Some refactoring / general improvements to the test runner.