wip(not tested): Initial approach for testing retries

wip(not tested): Initial approach for testing retries #1253