WIP Cartridge Refactor - restore test

* webmock causing issues between tests