Index: vhUnitTest/APPS/TRANSP/UPS/impl/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u -r33484 -r33605
--- vhUnitTest/APPS/TRANSP/UPS/impl/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 33484)
+++ vhUnitTest/APPS/TRANSP/UPS/impl/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 33605)
@@ -11,11 +11,11 @@
 	
 	#dim OfferteBerekenaar As APPS.TRANSP.UPS.impl.OfferteBerekenaar = ##class(APPS.TRANSP.UPS.impl.OfferteBerekenaar).%New(RateBerekenaar, TimeInTransitBerekenaar)
 
-	#dim BerekenInput As APPS.TRANSP.OfferteService.dto.BerekenInput = ..GeefBerekenInput()
+	#dim BerekenInput As APPS.TRANSP.OfferteService.dto.BerekenInput = ##class(vhTest.Utils.APPS.TRANSP.OfferteService.dto.BerekenInput).GeefBerekenInput()
 
 	#dim TransportOfferte As APPS.TRANSP.OfferteService.dto.OfferteData = OfferteBerekenaar.Bereken(BerekenInput)
 	
-	#dim TestTransportOfferte As APPS.TRANSP.OfferteService.dto.OfferteData = ..GeefTransportOfferte()
+	#dim TestTransportOfferte As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(vhTest.Utils.APPS.TRANSP.OfferteService.dto.OfferteData).GeefTransportOfferte()
 	
 	Do $$$AssertEquals(TransportOfferte.Items.Count(), TestTransportOfferte.Items.Count())
 	
@@ -24,90 +24,6 @@
 		}
 ]]></Implementation>
 </Method>
-
-<Method name="GeefBerekenInput">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.OfferteService.dto.BerekenInput</ReturnType>
-<Implementation><![CDATA[
-	#dim BerekenInput As APPS.TRANSP.OfferteService.dto.BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
-	Set BerekenInput.Referentie = "1"
-	Set BerekenInput.GewensteLeverDatum = ..GeefGeldigeDatum()
-	Set BerekenInput.VroegsteAfhaalDatum = ..GeefHuidigeDatum()
-	Set BerekenInput.LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
-	Set BerekenInput.LeverAdres.ProvincieCode = ""
-	Set BerekenInput.LeverAdres.LandCode = "DE"
-	Set BerekenInput.LeverAdres.Postcode = "57462"
-	Set BerekenInput.LeverAdres.Woonplaats = "Olpe"
-	
-	For Item=1:1:15 {
-		#dim TeverzendItem As APPS.TRANSP.OfferteService.dto.TeverzendenItem = ##class(APPS.TRANSP.OfferteService.dto.TeverzendenItem).%New()
-		Set TeverzendItem.ProductID = Item
-		Set TeverzendItem.WaardeGoederen = Item * 10
-		Set TeverzendItem.Gewicht = Item * 5
-		Set TeverzendItem.Afmeting = Item * 500
-		Do BerekenInput.TeVerzendenItems.Insert(TeverzendItem)
-	}
-	
-	Quit BerekenInput
-]]></Implementation>
-</Method>
-
-<Method name="GeefGeldigeDatum">
-<Private>1</Private>
-<ReturnType>%Date</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.DateTime).DatumBereken(..GeefHuidigeDatum(),10, ##class(TECH.enu.DatePart).Dag())
-]]></Implementation>
-</Method>
-
-<Method name="GeefHuidigeDatum">
-<Private>1</Private>
-<ReturnType>%Date</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate()
-]]></Implementation>
-</Method>
-
-<Method name="GeefTransportOfferte">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
-<Implementation><![CDATA[
-	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
-	
-	#dim OfferteItem1 As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
-	Set OfferteItem1.Code = 2
-	Set OfferteItem1.Omschrijving = "UPS Express"
-	Set OfferteItem1.Gegarandeerd = "1"
-	Set OfferteItem1.Duurtijd = 1
-	Set OfferteItem1.Kostprijs = 70
-	Set OfferteItem1.CarbonNeutralPrijs = 7
-	Set OfferteItem1.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
-
-	Do OfferteData.Items.Insert(OfferteItem1)
-
-	#dim OfferteItem2 As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
-	Set OfferteItem2.Code = 2
-	Set OfferteItem2.Omschrijving = "UPS Express"
-	Set OfferteItem2.Gegarandeerd = "1"
-	Set OfferteItem2.Duurtijd = 10
-	Set OfferteItem2.Kostprijs = 70
-	Set OfferteItem2.CarbonNeutralPrijs = 7
-	Set OfferteItem2.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
-
-	Do OfferteData.Items.Insert(OfferteItem2)
-
-	#dim OfferteItem3 As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
-	Set OfferteItem3.Code = 4
-	Set OfferteItem3.Omschrijving = "UPS Standard"
-	Set OfferteItem3.Gegarandeerd = "1"
-	Set OfferteItem3.Duurtijd = 8
-	Set OfferteItem3.Kostprijs = 110
-	Set OfferteItem3.CarbonNeutralPrijs = 11
-	Set OfferteItem3.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
-
-	Do OfferteData.Items.Insert(OfferteItem3)
-
-	Quit OfferteData
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Utils/APPS/TRANSP/OfferteService/dto/BerekenInput.cls.xml
===================================================================
diff -u
--- vhTest/Utils/APPS/TRANSP/OfferteService/dto/BerekenInput.cls.xml	(revision 0)
+++ vhTest/Utils/APPS/TRANSP/OfferteService/dto/BerekenInput.cls.xml	(revision 33605)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Utils.APPS.TRANSP.OfferteService.dto.BerekenInput">
+<Super>%RegisteredObject</Super>
+
+<Method name="GeefBerekenInput">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.OfferteService.dto.BerekenInput</ReturnType>
+<Implementation><![CDATA[
+	#dim BerekenInput As APPS.TRANSP.OfferteService.dto.BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
+	Set BerekenInput.Referentie = "1"
+	Set BerekenInput.GewensteLeverDatum = ..GeefGeldigeDatum()
+	Set BerekenInput.VroegsteAfhaalDatum = ..GeefHuidigeDatum()
+	Set BerekenInput.LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
+	Set BerekenInput.LeverAdres.ProvincieCode = ""
+	Set BerekenInput.LeverAdres.LandCode = "DE"
+	Set BerekenInput.LeverAdres.Postcode = "57462"
+	Set BerekenInput.LeverAdres.Woonplaats = "Olpe"
+	
+	For Item=1:1:15 {
+		#dim TeverzendItem As APPS.TRANSP.OfferteService.dto.TeverzendenItem = ##class(APPS.TRANSP.OfferteService.dto.TeverzendenItem).%New()
+		Set TeverzendItem.ProductID = Item
+		Set TeverzendItem.WaardeGoederen = Item * 10
+		Set TeverzendItem.Gewicht = Item * 5
+		Set TeverzendItem.Afmeting = Item * 500
+		Do BerekenInput.TeVerzendenItems.Insert(TeverzendItem)
+	}
+	
+	Quit BerekenInput
+]]></Implementation>
+</Method>
+
+<Method name="GeefGeldigeDatum">
+<ClassMethod>1</ClassMethod>
+<Private>1</Private>
+<ReturnType>%Date</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.DateTime).DatumBereken(..GeefHuidigeDatum(),10, ##class(TECH.enu.DatePart).Dag())
+]]></Implementation>
+</Method>
+
+<Method name="GeefHuidigeDatum">
+<ClassMethod>1</ClassMethod>
+<Private>1</Private>
+<ReturnType>%Date</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Utils/APPS/TRANSP/OfferteService/dto/OfferteData.cls.xml
===================================================================
diff -u
--- vhTest/Utils/APPS/TRANSP/OfferteService/dto/OfferteData.cls.xml	(revision 0)
+++ vhTest/Utils/APPS/TRANSP/OfferteService/dto/OfferteData.cls.xml	(revision 33605)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Utils.APPS.TRANSP.OfferteService.dto.OfferteData">
+<Super>%RegisteredObject</Super>
+
+<Method name="GeefTransportOfferte">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
+	
+	#dim OfferteItem1 As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+	Set OfferteItem1.Code = 2
+	Set OfferteItem1.Omschrijving = "UPS Express"
+	Set OfferteItem1.Gegarandeerd = "1"
+	Set OfferteItem1.Duurtijd = 1
+	Set OfferteItem1.Kostprijs = 70
+	Set OfferteItem1.CarbonNeutralPrijs = 7
+	Set OfferteItem1.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
+
+	Do OfferteData.Items.Insert(OfferteItem1)
+
+	#dim OfferteItem2 As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+	Set OfferteItem2.Code = 2
+	Set OfferteItem2.Omschrijving = "UPS Express"
+	Set OfferteItem2.Gegarandeerd = "1"
+	Set OfferteItem2.Duurtijd = 10
+	Set OfferteItem2.Kostprijs = 70
+	Set OfferteItem2.CarbonNeutralPrijs = 7
+	Set OfferteItem2.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
+
+	Do OfferteData.Items.Insert(OfferteItem2)
+
+	#dim OfferteItem3 As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+	Set OfferteItem3.Code = 4
+	Set OfferteItem3.Omschrijving = "UPS Standard"
+	Set OfferteItem3.Gegarandeerd = "1"
+	Set OfferteItem3.Duurtijd = 8
+	Set OfferteItem3.Kostprijs = 110
+	Set OfferteItem3.CarbonNeutralPrijs = 11
+	Set OfferteItem3.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
+
+	Do OfferteData.Items.Insert(OfferteItem3)
+
+	Quit OfferteData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>