small refactoring, added test specs for all services