Better infrastructure for the test runner