Index: vhUnitTest/DOM/VKP/dto/VerkoopPrijsUitzondering/Test.cls.xml
===================================================================
diff -u -r45330 -r45334
--- vhUnitTest/DOM/VKP/dto/VerkoopPrijsUitzondering/Test.cls.xml	(.../Test.cls.xml)	(revision 45330)
+++ vhUnitTest/DOM/VKP/dto/VerkoopPrijsUitzondering/Test.cls.xml	(.../Test.cls.xml)	(revision 45334)
@@ -8,17 +8,19 @@
 <Private>1</Private>
 </Property>
 
-<Method name="OnBeforeAllTests">
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
- 	Do ##super()
+	do ##super(aTestName)
  	Do ..KuisDataOp()
 ]]></Implementation>
 </Method>
 
-<Method name="OnAfterAllTests">
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
  	Do ..KuisDataOp()
- 	Do ##super()
+ 	Do ##super(aTestName)
 ]]></Implementation>
 </Method>
 
@@ -48,12 +50,12 @@
 <Implementation><![CDATA[
 	Set VerkoopPrijzUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).%New()
 	Set VerkoopPrijzUitzondering.KlantId = "K||999"
-	Set VerkoopPrijzUitzondering.HoofdGroep = "01CH "
+	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) = """01CH """
+	Set $Piece(Subscript,",",3) = VerkoopPrijzUitzondering.HoofdGroep
 	Set $Piece(Subscript,",",4) = """0"""
 	Set $Piece(Subscript,",",5) = """0"""
 	Set $Piece(Subscript,",",6) = """0"""
@@ -68,6 +70,54 @@
 ]]></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 """
+	
+	#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 @("^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 """
+	
+	#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 @("^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>
+
 <Method name="KuisDataOp">
 <Private>1</Private>
 <Implementation><![CDATA[