I wonder if those other tests, which I ended up disabling, could be fixed
similarly. Though those errors seemed to be of a different variety.