Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u -r37034 -r37106
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 37034)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 37106)
@@ -85,52 +85,57 @@
 <FormalSpec>OfferteDataResult:APPS.TRANSP.OfferteService.dto.OfferteData</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Do $$$AssertEquals(OfferteDataResult.Details.Count(), 4)
-	Do $$$AssertEquals(OfferteDataResult.Details.GetAt(1),"DHL Pallet:Gewicht 100Kg,Hoogte 1mm,Breedte 1mm,Lengte 1mm")
-	Do $$$AssertEquals(OfferteDataResult.Details.GetAt(2),"DHL Pallet:Gewicht 100Kg,Hoogte 1mm,Breedte 1mm,Lengte 1mm")
-	Do $$$AssertEquals(OfferteDataResult.Details.GetAt(3),"DHL Totaal:Gewicht 200Kg,Tarief 81 euro")
-	Do $$$AssertEquals(OfferteDataResult.Details.GetAt(4),"DHL Transportduur:Aantal dagen 4,Dag Wed,OphaalDatum 28.04.16,LeverDatum 04.05.16")
+	if $$$AssertEquals(OfferteDataResult.Details.Count(), 4) {
+		Do $$$AssertEquals(OfferteDataResult.Details.GetAt(1),"DHL Pallet:Gewicht 100Kg,Hoogte 1mm,Breedte 1mm,Lengte 1mm")
+		Do $$$AssertEquals(OfferteDataResult.Details.GetAt(2),"DHL Pallet:Gewicht 100Kg,Hoogte 1mm,Breedte 1mm,Lengte 1mm")
+		Do $$$AssertEquals(OfferteDataResult.Details.GetAt(3),"DHL Totaal:Gewicht 200Kg,Tarief 81 euro")
+		Do $$$AssertEquals(OfferteDataResult.Details.GetAt(4),"DHL Transportduur:Aantal dagen 4,Dag Wed,OphaalDatum 28.04.16,LeverDatum 04.05.16")
+	}
 ]]></Implementation>
 </Method>
 
 <Method name="AssertOfferteDataDuurtijd">
 <FormalSpec>OfferteDataResult:APPS.TRANSP.OfferteService.dto.OfferteData</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Do $$$AssertEquals(OfferteDataResult.Items.Count(), 1)
-	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).LeverDag,"Wed")
-	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).Duurtijd,4)
-	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).LeverDatum,64042)
-	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).LeverTijd,43200)
+	if $$$AssertEquals(OfferteDataResult.Items.Count(), 1) {
+		Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).LeverDag,"Wed")
+		Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).Duurtijd,4)
+		Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).LeverDatum,64042)
+		Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).LeverTijd,43200)
+	}
 ]]></Implementation>
 </Method>
 
 <Method name="AssertOfferteDataTariefVoor1Pallet">
 <FormalSpec>OfferteDataResult:APPS.TRANSP.OfferteService.dto.OfferteData</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Do $$$AssertEquals(OfferteDataResult.Items.Count(), 1)
-	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).CarbonNeutralPrijs,0)
-	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).Kostprijs, 40.5)
+	if $$$AssertEquals(OfferteDataResult.Items.Count(), 1) {
+		Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).CarbonNeutralPrijs,0)
+		Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).Kostprijs, 40.5)
+	}
 ]]></Implementation>
 </Method>
 
 <Method name="AssertOfferteDataTariefVoor2Palletten">
 <FormalSpec>OfferteDataResult:APPS.TRANSP.OfferteService.dto.OfferteData</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Do $$$AssertEquals(OfferteDataResult.Items.Count(), 1)
-	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).CarbonNeutralPrijs,0)
-	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).Kostprijs, 81)
+	if $$$AssertEquals(OfferteDataResult.Items.Count(), 1) {
+		Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).CarbonNeutralPrijs,0)
+		Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).Kostprijs, 81)
+	}
 ]]></Implementation>
 </Method>
 
 <Method name="AssertAantalPalletten">
 <FormalSpec>OfferteDataResult:APPS.TRANSP.OfferteService.dto.OfferteData,AantalPalletten:TECH.Integer</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Do $$$AssertEquals(OfferteDataResult.Items.Count(), 1)
-	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).AantalPalletten,AantalPalletten)
+	if $$$AssertEquals(OfferteDataResult.Items.Count(), 1) {
+		Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).AantalPalletten,AantalPalletten)
+	}
 ]]></Implementation>
 </Method>