adding a service, refactoring tests