Updated test runner to work everywhere