New e2e tests, refactored