Singleton tests updated and fixed