Unit tests. Singleton fix.