e2e test refactoring done
merge