updated tests to support new retrying architecture