Remove beforeEach and afterEach, in combination with suite they are

triggered for every single test even outside of the suite they were
invoked in.

Makefile

@@ -18,7 +18,9 @@ config/environments/test.js: config.status--test
 check-local: config/environments/test.js
 	./run_tests.sh ${RUNTESTFLAGS} \
 	test/unit/cartodb/*.js \
-    test/acceptance/*.js 
+	test/unit/cartodb/cache/model/*.js \
+	test/acceptance/*.js \
+	test/acceptance/cache/*.js
 
 check-submodules:
 	PATH="$$PATH:$(srcdir)/node_modules/.bin/"; \

test/acceptance/cache/surrogate_keys_invalidation.js

@@ -16,9 +16,13 @@ var serverOptions = ServerOptions();
 
 suite('templates surrogate keys', function() {
 
-    var redisClient,
+    var sqlApiServer;
-        sqlApiServer,
+    var redisClient = redis.createClient(global.environment.redis.port);
-        server;
+
+    // Enable Varnish purge for tests
+    serverOptions.varnish_purge_enabled = true;
+
+    var server = new CartodbWindshaft(serverOptions);
 
     var templateOwner = 'localhost',
         templateName = 'acceptance',
@@ -45,19 +49,12 @@ suite('templates surrogate keys', function() {
         expectedBody = { template_id: expectedTemplateId };
 
     suiteSetup(function(done) {
-        // Enable Varnish purge for tests
-        serverOptions.varnish_purge_enabled = true;
-
-        server = new CartodbWindshaft(serverOptions);
-
         sqlApiServer = new SqlApiEmulator(global.environment.sqlapi.port, done);
-
-        redisClient = redis.createClient(global.environment.redis.port);
     });
 
     var surrogateKeysCacheInvalidateFn = SurrogateKeysCache.prototype.invalidate;
 
-    beforeEach(function(done) {
+    function createTemplate(callback) {
         var postTemplateRequest = {
             url: '/tiles/template?api_key=1234',
             method: 'POST',
@@ -90,10 +87,10 @@ suite('templates surrogate keys', function() {
                 return true;
             },
             function finish(err) {
-                done(err);
+                callback(err);
             }
         );
-    });
+    }
 
     test("update template calls surrogate keys invalidation", function(done) {
         var cacheEntryKey;
@@ -104,7 +101,13 @@ suite('templates surrogate keys', function() {
         };
 
         Step(
-            function putValidTemplate() {
+            function createTemplateToUpdate() {
+                createTemplate(this);
+            },
+            function putValidTemplate(err) {
+                if (err) {
+                    throw err;
+                }
                 var updateTemplateRequest = {
                     url: '/tiles/template/' + expectedTemplateId + '/?api_key=1234',
                     method: 'PUT',
@@ -163,7 +166,13 @@ suite('templates surrogate keys', function() {
         };
 
         Step(
-            function putValidTemplate() {
+            function createTemplateToDelete() {
+                createTemplate(this);
+            },
+            function deleteValidTemplate(err) {
+                if (err) {
+                    throw err;
+                }
                 var deleteTemplateRequest = {
                     url: '/tiles/template/' + expectedTemplateId + '/?api_key=1234',
                     method: 'DELETE',
@@ -199,12 +208,10 @@ suite('templates surrogate keys', function() {
         );
     });
 
-    afterEach(function(done) {
-        SurrogateKeysCache.prototype.invalidate = surrogateKeysCacheInvalidateFn;
-        done();
-    });
-
     suiteTeardown(function(done) {
+        SurrogateKeysCache.prototype.invalidate = surrogateKeysCacheInvalidateFn;
+        // Enable Varnish purge for tests
+        serverOptions.varnish_purge_enabled = false;
         sqlApiServer.close(done);
     });
 

test/acceptance/health_check.js

@@ -7,7 +7,7 @@ var server = new CartodbWindshaft(serverOptions);
 
 suite('health checks', function () {
 
-    beforeEach(function (done) {
+    function resetHealthConfig() {
         global.environment.health = {
             enabled: true,
             username: 'localhost',
@@ -15,8 +15,7 @@ suite('health checks', function () {
             x: 0,
             y: 0
         };
-        done();
+    }
-    });
 
     var healthCheckRequest = {
         url: '/health',
@@ -27,13 +26,14 @@ suite('health checks', function () {
     };
 
     test('returns 200 and ok=true with enabled configuration', function (done) {
+        resetHealthConfig();
+
         assert.response(server,
             healthCheckRequest,
             {
                 status: 200
             },
             function (res, err) {
-              console.log(res.body);
                 assert.ok(!err);
 
                 var parsed = JSON.parse(res.body);
@@ -47,6 +47,8 @@ suite('health checks', function () {
     });
 
     test('fails for invalid user because it is not in redis', function (done) {
+        resetHealthConfig();
+
         global.environment.health.username = 'invalid';
 
         assert.response(server,