Fixed retry tests to conform to changes in external test service