Clean out screenshots on gulp build
Refactor e2e test to be more robust