Move tests covering the private logic to the
new AutoRetry class. Fix integration tests
that depended on the old interface.