Finished splitting classes/tests; now we can start refactoring