Index: vhUnitTest/APPS/OV/impl/TrackAndTraceService/TestGlsUrls.cls.xml
===================================================================
diff -u -r59732 -r61083
--- vhUnitTest/APPS/OV/impl/TrackAndTraceService/TestGlsUrls.cls.xml	(.../TestGlsUrls.cls.xml)	(revision 59732)
+++ vhUnitTest/APPS/OV/impl/TrackAndTraceService/TestGlsUrls.cls.xml	(.../TestGlsUrls.cls.xml)	(revision 61083)
@@ -237,7 +237,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="aTest Geen Publiek">
+<Method name="Test Geen Publiek">
 <Implementation><![CDATA[
 	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
 	
@@ -251,6 +251,8 @@
 
 <Method name="Test Transsmart Privaat Parcel - DHL">
 <Implementation><![CDATA[
+	#dim ProjectsettingAPI As DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
+	Do ProjectsettingAPI.VerwachtMethodCall("IsTranssmartActive").DanReturn($$$True)	
 	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
 	
 	#dim BonID As %String = "5"
@@ -261,26 +263,32 @@
 	If (##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI().IsTranssmartActive()){	
 		Do $$$AssertEquals(TeVerwachtenURL,PrivateTrackAndTraceURL,"URL is teruggeven voor Transsmart")
 	}
+	Do ProjectsettingAPI.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test Transsmart Privaat Freight - VRD">
 <Implementation><![CDATA[
+	#dim ProjectsettingAPI As DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
+	Do ProjectsettingAPI.VerwachtMethodCall("IsTranssmartActive").DanReturn($$$True)	
 	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
 	
 	#dim BonID As %String = "6"		
-	#Dim TeVerwachtenURL As %String = ..TranssmartVrdVerzendData.TrackAndTraceUrl_"/"_..TranssmartVrdVerzendData.TrackAndTraceID
+	#Dim TeVerwachtenURL As %String = ..TranssmartVrdVerzendData.TrackAndTraceUrl
 	
 	#dim PrivateTrackAndTraceURL As %String = TrackAndTraceService.GeefPrivateTrackAndTraceURL(BonID)
 	
 	If (##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI().IsTranssmartActive()){
 		Do $$$AssertEquals(TeVerwachtenURL,PrivateTrackAndTraceURL,"URL is teruggeven voor Transsmart.")
 	}
+	Do ProjectsettingAPI.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test Transsmart Publieke Parcel - DHL">
 <Implementation><![CDATA[
+	#dim ProjectsettingAPI As DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
+	Do ProjectsettingAPI.VerwachtMethodCall("IsTranssmartActive").DanReturn($$$True)	
 	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
 	
 	#dim BonID As %String = "5"
@@ -291,21 +299,25 @@
 	If (##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI().IsTranssmartActive()){
 		Do $$$AssertEquals(TeVerwachtenURL,PrivateTrackAndTraceURL,"URL is teruggeven voor Transsmart")
 	}
+	Do ProjectsettingAPI.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test Transsmart Publieke Freight - VRD">
 <Implementation><![CDATA[
+	#dim ProjectsettingAPI As DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
+	Do ProjectsettingAPI.VerwachtMethodCall("IsTranssmartActive").DanReturn($$$True)	
 	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
 	
 	#dim BonID As %String = "6"		
-	#Dim TeVerwachtenURL As %String = ..TranssmartVrdVerzendData.TrackAndTraceUrl_"/"_..TranssmartVrdVerzendData.TrackAndTraceID
+	#Dim TeVerwachtenURL As %String = ..TranssmartVrdVerzendData.TrackAndTraceUrl
 	
 	#dim PrivateTrackAndTraceURL As %String = TrackAndTraceService.GeefPubliekeTrackAndTraceURL(BonID)
 	
 	If (##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI().IsTranssmartActive()){
 		Do $$$AssertEquals(TeVerwachtenURL,PrivateTrackAndTraceURL,"URL is teruggeven voor Transsmart.")
 	}
+	Do ProjectsettingAPI.Verifieer()
 ]]></Implementation>
 </Method>
 </Class>