Fix cartridge controller tests