fix intermittent test failures.