WIP Cartridge Refactor - Cleanup tests