Added code to speed up unit test for retry behavior