Adjusted scope, made singleton
Adjusted scope, made singleton
Testing service implementation