Use new test_runner