Removed old Testclasses and remove dependency