Cleanup of Unit Tests

Things that are left to do after this:

* Since the tests are now going through the public methods of each test class, a number of methods are still named unnamedX - so these should be renamed to something fitting
* Total test count comes out at 12205 instead of 12208
* Code Coverage needs to be tested