Fixes the custom e2e tests
Merge pull request #986 from kbidarkar/fix-tests333

Fixes the custom e2e tests