CDB-1692 Added some tests, still unfinished but need to change branch
Merge branch 'privacy-maps' of https://github.com/CartoDB/cartodb into privacy-maps