Fix cartridge controller tests
Fix scaling controller tests