Added tests for singletons