diff --git a/src/kuzzle.js b/src/kuzzle.js
index 7d7d94ca4..73f325e44 100644
--- a/src/kuzzle.js
+++ b/src/kuzzle.js
@@ -403,7 +403,7 @@ Kuzzle.prototype.addListener = function(event, listener) {
     throw new Error('[' + event + '] is not a known event. Known events: ' + knownEvents.toString());
   }
 
-  if (typeof listenerType !== 'function') {
+  if (listenerType !== 'function') {
     throw new Error('Invalid listener type: expected a function, got a ' + listenerType);
   }
 
@@ -714,7 +714,7 @@ Kuzzle.prototype.removeAllListeners = function (event) {
       throw new Error('[' + event + '] is not a known event. Known events: ' + knownEvents.toString());
     }
 
-    this.eventsListeners[event] = [];
+    this.eventListeners[event] = [];
   } else {
     knownEvents.forEach(function (eventName) {
       self.eventListeners[eventName] = [];
diff --git a/test/kuzzle/listenersManagement.test.js b/test/kuzzle/listenersManagement.test.js
new file mode 100644
index 000000000..324bdf79b
--- /dev/null
+++ b/test/kuzzle/listenersManagement.test.js
@@ -0,0 +1,122 @@
+var
+  should = require('should'),
+  rewire = require('rewire'),
+  Kuzzle = rewire('../../src/kuzzle');
+
+describe('Kuzzle: listeners management', () => {
+  var
+    kuzzle,
+    listenerIds;
+
+  beforeEach(function () {
+    var stublistener = function () {};
+
+    kuzzle = new Kuzzle('foo');
+    listenerIds = [];
+
+    listenerIds.push(kuzzle.addListener('subscribed', stublistener));
+    listenerIds.push(kuzzle.addListener('subscribed', stublistener));
+    listenerIds.push(kuzzle.addListener('subscribed', stublistener));
+    listenerIds.push(kuzzle.addListener('subscribed', stublistener));
+    kuzzle.addListener('unsubscribed', stublistener);
+    kuzzle.addListener('unsubscribed', stublistener);
+    kuzzle.addListener('unsubscribed', stublistener);
+    kuzzle.addListener('disconnected', stublistener);
+    kuzzle.addListener('disconnected', stublistener);
+    kuzzle.addListener('reconnected', stublistener);
+  });
+
+  describe('#addListener', function () {
+    it('should properly add new listeners to events', function () {
+      should(kuzzle.eventListeners['subscribed'].length).be.exactly(4);
+      should(kuzzle.eventListeners['unsubscribed'].length).be.exactly(3);
+      should(kuzzle.eventListeners['disconnected'].length).be.exactly(2);
+      should(kuzzle.eventListeners['reconnected'].length).be.exactly(1);
+    });
+
+    it('should throw an error if trying to adding a listener to an unknown event', function () {
+      try {
+        kuzzle.addListener('foo', function () {});
+        should.fail('success', 'failure', 'Should have failed to add a listener to unknown event "foo"', '');
+      }
+      catch (e) { }
+    });
+
+    it('should throw an error when providing a non-function listener argument', function () {
+      try {
+        kuzzle.addListener('subscribed', 'bar');
+        should.fail('success', 'failure', 'Should have failed to add a string listener', '');
+      }
+      catch (e) { }
+    });
+  });
+
+  describe('#removeAllListeners', function () {
+    it('should remove all registered listeners on a given event when asked to', function () {
+      kuzzle.removeAllListeners('disconnected');
+
+      should(kuzzle.eventListeners['subscribed'].length).be.exactly(4);
+      should(kuzzle.eventListeners['unsubscribed'].length).be.exactly(3);
+      should(kuzzle.eventListeners['disconnected'].length).be.exactly(0);
+      should(kuzzle.eventListeners['reconnected'].length).be.exactly(1);
+    });
+
+    it('should remove all registered listeners on all events when providing no event argument', function () {
+      kuzzle.removeAllListeners();
+
+      should(kuzzle.eventListeners['subscribed'].length).be.exactly(0);
+      should(kuzzle.eventListeners['unsubscribed'].length).be.exactly(0);
+      should(kuzzle.eventListeners['disconnected'].length).be.exactly(0);
+      should(kuzzle.eventListeners['reconnected'].length).be.exactly(0);
+    });
+
+    it('should throw an error when an unknown event is provided', function () {
+      try {
+        kuzzle.removeAllListeners('foo');
+        should.fail('success', 'failure', 'Should have failed removing listeners with an unknown event', '');
+      }
+      catch (e) {
+        should(kuzzle.eventListeners['subscribed'].length).be.exactly(4);
+        should(kuzzle.eventListeners['unsubscribed'].length).be.exactly(3);
+        should(kuzzle.eventListeners['disconnected'].length).be.exactly(2);
+        should(kuzzle.eventListeners['reconnected'].length).be.exactly(1);
+      }
+    });
+  });
+
+  describe('#removeListener', function () {
+    it('should remove any one listener from the listener list', function () {
+      var listener = kuzzle.eventListeners['subscribed'].filter(l => { return l.id === listenerIds[2]});
+
+      should(listener.length).be.exactly(1);
+      kuzzle.removeListener('subscribed', listenerIds[2]);
+      listener = kuzzle.eventListeners['subscribed'].filter(l => { return l.id === listenerIds[2]});
+      should(listener.length).be.exactly(0);
+      should(kuzzle.eventListeners['subscribed'].length).be.exactly(3);
+      should(kuzzle.eventListeners['unsubscribed'].length).be.exactly(3);
+      should(kuzzle.eventListeners['disconnected'].length).be.exactly(2);
+      should(kuzzle.eventListeners['reconnected'].length).be.exactly(1);
+    });
+
+    it('should throw an error when trying to remove a listener from an unknown event', function () {
+      try {
+        kuzzle.removeListener('foo', 'bar');
+        should.fail('success', 'failure', 'Should have failed removing listeners with an unknown event', '');
+      }
+      catch (e) {
+        should(kuzzle.eventListeners['subscribed'].length).be.exactly(4);
+        should(kuzzle.eventListeners['unsubscribed'].length).be.exactly(3);
+        should(kuzzle.eventListeners['disconnected'].length).be.exactly(2);
+        should(kuzzle.eventListeners['reconnected'].length).be.exactly(1);
+      }
+    });
+
+    it('should do nothing if the provided listener id does not exist', function () {
+      kuzzle.removeListener('subscribed', 'foo');
+      should(kuzzle.eventListeners['subscribed'].length).be.exactly(4);
+      should(kuzzle.eventListeners['unsubscribed'].length).be.exactly(3);
+      should(kuzzle.eventListeners['disconnected'].length).be.exactly(2);
+      should(kuzzle.eventListeners['reconnected'].length).be.exactly(1);
+    });
+  });
+});
diff --git a/test/kuzzle/offlineQueue.test.js b/test/kuzzle/offlineQueue.test.js
index 6b2f00c83..fbf45c549 100644
--- a/test/kuzzle/offlineQueue.test.js
+++ b/test/kuzzle/offlineQueue.test.js
@@ -111,4 +111,18 @@ describe('Kuzzle: offline queue management', () => {
       }, numRequests * kuzzle.replayInterval + 10)
     });
   });
+
+  describe('#flushing the queue', function () {
+    it ('should empty the queue when asked to', function () {
+      var kuzzle = new Kuzzle('foo');
+
+      kuzzle.offlineQueue.push({ts: 'foo', query: {}, cb: function () {}});
+      kuzzle.offlineQueue.push({ts: 'foo', query: {}, cb: function () {}});
+      kuzzle.offlineQueue.push({ts: 'foo', query: {}, cb: function () {}});
+      kuzzle.offlineQueue.push({ts: 'foo', query: {}, cb: function () {}});
+
+      kuzzle.flushQueue();
+      should(kuzzle.offlineQueue.length).be.exactly(0);
+    });
+  });
 });