small refactor e2e