refactoring of e2e tests