WIP Cartridge Refactor - Fixed test method names