Attempt to fix spurious test failures due to timing sensitivities.