Index: vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestWriter/WriteRequest/Test.cls.xml
===================================================================
diff -u -r35763 -r35949
--- vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestWriter/WriteRequest/Test.cls.xml	(.../Test.cls.xml)	(revision 35763)
+++ vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestWriter/WriteRequest/Test.cls.xml	(.../Test.cls.xml)	(revision 35949)
@@ -18,13 +18,13 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test : schrijft bestand naar optiboxmap geeft foutmelding">
+<Method name="Test : schrijft bestand naar optiboxmap geeft foutmelding dat bestand reeds bestaat">
 <Implementation><![CDATA[
 	#dim FileAPIFake As vhTest.Fake.TECH.File.FileAPI = ##class(vhTest.Fake.TECH.File.FileAPI).%New()
-	#dim FileUtilsFake As vhTest.Fake.TECH.File.FileUtils = ##class(vhTest.Fake.TECH.File.FileUtils).%New()
-	Do FileUtilsFake.VoegToeFileInfo(..GeefBestandVolledigNaam())
+	#dim FileUtilsMock As vhTest.Mock.TECH.File.impl.FileUtils = ##class(vhTest.Mock.TECH.File.impl.FileUtils).%New()
+	Do FileUtilsMock.IndienMethodCall("FileExists",$$$ElkeWaarde).DanReturn(1)
 	
-	#dim RequestWriter As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestWriter = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestWriter).%New(FileAPIFake, FileUtilsFake)
+	#dim RequestWriter As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestWriter = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestWriter).%New(FileAPIFake, FileUtilsMock)
 
 	#dim VerwachteError As %String = "Bestand " _..GeefBestandVolledigNaam() _" bestaat reeds in de OptiboxBig folder!"
 	set VerwachteError = VerwachteError _ $$$CRLF _ "Gelieve na te zien waarom optiboxBig dit bestand niet verwerkt heeft."
Index: APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml
===================================================================
diff -u -r35753 -r35949
--- APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 35753)
+++ APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 35949)
@@ -3,6 +3,23 @@
 <Class name="APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestComposer">
 <Super>TECH.Mockable</Super>
 
+<Property name="FormatAPI">
+<Type>TECH.Format.impl.FormatAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>initvalue:%CacheString</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..FormatAPI = ##class(TECH.Format.impl.FormatAPI).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Compose">
 <FormalSpec>CollisOpPallet:APPS.TRANSP.Stapeling.dto.CollisOpPallet</FormalSpec>
 <ReturnType>APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.cubeiq</ReturnType>
@@ -41,7 +58,7 @@
 	Set cubeiqPackage.length = ColliOpPallet.Afmeting.Lengte
 	Set cubeiqPackage.width = ColliOpPallet.Afmeting.Breedte
 	Set cubeiqPackage.height = ColliOpPallet.Afmeting.Hoogte
-	Set cubeiqPackage.weight = ##class(TECH.Format.impl.FormatAPI).%New().FormatNumber(ColliOpPallet.GewichtInKg,2,".")
+	Set cubeiqPackage.weight = ..FormatAPI.FormatNumber(ColliOpPallet.GewichtInKg,2,".")
 	Set cubeiqPackage.turnable = "False" 
 	Set cubeiqPackage.sideupok = "False" 
 	Set cubeiqPackage.endupok = "True" 
@@ -242,7 +259,7 @@
 <Method name="GeefHuidigeDatum">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $$FormatDateTime^vhLib("dd/mm/YYYY",$H)
+<Implementation><![CDATA[	Quit $$FormatDateTime^vhLib("dd/mm/YYYY",##class(TECH.DateTime.impl.DateTimeAPI).%New().CurrentHorolog())
 ]]></Implementation>
 </Method>
 </Class>