Fix lock/unlock functional tests
Merge pull request #52 from pmorie/dev/cartridge_refactor

Fix lock/unlock functional tests