Minor change to service.
Fix tests