Tweak to run_tests