Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml
===================================================================
diff -u -r73833 -r73854
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 73833)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 73854)
@@ -7,13 +7,14 @@
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "DnaCode"
-	Set Request.BatchId = 1234567
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
+	Set DnaCode1.Lijn = 1
 	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode2.Toelevering = "222222"
 	Set DnaCode2.InitialenScanner = "XXX"
+	Set DnaCode2.Lijn = 1
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	#dim DnaCodeIteratorTweeStuks As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
@@ -25,15 +26,10 @@
 	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep",DnaCode1.Toelevering).DanDoeNiks()
 	
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
-	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()	
+	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
-	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
-	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
-	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -43,7 +39,6 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
-	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -71,13 +66,14 @@
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "DnaCode"
-	Set Request.BatchId = 1234567
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
+	Set DnaCode1.Lijn = 1
 	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode2.Toelevering = "222222"
 	Set DnaCode2.InitialenScanner = "XXX"
+	Set DnaCode2.Lijn = 1
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	#dim DnaCodeIteratorTweeStuks As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
@@ -91,13 +87,8 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective", DnaCode1.DnaCode).DanDoeNiks()
 	
-	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
-	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
-	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
-	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"-1021")
@@ -107,7 +98,6 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
-	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -175,6 +165,7 @@
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
+	Set DnaCode1.Lijn = 1
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCodeEnRecent",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
@@ -189,13 +180,8 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective", DnaCode1.DnaCode).DanDoeNiks()
 	
-	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
-	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
-	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,, DnaCodeInVhossKastBepalerStub,,, ToeleveringServiceMock, DocumentGeneratorMock)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,, DnaCodeInVhossKastBepalerStub,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
-	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -204,7 +190,6 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
-	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -273,12 +258,13 @@
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "K00000A"
 	Set Request.Toelevering = "356789"
-	Set Request.BatchId = 1234567
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
+	Set DnaCode1.Lijn = 1
 	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode2.Toelevering = "222222"
+	Set DnaCode2.Lijn = 1
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	#dim DnaCodeIteratorTweeStuks As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
@@ -292,13 +278,8 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
-	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
-	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
-	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -307,7 +288,6 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
-	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -370,23 +350,25 @@
 	Set Request.DnaCode = "DnaCode"
 	Set Request.Aantal = -1
 	Set Request.PalletCode = "TBX12345"
-	Set Request.BatchId = 1234567
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
 	Set DnaCode1.DnaCode = "DnaCode"
 	Set DnaCode1.PalletCode = "TBX12345"
 	Set DnaCode1.InitialenScanner = "XXX"
+	Set DnaCode1.Lijn = 1
 	
 	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode2.Toelevering = "222222"
 	Set DnaCode2.InitialenScanner = "XXX"
+	Set DnaCode1.Lijn = 1
 	
 	Set AfgemeldeDnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set AfgemeldeDnaCode.Toelevering = "222222"
 	Set AfgemeldeDnaCode.DnaCode = "DnaCode"
 	Set AfgemeldeDnaCode.InitialenScanner = ""
 	Set AfgemeldeDnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Ongedaan()
+	Set AfgemeldeDnaCode.Lijn = 1
 	
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	#dim DnaCodeIteratorTweeStuks As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
@@ -401,13 +383,8 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
-	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
-	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
-	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -416,7 +393,6 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
-	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -425,10 +401,10 @@
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "DnaCode"
 	Set Request.Locatie = $$$DummyString
-	Set Request.BatchId = 1234567
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
+	Set DnaCode1.Lijn = 1
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCodeEnRecent",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
@@ -441,13 +417,8 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
-	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
-	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
-	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -456,7 +427,6 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
-	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -465,20 +435,22 @@
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "DnaCode"
 	Set Request.Locatie = $$$DummyString
-	Set Request.BatchId = 1234567
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
 	Set DnaCode1.DnaCode = "LAAAAA1"
 	Set DnaCode1.ParentDnaCode = "LBBBBB1"
+	Set DnaCode1.Lijn = 1
 	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode2.Toelevering = "222222"
 	Set DnaCode2.DnaCode = "LBBBBB1"
 	Set DnaCode2.ParentDnaCode = "LBBBBB1"
+	Set DnaCode2.Lijn = 1
 	Set DnaCode3 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode3.Toelevering = "222222"
 	Set DnaCode3.DnaCode = "LCCCCC1"
 	Set DnaCode3.ParentDnaCode = "LBBBBB1"
+	Set DnaCode3.Lijn = 1
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	#dim DnaCodeIteratorDrieStuks As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1,DnaCode2,DnaCode3)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
@@ -495,13 +467,8 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
-	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
-	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
-	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -510,18 +477,17 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
-	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Als toelevering een spacestep bevat, moet de response true bevatten in property &apos;IsSST&apos; ">
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "DnaCode"
-	Set Request.BatchId = 1234567
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
+	Set DnaCode1.Lijn = 1	
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCodeEnRecent",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
@@ -534,13 +500,8 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
-	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
-	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
-	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -550,18 +511,17 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
-	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Als toelevering geen spacestep bevat, moet de response false bevatten in property &apos;IsSST&apos; ">
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "DnaCode"
-	Set Request.BatchId = 1234567
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
+	Set DnaCode1.Lijn = 1
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCodeEnRecent",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
@@ -574,13 +534,8 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
-	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
-	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
-	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -590,7 +545,6 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
-	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 </Class>