Index: vhUnitTest/DOM/VKP/dto/VerkoopPrijsUitzondering/Test.cls.xml
===================================================================
diff -u -r45334 -r45344
--- vhUnitTest/DOM/VKP/dto/VerkoopPrijsUitzondering/Test.cls.xml	(.../Test.cls.xml)	(revision 45334)
+++ vhUnitTest/DOM/VKP/dto/VerkoopPrijsUitzondering/Test.cls.xml	(.../Test.cls.xml)	(revision 45344)
@@ -28,12 +28,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"""
@@ -46,40 +46,16 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: De node bestaat wel">
-<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($ClassName(VerkoopPrijsUitzondering),"DOM.VKP.dto.VerkoopPrijsUitzondering")
-]]></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 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,",",3) = """"_VerkoopPrijzUitzondering.HoofdGroep_" """
 	Set $Piece(Subscript,",",4) = """0"""
 	Set $Piece(Subscript,",",5) = """0"""
 	Set $Piece(Subscript,",",6) = """0"""
@@ -98,12 +74,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) = VerkoopPrijzUitzondering.HoofdGroep
+	Set $Piece(Subscript,",",3) = """"_VerkoopPrijzUitzondering.HoofdGroep_" """
 	Set $Piece(Subscript,",",4) = """0"""
 	Set $Piece(Subscript,",",5) = """0"""
 	Set $Piece(Subscript,",",6) = """0"""
@@ -114,7 +90,7 @@
 	
 	#dim VerkoopPrijsUitzondering As DOM.VKP.dto.VerkoopPrijsUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).FromNode(Subscript)
 	
-	Do $$$AssertEquals(VerkoopPrijsUitzondering.HoofdGroep,"""01CH """)
+	Do $$$AssertEquals(VerkoopPrijsUitzondering.HoofdGroep,"01CH")
 ]]></Implementation>
 </Method>
 
Index: DOM/VKP/dto/VerkoopPrijsUitzondering.cls.xml
===================================================================
diff -u -r45330 -r45344
--- DOM/VKP/dto/VerkoopPrijsUitzondering.cls.xml	(.../VerkoopPrijsUitzondering.cls.xml)	(revision 45330)
+++ DOM/VKP/dto/VerkoopPrijsUitzondering.cls.xml	(.../VerkoopPrijsUitzondering.cls.xml)	(revision 45344)
@@ -62,7 +62,7 @@
 	}
 	
 	Set VerkoopPrijsUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).%New()
-	Set VerkoopPrijsUitzondering.HoofdGroep = $Piece(Subscript,",",3)
+	Set VerkoopPrijsUitzondering.HoofdGroep = $Extract($Piece(Subscript,",",3),2,*-2)
 	Set VerkoopPrijsUitzondering.KlantId = "K||"_$Piece(Subscript,",",2)
 	
 	Quit VerkoopPrijsUitzondering