Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml
===================================================================
diff -u -r55819 -r56080
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 55819)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 56080)
@@ -8,9 +8,6 @@
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "DnaCode"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
-	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "333333"
 	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
@@ -23,15 +20,14 @@
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringId",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorTweeStuks)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(1)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock, DnaCodeRepositoryMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
 	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),2)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"2")
 	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"1")
-	Do HeaderValidatorMock.Verifieer()
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -41,22 +37,18 @@
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "DnaCode"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
-
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCode",Request.DnaCode).DanReturn(..EmptyIterator())
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",$$$ElkeWaarde).ExactAantalKeer(0)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock, DnaCodeRepositoryMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
 	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,##class(TECH.enu.ExceptionCode).DataNotFound())
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
 	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
-	Do HeaderValidatorMock.Verifieer()
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -67,25 +59,21 @@
 	Set Request.DnaCode = "DnaCode"
 	Set Request.Toelevering = "356789"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
-	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "333333"
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCode",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(0)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock, DnaCodeRepositoryMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
 	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,##class(TECH.enu.ExceptionCode).InvalidInput())
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
 	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
-	Do HeaderValidatorMock.Verifieer()
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -96,25 +84,21 @@
 	Set Request.DnaCode = "DnaCode"
 	Set Request.PalletCode = "TBX12345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
-	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.PalletCode = "TBX12345"
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCode",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(0)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock, DnaCodeRepositoryMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
 	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,##class(TECH.enu.ExceptionCode).InvalidInput())
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
 	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
-	Do HeaderValidatorMock.Verifieer()
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -126,9 +110,6 @@
 	Set Request.Aantal = -1
 	Set Request.PalletCode = "TBX12345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
-	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "333333"
 	Set DnaCode1.PalletCode = "TBX12345"
@@ -150,15 +131,14 @@
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringId",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorTweeStuks)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",..Matches.Object(AfgemeldeDnaCode)).ExactAantalKeer(1)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock, DnaCodeRepositoryMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
 	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),2)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"2")
 	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"1")
-	Do HeaderValidatorMock.Verifieer()
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r56061 -r56080
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 56061)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 56080)
@@ -14,13 +14,12 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>HeaderValidator:WSimpl.Halux.AAP.HeaderValidator,DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository</FormalSpec>
+<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..HeaderValidator = $$$Inject(HeaderValidator, ##class(WSimpl.Halux.AAP.HeaderValidator).%New())
 	Set ..DnaCodeRepository = $$$Inject(DnaCodeRepository, ##class(DOM.Halux.AAP.DnaCodeRepository).%New())
 	
 	Quit $$$OK
@@ -33,8 +32,6 @@
 <Implementation><![CDATA[
 	Set Response = ##class(WS.Halux.AAP.ValideerPalletCodeResponse).%New()
 	Try {
-		Do ..HeaderValidator.ValidateHeader(ValideerPalletCodeRequest.Header)
-
 		#dim Match As %Boolean = $$$False
 		
 		#dim PalletCode = ##class(TECH.StringUtils).ToUpper(ValideerPalletCodeRequest.PalletCode)
@@ -69,8 +66,6 @@
 	Set Response = ##class(WS.Halux.AAP.ZoekViaPalletCodeResponse).%New()
 	
 	Try {
-		Do ..HeaderValidator.ValidateHeader(ZoakViaPalletCodeRequest.Header)
-
 		#dim PalletCode = ##class(TECH.StringUtils).ToUpper(ZoakViaPalletCodeRequest.PalletCode)
 		
 		#dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekViaPalletCode(PalletCode)
@@ -105,8 +100,6 @@
 	Set Response = ##class(WS.Halux.AAP.ZoekViaToeleveringResponse).%New()
 	
 	Try {
-		Do ..HeaderValidator.ValidateHeader(ZoekViaToeleveringRequest.Header)
-		
 		#dim DnaCodeIterator As TECH.Iteraot = ..DnaCodeRepository.ZoekViaToeleveringId(ZoekViaToeleveringRequest.Toelevering)
 		
 		If DnaCodeIterator.HasNext() {
@@ -149,8 +142,6 @@
 	Set Response = ##class(WS.Halux.AAP.DnaCodeAfmeldenResponse).%New()
 	
 	Try {
-		Do ..HeaderValidator.ValidateHeader(DnaCodeAfmeldenRequest.Header)
-
 		#dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekViaDnaCode(DnaCodeAfmeldenRequest.DnaCode)
 		
 		If $$$Not(DnaCodeIterator.HasNext()) {
@@ -214,8 +205,6 @@
 	
 	Set Response = ##class(WS.Halux.AAP.ToeleveringBijwerkenResponse).%New()
 	Try {
-		Do ..HeaderValidator.ValidateHeader(ToeleveringBijwerkenRequest.Header)
-
 		#dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekViaToeleveringId(ToeleveringBijwerkenRequest.Toelevering)
 		If DnaCodeIterator.HasNext() {
 			Set Response.Header.Status = "200"
Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ValideerPalletcode/Test.cls.xml
===================================================================
diff -u -r55656 -r56080
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ValideerPalletcode/Test.cls.xml	(.../Test.cls.xml)	(revision 55656)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ValideerPalletcode/Test.cls.xml	(.../Test.cls.xml)	(revision 56080)
@@ -8,15 +8,11 @@
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
 	Set Request.PalletCode = "TBX12345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock)
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-	Do HeaderValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -25,15 +21,11 @@
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
 	Set Request.PalletCode = "KAD12345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock)
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-	Do HeaderValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -42,15 +34,11 @@
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
 	Set Request.PalletCode = "DIV12345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock)
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-	Do HeaderValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -59,15 +47,11 @@
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
 	Set Request.PalletCode = "TBP12345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock)
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-	Do HeaderValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -76,15 +60,11 @@
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
 	Set Request.PalletCode = "SFS12345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock)
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-	Do HeaderValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -93,15 +73,11 @@
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
 	Set Request.PalletCode = "Vhoss345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock)
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-	Do HeaderValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -110,15 +86,11 @@
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
 	Set Request.PalletCode = "tbx12345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock)
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-	Do HeaderValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -127,16 +99,12 @@
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
 	Set Request.PalletCode = $$$DummyString
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock)
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"1005:InvalidUserInput")
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Ongeldige code")
-	Do HeaderValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaPalletcode/Test.cls.xml
===================================================================
diff -u -r56057 -r56080
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaPalletcode/Test.cls.xml	(.../Test.cls.xml)	(revision 56057)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaPalletcode/Test.cls.xml	(.../Test.cls.xml)	(revision 56080)
@@ -8,22 +8,18 @@
 	Set Request = ##class(WS.Halux.AAP.ZoekViaPalletCodeRequest).%New()
 	Set Request.PalletCode = "TBX12345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
-	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	#dim DnaCodeIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",Request.PalletCode).DanReturn(DnaCodeIterator)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock, DnaCodeRepositoryMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
 	
 	#dim Antwoord As WS.Halux.AAP.ZoekViaPalletCodeResponse = DnaCodeService.ZoekViaPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),2)
-	Do HeaderValidatorMock.Verifieer()
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -33,20 +29,16 @@
 	Set Request = ##class(WS.Halux.AAP.ZoekViaPalletCodeRequest).%New()
 	Set Request.PalletCode = "TBX12345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
-	
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",Request.PalletCode).DanReturn(..EmptyIterator())
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock, DnaCodeRepositoryMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
 	
 	#dim Antwoord As WS.Halux.AAP.ZoekViaPalletCodeResponse = DnaCodeService.ZoekViaPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,##class(TECH.enu.ExceptionCode).DataNotFound())
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Geen data gevonden voor pallet 'TBX12345'")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
-	Do HeaderValidatorMock.Verifieer()
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ToeleveringBijwerken/Test.cls.xml
===================================================================
diff -u -r55818 -r56080
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ToeleveringBijwerken/Test.cls.xml	(.../Test.cls.xml)	(revision 55818)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ToeleveringBijwerken/Test.cls.xml	(.../Test.cls.xml)	(revision 56080)
@@ -9,9 +9,6 @@
 	Set Request.Toelevering = "333333"
 	Set Request.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).OnHold()
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
-	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "333333"
 	Set DnaCode1.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Gescand()
@@ -26,12 +23,11 @@
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(1)
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode2).ExactAantalKeer(0)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock, DnaCodeRepositoryMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
 	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.ToeleveringBijwerken(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-	Do HeaderValidatorMock.Verifieer()
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -42,20 +38,16 @@
 	Set Request.Toelevering = "333333"
 	Set Request.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).OnHold()
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
-	
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringId",Request.Toelevering).DanReturn(..EmptyIterator())
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",$$$ElkeWaarde).ExactAantalKeer(0)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock, DnaCodeRepositoryMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
 	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.ToeleveringBijwerken(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"-1021")
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Geen data gevonden voor toelevering '333333'")
-	Do HeaderValidatorMock.Verifieer()
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaToelevering/Test.cls.xml
===================================================================
diff -u -r56061 -r56080
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaToelevering/Test.cls.xml	(.../Test.cls.xml)	(revision 56061)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaToelevering/Test.cls.xml	(.../Test.cls.xml)	(revision 56080)
@@ -8,24 +8,20 @@
 	Set Request = ##class(WS.Halux.AAP.ZoekViaToeleveringRequest).%New()
 	Set Request.Toelevering = "333333"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
-	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	#dim DnaCodeIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaToeleveringId",Request.Toelevering).DanReturn(DnaCodeIterator)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock, DnaCodeRepositoryMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
 	
 	#dim Antwoord As WS.Halux.AAP.ZoekViaToeleveringResponse = DnaCodeService.ZoekViaToelevering(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),2)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"2")
 	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
-	Do HeaderValidatorMock.Verifieer()
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -35,20 +31,16 @@
 	Set Request = ##class(WS.Halux.AAP.ZoekViaToeleveringRequest).%New()
 	Set Request.Toelevering = "333333"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
-	
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaToeleveringId",Request.Toelevering).DanReturn(..EmptyIterator())
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock, DnaCodeRepositoryMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
 	
 	#dim Antwoord As WS.Halux.AAP.ZoekViaToeleveringResponse = DnaCodeService.ZoekViaToelevering(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,##class(TECH.enu.ExceptionCode).DataNotFound())
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Geen data gevonden voor pallet 333333")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
-	Do HeaderValidatorMock.Verifieer()
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
Index: WS/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r56079 -r56080
--- WS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 56079)
+++ WS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 56080)
@@ -18,6 +18,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="HeaderValidator">
+<Type>WSimpl.Halux.AAP.HeaderValidator</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
@@ -26,6 +31,7 @@
 <Implementation><![CDATA[
 	Do ##super()
 	Set ..DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
+	Set ..HeaderValidator = ##class(WSimpl.Halux.AAP.HeaderValidator).%New()
 
 	Quit $$$OK
 ]]></Implementation>
@@ -75,7 +81,9 @@
 <FormalSpec>Request:%CacheString,UitTeVoerenMethod:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%CacheString</ReturnType>
-<Implementation><![CDATA[	Quit $Method(..DnaCodeService, UitTeVoerenMethod, Request)
+<Implementation><![CDATA[
+	Do ..HeaderValidator.ValidateHeader(Request.Header)
+	Quit $Method(..DnaCodeService, UitTeVoerenMethod, Request)
 ]]></Implementation>
 </Method>
 </Class>