Fix `deleteById(id)` and other test failures

lib/dao.js

@@ -1284,6 +1284,10 @@ DataAccessObject.removeById = DataAccessObject.destroyById = DataAccessObject.de
       options = {};
     }
   }
+
+  options = options || {};
+  cb = cb || noCallback;
+
   assert(typeof options === 'object', 'The options argument must be an object');
   assert(typeof cb === 'function', 'The cb argument must be a function');
 

test/crud-with-options.test.js

@@ -353,6 +353,12 @@ describe('crud-with-options', function () {
 
   });
 
+  describe('deleteById', function() {
+    it('should allow deleteById(id)', function () {
+      User.deleteById(1);
+    });
+  });
+
   describe('updateAll ', function () {
 
     beforeEach(seed);

test/events.js

@@ -14,11 +14,7 @@ describe('events', function() {
       });
     });
     this.shouldEmitEvent = function(eventName, listener, done) {
-      var timeout = setTimeout(function() {
-        done(new Error('did not emit ' + eventName));
-      }, 100);
       this.TestModel.on(eventName, function() {
-        clearTimeout(timeout);
         listener.apply(this, arguments);
         done();
       });