Index: APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml
===================================================================
diff -u -r66828 -r66868
--- APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml	(.../DnaCodeServiceHelper.cls.xml)	(revision 66828)
+++ APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml	(.../DnaCodeServiceHelper.cls.xml)	(revision 66868)
@@ -94,7 +94,7 @@
 <Implementation><![CDATA[
 	#dim ParentDnaCode As %String = ""
 	
-	If ##class(TECH.StringUtils).StartsWith(DnaCode.DnaCode,"O","G","M") || (Batch.GeefProductieGroep()=##class(APPS.Halux.common.enu.ProductieGroep).Kast())|| (Batch.GeefProductieGroep()=##class(APPS.Halux.common.enu.ProductieGroep).LosseComponenten() || (..IsTaorLosseComponentenVerpakking(DnaCode))) {
+	If ##class(TECH.StringUtils).StartsWith(DnaCode.DnaCode,"O", "G") || (Batch.GeefProductieGroep()=##class(APPS.Halux.common.enu.ProductieGroep).Kast())|| (Batch.GeefProductieGroep()=##class(APPS.Halux.common.enu.ProductieGroep).LosseComponenten() || (..IsTaorLosseComponentenVerpakking(DnaCode))) {
 		Set ParentDnaCode = DnaCode.DnaCode
 	}
 	
Index: vhUnitTest/APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper/BepaalParentDnaCode/Test.cls.xml
===================================================================
diff -u -r66812 -r66868
--- vhUnitTest/APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper/BepaalParentDnaCode/Test.cls.xml	(.../Test.cls.xml)	(revision 66812)
+++ vhUnitTest/APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper/BepaalParentDnaCode/Test.cls.xml	(.../Test.cls.xml)	(revision 66868)
@@ -58,31 +58,31 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: DnaCode begint met O of G of M -&gt; ParentDnaCode is DnaCode">
+<Method name="Test: DnaCode begint met O of G -&gt; ParentDnaCode is DnaCode">
 <Implementation><![CDATA[
 	#dim ParentDnaCode1 As %String
 	#dim ParentDnaCode2 As %String
-	#dim ParentDnaCode3 As %String
 	
 	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New()
 	Set ParentDnaCode1 = DnaCodeServiceHelper.BepaalParentDnaCode(..DnaCode1, ..Batch)
 	Set ParentDnaCode2 = DnaCodeServiceHelper.BepaalParentDnaCode(..DnaCode2, ..Batch)
-	Set ParentDnaCode3 = DnaCodeServiceHelper.BepaalParentDnaCode(..DnaCode3, ..Batch)
 	
 	Do $$$AssertEquals(ParentDnaCode1, ..DnaCode1.DnaCode)
 	Do $$$AssertEquals(ParentDnaCode2, ..DnaCode2.DnaCode)
-	Do $$$AssertEquals(ParentDnaCode3, ..DnaCode3.DnaCode)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: DnaCode begint niet met O of G of M -&gt; ParentDnaCode is leeg">
+<Method name="Test: DnaCode begint niet met O of G -&gt; ParentDnaCode is leeg">
 <Implementation><![CDATA[
-	#dim ParentDnaCode As %String
+	#dim ParentDnaCode1 As %String
+	#dim ParentDnaCode2 As %String
 
 	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New()
-	Set ParentDnaCode = DnaCodeServiceHelper.BepaalParentDnaCode(..DnaCode4, ..Batch)
+	Set ParentDnaCode1 = DnaCodeServiceHelper.BepaalParentDnaCode(..DnaCode4, ..Batch)
+	Set ParentDnaCode2 = DnaCodeServiceHelper.BepaalParentDnaCode(..DnaCode3, ..Batch)
 	
-	Do $$$AssertEquals(ParentDnaCode, "")
+	Do $$$AssertEquals(ParentDnaCode1, "")
+	Do $$$AssertEquals(ParentDnaCode2, "")
 ]]></Implementation>
 </Method>