added tests for RetryMethods concern. Refactored RetryMethods