Updated services. Added unit test for service.