Removed singletons
Switched TestSystems and InGame