WIP Cartridge Refactor -- v2_cart_model functional testing

Missed two files