Major refactoring in e2e-tests