TST: Fix tests for unique identifiers