Cleaned up run_test