Singleton + Testfix