refactoring and delete test classes.