Fixing testsuite failures with mongo model