Fix grunt for e2e tests, refactoring e2e tests for login/lgoout.