Improved the naming conventions for the test runners