diff --git a/src/Services/TestData/AppTestDataModel.cs b/src/Services/TestData/AppTestDataModel.cs
index 837e6da9..3df129f7 100644
--- a/src/Services/TestData/AppTestDataModel.cs
+++ b/src/Services/TestData/AppTestDataModel.cs
@@ -190,7 +190,7 @@ public Party ToParty(List<AppTestOrg>? potentialChildOrgs = null)
             PartyId = PartyId,
             OrgNumber = OrgNumber,
             IsDeleted = false,
-            PartyTypeName = Altinn.Platform.Register.Enums.PartyType.Organisation, // TODO: consider supporting bankrupt
+            PartyTypeName = Altinn.Platform.Register.Enums.PartyType.Organisation, // TODO: consider supporting bankrupt or subUnit
             Name = Name,
             ChildParties = childParties,
             //HelperFieldsSetLater
@@ -266,9 +266,9 @@ public Party ToParty(List<AppTestOrg>? possibleChildParties = null)
         {
             PartyId = PartyId,
             IsDeleted = false,
-            SSN = SSN,
+            SSN = string.IsNullOrEmpty(SSN) ? null : SSN,
             Name = GetFullName(),
-            PartyTypeName = Altinn.Platform.Register.Enums.PartyType.Person, // TODO: consider supporting selfIdentified
+            PartyTypeName = string.IsNullOrEmpty(SSN) ? Altinn.Platform.Register.Enums.PartyType.SelfIdentified : Altinn.Platform.Register.Enums.PartyType.Person,
             ChildParties = childParties,
             //HelperFieldsSetLater
             // OnlyHierarchyElementWithNoAccess =