Merge "Fix test_fix_argument_yes"