There are a number of cleanups I'd like to do to fix flaky tests. This issue will capture the changes I am going to make.