Reformat code
Refactor some classes. Avoid object creation for each test name refactoring.