fix eap spec file versions
WIP Cartridge Refactor - Refactor V2CartridgeModel to use CartridgeRepository

* Update calls, tests, etc