Merge "ProviderTest: use the correct provider object when creating a service"