diff --git a/orcid-pub-web/src/test/java/org/orcid/api/publicV2/server/PublicV2ApiServiceDelegatorTest.java b/orcid-pub-web/src/test/java/org/orcid/api/publicV2/server/PublicV2ApiServiceDelegatorTest.java
index 8e784e8b5a..fe170e3134 100644
--- a/orcid-pub-web/src/test/java/org/orcid/api/publicV2/server/PublicV2ApiServiceDelegatorTest.java
+++ b/orcid-pub-web/src/test/java/org/orcid/api/publicV2/server/PublicV2ApiServiceDelegatorTest.java
@@ -25,7 +25,6 @@
 import org.orcid.api.publicV2.server.delegator.PublicV2ApiServiceDelegator;
 import org.orcid.api.publicV2.server.delegator.impl.PublicV2ApiServiceDelegatorImpl;
 import org.orcid.core.api.OrcidApiConstants;
-import org.orcid.core.exception.DeactivatedException;
 import org.orcid.core.exception.OrcidBadRequestException;
 import org.orcid.core.exception.OrcidNonPublicElementException;
 import org.orcid.core.exception.SearchStartParameterLimitExceededException;
@@ -570,8 +569,8 @@ public void testViewEmails() {
         assertEquals(Visibility.PUBLIC.value(), email.getVisibility().value());
         assertEquals(Visibility.PUBLIC.value(), email2.getVisibility().value());
         assertEquals("/0000-0000-0000-0003/email", emails.getPath());
-        assertEquals("APP-5555555555555555", email.getSource().retrieveSourcePath());
-        assertEquals("Source Client 1", email.getSource().getSourceName().getContent());
+        assertEquals("0000-0000-0000-0000", email.getSource().retrieveSourcePath());
+        assertEquals("ORCID email validation", email.getSource().getSourceName().getContent());
         assertNull(email.getSource().getSourceOrcid());
         assertEquals("0000-0000-0000-0000", email2.getSource().retrieveSourcePath());
         assertEquals("ORCID email validation", email2.getSource().getSourceName().getContent());
@@ -1305,8 +1304,8 @@ private void validatePerson(Person person) {
         assertNotNull(email.getLastModifiedDate().getValue());
         assertNotNull(email2.getLastModifiedDate());
         assertNotNull(email2.getLastModifiedDate().getValue());
-        assertEquals("APP-5555555555555555", email.getSource().retrieveSourcePath());
-        assertEquals("Source Client 1", email.getSource().getSourceName().getContent());
+        assertEquals("0000-0000-0000-0000", email.getSource().retrieveSourcePath());
+        assertEquals("ORCID email validation", email.getSource().getSourceName().getContent());
         assertNull(email.getSource().getSourceOrcid());
         assertEquals("0000-0000-0000-0000", email2.getSource().retrieveSourcePath());
         assertEquals("ORCID email validation", email2.getSource().getSourceName().getContent());
diff --git a/orcid-pub-web/src/test/java/org/orcid/api/publicV3/server/PublicV3ApiServiceDelegatorTest.java b/orcid-pub-web/src/test/java/org/orcid/api/publicV3/server/PublicV3ApiServiceDelegatorTest.java
index 75c3d0220a..acea94057d 100644
--- a/orcid-pub-web/src/test/java/org/orcid/api/publicV3/server/PublicV3ApiServiceDelegatorTest.java
+++ b/orcid-pub-web/src/test/java/org/orcid/api/publicV3/server/PublicV3ApiServiceDelegatorTest.java
@@ -597,8 +597,8 @@ public void testViewEmails() {
         assertEquals(Visibility.PUBLIC.value(), email.getVisibility().value());
         assertEquals(Visibility.PUBLIC.value(), email2.getVisibility().value());
         assertEquals("/0000-0000-0000-0003/email", emails.getPath());
-        assertEquals("APP-5555555555555555", email.getSource().retrieveSourcePath());
-        assertEquals("Source Client 1", email.getSource().getSourceName().getContent());
+        assertEquals("0000-0000-0000-0000", email.getSource().retrieveSourcePath());
+        assertEquals("ORCID email validation", email.getSource().getSourceName().getContent());
         assertNull(email.getSource().getSourceOrcid());
         assertEquals("0000-0000-0000-0000", email2.getSource().retrieveSourcePath());
         assertEquals("ORCID email validation", email2.getSource().getSourceName().getContent());
@@ -1836,9 +1836,9 @@ private void validatePerson(Person person) {
         assertNotNull(email.getLastModifiedDate().getValue());
         assertNotNull(email2.getLastModifiedDate());
         assertNotNull(email2.getLastModifiedDate().getValue());
-        assertEquals("APP-5555555555555555", email.getSource().retrieveSourcePath());
+        assertEquals("0000-0000-0000-0000", email.getSource().retrieveSourcePath());
         assertNull(email.getSource().getSourceOrcid());
-        assertEquals("Source Client 1", email.getSource().getSourceName().getContent());
+        assertEquals("ORCID email validation", email.getSource().getSourceName().getContent());
         assertEquals("0000-0000-0000-0000", email2.getSource().retrieveSourcePath());
         assertNull(email2.getSource().getSourceOrcid());
         assertEquals("ORCID email validation", email2.getSource().getSourceName().getContent());