NewRetryTest refactoring