More refactoring work on test runners