Removed unused classes and fixed the tests to be current