Merge "Fix arguments for method expected_success"