Improve test runner