Index: vhTest/Dummy/APPS/TRANSP/OfferteService/dto/BerekenInput.cls.xml
===================================================================
diff -u
--- vhTest/Dummy/APPS/TRANSP/OfferteService/dto/BerekenInput.cls.xml	(revision 0)
+++ vhTest/Dummy/APPS/TRANSP/OfferteService/dto/BerekenInput.cls.xml	(revision 33619)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Dummy.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 = ##class(TECH.DateTime).TextToDate("11/03/2016")
+	Set BerekenInput.VroegsteAfhaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
+	Set BerekenInput.LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
+	Set BerekenInput.LeverAdres.ProvincieCode = ""
+	Set BerekenInput.LeverAdres.LandCode = "BE"
+	Set BerekenInput.LeverAdres.Postcode = "9100"
+	Set BerekenInput.LeverAdres.Woonplaats = "Sint-Niklaas"
+	
+	For Item=1:1:10 {
+		#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.Aantal = 1
+		Set TeverzendItem.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(Item * 500, Item * 10, Item * 100 )
+		Do BerekenInput.TeVerzendenItems.Insert(TeverzendItem)
+	}
+	
+	Quit BerekenInput
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/TRANSP/UPS/impl/TimeInTransit/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u -r33484 -r33619
--- vhUnitTest/APPS/TRANSP/UPS/impl/TimeInTransit/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 33484)
+++ vhUnitTest/APPS/TRANSP/UPS/impl/TimeInTransit/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 33619)
@@ -9,11 +9,11 @@
 	
 	#dim OfferteBerekenaar As APPS.TRANSP.UPS.impl.TimeInTransit.OfferteBerekenaar = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.OfferteBerekenaar).%New(FakeWebClient)
 	
-	#dim BerekenInput As APPS.TRANSP.OfferteService.dto.BerekenInput = ..GeefBerekenInput()
+	#dim BerekenInput As APPS.TRANSP.OfferteService.dto.BerekenInput = ##class(vhTest.Dummy.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.Dummy.APPS.TRANSP.OfferteService.dto.OfferteData).GeefTransportOfferte()
 	
 	Do $$$AssertEquals(TransportOfferte.Items.Count(), TestTransportOfferte.Items.Count())
 	
@@ -22,57 +22,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 = ##class(TECH.DateTime).TextToDate("11/03/2016")
-	Set BerekenInput.VroegsteAfhaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
-	Set BerekenInput.LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
-	Set BerekenInput.LeverAdres.ProvincieCode = ""
-	Set BerekenInput.LeverAdres.LandCode = "BE"
-	Set BerekenInput.LeverAdres.Postcode = "9100"
-	Set BerekenInput.LeverAdres.Woonplaats = "Sint-Niklaas"
-	
-	For Item=1:1:10 {
-		#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.Aantal = 1
-		Set TeverzendItem.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(Item * 500, Item * 10, Item * 100 )
-		Do BerekenInput.TeVerzendenItems.Insert(TeverzendItem)
-	}
-	
-	Quit BerekenInput
-]]></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()
-	
-	For Item=1:1:5 {
-		#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
-		Set OfferteItem.Code = Item
-		Set OfferteItem.Omschrijving = "Omschrijving"_Item
-		Set OfferteItem.Gegarandeerd = "1"
-		Set OfferteItem.Duurtijd = Item
-		Set OfferteItem.Kostprijs = 0
-		Set OfferteItem.CarbonNeutralPrijs = 0
-		Set OfferteItem.OphaalDatum = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate()
-
-		Do OfferteData.Items.Insert(OfferteItem)
-	}
-
-	Quit OfferteData
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Dummy/APPS/TRANSP/OfferteService/dto/OfferteData.cls.xml
===================================================================
diff -u
--- vhTest/Dummy/APPS/TRANSP/OfferteService/dto/OfferteData.cls.xml	(revision 0)
+++ vhTest/Dummy/APPS/TRANSP/OfferteService/dto/OfferteData.cls.xml	(revision 33619)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Dummy.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()
+	
+	For Item=1:1:5 {
+		#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+		Set OfferteItem.Code = Item
+		Set OfferteItem.Omschrijving = "Omschrijving"_Item
+		Set OfferteItem.Gegarandeerd = "1"
+		Set OfferteItem.Duurtijd = Item
+		Set OfferteItem.Kostprijs = 0
+		Set OfferteItem.CarbonNeutralPrijs = 0
+		Set OfferteItem.OphaalDatum = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate()
+
+		Do OfferteData.Items.Insert(OfferteItem)
+	}
+
+	Quit OfferteData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>