Singleton concept cleanup

connector method names changed

removed useless option
Singleton tests updated and fixed