WIP Cartridge Refactor - Added functional tests for lock/unlock