E2e stability

Optimizes e2e tests, increases timeouts. Hoping this will be the foundation for better stability in the e2e tests, which have been timing out sporadically and unpredictably.