Fixed up for latest API changes and now uses Embedded Mongo for tests