Fix master e2e tests
Merge pull request #526 from 28msec/fix-master-tests

Fix master e2e tests