Improvements to test runner