This PR translates two of our most flakey unit tests into e2e tests where they are fit much more naturally.