service_mock improvements