fixed problem with gni-uuid representation
fixed tests