Cleanups and removed all unit tests (completely broken after refactorings)