my version
connector method names changed
removed useless option
Singleton tests updated and fixed