Fix tests related to surrogate keys, includes tables
Fix tests related to surrogate keys, includes tables

CartoDB/Windshaft-cartodb,CartoDB/Windshaft-cartodb,CartoDB/Windshaft-cartodb,CartoDB/Windshaft-cartodb