Removed unwanted classes
Changed unit test naming