Index: vhUnitTest/APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory/GeefDoorHandelMeeleverenBepaler.cls.xml
===================================================================
diff -u -r53704 -r55273
--- vhUnitTest/APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory/GeefDoorHandelMeeleverenBepaler.cls.xml	(.../GeefDoorHandelMeeleverenBepaler.cls.xml)	(revision 53704)
+++ vhUnitTest/APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory/GeefDoorHandelMeeleverenBepaler.cls.xml	(.../GeefDoorHandelMeeleverenBepaler.cls.xml)	(revision 55273)
@@ -25,15 +25,17 @@
 <Implementation><![CDATA[
 	Set Factory = ##class(APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepalerFactory).%New()
 	
-	#dim PersonalityIdIterator as TECH.ItemIterator = ##class(TECH.ListIterator).%New(##class(TECH.ListUtils).PiecesToList(##class(DOM.common.enu.Personality).ValueList(),","))
+	#dim PersonalityIdIterator As TECH.ListIterator = ##class(DOM.common.enu.Personality).ValueListIterator()
 	
 	while PersonalityIdIterator.HasNext() {
 		#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.%Extends("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler"))
-		} else{
-			Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler"))
+			Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.BeslagDesign"))
+		} elseif (PersonalityId = 17) {	
+			Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.Galimberti"))
+		} else {
+			Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.Geen"))
 		}
 	}
 ]]></Implementation>
Index: APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory.cls.xml
===================================================================
diff -u -r53498 -r55273
--- APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory.cls.xml	(.../DoorHandelMeeleverenBepalerFactory.cls.xml)	(revision 53498)
+++ APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory.cls.xml	(.../DoorHandelMeeleverenBepalerFactory.cls.xml)	(revision 55273)
@@ -7,12 +7,9 @@
 <FormalSpec>PersonalityId:DOM.common.enu.Personality=""</FormalSpec>
 <ReturnType>APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler</ReturnType>
 <Implementation><![CDATA[
-	if PersonalityId = ##class(DOM.common.enu.Personality).BeslagDesign() {
-		#dim Bepaler as APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler = ##class(APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.BeslagDesign).%New()
-	} else {
-		Set Bepaler = ##class(APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.Geen).%New()
-	}
-	Quit Bepaler
+	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()
+	Quit ##class(APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.Geen).%New()
 ]]></Implementation>
 </Method>
 </Class>