Deleted unnecessary classes. Added TestSuite