e2e: improve e2e resiliancy

Changes to make e2e tests more likely to succeed in setting up
middle-tier and executing on SauceLabs.