Remove test class
Refactoring