diff --git a/config/environments/development.js b/config/environments/development.js
index cae6586e..945b2ec3 100644
--- a/config/environments/development.js
+++ b/config/environments/development.js
@@ -14,7 +14,6 @@ var config = {
         extent: "-180,-90,180,90",
         srid: 4326,
         */
-        /* max_size: 0, */ /* see https://github.com/Vizzuality/Windshaft-cartodb/issues/16 */
         simplify: true
     }
     ,redis: {
diff --git a/config/environments/test.js b/config/environments/test.js
index 1d16cdbf..50452160 100644
--- a/config/environments/test.js
+++ b/config/environments/test.js
@@ -3,7 +3,7 @@ var config = {
     ,port: 8888
     ,host: '127.0.0.1'
     ,enable_cors: true
-    ,cache_enabled: true
+    ,cache_enabled: false
     ,postgres: {
         user: "tileuser",
         host: '127.0.0.1',
diff --git a/lib/cartodb/cache_validator.js b/lib/cartodb/cache_validator.js
index 30cbb601..479568f6 100644
--- a/lib/cartodb/cache_validator.js
+++ b/lib/cartodb/cache_validator.js
@@ -38,7 +38,7 @@ function generateCacheChannel(req, callback){
         if (!_.isNull(channelCache[sql_md5]) && !_.isUndefined(channelCache[sql_md5])) {
             callback(channelCache[sql_md5]);
         } else{
-            // strip out windshaft/mapnik inserted sql
+            // strip out windshaft/mapnik inserted sql if present
             var sql = req.params.sql.match(/^\((.*)\)\sas\scdbq$/);
             sql = (sql != null) ? sql[1] : req.params.sql;
 
diff --git a/test/acceptance/server.js b/test/acceptance/server.js
index a05b3e13..423f050b 100644
--- a/test/acceptance/server.js
+++ b/test/acceptance/server.js
@@ -193,4 +193,8 @@ tests["get'ing a tile with default style and complex sql should return a constra
         status: 200,
         headers: { 'Content-Type': 'image/png' }
     });
-}; 
+};
+
+
+
+