Fix test build and test runner