Merge "Fix tests not honoring the provider setting."