Index: vhUnitTest/DOM/VKP/dto/VerkoopPrijsUitzondering/Test.cls.xml
===================================================================
diff -u -r45320 -r45330
--- vhUnitTest/DOM/VKP/dto/VerkoopPrijsUitzondering/Test.cls.xml	(.../Test.cls.xml)	(revision 45320)
+++ vhUnitTest/DOM/VKP/dto/VerkoopPrijsUitzondering/Test.cls.xml	(.../Test.cls.xml)	(revision 45330)
@@ -8,13 +8,34 @@
 <Private>1</Private>
 </Property>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+ 	Do ##super()
+ 	Do ..KuisDataOp()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+ 	Do ..KuisDataOp()
+ 	Do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="Test: De node bestaat niet">
 <Implementation><![CDATA[
-	#dim TypePrijs As %String = """N"""
-	#dim KlantNummer As %String = """999"""
-	#dim HoofdGroep As %String = """01CH """
+	Set VerkoopPrijzUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).%New()
+	Set VerkoopPrijzUitzondering.KlantId = "K||999"
+	Set VerkoopPrijzUitzondering.HoofdGroep = "01CH "
 	
-	#dim Subscript As %String = "("_TypePrijs_","_KlantNummer_","_HoofdGroep_",0,0,0,1)"
+	#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,",",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.")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(..E.InvalidInputException,Substrings))
@@ -25,33 +46,35 @@
 
 <Method name="Test: De node bestaat wel">
 <Implementation><![CDATA[
-	Do ..ZetDataOp()
+	Set VerkoopPrijzUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).%New()
+	Set VerkoopPrijzUitzondering.KlantId = "K||999"
+	Set VerkoopPrijzUitzondering.HoofdGroep = "01CH "
 	
-	#dim Subscript As %String = ..OpgezetteSubscript
+	#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,",",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($ClassName(VerkoopPrijsUitzondering),"DOM.VKP.dto.VerkoopPrijsUitzondering")
-	
-	Do ..KuisDataOp()
 ]]></Implementation>
 </Method>
 
-<Method name="ZetDataOp">
+<Method name="KuisDataOp">
 <Private>1</Private>
 <Implementation><![CDATA[
-	Do ..KuisDataOp()
-	
-	Set ^KLPUTZ("N",20486,"01CH ",0,0,0,1) = "20\0\\178177\\\64649\64663\64531;THB\\\\\\\"
-	Set ..OpgezetteSubscript = "(""N"",20486,""01CH "",0,0,0,1)"
+	Quit:(..OpgezetteSubscript = "")
+	Kill @("^KLPUTZ("_..OpgezetteSubscript_")")
 ]]></Implementation>
 </Method>
-
-<Method name="KuisDataOp">
-<Private>1</Private>
-<Implementation><![CDATA[	Kill ^KLPUTZ("N",20486,"01CH ",0,0,0,1)
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: DOM/VKP/dto/VerkoopPrijsUitzondering.cls.xml
===================================================================
diff -u -r45321 -r45330
--- DOM/VKP/dto/VerkoopPrijsUitzondering.cls.xml	(.../VerkoopPrijsUitzondering.cls.xml)	(revision 45321)
+++ DOM/VKP/dto/VerkoopPrijsUitzondering.cls.xml	(.../VerkoopPrijsUitzondering.cls.xml)	(revision 45330)
@@ -7,23 +7,23 @@
 <Default>DOM.VKP.impl.VerkoopPrijsUitzondering</Default>
 </Parameter>
 
-<Property name="KlantId">
-<Type>%String</Type>
+<Property name="GeldigTot">
+<Type>%Date</Type>
 </Property>
 
-<Property name="HoofdGroep">
-<Type>%String</Type>
+<Property name="GeldigVan">
+<Type>%Date</Type>
 </Property>
 
 <Property name="Groep">
 <Type>%String</Type>
 </Property>
 
-<Property name="SubGroep">
+<Property name="HoofdGroep">
 <Type>%String</Type>
 </Property>
 
-<Property name="ProductId">
+<Property name="KlantId">
 <Type>%String</Type>
 </Property>
 
@@ -43,20 +43,20 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="GeldigVan">
-<Type>%Date</Type>
+<Property name="ProductId">
+<Type>%String</Type>
 </Property>
 
-<Property name="GeldigTot">
-<Type>%Date</Type>
+<Property name="SubGroep">
+<Type>%String</Type>
 </Property>
 
 <Method name="FromNode">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Subscript:%String</FormalSpec>
 <ReturnType>DOM.VKP.dto.VerkoopPrijsUitzondering</ReturnType>
 <Implementation><![CDATA[
-	If $$$Not($Data(@("^KLPUTZ"_Subscript_""))){
+	If $$$Not($Data(@("^KLPUTZ("_Subscript_")"))){
 		Set Exceptie = ##class(TECH.Exceptions.InvalidInputException).%New("Subscript '"_Subscript_"' bestaat niet.")
 		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
 	}