E2E tests refactored