Some cleanup of the test runner