CartoDB/cartodb — pull request #1506 by viddo (2014-12-17 16:29:17+00:00)
Title: Fix the tests

Fix the tests, seems to break in #1455 merged earlier today