add/del/update user mailbox as part of transaction

src/test/database-test.js

@@ -1340,6 +1340,13 @@ describe('database', function () {
     });
 
     describe('mailboxes', function () {
+        before(function (done) {
+            async.series([
+                database.initialize,
+                database._clear
+            ], done);
+        });
+
         it('add user mailbox succeeds', function (done) {
             mailboxdb.add('girish', 'uid-0', mailboxdb.TYPE_USER, function (error, mailbox) {
                 expect(error).to.be(null);

src/test/user-test.js

@@ -1008,7 +1008,7 @@ describe('User', function () {
 
         it('can remove valid user', function (done) {
             user.remove(userObject.id, { }, function (error) {
-                expect(error).to.be(null);
+                expect(!error).to.be.ok();
                 done();
             });
         });