Make sure that service_instance_test can still execute

Change-Id: I6eb8a656cf37c5337c14e6ecaca16c84b9b62419