Correct intermittent test failures