Cleaned up tests by deleting dead code, packaging utilities/test classes together, fixing a few tests that were commented out