Tests green. Implemented singleton in Resolver class