Removed obsolete class
Adding new test classes
Added other new classes and responded to failing tests