Merge "Fix args parsing in run_tests"