Merge pull request #741 from CartoDB/3.6.6-fix-pg-vulnerability

3.6.6 fix pg vulnerability
Adding a new cartodb-psql fixing a pg vulnerability
2017-09-01 17:13:35 +02:00 · 2017-09-01 13:30:30 +02:00
64 changed files with 662 additions and 3222 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,6 @@ tools/munin/windshaft.conf
 logs/
 pids/
 redis.pid
-*.log
+test.log
+npm-debug.log
 coverage/
-.DS_Store
--- a/.jshintrc
+++ b/.jshintrc
@@ -40,7 +40,7 @@
    "debug"         : false,     // true: Allow debugger statements e.g. browser breakpoints.
 //    "eqnull"        : false,     // true: Tolerate use of `== null`
 //    "es5"           : false,     // true: Allow ES5 syntax (ex: getters and setters)
-    "esnext"        : true,     // true: Allow ES.next (ES6) syntax (ex: `const`)
+//    "esnext"        : false,     // true: Allow ES.next (ES6) syntax (ex: `const`)
 //    "moz"           : false,     // true: Allow Mozilla specific syntax (extends and overrides esnext features)
 //    // (ex: `for each`, multiple try/catch, function expression…)
 //    "evil"          : false,     // true: Tolerate use of `eval` and `new Function()`
--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 1. Test (make clean all check), fix if broken before proceeding
 2. Ensure proper version in package.json
 3. Ensure NEWS section exists for the new version, review it, add release date
-4. If there are modified dependencies in package.json, update them with `yarn upgrade {{package_name}}@{{version}}`
+4. Recreate yarn.lock with: `yarn upgrade`
 5. Commit package.json, yarn.lock, NEWS
 6. git tag -a Major.Minor.Patch # use NEWS section as content
 7. Stub NEWS/package for next version
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,89 +1,10 @@
 # Changelog

-## 3.9.8
-Released 2017-07-21
-
- - Upgrades windshaft to [3.2.2](https://github.com/CartoDB/windshaft/releases/tag/3.2.2).
-
-
-## 3.9.7
-Released 2017-07-20
-
-Bug fixes:
- - Respond with 204 (No content) when vector tile has no data #712
+## 3.6.7
+Released 2017-09-01

 Announcements:
- - Upgrades turbo-carto to [0.19.2](https://github.com/CartoDB/turbo-carto/releases/tag/0.19.2)
-
-
-## 3.9.6
-Released 2017-07-11
-
- - Dataviews: support for aggregation in search results #708
-
-
-## 3.9.5
-Released 2017-06-27
-
- - Dataviews: support special numeric values (±Infinity, NaN) #700
-
-
-## 3.9.4
-Released 2017-06-22
-
-Announcements:
- - Upgrades camshaft to [0.55.6](https://github.com/CartoDB/camshaft/releases/tag/0.55.6).
-
-## 3.9.3
-Released 2017-06-16
-
-Announcements:
- - Upgrades camshaft to [0.55.5](https://github.com/CartoDB/camshaft/releases/tag/0.55.5).
-
-## 3.9.2
-Released 2017-06-16
-
-Announcements:
- - Upgrades camshaft to [0.55.4](https://github.com/CartoDB/camshaft/releases/tag/0.55.4).
-
-## 3.9.1
-Released 2017-06-06
-
-Announcements:
- - Upgrades camshaft to [0.55.3](https://github.com/CartoDB/camshaft/releases/tag/0.55.3).
-
-
-## 3.9.0
-Released 2017-05-31
-
-Announcements:
- - Upgrades windshaft to [3.2.1](https://github.com/CartoDB/windshaft/releases/tag/3.2.1).
- - Add support to retrieve info about layer stats in map instantiation.
- - Upgrades camshaft to [0.55.2](https://github.com/CartoDB/camshaft/releases/tag/0.55.2).
- - Remove promise polyfill from turbo-carto adapter
-
-
-## 3.8.0
-Released 2017-05-22
-
-Announcements:
- - Upgrades camshaft to [0.55.0](https://github.com/CartoDB/camshaft/releases/tag/0.55.0).
- - Upgrades turbo-carto to [0.19.1](https://github.com/CartoDB/turbo-carto/releases/tag/0.19.1)
-
-
-## 3.7.1
-Released 2017-05-18
-
-Bug fixes:
- - Fix buffersize assignment when is not defined in requested mapconfig.
-
-
-## 3.7.0
-Released 2017-05-18
-
-Announcements:
- Manage multiple values of buffer-size for different formats
- Upgrades windshaft to [3.2.0](https://github.com/CartoDB/windshaft/releases/tag/3.2.0).
+ - Adding a new cartodb-psql fixing a pg vulnerability.


 ## 3.6.6
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -324,7 +324,8 @@ var config = {
        // whether the affected tables for a given SQL must query directly postgresql or use the SQL API
        cdbQueryTablesFromPostgres: true,
        // whether in mapconfig is available stats & metadata for each layer
-        layerStats: true
+        layerMetadata: true
+
    }
 };

--- a/config/environments/production.js.example
+++ b/config/environments/production.js.example
@@ -324,7 +324,7 @@ var config = {
        // whether the affected tables for a given SQL must query directly postgresql or use the SQL API
        cdbQueryTablesFromPostgres: true,
        // whether in mapconfig is available stats & metadata for each layer
-        layerStats: false
+        layerMetadata: false
    }
 };

--- a/config/environments/staging.js.example
+++ b/config/environments/staging.js.example
@@ -324,7 +324,7 @@ var config = {
        // whether the affected tables for a given SQL must query directly postgresql or use the SQL API
        cdbQueryTablesFromPostgres: true,
        // whether in mapconfig is available stats & metadata for each layer
-        layerStats: true
+        layerMetadata: true
    }
 };

--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -318,7 +318,7 @@ var config = {
        // whether the affected tables for a given SQL must query directly postgresql or use the SQL API
        cdbQueryTablesFromPostgres: true,
        // whether in mapconfig is available stats & metadata for each layer
-        layerStats: true
+        layerMetadata: true
    }
 };

--- a/lib/cartodb/backends/dataview.js
+++ b/lib/cartodb/backends/dataview.js
@@ -43,19 +43,53 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
            ownFilter = !!ownFilter;

            var query = (ownFilter) ? dataviewDefinition.sql.own_filter_on : dataviewDefinition.sql.own_filter_off;
+            var sourceId =  dataviewDefinition.source.id; // node.id
+            var layer = _.find(mapConfig.obj().layers, function(l) {
+                return l.options.source && (l.options.source.id === sourceId);
+            });
+            var queryRewriteData = layer && layer.options.query_rewrite_data;
+            if (queryRewriteData && dataviewDefinition.node.type === 'source') {
+                queryRewriteData = _.extend({}, queryRewriteData, {
+                    filters: dataviewDefinition.node.filters,
+                    unfiltered_query: dataviewDefinition.sql.own_filter_on
+                });
+            }
+
            if (params.bbox) {
                var bboxFilter = new BBoxFilter({column: 'the_geom_webmercator', srid: 3857}, {bbox: params.bbox});
                query = bboxFilter.sql(query);
+                if ( queryRewriteData ) {
+                    var bbox_filter_definition = {
+                        type: 'bbox',
+                        options: {
+                            column: 'the_geom_webmercator',
+                            srid: 3857
+                        },
+                        params: {
+                            bbox: params.bbox
+                        }
+                    };
+                    queryRewriteData = _.extend(queryRewriteData, { bbox_filter: bbox_filter_definition });
+                }
            }

-            var queryRewriteData = getQueryRewriteData(mapConfig, dataviewDefinition, params);
-
            var dataviewFactory = DataviewFactoryWithOverviews.getFactory(
                overviewsQueryRewriter, queryRewriteData, { bbox: params.bbox }
            );

+            var overrideParams = _.reduce(_.pick(params, 'start', 'end', 'bins'),
+                function castNumbers(overrides, val, k) {
+                    if (!Number.isFinite(+val)) {
+                        throw new Error('Invalid number format for parameter \'' + k + '\'');
+                    }
+                    overrides[k] = +val;
+                    return overrides;
+                },
+                {ownFilter: ownFilter}
+            );
+
            var dataview = dataviewFactory.getDataview(query, dataviewDefinition);
-            dataview.getResult(pg, getOverrideParams(params, ownFilter), this);
+            dataview.getResult(pg, overrideParams, this);
        },
        function returnCallback(err, result) {
            return callback(err, result);
@@ -63,49 +97,6 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
    );
 };

-function getQueryRewriteData(mapConfig, dataviewDefinition, params) {
-    var sourceId = dataviewDefinition.source.id; // node.id
-    var layer = _.find(mapConfig.obj().layers, function(l) {
-        return l.options.source && (l.options.source.id === sourceId);
-    });
-    var queryRewriteData = layer && layer.options.query_rewrite_data;
-    if (queryRewriteData && dataviewDefinition.node.type === 'source') {
-        queryRewriteData = _.extend({}, queryRewriteData, {
-            filters: dataviewDefinition.node.filters,
-            unfiltered_query: dataviewDefinition.sql.own_filter_on
-        });
-    }
-
-    if (params.bbox && queryRewriteData) {
-        var bbox_filter_definition = {
-            type: 'bbox',
-            options: {
-                column: 'the_geom_webmercator',
-                srid: 3857
-            },
-            params: {
-                bbox: params.bbox
-            }
-        };
-        queryRewriteData = _.extend(queryRewriteData, { bbox_filter: bbox_filter_definition });
-    }
-
-    return queryRewriteData;
-}
-
-function getOverrideParams(params, ownFilter) {
-    return _.reduce(_.pick(params, 'start', 'end', 'bins'),
-        function castNumbers(overrides, val, k) {
-            if (!Number.isFinite(+val)) {
-                throw new Error('Invalid number format for parameter \'' + k + '\'');
-            }
-            overrides[k] = +val;
-            return overrides;
-        },
-        {ownFilter: ownFilter}
-    );
-}
-
 DataviewBackend.prototype.search = function (mapConfigProvider, user, params, callback) {
    var dataviewName = params.dataviewName;

--- a/lib/cartodb/backends/layer-stats/empty-layer-stats.js
+++ b/lib/cartodb/backends/layer-stats/empty-layer-stats.js
@@ -1,16 +0,0 @@
-function EmptyLayerStats(types) {
-    this._types = types || {};
-}
-
-EmptyLayerStats.prototype.is = function (type) {
-    return this._types[type] ? this._types[type] : false;
-};
-
-EmptyLayerStats.prototype.getStats =
-function (layer, dbConnection, callback) {
-    setImmediate(function() {
-        callback(null, {});
-    });
-};
-
-module.exports = EmptyLayerStats;
--- a/lib/cartodb/backends/layer-stats/factory.js
+++ b/lib/cartodb/backends/layer-stats/factory.js
@@ -1,23 +0,0 @@
-var LayerStats = require('./layer-stats');
-var EmptyLayerStats = require('./empty-layer-stats');
-var MapnikLayerStats = require('./mapnik-layer-stats');
-var TorqueLayerStats = require('./torque-layer-stats');
-
-module.exports = function LayerStatsFactory(type) {
-    var layerStatsIterator = [];
-    var selectedType = type || 'ALL';
-
-    if (selectedType === 'ALL') {
-        layerStatsIterator.push(new EmptyLayerStats({ http: true, plain: true }));
-        layerStatsIterator.push(new MapnikLayerStats());
-        layerStatsIterator.push(new TorqueLayerStats());
-    } else if (selectedType === 'mapnik') {
-        layerStatsIterator.push(new EmptyLayerStats({ http: true, plain: true, torque: true }));
-        layerStatsIterator.push(new MapnikLayerStats());
-    } else if (selectedType === 'torque') {
-        layerStatsIterator.push(new EmptyLayerStats({ http: true, plain: true, mapnik: true }));
-        layerStatsIterator.push(new TorqueLayerStats());
-    }
-
-    return new LayerStats(layerStatsIterator);
-};
--- a/lib/cartodb/backends/layer-stats/layer-stats.js
+++ b/lib/cartodb/backends/layer-stats/layer-stats.js
@@ -1,45 +0,0 @@
-var queue = require('queue-async');
-
-function LayerStats(layerStatsIterator) {
-    this.layerStatsIterator = layerStatsIterator;
-}
-
-LayerStats.prototype.getStats = function (mapConfig, dbConnection, callback) {
-    var self = this;
-    var stats = [];
-
-    if (!mapConfig.getLayers().length) {
-        return callback(null, stats);
-    }
-    var metaQueue = queue(mapConfig.getLayers().length);
-    mapConfig.getLayers().forEach(function (layer, layerId) {
-        var layerType = mapConfig.layerType(layerId);
-
-        for (var i = 0; i < self.layerStatsIterator.length; i++) {
-            if (self.layerStatsIterator[i].is(layerType)) {
-                var getStats = self.layerStatsIterator[i].getStats.bind(self.layerStatsIterator[i]);
-                metaQueue.defer(getStats, layer, dbConnection);
-                break;
-            }
-        }
-    });
-
-    metaQueue.awaitAll(function (err, results) {
-        if (err) {
-            return callback(err);
-        }
-
-        if (!results) {
-            return callback(null, null);
-        }
-
-        mapConfig.getLayers().forEach(function (layer, layerIndex) {
-            stats[layerIndex] = results[layerIndex];
-        });
-
-        return callback(err, stats);
-    });
-
-};
-
-module.exports = LayerStats;
--- a/lib/cartodb/backends/layer-stats/mapnik-layer-stats.js
+++ b/lib/cartodb/backends/layer-stats/mapnik-layer-stats.js
@@ -1,28 +0,0 @@
-var queryUtils = require('../../utils/query-utils');
-
-function MapnikLayerStats () {
-    this._types = {
-        mapnik: true,
-        cartodb: true
-    };
-}
-
-MapnikLayerStats.prototype.is = function (type) {
-    return this._types[type] ? this._types[type] : false;
-};
-
-MapnikLayerStats.prototype.getStats =
-function (layer, dbConnection, callback) {
-    var queryRowCountSql = queryUtils.getQueryRowCount(layer.options.sql);
-    // This query would gather stats for postgresql table if not exists
-    dbConnection.query(queryRowCountSql, function (err, res) {
-        if (err) {
-            return callback(null, {estimatedFeatureCount: -1});
-        } else {
-            // We decided that the relation is 1 row == 1 feature
-            return callback(null, {estimatedFeatureCount: res.rows[0].rows});
-        }
-    });
-};
-
-module.exports = MapnikLayerStats;
--- a/lib/cartodb/backends/layer-stats/torque-layer-stats.js
+++ b/lib/cartodb/backends/layer-stats/torque-layer-stats.js
@@ -1,16 +0,0 @@
-function TorqueLayerStats() {
-    this._types = {
-        torque: true
-    };
-}
-
-TorqueLayerStats.prototype.is = function (type) {
-    return this._types[type] ? this._types[type] : false;
-};
-
-TorqueLayerStats.prototype.getStats =
-function (layer, dbConnection, callback) {
-    return callback(null, {});
-};
-
-module.exports = TorqueLayerStats;
--- a/lib/cartodb/backends/stats.js
+++ b/lib/cartodb/backends/stats.js
@@ -1,16 +0,0 @@
-var layerStats = require('./layer-stats/factory');
-
-function StatsBackend() {
-}
-
-module.exports = StatsBackend;
-
-StatsBackend.prototype.getStats = function(mapConfig, dbConnection, callback) {
-    var enabledFeatures = global.environment.enabledFeatures;
-    var layerStatsEnabled = enabledFeatures ? enabledFeatures.layerStats: false;
-    if (layerStatsEnabled) {
-        layerStats().getStats(mapConfig, dbConnection, callback);
-    } else {
-        return callback(null, []);
-    }
-};
--- a/lib/cartodb/backends/template_maps.js
+++ b/lib/cartodb/backends/template_maps.js
@@ -296,7 +296,7 @@ TemplateMaps.prototype.delTemplate = function(owner, tpl_id, callback) {
 // @param callback function(err)
 //
 TemplateMaps.prototype.updTemplate = function(owner, tpl_id, template, callback) {
-
+    
    var self = this;

    template = templateDefaults(template);
@@ -430,17 +430,13 @@ var _reNumber = /^([-+]?[\d\.]?\d+([eE][+-]?\d+)?)$/,
    _reCSSColorVal = /^#[0-9a-fA-F]{3,6}$/;

 function _replaceVars (str, params) {
-    // Construct regular expressions for each param
+  //return _.template(str, params); // lazy way, possibly dangerous
+  // Construct regular expressions for each param
    Object.keys(params).forEach(function(k) {
        str = str.replace(new RegExp("<%=\\s*" + k + "\\s*%>", "g"), params[k]);
    });
    return str;
 }
-
-function isObject(val) {
-    return ( _.isObject(val) && !_.isArray(val) && !_.isFunction(val));
-}
-
 TemplateMaps.prototype.instance = function(template, params) {
  var all_params = {};
  var phold = template.placeholders || {};
@@ -478,13 +474,6 @@ TemplateMaps.prototype.instance = function(template, params) {

  // NOTE: we're deep-cloning the layergroup here
  var layergroup = JSON.parse(JSON.stringify(template.layergroup));
-
-  if (layergroup.buffersize && isObject(layergroup.buffersize)) {
-      Object.keys(layergroup.buffersize).forEach(function(k) {
-        layergroup.buffersize[k] = parseInt(_replaceVars(layergroup.buffersize[k], all_params), 10);
-      });
-  }
-
  for (var i=0; i<layergroup.layers.length; ++i) {
    var lyropt = layergroup.layers[i].options;

--- a/lib/cartodb/controllers/base.js
+++ b/lib/cartodb/controllers/base.js
@@ -201,10 +201,6 @@ BaseController.prototype.sendError = function(req, res, err, label) {

    var statusCode = findStatusCode(err);

-    if (err.message === 'Tile does not exist' && req.params.format === 'mvt') {
-        statusCode = 204;
-    }
-
    debug('[%s ERROR] -- %d: %s, %s', label, statusCode, err, err.stack);

    // If a callback was requested, force status to 200
--- a/lib/cartodb/controllers/layergroup.js
+++ b/lib/cartodb/controllers/layergroup.js
@@ -253,9 +253,7 @@ LayergroupController.prototype.finalizeGetTileOrGrid = function(err, req, res, t
        grid_json: true,
        json_torque: true,
        torque_json: true,
-        png: true,
-        png32: true,
-        mvt: true
+        png: true
    };

    var formatStat = 'invalid';
--- a/lib/cartodb/controllers/map.js
+++ b/lib/cartodb/controllers/map.js
@@ -20,7 +20,6 @@ var NamedMapsCacheEntry = require('../cache/model/named_maps_entry');
 var NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider');
 var CreateLayergroupMapConfigProvider = require('../models/mapconfig/provider/create-layergroup-provider');

-
 /**
 * @param {AuthApi} authApi
 * @param {PgConnection} pgConnection
@@ -31,12 +30,10 @@ var CreateLayergroupMapConfigProvider = require('../models/mapconfig/provider/cr
 * @param {UserLimitsApi} userLimitsApi
 * @param {LayergroupAffectedTables} layergroupAffectedTables
 * @param {MapConfigAdapter} mapConfigAdapter
- * @param {StatsBackend} statsBackend
 * @constructor
 */
 function MapController(authApi, pgConnection, templateMaps, mapBackend, metadataBackend,
-                       surrogateKeysCache, userLimitsApi, layergroupAffectedTables, mapConfigAdapter,
-                       statsBackend) {
+                       surrogateKeysCache, userLimitsApi, layergroupAffectedTables, mapConfigAdapter) {

    BaseController.call(this, authApi, pgConnection);

@@ -50,8 +47,6 @@ function MapController(authApi, pgConnection, templateMaps, mapBackend, metadata

    this.mapConfigAdapter = mapConfigAdapter;
    this.resourceLocator = new ResourceLocator(global.environment);
-
-    this.statsBackend = statsBackend;
 }

 util.inherits(MapController, BaseController);
@@ -219,6 +214,7 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn

    var mapConfigProvider;
    var mapConfig;
+
    step(
        function setupParams(){
            self.req2params(req, this);
@@ -253,9 +249,7 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
        },
        function afterLayergroupCreate(err, layergroup) {
            assert.ifError(err);
-            self.afterLayergroupCreate(req, res, mapConfig, layergroup,
-                                       mapConfigProvider.analysesResults,
-                                       this);
+            self.afterLayergroupCreate(req, res, mapConfig, layergroup, mapConfigProvider.analysesResults, this);
        },
        function finishTemplateInstantiation(err, layergroup) {
            if (err) {
@@ -278,8 +272,7 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
    );
 };

-MapController.prototype.afterLayergroupCreate =
-function(req, res, mapconfig, layergroup, analysesResults, callback) {
+MapController.prototype.afterLayergroupCreate = function(req, res, mapconfig, layergroup, analysesResults, callback) {
    var self = this;

    var username = req.context.user;
@@ -325,7 +318,6 @@ function(req, res, mapconfig, layergroup, analysesResults, callback) {

    var dbName = req.params.dbname;
    var layergroupId = layergroup.layergroupid;
-    var dbConnection;

    step(
        function getPgConnection() {
@@ -333,8 +325,7 @@ function(req, res, mapconfig, layergroup, analysesResults, callback) {
        },
        function getAffectedTablesAndLastUpdatedTime(err, connection) {
            assert.ifError(err);
-            dbConnection = connection;
-            QueryTables.getAffectedTablesFromQuery(dbConnection, sql.join(';'), this);
+            QueryTables.getAffectedTablesFromQuery(connection, sql.join(';'), this);
        },
        function handleAffectedTablesAndLastUpdatedTime(err, result) {
            req.profiler.done('queryTablesAndLastUpdated');
@@ -361,21 +352,6 @@ function(req, res, mapconfig, layergroup, analysesResults, callback) {

            return null;
        },
-        function fetchLayersStats(err) {
-            assert.ifError(err);
-            var next = this;
-            self.statsBackend.getStats(mapconfig, dbConnection, function(err, layersStats) {
-                if (err) {
-                    return next(err);
-                }
-                if (layersStats.length > 0) {
-                    layergroup.metadata.layers.forEach(function (layer, index) {
-                        layer.meta.stats = layersStats[index];
-                    });
-                }
-                return next();
-            });
-        },
        function finish(err) {
            done(err);
        }
--- a/lib/cartodb/models/dataview/aggregation.js
+++ b/lib/cartodb/models/dataview/aggregation.js
@@ -5,32 +5,11 @@ var debug = require('debug')('windshaft:widget:aggregation');
 var dot = require('dot');
 dot.templateSettings.strip = false;

-var filteredQueryTpl = dot.template([
-    'filtered_source AS (',
-    '  SELECT *',
-    '  FROM ({{=it._query}}) _cdb_filtered_source',
-    '  {{?it._aggregationColumn && it._isFloatColumn}}WHERE',
-    '    {{=it._aggregationColumn}} != \'infinity\'::float',
-    '  AND',
-    '    {{=it._aggregationColumn}} != \'-infinity\'::float',
-    '  AND',
-    '    {{=it._aggregationColumn}} != \'NaN\'::float{{?}}',
-    ')'
-].join(' \n'));
-
 var summaryQueryTpl = dot.template([
    'summary AS (',
    '  SELECT',
    '  count(1) AS count,',
    '  sum(CASE WHEN {{=it._column}} IS NULL THEN 1 ELSE 0 END) AS nulls_count',
-    '  {{?it._isFloatColumn}},sum(',
-    '    CASE',
-    '      WHEN {{=it._aggregationColumn}} = \'infinity\'::float OR {{=it._aggregationColumn}} = \'-infinity\'::float',
-    '      THEN 1',
-    '      ELSE 0',
-    '    END',
-    '  ) AS infinities_count,',
-    '  sum(CASE WHEN {{=it._aggregationColumn}} = \'NaN\'::float THEN 1 ELSE 0 END) AS nans_count{{?}}',
    '  FROM ({{=it._query}}) _cdb_aggregation_nulls',
    ')'
 ].join('\n'));
@@ -39,7 +18,7 @@ var rankedCategoriesQueryTpl = dot.template([
    'categories AS(',
    '  SELECT {{=it._column}} AS category, {{=it._aggregation}} AS value,',
    '    row_number() OVER (ORDER BY {{=it._aggregation}} desc) as rank',
-    '  FROM filtered_source',
+    '  FROM ({{=it._query}}) _cdb_aggregation_all',
    '  {{?it._aggregationColumn!==null}}WHERE {{=it._aggregationColumn}} IS NOT NULL{{?}}',
    '  GROUP BY {{=it._column}}',
    '  ORDER BY 2 DESC',
@@ -65,25 +44,22 @@ var categoriesSummaryCountQueryTpl = dot.template([
 ].join('\n'));

 var rankedAggregationQueryTpl = dot.template([
-    'SELECT CAST(category AS text), value, false as agg, nulls_count, min_val, max_val,',
-    '    count, categories_count{{?it._isFloatColumn}}, nans_count, infinities_count{{?}}',
+    'SELECT CAST(category AS text), value, false as agg, nulls_count, min_val, max_val, count, categories_count',
    '  FROM categories, summary, categories_summary_min_max, categories_summary_count',
    '  WHERE rank < {{=it._limit}}',
    'UNION ALL',
-    'SELECT \'Other\' category, {{=it._aggregationFn}}(value) as value, true as agg, nulls_count,',
-    '       min_val, max_val, count, categories_count{{?it._isFloatColumn}}, nans_count, infinities_count{{?}}',
+    'SELECT \'Other\' category, {{=it._aggregationFn}}(value) as value, true as agg, nulls_count, min_val, max_val,',
+    '       count, categories_count',
    '  FROM categories, summary, categories_summary_min_max, categories_summary_count',
    '  WHERE rank >= {{=it._limit}}',
-    'GROUP BY nulls_count, min_val, max_val, count,',
-    '  categories_count{{?it._isFloatColumn}}, nans_count, infinities_count{{?}}'
+    'GROUP BY nulls_count, min_val, max_val, count, categories_count'
 ].join('\n'));

 var aggregationQueryTpl = dot.template([
    'SELECT CAST({{=it._column}} AS text) AS category, {{=it._aggregation}} AS value, false as agg,',
-    '  nulls_count, min_val, max_val, count, categories_count{{?it._isFloatColumn}}, nans_count, infinities_count{{?}}',
+    '  nulls_count, min_val, max_val, count, categories_count',
    'FROM ({{=it._query}}) _cdb_aggregation_all, summary, categories_summary_min_max, categories_summary_count',
-    'GROUP BY category, nulls_count, min_val, max_val, count,',
-    '  categories_count{{?it._isFloatColumn}}, nans_count, infinities_count{{?}}',
+    'GROUP BY category, nulls_count, min_val, max_val, count, categories_count',
    'ORDER BY value DESC'
 ].join('\n'));

@@ -108,7 +84,7 @@ var TYPE = 'aggregation';
     }
 }
 */
-function Aggregation(query, options, queries) {
+function Aggregation(query, options) {
    if (!_.isString(options.column)) {
        throw new Error('Aggregation expects `column` in widget options');
    }
@@ -132,11 +108,9 @@ function Aggregation(query, options, queries) {
    BaseWidget.apply(this);

    this.query = query;
-    this.queries = queries;
    this.column = options.column;
    this.aggregation = options.aggregation;
    this.aggregationColumn = options.aggregationColumn;
-    this._isFloatColumn = null;
 }

 Aggregation.prototype = new BaseWidget();
@@ -145,39 +119,19 @@ Aggregation.prototype.constructor = Aggregation;
 module.exports = Aggregation;

 Aggregation.prototype.sql = function(psql, override, callback) {
-    var self = this;
-
    if (!callback) {
        callback = override;
        override = {};
    }

-    if (this.aggregationColumn && this._isFloatColumn === null) {
-        this._isFloatColumn = false;
-        this.getColumnType(psql, this.aggregationColumn, this.queries.no_filters, function (err, type) {
-            if (!err && !!type) {
-                self._isFloatColumn = type.float;
-            }
-            self.sql(psql, override, callback);
-        });
-        return null;
-    }
-
    var _query = this.query;

    var aggregationSql;

    if (!!override.ownFilter) {
        aggregationSql = [
-            this.getCategoriesCTESql(
-                _query,
-                this.column,
-                this.aggregation,
-                this.aggregationColumn,
-                this._isFloatColumn
-            ),
+            this.getCategoriesCTESql(_query, this.column, this.aggregation, this.aggregationColumn),
            aggregationQueryTpl({
-                _isFloatColumn: this._isFloatColumn,
                _query: _query,
                _column: this.column,
                _aggregation: this.getAggregationSql(),
@@ -186,15 +140,8 @@ Aggregation.prototype.sql = function(psql, override, callback) {
        ].join('\n');
    } else {
        aggregationSql = [
-            this.getCategoriesCTESql(
-                _query,
-                this.column,
-                this.aggregation,
-                this.aggregationColumn,
-                this._isFloatColumn
-            ),
+            this.getCategoriesCTESql(_query, this.column, this.aggregation, this.aggregationColumn),
            rankedAggregationQueryTpl({
-                _isFloatColumn: this._isFloatColumn,
                _query: _query,
                _column: this.column,
                _aggregationFn: this.aggregation !== 'count' ? this.aggregation : 'sum',
@@ -208,38 +155,30 @@ Aggregation.prototype.sql = function(psql, override, callback) {
    return callback(null, aggregationSql);
 };

-Aggregation.prototype.getCategoriesCTESql = function(query, column, aggregation, aggregationColumn, isFloatColumn) {
+Aggregation.prototype.getCategoriesCTESql = function(query, column, aggregation, aggregationColumn) {
    return [
-        "WITH",
-        [
-            filteredQueryTpl({
-                _isFloatColumn: isFloatColumn,
-                _query: this.query,
-                _column: this.column,
-                _aggregationColumn: aggregation !== 'count' ? aggregationColumn : null
-            }),
-            summaryQueryTpl({
-                _isFloatColumn: isFloatColumn,
-                _query: query,
-                _column: column,
-                _aggregationColumn: aggregation !== 'count' ? aggregationColumn : null
-            }),
-            rankedCategoriesQueryTpl({
-                _query: query,
-                _column: column,
-                _aggregation: this.getAggregationSql(),
-                _aggregationColumn: aggregation !== 'count' ? aggregationColumn : null
-            }),
-            categoriesSummaryMinMaxQueryTpl({
-                _query: query,
-                _column: column
-            }),
-            categoriesSummaryCountQueryTpl({
-                _query: query,
-                _column: column
-            })
-        ].join(',\n')
-    ].join('\n');
+                "WITH",
+                [
+                    summaryQueryTpl({
+                        _query: query,
+                        _column: column
+                    }),
+                    rankedCategoriesQueryTpl({
+                        _query: query,
+                        _column: column,
+                        _aggregation: this.getAggregationSql(),
+                        _aggregationColumn: aggregation !== 'count' ? aggregationColumn : null
+                    }),
+                    categoriesSummaryMinMaxQueryTpl({
+                        _query: query,
+                        _column: column
+                    }),
+                    categoriesSummaryCountQueryTpl({
+                        _query: query,
+                        _column: column
+                    })
+                ].join(',\n')
+            ].join('\n');
 };

 var aggregationFnQueryTpl = dot.template('{{=it._aggregationFn}}({{=it._aggregationColumn}})');
@@ -254,8 +193,6 @@ Aggregation.prototype.format = function(result) {
    var categories = [];
    var count = 0;
    var nulls = 0;
-    var nans = 0;
-    var infinities = 0;
    var minValue = 0;
    var maxValue = 0;
    var categoriesCount = 0;
@@ -265,15 +202,12 @@ Aggregation.prototype.format = function(result) {
        var firstRow = result.rows[0];
        count = firstRow.count;
        nulls = firstRow.nulls_count;
-        nans = firstRow.nans_count;
-        infinities = firstRow.infinities_count;
        minValue = firstRow.min_val;
        maxValue = firstRow.max_val;
        categoriesCount = firstRow.categories_count;

        result.rows.forEach(function(row) {
-            categories.push(_.omit(row, 'count', 'nulls_count', 'min_val',
-                'max_val', 'categories_count', 'nans_count', 'infinities_count'));
+            categories.push(_.omit(row, 'count', 'nulls_count', 'min_val', 'max_val', 'categories_count'));
        });
    }

@@ -281,8 +215,6 @@ Aggregation.prototype.format = function(result) {
        aggregation: this.aggregation,
        count: count,
        nulls: nulls,
-        nans: nans,
-        infinities: infinities,
        min: minValue,
        max: maxValue,
        categoriesCount: categoriesCount,
@@ -321,8 +253,6 @@ Aggregation.prototype.search = function(psql, userQuery, callback) {
    var self = this;

    var _userQuery = psql.escapeLiteral('%' + userQuery + '%');
-    var _value = this.aggregation !== 'count' && this.aggregationColumn ?
-        this.aggregation + '(' + this.aggregationColumn + ')' : 'count(1)';

    // TODO unfiltered will be wrong as filters are already applied at this point
    var query = searchQueryTpl({
@@ -335,7 +265,7 @@ Aggregation.prototype.search = function(psql, userQuery, callback) {
        _searchFiltered: filterCategoriesQueryTpl({
            _query: this.query,
            _column: this.column,
-            _value: _value,
+            _value: 'count(1)',
            _userQuery: _userQuery
        })
    });
--- a/lib/cartodb/models/dataview/base.js
+++ b/lib/cartodb/models/dataview/base.js
@@ -1,6 +1,3 @@
-var dot = require('dot');
-dot.templateSettings.strip = false;
-
 function BaseDataview() {}

 module.exports = BaseDataview;
@@ -27,42 +24,3 @@ BaseDataview.prototype.getResult = function(psql, override, callback) {
 BaseDataview.prototype.search = function(psql, userQuery, callback) {
    return callback(null, this.format({ rows: [] }));
 };
-
-var FLOAT_OIDS = {
-    700: true,
-    701: true,
-    1700: true
-};
-
-var DATE_OIDS = {
-    1082: true,
-    1114: true,
-    1184: true
-};
-
-var columnTypeQueryTpl = dot.template(
-    'SELECT pg_typeof({{=it.column}})::oid FROM ({{=it.query}}) _cdb_column_type limit 1'
-);
-
-BaseDataview.prototype.getColumnType = function (psql, column, query, callback) {
-    var readOnlyTransaction = true;
-
-    var columnTypeQuery = columnTypeQueryTpl({
-        column: column, query: query
-    });
-
-    psql.query(columnTypeQuery, function(err, result) {
-        if (err) {
-            return callback(err);
-        }
-        var pgType = result.rows[0].pg_typeof;
-        callback(null, getPGTypeName(pgType));
-    }, readOnlyTransaction);
-};
-
-function getPGTypeName (pgType) {
-    return {
-        float: FLOAT_OIDS.hasOwnProperty(pgType),
-        date: DATE_OIDS.hasOwnProperty(pgType)
-    };
-}
--- a/lib/cartodb/models/dataview/formula.js
+++ b/lib/cartodb/models/dataview/formula.js
@@ -7,19 +7,9 @@ dot.templateSettings.strip = false;

 var formulaQueryTpl = dot.template([
    'SELECT',
-    '  {{=it._operation}}({{=it._column}}) AS result,',
-    '  (SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nulls WHERE {{=it._column}} IS NULL) AS nulls_count',
-    '  {{?it._isFloatColumn}},(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nulls',
-    '      WHERE {{=it._column}} = \'infinity\'::float OR {{=it._column}} = \'-infinity\'::float) AS infinities_count',
-    '  ,(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nulls',
-    '      WHERE {{=it._column}} = \'NaN\'::float) AS nans_count{{?}}',
-    'FROM ({{=it._query}}) _cdb_formula',
-    '{{?it._isFloatColumn && it._operation !== \'count\'}}WHERE',
-    '  {{=it._column}} != \'infinity\'::float',
-    'AND',
-    '  {{=it._column}} != \'-infinity\'::float',
-    'AND',
-    '  {{=it._column}} != \'NaN\'::float{{?}}'
+    '{{=it._operation}}({{=it._column}}) AS result,',
+    '(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nulls WHERE {{=it._column}} IS NULL) AS nulls_count',
+    'FROM ({{=it._query}}) _cdb_formula'
 ].join('\n'));

 var VALID_OPERATIONS = {
@@ -41,7 +31,7 @@ var TYPE = 'formula';
     }
 }
 */
-function Formula(query, options, queries) {
+function Formula(query, options) {
    if (!_.isString(options.operation)) {
        throw new Error('Formula expects `operation` in widget options');
    }
@@ -57,10 +47,8 @@ function Formula(query, options, queries) {
    BaseWidget.apply(this);

    this.query = query;
-    this.queries = queries;
    this.column = options.column || '1';
    this.operation = options.operation;
-    this._isFloatColumn = null;
 }

 Formula.prototype = new BaseWidget();
@@ -69,27 +57,14 @@ Formula.prototype.constructor = Formula;
 module.exports = Formula;

 Formula.prototype.sql = function(psql, override, callback) {
-    var self = this;
-
    if (!callback) {
        callback = override;
        override = {};
    }

-    if (this._isFloatColumn === null) {
-        this._isFloatColumn = false;
-        this.getColumnType(psql, this.column, this.queries.no_filters, function (err, type) {
-            if (!err && !!type) {
-                self._isFloatColumn = type.float;
-            }
-            self.sql(psql, override, callback);
-        });
-        return null;
-    }
-
+    var _query = this.query;
    var formulaSql = formulaQueryTpl({
-        _isFloatColumn: this._isFloatColumn,
-        _query: this.query,
+        _query: _query,
        _operation: this.operation,
        _column: this.column
    });
@@ -103,17 +78,13 @@ Formula.prototype.format = function(result) {
    var formattedResult = {
        operation: this.operation,
        result: 0,
-        nulls: 0,
-        nans: 0,
-        infinities: 0
+        nulls: 0
    };

    if (result.rows.length) {
        formattedResult.operation = this.operation;
        formattedResult.result = result.rows[0].result;
        formattedResult.nulls = result.rows[0].nulls_count;
-        formattedResult.nans = result.rows[0].nans_count;
-        formattedResult.infinities = result.rows[0].infinities_count;
    }

    return formattedResult;
--- a/lib/cartodb/models/dataview/histogram.js
+++ b/lib/cartodb/models/dataview/histogram.js
@@ -5,32 +5,20 @@ var debug = require('debug')('windshaft:dataview:histogram');
 var dot = require('dot');
 dot.templateSettings.strip = false;

+var columnTypeQueryTpl = dot.template(
+    'SELECT pg_typeof({{=it.column}})::oid FROM ({{=it.query}}) _cdb_histogram_column_type limit 1'
+);
 var columnCastTpl = dot.template("date_part('epoch', {{=it.column}})");

 var BIN_MIN_NUMBER = 6;
 var BIN_MAX_NUMBER = 48;

-var filteredQueryTpl = dot.template([
-    'filtered_source AS (',
-    '  SELECT *',
-    '  FROM ({{=it._query}}) _cdb_filtered_source',
-    '  WHERE',
-    '    {{=it._column}} IS NOT NULL',
-    '  {{?it._isFloatColumn}}AND',
-    '    {{=it._column}} != \'infinity\'::float',
-    '  AND',
-    '    {{=it._column}} != \'-infinity\'::float',
-    '  AND',
-    '    {{=it._column}} != \'NaN\'::float{{?}}',
-    ')'
-].join(' \n'));
-
 var basicsQueryTpl = dot.template([
    'basics AS (',
    '  SELECT',
    '    max({{=it._column}}) AS max_val, min({{=it._column}}) AS min_val,',
    '    avg({{=it._column}}) AS avg_val, count(1) AS total_rows',
-    '  FROM filtered_source',
+    '  FROM ({{=it._query}}) _cdb_basics',
    ')'
 ].join(' \n'));

@@ -39,7 +27,7 @@ var overrideBasicsQueryTpl = dot.template([
    '  SELECT',
    '    max({{=it._end}}) AS max_val, min({{=it._start}}) AS min_val,',
    '    avg({{=it._column}}) AS avg_val, count(1) AS total_rows',
-    '  FROM filtered_source',
+    '  FROM ({{=it._query}}) _cdb_basics',
    ')'
 ].join('\n'));

@@ -50,7 +38,7 @@ var iqrQueryTpl = dot.template([
    '    SELECT quartile, max(_cdb_iqr_column) AS quartile_max from (',
    '      SELECT {{=it._column}} AS _cdb_iqr_column, ntile(4) over (order by {{=it._column}}',
    '    ) AS quartile',
-    '    FROM filtered_source) _cdb_quartiles',
+    '    FROM ({{=it._query}}) _cdb_rank) _cdb_quartiles',
    '    WHERE quartile = 1 or quartile = 3',
    '    GROUP BY quartile',
    '  ) _cdb_iqr',
@@ -69,7 +57,7 @@ var binsQueryTpl = dot.template([
    '        )',
    '      )',
    '    END AS bins_number',
-    '  FROM basics, iqrange, filtered_source',
+    '  FROM basics, iqrange, ({{=it._query}}) _cdb_bins',
    '  LIMIT 1',
    ')'
 ].join('\n'));
@@ -89,34 +77,11 @@ var nullsQueryTpl = dot.template([
    ')'
 ].join('\n'));

-var infinitiesQueryTpl = dot.template([
-    'infinities AS (',
-    '  SELECT',
-    '    count(*) AS infinities_count',
-    '  FROM ({{=it._query}}) _cdb_histogram_infinities',
-    '  WHERE',
-    '    {{=it._column}} = \'infinity\'::float',
-    '  OR',
-    '    {{=it._column}} = \'-infinity\'::float',
-    ')'
-].join('\n'));
-
-var nansQueryTpl = dot.template([
-    'nans AS (',
-    '  SELECT',
-    '    count(*) AS nans_count',
-    '  FROM ({{=it._query}}) _cdb_histogram_infinities',
-    '  WHERE {{=it._column}} = \'NaN\'::float',
-    ')'
-].join('\n'));
-
 var histogramQueryTpl = dot.template([
    'SELECT',
    '    (max_val - min_val) / cast(bins_number as float) AS bin_width,',
    '    bins_number,',
    '    nulls_count,',
-    '    {{?it._isFloatColumn}}infinities_count,',
-    '    nans_count,{{?}}',
    '    avg_val,',
    '    CASE WHEN min_val = max_val',
    '      THEN 0',
@@ -126,9 +91,9 @@ var histogramQueryTpl = dot.template([
    '    max({{=it._column}})::numeric AS max,',
    '    avg({{=it._column}})::numeric AS avg,',
    '    count(*) AS freq',
-    'FROM filtered_source, basics, nulls, bins{{?it._isFloatColumn}}, infinities, nans{{?}}',
-    'GROUP BY bin, bins_number, bin_width, nulls_count,',
-    '  avg_val{{?it._isFloatColumn}}, infinities_count, nans_count{{?}}',
+    'FROM ({{=it._query}}) _cdb_histogram, basics, nulls, bins',
+    'WHERE {{=it._column}} IS NOT NULL',
+    'GROUP BY bin, bins_number, bin_width, nulls_count, avg_val',
    'ORDER BY bin'
 ].join('\n'));

@@ -162,49 +127,50 @@ Histogram.prototype.constructor = Histogram;

 module.exports = Histogram;

-Histogram.prototype.sql = function(psql, override, callback) {
-    var self = this;
+var DATE_OIDS = {
+    1082: true,
+    1114: true,
+    1184: true
+};

+Histogram.prototype.sql = function(psql, override, callback) {
    if (!callback) {
        callback = override;
        override = {};
    }

+    var self = this;
+
+    var _column = this.column;
+
+    var columnTypeQuery = columnTypeQueryTpl({
+        column: _column, query: this.queries.no_filters
+    });
+
    if (this._columnType === null) {
-        this.getColumnType(psql, this.column, this.queries.no_filters, function (err, type) {
+        psql.query(columnTypeQuery, function(err, result) {
            // assume numeric, will fail later
            self._columnType = 'numeric';
-            if (!err && !!type) {
-                self._columnType = Object.keys(type).find(function (key) {
-                    return type[key];
-                });
+            if (!err && !!result.rows[0]) {
+                var pgType = result.rows[0].pg_typeof;
+                if (DATE_OIDS.hasOwnProperty(pgType)) {
+                    self._columnType = 'date';
+                }
            }
            self.sql(psql, override, callback);
        }, true); // use read-only transaction
        return null;
    }

-    var histogramSql = this._buildQuery(override);
-
-    return callback(null, histogramSql);
-};
-
-Histogram.prototype._buildQuery = function (override) {
-    var filteredQuery, basicsQuery, binsQuery;
-    var _column = this.column;
-    var _query = this.query;
-
    if (this._columnType === 'date') {
        _column = columnCastTpl({column: _column});
    }

-    filteredQuery = filteredQueryTpl({
-        _isFloatColumn: this._columnType === 'float',
-        _query: _query,
-        _column: _column
-    });
+    var _query = this.query;

-    if (this._shouldOverride(override)) {
+    var basicsQuery, binsQuery;
+
+    if (override && _.has(override, 'start') && _.has(override, 'end') && _.has(override, 'bins')) {
        debug('overriding with %j', override);
        basicsQuery = overrideBasicsQueryTpl({
            _query: _query,
@@ -224,7 +190,7 @@ Histogram.prototype._buildQuery = function (override) {
            _column: _column
        });

-        if (this._shouldOverrideBins(override)) {
+        if (override && _.has(override, 'bins')) {
            binsQuery = [
                overrideBinsQueryTpl({
                    _bins: override.bins
@@ -245,34 +211,18 @@ Histogram.prototype._buildQuery = function (override) {
        }
    }

-    var cteSql = [
-        filteredQuery,
-        basicsQuery,
-        binsQuery,
-        nullsQueryTpl({
-            _query: _query,
-            _column: _column
-        })
-    ];
-
-    if (this._columnType === 'float') {
-        cteSql.push(
-            infinitiesQueryTpl({
-                _query: _query,
-                _column: _column
-            }),
-            nansQueryTpl({
-                _query: _query,
-                _column: _column
-            })
-        );
-    }

    var histogramSql = [
        "WITH",
-        cteSql.join(',\n'),
+        [
+            basicsQuery,
+            binsQuery,
+            nullsQueryTpl({
+                _query: _query,
+                _column: _column
+            })
+        ].join(',\n'),
        histogramQueryTpl({
-            _isFloatColumn: this._columnType === 'float',
            _query: _query,
            _column: _column
        })
@@ -280,15 +230,7 @@ Histogram.prototype._buildQuery = function (override) {

    debug(histogramSql);

-    return histogramSql;
-};
-
-Histogram.prototype._shouldOverride = function (override) {
-    return override && _.has(override, 'start') && _.has(override, 'end') && _.has(override, 'bins');
-};
-
-Histogram.prototype._shouldOverrideBins = function (override) {
-    return override && _.has(override, 'bins');
+    return callback(null, histogramSql);
 };

 Histogram.prototype.format = function(result, override) {
@@ -299,8 +241,6 @@ Histogram.prototype.format = function(result, override) {
    var width = getWidth(override);
    var binsStart = getBinStart(override);
    var nulls = 0;
-    var infinities = 0;
-    var nans = 0;
    var avg;

    if (result.rows.length) {
@@ -309,12 +249,10 @@ Histogram.prototype.format = function(result, override) {
        width = firstRow.bin_width || width;
        avg = firstRow.avg_val;
        nulls = firstRow.nulls_count;
-        infinities = firstRow.infinities_count;
-        nans = firstRow.nans_count;
        binsStart = override.hasOwnProperty('start') ? getBinStart(override) : firstRow.min;

        buckets = result.rows.map(function(row) {
-            return _.omit(row, 'bins_number', 'bin_width', 'nulls_count', 'infinities_count', 'nans_count', 'avg_val');
+            return _.omit(row, 'bins_number', 'bin_width', 'nulls_count', 'avg_val');
        });
    }

@@ -323,8 +261,6 @@ Histogram.prototype.format = function(result, override) {
        bins_count: binsCount,
        bins_start: binsStart,
        nulls: nulls,
-        infinities: infinities,
-        nans: nans,
        avg: avg,
        bins: buckets
    };
--- a/lib/cartodb/models/dataview/overviews/aggregation.js
+++ b/lib/cartodb/models/dataview/overviews/aggregation.js
@@ -1,36 +1,14 @@
 var BaseOverviewsDataview = require('./base');
 var BaseDataview = require('../aggregation');
-var debug = require('debug')('windshaft:widget:aggregation:overview');

 var dot = require('dot');
 dot.templateSettings.strip = false;

-var filteredQueryTpl = dot.template([
-    'filtered_source AS (',
-    '  SELECT *',
-    '  FROM ({{=it._query}}) _cdb_filtered_source',
-    '  {{?it._aggregationColumn  && it._isFloatColumn}}WHERE',
-    '    {{=it._aggregationColumn}} != \'infinity\'::float',
-    '  AND',
-    '    {{=it._aggregationColumn}} != \'-infinity\'::float',
-    '  AND',
-    '    {{=it._aggregationColumn}} != \'NaN\'::float{{?}}',
-    ')'
-].join(' \n'));
-
 var summaryQueryTpl = dot.template([
    'summary AS (',
    '  SELECT',
    '  sum(_feature_count) AS count,',
    '  sum(CASE WHEN {{=it._column}} IS NULL THEN 1 ELSE 0 END) AS nulls_count',
-    '  {{?it._isFloatColumn}},sum(',
-    '    CASE',
-    '      WHEN {{=it._aggregationColumn}} = \'infinity\'::float OR {{=it._aggregationColumn}} = \'-infinity\'::float',
-    '      THEN 1',
-    '      ELSE 0',
-    '    END',
-    '  ) AS infinities_count,',
-    '  sum(CASE WHEN {{=it._aggregationColumn}} = \'NaN\'::float THEN 1 ELSE 0 END) AS nans_count{{?}}',
    '  FROM ({{=it._query}}) _cdb_aggregation_nulls',
    ')'
 ].join('\n'));
@@ -39,7 +17,7 @@ var rankedCategoriesQueryTpl = dot.template([
    'categories AS(',
    '  SELECT {{=it._column}} AS category, {{=it._aggregation}} AS value,',
    '    row_number() OVER (ORDER BY {{=it._aggregation}} desc) as rank',
-    '  FROM filtered_source',
+    '  FROM ({{=it._query}}) _cdb_aggregation_all',
    '  {{?it._aggregationColumn!==null}}WHERE {{=it._aggregationColumn}} IS NOT NULL{{?}}',
    '  GROUP BY {{=it._column}}',
    '  ORDER BY 2 DESC',
@@ -58,46 +36,40 @@ var categoriesSummaryCountQueryTpl = dot.template([
    '  SELECT count(1) AS categories_count',
    '  FROM (',
    '    SELECT {{=it._column}} AS category',
-    '    FROM filtered_source',
+    '    FROM ({{=it._query}}) _cdb_categories',
    '    GROUP BY {{=it._column}}',
    '  ) _cdb_categories_count',
    ')'
 ].join('\n'));

 var rankedAggregationQueryTpl = dot.template([
-    'SELECT CAST(category AS text), value, false as agg, nulls_count, min_val, max_val,',
-    '    count, categories_count{{?it._isFloatColumn}}, nans_count, infinities_count{{?}}',
+    'SELECT CAST(category AS text), value, false as agg, nulls_count, min_val, max_val, count, categories_count',
    '  FROM categories, summary, categories_summary_min_max, categories_summary_count',
    '  WHERE rank < {{=it._limit}}',
    'UNION ALL',
-    'SELECT \'Other\' category, sum(value), true as agg, nulls_count, min_val, max_val,',
-    '    count, categories_count{{?it._isFloatColumn}}, nans_count, infinities_count{{?}}',
+    'SELECT \'Other\' category, sum(value), true as agg, nulls_count, min_val, max_val, count, categories_count',
    '  FROM categories, summary, categories_summary_min_max, categories_summary_count',
    '  WHERE rank >= {{=it._limit}}',
-    'GROUP BY nulls_count, min_val, max_val, count,',
-    '  categories_count{{?it._isFloatColumn}}, nans_count, infinities_count{{?}}'
+    'GROUP BY nulls_count, min_val, max_val, count, categories_count'
 ].join('\n'));

 var aggregationQueryTpl = dot.template([
    'SELECT CAST({{=it._column}} AS text) AS category, {{=it._aggregation}} AS value, false as agg,',
-    '  nulls_count, min_val, max_val, count, categories_count{{?it._isFloatColumn}}, nans_count, infinities_count{{?}}',
-    'FROM filtered_source, summary, categories_summary_min_max, categories_summary_count',
-    'GROUP BY category, nulls_count, min_val, max_val, count,',
-    '  categories_count{{?it._isFloatColumn}}, nans_count, infinities_count{{?}}',
+    '  nulls_count, min_val, max_val, count, categories_count',
+    'FROM ({{=it._query}}) _cdb_aggregation_all, summary, categories_summary_min_max, categories_summary_count',
+    'GROUP BY category, nulls_count, min_val, max_val, count, categories_count',
    'ORDER BY value DESC'
 ].join('\n'));

 var CATEGORIES_LIMIT = 6;

- function Aggregation(query, options, queryRewriter, queryRewriteData, params, queries) {
-    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params, queries);
+ function Aggregation(query, options, queryRewriter, queryRewriteData, params) {
+    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params);

    this.query = query;
-    this.queries = queries;
    this.column = options.column;
    this.aggregation = options.aggregation;
    this.aggregationColumn = options.aggregationColumn;
-    this._isFloatColumn = null;
 }

 Aggregation.prototype = Object.create(BaseOverviewsDataview.prototype);
@@ -106,49 +78,27 @@ Aggregation.prototype.constructor = Aggregation;
 module.exports = Aggregation;

 Aggregation.prototype.sql = function(psql, override, callback) {
-    var self = this;
-
    if (!callback) {
        callback = override;
        override = {};
    }

    var _query = this.rewrittenQuery(this.query);
-    var _aggregationColumn = this.aggregation !== 'count' ? this.aggregationColumn : null;
-
-    if (this.aggregationColumn && this._isFloatColumn === null) {
-        this._isFloatColumn = false;
-        this.getColumnType(psql, this.aggregationColumn, this.queries.no_filters, function (err, type) {
-            if (!err && !!type) {
-                self._isFloatColumn = type.float;
-            }
-            self.sql(psql, override, callback);
-        });
-        return null;
-    }

    var aggregationSql;
    if (!!override.ownFilter) {
        aggregationSql = [
            "WITH",
            [
-                filteredQueryTpl({
-                    _isFloatColumn: this._isFloatColumn,
-                    _query: _query,
-                    _column: this.column,
-                    _aggregationColumn: _aggregationColumn
-                }),
                summaryQueryTpl({
-                    _isFloatColumn: this._isFloatColumn,
                    _query: _query,
-                    _column: this.column,
-                    _aggregationColumn: _aggregationColumn
+                    _column: this.column
                }),
                rankedCategoriesQueryTpl({
                    _query: _query,
                    _column: this.column,
                    _aggregation: this.getAggregationSql(),
-                    _aggregationColumn: _aggregationColumn
+                    _aggregationColumn: this.aggregation !== 'count' ? this.aggregationColumn : null
                }),
                categoriesSummaryMinMaxQueryTpl({
                    _query: _query,
@@ -160,7 +110,6 @@ Aggregation.prototype.sql = function(psql, override, callback) {
                })
            ].join(',\n'),
            aggregationQueryTpl({
-                _isFloatColumn: this._isFloatColumn,
                _query: _query,
                _column: this.column,
                _aggregation: this.getAggregationSql(),
@@ -171,23 +120,15 @@ Aggregation.prototype.sql = function(psql, override, callback) {
        aggregationSql = [
            "WITH",
            [
-                filteredQueryTpl({
-                    _isFloatColumn: this._isFloatColumn,
-                    _query: _query,
-                    _column: this.column,
-                    _aggregationColumn: _aggregationColumn
-                }),
                summaryQueryTpl({
-                    _isFloatColumn: this._isFloatColumn,
                    _query: _query,
-                    _column: this.column,
-                    _aggregationColumn: _aggregationColumn
+                    _column: this.column
                }),
                rankedCategoriesQueryTpl({
                    _query: _query,
                    _column: this.column,
                    _aggregation: this.getAggregationSql(),
-                    _aggregationColumn: _aggregationColumn
+                    _aggregationColumn: this.aggregation !== 'count' ? this.aggregationColumn : null
                }),
                categoriesSummaryMinMaxQueryTpl({
                    _query: _query,
@@ -199,7 +140,6 @@ Aggregation.prototype.sql = function(psql, override, callback) {
                })
            ].join(',\n'),
            rankedAggregationQueryTpl({
-                _isFloatColumn: this._isFloatColumn,
                _query: _query,
                _column: this.column,
                _limit: CATEGORIES_LIMIT
@@ -207,8 +147,6 @@ Aggregation.prototype.sql = function(psql, override, callback) {
        ].join('\n');
    }

-    debug(aggregationSql);
-
    return callback(null, aggregationSql);
 };

--- a/lib/cartodb/models/dataview/overviews/base.js
+++ b/lib/cartodb/models/dataview/overviews/base.js
@@ -1,15 +1,14 @@
 var _ = require('underscore');
 var BaseDataview = require('../base');

-function BaseOverviewsDataview(query, queryOptions, BaseDataview, queryRewriter, queryRewriteData, options, queries) {
+function BaseOverviewsDataview(query, queryOptions, BaseDataview, queryRewriter, queryRewriteData, options) {
  this.BaseDataview = BaseDataview;
  this.query = query;
  this.queryOptions = queryOptions;
  this.queryRewriter = queryRewriter;
  this.queryRewriteData = queryRewriteData;
  this.options = options;
-  this.queries = queries;
-  this.baseDataview = new this.BaseDataview(this.query, this.queryOptions, this.queries);
+  this.baseDataview = new this.BaseDataview(this.query, this.queryOptions);
 }

 module.exports = BaseOverviewsDataview;
--- a/lib/cartodb/models/dataview/overviews/formula.js
+++ b/lib/cartodb/models/dataview/overviews/formula.js
@@ -1,61 +1,34 @@
 var BaseOverviewsDataview = require('./base');
 var BaseDataview = require('../formula');
-var debug = require('debug')('windshaft:widget:formula:overview');

 var dot = require('dot');
 dot.templateSettings.strip = false;

 var formulaQueryTpls = {
-    'count': dot.template([
-        'SELECT',
-        'sum(_feature_count) AS result,',
-        '(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nulls WHERE {{=it._column}} IS NULL) AS nulls_count',
-        '{{?it._isFloatColumn}},(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_infinities',
-        '  WHERE {{=it._column}} = \'infinity\'::float OR {{=it._column}} = \'-infinity\'::float) AS infinities_count,',
-        '(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nans',
-        '  WHERE {{=it._column}} = \'NaN\'::float) AS nans_count{{?}}',
-        'FROM ({{=it._query}}) _cdb_formula'
-    ].join('\n')),
-    'sum': dot.template([
-        'SELECT',
-        'sum({{=it._column}}*_feature_count) AS result,',
-        '(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nulls WHERE {{=it._column}} IS NULL) AS nulls_count',
-        '{{?it._isFloatColumn}},(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_infinities',
-        '  WHERE {{=it._column}} = \'infinity\'::float OR {{=it._column}} = \'-infinity\'::float) AS infinities_count',
-        ',(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nans',
-        '  WHERE {{=it._column}} = \'NaN\'::float) AS nans_count{{?}}',
-        'FROM ({{=it._query}}) _cdb_formula',
-        '{{?it._isFloatColumn}}WHERE',
-        '  {{=it._column}} != \'infinity\'::float',
-        'AND',
-        '  {{=it._column}} != \'-infinity\'::float',
-        'AND',
-        '  {{=it._column}} != \'NaN\'::float{{?}}'
-    ].join('\n')),
-    'avg': dot.template([
-        'SELECT',
-        'sum({{=it._column}}*_feature_count)/sum(_feature_count) AS result,',
-        '(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nulls WHERE {{=it._column}} IS NULL) AS nulls_count',
-        '{{?it._isFloatColumn}},(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_infinities',
-        '  WHERE {{=it._column}} = \'infinity\'::float OR {{=it._column}} = \'-infinity\'::float) AS infinities_count',
-        ',(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nans',
-        '  WHERE {{=it._column}} = \'NaN\'::float) AS nans_count{{?}}',
-        'FROM ({{=it._query}}) _cdb_formula',
-        '{{?it._isFloatColumn}}WHERE',
-        '  {{=it._column}} != \'infinity\'::float',
-        'AND',
-        '  {{=it._column}} != \'-infinity\'::float',
-        'AND',
-        '  {{=it._column}} != \'NaN\'::float{{?}}'
-    ].join('\n')),
+  'count': dot.template([
+      'SELECT',
+      'sum(_feature_count) AS result,',
+      '(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nulls WHERE {{=it._column}} IS NULL) AS nulls_count',
+      'FROM ({{=it._query}}) _cdb_formula'
+  ].join('\n')),
+  'sum': dot.template([
+      'SELECT',
+      'sum({{=it._column}}*_feature_count) AS result,',
+      '(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nulls WHERE {{=it._column}} IS NULL) AS nulls_count',
+      'FROM ({{=it._query}}) _cdb_formula'
+  ].join('\n')),
+  'avg': dot.template([
+      'SELECT',
+      'sum({{=it._column}}*_feature_count)/sum(_feature_count) AS result,',
+      '(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nulls WHERE {{=it._column}} IS NULL) AS nulls_count',
+      'FROM ({{=it._query}}) _cdb_formula'
+  ].join('\n')),
 };

-function Formula(query, options, queryRewriter, queryRewriteData, params, queries) {
-    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params, queries);
+function Formula(query, options, queryRewriter, queryRewriteData, params) {
+    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params);
    this.column = options.column || '1';
    this.operation = options.operation;
-    this._isFloatColumn = null;
-    this.queries = queries;
 }

 Formula.prototype = Object.create(BaseOverviewsDataview.prototype);
@@ -63,38 +36,21 @@ Formula.prototype.constructor = Formula;

 module.exports = Formula;

-Formula.prototype.sql = function (psql, override, callback) {
-    var self = this;
+Formula.prototype.sql = function(psql, override, callback) {
    var formulaQueryTpl = formulaQueryTpls[this.operation];

-    if (formulaQueryTpl) {
+    if ( formulaQueryTpl ) {
        // supported formula for use with overviews
-        if (this._isFloatColumn === null) {
-            this._isFloatColumn = false;
-            this.getColumnType(psql, this.column, this.queries.no_filters, function (err, type) {
-                if (!err && !!type) {
-                    self._isFloatColumn = type.float;
-                }
-                self.sql(psql, override, callback);
-            });
-            return null;
-        }
-
        var formulaSql = formulaQueryTpl({
-            _isFloatColumn: this._isFloatColumn,
-            _query: this.rewrittenQuery(this.query),
+            _query:     this.rewrittenQuery(this.query),
            _operation: this.operation,
-            _column: this.column
+            _column:    this.column
        });
-
        callback = callback || override;

-        debug(formulaSql);
-
        return callback(null, formulaSql);
    }

-
    // default behaviour
    return this.defaultSql(psql, override, callback);
 };
--- a/lib/cartodb/models/dataview/overviews/histogram.js
+++ b/lib/cartodb/models/dataview/overviews/histogram.js
@@ -1,35 +1,23 @@
 var _ = require('underscore');
 var BaseOverviewsDataview = require('./base');
 var BaseDataview = require('../histogram');
-var debug = require('debug')('windshaft:dataview:histogram:overview');

 var dot = require('dot');
 dot.templateSettings.strip = false;

+var columnTypeQueryTpl = dot.template(
+    'SELECT pg_typeof({{=it.column}})::oid FROM ({{=it.query}}) _cdb_histogram_column_type limit 1'
+);
+
 var BIN_MIN_NUMBER = 6;
 var BIN_MAX_NUMBER = 48;

-var filteredQueryTpl = dot.template([
-    'filtered_source AS (',
-    '  SELECT *',
-    '  FROM ({{=it._query}}) _cdb_filtered_source',
-    '  WHERE',
-    '    {{=it._column}} IS NOT NULL',
-    '  {{?it._isFloatColumn}}AND',
-    '    {{=it._column}} != \'infinity\'::float',
-    '  AND',
-    '    {{=it._column}} != \'-infinity\'::float',
-    '  AND',
-    '    {{=it._column}} != \'NaN\'::float{{?}}',
-    ')'
-].join(' \n'));
-
 var basicsQueryTpl = dot.template([
    'basics AS (',
    '  SELECT',
    '    max({{=it._column}}) AS max_val, min({{=it._column}}) AS min_val,',
    '    sum({{=it._column}}*_feature_count)/sum(_feature_count) AS avg_val, sum(_feature_count) AS total_rows',
-    '  FROM filtered_source',
+    '  FROM ({{=it._query}}) _cdb_basics',
    ')'
 ].join(' \n'));

@@ -38,7 +26,7 @@ var overrideBasicsQueryTpl = dot.template([
    '  SELECT',
    '    max({{=it._end}}) AS max_val, min({{=it._start}}) AS min_val,',
    '    sum({{=it._column}}*_feature_count)/sum(_feature_count) AS avg_val, sum(_feature_count) AS total_rows',
-    '  FROM filtered_source',
+    '  FROM ({{=it._query}}) _cdb_basics',
    ')'
 ].join('\n'));

@@ -49,7 +37,7 @@ var iqrQueryTpl = dot.template([
    '    SELECT quartile, max(_cdb_iqr_column) AS quartile_max from (',
    '      SELECT {{=it._column}} AS _cdb_iqr_column, ntile(4) over (order by {{=it._column}}',
    '    ) AS quartile',
-    '    FROM filtered_source) _cdb_quartiles',
+    '    FROM ({{=it._query}}) _cdb_rank) _cdb_quartiles',
    '    WHERE quartile = 1 or quartile = 3',
    '    GROUP BY quartile',
    '  ) _cdb_iqr',
@@ -68,7 +56,7 @@ var binsQueryTpl = dot.template([
    '        )',
    '      )',
    '    END AS bins_number',
-    '  FROM basics, iqrange, filtered_source',
+    '  FROM basics, iqrange, ({{=it._query}}) _cdb_bins',
    '  LIMIT 1',
    ')'
 ].join('\n'));
@@ -88,34 +76,11 @@ var nullsQueryTpl = dot.template([
    ')'
 ].join('\n'));

-var infinitiesQueryTpl = dot.template([
-    'infinities AS (',
-    '  SELECT',
-    '    count(*) AS infinities_count',
-    '  FROM ({{=it._query}}) _cdb_histogram_infinities',
-    '  WHERE',
-    '    {{=it._column}} = \'infinity\'::float',
-    '  OR',
-    '    {{=it._column}} = \'-infinity\'::float',
-    ')'
-].join('\n'));
-
-var nansQueryTpl = dot.template([
-    'nans AS (',
-    '  SELECT',
-    '    count(*) AS nans_count',
-    '  FROM ({{=it._query}}) _cdb_histogram_infinities',
-    '  WHERE {{=it._column}} = \'NaN\'::float',
-    ')'
-].join('\n'));
-
 var histogramQueryTpl = dot.template([
    'SELECT',
    '    (max_val - min_val) / cast(bins_number as float) AS bin_width,',
    '    bins_number,',
    '    nulls_count,',
-    '    {{?it._isFloatColumn}}infinities_count,',
-    '    nans_count,{{?}}',
    '    avg_val,',
    '    CASE WHEN min_val = max_val',
    '      THEN 0',
@@ -125,14 +90,14 @@ var histogramQueryTpl = dot.template([
    '    max({{=it._column}})::numeric AS max,',
    '    sum({{=it._column}}*_feature_count)/sum(_feature_count)::numeric AS avg,',
    '    sum(_feature_count) AS freq',
-    'FROM filtered_source, basics, nulls, bins{{?it._isFloatColumn}},infinities, nans{{?}}',
+    'FROM ({{=it._query}}) _cdb_histogram, basics, nulls, bins',
+    'WHERE {{=it._column}} IS NOT NULL',
    'GROUP BY bin, bins_number, bin_width, nulls_count, avg_val',
-    '   {{?it._isFloatColumn}}, infinities_count, nans_count{{?}}',
    'ORDER BY bin'
 ].join('\n'));

 function Histogram(query, options, queryRewriter, queryRewriteData, params, queries) {
-    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params, queries);
+    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params);

    this.query = query;
    this.queries = queries;
@@ -147,23 +112,36 @@ Histogram.prototype.constructor = Histogram;

 module.exports = Histogram;

-Histogram.prototype.sql = function(psql, override, callback) {
-    var self = this;

+var DATE_OIDS = {
+    1082: true,
+    1114: true,
+    1184: true
+};
+
+Histogram.prototype.sql = function(psql, override, callback) {
    if (!callback) {
        callback = override;
        override = {};
    }

+    var self = this;
+
+    var _column = this.column;
+
+    var columnTypeQuery = columnTypeQueryTpl({
+        column: _column, query: this.rewrittenQuery(this.queries.no_filters)
+    });

    if (this._columnType === null) {
-        this.getColumnType(psql, this.column, this.queries.no_filters, function (err, type) {
+        psql.query(columnTypeQuery, function(err, result) {
            // assume numeric, will fail later
            self._columnType = 'numeric';
-            if (!err && !!type) {
-                self._columnType = Object.keys(type).find(function (key) {
-                    return type[key];
-                });
+            if (!err && !!result.rows[0]) {
+                var pgType = result.rows[0].pg_typeof;
+                if (DATE_OIDS.hasOwnProperty(pgType)) {
+                    self._columnType = 'date';
+                }
            }
            self.sql(psql, override, callback);
        }, true); // use read-only transaction
@@ -176,24 +154,11 @@ Histogram.prototype.sql = function(psql, override, callback) {
        return this.defaultSql(psql, override, callback);
    }

-    var histogramSql = this._buildQuery(override);
-
-    return callback(null, histogramSql);
-};
-
-Histogram.prototype._buildQuery = function (override) {
-    var filteredQuery, basicsQuery, binsQuery;
-    var _column = this.column;
    var _query = this.rewrittenQuery(this.query);

-    filteredQuery = filteredQueryTpl({
-        _isFloatColumn: this._columnType === 'float',
-        _query: _query,
-        _column: _column
-    });
+    var basicsQuery, binsQuery;

-    if (this._shouldOverride(override)) {
-        debug('overriding with %j', override);
+    if (override && _.has(override, 'start') && _.has(override, 'end') && _.has(override, 'bins')) {
        basicsQuery = overrideBasicsQueryTpl({
            _query: _query,
            _column: _column,
@@ -212,7 +177,7 @@ Histogram.prototype._buildQuery = function (override) {
            _column: _column
        });

-        if (this._shouldOverrideBins(override)) {
+        if (override && _.has(override, 'bins')) {
            binsQuery = [
                overrideBinsQueryTpl({
                    _bins: override.bins
@@ -233,50 +198,22 @@ Histogram.prototype._buildQuery = function (override) {
        }
    }

-    var cteSql = [
-        filteredQuery,
-        basicsQuery,
-        binsQuery,
-        nullsQueryTpl({
-            _query: _query,
-            _column: _column
-        })
-    ];
-
-    if (this._columnType === 'float') {
-        cteSql.push(
-            infinitiesQueryTpl({
-                _query: _query,
-                _column: _column
-            }),
-            nansQueryTpl({
-                _query: _query,
-                _column: _column
-            })
-        );
-    }

    var histogramSql = [
        "WITH",
-        cteSql.join(',\n'),
+        [
+            basicsQuery,
+            binsQuery,
+            nullsQueryTpl({
+                _query: _query,
+                _column: _column
+            })
+        ].join(',\n'),
        histogramQueryTpl({
-            _isFloatColumn: this._columnType === 'float',
            _query: _query,
            _column: _column
        })
    ].join('\n');

-    debug(histogramSql);
-
-    return histogramSql;
+    return callback(null, histogramSql);
 };
-
-Histogram.prototype._shouldOverride = function (override) {
-    return override && _.has(override, 'start') && _.has(override, 'end') && _.has(override, 'bins');
-};
-
-Histogram.prototype._shouldOverrideBins = function (override) {
-    return override && _.has(override, 'bins');
-};
-
-
--- a/lib/cartodb/models/dataview/overviews/list.js
+++ b/lib/cartodb/models/dataview/overviews/list.js
@@ -1,8 +1,8 @@
 var BaseOverviewsDataview = require('./base');
 var BaseDataview = require('../list');

-function List(query, options, queryRewriter, queryRewriteData, params, queries) {
-    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params, queries);
+function List(query, options, queryRewriter, queryRewriteData, params) {
+    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params);
 }

 List.prototype = Object.create(BaseOverviewsDataview.prototype);
--- a/lib/cartodb/models/filter/bbox.js
+++ b/lib/cartodb/models/filter/bbox.js
@@ -66,8 +66,7 @@ function getBoundingBoxes(west, south, east, north) {
        bboxes.push([west, south, east, north]);
    } else {
        bboxes.push([west, south, 180, north]);
-        // here we assume west,east have been adjusted => west >= -180 => east > 180
-        bboxes.push([-180, south, east - 360, north]);
+        bboxes.push([-180, south, east % 180, north]);
    }

    return bboxes;
--- a/lib/cartodb/models/mapconfig/adapter/mapconfig-buffer-size-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/mapconfig-buffer-size-adapter.js
@@ -1,25 +0,0 @@
-function MapConfigBufferSizeAdapter() {
-    this.formats = ['png', 'png32', 'mvt', 'grid.json'];
-}
-
-module.exports = MapConfigBufferSizeAdapter;
-
-MapConfigBufferSizeAdapter.prototype.getMapConfig = function (user, requestMapConfig, params, context, callback) {
-    if (!context.templateParams || !context.templateParams.buffersize) {
-        return callback(null, requestMapConfig);
-    }
-
-    this.formats.forEach(function (format) {
-        if (Number.isFinite(context.templateParams.buffersize[format])) {
-            if (requestMapConfig.buffersize === undefined) {
-                requestMapConfig.buffersize = {};
-            }
-
-            requestMapConfig.buffersize[format] = context.templateParams.buffersize[format];
-        }
-    });
-
-    setImmediate(function () {
-        callback(null, requestMapConfig);
-    });
-};
--- a/lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js
@@ -43,6 +43,7 @@ MapConfigNamedLayersAdapter.prototype.getMapConfig = function (user, requestMapC

                    if (nestedNamedLayers.length > 0) {
                        var nestedNamedMapsError = new Error('Nested named layers are not allowed');
+                        // nestedNamedMapsError.http_status = 400;
                        return done(nestedNamedMapsError);
                    }

--- a/lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js
@@ -4,6 +4,13 @@ var dot = require('dot');
 dot.templateSettings.strip = false;
 var queue = require('queue-async');
 var PSQL = require('cartodb-psql');
+/**
+ * cartodb-psql creates `global.Promise` as an empty constructor.
+ * However, `turbo-carto` relies on a polyfil that fails to create the polyfil
+ * as it finds `global.Promise` but it doesn't find `Promise.resolve`.
+ */
+global.Promise = global.Promise || function() {};
+global.Promise.resolve = global.Promise.resolve || function() {};
 var turboCarto = require('turbo-carto');

 var SubstitutionTokens = require('../../../utils/substitution-tokens');
--- a/lib/cartodb/models/mapconfig/provider/named-map-provider.js
+++ b/lib/cartodb/models/mapconfig/provider/named-map-provider.js
@@ -90,7 +90,6 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function(callback) {
        },
        function instantiateTemplate(err, templateParams) {
            assert.ifError(err);
-            context.templateParams = templateParams;
            return self.templateMaps.instance(self.template, templateParams);
        },
        function prepareAdapterMapConfig(err, requestMapConfig) {
--- a/lib/cartodb/server.js
+++ b/lib/cartodb/server.js
@@ -35,15 +35,12 @@ var timeoutErrorTile = require('fs').readFileSync(timeoutErrorTilePath, {encodin

 var SqlWrapMapConfigAdapter = require('./models/mapconfig/adapter/sql-wrap-mapconfig-adapter');
 var MapConfigNamedLayersAdapter = require('./models/mapconfig/adapter/mapconfig-named-layers-adapter');
-var MapConfigBufferSizeAdapter = require('./models/mapconfig/adapter/mapconfig-buffer-size-adapter');
 var AnalysisMapConfigAdapter = require('./models/mapconfig/adapter/analysis-mapconfig-adapter');
 var MapConfigOverviewsAdapter = require('./models/mapconfig/adapter/mapconfig-overviews-adapter');
 var TurboCartoAdapter = require('./models/mapconfig/adapter/turbo-carto-adapter');
 var DataviewsWidgetsAdapter = require('./models/mapconfig/adapter/dataviews-widgets-adapter');
 var MapConfigAdapter = require('./models/mapconfig/adapter');

-var StatsBackend = require('./backends/stats');
-
 module.exports = function(serverOptions) {
    // Make stats client globally accessible
    global.statsClient = StatsClient.getInstance(serverOptions.statsd);
@@ -153,14 +150,11 @@ module.exports = function(serverOptions) {

    var analysisBackend = new AnalysisBackend(metadataBackend, serverOptions.analysis);

-    var statsBackend = new StatsBackend();
-
    var layergroupAffectedTablesCache = new LayergroupAffectedTablesCache();
    app.layergroupAffectedTablesCache = layergroupAffectedTablesCache;

    var mapConfigAdapter = new MapConfigAdapter(
        new MapConfigNamedLayersAdapter(templateMaps, pgConnection),
-        new MapConfigBufferSizeAdapter(),
        new SqlWrapMapConfigAdapter(),
        new DataviewsWidgetsAdapter(),
        new AnalysisMapConfigAdapter(analysisBackend),
@@ -213,8 +207,7 @@ module.exports = function(serverOptions) {
        surrogateKeysCache,
        userLimitsApi,
        layergroupAffectedTablesCache,
-        mapConfigAdapter,
-        statsBackend
+        mapConfigAdapter
    ).register(app);

    new controller.NamedMaps(
--- a/lib/cartodb/utils/query-utils.js
+++ b/lib/cartodb/utils/query-utils.js
@@ -1,26 +0,0 @@
-function prepareQuery(sql) {
-  var affectedTableRegexCache = {
-      bbox: /!bbox!/g,
-      scale_denominator: /!scale_denominator!/g,
-      pixel_width: /!pixel_width!/g,
-      pixel_height: /!pixel_height!/g
-  };
-
-  return sql
-      .replace(affectedTableRegexCache.bbox, 'ST_MakeEnvelope(0,0,0,0)')
-      .replace(affectedTableRegexCache.scale_denominator, '0')
-      .replace(affectedTableRegexCache.pixel_width, '1')
-      .replace(affectedTableRegexCache.pixel_height, '1');
-}
-
-module.exports.extractTableNames = function extractTableNames(query) {
-    return [
-        'SELECT * FROM CDB_QueryTablesText($windshaft$',
-        prepareQuery(query),
-        '$windshaft$) as tablenames'
-    ].join('');
-};
-
-module.exports.getQueryRowCount = function getQueryRowEstimation(query) {
-    return 'select CDB_EstimateRowCount(\'' + query + '\') as rows';
-};
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "windshaft-cartodb",
-  "version": "3.9.8",
+  "version": "3.6.7",
  "description": "A map tile server for CartoDB",
  "keywords": [
    "cartodb"
@@ -16,13 +16,12 @@
  "contributors": [
    "Simon Tokumine <simon@vizzuality.com>",
    "Javi Santana <jsantana@vizzuality.com>",
-    "Sandro Santilli <strk@vizzuality.com>",
-    "Carlos Matallín <matallo@carto.com>"
+    "Sandro Santilli <strk@vizzuality.com>"
  ],
  "dependencies": {
    "body-parser": "~1.14.0",
-    "camshaft": "0.55.6",
-    "cartodb-psql": "0.8.0",
+    "camshaft": "0.54.4",
+    "cartodb-psql": "0.10.1",
    "cartodb-query-tables": "0.2.0",
    "cartodb-redis": "0.13.2",
    "debug": "~2.2.0",
@@ -38,22 +37,21 @@
    "request": "~2.79.0",
    "step": "~0.0.6",
    "step-profiler": "~0.3.0",
-    "turbo-carto": "0.19.2",
+    "turbo-carto": "0.19.0",
    "underscore": "~1.6.0",
-    "windshaft": "3.2.2",
+    "windshaft": "3.1.2",
    "yargs": "~5.0.0"
  },
  "devDependencies": {
    "istanbul": "~0.4.3",
-    "jshint": "~2.9.4",
-    "mocha": "~3.4.1",
+    "jshint": "~2.6.0",
+    "mocha": "~1.21.4",
    "nock": "~2.11.0",
    "redis": "~0.12.1",
    "semver": "~1.1.4",
    "strftime": "~0.8.2"
  },
  "scripts": {
-    "lint": "jshint lib test",
    "preinstall": "make pre-install",
    "test": "make test-all"
  },
--- a/test/acceptance/buffer-size-format.js
+++ b/test/acceptance/buffer-size-format.js
@@ -1,441 +0,0 @@
-require('../support/test_helper');
-
-var fs = require('fs');
-var assert = require('../support/assert');
-var TestClient = require('../support/test-client');
-var mapnik = require('windshaft').mapnik;
-var IMAGE_TOLERANCE_PER_MIL = 5;
-
-var CARTOCSS_LABELS = [
-    '#layer {',
-    '  polygon-fill: #374C70;',
-    '  polygon-opacity: 0.9;',
-    '  line-width: 1;',
-    '  line-color: #FFF;',
-    '  line-opacity: 0.5;',
-    '}',
-    '#layer::labels {',
-    '  text-name: [name];',
-    '  text-face-name: \'DejaVu Sans Book\';',
-    '  text-size: 20;',
-    '  text-fill: #FFFFFF;',
-    '  text-label-position-tolerance: 0;',
-    '  text-halo-radius: 1;',
-    '  text-halo-fill: #6F808D;',
-    '  text-dy: -10;',
-    '  text-allow-overlap: true;',
-    '  text-placement: point;',
-    '  text-placement-type: dummy;',
-    '}'
-].join('\n');
-
-function createMapConfig (bufferSize, cartocss) {
-    cartocss = cartocss || CARTOCSS_LABELS;
-
-    return {
-        version: '1.6.0',
-        buffersize: bufferSize,
-        layers: [{
-            type: "cartodb",
-            options: {
-                sql: [
-                    'select',
-                    '   *',
-                    'from',
-                    '   populated_places_simple_reduced',
-                ].join('\n'),
-                cartocss: cartocss,
-                cartocss_version: '2.3.0',
-                interactivity: 'cartodb_id'
-            }
-        }]
-    };
-}
-
-describe('buffer size per format', function () {
-    var testCases = [
-        {
-            desc: 'should get png tile using buffer-size 0',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'png',
-            fixturePath: './test/fixtures/buffer-size/tile-7.64.48-buffer-size-0.png',
-            mapConfig: createMapConfig({ png: 0, 'grid.json': 0 }),
-            assert: function (tile, callback) {
-                assert.imageIsSimilarToFile(tile, this.fixturePath, IMAGE_TOLERANCE_PER_MIL, callback);
-            }
-        },
-        {
-            desc: 'should get png tile using buffer-size 128',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'png',
-            fixturePath: './test/fixtures/buffer-size/tile-7.64.48-buffer-size-128.png',
-            mapConfig: createMapConfig({ png: 128, 'grid.json': 128 }),
-            assert: function (tile, callback) {
-                assert.imageIsSimilarToFile(tile, this.fixturePath, IMAGE_TOLERANCE_PER_MIL, callback);
-            }
-        },
-        {
-            desc: 'should get mvt tile using buffer-size 0',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'mvt',
-            fixturePath: './test/fixtures/buffer-size/tile-7.64.48-buffer-size-0.mvt',
-            mapConfig: createMapConfig({ mvt: 0 }),
-            assert: function (tile, callback) {
-                var tileJSON = tile.toJSON();
-                var features = tileJSON[0].features;
-                assert.equal(features.length, 1);
-                callback();
-            }
-        },
-        {
-            desc: 'should get mvt tile using buffer-size 128',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'mvt',
-            fixturePath: './test/fixtures/buffer-size/tile-7.64.48-buffer-size-128.mvt',
-            mapConfig: createMapConfig({ mvt: 128 }),
-            assert: function (tile, callback) {
-                var tileJSON = tile.toJSON();
-                var features = tileJSON[0].features;
-                assert.equal(features.length, 9);
-                callback();
-            }
-        },
-        {
-            desc: 'should get grid.json tile using buffer-size 0 overriden by template params',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'grid.json',
-            layers: [0],
-            fixturePath: './test/fixtures/buffer-size/tile-grid.json.7.64.48-buffer-size-0.grid.json',
-            mapConfig: createMapConfig({ 'grid.json': 0 }),
-            assert: function (tile, callback) {
-                assert.utfgridEqualsFile(tile, this.fixturePath, 2,callback);
-            }
-        },
-        {
-            desc: 'should get grid.json tile using buffer-size 128 overriden by template params',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'grid.json',
-            layers: [0],
-            fixturePath: './test/fixtures/buffer-size/tile-7.64.48-buffer-size-128.grid.json',
-            mapConfig: createMapConfig({ 'grid.json': 128 }),
-            assert: function (tile, callback) {
-                assert.utfgridEqualsFile(tile, this.fixturePath, 2, callback);
-            }
-        }
-    ];
-
-    testCases.forEach(function (test) {
-        it(test.desc, function (done) {
-            var testClient = new TestClient(test.mapConfig, 1234);
-            var coords = test.coords;
-            var options = {
-                format: test.format,
-                layers: test.layers
-            };
-            testClient.getTile(coords.z, coords.x, coords.y, options, function (err, res, tile) {
-                assert.ifError(err);
-                // To generate images use:
-                // tile.save(test.fixturePath);
-                test.assert(tile, function (err) {
-                    assert.ifError(err);
-                    testClient.drain(done);
-                });
-            });
-        });
-    });
-});
-
-function createBufferSizeTemplate (name, buffersize, placeholders, cartocss) {
-    cartocss = cartocss || CARTOCSS_LABELS;
-
-    return {
-        "version": "0.0.1",
-        "name": name,
-        "placeholders": placeholders || {
-            "buffersize": {
-                "type": "number",
-                "default": 0
-            }
-        },
-        "layergroup": createMapConfig(buffersize)
-    };
-}
-
-describe('buffer size per format for named maps', function () {
-    var testCases = [
-        {
-            desc: 'should get png tile using buffer-size 0 (default value in template)',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'png',
-            fixturePath: './test/fixtures/buffer-size/tile-7.64.48-buffer-size-0.png',
-            template: createBufferSizeTemplate('named-default-buffer-size', {png: '<%= buffersize %>'}),
-            assert: function (tile, callback) {
-                assert.imageIsSimilarToFile(tile, this.fixturePath, IMAGE_TOLERANCE_PER_MIL, callback);
-            }
-        },
-        {
-            desc: 'should get png tile using buffer-size 128 (placehoder value)',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'png',
-            placeholders: { buffersize: 128 },
-            fixturePath: './test/fixtures/buffer-size/tile-7.64.48-buffer-size-128.png',
-            template: createBufferSizeTemplate('named-custom-buffer-size', { png: '<%= buffersize %>'}),
-            assert: function (tile, callback) {
-                assert.imageIsSimilarToFile(tile, this.fixturePath, IMAGE_TOLERANCE_PER_MIL, callback);
-            }
-        },
-        {
-            desc: 'should get png tile using buffer-size 0 (default value in template by format)',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'png',
-            placeholders: { buffersize_png: 0 },
-            fixturePath: './test/fixtures/buffer-size/tile-7.64.48-buffer-size-0.png',
-            template: createBufferSizeTemplate('named-default-buffer-size-by-format', {
-                png: '<%= buffersize_png %>'
-            }, {
-                "buffersize_png": {
-                    "type": "number",
-                    "default": "0"
-                }
-            }),
-            assert: function (tile, callback) {
-                assert.imageIsSimilarToFile(tile, this.fixturePath, IMAGE_TOLERANCE_PER_MIL, callback);
-            }
-        },
-        {
-            desc: 'should get png tile using buffer-size 128 (placehoder value in template by format)',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'png',
-            placeholders: { buffersize_png: 128 },
-            fixturePath: './test/fixtures/buffer-size/tile-7.64.48-buffer-size-128.png',
-            template: createBufferSizeTemplate('named-custom-buffer-size-by-format', {
-                png: '<%= buffersize_png %>'
-            }, {
-                "buffersize_png": {
-                    "type": "number",
-                    "default": "0"
-                }
-            }),
-            assert: function (tile, callback) {
-                assert.imageIsSimilarToFile(tile, this.fixturePath, IMAGE_TOLERANCE_PER_MIL, callback);
-            }
-        },
-        {
-            desc: 'should get grid.json tile using buffer-size 0 overriden by template params',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'grid.json',
-            layers: [0],
-            placeholders: { buffersize_gridjson: 0 },
-            fixturePath: './test/fixtures/buffer-size/tile-grid.json.7.64.48-buffer-size-0.grid.json',
-            template: createBufferSizeTemplate('named-default-buffer-size-by-format-gridjson', {
-                'grid.json': '<%= buffersize_gridjson %>'
-            }, {
-                "buffersize_gridjson": {
-                    "type": "number",
-                    "default": "0"
-                }
-            }),
-            assert: function (tile, callback) {
-                assert.utfgridEqualsFile(tile, this.fixturePath, 2,callback);
-            }
-        },
-        {
-            desc: 'should get grid.json tile using buffer-size 128 overriden by template params',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'grid.json',
-            layers: [0],
-            placeholders: { buffersize_gridjson: 128 },
-            fixturePath: './test/fixtures/buffer-size/tile-7.64.48-buffer-size-128.grid.json',
-            template: createBufferSizeTemplate('named-custom-buffer-size-by-format-gridjson', {
-                'grid.json': '<%= buffersize_gridjson %>'
-            }, {
-                "buffersize_gridjson": {
-                    "type": "number",
-                    "default": "0"
-                }
-            }),
-            assert: function (tile, callback) {
-                assert.utfgridEqualsFile(tile, this.fixturePath, 2, callback);
-            }
-        }
-    ];
-
-    testCases.forEach(function (test) {
-        it(test.desc, function (done) {
-            var testClient = new TestClient(test.template, 1234);
-            var coords = test.coords;
-            var options = {
-                format: test.format,
-                placeholders: test.placeholders,
-                layers: test.layers
-            };
-            testClient.getTile(coords.z, coords.x, coords.y, options, function (err, res, tile) {
-                assert.ifError(err);
-                // To generate images use:
-                //tile.save('./test/fixtures/buffer-size/tile-7.64.48-buffer-size-0-test.png');
-                test.assert(tile, function (err) {
-                    assert.ifError(err);
-                    testClient.drain(done);
-                });
-            });
-        });
-    });
-});
-
-
-describe('buffer size per format for named maps w/o placeholders', function () {
-    var testCases = [
-        {
-            desc: 'should get png tile using buffer-size 0 overriden by template params',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'png',
-            placeholders: {
-                buffersize: {
-                    png: 0
-                }
-            },
-            fixturePath: './test/fixtures/buffer-size/tile-7.64.48-buffer-size-0.png',
-            template: createBufferSizeTemplate('named-no-buffer-size-png-0', {}, {}),
-            assert: function (tile, callback) {
-                assert.imageIsSimilarToFile(tile, this.fixturePath, IMAGE_TOLERANCE_PER_MIL, callback);
-            }
-        },
-        {
-            desc: 'should get png tile using buffer-size 128 overriden by template params',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'png',
-            placeholders: {
-                buffersize: {
-                    png: 128
-                }
-            },
-            fixturePath: './test/fixtures/buffer-size/tile-7.64.48-buffer-size-128.png',
-            template: createBufferSizeTemplate('named-no-buffer-size-png-128', {}, {}),
-            assert: function (tile, callback) {
-                assert.imageIsSimilarToFile(tile, this.fixturePath, IMAGE_TOLERANCE_PER_MIL, callback);
-            }
-        },
-        {
-            desc: 'should get mvt tile using buffer-size 0 overriden by template params',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'mvt',
-            placeholders: {
-                buffersize: {
-                    mvt: 0
-                }
-            },
-            fixturePath: './test/fixtures/buffer-size/tile-mvt-7.64.48-buffer-size-0.mvt',
-            template: createBufferSizeTemplate('named-no-buffer-size-mvt', {}, {}),
-            assert: function (tile, callback) {
-                var tileJSON = tile.toJSON();
-                var features = tileJSON[0].features;
-
-                var dataFixture = fs.readFileSync(this.fixturePath);
-                var vtile = new mapnik.VectorTile(this.coords.z, this.coords.x, this.coords.y);
-                vtile.setDataSync(dataFixture);
-                var vtileJSON = vtile.toJSON();
-                var vtileFeatures = vtileJSON[0].features;
-
-                assert.equal(features.length, vtileFeatures.length);
-                callback();
-            }
-        },
-        {
-            desc: 'should get mvt tile using buffer-size 128 overriden by template params',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'mvt',
-            placeholders: {
-                buffersize: {
-                    mvt: 128
-                }
-            },
-            fixturePath: './test/fixtures/buffer-size/tile-mvt-7.64.48-buffer-size-128.mvt',
-            template: createBufferSizeTemplate('named-no-buffer-size-mvt-128', {}, {}),
-            assert: function (tile, callback) {
-                var tileJSON = tile.toJSON();
-                var features = tileJSON[0].features;
-
-                var dataFixture = fs.readFileSync(this.fixturePath);
-                var vtile = new mapnik.VectorTile(this.coords.z, this.coords.x, this.coords.y);
-                vtile.setDataSync(dataFixture);
-                var vtileJSON = vtile.toJSON();
-                var vtileFeatures = vtileJSON[0].features;
-
-                assert.equal(features.length, vtileFeatures.length);
-                callback();
-            }
-        },
-        {
-            desc: 'should get grid.json tile using buffer-size 0 overriden by template params',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'grid.json',
-            layers: [0],
-            placeholders: {
-                buffersize: {
-                    'grid.json': 0
-                }
-            },
-            fixturePath: './test/fixtures/buffer-size/tile-grid.json.7.64.48-buffer-size-0.grid.json',
-            template: createBufferSizeTemplate('named-no-buffer-size-grid-json-0', {}, {}),
-            assert: function (tile, callback) {
-                assert.utfgridEqualsFile(tile, this.fixturePath, 2,callback);
-            }
-        },
-        {
-            desc: 'should get grid.json tile using buffer-size 128 overriden by template params',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'grid.json',
-            layers: [0],
-            placeholders: {
-                buffersize: {
-                    'grid.json': 128
-                }
-            },
-            fixturePath: './test/fixtures/buffer-size/tile-7.64.48-buffer-size-128.grid.json',
-            template: createBufferSizeTemplate('named-no-buffer-size-grid-json-128', {}, {}),
-            assert: function (tile, callback) {
-                assert.utfgridEqualsFile(tile, this.fixturePath, 2, callback);
-            }
-        },
-        {
-            desc: 'should get png tile using buffer-size 0' +
-                  ' overriden by template params with no buffersize in mapconfig',
-            coords: { z: 7, x: 64, y: 48 },
-            format: 'png',
-            placeholders: {
-                buffersize: {
-                    png: 0
-                }
-            },
-            fixturePath: './test/fixtures/buffer-size/tile-7.64.48-buffer-size-0.png',
-            template: createBufferSizeTemplate('named-no-buffer-size-mapconfig-png-0', undefined, {}),
-            assert: function (tile, callback) {
-                assert.imageIsSimilarToFile(tile, this.fixturePath, IMAGE_TOLERANCE_PER_MIL, callback);
-            }
-        },
-
-    ];
-
-    testCases.forEach(function (test) {
-        it(test.desc, function (done) {
-            var testClient = new TestClient(test.template, 1234);
-            var coords = test.coords;
-            var options = {
-                format: test.format,
-                placeholders: test.placeholders,
-                layers: test.layers
-            };
-            testClient.getTile(coords.z, coords.x, coords.y, options, function (err, res, tile) {
-                assert.ifError(err);
-                // To generate images use:
-                //tile.save(test.fixturePath);
-                // require('fs').writeFileSync(test.fixturePath, JSON.stringify(tile));
-                // require('fs').writeFileSync(test.fixturePath, tile.getDataSync());
-                test.assert(tile, function (err) {
-                    assert.ifError(err);
-                    testClient.drain(done);
-                });
-            });
-        });
-    });
-});
--- a/test/acceptance/dataviews/aggregation.js
+++ b/test/acceptance/dataviews/aggregation.js
@@ -145,182 +145,4 @@ describe('aggregations happy cases', function() {
            });
        });
    });
-
-    var widgetSearchExpects = {
-        'count': [ { category: 'other_a', value: 3 } ],
-        'sum': [ { category: 'other_a', value: 6 } ],
-        'avg': [ { category: 'other_a', value: 2 } ],
-        'max': [ { category: 'other_a', value: 3 } ],
-        'min': [ { category: 'other_a', value: 1 } ]
-    };
-
-    Object.keys(operations_and_values).forEach(function (operation) {
-        var description = 'should search OTHER category using "' + operation + '"';
-
-        it(description, function (done) {
-            this.testClient = new TestClient(aggregationOperationMapConfig(operation, query_other, 'cat', 'val'));
-            this.testClient.widgetSearch('cat', 'other_a', function (err, res, searchResult) {
-                assert.ifError(err);
-
-                assert.ok(searchResult);
-                assert.equal(searchResult.type, 'aggregation');
-
-                assert.equal(searchResult.categories.length, 1);
-                assert.deepEqual(
-                    searchResult.categories,
-                    widgetSearchExpects[operation]
-                );
-                done();
-            });
-        });
-    });
-});
-
-describe('aggregation-dataview: special float values', function() {
-
-    afterEach(function(done) {
-        if (this.testClient) {
-            this.testClient.drain(done);
-        } else {
-            done();
-        }
-    });
-
-    function createMapConfig(layers, dataviews, analysis) {
-        return {
-            version: '1.5.0',
-            layers: layers,
-            dataviews: dataviews || {},
-            analyses: analysis || []
-        };
-    }
-
-    var mapConfig = createMapConfig(
-        [
-            {
-                "type": "cartodb",
-                "options": {
-                    "source": {
-                        "id": "a0"
-                    },
-                    "cartocss": "#points { marker-width: 10; marker-fill: red; }",
-                    "cartocss_version": "2.3.0"
-                }
-            }
-        ],
-        {
-            val_aggregation: {
-                source: {
-                    id: 'a0'
-                },
-                type: 'aggregation',
-                options: {
-                    column: 'cat',
-                    aggregation: 'avg',
-                    aggregationColumn: 'val'
-                }
-            },
-            sum_aggregation_numeric: {
-                source: {
-                    id: 'a1'
-                },
-                type: 'aggregation',
-                options: {
-                    column: 'cat',
-                    aggregation: 'sum',
-                    aggregationColumn: 'val'
-                }
-            }
-        },
-        [
-            {
-                "id": "a0",
-                "type": "source",
-                "params": {
-                    "query": [
-                        'SELECT',
-                        '  null::geometry the_geom_webmercator,',
-                        '  CASE',
-                        '    WHEN x % 4 = 0 THEN \'infinity\'::float',
-                        '    WHEN x % 4 = 1 THEN \'-infinity\'::float',
-                        '    WHEN x % 4 = 2 THEN \'NaN\'::float',
-                        '    ELSE x',
-                        '  END AS val,',
-                        '  CASE',
-                        '    WHEN x % 2 = 0 THEN \'category_1\'',
-                        '    ELSE \'category_2\'',
-                        '  END AS cat',
-                        'FROM generate_series(1, 1000) x'
-                    ].join('\n')
-                }
-            }, {
-                "id": "a1",
-                "type": "source",
-                "params": {
-                    "query": [
-                        'SELECT',
-                        '  null::geometry the_geom_webmercator,',
-                        '  CASE',
-                        '    WHEN x % 3 = 0 THEN \'NaN\'::numeric',
-                        '    WHEN x % 3 = 1 THEN x',
-                        '    ELSE x',
-                        '  END AS val,',
-                        '  CASE',
-                        '    WHEN x % 2 = 0 THEN \'category_1\'',
-                        '    ELSE \'category_2\'',
-                        '  END AS cat',
-                        'FROM generate_series(1, 1000) x'
-                    ].join('\n')
-                }
-            }
-        ]
-    );
-
-    // Source a0
-    // -----------------------------------------------
-    // the_geom_webmercator  |    val    |    cat
-    // ----------------------+-----------+------------
-    //                       | -Infinity | category_2
-    //                       |       NaN | category_1
-    //                       |         3 | category_2
-    //                       |  Infinity | category_1
-    //                       | -Infinity | category_2
-    //                       |       NaN | category_1
-    //                       |         7 | category_2
-    //                       |  Infinity | category_1
-    //                       | -Infinity | category_2
-    //                       |       NaN | category_1
-    //                       |        11 | category_2
-    //                       |         " |          "
-
-    var filters = [{ own_filter: 0 }, {}];
-    filters.forEach(function (filter) {
-        it('should handle special float values using filter: ' + JSON.stringify(filter), function(done) {
-            this.testClient = new TestClient(mapConfig, 1234);
-            this.testClient.getDataview('val_aggregation', { own_filter: 0 }, function(err, dataview) {
-                assert.ifError(err);
-                assert.ok(dataview.infinities === (250 + 250));
-                assert.ok(dataview.nans === 250);
-                assert.ok(dataview.categories.length === 1);
-                dataview.categories.forEach(function (category) {
-                    assert.ok(category.category === 'category_2');
-                    assert.ok(category.value === 501);
-                });
-                done();
-            });
-        });
-
-        it('should handle special numeric values using filter: ' + JSON.stringify(filter), function(done) {
-            this.testClient = new TestClient(mapConfig, 1234);
-            this.testClient.getDataview('sum_aggregation_numeric', { own_filter: 0 }, function(err, dataview) {
-                assert.ifError(err);
-                assert.ok(dataview.nans === 333);
-                assert.ok(dataview.categories.length === 2);
-                dataview.categories.forEach(function (category) {
-                    assert.ok(category.value !== null);
-                });
-                done();
-            });
-        });
-    });
 });
--- a/test/acceptance/dataviews/formula.js
+++ b/test/acceptance/dataviews/formula.js
@@ -1,80 +0,0 @@
-require('../../support/test_helper');
-var assert = require('../../support/assert');
-var TestClient = require('../../support/test-client');
-
-function createMapConfig(layers, dataviews, analysis) {
-    return {
-        version: '1.5.0',
-        layers: layers,
-        dataviews: dataviews || {},
-        analyses: analysis || []
-    };
-}
-
-describe('formula-dataview: special float values', function() {
-
-    afterEach(function(done) {
-        if (this.testClient) {
-            this.testClient.drain(done);
-        } else {
-            done();
-        }
-    });
-
-    var mapConfig = createMapConfig(
-        [
-            {
-                "type": "cartodb",
-                "options": {
-                    "source": {
-                        "id": "a0"
-                    },
-                    "cartocss": "#points { marker-width: 10; marker-fill: red; }",
-                    "cartocss_version": "2.3.0"
-                }
-            }
-        ],
-        {
-            val_formula: {
-                source: {
-                    id: 'a0'
-                },
-                type: 'formula',
-                options: {
-                    column: 'val',
-                    operation: 'avg'
-                }
-            }
-        },
-        [
-            {
-                "id": "a0",
-                "type": "source",
-                "params": {
-                    "query": [
-                        'SELECT',
-                        '  null::geometry the_geom_webmercator,',
-                        '  CASE',
-                        '    WHEN x % 4 = 0 THEN \'infinity\'::float',
-                        '    WHEN x % 4 = 1 THEN \'-infinity\'::float',
-                        '    WHEN x % 4 = 2 THEN \'NaN\'::float',
-                        '    ELSE x',
-                        '  END AS val',
-                        'FROM generate_series(1, 1000) x'
-                    ].join('\n')
-                }
-            }
-        ]
-    );
-
-    it('should filter infinities out and count them in the summary', function(done) {
-        this.testClient = new TestClient(mapConfig, 1234);
-        this.testClient.getDataview('val_formula', {}, function(err, dataview) {
-            assert.ok(!err, err);
-            assert.equal(dataview.result, 501);
-            assert.ok(dataview.infinities === (250 + 250));
-            assert.ok(dataview.nans === 250);
-            done();
-        });
-    });
-});
--- a/test/acceptance/dataviews/histogram.js
+++ b/test/acceptance/dataviews/histogram.js
@@ -3,15 +3,6 @@ require('../../support/test_helper');
 var assert = require('../../support/assert');
 var TestClient = require('../../support/test-client');

-function createMapConfig(layers, dataviews, analysis) {
-    return {
-        version: '1.5.0',
-        layers: layers,
-        dataviews: dataviews || {},
-        analyses: analysis || []
-    };
-}
-
 describe('histogram-dataview', function() {

    afterEach(function(done) {
@@ -22,6 +13,15 @@ describe('histogram-dataview', function() {
        }
    });

+    function createMapConfig(layers, dataviews, analysis) {
+        return {
+            version: '1.5.0',
+            layers: layers,
+            dataviews: dataviews || {},
+            analyses: analysis || []
+        };
+    }
+
    var mapConfig = createMapConfig(
        [
            {
@@ -89,6 +89,7 @@ describe('histogram-dataview', function() {
        this.testClient = new TestClient(mapConfig, 1234);
        this.testClient.getDataview('pop_max_histogram', params, function(err, res) {
            assert.ok(!err, err);
+
            assert.ok(res.errors);
            assert.equal(res.errors.length, 1);
            assert.ok(res.errors[0].match(/Invalid number format for parameter 'bins'/));
@@ -97,70 +98,3 @@ describe('histogram-dataview', function() {
        });
    });
 });
-
-
-describe('histogram-dataview: special float valuer', function() {
-
-    afterEach(function(done) {
-        if (this.testClient) {
-            this.testClient.drain(done);
-        } else {
-            done();
-        }
-    });
-
-    var mapConfig = createMapConfig(
-        [
-            {
-                "type": "cartodb",
-                "options": {
-                    "source": {
-                        "id": "a0"
-                    },
-                    "cartocss": "#points { marker-width: 10; marker-fill: red; }",
-                    "cartocss_version": "2.3.0"
-                }
-            }
-        ],
-        {
-            val_histogram: {
-                source: {
-                    id: 'a0'
-                },
-                type: 'histogram',
-                options: {
-                    column: 'val'
-                }
-            }
-        },
-        [
-            {
-                "id": "a0",
-                "type": "source",
-                "params": {
-                    "query": [
-                        'SELECT',
-                        '  null::geometry the_geom_webmercator,',
-                        '  CASE',
-                        '    WHEN x % 4 = 0 THEN \'infinity\'::float',
-                        '    WHEN x % 4 = 1 THEN \'-infinity\'::float',
-                        '    WHEN x % 4 = 2 THEN \'NaN\'::float',
-                        '    ELSE x',
-                        '  END AS val',
-                        'FROM generate_series(1, 1000) x'
-                    ].join('\n')
-                }
-            }
-        ]
-    );
-
-    it('should filter infinities out and count them in the summary', function(done) {
-        this.testClient = new TestClient(mapConfig, 1234);
-        this.testClient.getDataview('val_histogram', {}, function(err, dataview) {
-            assert.ok(!err, err);
-            assert.ok(dataview.infinities === (250 + 250));
-            assert.ok(dataview.nans === 250);
-            done();
-        });
-    });
-});
--- a/test/acceptance/dataviews/overviews.js
+++ b/test/acceptance/dataviews/overviews.js
@@ -124,13 +124,6 @@ describe('dataviews using tables with overviews', function() {
                params: {
                  query: 'select * from test_table_overviews'
                }
-            },
-            {
-                id: 'data-source-special-float-values',
-                type: 'source',
-                params: {
-                  query: 'select * from test_special_float_values_table_overviews'
-                }
            }
        ],
        dataviews:  {
@@ -151,17 +144,6 @@ describe('dataviews using tables with overviews', function() {
                    aggregationColumn: 'name',
                }
            },
-            test_categories_special_values: {
-                type: 'aggregation',
-                source: {
-                    id: 'data-source-special-float-values'
-                },
-                options: {
-                    column: 'name',
-                    aggregation: 'sum',
-                    aggregationColumn: 'value',
-                }
-            },
            test_histogram: {
                type: 'histogram',
                source: {id: 'data-source'},
@@ -178,16 +160,6 @@ describe('dataviews using tables with overviews', function() {
                    bins: 2
                }
            },
-            test_histogram_special_values: {
-                type: 'histogram',
-                source: {
-                    id: 'data-source-special-float-values'
-                },
-                options: {
-                    column: 'value',
-                    bins: 2
-                }
-            },
            test_avg: {
                type: 'formula',
                source: {id: 'data-source'},
@@ -196,16 +168,6 @@ describe('dataviews using tables with overviews', function() {
                    operation: 'avg'
                }
            },
-            test_formula_sum_special_values: {
-                type: 'formula',
-                source: {
-                    id: 'data-source-special-float-values'
-                },
-                options: {
-                    column: 'value',
-                    operation: 'sum'
-                }
-            },
            test_count: {
                type: 'formula',
                source: {id: 'data-source'},
@@ -240,17 +202,6 @@ describe('dataviews using tables with overviews', function() {
                    cartocss_version: '2.3.0',
                    source: { id: 'data-source' }
                }
-            },
-            {
-                type: 'mapnik',
-                options: {
-                    sql: 'select * from test_special_float_values_table_overviews',
-                    cartocss: '#layer { marker-fill: red; marker-width: 32; marker-allow-overlap: true; }',
-                    cartocss_version: '2.3.0',
-                    source: {
-                        id: 'data-source-special-float-values'
-                    }
-                }
            }
        ]
    };
@@ -261,14 +212,7 @@ describe('dataviews using tables with overviews', function() {
            if (err) {
                return done(err);
            }
-            assert.deepEqual(formula_result, {
-                "operation":"sum",
-                "result":15,
-                "infinities": 0,
-                "nans": 0,
-                "nulls":0,
-                "type":"formula"
-            });
+            assert.deepEqual(formula_result, {"operation":"sum","result":15,"nulls":0,"type":"formula"});

            testClient.drain(done);
        });
@@ -280,14 +224,7 @@ describe('dataviews using tables with overviews', function() {
            if (err) {
                return done(err);
            }
-            assert.deepEqual(formula_result, {
-                "operation":"avg",
-                "result":3,
-                "nulls":0,
-                "type":"formula",
-                "infinities": 0,
-                "nans": 0
-            });
+            assert.deepEqual(formula_result, {"operation":"avg","result":3,"nulls":0,"type":"formula"});

            testClient.drain(done);
        });
@@ -299,14 +236,7 @@ describe('dataviews using tables with overviews', function() {
            if (err) {
                return done(err);
            }
-            assert.deepEqual(formula_result, {
-                "operation":"count",
-                "result":5,
-                "nulls":0,
-                "type":"formula",
-                "infinities": 0,
-                "nans": 0
-            });
+            assert.deepEqual(formula_result, {"operation":"count","result":5,"nulls":0,"type":"formula"});

            testClient.drain(done);
        });
@@ -318,14 +248,7 @@ describe('dataviews using tables with overviews', function() {
            if (err) {
                return done(err);
            }
-            assert.deepEqual(formula_result, {
-                "operation": "max",
-                "result": 5,
-                "nulls": 0,
-                "infinities": 0,
-                "nans": 0,
-                "type": "formula"
-            });
+            assert.deepEqual(formula_result, {"operation":"max","result":5,"nulls":0,"type":"formula"});

            testClient.drain(done);
        });
@@ -337,14 +260,7 @@ describe('dataviews using tables with overviews', function() {
            if (err) {
                return done(err);
            }
-            assert.deepEqual(formula_result, {
-                "operation": "min",
-                "result": 1,
-                "nulls": 0,
-                "infinities": 0,
-                "nans": 0,
-                "type": "formula"
-            });
+            assert.deepEqual(formula_result, {"operation":"min","result":1,"nulls":0,"type":"formula"});

            testClient.drain(done);
        });
@@ -359,14 +275,7 @@ describe('dataviews using tables with overviews', function() {
            if (err) {
                return done(err);
            }
-            assert.deepEqual(formula_result, {
-                "operation":"sum",
-                "result":15,
-                "nulls":0,
-                "infinities": 0,
-                "nans": 0,
-                "type":"formula"
-            });
+            assert.deepEqual(formula_result, {"operation":"sum","result":15,"nulls":0,"type":"formula"});

            testClient.drain(done);
        });
@@ -463,14 +372,7 @@ describe('dataviews using tables with overviews', function() {
                    if (err) {
                        return done(err);
                    }
-                    assert.deepEqual(formula_result, {
-                        "operation":"sum",
-                        "result":1,
-                        "nulls":0,
-                        "infinities": 0,
-                        "nans": 0,
-                        "type":"formula"
-                    });
+                    assert.deepEqual(formula_result, {"operation":"sum","result":1,"nulls":0,"type":"formula"});
                    testClient.drain(done);
                });
            });
@@ -481,14 +383,7 @@ describe('dataviews using tables with overviews', function() {
                    if (err) {
                        return done(err);
                    }
-                    assert.deepEqual(formula_result, {
-                        "operation":"avg",
-                        "result":1,
-                        "nulls":0,
-                        "infinities": 0,
-                        "nans": 0,
-                        "type":"formula"
-                    });
+                    assert.deepEqual(formula_result, {"operation":"avg","result":1,"nulls":0,"type":"formula"});

                    testClient.drain(done);
                });
@@ -500,14 +395,7 @@ describe('dataviews using tables with overviews', function() {
                    if (err) {
                        return done(err);
                    }
-                    assert.deepEqual(formula_result, {
-                        "operation":"count",
-                        "result":1,
-                        "infinities": 0,
-                        "nans": 0,
-                        "nulls":0,
-                        "type":"formula"
-                    });
+                    assert.deepEqual(formula_result, {"operation":"count","result":1,"nulls":0,"type":"formula"});

                    testClient.drain(done);
                });
@@ -519,14 +407,7 @@ describe('dataviews using tables with overviews', function() {
                    if (err) {
                        return done(err);
                    }
-                    assert.deepEqual(formula_result, {
-                        "operation": "max",
-                        "result": 1,
-                        "nulls": 0,
-                        "infinities": 0,
-                        "nans": 0,
-                        "type": "formula"
-                    });
+                    assert.deepEqual(formula_result, {"operation":"max","result":1,"nulls":0,"type":"formula"});

                    testClient.drain(done);
                });
@@ -538,14 +419,7 @@ describe('dataviews using tables with overviews', function() {
                    if (err) {
                        return done(err);
                    }
-                    assert.deepEqual(formula_result, {
-                        "operation": "min",
-                        "result": 1,
-                        "nulls": 0,
-                        "infinities": 0,
-                        "nans": 0,
-                        "type": "formula"
-                    });
+                    assert.deepEqual(formula_result, {"operation":"min","result":1,"nulls":0,"type":"formula"});

                    testClient.drain(done);
                });
@@ -563,14 +437,7 @@ describe('dataviews using tables with overviews', function() {
                    if (err) {
                        return done(err);
                    }
-                    assert.deepEqual(formula_result, {
-                        "operation":"sum",
-                        "result":1,
-                        "nulls":0,
-                        "infinities": 0,
-                        "nans": 0,
-                        "type":"formula"
-                    });
+                    assert.deepEqual(formula_result, {"operation":"sum","result":1,"nulls":0,"type":"formula"});
                    testClient.drain(done);
                });
            });
@@ -578,69 +445,5 @@ describe('dataviews using tables with overviews', function() {

        });

-        describe('aggregation special float values', function () {
-            var params = {};
-
-            it("should expose an aggregation dataview filtering special float values out", function (done) {
-                var testClient = new TestClient(overviewsMapConfig);
-                testClient.getDataview('test_categories_special_values', params, function (err, dataview) {
-                    if (err) {
-                        return done(err);
-                    }
-                    assert.deepEqual(dataview, {
-                        aggregation: 'sum',
-                        count: 5,
-                        nulls: 0,
-                        nans: 1,
-                        infinities: 1,
-                        min: 6,
-                        max: 6,
-                        categoriesCount: 1,
-                        categories: [ { category: 'Hawai', value: 6, agg: false } ],
-                        type: 'aggregation'
-                    });
-                    testClient.drain(done);
-                });
-            });
-
-            it('should expose a histogram dataview filtering special float values out', function (done) {
-                var testClient = new TestClient(overviewsMapConfig);
-                testClient.getDataview('test_histogram_special_values', params, function (err, dataview) {
-                    if (err) {
-                        return done(err);
-                    }
-                    assert.deepEqual(dataview, {
-                        bin_width: 0,
-                        bins_count: 1,
-                        bins_start: 3,
-                        nulls: 0,
-                        infinities: 1,
-                        nans: 1,
-                        avg: 3,
-                        bins: [ { bin: 0, min: 3, max: 3, avg: 3, freq: 2 } ],
-                        type: 'histogram'
-                    });
-                    testClient.drain(done);
-                });
-            });
-
-            it('should expose a formula (sum) dataview filtering special float values out', function (done) {
-                var testClient = new TestClient(overviewsMapConfig);
-                testClient.getDataview('test_formula_sum_special_values', params, function (err, dataview) {
-                    if (err) {
-                        return done(err);
-                    }
-                    assert.deepEqual(dataview, {
-                        operation: 'sum',
-                        result: 6,
-                        nulls: 0,
-                        nans: 1,
-                        infinities: 1,
-                        type: 'formula'
-                    });
-                    testClient.drain(done);
-                });
-            });
-        });
    });
 });
--- a/test/acceptance/multilayer.js
+++ b/test/acceptance/multilayer.js
@@ -1041,7 +1041,7 @@ describe(suiteName, function() {
          );
        });
    }
-
+    
    // See https://github.com/CartoDB/Windshaft-cartodb/issues/91
    // and https://github.com/CartoDB/Windshaft-cartodb/issues/38
    it("tiles for private tables can be fetched with api_key", function(done) {
--- a/test/acceptance/mvt.js
+++ b/test/acceptance/mvt.js
@@ -1,53 +0,0 @@
-require('../support/test_helper');
-
-const assert = require('../support/assert');
-const TestClient = require('../support/test-client');
-
-function createMapConfig (sql = TestClient.SQL.ONE_POINT) {
-    return {
-        version: '1.6.0',
-        layers: [{
-            type: "cartodb",
-            options: {
-                sql: sql,
-                cartocss: TestClient.CARTOCSS.POINTS,
-                cartocss_version: '2.3.0',
-                interactivity: 'cartodb_id'
-            }
-        }]
-    };
-}
-
-describe('mvt', function () {
-    const testCases = [
-        {
-            desc: 'should get empty mvt with code 204 (no content)',
-            coords: { z: 0, x: 0, y: 0 },
-            format: 'mvt',
-            status: 204,
-            mapConfig: createMapConfig(TestClient.SQL.EMPTY)
-        },
-        {
-            desc: 'should get mvt tile with code 200 (ok)',
-            coords: { z: 0, x: 0, y: 0 },
-            format: 'mvt',
-            status: 200,
-            mapConfig: createMapConfig()
-        }
-    ];
-
-    testCases.forEach(function (test) {
-        it(test.desc, done => {
-            const testClient = new TestClient(test.mapConfig, 1234);
-            const { z, x, y } = test.coords;
-            const { format, status } = test;
-
-            testClient.getTile(z, x, y, { format, status }, (err, res) => {
-                assert.ifError(err);
-
-                assert.equal(res.statusCode, test.status);
-                testClient.drain(done);
-            });
-        });
-    });
-});
--- a/test/acceptance/ported/multilayer_error_cases.js
+++ b/test/acceptance/ported/multilayer_error_cases.js
@@ -5,7 +5,6 @@ var step = require('step');
 var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 var testClient = require('./support/test_client');
-var TestClient = require('../../support/test-client');

 var BaseController = require('../../../lib/cartodb/controllers/base');

@@ -24,14 +23,6 @@ describe('multilayer error cases', function() {
        BaseController.prototype.req2params = req2paramsFn;
    });

-    // var client = null;
-    afterEach(function(done) {
-        if (this.client) {
-            return this.client.drain(done);
-        }
-        return done();
-    });
-
    it("post layergroup with wrong Content-Type", function(done) {
        assert.response(server, {
            url: '/database/windshaft_test/layergroup',
@@ -162,16 +153,24 @@ describe('multilayer error cases', function() {
        ]
      };
      ServerOptions.afterLayergroupCreateCalls = 0;
-      this.client = new TestClient(layergroup);
-      this.client.getLayergroup({status: 400}, function(err, parsed) {
-        assert.ok(!err, err);
-        // See http://github.com/CartoDB/Windshaft/issues/159
-        assert.equal(ServerOptions.afterLayergroupCreateCalls, 0);
-        assert.ok(parsed);
-        assert.equal(parsed.errors.length, 1);
-        var error = parsed.errors[0];
-        assert.ok(error.match(/column "missing" does not exist/m), error);
-        done();
+      assert.response(server, {
+          url: '/database/windshaft_test/layergroup',
+          method: 'POST',
+          headers: {'Content-Type': 'application/json' },
+          data: JSON.stringify(layergroup)
+      }, {}, function(res) {
+        try {
+          assert.equal(res.statusCode, 400, res.statusCode + ': ' + res.body);
+          // See http://github.com/CartoDB/Windshaft/issues/159
+          assert.equal(ServerOptions.afterLayergroupCreateCalls, 0);
+          var parsed = JSON.parse(res.body);
+          assert.ok(parsed);
+          assert.equal(parsed.errors.length, 1);
+          var error = parsed.errors[0];
+          assert.ok(error.match(/column "missing" does not exist/m), error);
+          // TODO: check which layer introduced the problem ?
+          done();
+        } catch (err) { done(err); }
      });
    });

--- a/test/acceptance/ported/server_png8_format.js
+++ b/test/acceptance/ported/server_png8_format.js
@@ -16,13 +16,13 @@ describe('server_png8_format', function() {
    var serverOptionsPng32 = ServerOptions;
    serverOptionsPng32.grainstore = _.clone(ServerOptions.grainstore);
    serverOptionsPng32.grainstore.mapnik_tile_format = 'png32';
-    var serverPng32 = cartodbServer(serverOptionsPng32);
+    var serverPng32 = new cartodbServer(serverOptionsPng32);
    serverPng32.setMaxListeners(0);

    var serverOptionsPng8 = ServerOptions;
    serverOptionsPng8.grainstore = _.clone(ServerOptions.grainstore);
    serverOptionsPng8.grainstore.mapnik_tile_format = 'png8:m=h';
-    var serverPng8 = cartodbServer(serverOptionsPng8);
+    var serverPng8 = new cartodbServer(serverOptionsPng8);
    serverPng8.setMaxListeners(0);


--- a/test/acceptance/stats/mapnik_stats_layergroup.js
+++ b/test/acceptance/stats/mapnik_stats_layergroup.js
@@ -1,279 +0,0 @@
-require('../../support/test_helper');
-
-var assert = require('../../support/assert');
-var TestClient = require('../../support/test-client');
-
-describe('Create mapnik layergroup', function() {
-    before(function() {
-        this.layerStatsConfig = global.environment.enabledFeatures.layerStats;
-        global.environment.enabledFeatures.layerStats = true;
-    });
-
-    after(function() {
-        global.environment.enabledFeatures.layerStats = this.layerStatsConfig;
-    });
-
-    var cartocssVersion = '2.3.0';
-    var cartocss = '#layer { line-width:16; }';
-
-    var mapnikLayer1 = {
-        type: 'mapnik',
-        options: {
-            sql: 'select * from test_table limit 1',
-            cartocss_version: cartocssVersion,
-            cartocss: cartocss
-        }
-    };
-
-    var mapnikLayer2 = {
-        type: 'mapnik',
-        options: {
-            sql: 'select * from test_table_2 limit 2',
-            cartocss_version: cartocssVersion,
-            cartocss: cartocss
-        }
-    };
-
-    var mapnikLayer3 = {
-        type: 'mapnik',
-        options: {
-            sql: 'select * from test_table_3 limit 3',
-            cartocss_version: cartocssVersion,
-            cartocss: cartocss
-        }
-    };
-
-    var mapnikLayer4 = {
-        type: 'mapnik',
-        options: {
-            sql: [
-                'select t1.cartodb_id, t1.the_geom, t1.the_geom_webmercator, t2.address',
-                ' from test_table t1, test_table_2 t2',
-                ' where t1.cartodb_id = t2.cartodb_id;'
-            ].join(''),
-            cartocss_version: cartocssVersion,
-            cartocss: cartocss
-        }
-    };
-
-    var httpLayer = {
-        type: 'http',
-        options: {
-            urlTemplate: 'http://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png',
-            subdomains: ['a','b','c']
-        }
-    };
-
-    var mapnikLayerGeomColumn = {
-        type: 'mapnik',
-        options: {
-            sql: 'select *, the_geom as my_geom from test_table_3 limit 2',
-            geom_column: 'my_geom',
-            cartocss_version: cartocssVersion,
-            cartocss: cartocss
-        }
-    };
-
-    function mapnikBasicLayerId(index) {
-        return 'layer' + index;
-    }
-    function typeLayerId(type, index) {
-        return type + '-' + mapnikBasicLayerId(index);
-    }
-
-    it('with one mapnik layer should response with meta-stats for that layer', function(done) {
-        var testClient = new TestClient({
-            version: '1.4.0',
-            layers: [
-                mapnikLayer1
-            ]
-        });
-
-        testClient.getLayergroup(function(err, layergroup) {
-            assert.ok(!err);
-            assert.equal(layergroup.metadata.layers[0].id, mapnikBasicLayerId(0));
-            assert.equal(layergroup.metadata.layers[0].meta.stats.estimatedFeatureCount, 1);
-            testClient.drain(done);
-        });
-    });
-
-    it('with two mapnik layer should response with meta-stats for every layer', function(done) {
-        var testClient = new TestClient({
-            version: '1.4.0',
-            layers: [
-                mapnikLayer1,
-                mapnikLayer2
-            ]
-        });
-
-        testClient.getLayergroup(function(err, layergroup) {
-            assert.ok(!err);
-            assert.equal(layergroup.metadata.layers[0].id, mapnikBasicLayerId(0));
-            assert.equal(layergroup.metadata.layers[0].meta.stats.estimatedFeatureCount, 1);
-            assert.equal(layergroup.metadata.layers[1].id, mapnikBasicLayerId(1));
-            assert.equal(layergroup.metadata.layers[1].meta.stats.estimatedFeatureCount, 2);
-            testClient.drain(done);
-        });
-    });
-
-    it('with three mapnik layer should response with meta-stats for every layer', function(done) {
-        var testClient = new TestClient({
-            version: '1.4.0',
-            layers: [
-                mapnikLayer1,
-                mapnikLayer2,
-                mapnikLayer3
-            ]
-        });
-
-        testClient.getLayergroup(function(err, layergroup) {
-            assert.ok(!err);
-            assert.equal(layergroup.metadata.layers[0].id, mapnikBasicLayerId(0));
-            assert.equal(layergroup.metadata.layers[0].meta.stats.estimatedFeatureCount, 1);
-            assert.equal(layergroup.metadata.layers[1].id, mapnikBasicLayerId(1));
-            assert.equal(layergroup.metadata.layers[1].meta.stats.estimatedFeatureCount, 2);
-            assert.equal(layergroup.metadata.layers[2].id, mapnikBasicLayerId(2));
-            assert.equal(layergroup.metadata.layers[2].meta.stats.estimatedFeatureCount, 3);
-            testClient.drain(done);
-        });
-    });
-
-    it('with one mapnik layer (sql with join) should response with meta-stats for that layer', function(done) {
-        var testClient = new TestClient({
-            version: '1.4.0',
-            layers: [
-                mapnikLayer4
-            ]
-        });
-
-        testClient.getLayergroup(function(err, layergroup) {
-            assert.ok(!err);
-            assert.equal(layergroup.metadata.layers[0].id, mapnikBasicLayerId(0));
-            assert.equal(layergroup.metadata.layers[0].meta.stats.estimatedFeatureCount, 5);
-            testClient.drain(done);
-        });
-    });
-
-    it('with two mapnik layer (sql with join) should response with meta-stats for every layer', function(done) {
-        var testClient = new TestClient({
-            version: '1.4.0',
-            layers: [
-                mapnikLayer4,
-                mapnikLayer4
-            ]
-        });
-
-        testClient.getLayergroup(function(err, layergroup) {
-            assert.ok(!err);
-            assert.equal(layergroup.metadata.layers[0].id, mapnikBasicLayerId(0));
-            assert.equal(layergroup.metadata.layers[0].meta.stats.estimatedFeatureCount, 5);
-            assert.equal(layergroup.metadata.layers[1].id, mapnikBasicLayerId(1));
-            assert.equal(layergroup.metadata.layers[1].meta.stats.estimatedFeatureCount, 5);
-            testClient.drain(done);
-        });
-    });
-
-    it('with two mapnik layer (with & without join) should response with meta-stats for every layer', function(done) {
-        var testClient = new TestClient({
-            version: '1.4.0',
-            layers: [
-                mapnikLayer3,
-                mapnikLayer4
-            ]
-        });
-
-        testClient.getLayergroup(function(err, layergroup) {
-            assert.ok(!err);
-            assert.equal(layergroup.metadata.layers[0].id, mapnikBasicLayerId(0));
-            assert.equal(layergroup.metadata.layers[0].meta.stats.estimatedFeatureCount, 3);
-            assert.ok(!layergroup.metadata.layers[0].meta.stats[1]);
-            assert.equal(layergroup.metadata.layers[1].id, mapnikBasicLayerId(1));
-            assert.equal(layergroup.metadata.layers[1].meta.stats.estimatedFeatureCount, 5);
-            assert.ok(!layergroup.metadata.layers[2]);
-            testClient.drain(done);
-        });
-    });
-
-    it('with mapnik and layer and httplayer should response with layer metadata with same order', function(done) {
-        var testClient = new TestClient({
-            version: '1.4.0',
-            layers: [
-                mapnikLayer1,
-                httpLayer
-            ]
-        });
-
-        testClient.getLayergroup(function(err, layergroup) {
-            assert.ok(!err);
-            assert.equal(layergroup.metadata.layers[0].id, mapnikBasicLayerId(0));
-            assert.equal(layergroup.metadata.layers[0].type, 'mapnik');
-            assert.equal(layergroup.metadata.layers[0].meta.stats.estimatedFeatureCount, 1);
-            assert.equal(layergroup.metadata.layers[1].id, typeLayerId('http', 0));
-            assert.equal(layergroup.metadata.layers[1].type, 'http');
-            testClient.drain(done);
-        });
-    });
-
-    it('with httpLayer and mapnik layer should response with layer metadata with same order', function(done) {
-        var testClient = new TestClient({
-            version: '1.4.0',
-            layers: [
-                httpLayer,
-                mapnikLayer1
-            ]
-        });
-
-        testClient.getLayergroup(function (err, layergroup) {
-            assert.ok(!err);
-            assert.equal(layergroup.metadata.layers[0].id, typeLayerId('http', 0));
-            assert.equal(layergroup.metadata.layers[0].type, 'http');
-            assert.ok(!layergroup.metadata.layers[0].meta.cartocss);
-            assert.equal(layergroup.metadata.layers[1].meta.stats.estimatedFeatureCount, 1);
-            assert.equal(layergroup.metadata.layers[1].id, mapnikBasicLayerId(0));
-            assert.equal(layergroup.metadata.layers[1].type, 'mapnik');
-            assert.equal(layergroup.metadata.layers[1].meta.cartocss, cartocss);
-            testClient.drain(done);
-        });
-    });
-
-    it('should work with different geom_column', function(done) {
-        var testClient = new TestClient({
-            version: '1.4.0',
-            layers: [
-                mapnikLayerGeomColumn
-            ]
-        });
-
-        testClient.getLayergroup(function(err, layergroup) {
-            assert.ok(!err);
-            assert.equal(layergroup.metadata.layers[0].id, mapnikBasicLayerId(0));
-            // we don't care about stats here as is an aliased column
-            assert.ok(layergroup.metadata.layers[0].meta.stats.hasOwnProperty('estimatedFeatureCount'));
-            testClient.drain(done);
-        });
-    });
-
-    it('should not include the stats part if the FF is disabled', function(done) {
-        global.environment.enabledFeatures.layerStats = false;
-        var testClient = new TestClient({
-            version: '1.4.0',
-            layers: [
-                httpLayer,
-                mapnikLayer1,
-                httpLayer
-            ]
-        });
-
-        testClient.getLayergroup(function(err, layergroup) {
-            assert.ok(!err);
-            assert.equal(layergroup.metadata.layers[0].id, typeLayerId('http', 0));
-            assert.equal(layergroup.metadata.layers[0].type, 'http');
-            assert.equal(layergroup.metadata.layers[1].id, mapnikBasicLayerId(0));
-            assert.equal(layergroup.metadata.layers[1].type, 'mapnik');
-            assert.ok(!layergroup.metadata.layers[1].meta.hasOwnProperty('stats'));
-            assert.equal(layergroup.metadata.layers[2].id, typeLayerId('http', 1));
-            assert.equal(layergroup.metadata.layers[2].type, 'http');
-            testClient.drain(done);
-        });
-    });
-});
--- a/test/acceptance/stats/multilayer_stats.js
+++ b/test/acceptance/stats/multilayer_stats.js
@@ -1,225 +0,0 @@
-require('../../support/test_helper');
-
-var assert = require('../../support/assert');
-var TestClient = require('../../support/test-client');
-
-describe('multilayer stats disabled', function() {
-
-    before(function () {
-        this.layerMetadataConfig = global.environment.enabledFeatures.layerMetadata;
-        this.layerStatsConfig = global.environment.enabledFeatures.layerStats;
-        global.environment.enabledFeatures.layerMetadata = true;
-        global.environment.enabledFeatures.layerStats = false;
-    });
-
-    after(function () {
-        global.environment.enabledFeatures.layerMetadata = this.layerMetadataConfig;
-        global.environment.enabledFeatures.layerStats = this.layerStatsConfig;
-    });
-
-
-    function testLayerMetadataStats(testScenario) {
-
-        it(testScenario.desc, function(done) {
-            var mapConfig =  {
-                version: '1.3.0',
-                layers: testScenario.layers
-            };
-
-            var testClient = new TestClient(mapConfig);
-
-            testClient.getLayergroup(function(err, layergroup) {
-                assert.ifError(err);
-                layergroup.metadata.layers.forEach(function (layer) {
-                    if (layer.type !== 'torque' && layer.type !== 'mapnik') {
-                        assert.ok(!('stats' in layer.meta));
-                    } else if (layer.type !== 'torque') {
-                        assert.ok(!('stats' in layer.meta));
-                        assert.ok('cartocss' in layer.meta);
-                    } else {
-                        assert.ok('cartocss' in layer.meta);
-                        // check torque metadata at least match in number
-                        var torqueLayers = mapConfig.layers.filter(function(layer) { return layer.type === 'torque'; });
-                        if (torqueLayers.length) {
-                            assert.equal(Object.keys(layergroup.metadata.torque).length, torqueLayers.length);
-                        }
-                    }
-                });
-
-                testClient.drain(done);
-            });
-        });
-    }
-
-    var cartocssVersion = '2.3.0';
-    var cartocss = '#layer { line-width:16; }';
-    var sql = "select 1 as i, st_setsrid('LINESTRING(0 0, 1 0)'::geometry, 4326) as the_geom, " +
-              "st_setsrid('LINESTRING(0 0, 1 0)'::geometry, 3857) as the_geom_webmercator";
-    var sqlWadus = "select 1 as wadus, st_setsrid('LINESTRING(0 0, 1 0)'::geometry, 4326) as the_geom, " +
-                   "st_setsrid('LINESTRING(0 0, 1 0)'::geometry, 3857) as the_geom_webmercator";
-
-    var httpLayer = {
-        type: 'http',
-        options: {
-            urlTemplate: 'http://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png',
-            subdomains: ['a','b','c']
-        }
-    };
-
-    var torqueLayer = {
-        type: 'torque',
-        options: {
-            sql: "select 1 id, '1970-01-02'::date d, 'POINT(0 0)'::geometry the_geom_webmercator",
-            cartocss: [
-                "Map {",
-                    "-torque-frame-count:2;",
-                    "-torque-resolution:3;",
-                    "-torque-time-attribute:d;",
-                    "-torque-aggregation-function:'count(id)';",
-                "}"
-            ].join(' '),
-            cartocss_version: '2.0.1'
-        }
-    };
-
-    var mapnikLayer = {
-        type: 'mapnik',
-        options: {
-            sql: sql,
-            cartocss_version: cartocssVersion,
-            cartocss: cartocss
-        }
-    };
-
-    var mapnikInteractivityLayer = {
-        type: 'mapnik',
-        options: {
-            sql: sql,
-            cartocss_version: cartocssVersion,
-            cartocss: cartocss,
-            interactivity: 'i'
-        }
-    };
-
-    var cartodbLayer = {
-        type: 'cartodb',
-        options: {
-            sql: sql,
-            cartocss_version: cartocssVersion,
-            cartocss: cartocss
-        }
-    };
-
-    var cartodbInteractivityLayer = {
-        type: 'cartodb',
-        options: {
-            sql: sql,
-            cartocss_version: cartocssVersion,
-            cartocss: cartocss,
-            interactivity: 'i'
-        }
-    };
-
-    var cartodbWadusInteractivityLayer = {
-        type: 'cartodb',
-        options: {
-            sql: sqlWadus,
-            cartocss_version: cartocssVersion,
-            cartocss: cartocss,
-            interactivity: 'wadus'
-        }
-    };
-
-    var noTypeLayer = {
-        options: {
-            sql: sql,
-            cartocss_version: cartocssVersion,
-            cartocss: cartocss
-        }
-    };
-
-    var noTypeInteractivityLayer = {
-        options: {
-            sql: sql,
-            cartocss_version: cartocssVersion,
-            cartocss: cartocss,
-            interactivity: 'i'
-        }
-    };
-
-    var testScenarios = [
-        {
-            desc: 'one layer, no interactivity',
-            layers: [cartodbLayer]
-        },
-        {
-            desc: 'two layers, different interactivity columns',
-            layers: [
-                cartodbWadusInteractivityLayer,
-                cartodbInteractivityLayer
-            ]
-        },
-        {
-            desc: 'torque + interactivity layers',
-            layers: [
-                torqueLayer,
-                cartodbWadusInteractivityLayer,
-                cartodbInteractivityLayer
-            ]
-        },
-        {
-            desc: 'interactivity + torque + interactivity',
-            layers: [
-                cartodbInteractivityLayer,
-                torqueLayer,
-                cartodbInteractivityLayer
-            ]
-        },
-        {
-            desc: 'http + interactivity + torque + no interactivity + torque + interactivity',
-            layers: [
-                httpLayer,
-                cartodbInteractivityLayer,
-                torqueLayer,
-                cartodbLayer,
-                torqueLayer,
-                cartodbWadusInteractivityLayer
-            ]
-        },
-        {
-            desc: 'mapnik type – two layers, interactivity mix',
-            layers: [
-                mapnikLayer,
-                mapnikInteractivityLayer
-            ]
-        },
-        {
-            desc: 'mapnik type – http + interactivity + torque + interactivity',
-            layers: [
-                httpLayer,
-                mapnikInteractivityLayer,
-                torqueLayer,
-                cartodbInteractivityLayer
-            ]
-        },
-        {
-            desc: 'no type – two layers, interactivity mix',
-            layers: [
-                noTypeLayer,
-                noTypeInteractivityLayer
-            ]
-        },
-        {
-            desc: 'no type – http + interactivity + torque + interactivity',
-            layers: [
-                httpLayer,
-                noTypeInteractivityLayer,
-                torqueLayer,
-                noTypeInteractivityLayer
-            ]
-        }
-    ];
-
-    testScenarios.forEach(testLayerMetadataStats);
-
-});
--- a/test/acceptance/widgets/ported/aggregation.js
+++ b/test/acceptance/widgets/ported/aggregation.js
@@ -322,25 +322,6 @@ describe('widgets', function() {
                    });
                });
            });
-
-            [adm0name].forEach(function(userQuery) {
-                it('should search with sum aggregation: ' + userQuery, function(done) {
-                    this.testClient = new TestClient(aggregationSumMapConfig);
-                    this.testClient.widgetSearch('adm0name', userQuery, function (err, res, searchResult) {
-                        assert.ok(!err, err);
-                        assert.ok(searchResult);
-                        assert.equal(searchResult.type, 'aggregation');
-
-                        assert.equal(searchResult.categories.length, 1);
-                        assert.deepEqual(
-                            searchResult.categories,
-                            [{ category:"Argentina", value:28015640 }]
-                        );
-
-                        done();
-                    });
-                });
-            });
        });

    });
--- a/test/fixtures/buffer-size/tile-7.64.48-buffer-size-0.png
+++ b/test/fixtures/buffer-size/tile-7.64.48-buffer-size-0.png
--- a/test/fixtures/buffer-size/tile-7.64.48-buffer-size-128.geojson
+++ b/test/fixtures/buffer-size/tile-7.64.48-buffer-size-128.geojson
@@ -1 +0,0 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[-53839,4629161]},"properties":{"name":"Alicante","cartodb_id":1200}},{"type":"Feature","geometry":{"type":"Point","coordinates":[242835,5069332]},"properties":{"name":"Barcelona","cartodb_id":5330}},{"type":"Feature","geometry":{"type":"Point","coordinates":[-5567,4861644]},"properties":{"name":"Castello","cartodb_id":1201}},{"type":"Feature","geometry":{"type":"Point","coordinates":[272735,5092314]},"properties":{"name":"Mataro","cartodb_id":615}},{"type":"Feature","geometry":{"type":"Point","coordinates":[-125787,4576600]},"properties":{"name":"Murcia","cartodb_id":952}},{"type":"Feature","geometry":{"type":"Point","coordinates":[295469,4804267]},"properties":{"name":"Palma","cartodb_id":5500}},{"type":"Feature","geometry":{"type":"Point","coordinates":[139148,5030112]},"properties":{"name":"Tarragona","cartodb_id":616}},{"type":"Feature","geometry":{"type":"Point","coordinates":[-44746,4791667]},"properties":{"name":"Valencia","cartodb_id":5942}},{"type":"Feature","geometry":{"type":"Point","coordinates":[-99072,5108695]},"properties":{"name":"Zaragoza","cartodb_id":5932}}]}
--- a/test/fixtures/buffer-size/tile-7.64.48-buffer-size-128.grid.json
+++ b/test/fixtures/buffer-size/tile-7.64.48-buffer-size-128.grid.json
@@ -1 +0,0 @@
-{"grid":["                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","    !!                                                          ","!!! !!!!!                                                       ","!!!!!!! !                                                       ","!!! !!!!!                                                       "," !!    !                                                        ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                     ###   #    ","                                                     ####### ###","                                                     ####### ## ","$                                                    ## #### ## ","$$                                                              ","$$                                                              ","$$                                                              ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                "],"keys":["","9","2","1"],"data":{"1":{"cartodb_id":5942},"2":{"cartodb_id":5500},"9":{"cartodb_id":1201}}}
--- a/test/fixtures/buffer-size/tile-7.64.48-buffer-size-128.png
+++ b/test/fixtures/buffer-size/tile-7.64.48-buffer-size-128.png
--- a/test/fixtures/buffer-size/tile-grid.json.7.64.48-buffer-size-0.grid.json
+++ b/test/fixtures/buffer-size/tile-grid.json.7.64.48-buffer-size-0.grid.json
@@ -1 +0,0 @@
-{"grid":["                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                     !!!   !    ","                                                     !!!!!!! !!!","                                                     !!!!!!! !! ","                                                     !! !!!! !! ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                ","                                                                "],"keys":["","1"],"data":{"1":{"cartodb_id":5500}}}
--- a/test/fixtures/buffer-size/tile-mvt-7.64.48-buffer-size-0.geojson
+++ b/test/fixtures/buffer-size/tile-mvt-7.64.48-buffer-size-0.geojson
@@ -1 +0,0 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[295469,4804267]},"properties":{"name":"Palma","cartodb_id":5500}}]}
--- a/test/fixtures/buffer-size/tile-mvt-7.64.48-buffer-size-0.mvt
+++ b/test/fixtures/buffer-size/tile-mvt-7.64.48-buffer-size-0.mvt
--- a/test/fixtures/buffer-size/tile-mvt-7.64.48-buffer-size-128.mvt
+++ b/test/fixtures/buffer-size/tile-mvt-7.64.48-buffer-size-128.mvt
--- a/test/support/assert.js
+++ b/test/support/assert.js
@@ -126,25 +126,22 @@ assert.response = function(server, req, res, callback) {
                // Assert response body
                if (res.body) {
                    var eql = res.body instanceof RegExp ? res.body.test(response.body) : res.body === response.body;
-                    if (!eql) {
-                        return callback(response, new Error(colorize(
-                            '[red]{Invalid response body.}\n' +
+                    assert.ok(
+                        eql,
+                        colorize('[red]{Invalid response body.}\n' +
                            '     Expected: [green]{' + res.body + '}\n' +
-                            '     Got: [red]{' + response.body + '}'))
-                        );
-                    }
+                            '     Got: [red]{' + response.body + '}')
+                    );
                }

                // Assert response status
                if (typeof status === 'number') {
-                    if (response.statusCode != status) {
-                        return callback(response, new Error(colorize(
-                            '[red]{Invalid response status code.}\n' +
+                    assert.equal(response.statusCode, status,
+                        colorize('[red]{Invalid response status code.}\n' +
                            '     Expected: [green]{' + status + '}\n' +
                            '     Got: [red]{' + response.statusCode + '}\n' +
-                            '     Body: ' + response.body))
-                        );
-                    }
+                            '     Body: ' + response.body)
+                    );
                }

                // Assert response headers
@@ -155,13 +152,11 @@ assert.response = function(server, req, res, callback) {
                            actual = response.headers[name.toLowerCase()],
                            expected = res.headers[name],
                            headerEql = expected instanceof RegExp ? expected.test(actual) : expected === actual;
-                        if (!headerEql) {
-                            return callback(response, new Error(colorize(
-                                'Invalid response header [bold]{' + name + '}.\n' +
+                        assert.ok(headerEql,
+                            colorize('Invalid response header [bold]{' + name + '}.\n' +
                                '     Expected: [green]{' + expected + '}\n' +
-                                '     Got: [red]{' + actual + '}'))
-                            );
-                        }
+                                '     Got: [red]{' + actual + '}')
+                        );
                    }
                }

--- a/test/support/prepare_db.sh
+++ b/test/support/prepare_db.sh
@@ -76,7 +76,7 @@ if test x"$PREPARE_PGSQL" = xyes; then
  createdb -Ttemplate_postgis -EUTF8 "${TEST_DB}" || die "Could not create test database"

  LOCAL_SQL_SCRIPTS='analysis_catalog windshaft.test gadm4 ported/populated_places_simple_reduced cdb_analysis_check cdb_invalidate_varnish'
-  REMOTE_SQL_SCRIPTS='CDB_QueryStatements CDB_QueryTables CDB_CartodbfyTable CDB_TableMetadata CDB_ForeignTable CDB_UserTables CDB_ColumnNames CDB_ZoomFromScale CDB_OverviewsSupport CDB_Overviews CDB_QuantileBins CDB_JenksBins CDB_HeadsTailsBins CDB_EqualIntervalBins CDB_Hexagon CDB_XYZ CDB_EstimateRowCount'
+  REMOTE_SQL_SCRIPTS='CDB_QueryStatements CDB_QueryTables CDB_CartodbfyTable CDB_TableMetadata CDB_ForeignTable CDB_UserTables CDB_ColumnNames CDB_ZoomFromScale CDB_OverviewsSupport CDB_Overviews CDB_QuantileBins CDB_JenksBins CDB_HeadsTailsBins CDB_EqualIntervalBins CDB_Hexagon CDB_XYZ'

  CURL_ARGS=""
  for i in ${REMOTE_SQL_SCRIPTS}
--- a/test/support/sql/windshaft.test.sql
+++ b/test/support/sql/windshaft.test.sql
@@ -339,78 +339,6 @@ INSERT INTO _vovw_2_test_table_overviews VALUES
 INSERT INTO _vovw_1_test_table_overviews VALUES
 ('2011-09-21 14:02:21.358706', '2011-09-21 14:02:21.314252', 1, 'Hawai', 'Calle de Pérez Galdós 9, Madrid, Spain', 3.0, '0101000020E610000000000000000020C00000000000004440', '0101000020110F000076491621312319C122D4663F1DCC5241', 5);

-- table with overviews whit special float values
-
-CREATE TABLE test_special_float_values_table_overviews (
-    cartodb_id integer NOT NULL,
-    name character varying,
-    address character varying,
-    value float8,
-    the_geom geometry,
-    the_geom_webmercator geometry,
-    _feature_count integer,
-    CONSTRAINT enforce_dims_the_geom CHECK ((st_ndims(the_geom) = 2)),
-    CONSTRAINT enforce_dims_the_geom_webmercator CHECK ((st_ndims(the_geom_webmercator) = 2)),
-    CONSTRAINT enforce_geotype_the_geom CHECK (((geometrytype(the_geom) = 'POINT'::text) OR (the_geom IS NULL))),
-    CONSTRAINT enforce_geotype_the_geom_webmercator CHECK (((geometrytype(the_geom_webmercator) = 'POINT'::text) OR (the_geom_webmercator IS NULL))),
-    CONSTRAINT enforce_srid_the_geom CHECK ((st_srid(the_geom) = 4326)),
-    CONSTRAINT enforce_srid_the_geom_webmercator CHECK ((st_srid(the_geom_webmercator) = 3857))
-);
-
-GRANT ALL ON TABLE test_special_float_values_table_overviews TO :TESTUSER;
-GRANT SELECT ON TABLE test_special_float_values_table_overviews TO :PUBLICUSER;
-
-CREATE SEQUENCE test_special_float_values_table_overviews_cartodb_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE test_special_float_values_table_overviews_cartodb_id_seq OWNED BY test_special_float_values_table_overviews.cartodb_id;
-
-SELECT pg_catalog.setval('test_special_float_values_table_overviews_cartodb_id_seq', 60, true);
-
-ALTER TABLE test_special_float_values_table_overviews ALTER COLUMN cartodb_id SET DEFAULT nextval('test_special_float_values_table_overviews_cartodb_id_seq'::regclass);
-
-INSERT INTO test_special_float_values_table_overviews VALUES
-(1, 'Hawai', 'Calle de Pérez Galdós 9, Madrid, Spain', 1.0, '0101000020E6100000A6B73F170D990DC064E8D84125364440', '0101000020110F000076491621312319C122D4663F1DCC5241', 1),
-(2, 'El Estocolmo', 'Calle de la Palma 72, Madrid, Spain', 2.0, '0101000020E6100000C90567F0F7AB0DC0AB07CC43A6364440', '0101000020110F0000C4356B29423319C15DD1092DADCC5241', 1),
-(3, 'El Rey del Tallarín', 'Plaza Conde de Toreno 2, Madrid, Spain', 'NaN'::float, '0101000020E610000021C8410933AD0DC0CB0EF10F5B364440', '0101000020110F000053E71AC64D3419C10F664E4659CC5241', 1),
-(4, 'El Lacón', 'Manuel Fernández y González 8, Madrid, Spain', 4.0, '0101000020E6100000BC5983F755990DC07D923B6C22354440', '0101000020110F00005DACDB056F2319C1EC41A980FCCA5241', 1),
-(5, 'El Pico', 'Calle Divino Pastor 12, Madrid, Spain', 'infinity'::float, '0101000020E61000003B6D8D08C6A10DC0371B2B31CF364440', '0101000020110F00005F716E91992A19C17DAAA4D6DACC5241', 1);
-
-ALTER TABLE ONLY test_special_float_values_table_overviews ADD CONSTRAINT test_special_float_values_table_overviews_pkey PRIMARY KEY (cartodb_id);
-
-CREATE INDEX test_special_float_values_table_overviews_the_geom_idx ON test_special_float_values_table_overviews USING gist (the_geom);
-CREATE INDEX test_special_float_values_table_overviews_the_geom_webmercator_idx ON test_special_float_values_table_overviews USING gist (the_geom_webmercator);
-
-GRANT ALL ON TABLE test_special_float_values_table_overviews TO :TESTUSER;
-GRANT SELECT ON TABLE test_special_float_values_table_overviews TO :PUBLICUSER;
-
-CREATE TABLE _vovw_1_test_special_float_values_table_overviews (
-    cartodb_id integer NOT NULL,
-    name character varying,
-    address character varying,
-    value float8,
-    the_geom geometry,
-    the_geom_webmercator geometry,
-    _feature_count integer,
-    CONSTRAINT enforce_dims_the_geom CHECK ((st_ndims(the_geom) = 2)),
-    CONSTRAINT enforce_dims_the_geom_webmercator CHECK ((st_ndims(the_geom_webmercator) = 2)),
-    CONSTRAINT enforce_geotype_the_geom CHECK (((geometrytype(the_geom) = 'POINT'::text) OR (the_geom IS NULL))),
-    CONSTRAINT enforce_geotype_the_geom_webmercator CHECK (((geometrytype(the_geom_webmercator) = 'POINT'::text) OR (the_geom_webmercator IS NULL))),
-    CONSTRAINT enforce_srid_the_geom CHECK ((st_srid(the_geom) = 4326)),
-    CONSTRAINT enforce_srid_the_geom_webmercator CHECK ((st_srid(the_geom_webmercator) = 3857))
-);
-
-GRANT ALL ON TABLE _vovw_1_test_special_float_values_table_overviews TO :TESTUSER;
-GRANT SELECT ON TABLE _vovw_1_test_special_float_values_table_overviews TO :PUBLICUSER;
-
-INSERT INTO _vovw_1_test_special_float_values_table_overviews VALUES
-(1, 'Hawai', 'Calle de Pérez Galdós 9, Madrid, Spain', 3, '0101000020E610000000000000000020C00000000000004440', '0101000020110F000076491621312319C122D4663F1DCC5241', 2),
-(3, 'El Rey del Tallarín', 'Plaza Conde de Toreno 2, Madrid, Spain', 'NaN'::float, '0101000020E610000021C8410933AD0DC0CB0EF10F5B364440', '0101000020110F000053E71AC64D3419C10F664E4659CC5241', 1),
-(4, 'El Lacón', 'Manuel Fernández y González 8, Madrid, Spain', 'infinity'::float, '0101000020E6100000BC5983F755990DC07D923B6C22354440', '0101000020110F00005DACDB056F2319C1EC41A980FCCA5241', 2);

 -- analysis tables -----------------------------------------------

@@ -721,5 +649,3 @@ CREATE OR REPLACE FUNCTION cdb_crankshaft.CDB_KMeans(query text, no_clusters int
    END;
 $$ LANGUAGE plpgsql;
 GRANT ALL ON FUNCTION cdb_crankshaft.CDB_KMeans(text, integer, integer) TO :TESTUSER;
-
-ANALYZE;
--- a/test/support/test-client.js
+++ b/test/support/test-client.js
@@ -16,23 +16,14 @@ var serverOptions = require('../../lib/cartodb/server_options');
 serverOptions.analysis.batch.inlineExecution = true;
 var server = new CartodbWindshaft(serverOptions);

-function TestClient(config, apiKey) {
-    this.mapConfig = isMapConfig(config) ? config : null;
-    this.template = isTemplate(config) ? config : null;
+function TestClient(mapConfig, apiKey) {
+    this.mapConfig = mapConfig;
    this.apiKey = apiKey;
    this.keysToDelete = {};
 }

 module.exports = TestClient;

-function isMapConfig(config) {
-    return config && config.layers;
-}
-
-function isTemplate(config) {
-    return config && config.layergroup;
-}
-
 module.exports.RESPONSE = {
    ERROR: {
        status: 400,
@@ -75,11 +66,6 @@ module.exports.CARTOCSS = {
    ].join('\n')
 };

-module.exports.SQL = {
-    EMPTY: 'select 1 as cartodb_id, null::geometry as the_geom_webmercator',
-    ONE_POINT: 'select 1 as cartodb_id, \'SRID=3857;POINT(0 0)\'::geometry the_geom_webmercator'
-}
-
 TestClient.prototype.getWidget = function(widgetName, params, callback) {
    var self = this;

@@ -420,7 +406,6 @@ TestClient.prototype.getTile = function(z, x, y, params, callback) {
    }

    var url = '/api/v1/map';
-    var urlNamed = url + '/named';

    if (this.apiKey) {
        url += '?' + qs.stringify({api_key: this.apiKey});
@@ -428,60 +413,17 @@ TestClient.prototype.getTile = function(z, x, y, params, callback) {

    var layergroupId;
    step(
-        function createTemplate () {
+        function createLayergroup() {
            var next = this;
-
-            if (!self.template) {
-                return next();
-            }
-
-            if (!self.apiKey) {
-                return next(new Error('apiKey param is mandatory to create a new template'));
-            }
-
-            params.placeholders = params.placeholders || {};
-
            assert.response(server,
                {
-                    url: urlNamed + '?' + qs.stringify({ api_key: self.apiKey }),
+                    url: url,
                    method: 'POST',
                    headers: {
                        host: 'localhost',
                        'Content-Type': 'application/json'
                    },
-                    data: JSON.stringify(self.template)
-                },
-                {
-                    status: 200,
-                    headers: {
-                        'Content-Type': 'application/json; charset=utf-8'
-                    }
-                },
-                function (res, err) {
-                    if (err) {
-                        return next(err);
-                    }
-                    return next(null, JSON.parse(res.body).template_id);
-                }
-            );
-        },
-        function createLayergroup(err, templateId) {
-            var next = this;
-
-            var data = templateId ? params.placeholders : self.mapConfig
-            var path  = templateId ?
-                urlNamed + '/' + templateId  + '?' + qs.stringify({api_key: self.apiKey}) :
-                url;
-
-            assert.response(server,
-                {
-                    url: path,
-                    method: 'POST',
-                    headers: {
-                        host: 'localhost',
-                        'Content-Type': 'application/json'
-                    },
-                    data: JSON.stringify(data)
+                    data: JSON.stringify(self.mapConfig)
                },
                {
                    status: 200,
@@ -530,7 +472,7 @@ TestClient.prototype.getTile = function(z, x, y, params, callback) {
            };

            var expectedResponse = {
-                status: params.status || 200,
+                status: 200,
                headers: {
                    'Content-Type': 'application/json; charset=utf-8'
                }
@@ -543,46 +485,14 @@ TestClient.prototype.getTile = function(z, x, y, params, callback) {
                expectedResponse.headers['Content-Type'] = 'image/png';
            }

-            var isMvt = format.match(/mvt$/);
-
-            if (isMvt) {
-                request.encoding = 'binary';
-
-                if (expectedResponse.status === 200) {
-                    expectedResponse.headers['Content-Type'] = 'application/x-protobuf';
-                } else if (expectedResponse.status === 204) {
-                    expectedResponse.headers['Content-Type'] = undefined;
-                }
-            }
-
-            var isGeojson = format.match(/geojson$/);
-
-            if (isGeojson) {
-                request.encoding = 'utf-8';
-                expectedResponse.headers['Content-Type'] = 'application/json; charset=utf-8';
-            }
-
-            var isGridJSON = format.match(/grid.json$/);
-
-            if (isGridJSON) {
-                request.encoding = 'utf-8';
-                expectedResponse.headers['Content-Type'] = 'application/json; charset=utf-8';
-            }
-
            assert.response(server, request, expectedResponse, function(res, err) {
                assert.ifError(err);
+
                var obj;

                if (isPng) {
                    obj = mapnik.Image.fromBytes(new Buffer(res.body, 'binary'));
-                }
-                else if (isMvt) {
-                    if (res.body) {
-                        obj = new mapnik.VectorTile(z, x, y);
-                        obj.setDataSync(new Buffer(res.body, 'binary'));
-                    }
-                }
-                else {
+                } else {
                    obj = JSON.parse(res.body);
                }

@@ -628,20 +538,18 @@ TestClient.prototype.getLayergroup = function(expectedResponse, callback) {
        },
        expectedResponse,
        function(res, err) {
-            // If there is a response, we are still interested in catching the created keys
-            // to be able to delete them on the .drain() method.
-            if (res) {
-                var parsedBody = JSON.parse(res.body);
-                if (parsedBody.layergroupid) {
-                    self.keysToDelete['map_cfg|' + LayergroupToken.parse(parsedBody.layergroupid).token] = 0;
-                    self.keysToDelete['user:localhost:mapviews:global'] = 5;
-                }
-            }
            if (err) {
                return callback(err);
            }

-            return callback(null, JSON.parse(res.body));
+            var parsedBody = JSON.parse(res.body);
+
+            if (parsedBody.layergroupid) {
+                self.keysToDelete['map_cfg|' + LayergroupToken.parse(parsedBody.layergroupid).token] = 0;
+                self.keysToDelete['user:localhost:mapviews:global'] = 5;
+            }
+
+            return callback(null, parsedBody);
        }
    );
 };
--- a/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js
+++ b/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js
@@ -1,153 +0,0 @@
-var assert = require('assert');
-var MapnikLayerStats = require('../../../../../lib/cartodb/backends/layer-stats/mapnik-layer-stats');
-var MapConfig = require('windshaft').model.MapConfig;
-
-function getDbConnectionMock () {
-    return {
-        query: function(sql, callback) {
-            return callback(null, {
-                rows: [{rows: 1}]
-            });
-        }
-    };
-}
-
-describe('mapnik-layer-stats', function() {
-
-    beforeEach(function () {
-        this.dbConnectionMock = getDbConnectionMock();
-        this.rendererCacheMock = {};
-        this.params = {};
-    });
-
-    var testMapConfigOneLayer = {
-        version: '1.5.0',
-        layers: [
-            {
-                type: 'mapnik',
-                options: {
-                    sql: 'select * from test_table limit 2',
-                    cartocss: '#layer { marker-fill:red; marker-width:32; marker-allow-overlap:true; }',
-                    cartocss_version: '2.3.0'
-                }
-            }
-        ]
-    };
-
-    var testMapConfigTwoLayers = {
-        version: '1.5.0',
-        layers: [
-            {
-                type: 'mapnik',
-                options: {
-                    sql: 'select * from test_table limit 2',
-                    cartocss: '#layer { marker-fill:red; marker-width:32; marker-allow-overlap:true; }',
-                    cartocss_version: '2.3.0'
-                }
-            },
-            {
-                type: 'mapnik',
-                options: {
-                    sql: 'select * from test_table limit 2',
-                    cartocss: '#layer { marker-fill:red; marker-width:32; marker-allow-overlap:true; }',
-                    cartocss_version: '2.3.0'
-                }
-            },
-        ]
-    };
-
-    var testMapConfigOneLayerTwoTables = {
-        version: '1.5.0',
-        layers: [
-            {
-                type: 'mapnik',
-                options: {
-                    sql: 'select * from test_table limit 2',
-                    cartocss: '#layer { marker-fill:red; marker-width:32; marker-allow-overlap:true; }',
-                    cartocss_version: '2.3.0',
-                    affected_tables: ['test_table_1', 'test_table_2']
-                }
-            },
-        ]
-    };
-
-    var testMapConfigTwoLayerTwoTables = {
-        version: '1.5.0',
-        layers: [
-            {
-                type: 'mapnik',
-                options: {
-                    sql: 'select * from test_table limit 2',
-                    cartocss: '#layer { marker-fill:red; marker-width:32; marker-allow-overlap:true; }',
-                    cartocss_version: '2.3.0',
-                    affected_tables: ['test_table_1', 'test_table_2']
-                }
-            },
-            {
-                type: 'mapnik',
-                options: {
-                    sql: 'select * from test_table limit 2',
-                    cartocss: '#layer { marker-fill:red; marker-width:32; marker-allow-overlap:true; }',
-                    cartocss_version: '2.3.0',
-                    affected_tables: ['test_table_3', 'test_table_4']
-                }
-            },
-        ]
-    };
-
-    it('should return 1 feature for one layer', function(done) {
-        var mapConfig = MapConfig.create(testMapConfigOneLayer);
-        var layer = mapConfig.getLayer(0);
-        var testSubject = new MapnikLayerStats();
-        testSubject.getStats(layer, this.dbConnectionMock, function (err, result)  {
-            assert.ifError(err);
-            assert.equal(result.estimatedFeatureCount, 1);
-            done();
-        });
-    });
-
-    it('should return 1 feature for two layers', function(done) {
-        var self = this;
-        var mapConfig = MapConfig.create(testMapConfigTwoLayers);
-        var layer0 = mapConfig.getLayer(0);
-        var layer1 = mapConfig.getLayer(1);
-        var testSubject = new MapnikLayerStats();
-        testSubject.getStats(layer0, self.dbConnectionMock, function (err, result)  {
-            assert.ifError(err);
-            assert.equal(result.estimatedFeatureCount, 1);
-            testSubject.getStats(layer1, self.dbConnectionMock, function (err, result)  {
-                assert.ifError(err);
-                assert.equal(result.estimatedFeatureCount, 1);
-                done();
-            });
-        });
-    });
-
-    it('should return 1 feature for one layers with two tables', function(done) {
-        var mapConfig = MapConfig.create(testMapConfigOneLayerTwoTables);
-        var layer = mapConfig.getLayer(0);
-        var testSubject = new MapnikLayerStats();
-        testSubject.getStats(layer, this.dbConnectionMock, function (err, result)  {
-            assert.ifError(err);
-            assert.equal(result.estimatedFeatureCount, 1);
-            done();
-        });
-    });
-
-    it('should return 1 feature for two layers and two tables', function(done) {
-        var self = this;
-        var mapConfig = MapConfig.create(testMapConfigTwoLayerTwoTables);
-        var layer0 = mapConfig.getLayer(0);
-        var layer1 = mapConfig.getLayer(1);
-        var testSubject = new MapnikLayerStats();
-        testSubject.getStats(layer0, self.dbConnectionMock, function (err, result)  {
-            assert.ifError(err);
-            assert.equal(result.estimatedFeatureCount, 1);
-            testSubject.getStats(layer1, self.dbConnectionMock, function (err, result)  {
-                assert.ifError(err);
-                assert.equal(result.estimatedFeatureCount, 1);
-                done();
-            });
-        });
-    });
-});
--- a/test/unit/cartodb/backends/layer-stats/torque-layer-stats.js
+++ b/test/unit/cartodb/backends/layer-stats/torque-layer-stats.js
@@ -1,36 +0,0 @@
-var assert = require('assert');
-var TorqueLayerStats = require('../../../../../lib/cartodb/backends/layer-stats/torque-layer-stats');
-var MapConfig = require('windshaft').model.MapConfig;
-
-describe('torque-layer-stats', function () {
-
-    beforeEach(function () {
-        this.params = {};
-    });
-
-    var testMapConfigOneLayer = {
-        version: '1.5.0',
-        layers: [
-            {
-                type: 'torque',
-                options: {
-                    sql: 'select * from test_table limit 2',
-                    cartocss: '#layer { marker-fill:red; marker-width:32; marker-allow-overlap:true; }',
-                    cartocss_version: '2.3.0',
-                }
-            },
-        ]
-    };
-
-    it('should return torque stats for one layer', function(done) {
-        var mapConfig = MapConfig.create(testMapConfigOneLayer);
-        var layerId = 0;
-        var layer = mapConfig.getLayer(layerId);
-        var testSubject = new TorqueLayerStats();
-        testSubject.getStats(layer, {}, function (err, result) {
-            assert.ifError(err);
-            assert.deepEqual({}, result);
-            done();
-        });
-    });
-});
--- a/test/unit/cartodb/model/filter/bbox-filters.test.js
+++ b/test/unit/cartodb/model/filter/bbox-filters.test.js
@@ -111,23 +111,6 @@ describe('Bounding box filter', function() {
                createRef([-180, -45, 0, 45])
            );
        });
-
-        it('generating multiple bbox', function() {
-            var bbox = [90, -45, 190, 45];
-            var bboxFilter = createFilter(bbox);
-
-            assert.equal(bboxFilter.bboxes.length, 2);
-
-            assert.deepEqual(
-                bboxFilter.bboxes[0],
-                createRef([90, -45, 180, 45])
-            );
-            assert.deepEqual(
-                bboxFilter.bboxes[1],
-                createRef([-180, -45, -170, 45])
-            );
-        });
-
    });

    describe('out of bounds', function() {
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Raul Ochoa	47217909f6	Merge pull request #741 from CartoDB/3.6.6-fix-pg-vulnerability 3.6.6 fix pg vulnerability	2017-09-01 17:13:35 +02:00
Simon	3a0a366230	Adding a new cartodb-psql fixing a pg vulnerability	2017-09-01 13:30:30 +02:00
				`@@ -1 +0,0 @@`
				{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[-53839,4629161]},"properties":{"name":"Alicante","cartodb_id":1200}},{"type":"Feature","geometry":{"type":"Point","coordinates":[242835,5069332]},"properties":{"name":"Barcelona","cartodb_id":5330}},{"type":"Feature","geometry":{"type":"Point","coordinates":[-5567,4861644]},"properties":{"name":"Castello","cartodb_id":1201}},{"type":"Feature","geometry":{"type":"Point","coordinates":[272735,5092314]},"properties":{"name":"Mataro","cartodb_id":615}},{"type":"Feature","geometry":{"type":"Point","coordinates":[-125787,4576600]},"properties":{"name":"Murcia","cartodb_id":952}},{"type":"Feature","geometry":{"type":"Point","coordinates":[295469,4804267]},"properties":{"name":"Palma","cartodb_id":5500}},{"type":"Feature","geometry":{"type":"Point","coordinates":[139148,5030112]},"properties":{"name":"Tarragona","cartodb_id":616}},{"type":"Feature","geometry":{"type":"Point","coordinates":[-44746,4791667]},"properties":{"name":"Valencia","cartodb_id":5942}},{"type":"Feature","geometry":{"type":"Point","coordinates":[-99072,5108695]},"properties":{"name":"Zaragoza","cartodb_id":5932}}]}
				`@@ -1 +0,0 @@`
				{"grid":[" "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," !! ","!!! !!!!! ","!!!!!!! ! ","!!! !!!!! "," !! ! "," "," "," "," "," "," "," "," ### # "," ####### ###"," ####### ## ","$ ## #### ## ","$$ ","$$ ","$$ "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "],"keys":["","9","2","1"],"data":{"1":{"cartodb_id":5942},"2":{"cartodb_id":5500},"9":{"cartodb_id":1201}}}
				`@@ -1 +0,0 @@`
				`{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[295469,4804267]},"properties":{"name":"Palma","cartodb_id":5500}}]}`