WIP Cartridge Refactor - cucumber test refactor

* Clear up rest of fall out from CartridgeRepository