Merge "Add test to confirm overalapped UIDs are rejected"