Fix logging in v2 model
Condense mock cuke tests
Merge pull request #62 from pmorie/dev/cartridge_refactor

1 Fix and a test speed-up