WIP Cartridge Refactor - Fix unit tests

* mocking did support contract
Merge pull request #83 from jwhonce/dev/wip_v2

WIP Cartridge Refactor - Fix unit tests