Add service implementations Unit tests