retry -
  - Fixed mock test framework to work with 'retry'
  - Added retry tests