Merge "Skip failing test test_fix_argument_yes"