Update for new test runner