Fix broken tests, service_type must have a code. [Fixes #68004948]