Remove the use of depth=2 from /service_instances endpoint

- Also take care of a few timing related failures