WIP Cartridge Refactor - Cleanup tests
Merge pull request #64 from jwhonce/dev/wip

WIP Cartridge Refactor - Cleanup tests