diff --git a/test/tests/functional/mongos_mocks/multiple_proxies_tests.js b/test/tests/functional/mongos_mocks/multiple_proxies_tests.js
index 052c82da9..e736f9dba 100644
--- a/test/tests/functional/mongos_mocks/multiple_proxies_tests.js
+++ b/test/tests/functional/mongos_mocks/multiple_proxies_tests.js
@@ -201,7 +201,7 @@ describe('Mongos Multiple Proxies (mocks)', function() {
                   expect(___err).to.be.null;
                   expect(___r.connection.port).to.equal(11003);
 
-                  mock.cleanup([server2, mongos1, mongos2], () => done());
+                  mock.cleanup([server, server2, mongos1, mongos2], () => done());
                 });
               });
             });
diff --git a/test/tests/functional/mongos_mocks/single_proxy_connection_tests.js b/test/tests/functional/mongos_mocks/single_proxy_connection_tests.js
index 220f5d19a..6f54dd8dd 100644
--- a/test/tests/functional/mongos_mocks/single_proxy_connection_tests.js
+++ b/test/tests/functional/mongos_mocks/single_proxy_connection_tests.js
@@ -71,7 +71,7 @@ describe('Mongos Single Proxy Connection (mocks)', function() {
       });
 
       // Attempt to connect
-      var _server = new Mongos([{ host: 'localhost', port: 52017 }], {
+      var mongos = new Mongos([{ host: 'localhost', port: 52017 }], {
         connectionTimeout: 3000,
         socketTimeout: 1000,
         haInterval: 500,
@@ -82,23 +82,23 @@ describe('Mongos Single Proxy Connection (mocks)', function() {
       var finished = false;
 
       // Add event listeners
-      _server.once('connect', function() {
+      mongos.once('connect', function() {
         // Run an interval
         var intervalId = setInterval(function() {
-          _server.insert('test.test', [{ created: new Date() }], function(err, r) {
+          mongos.insert('test.test', [{ created: new Date() }], function(err, r) {
             if (r && !finished) {
               finished = true;
               clearInterval(intervalId);
               expect(r.connection.port).to.equal(52017);
 
-              mock.cleanup([server], () => done());
+              mock.cleanup([mongos, server], () => done());
             }
           });
         }, 500);
       });
 
-      _server.on('error', done);
-      _server.connect();
+      mongos.on('error', done);
+      mongos.connect();
     }
   });
 
@@ -170,7 +170,7 @@ describe('Mongos Single Proxy Connection (mocks)', function() {
       });
 
       // Attempt to connect
-      var _server = new Mongos([{ host: 'localhost', port: 52018 }], {
+      var mongos = new Mongos([{ host: 'localhost', port: 52018 }], {
         connectionTimeout: 30000,
         socketTimeout: 30000,
         haInterval: 500,
@@ -178,9 +178,9 @@ describe('Mongos Single Proxy Connection (mocks)', function() {
       });
 
       // Add event listeners
-      _server.once('connect', function() {
+      mongos.once('connect', function() {
         // Execute find
-        var cursor = _server.cursor('test.test', {
+        var cursor = mongos.cursor('test.test', {
           find: 'test',
           query: {},
           batchSize: 2
@@ -195,14 +195,14 @@ describe('Mongos Single Proxy Connection (mocks)', function() {
             expect(_err).to.not.exist;
             expect(_d).to.exist;
 
-            mock.cleanup([server], () => done());
+            mock.cleanup([mongos, server], () => done());
           });
         });
       });
 
-      _server.on('error', done);
+      mongos.on('error', done);
       setTimeout(function() {
-        _server.connect();
+        mongos.connect();
       }, 100);
     }
   });
diff --git a/test/tests/functional/rs_mocks/primary_loses_network_tests.js b/test/tests/functional/rs_mocks/primary_loses_network_tests.js
index 4ba2075a3..2a0dbf23e 100644
--- a/test/tests/functional/rs_mocks/primary_loses_network_tests.js
+++ b/test/tests/functional/rs_mocks/primary_loses_network_tests.js
@@ -6,7 +6,7 @@ var assign = require('../../../../lib/utils').assign,
   ConnectionSpy = require('../shared').ConnectionSpy;
 
 describe('ReplSet Primary Loses Network (mocks)', function() {
-  it('Recover from Primary loosing network connectivity', {
+  it('Recover from Primary losing network connectivity', {
     metadata: {
       requires: {
         generators: true,
@@ -150,7 +150,7 @@ describe('ReplSet Primary Loses Network (mocks)', function() {
           server.on('joined', function(__type, __server) {
             if (__type === 'primary' && __server.name === 'localhost:32002') {
               mock.cleanup(
-                [primaryServer, firstSecondaryServer, secondSecondaryServer, __server],
+                [server, primaryServer, firstSecondaryServer, secondSecondaryServer],
                 spy,
                 () => done()
               );
diff --git a/test/tests/functional/single_mocks/timeout_tests.js b/test/tests/functional/single_mocks/timeout_tests.js
index 01719a53d..19ad47674 100644
--- a/test/tests/functional/single_mocks/timeout_tests.js
+++ b/test/tests/functional/single_mocks/timeout_tests.js
@@ -2,7 +2,7 @@
 var expect = require('chai').expect,
   assign = require('../../../../lib/utils').assign,
   co = require('co'),
-  mockupdb = require('../../../mock');
+  mock = require('../../../mock');
 
 describe('Single Timeout (mocks)', function() {
   it('Should correctly timeout socket operation and then correctly re-execute', {
@@ -40,7 +40,7 @@ describe('Single Timeout (mocks)', function() {
 
       // Boot the mock
       co(function*() {
-        server = yield mockupdb.createServer(37019, 'localhost');
+        server = yield mock.createServer(37019, 'localhost');
 
         server.setMessageHandler(request => {
           var doc = request.document;
@@ -94,7 +94,7 @@ describe('Single Timeout (mocks)', function() {
                   finished = true;
                   expect(_r.connection.port).to.equal('37019');
                   replset.destroy({ force: true });
-                  done();
+                  mock.cleanup([server], () => done());
                 } else {
                   wait();
                 }
@@ -149,7 +149,7 @@ describe('Single Timeout (mocks)', function() {
       // Boot the mock
       var __server;
       co(function*() {
-        __server = yield mockupdb.createServer(37017, 'localhost', {
+        __server = yield mock.createServer(37017, 'localhost', {
           onRead: function(_server, connection) {
             // Force EPIPE error
             if (currentStep === 1) {
@@ -268,8 +268,7 @@ describe('Single Timeout (mocks)', function() {
           expect(r).to.exist;
           expect(brokenPipe).to.equal(true);
           _server.destroy();
-          __server.destroy();
-          done();
+          mock.cleanup([__server, _server], () => done());
         });
       });
 
@@ -315,7 +314,7 @@ describe('Single Timeout (mocks)', function() {
 
         // Boot the mock
         co(function*() {
-          server = yield mockupdb.createServer(37019, 'localhost');
+          server = yield mock.createServer(37019, 'localhost');
 
           server.setMessageHandler(request => {
             if (currentStep === 1) {