Pass tests using singleton class
Converted to Gem