Updated test runner