diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 5cab5d58..0bda38fd 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -2,65 +2,34 @@
   "name": "cartodb_sql_api",
   "version": "1.17.2",
   "dependencies": {
-    "cartodb-psql": {
-      "version": "0.4.0",
-      "from": "https://github.com/CartoDB/node-cartodb-psql/tarball/0.4.0",
-      "resolved": "https://github.com/CartoDB/node-cartodb-psql/tarball/0.4.0",
-      "dependencies": {
-        "pg": {
-          "version": "2.6.2-cdb1",
-          "from": "pg@git://github.com/CartoDB/node-postgres.git#2.6.2-cdb1",
-          "resolved": "git://github.com/CartoDB/node-postgres.git#836a2dc3131e873fc4ba20cd16e7fb69a7dca98a",
-          "dependencies": {
-            "generic-pool": {
-              "version": "2.0.3",
-              "from": "generic-pool@2.0.3"
-            },
-            "buffer-writer": {
-              "version": "1.0.0",
-              "from": "buffer-writer@1.0.0"
-            }
-          }
-        }
-      }
-    },
     "cartodb-redis": {
       "version": "0.11.0",
       "from": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",
-      "resolved": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",
       "dependencies": {
         "strftime": {
-          "version": "0.8.2",
-          "from": "strftime@~0.8.2"
+          "version": "0.8.2"
         },
         "dot": {
-          "version": "1.0.2",
-          "from": "dot@~1.0.2"
+          "version": "1.0.2"
         },
         "redis-mpool": {
           "version": "0.1.0",
-          "from": "redis-mpool@git://github.com/CartoDB/node-redis-mpool.git#0.1.0",
-          "resolved": "git://github.com/CartoDB/node-redis-mpool.git#47510b8d4525ee24aa2e5328976372274a1d144e",
+          "from": "git://github.com/CartoDB/node-redis-mpool.git#0.1.0",
           "dependencies": {
             "generic-pool": {
-              "version": "2.1.1",
-              "from": "generic-pool@~2.1.1"
+              "version": "2.1.1"
             },
             "redis": {
-              "version": "0.12.1",
-              "from": "redis@~0.12.1"
+              "version": "0.12.1"
             },
             "hiredis": {
               "version": "0.1.17",
-              "from": "hiredis@~0.1.17",
               "dependencies": {
                 "bindings": {
-                  "version": "1.2.1",
-                  "from": "bindings@*"
+                  "version": "1.2.1"
                 },
                 "nan": {
-                  "version": "1.1.2",
-                  "from": "nan@~1.1.0"
+                  "version": "1.1.2"
                 }
               }
             }
@@ -68,136 +37,423 @@
         }
       }
     },
+    "cartodb-psql": {
+      "version": "0.4.0",
+      "from": "https://github.com/CartoDB/node-cartodb-psql/tarball/0.4.0",
+      "dependencies": {
+        "pg": {
+          "version": "2.6.2-cdb1",
+          "from": "git://github.com/CartoDB/node-postgres.git#2.6.2-cdb1",
+          "dependencies": {
+            "generic-pool": {
+              "version": "2.0.3"
+            },
+            "buffer-writer": {
+              "version": "1.0.0"
+            }
+          }
+        }
+      }
+    },
+    "step-profiler": {
+      "version": "0.1.0",
+      "from": "https://github.com/CartoDB/node-step-profiler/tarball/0.1.0"
+    },
+    "underscore": {
+      "version": "1.6.0"
+    },
     "express": {
       "version": "2.5.11",
-      "from": "express@~2.5.11",
       "dependencies": {
         "connect": {
           "version": "1.9.2",
-          "from": "connect@1.x",
           "dependencies": {
             "formidable": {
-              "version": "1.0.15",
-              "from": "formidable@1.0.x"
+              "version": "1.0.15"
             }
           }
         },
         "mime": {
-          "version": "1.2.4",
-          "from": "mime@1.2.4"
+          "version": "1.2.4"
         },
         "qs": {
-          "version": "0.4.2",
-          "from": "qs@0.4.x"
+          "version": "0.4.2"
         },
         "mkdirp": {
-          "version": "0.3.0",
-          "from": "mkdirp@0.3.0"
+          "version": "0.3.0"
         }
       }
     },
-    "log4js": {
-      "version": "0.6.21",
-      "from": "log4js@~0.6.18",
+    "step": {
+      "version": "0.0.5"
+    },
+    "topojson": {
+      "version": "0.0.8",
       "dependencies": {
-        "async": {
-          "version": "0.2.10",
-          "from": "async@~0.2.0"
-        },
-        "readable-stream": {
-          "version": "1.0.32",
-          "from": "readable-stream@~1.0.2",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.32.tgz",
+        "optimist": {
+          "version": "0.3.5",
           "dependencies": {
-            "core-util-is": {
-              "version": "1.0.1",
-              "from": "core-util-is@~1.0.0"
-            },
-            "isarray": {
-              "version": "0.0.1",
-              "from": "isarray@0.0.1"
-            },
-            "string_decoder": {
-              "version": "0.10.31",
-              "from": "string_decoder@~0.10.x"
-            },
-            "inherits": {
-              "version": "2.0.1",
-              "from": "inherits@~2.0.1"
+            "wordwrap": {
+              "version": "0.0.2"
             }
           }
-        },
-        "semver": {
-          "version": "1.1.4",
-          "from": "semver@~1.1.4"
+        }
+      }
+    },
+    "oauth-client": {
+      "version": "0.3.0",
+      "dependencies": {
+        "node-uuid": {
+          "version": "1.1.0"
         }
       }
     },
     "lru-cache": {
-      "version": "2.5.0",
-      "from": "lru-cache@~2.5.0"
+      "version": "2.5.0"
     },
-    "node-statsd": {
-      "version": "0.0.7",
-      "from": "node-statsd@~0.0.7"
-    },
-    "oauth-client": {
-      "version": "0.3.0",
-      "from": "oauth-client@0.3.0",
+    "log4js": {
+      "version": "0.6.21",
       "dependencies": {
-        "node-uuid": {
-          "version": "1.1.0",
-          "from": "node-uuid@1.1.0"
+        "async": {
+          "version": "0.2.10"
+        },
+        "readable-stream": {
+          "version": "1.0.32",
+          "dependencies": {
+            "core-util-is": {
+              "version": "1.0.1"
+            },
+            "isarray": {
+              "version": "0.0.1"
+            },
+            "string_decoder": {
+              "version": "0.10.31"
+            },
+            "inherits": {
+              "version": "2.0.1"
+            }
+          }
+        },
+        "semver": {
+          "version": "1.1.4"
         }
       }
     },
     "rollbar": {
       "version": "0.3.13",
-      "from": "rollbar@~0.3.2",
       "dependencies": {
         "node-uuid": {
-          "version": "1.4.1",
-          "from": "node-uuid@1.4.x"
+          "version": "1.4.1"
         },
         "lru-cache": {
-          "version": "2.2.4",
-          "from": "lru-cache@~2.2.1"
+          "version": "2.2.4"
         },
         "json-stringify-safe": {
-          "version": "5.0.0",
-          "from": "json-stringify-safe@~5.0.0"
+          "version": "5.0.0"
         }
       }
     },
-    "step": {
-      "version": "0.0.5",
-      "from": "step@~0.0.5"
+    "node-statsd": {
+      "version": "0.0.7"
     },
-    "step-profiler": {
-      "version": "0.1.0",
-      "from": "https://github.com/CartoDB/node-step-profiler/tarball/0.1.0",
-      "resolved": "https://github.com/CartoDB/node-step-profiler/tarball/0.1.0"
+    "redis": {
+      "version": "0.7.1"
     },
-    "topojson": {
-      "version": "0.0.8",
-      "from": "topojson@0.0.8",
+    "libxmljs": {
+      "version": "0.8.1",
       "dependencies": {
-        "optimist": {
-          "version": "0.3.5",
-          "from": "optimist@0.3.5",
-          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.5.tgz",
+        "bindings": {
+          "version": "1.0.0"
+        }
+      }
+    },
+    "mocha": {
+      "version": "1.21.4",
+      "dependencies": {
+        "commander": {
+          "version": "2.0.0"
+        },
+        "growl": {
+          "version": "1.8.1"
+        },
+        "jade": {
+          "version": "0.26.3",
           "dependencies": {
-            "wordwrap": {
-              "version": "0.0.2",
-              "from": "wordwrap@~0.0.2"
+            "commander": {
+              "version": "0.6.1"
+            },
+            "mkdirp": {
+              "version": "0.3.0"
+            }
+          }
+        },
+        "diff": {
+          "version": "1.0.7"
+        },
+        "debug": {
+          "version": "2.0.0",
+          "dependencies": {
+            "ms": {
+              "version": "0.6.2"
+            }
+          }
+        },
+        "mkdirp": {
+          "version": "0.3.5"
+        },
+        "glob": {
+          "version": "3.2.3",
+          "dependencies": {
+            "minimatch": {
+              "version": "0.2.14",
+              "dependencies": {
+                "sigmund": {
+                  "version": "1.0.0"
+                }
+              }
+            },
+            "graceful-fs": {
+              "version": "2.0.3"
+            },
+            "inherits": {
+              "version": "2.0.1"
             }
           }
         }
       }
     },
-    "underscore": {
-      "version": "1.6.0",
-      "from": "underscore@~1.6.0"
+    "zipfile": {
+      "version": "0.5.3",
+      "dependencies": {
+        "nan": {
+          "version": "1.2.0"
+        },
+        "node-pre-gyp": {
+          "version": "0.5.19",
+          "dependencies": {
+            "nopt": {
+              "version": "2.2.1",
+              "dependencies": {
+                "abbrev": {
+                  "version": "1.0.5"
+                }
+              }
+            },
+            "npmlog": {
+              "version": "0.0.6",
+              "dependencies": {
+                "ansi": {
+                  "version": "0.2.1"
+                }
+              }
+            },
+            "request": {
+              "version": "2.36.0",
+              "dependencies": {
+                "qs": {
+                  "version": "0.6.6"
+                },
+                "json-stringify-safe": {
+                  "version": "5.0.0"
+                },
+                "mime": {
+                  "version": "1.2.11"
+                },
+                "forever-agent": {
+                  "version": "0.5.2"
+                },
+                "node-uuid": {
+                  "version": "1.4.1"
+                },
+                "tough-cookie": {
+                  "version": "0.12.1",
+                  "dependencies": {
+                    "punycode": {
+                      "version": "1.2.4"
+                    }
+                  }
+                },
+                "form-data": {
+                  "version": "0.1.2",
+                  "dependencies": {
+                    "combined-stream": {
+                      "version": "0.0.4",
+                      "dependencies": {
+                        "delayed-stream": {
+                          "version": "0.0.5"
+                        }
+                      }
+                    },
+                    "async": {
+                      "version": "0.2.10"
+                    }
+                  }
+                },
+                "tunnel-agent": {
+                  "version": "0.4.0"
+                },
+                "http-signature": {
+                  "version": "0.10.0",
+                  "dependencies": {
+                    "assert-plus": {
+                      "version": "0.1.2"
+                    },
+                    "asn1": {
+                      "version": "0.1.11"
+                    },
+                    "ctype": {
+                      "version": "0.5.2"
+                    }
+                  }
+                },
+                "oauth-sign": {
+                  "version": "0.3.0"
+                },
+                "hawk": {
+                  "version": "1.0.0",
+                  "dependencies": {
+                    "hoek": {
+                      "version": "0.9.1"
+                    },
+                    "boom": {
+                      "version": "0.4.2"
+                    },
+                    "cryptiles": {
+                      "version": "0.2.2"
+                    },
+                    "sntp": {
+                      "version": "0.2.4"
+                    }
+                  }
+                },
+                "aws-sign2": {
+                  "version": "0.5.0"
+                }
+              }
+            },
+            "semver": {
+              "version": "2.3.0"
+            },
+            "tar": {
+              "version": "0.1.19",
+              "dependencies": {
+                "inherits": {
+                  "version": "2.0.1"
+                },
+                "block-stream": {
+                  "version": "0.0.7"
+                },
+                "fstream": {
+                  "version": "0.1.25",
+                  "dependencies": {
+                    "mkdirp": {
+                      "version": "0.3.5"
+                    },
+                    "graceful-fs": {
+                      "version": "2.0.3"
+                    }
+                  }
+                }
+              }
+            },
+            "tar-pack": {
+              "version": "2.0.0",
+              "dependencies": {
+                "uid-number": {
+                  "version": "0.0.3"
+                },
+                "once": {
+                  "version": "1.1.1"
+                },
+                "debug": {
+                  "version": "0.7.4"
+                },
+                "fstream": {
+                  "version": "0.1.25",
+                  "dependencies": {
+                    "mkdirp": {
+                      "version": "0.3.5"
+                    },
+                    "graceful-fs": {
+                      "version": "2.0.3"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                },
+                "fstream-ignore": {
+                  "version": "0.0.7",
+                  "dependencies": {
+                    "minimatch": {
+                      "version": "0.2.14",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.5.0"
+                        },
+                        "sigmund": {
+                          "version": "1.0.0"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                },
+                "readable-stream": {
+                  "version": "1.0.27-1",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    },
+                    "isarray": {
+                      "version": "0.0.1"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.25-1"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                },
+                "graceful-fs": {
+                  "version": "1.2.3"
+                }
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.0",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8"
+                }
+              }
+            },
+            "rc": {
+              "version": "0.4.0",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.10"
+                },
+                "deep-extend": {
+                  "version": "0.2.10"
+                },
+                "strip-json-comments": {
+                  "version": "0.1.3"
+                },
+                "ini": {
+                  "version": "1.1.0"
+                }
+              }
+            },
+            "rimraf": {
+              "version": "2.2.8"
+            }
+          }
+        }
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 8a0456a8..af61e682 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     },
     "devDependencies": {
         "redis": "0.7.1",
-        "mocha": "~1.14.0",
+        "mocha": "~1.21.4",
         "zipfile": "~0.5.0",
         "libxmljs": "~0.8.1"
     },