id/cartodb_id handling cleaned up
fixing unit tests WIP
unit tests fixed