Fix up some flaky behavior of the new improved update e2e test.