CLC-4275: fix test flow control and OAuth handling for Google-related tests