Made tests to pass 10/10 and deleted unnecessary classes