Make TimeoutTest more robust