Index: vhUnitTest/APPS/EC/ConfiguratorService/TestBase.cls.xml
===================================================================
diff -u -r30393 -r32447
--- vhUnitTest/APPS/EC/ConfiguratorService/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 30393)
+++ vhUnitTest/APPS/EC/ConfiguratorService/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 32447)
@@ -9,19 +9,39 @@
 <Private>1</Private>
 </Property>
 
+<Property name="NietBeneluxOnderneming">
+<Type>DOM.VKP.VanHoeckeKlant</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="BelgischeOnderneming">
+<Type>DOM.VKP.VanHoeckeKlant</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Personality">
 <Type>DOM.common.impl.Personality</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
-	do ##super()
+	Do ##super()
 
-	set ..Klant = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakBelgischeOnderneming() 
-	set ..Personality = ##class(DOM.common.VanHoeckePersonality).Instance()
+	Set ..BelgischeOnderneming = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakBelgischeOnderneming()
+	Set ..NietBeneluxOnderneming = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakNietBENELUXOnderneming()
+	Set ..Personality = ##class(DOM.common.VanHoeckePersonality).Instance()
 ]]></Implementation>
 </Method>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Set ..Klant = ..BelgischeOnderneming
+]]></Implementation>
+</Method>
 </Class>