Singleton changes.
Singleton simple test added.