Fix up e2e tests.
Merge pull request #2941 from mbforbes/gceTests

Improve e2e tests