Index: APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory.cls.xml
===================================================================
diff -u -r55273 -r55725
--- APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory.cls.xml	(.../DoorHandelMeeleverenBepalerFactory.cls.xml)	(revision 55273)
+++ APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory.cls.xml	(.../DoorHandelMeeleverenBepalerFactory.cls.xml)	(revision 55725)
@@ -7,8 +7,9 @@
 <FormalSpec>PersonalityId:DOM.common.enu.Personality=""</FormalSpec>
 <ReturnType>APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler</ReturnType>
 <Implementation><![CDATA[
-	Quit:(PersonalityId = ##class(DOM.common.enu.Personality).BeslagDesign()) ##class(APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.BeslagDesign).%New()
-	Quit:(PersonalityId = ##class(DOM.common.enu.Personality).Galimberti()) ##class(APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.Galimberti).%New()
+	If ##class(TECH.StringUtils).Contains(PersonalityId,##class(DOM.common.enu.Personality).BeslagDesign(),##class(DOM.common.enu.Personality).Galimberti(),##class(DOM.common.enu.Personality).Pavanello(),##class(DOM.common.enu.Personality).Ferexpert()){
+		Quit ##class(APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux).%New()
+	}
 	Quit ##class(APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.Geen).%New()
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory/GeefDoorHandelMeeleverenBepaler.cls.xml
===================================================================
diff -u -r55273 -r55725
--- vhUnitTest/APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory/GeefDoorHandelMeeleverenBepaler.cls.xml	(.../GeefDoorHandelMeeleverenBepaler.cls.xml)	(revision 55273)
+++ vhUnitTest/APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory/GeefDoorHandelMeeleverenBepaler.cls.xml	(.../GeefDoorHandelMeeleverenBepaler.cls.xml)	(revision 55725)
@@ -31,9 +31,13 @@
 		#dim PersonalityId as DOM.common.enu.Personality = PersonalityIdIterator.Next()
 		#dim Bepaler as APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler = Factory.GeefDoorHandelMeeleverenBepaler(PersonalityId)
 		if (PersonalityId = 14) {		
-			Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.BeslagDesign"))
+			Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux"))			
 		} elseif (PersonalityId = 17) {	
-			Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.Galimberti"))
+			Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux"))
+		} elseif (PersonalityId = 18) {	
+			Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux"))
+		} elseif (PersonalityId = 19) {	
+			Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux"))
 		} else {
 			Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.Geen"))
 		}