Remove run_tests.py differences with upstream