Finish tests, remove old classes