refactored options patchers and added tests for retry handler patch