refactored e2e scenarios to reuse common objects