Index: vhUnitTest/AXimpl/AxToAdminUtils/Test.cls.xml
===================================================================
diff -u -r59584 -r74115
--- vhUnitTest/AXimpl/AxToAdminUtils/Test.cls.xml	(.../Test.cls.xml)	(revision 59584)
+++ vhUnitTest/AXimpl/AxToAdminUtils/Test.cls.xml	(.../Test.cls.xml)	(revision 74115)
@@ -51,30 +51,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: ConvertSupplierIDHLX default">
-<Implementation><![CDATA[
-	#dim SupplierID As %String = "9999"
-	#dim ConvertedLeverancierID As %String = ""
-	
-	Set Converter = ##class(AXimpl.AxToAdminUtils).%New()
-	Set ConvertedLeverancierID = Converter.ConvertSupplierIDHLX(SupplierID)
-	
-	Do $$$AssertEquals(ConvertedLeverancierID,"L||9999")
-]]></Implementation>
-</Method>
-
-<Method name="Test: ConvertSupplierIDHLX leeg">
-<Implementation><![CDATA[
-	#dim SupplierID As %String = ""
-	#dim ConvertedLeverancierID As %String = ""
-	
-	Set Converter = ##class(AXimpl.AxToAdminUtils).%New()
-	Set ConvertedLeverancierID = Converter.ConvertSupplierIDHLX(SupplierID)
-	
-	Do $$$AssertEquals(ConvertedLeverancierID,"")
-]]></Implementation>
-</Method>
-
 <Method name="Test: Convert ZuluTimeStamp voor zomertijd">
 <Implementation><![CDATA[
 	Set Converter = ##class(AXimpl.AxToAdminUtils).%New()
@@ -103,6 +79,11 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: CleanUpText verwijdert dubbele quote">
+<Implementation><![CDATA[	Do $$$AssertEquals(##class(AXimpl.AxToAdminUtils).CleanUpText("The ""neighbour"" of the beast"),"The neighbour of the beast")
+]]></Implementation>
+</Method>
+
 <Method name="Test: CustClassificationId is R02">
 <Implementation><![CDATA[
 	Set Converter = ##class(AXimpl.AxToAdminUtils).%New()
@@ -137,6 +118,41 @@
 	Do $$$AssertEquals(Converter.ConvertCustClassificationIdToRegio("R01234567890123456789"),"1234567890123456789")
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Omzetten speciale Häfele verzendwijze naar DI1">
+<Implementation><![CDATA[
+	Set Utils = ##class(AXimpl.AxToAdminUtils).%New()
+	Do $$$AssertEquals(Utils.ConvertVerzendingWijze("DiHF"),##class(TECH.StringUtils).Trim(##class(DOM.VKP.enu.VerzendWijze).Distributeur1()))
+]]></Implementation>
+</Method>
+
+<Method name="Test: Omzetten speciale Häfele Zwitserland verzendwijze naar DI1">
+<Implementation><![CDATA[
+	Set Utils = ##class(AXimpl.AxToAdminUtils).%New()
+	Do $$$AssertEquals(Utils.ConvertVerzendingWijze("DiHFCH"),##class(TECH.StringUtils).Trim(##class(DOM.VKP.enu.VerzendWijze).Distributeur1()))
+]]></Implementation>
+</Method>
+
+<Method name="Test: Omzetten speciale OPO verzendwijze naar DI1">
+<Implementation><![CDATA[
+	Set Utils = ##class(AXimpl.AxToAdminUtils).%New()
+	Do $$$AssertEquals(Utils.ConvertVerzendingWijze("DiOpo"),##class(TECH.StringUtils).Trim(##class(DOM.VKP.enu.VerzendWijze).Distributeur1()))
+]]></Implementation>
+</Method>
+
+<Method name="Test: Omzetten speciale OPODe verzendwijze naar DI1">
+<Implementation><![CDATA[
+	Set Utils = ##class(AXimpl.AxToAdminUtils).%New()
+	Do $$$AssertEquals(Utils.ConvertVerzendingWijze("Opo"),##class(TECH.StringUtils).Trim(##class(DOM.VKP.enu.VerzendWijze).Distributeur1()))
+]]></Implementation>
+</Method>
+
+<Method name="Test: Omzetten speciale BlumPolen verzendwijze naar DI1">
+<Implementation><![CDATA[
+	Set Utils = ##class(AXimpl.AxToAdminUtils).%New()
+	Do $$$AssertEquals(Utils.ConvertVerzendingWijze("BS"),##class(TECH.StringUtils).Trim(##class(DOM.VKP.enu.VerzendWijze).Distributeur1()))
+]]></Implementation>
+</Method>
 </Class>