V2 cucumber test refactor
WIP Cartridge Refactor - cucumber test refactor

* Clear up rest of fall out from CartridgeRepository
WIP Cartridge Refactor - Fix node_test.rb

* Clear singleton between runs
WIP Cartridge Refactor - missed commit

* wrong assertion value
Merge pull request #1683 from jwhonce/wip/mock_updated

WIP Cartridge Refactor - cucumber test refactor