Fix bug when provider is `google` and add test coverage
Merge pull request #2302 from danielgtaylor/gs-fix

Fix bug when provider is `google` and add test coverage. Fixes #2302, #2298.