Refactoring the services, Update tests