REFACTORING Singletonization in beforeEach
SPIKE Singleton is not for ever