WIP Cartridge Refactor - Fix unit tests

* mocking did not support contract