Made the test runner a bit more readable