set cluster to false again

test/mocha.opts

@@ -1,3 +1,4 @@
 --reporter dot
 --timeout 25000
 --exit
+--bail

test/mocks/databasemock.js

@@ -35,7 +35,7 @@ nconf.defaults({
 
 if (!nconf.get('isCluster')) {
 	nconf.set('isPrimary', 'true');
-	nconf.set('isCluster', 'true');
+	nconf.set('isCluster', 'false');
 }
 
 var dbType = nconf.get('database');

test/pubsub.js

@@ -10,10 +10,11 @@ describe('pubsub', function () {
 	it('should use singleHostCluster', function (done) {
 		var oldValue = nconf.get('singleHostCluster');
 		nconf.set('singleHostCluster', true);
+		nconf.set('isCluster', true);
 		pubsub.on('testEvent', function (message) {
 			assert.equal(message.foo, 1);
 			nconf.set('singleHostCluster', oldValue);
-
+			nconf.set('isCluster', 'false');
 			pubsub.removeAllListeners('testEvent');
 			done();
 		});
@@ -23,9 +24,11 @@ describe('pubsub', function () {
 	it('should use the current database\'s pubsub', function (done) {
 		var oldValue = nconf.get('singleHostCluster');
 		nconf.set('singleHostCluster', false);
+		nconf.set('isCluster', true);
 		pubsub.on('testEvent', function (message) {
 			assert.equal(message.foo, 1);
 			nconf.set('singleHostCluster', oldValue);
+			nconf.set('isCluster', 'false');
 			pubsub.removeAllListeners('testEvent');
 			done();
 		});