Fix more spurious test failures
4 files changed