diff --git a/lib/memcached.js b/lib/memcached.js
index <HASH>..<HASH> 100644
--- a/lib/memcached.js
+++ b/lib/memcached.js
@@ -596,8 +596,10 @@ Client.config = {
     }
   };
 
-  memcached.delegateCallback = function(master, err, data, cb){
+  memcached.delegateCallback = function(){
         this.activeQueries--;
+        var master = arguments[0];
+        var cb = arguments[arguments.length-1];
         var args = Array.prototype.slice.call(arguments, 1, arguments.length-1);
         cb.apply(master, args);
   };
diff --git a/test/common.js b/test/common.js
index <HASH>..<HASH> 100644
--- a/test/common.js
+++ b/test/common.js
@@ -14,7 +14,7 @@
  * @type {Object}
  * @api public
  */
-var testMemcachedHost = process.env.MEMCACHED__HOST || '10.211.55.5';
+var testMemcachedHost = '127.0.0.1';
 
 exports.servers = {
     single: testMemcachedHost + ':11211'
Fixed a bug in multi caused by the new queue limit. Modified mocha tests to point locally by default.