Teiiddes2

Instead of branch teiiddes, minor edits to smoke and e2e tests.