tidy up test runner