add deferred retries + tests