Test refactoring. Remove hacked classes used during testing