diff --git a/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java b/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java
index 0ab2403a3..f2786dd9d 100644
--- a/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java
+++ b/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java
@@ -11,6 +11,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 
+import eu.dnetlib.dhp.schema.oaf.utils.PidType;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeEach;
@@ -396,11 +397,10 @@ public class MappersTest {
 		assertEquals(1, d.getAuthor().size());
 		assertEquals(1, d.getSubject().size());
 		assertEquals(1, d.getInstance().size());
-		assertTrue(d.getPid().isEmpty());
-
-		assertTrue(d.getInstance().get(0).getPid().isEmpty());
-		assertEquals(1, d.getInstance().get(0).getAlternateIdentifier().size());
-		assertEquals("handle", d.getInstance().get(0).getAlternateIdentifier().get(0).getQualifier().getClassid());
+		assertNotNull(d.getPid());
+		assertEquals(1, d.getPid().size());
+		assertTrue(PidType.isValid(d.getPid().get(0).getQualifier().getClassid()));
+		assertEquals(PidType.handle, PidType.valueOf(d.getPid().get(0).getQualifier().getClassid()));
 
 		assertNotNull(d.getInstance().get(0).getUrl());
 	}
@@ -451,7 +451,10 @@ public class MappersTest {
 		assertEquals(1, p.getAuthor().size());
 		assertEquals("OPEN", p.getBestaccessright().getClassid());
 
-		assertTrue(p.getPid().isEmpty());
+		assertTrue(p.getPid().size() == 1);
+		assertTrue(PidType.isValid(p.getPid().get(0).getQualifier().getClassid()));
+		assertTrue(PidType.handle.equals(PidType.valueOf(p.getPid().get(0).getQualifier().getClassid())));
+		assertEquals("hdl:11858/00-1734-0000-0003-EE73-2", p.getPid().get(0).getValue());
 		assertEquals("dataset", p.getResulttype().getClassname());
 		assertEquals(1, p.getInstance().size());
 		assertEquals("OPEN", p.getInstance().get(0).getAccessright().getClassid());
@@ -461,11 +464,8 @@ public class MappersTest {
 			"http://creativecommons.org/licenses/by/3.0/de/legalcode", p.getInstance().get(0).getLicense().getValue());
 
 		assertEquals(1, p.getInstance().size());
-		assertEquals(1, p.getInstance().get(0).getAlternateIdentifier().size());
-		assertEquals("handle", p.getInstance().get(0).getAlternateIdentifier().get(0).getQualifier().getClassid());
-		assertEquals(
-			"hdl:11858/00-1734-0000-0003-EE73-2", p.getInstance().get(0).getAlternateIdentifier().get(0).getValue());
-
+		assertNotNull(p.getInstance().get(0).getAlternateIdentifier());
+		assertEquals(0, p.getInstance().get(0).getAlternateIdentifier().size());
 		assertEquals(1, p.getInstance().get(0).getUrl().size());
 	}