Improve the test runner