further improvements to the test runner