diff --git a/README.md b/README.md
index 73586d9..8fbfdd4 100644
--- a/README.md
+++ b/README.md
@@ -120,7 +120,7 @@ server in order to test your applications:
 ```javascript
     var $websocketBackend;
 
-    beforeEach(angular.mock.module('ngWebSocket', 'ngWebSocketMock');
+    beforeEach(angular.mock.module('ngWebSocket', 'ngWebSocketMock'));
 
     beforeEach(inject(function (_$websocketBackend_) {
       $websocketBackend = _$websocketBackend_;
@@ -137,8 +137,10 @@ name                           | arguments  | description
 -------------------------------|------------|-----------------------------------
 flush                          |            | Executes all pending requests
 expectConnect                  | url:String | Specify the url of an expected WebSocket connection
-expectClose                    |            | Expect "close" to be called on the WebSocket
+expectClose                    | url:String | Expect "close" to be called on the WebSocket
 expectSend                     | msg:String | Expectation of send to be called, with required message
+fakeClose                      | url:String | Used to fake close a socket and test corresponding close handlers
+fakeMessage                    | url:String, data:object | Used to fake a backend initialized send action, which can be handled in onMessage
 verifyNoOutstandingExpectation |            | Makes sure all expectations have been satisfied, should be called in afterEach
 verifyNoOutstandingRequest     |            | Makes sure no requests are pending, should be called in afterEach
 
diff --git a/dist/angular-websocket-mock.js b/dist/angular-websocket-mock.js
index 21bb08a..222c002 100644
--- a/dist/angular-websocket-mock.js
+++ b/dist/angular-websocket-mock.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
-    define(['module', 'angular'], factory);
+    define(["module", "angular"], factory);
   } else if (typeof exports !== "undefined") {
-    factory(module, require('angular'));
+    factory(module, require("angular"));
   } else {
     var mod = {
       exports: {}
@@ -11,7 +11,7 @@
     global.angularWebsocketMock = mod.exports;
   }
 })(this, function (module, _angular) {
-  'use strict';
+  "use strict";
 
   var _angular2 = _interopRequireDefault(_angular);
 
@@ -28,11 +28,19 @@
     var pendingCloses = [];
     var sendQueue = [];
     var pendingSends = [];
+    var pendingMessages = [];
     var mock = false;
+    var existingMocks = {};
 
     function $MockWebSocket(url, protocols) {
+      this.url = url;
       this.protocols = protocols;
       this.ssl = /(wss)/i.test(this.url);
+      if (!existingMocks[url]) {
+        existingMocks[url] = [this];
+      } else {
+        existingMocks[url].push(this);
+      }
     }
 
     $MockWebSocket.prototype.send = function (msg) {
@@ -45,6 +53,19 @@
       }
     };
 
+    this.fakeClose = function (url, code) {
+      closeQueue.push(url);
+      if (existingMocks[url]) {
+        existingMocks[url].map(function (mockSocket) {
+          mockSocket.close(code);
+        });
+      }
+    };
+
+    this.fakeMessage = function (url, data) {
+      pendingMessages.push({ url: url, data: data });
+    };
+
     this.mock = function () {
       mock = true;
     };
@@ -57,8 +78,8 @@
       return connectQueue.indexOf(url) > -1;
     };
 
-    $MockWebSocket.prototype.close = function () {
-      pendingCloses.push(true);
+    $MockWebSocket.prototype.close = function (code) {
+      pendingCloses.push({ url: this.url, code: code ? code : 1000 });
     };
 
     function createWebSocketBackend(url, protocols) {
@@ -76,19 +97,61 @@
     this.create = createWebSocketBackend;
     this.createWebSocketBackend = createWebSocketBackend;
 
+    function callOpenCallbacks(url) {
+      existingMocks[url].map(function (socketMock) {
+        if (socketMock.onopen && typeof socketMock.onopen === "function") {
+          socketMock.onopen();
+        }
+      });
+    }
+
+    function callCloseCallbacks(url, code) {
+      existingMocks[url].map(function (socketMock) {
+        if (socketMock.onclose && typeof socketMock.onclose === "function") {
+          socketMock.onclose({ code: code });
+        }
+      });
+    }
+
+    function callMessageCallbacks(url, data) {
+      if (existingMocks[url]) {
+        existingMocks[url].map(function (socketMock) {
+          if (socketMock.onmessage && typeof socketMock.onmessage === "function") {
+            socketMock.onmessage({ data: JSON.stringify(data) });
+          }
+        });
+      }
+    }
+
+    function setReadyState(url, state) {
+      if (existingMocks[url]) {
+        existingMocks[url].map(function (socketMock) {
+          socketMock.readyState = state;
+        });
+      }
+    }
+
     this.flush = function () {
       var url, msg, config;
       while (url = pendingConnects.shift()) {
         var i = connectQueue.indexOf(url);
         if (i > -1) {
           connectQueue.splice(i, 1);
+          callOpenCallbacks(url);
+          setReadyState(url, 1);
         }
         // if (config && config.url) {
         // }
       }
 
-      while (pendingCloses.shift()) {
-        closeQueue.shift();
+      var pendingClose;
+      while (pendingClose = pendingCloses.shift()) {
+        var i = closeQueue.indexOf(pendingClose.url);
+        if (i > -1) {
+          closeQueue.splice(i, 1);
+          callCloseCallbacks(pendingClose.url, pendingClose.code);
+          setReadyState(pendingClose.url, 3);
+        }
       }
 
       while (msg = pendingSends.shift()) {
@@ -103,6 +166,10 @@
           sendQueue.splice(j, 1);
         }
       }
+
+      while (msg = pendingMessages.shift()) {
+        callMessageCallbacks(msg.url, msg.data);
+      }
     };
 
     this.expectConnect = function (url, protocols) {
@@ -110,8 +177,8 @@
       // connectQueue.push({url: url, protocols: protocols});
     };
 
-    this.expectClose = function () {
-      closeQueue.push(true);
+    this.expectClose = function (url) {
+      closeQueue.push(url);
     };
 
     this.expectSend = function (msg) {
diff --git a/dist/angular-websocket.js b/dist/angular-websocket.js
index db99c8e..54ab2cf 100644
--- a/dist/angular-websocket.js
+++ b/dist/angular-websocket.js
@@ -25,12 +25,6 @@
     };
   }
 
-  var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
-    return typeof obj;
-  } : function (obj) {
-    return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj;
-  };
-
   var Socket;
 
   if (typeof window === 'undefined') {
@@ -148,6 +142,13 @@
     };
 
     $WebSocket.prototype._connect = function _connect(force) {
+      if (this.socket) {
+        this.socket.onmessage = null;
+        this.socket.onopen = null;
+        this.socket.onerror = null;
+        this.socket.onclose = null;
+        this.socket.close();
+      }
       if (force || !this.socket || this.socket.readyState !== this._readyStateConstants.OPEN) {
         this.socket = $websocketBackend.create(this.url, this.protocols);
         this.socket.onmessage = _angular2.default.bind(this, this._onMessageHandler);
@@ -320,10 +321,6 @@
         return self;
       }
 
-      if ($websocketBackend.isMocked && $websocketBackend.isMocked() && $websocketBackend.isConnected(this.url)) {
-        this._onMessageHandler($websocketBackend.mockSend());
-      }
-
       return promise;
     };
 
@@ -412,4 +409,4 @@
 
   exports.default = _angular2.default.module('ngWebSocket');
   module.exports = exports['default'];
-});
+});
\ No newline at end of file
diff --git a/dist/angular-websocket.min.js b/dist/angular-websocket.min.js
index 0d82580..d8a7f43 100644
--- a/dist/angular-websocket.min.js
+++ b/dist/angular-websocket.min.js
@@ -1,2 +1,2 @@
-!function(e,t){if("function"==typeof define&&define.amd)define(["module","exports","angular","ws"],t);else if("undefined"!=typeof exports)t(module,exports,require("angular"),require("ws"));else{var o={exports:{}};t(o,o.exports,e.angular,e.ws),e.angularWebsocket=o.exports}}(this,function(e,t,o,n){"use strict";function s(e){return e&&e.__esModule?e:{"default":e}}function r(e,t,o,n){function s(t,o,n){n||!k(o)||C(o)||(n=o,o=void 0),this.protocols=o,this.url=t||"Missing URL",this.ssl=/(wss)/i.test(this.url),this.scope=n&&n.scope||e,this.rootScopeFailover=n&&n.rootScopeFailover&&!0,this.useApplyAsync=n&&n.useApplyAsync||!1,this.initialTimeout=n&&n.initialTimeout||500,this.maxTimeout=n&&n.maxTimeout||3e5,this.reconnectIfNotNormalClose=n&&n.reconnectIfNotNormalClose||!1,this.binaryType=n&&n.binaryType||"blob",this._reconnectAttempts=0,this.sendQueue=[],this.onOpenCallbacks=[],this.onMessageCallbacks=[],this.onErrorCallbacks=[],this.onCloseCallbacks=[],f(this._readyStateConstants),t?this._connect():this._setInternalState(0)}return s.prototype._readyStateConstants={CONNECTING:0,OPEN:1,CLOSING:2,CLOSED:3,RECONNECT_ABORTED:4},s.prototype._normalCloseCode=1e3,s.prototype._reconnectableStatusCodes=[4e3],s.prototype.safeDigest=function(e){e&&!this.scope.$$phase&&this.scope.$digest()},s.prototype.bindToScope=function(t){var o=this;return t&&(this.scope=t,this.rootScopeFailover&&this.scope.$on("$destroy",function(){o.scope=e})),o},s.prototype._connect=function(e){!e&&this.socket&&this.socket.readyState===this._readyStateConstants.OPEN||(this.socket=n.create(this.url,this.protocols),this.socket.onmessage=c["default"].bind(this,this._onMessageHandler),this.socket.onopen=c["default"].bind(this,this._onOpenHandler),this.socket.onerror=c["default"].bind(this,this._onErrorHandler),this.socket.onclose=c["default"].bind(this,this._onCloseHandler),this.socket.binaryType=this.binaryType)},s.prototype.fireQueue=function(){for(;this.sendQueue.length&&this.socket.readyState===this._readyStateConstants.OPEN;){var e=this.sendQueue.shift();this.socket.send(d(e.message)||"blob"!=this.binaryType?e.message:JSON.stringify(e.message)),e.deferred.resolve()}},s.prototype.notifyOpenCallbacks=function(e){for(var t=0;t<this.onOpenCallbacks.length;t++)this.onOpenCallbacks[t].call(this,e)},s.prototype.notifyCloseCallbacks=function(e){for(var t=0;t<this.onCloseCallbacks.length;t++)this.onCloseCallbacks[t].call(this,e)},s.prototype.notifyErrorCallbacks=function(e){for(var t=0;t<this.onErrorCallbacks.length;t++)this.onErrorCallbacks[t].call(this,e)},s.prototype.onOpen=function(e){return this.onOpenCallbacks.push(e),this},s.prototype.onClose=function(e){return this.onCloseCallbacks.push(e),this},s.prototype.onError=function(e){return this.onErrorCallbacks.push(e),this},s.prototype.onMessage=function(e,t){if(!y(e))throw new Error("Callback must be a function");if(t&&b(t.filter)&&!d(t.filter)&&!(t.filter instanceof RegExp))throw new Error("Pattern must be a string or regular expression");return this.onMessageCallbacks.push({fn:e,pattern:t?t.filter:void 0,autoApply:t?t.autoApply:!0}),this},s.prototype._onOpenHandler=function(e){this._reconnectAttempts=0,this.notifyOpenCallbacks(e),this.fireQueue()},s.prototype._onCloseHandler=function(e){var t=this;t.useApplyAsync?t.scope.$applyAsync(function(){t.notifyCloseCallbacks(e)}):(t.notifyCloseCallbacks(e),t.safeDigest(!0)),(this.reconnectIfNotNormalClose&&e.code!==this._normalCloseCode||this._reconnectableStatusCodes.indexOf(e.code)>-1)&&this.reconnect()},s.prototype._onErrorHandler=function(e){var t=this;t.useApplyAsync?t.scope.$applyAsync(function(){t.notifyErrorCallbacks(e)}):(t.notifyErrorCallbacks(e),t.safeDigest(!0))},s.prototype._onMessageHandler=function(e){function t(e,t,o){o=m.call(arguments,2),s.useApplyAsync?s.scope.$applyAsync(function(){e.apply(s,o)}):(e.apply(s,o),s.safeDigest(t))}for(var o,n,s=this,r=0;r<s.onMessageCallbacks.length;r++)n=s.onMessageCallbacks[r],o=n.pattern,o?d(o)&&e.data===o?t(n.fn,n.autoApply,e):o instanceof RegExp&&o.exec(e.data)&&t(n.fn,n.autoApply,e):t(n.fn,n.autoApply,e)},s.prototype.close=function(e){return!e&&this.socket.bufferedAmount||this.socket.close(),this},s.prototype.send=function(e){function o(e){e.cancel=s;var t=e.then;return e.then=function(){var e=t.apply(this,arguments);return o(e)},e}function s(t){return i.sendQueue.splice(i.sendQueue.indexOf(e),1),r.reject(t),i}var r=t.defer(),i=this,a=o(r.promise);return i.readyState===i._readyStateConstants.RECONNECT_ABORTED?r.reject("Socket connection has been closed"):(i.sendQueue.push({message:e,deferred:r}),i.fireQueue()),n.isMocked&&n.isMocked()&&n.isConnected(this.url)&&this._onMessageHandler(n.mockSend()),a},s.prototype.reconnect=function(){this.close();var e=this._getBackoffDelay(++this._reconnectAttempts),t=e/1e3;return console.log("Reconnecting in "+t+" seconds"),o(c["default"].bind(this,this._connect),e),this},s.prototype._getBackoffDelay=function(e){var t=Math.random()+1,o=this.initialTimeout,n=2,s=e,r=this.maxTimeout;return Math.floor(Math.min(t*o*Math.pow(n,s),r))},s.prototype._setInternalState=function(e){if(Math.floor(e)!==e||0>e||e>4)throw new Error("state must be an integer between 0 and 4, got: "+e);h||(this.readyState=e||this.socket.readyState),this._internalConnectionState=e,g(this.sendQueue,function(e){e.deferred.reject("Message cancelled due to closed socket connection")})},h&&h(s.prototype,"readyState",{get:function(){return this._internalConnectionState||this.socket.readyState},set:function(){throw new Error("The readyState property is read-only")}}),function(e,t,o){return new s(e,t,o)}}function i(e){this.create=function(e,t){var o=/wss?:\/\//.exec(e);if(!o)throw new Error("Invalid url provided");return t?new a(e,t):new a(e)},this.createWebSocketBackend=function(t,o){return e.warn("Deprecated: Please use .create(url, protocols)"),this.create(t,o)}}Object.defineProperty(t,"__esModule",{value:!0});var a,c=s(o),l="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol?"symbol":typeof e};if("object"===("undefined"==typeof t?"undefined":l(t))&&"function"==typeof require)try{a=n.Client||n.client||n}catch(u){}a=a||window.WebSocket||window.MozWebSocket;var p=c["default"].noop,f=Object.freeze?Object.freeze:p,h=Object.defineProperty,d=c["default"].isString,y=c["default"].isFunction,b=c["default"].isDefined,k=c["default"].isObject,C=c["default"].isArray,g=c["default"].forEach,m=Array.prototype.slice;Array.prototype.indexOf||(Array.prototype.indexOf=function(e){var t=this.length>>>0,o=Number(arguments[1])||0;for(o=0>o?Math.ceil(o):Math.floor(o),0>o&&(o+=t);t>o;o++)if(o in this&&this[o]===e)return o;return-1}),c["default"].module("ngWebSocket",[]).factory("$websocket",["$rootScope","$q","$timeout","$websocketBackend",r]).factory("WebSocket",["$rootScope","$q","$timeout","WebsocketBackend",r]).service("$websocketBackend",["$log",i]).service("WebSocketBackend",["$log",i]),c["default"].module("angular-websocket",["ngWebSocket"]),t["default"]=c["default"].module("ngWebSocket"),e.exports=t["default"]});
+!function(e,t){if("function"==typeof define&&define.amd)define(["module","exports","angular","ws"],t);else if("undefined"!=typeof exports)t(module,exports,require("angular"),require("ws"));else{var o={exports:{}};t(o,o.exports,e.angular,e.ws),e.angularWebsocket=o.exports}}(this,function(e,t,o,n){"use strict";function s(e){return e&&e.__esModule?e:{default:e}}function r(e,t,o,n){function s(t,o,n){n||!y(o)||b(o)||(n=o,o=void 0),this.protocols=o,this.url=t||"Missing URL",this.ssl=/(wss)/i.test(this.url),this.scope=n&&n.scope||e,this.rootScopeFailover=n&&n.rootScopeFailover&&!0,this.useApplyAsync=n&&n.useApplyAsync||!1,this.initialTimeout=n&&n.initialTimeout||500,this.maxTimeout=n&&n.maxTimeout||3e5,this.reconnectIfNotNormalClose=n&&n.reconnectIfNotNormalClose||!1,this.binaryType=n&&n.binaryType||"blob",this._reconnectAttempts=0,this.sendQueue=[],this.onOpenCallbacks=[],this.onMessageCallbacks=[],this.onErrorCallbacks=[],this.onCloseCallbacks=[],u(this._readyStateConstants),t?this._connect():this._setInternalState(0)}return s.prototype._readyStateConstants={CONNECTING:0,OPEN:1,CLOSING:2,CLOSED:3,RECONNECT_ABORTED:4},s.prototype._normalCloseCode=1e3,s.prototype._reconnectableStatusCodes=[4e3],s.prototype.safeDigest=function(e){e&&!this.scope.$$phase&&this.scope.$digest()},s.prototype.bindToScope=function(t){var o=this;return t&&(this.scope=t,this.rootScopeFailover&&this.scope.$on("$destroy",function(){o.scope=e})),o},s.prototype._connect=function(e){this.socket&&(this.socket.onmessage=null,this.socket.onopen=null,this.socket.onerror=null,this.socket.onclose=null,this.socket.close()),!e&&this.socket&&this.socket.readyState===this._readyStateConstants.OPEN||(this.socket=n.create(this.url,this.protocols),this.socket.onmessage=c.default.bind(this,this._onMessageHandler),this.socket.onopen=c.default.bind(this,this._onOpenHandler),this.socket.onerror=c.default.bind(this,this._onErrorHandler),this.socket.onclose=c.default.bind(this,this._onCloseHandler),this.socket.binaryType=this.binaryType)},s.prototype.fireQueue=function(){for(;this.sendQueue.length&&this.socket.readyState===this._readyStateConstants.OPEN;){var e=this.sendQueue.shift();this.socket.send(h(e.message)||"blob"!=this.binaryType?e.message:JSON.stringify(e.message)),e.deferred.resolve()}},s.prototype.notifyOpenCallbacks=function(e){for(var t=0;t<this.onOpenCallbacks.length;t++)this.onOpenCallbacks[t].call(this,e)},s.prototype.notifyCloseCallbacks=function(e){for(var t=0;t<this.onCloseCallbacks.length;t++)this.onCloseCallbacks[t].call(this,e)},s.prototype.notifyErrorCallbacks=function(e){for(var t=0;t<this.onErrorCallbacks.length;t++)this.onErrorCallbacks[t].call(this,e)},s.prototype.onOpen=function(e){return this.onOpenCallbacks.push(e),this},s.prototype.onClose=function(e){return this.onCloseCallbacks.push(e),this},s.prototype.onError=function(e){return this.onErrorCallbacks.push(e),this},s.prototype.onMessage=function(e,t){if(!f(e))throw new Error("Callback must be a function");if(t&&d(t.filter)&&!h(t.filter)&&!(t.filter instanceof RegExp))throw new Error("Pattern must be a string or regular expression");return this.onMessageCallbacks.push({fn:e,pattern:t?t.filter:void 0,autoApply:!t||t.autoApply}),this},s.prototype._onOpenHandler=function(e){this._reconnectAttempts=0,this.notifyOpenCallbacks(e),this.fireQueue()},s.prototype._onCloseHandler=function(e){var t=this;t.useApplyAsync?t.scope.$applyAsync(function(){t.notifyCloseCallbacks(e)}):(t.notifyCloseCallbacks(e),t.safeDigest(!0)),(this.reconnectIfNotNormalClose&&e.code!==this._normalCloseCode||this._reconnectableStatusCodes.indexOf(e.code)>-1)&&this.reconnect()},s.prototype._onErrorHandler=function(e){var t=this;t.useApplyAsync?t.scope.$applyAsync(function(){t.notifyErrorCallbacks(e)}):(t.notifyErrorCallbacks(e),t.safeDigest(!0))},s.prototype._onMessageHandler=function(e){function t(e,t,o){o=C.call(arguments,2),s.useApplyAsync?s.scope.$applyAsync(function(){e.apply(s,o)}):(e.apply(s,o),s.safeDigest(t))}for(var o,n,s=this,r=0;r<s.onMessageCallbacks.length;r++)n=s.onMessageCallbacks[r],o=n.pattern,o?h(o)&&e.data===o?t(n.fn,n.autoApply,e):o instanceof RegExp&&o.exec(e.data)&&t(n.fn,n.autoApply,e):t(n.fn,n.autoApply,e)},s.prototype.close=function(e){return!e&&this.socket.bufferedAmount||this.socket.close(),this},s.prototype.send=function(e){function o(e){e.cancel=n;var t=e.then;return e.then=function(){var e=t.apply(this,arguments);return o(e)},e}function n(t){return r.sendQueue.splice(r.sendQueue.indexOf(e),1),s.reject(t),r}var s=t.defer(),r=this,i=o(s.promise);return r.readyState===r._readyStateConstants.RECONNECT_ABORTED?s.reject("Socket connection has been closed"):(r.sendQueue.push({message:e,deferred:s}),r.fireQueue()),i},s.prototype.reconnect=function(){this.close();var e=this._getBackoffDelay(++this._reconnectAttempts),t=e/1e3;return console.log("Reconnecting in "+t+" seconds"),o(c.default.bind(this,this._connect),e),this},s.prototype._getBackoffDelay=function(e){var t=Math.random()+1,o=this.initialTimeout,n=2,s=e,r=this.maxTimeout;return Math.floor(Math.min(t*o*Math.pow(n,s),r))},s.prototype._setInternalState=function(e){if(Math.floor(e)!==e||e<0||e>4)throw new Error("state must be an integer between 0 and 4, got: "+e);p||(this.readyState=e||this.socket.readyState),this._internalConnectionState=e,k(this.sendQueue,function(e){e.deferred.reject("Message cancelled due to closed socket connection")})},p&&p(s.prototype,"readyState",{get:function(){return this._internalConnectionState||this.socket.readyState},set:function(){throw new Error("The readyState property is read-only")}}),function(e,t,o){return new s(e,t,o)}}function i(e){this.create=function(e,t){var o=/wss?:\/\//.exec(e);if(!o)throw new Error("Invalid url provided");return t?new a(e,t):new a(e)},this.createWebSocketBackend=function(t,o){return e.warn("Deprecated: Please use .create(url, protocols)"),this.create(t,o)}}Object.defineProperty(t,"__esModule",{value:!0});var a,c=s(o);if("undefined"==typeof window)try{a=n.Client||n.client||n}catch(e){}a=a||window.WebSocket||window.MozWebSocket;var l=c.default.noop,u=Object.freeze?Object.freeze:l,p=Object.defineProperty,h=c.default.isString,f=c.default.isFunction,d=c.default.isDefined,y=c.default.isObject,b=c.default.isArray,k=c.default.forEach,C=Array.prototype.slice;Array.prototype.indexOf||(Array.prototype.indexOf=function(e){var t=this.length>>>0,o=Number(arguments[1])||0;for(o=o<0?Math.ceil(o):Math.floor(o),o<0&&(o+=t);o<t;o++)if(o in this&&this[o]===e)return o;return-1}),c.default.module("ngWebSocket",[]).factory("$websocket",["$rootScope","$q","$timeout","$websocketBackend",r]).factory("WebSocket",["$rootScope","$q","$timeout","WebsocketBackend",r]).service("$websocketBackend",["$log",i]).service("WebSocketBackend",["$log",i]),c.default.module("angular-websocket",["ngWebSocket"]),t.default=c.default.module("ngWebSocket"),e.exports=t.default});
 //# sourceMappingURL=angular-websocket.min.js.map
diff --git a/dist/angular-websocket.min.js.map b/dist/angular-websocket.min.js.map
index 0983906..db47fc4 100644
--- a/dist/angular-websocket.min.js.map
+++ b/dist/angular-websocket.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["dist/angular-websocket.js"],"names":["global","factory","define","amd","exports","module","require","mod","angular","ws","angularWebsocket","this","_angular","_interopRequireDefault","obj","__esModule","default","$WebSocketProvider","$rootScope","$q","$timeout","$websocketBackend","$WebSocket","url","protocols","options","isObject","isArray","undefined","ssl","test","scope","rootScopeFailover","useApplyAsync","initialTimeout","maxTimeout","reconnectIfNotNormalClose","binaryType","_reconnectAttempts","sendQueue","onOpenCallbacks","onMessageCallbacks","onErrorCallbacks","onCloseCallbacks","objectFreeze","_readyStateConstants","_connect","_setInternalState","prototype","CONNECTING","OPEN","CLOSING","CLOSED","RECONNECT_ABORTED","_normalCloseCode","_reconnectableStatusCodes","safeDigest","autoApply","$$phase","$digest","bindToScope","self","$on","force","socket","readyState","create","onmessage","_angular2","bind","_onMessageHandler","onopen","_onOpenHandler","onerror","_onErrorHandler","onclose","_onCloseHandler","fireQueue","length","data","shift","send","isString","message","JSON","stringify","deferred","resolve","notifyOpenCallbacks","event","i","call","notifyCloseCallbacks","notifyErrorCallbacks","onOpen","cb","push","onClose","onError","onMessage","callback","isFunction","Error","isDefined","filter","RegExp","fn","pattern","$applyAsync","code","indexOf","reconnect","applyAsyncOrDigest","args","arraySlice","arguments","apply","currentCallback","exec","close","bufferedAmount","cancelableify","promise","cancel","then","newPromise","reason","splice","reject","defer","isMocked","isConnected","mockSend","backoffDelay","_getBackoffDelay","backoffDelaySeconds","console","log","attempt","R","Math","random","T","F","N","M","floor","min","pow","state","objectDefineProperty","_internalConnectionState","forEach","pending","get","set","$WebSocketBackendProvider","$log","match","Socket","createWebSocketBackend","warn","Object","defineProperty","value","_typeof","Symbol","iterator","constructor","Client","client","e","window","WebSocket","MozWebSocket","noop","freeze","Array","slice","elt","len","from","Number","ceil","service"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"sources":["dist/angular-websocket.js"],"names":["global","factory","define","amd","exports","module","require","mod","angular","ws","angularWebsocket","this","_angular","_interopRequireDefault","obj","__esModule","default","$WebSocketProvider","$rootScope","$q","$timeout","$websocketBackend","$WebSocket","url","protocols","options","isObject","isArray","undefined","ssl","test","scope","rootScopeFailover","useApplyAsync","initialTimeout","maxTimeout","reconnectIfNotNormalClose","binaryType","_reconnectAttempts","sendQueue","onOpenCallbacks","onMessageCallbacks","onErrorCallbacks","onCloseCallbacks","objectFreeze","_readyStateConstants","_connect","_setInternalState","prototype","CONNECTING","OPEN","CLOSING","CLOSED","RECONNECT_ABORTED","_normalCloseCode","_reconnectableStatusCodes","safeDigest","autoApply","$$phase","$digest","bindToScope","self","$on","force","socket","onmessage","onopen","onerror","onclose","close","readyState","create","_angular2","bind","_onMessageHandler","_onOpenHandler","_onErrorHandler","_onCloseHandler","fireQueue","length","data","shift","send","isString","message","JSON","stringify","deferred","resolve","notifyOpenCallbacks","event","i","call","notifyCloseCallbacks","notifyErrorCallbacks","onOpen","cb","push","onClose","onError","onMessage","callback","isFunction","Error","isDefined","filter","RegExp","fn","pattern","$applyAsync","code","indexOf","reconnect","applyAsyncOrDigest","args","arraySlice","arguments","apply","currentCallback","exec","bufferedAmount","cancelableify","promise","cancel","then","newPromise","reason","splice","reject","defer","backoffDelay","_getBackoffDelay","backoffDelaySeconds","console","log","attempt","R","Math","random","T","F","N","M","floor","min","pow","state","objectDefineProperty","_internalConnectionState","forEach","pending","get","set","$WebSocketBackendProvider","$log","match","Socket","createWebSocketBackend","warn","Object","defineProperty","value","window","Client","client","e","WebSocket","MozWebSocket","noop","freeze","Array","slice","elt","len","from","Number","ceil","service"],"mappings":"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"}
\ No newline at end of file
diff --git a/example/howToTest/controller.js b/example/howToTest/controller.js
new file mode 100644
index 0000000..47390b4
--- /dev/null
+++ b/example/howToTest/controller.js
@@ -0,0 +1,25 @@
+angular.module("appToTest", ['ngWebSocket']).controller("ControllerToTest", ["$scope", "$websocket", function($scope, $websocket) {
+	var socket;
+	$scope.isConnected = false;
+
+	function initializeSocket() {
+		socket.onOpen(function() {
+			$scope.isConnected = true;
+		});
+		socket.onClose(function() {
+			$scope.isConnected = false;
+		});
+		socket.onMessage(function(message) {
+			$scope.lastReceivedMessage = JSON.parse(message.data);
+		});
+	}
+
+	$scope.connect = function() {
+		socket = $websocket("wss://foo");
+		initializeSocket();
+	};
+
+	$scope.sendMessage = function(sMessage) {
+		socket.send(sMessage);
+	};
+}]);
diff --git a/example/howToTest/controller.spec.js b/example/howToTest/controller.spec.js
new file mode 100644
index 0000000..a39cc6f
--- /dev/null
+++ b/example/howToTest/controller.spec.js
@@ -0,0 +1,69 @@
+describe("ControllerToTest", function() {
+	var controller, $scope, $websocketBackend, $timeout;
+
+	beforeEach(angular.mock.module('ngWebSocket', 'ngWebSocketMock'));
+
+	beforeEach(function() {
+		module("appToTest");
+		inject(function(_$websocketBackend_, _$controller_, _$timeout_) {
+			$websocketBackend = _$websocketBackend_;
+			$scope = {};
+      		controller = _$controller_('ControllerToTest', { $scope: $scope });
+      		$timeout = _$timeout_;
+		});
+
+		$websocketBackend.expectConnect("wss://foo");
+	});
+
+	afterEach(function() {
+		$websocketBackend.verifyNoOutstandingRequest();
+		$websocketBackend.verifyNoOutstandingExpectation();
+	});
+
+	function connect() {
+		$scope.connect();
+		$websocketBackend.flush();
+	}
+
+	it("should initiate a connection on connect", function() {
+		connect();
+	});
+
+	it("should react on an established connection", function() {
+		expect($scope.isConnected).toEqual(false);
+		connect();
+		expect($scope.isConnected).toEqual(true);
+	});
+
+	it("should react on a closing connection", function() {
+		connect();
+		$websocketBackend.fakeClose("wss://foo");
+		$websocketBackend.flush();
+		expect($scope.isConnected).toEqual(false);
+	});
+
+	it("should react on an incoming message", function() {
+		connect();
+		$websocketBackend.fakeMessage("wss://foo", "hello");
+		$websocketBackend.flush();
+		expect($scope.lastReceivedMessage).toEqual("hello");
+	});
+
+	it("should send a message to the socket", function() {
+		connect();
+		$websocketBackend.expectSend("wss://foo", "greetings");
+		$scope.sendMessage("greetings");
+		$websocketBackend.flush();
+	});
+
+	it("should reconnect after connection was closed", function() {
+		connect();
+		$websocketBackend.fakeClose("wss://foo", 4000);
+		$websocketBackend.flush();
+		expect($scope.isConnected).toEqual(false);
+		$websocketBackend.expectConnect("wss://foo");
+		$timeout.flush(90001);
+		$websocketBackend.flush();
+		expect($scope.isConnected).toEqual(true);
+	});
+});
\ No newline at end of file
diff --git a/example/howToTest/karma.conf.js b/example/howToTest/karma.conf.js
new file mode 100644
index 0000000..7fc7f6a
--- /dev/null
+++ b/example/howToTest/karma.conf.js
@@ -0,0 +1,65 @@
+// Karma configuration
+// Generated on Thu Dec 25 2014 14:12:24 GMT-0800 (PST)
+
+module.exports = function(config) {
+
+  var configuration = {
+
+    // base path, that will be used to resolve files and exclude
+    basePath: '',
+
+    // frameworks to use
+    frameworks: ['jasmine'],
+
+    // list of files / patterns to load in the browser
+    files: [
+      '../../bower_components/angular/angular.js',
+      '../../bower_components/angular-mocks/angular-mocks.js',
+      '../../dist/angular-websocket.js',
+      '../../dist/angular-websocket-mock.js',
+      './controller.js',
+      './controller.spec.js'
+    ],
+
+    // list of files to exclude
+    exclude: [
+
+    ],
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
+    reporters: ['progress'],
+
+    // web server port
+    port: 9876,
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_WARN,
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: false,
+
+    // Start these browsers, currently available:
+    // - Chrome
+    // - ChromeCanary
+    // - Firefox
+    // - Opera (has to be installed with `npm install karma-opera-launcher`)
+    // - Safari (only Mac; has to be installed with `npm install karma-safari-launcher`)
+    // - PhantomJS
+    // - IE (only Windows; has to be installed with `npm install karma-ie-launcher`)
+    browsers: ['PhantomJS'],
+
+    // If browser does not capture in given timeout [ms], kill it
+    captureTimeout: 60000,
+
+    // Continuous Integration mode
+    // if true, it capture browsers, run tests and exit
+    singleRun: true
+  };
+
+  config.set(configuration);
+};
diff --git a/example/howToTest/package.json b/example/howToTest/package.json
new file mode 100644
index 0000000..0e0458b
--- /dev/null
+++ b/example/howToTest/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "howToTest",
+  "scripts": {
+    "test": "karma start karma.conf.js"
+  }
+}
diff --git a/karma.conf.js b/karma.conf.js
index 2ff1c92..0d58c1c 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -17,7 +17,9 @@ module.exports = function(config) {
       'bower_components/angular-mocks/angular-mocks.js',
       'dist/angular-websocket.js',
       'dist/angular-websocket-mock.js',
-      'test/angular-websocket.spec.js'
+      'test/angular-websocket.spec.js',
+      'example/howToTest/controller.js',
+      'example/howToTest/controller.spec.js',
     ],
 
     // list of files to exclude
diff --git a/src/angular-websocket-mock.js b/src/angular-websocket-mock.js
index a4d663a..396a421 100644
--- a/src/angular-websocket-mock.js
+++ b/src/angular-websocket-mock.js
@@ -7,13 +7,19 @@ function $WebSocketBackend() {
   var pendingCloses = [];
   var sendQueue = [];
   var pendingSends = [];
+  var pendingMessages = [];
   var mock = false;
-
+  var existingMocks = {};
 
   function $MockWebSocket(url, protocols) {
+    this.url = url;
     this.protocols = protocols;
     this.ssl = /(wss)/i.test(this.url);
-
+    if(!existingMocks[url]) {
+      existingMocks[url] = [this];
+    } else {
+      existingMocks[url].push(this);
+    }
   }
 
   $MockWebSocket.prototype.send = function (msg) {
@@ -26,6 +32,19 @@ function $WebSocketBackend() {
     }
   };
 
+  this.fakeClose = function(url, code) {
+    closeQueue.push(url);
+    if(existingMocks[url]) {
+      existingMocks[url].map(function(mockSocket) {
+        mockSocket.close(code);
+      });
+    }
+  };
+
+  this.fakeMessage = function(url, data) {
+    pendingMessages.push({url: url, data: data});
+  };
+
   this.mock = function() {
     mock = true;
   };
@@ -38,8 +57,8 @@ function $WebSocketBackend() {
       return connectQueue.indexOf(url) > -1;
   };
 
-  $MockWebSocket.prototype.close = function () {
-    pendingCloses.push(true);
+  $MockWebSocket.prototype.close = function (code) {
+    pendingCloses.push({url: this.url, code: code ? code : 1000});
   };
 
   function createWebSocketBackend(url, protocols) {
@@ -57,19 +76,61 @@ function $WebSocketBackend() {
   this.create = createWebSocketBackend;
   this.createWebSocketBackend = createWebSocketBackend;
 
+  function callOpenCallbacks(url) {
+    existingMocks[url].map(function(socketMock) {
+      if(socketMock.onopen && typeof socketMock.onopen === "function") {
+        socketMock.onopen();
+      }
+    });
+  }
+
+  function callCloseCallbacks(url, code) {
+    existingMocks[url].map(function(socketMock) {
+      if(socketMock.onclose && typeof socketMock.onclose === "function") {
+        socketMock.onclose({code: code});
+      }
+    });
+  }
+
+  function callMessageCallbacks(url, data) {
+    if(existingMocks[url]) {
+      existingMocks[url].map(function(socketMock) {
+        if(socketMock.onmessage && typeof socketMock.onmessage === "function") {
+          socketMock.onmessage({data: JSON.stringify(data)});
+        }
+      });
+    }
+  }
+
+  function setReadyState(url, state) {
+    if(existingMocks[url]) {
+      existingMocks[url].map(function(socketMock) {
+        socketMock.readyState = state;
+      });
+    }
+  }
+
   this.flush = function () {
     var url, msg, config;
     while (url = pendingConnects.shift()) {
       var i = connectQueue.indexOf(url);
       if (i > -1) {
         connectQueue.splice(i, 1);
+        callOpenCallbacks(url);
+        setReadyState(url, 1);
       }
       // if (config && config.url) {
       // }
     }
 
-    while (pendingCloses.shift()) {
-      closeQueue.shift();
+    var pendingClose;
+    while (pendingClose = pendingCloses.shift()) {
+      var i = closeQueue.indexOf(pendingClose.url);
+      if(i > -1) {
+        closeQueue.splice(i, 1);
+        callCloseCallbacks(pendingClose.url, pendingClose.code);
+        setReadyState(pendingClose.url, 3);
+      }
     }
 
     while (msg = pendingSends.shift()) {
@@ -84,6 +145,10 @@ function $WebSocketBackend() {
         sendQueue.splice(j, 1);
       }
     }
+
+    while (msg = pendingMessages.shift()) {
+      callMessageCallbacks(msg.url, msg.data);
+    }
   };
 
   this.expectConnect = function (url, protocols) {
@@ -91,8 +156,8 @@ function $WebSocketBackend() {
     // connectQueue.push({url: url, protocols: protocols});
   };
 
-  this.expectClose = function () {
-    closeQueue.push(true);
+  this.expectClose = function (url) {
+    closeQueue.push(url);
   };
 
   this.expectSend = function (msg) {
diff --git a/src/angular-websocket.js b/src/angular-websocket.js
index 3f4e919..3456a10 100644
--- a/src/angular-websocket.js
+++ b/src/angular-websocket.js
@@ -85,7 +85,6 @@ function $WebSocketProvider($rootScope, $q, $timeout, $websocketBackend) {
 
   }
 
-
   $WebSocket.prototype._readyStateConstants = {
     'CONNECTING': 0,
     'OPEN': 1,
@@ -120,6 +119,13 @@ function $WebSocketProvider($rootScope, $q, $timeout, $websocketBackend) {
   };
 
   $WebSocket.prototype._connect = function _connect(force) {
+    if(this.socket) {
+      this.socket.onmessage = null;
+      this.socket.onopen  = null;
+      this.socket.onerror = null;
+      this.socket.onclose = null;
+      this.socket.close();
+    }
     if (force || !this.socket || this.socket.readyState !== this._readyStateConstants.OPEN) {
       this.socket = $websocketBackend.create(this.url, this.protocols);
       this.socket.onmessage = angular.bind(this, this._onMessageHandler);
@@ -299,11 +305,6 @@ function $WebSocketProvider($rootScope, $q, $timeout, $websocketBackend) {
       return self;
     }
 
-    if ($websocketBackend.isMocked && $websocketBackend.isMocked() &&
-            $websocketBackend.isConnected(this.url)) {
-      this._onMessageHandler($websocketBackend.mockSend());
-    }
-
     return promise;
   };
 
diff --git a/test/angular-websocket.spec.js b/test/angular-websocket.spec.js
index a5e4f4e..d6c8527 100644
--- a/test/angular-websocket.spec.js
+++ b/test/angular-websocket.spec.js
@@ -154,6 +154,11 @@ describe('angular-websocket', function() {
         expect(typeof ws.socket.onerror).toBe('function');
         expect(typeof ws.socket.onclose).toBe('function');
       });
+
+      it('should set readyState', function() {
+        $websocketBackend.flush();
+        expect(ws.readyState).toEqual(ws._readyStateConstants.OPEN);
+      });
     });
 
 
@@ -174,7 +179,7 @@ describe('angular-websocket', function() {
       });
 
       it('should call close on the underlying socket', function() {
-        $websocketBackend.expectClose();
+        $websocketBackend.expectClose(url);
         ws.close();
       });
 
@@ -186,10 +191,17 @@ describe('angular-websocket', function() {
 
 
       it('should accept a force param to close the socket even if bufferedAmount is greater than 0', function() {
-        $websocketBackend.expectClose();
+        $websocketBackend.expectClose(url);
         ws.socket.bufferedAmount = 5;
         ws.close(true);
       });
+
+      it('should set readyState', function() {
+        $websocketBackend.expectClose(url);
+        ws.close();
+        $websocketBackend.flush();
+        expect(ws.readyState).toEqual(ws._readyStateConstants.CLOSED);
+      });
     });
 
 
@@ -199,7 +211,7 @@ describe('angular-websocket', function() {
         $websocketBackend.expectConnect(url);
 
         var ws = $websocket(url);
-        $websocketBackend.expectClose();
+        $websocketBackend.expectClose(url);
         ws.reconnect();
 
         $websocketBackend.flush();
@@ -918,6 +930,46 @@ describe('angular-websocket', function() {
 
    }); // end ._onErrorHandler()
 
+   describe('eventHandlers', function() {
+    var url, ws;
+
+     beforeEach(function() {
+       url = 'ws://foo';
+       $websocketBackend.expectConnect(url);
+       ws = $websocket(url);
+     });
+
+     it('should be automatically called on open', function() {
+       var spy = jasmine.createSpy('callback');
+       ws.onOpenCallbacks.push(spy);
+       $websocketBackend.flush();
+       expect(spy).toHaveBeenCalled();
+     });
+
+     it('should be automatically called on close', function() {
+       var spy = jasmine.createSpy('callback');
+       ws.onCloseCallbacks.push(spy);
+       $websocketBackend.expectClose(url);
+       ws.close();
+       $websocketBackend.flush();
+       expect(spy).toHaveBeenCalled();
+     });
+
+     it("should be automatically called on fake close", function() {
+       var spy = jasmine.createSpy('callback');
+       ws.onCloseCallbacks.push(spy);
+       $websocketBackend.fakeClose(url);
+       $websocketBackend.flush();
+       expect(spy).toHaveBeenCalled();
+     });
 
+     it("should be automatically called on fake send", function() {
+       var spy = jasmine.createSpy('callback');
+       ws.onMessage(spy);
+       $websocketBackend.fakeMessage(url, {data: "test"});
+       $websocketBackend.flush();
+       expect(spy).toHaveBeenCalled();
+     });
+   });
   }); // end $websocketBackend
 }); // end $websocket