fixed tests
Merge branch 'release/2.9.0+' of github.com:CartoDB/cartodb into release/2.9.0+