Fix periodic test failure.
Fix issues caused by lots of timeout requests.
More proper fix for intermittent test failure.