Fixes to the test runner