Merge "Add new tests for check-uuid tool"