Integrate deployment scenarios into e2e tests

Various fixes for deployments and integration with the e2e tests.