Support cartridges in Mongo
Various test updates