- I originally removed this feature because the
  feature was listed as deprecated
- now they want it back
- update tests
- update mocks to be more organized