Add tests for Service + minor fixes