HH-48866 service_mock improvements