The latest e2e tests have become quite flakey and require re-runs to get everything through. This should be fixed!