Start to fix e2e tests.