Major updates to the test runner