Index: vhUnitTest/DOM/VKP/dto/VerkoopPrijsUitzondering/Test.cls.xml
===================================================================
diff -u -r45344 -r45346
--- vhUnitTest/DOM/VKP/dto/VerkoopPrijsUitzondering/Test.cls.xml	(.../Test.cls.xml)	(revision 45344)
+++ vhUnitTest/DOM/VKP/dto/VerkoopPrijsUitzondering/Test.cls.xml	(.../Test.cls.xml)	(revision 45346)
@@ -8,6 +8,30 @@
 <Private>1</Private>
 </Property>
 
+<Property name="VerkoopPrijsUitzondering">
+<Type>DOM.VKP.dto.VerkoopPrijsUitzondering</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+ 	Do ##super()
+ 	Set VerkoopPrijzUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).%New()
+	Set VerkoopPrijzUitzondering.KlantId = "K||999"
+	Set VerkoopPrijzUitzondering.HoofdGroep = "01CH"
+	
+	#dim Subscript As %String
+	Set $Piece(Subscript,",",1) = """N"""
+	Set $Piece(Subscript,",",2) = $Piece(VerkoopPrijzUitzondering.KlantId,"||",2)
+	Set $Piece(Subscript,",",3) = """"_VerkoopPrijzUitzondering.HoofdGroep_" """
+	Set $Piece(Subscript,",",4) = """0"""
+	Set $Piece(Subscript,",",5) = """0"""
+	Set $Piece(Subscript,",",6) = """0"""
+	Set $Piece(Subscript,",",7) = """0"""
+	Set ..OpgezetteSubscript = Subscript
+]]></Implementation>
+</Method>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
@@ -26,70 +50,29 @@
 
 <Method name="Test: De node bestaat niet">
 <Implementation><![CDATA[
-	Set VerkoopPrijzUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).%New()
-	Set VerkoopPrijzUitzondering.KlantId = "K||999"
-	Set VerkoopPrijzUitzondering.HoofdGroep = "01CH"
-	
-	#dim Subscript As %String
-	Set $Piece(Subscript,",",1) = """N"""
-	Set $Piece(Subscript,",",2) = $Piece(VerkoopPrijzUitzondering.KlantId,"||",2)
-	Set $Piece(Subscript,",",3) = """"_VerkoopPrijzUitzondering.HoofdGroep_" """
-	Set $Piece(Subscript,",",4) = """0"""
-	Set $Piece(Subscript,",",5) = """0"""
-	Set $Piece(Subscript,",",6) = """0"""
-	Set $Piece(Subscript,",",7) = """0"""
-	
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Subscript '"_Subscript_"' bestaat niet.")
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Subscript '"_..OpgezetteSubscript_"' bestaat niet.")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(..E.InvalidInputException,Substrings))
 	
-	#dim VerkoopPrijsUitzondering As DOM.VKP.dto.VerkoopPrijsUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).FromNode(Subscript)
+	#dim VerkoopPrijsUitzondering As DOM.VKP.dto.VerkoopPrijsUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).FromNode(..OpgezetteSubscript)
 ]]></Implementation>
 </Method>
 
 <Method name="Test: De 2e node zet het klantnummer">
 <Implementation><![CDATA[
-	Set VerkoopPrijzUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).%New()
-	Set VerkoopPrijzUitzondering.KlantId = "K||999"
-	Set VerkoopPrijzUitzondering.HoofdGroep = "01CH"
+	Set @("^KLPUTZ("_..OpgezetteSubscript_")") = "20\0\\178177\\\64649\64663\64531;THB\\\\\\\"
 	
-	#dim Subscript As %String
-	Set $Piece(Subscript,",",1) = """N"""
-	Set $Piece(Subscript,",",2) = $Piece(VerkoopPrijzUitzondering.KlantId,"||",2)
-	Set $Piece(Subscript,",",3) = """"_VerkoopPrijzUitzondering.HoofdGroep_" """
-	Set $Piece(Subscript,",",4) = """0"""
-	Set $Piece(Subscript,",",5) = """0"""
-	Set $Piece(Subscript,",",6) = """0"""
-	Set $Piece(Subscript,",",7) = """0"""
+	#dim VerkoopPrijsUitzondering As DOM.VKP.dto.VerkoopPrijsUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).FromNode(..OpgezetteSubscript)
 	
-	Set @("^KLPUTZ("_Subscript_")") = "20\0\\178177\\\64649\64663\64531;THB\\\\\\\"
-	Set ..OpgezetteSubscript = Subscript
-	
-	#dim VerkoopPrijsUitzondering As DOM.VKP.dto.VerkoopPrijsUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).FromNode(Subscript)
-	
 	Do $$$AssertEquals(VerkoopPrijsUitzondering.KlantId,"K||999")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: De 3e node zet de hoofdgroep">
 <Implementation><![CDATA[
-	Set VerkoopPrijzUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).%New()
-	Set VerkoopPrijzUitzondering.KlantId = "K||999"
-	Set VerkoopPrijzUitzondering.HoofdGroep = "01CH"
+	Set @("^KLPUTZ("_..OpgezetteSubscript_")") = "20\0\\178177\\\64649\64663\64531;THB\\\\\\\"
 	
-	#dim Subscript As %String
-	Set $Piece(Subscript,",",1) = """N"""
-	Set $Piece(Subscript,",",2) = $Piece(VerkoopPrijzUitzondering.KlantId,"||",2)
-	Set $Piece(Subscript,",",3) = """"_VerkoopPrijzUitzondering.HoofdGroep_" """
-	Set $Piece(Subscript,",",4) = """0"""
-	Set $Piece(Subscript,",",5) = """0"""
-	Set $Piece(Subscript,",",6) = """0"""
-	Set $Piece(Subscript,",",7) = """0"""
+	#dim VerkoopPrijsUitzondering As DOM.VKP.dto.VerkoopPrijsUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).FromNode(..OpgezetteSubscript)
 	
-	Set @("^KLPUTZ("_Subscript_")") = "20\0\\178177\\\64649\64663\64531;THB\\\\\\\"
-	Set ..OpgezetteSubscript = Subscript
-	
-	#dim VerkoopPrijsUitzondering As DOM.VKP.dto.VerkoopPrijsUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).FromNode(Subscript)
-	
 	Do $$$AssertEquals(VerkoopPrijsUitzondering.HoofdGroep,"01CH")
 ]]></Implementation>
 </Method>