test runner refactoring