Get service_instance_test to compile again