Added singletons and tests for them