Made the test runner parameterized