Pass all tests for Mongo DB refactor