Make e2e tests work again