changes to getSingletons and tests