cleaning up output
changed return service type and that fixed the failing tests