updated google wait behavior to avoid failures