Switched test runners to run-tests.py