Improved timing of timeout test
Optimization - removed unnecessary poll in check loop