Work on the E2E-Tests after separation of concerns