Fixes to e2e script
Merge pull request #1976 from lavalamp/fix4

Fixes to e2e script