Save does not update uid fields, fix and unit tests