WIP Cartridge Refactor - Added functional tests for lock/unlock
Merge pull request #46 from jwhonce/dev/wip

WIP Cartridge Refactor - Added functional tests for lock/unlock