Fix the failure to run the e2e tests
Merge pull request #553 from bvahdat/master

Fix the failure to run the e2e tests