refactor this test to allow for timeouts
[bamboo] Automated branch merge (from 1.10:20ecfe3bc7e72ef43526ebb054133ff933ece35f)