phpunit globals mocked in bootstrap
Update Singleton class & test
Improved test coverage