Work around race conditions in tests on faster hardware.

THIS NEEDS A PROPER FIX.
2 files changed