Merge "Add unit test for uidMatchTypeToString function"