added validation for uniq
fixed tests