Refactored name of services and fixed unit tests