Refactoring Mongo model. All unit tests passing with mongo