Updated test runner with new naming convention