Index: vhUnitTest/APPS/TRANSP/UPS/impl/Rate/Service/RatePort/Test.cls.xml
===================================================================
diff -u -r32827 -r32829
--- vhUnitTest/APPS/TRANSP/UPS/impl/Rate/Service/RatePort/Test.cls.xml	(.../Test.cls.xml)	(revision 32827)
+++ vhUnitTest/APPS/TRANSP/UPS/impl/Rate/Service/RatePort/Test.cls.xml	(.../Test.cls.xml)	(revision 32829)
@@ -16,7 +16,7 @@
 	do $$$AssertEquals(TransportSpy.Action,"http://onlinetools.ups.com/webservices/RateBinding/v1.1")
 	do $$$AssertEquals(TransportSpy.OneWay,$$$false)
 	
-	do ..DataExporteerder.ExporteerStream(..FormateerXmlStream(TransportSpy.RequestStream),"Response.xml")
+	do ..DataExporteerder.ExporteerStream(##class(TECH.StreamUtils).FormateerXmlStream(TransportSpy.RequestStream),"Response.xml")
 	
 	do $$$AssertReferentieBestanden(..GeefBestandLocatie())
 ]]></Implementation>
@@ -37,23 +37,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="FormateerXmlStream">
-<FormalSpec>BronStream:%Stream</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Stream</ReturnType>
-<Implementation><![CDATA[
-	Set reader=##class(%XML.Reader).%New()
-	Set writer=##class(%XML.Writer).%New()
-	Do reader.OpenStream(BronStream)
-	Set writer.Charset="UTF-8"
-	Set writer.Indent=1
-	Set Stream=##class(%GlobalCharacterStream).%New()
-	Do writer.OutputToStream(Stream)
-	Do writer.Document(reader.Document)
-	Quit Stream
-]]></Implementation>
-</Method>
-
 <Method name="GeefRateRequest">
 <Private>1</Private>
 <ReturnType>APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest</ReturnType>
Index: vhUnitTest/APPS/TRANSP/UPS/impl/TimeInTransit/Service/TimeInTransitPort/Test.cls.xml
===================================================================
diff -u -r32828 -r32829
--- vhUnitTest/APPS/TRANSP/UPS/impl/TimeInTransit/Service/TimeInTransitPort/Test.cls.xml	(.../Test.cls.xml)	(revision 32828)
+++ vhUnitTest/APPS/TRANSP/UPS/impl/TimeInTransit/Service/TimeInTransitPort/Test.cls.xml	(.../Test.cls.xml)	(revision 32829)
@@ -16,7 +16,7 @@
 	do $$$AssertEquals(TransportSpy.Action,"http://onlinetools.ups.com/webservices/TimeInTransitBinding/v1.0")
 	do $$$AssertEquals(TransportSpy.OneWay,$$$false)
 	
-	do ..DataExporteerder.ExporteerStream(..FormateerXmlStream(TransportSpy.RequestStream),"Response.xml")
+	do ..DataExporteerder.ExporteerStream(##class(TECH.StreamUtils).FormateerXmlStream(TransportSpy.RequestStream),"Response.xml")
 	
 	do $$$AssertReferentieBestanden(..GeefBestandLocatie())
 ]]></Implementation>
@@ -37,23 +37,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="FormateerXmlStream">
-<FormalSpec>BronStream:%Stream</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Stream</ReturnType>
-<Implementation><![CDATA[
-	Set reader=##class(%XML.Reader).%New()
-	Set writer=##class(%XML.Writer).%New()
-	Do reader.OpenStream(BronStream)
-	Set writer.Charset="UTF-8"
-	Set writer.Indent=1
-	Set Stream=##class(%GlobalCharacterStream).%New()
-	Do writer.OutputToStream(Stream)
-	Do writer.Document(reader.Document)
-	Quit Stream
-]]></Implementation>
-</Method>
-
 <Method name="GeefTransitInTimeRequest">
 <Private>1</Private>
 <ReturnType>APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest</ReturnType>