Add tests for createSingletons