Merge "Fix UID test and make debugging easier"