If this PR introduces a potential 10 sec delay vs what's there now, shouldn't this be 20000 to keep the same margin for intermittent environmental issues?

The test loops testing for reload completion every 100 ms until success or timeout, so in the normal non-failure case there is no real cost to a longer timeout.