refactored tests and service naming