Refactored tests a bit by moving tests of certain classes into their own test file.