refactor and add tests for retry options