Address review comments
Fix failing mongo modulestore unit tests