Merge "Adds service_providers client tests"