Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test016SpoelbakMetMat/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test016SpoelbakMetMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test016SpoelbakMetMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -143,7 +143,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -642,7 +642,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test005/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test005/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test005/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -168,7 +168,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -708,7 +708,7 @@
   <options>
     <description>LADE 002</description>
     <name>002-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 002</description>
@@ -1248,7 +1248,7 @@
   <options>
     <description>LADE 003</description>
     <name>003-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 003</description>
@@ -1848,7 +1848,7 @@
   <options>
     <description>LADE 004</description>
     <name>004-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 004</description>
@@ -2407,7 +2407,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test001/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test001/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test001/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -183,7 +183,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -793,7 +793,7 @@
   <options>
     <description>LADE 002</description>
     <name>002-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 002</description>
@@ -1292,7 +1292,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestLBXFree/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestLBXFree/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestLBXFree/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -158,7 +158,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -698,7 +698,7 @@
   <options>
     <description>LADE 002</description>
     <name>002-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 002</description>
@@ -1218,7 +1218,7 @@
   <options>
     <description>LADE 003</description>
     <name>003-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 003</description>
@@ -1747,7 +1747,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test003/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test003/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test003/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -143,7 +143,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -622,7 +622,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test008/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test008/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test008/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -163,7 +163,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -703,7 +703,7 @@
   <options>
     <description>LADE 002</description>
     <name>002-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 002</description>
@@ -1253,7 +1253,7 @@
   <options>
     <description>LADE 003</description>
     <name>003-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 003</description>
@@ -1813,7 +1813,7 @@
   <options>
     <description>LADE 004</description>
     <name>004-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 004</description>
@@ -2362,7 +2362,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test002/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test002/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test002/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -163,7 +163,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -703,7 +703,7 @@
   <options>
     <description>LADE 002</description>
     <name>002-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 002</description>
@@ -1253,7 +1253,7 @@
   <options>
     <description>LADE 003</description>
     <name>003-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 003</description>
@@ -1813,7 +1813,7 @@
   <options>
     <description>LADE 004</description>
     <name>004-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 004</description>
@@ -2362,7 +2362,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test022DubbeleSifonladeMetMat/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test022DubbeleSifonladeMetMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test022DubbeleSifonladeMetMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -168,7 +168,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -747,7 +747,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test018FrontOnly/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test018FrontOnly/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test018FrontOnly/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -108,7 +108,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -547,7 +547,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestSifon/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestSifon/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestSifon/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -198,7 +198,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -828,7 +828,7 @@
   <options>
     <description>LADE 002</description>
     <name>002-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 002</description>
@@ -1403,7 +1403,7 @@
   <options>
     <description>LADE 003</description>
     <name>003-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 003</description>
@@ -2048,7 +2048,7 @@
   <options>
     <description>LADE 004</description>
     <name>004-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 004</description>
@@ -2612,7 +2612,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test006/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test006/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test006/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -173,7 +173,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -833,7 +833,7 @@
   <options>
     <description>LADE 002</description>
     <name>002-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 002</description>
@@ -1432,7 +1432,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test011/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test011/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test011/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -183,7 +183,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -812,7 +812,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestInbegrepenAfdekkappenFronthouder/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestInbegrepenAfdekkappenFronthouder/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestInbegrepenAfdekkappenFronthouder/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -138,7 +138,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -627,7 +627,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0002.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0002.xml	(.../15000_0002.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0002.xml	(.../15000_0002.xml)	(revision 72935)
@@ -148,7 +148,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -657,7 +657,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test013AantalPickingbladEnVoormontageVerschillend/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test013AantalPickingbladEnVoormontageVerschillend/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test013AantalPickingbladEnVoormontageVerschillend/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -178,7 +178,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -768,7 +768,7 @@
   <options>
     <description>LADE 002</description>
     <name>002-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 002</description>
@@ -1358,7 +1358,7 @@
   <options>
     <description>LADE 003</description>
     <name>003-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 003</description>
@@ -1948,7 +1948,7 @@
   <options>
     <description>LADE 004</description>
     <name>004-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 004</description>
@@ -2538,7 +2538,7 @@
   <options>
     <description>LADE 005</description>
     <name>005-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 005</description>
@@ -3128,7 +3128,7 @@
   <options>
     <description>LADE 006</description>
     <name>006-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 006</description>
@@ -3718,7 +3718,7 @@
   <options>
     <description>LADE 007</description>
     <name>007-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 007</description>
@@ -4288,7 +4288,7 @@
   <options>
     <description>LADE 008</description>
     <name>008-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 008</description>
@@ -4858,7 +4858,7 @@
   <options>
     <description>LADE 009</description>
     <name>009-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 009</description>
@@ -5428,7 +5428,7 @@
   <options>
     <description>LADE 010</description>
     <name>010-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 010</description>
@@ -5998,7 +5998,7 @@
   <options>
     <description>LADE 011</description>
     <name>011-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 011</description>
@@ -6568,7 +6568,7 @@
   <options>
     <description>LADE 012</description>
     <name>012-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 012</description>
@@ -7138,7 +7138,7 @@
   <options>
     <description>LADE 013</description>
     <name>013-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 013</description>
@@ -7708,7 +7708,7 @@
   <options>
     <description>LADE 014</description>
     <name>014-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 014</description>
@@ -8278,7 +8278,7 @@
   <options>
     <description>LADE 015</description>
     <name>015-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 015</description>
@@ -8848,7 +8848,7 @@
   <options>
     <description>LADE 016</description>
     <name>016-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 016</description>
@@ -9377,7 +9377,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test014MetGekoppeldeMat/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test014MetGekoppeldeMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test014MetGekoppeldeMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -198,7 +198,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -888,7 +888,7 @@
   <options>
     <description>LADE 002</description>
     <name>002-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 002</description>
@@ -1578,7 +1578,7 @@
   <options>
     <description>LADE 003</description>
     <name>003-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 003</description>
@@ -2268,7 +2268,7 @@
   <options>
     <description>LADE 004</description>
     <name>004-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 004</description>
@@ -2868,7 +2868,7 @@
   <options>
     <description>LADE 005</description>
     <name>005-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 005</description>
@@ -3458,7 +3458,7 @@
   <options>
     <description>LADE 006</description>
     <name>006-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 006</description>
@@ -4007,7 +4007,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -163,7 +163,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -722,7 +722,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test009/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test009/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test009/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -178,7 +178,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -797,7 +797,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0003.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0003.xml	(.../15000_0003.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0003.xml	(.../15000_0003.xml)	(revision 72935)
@@ -173,7 +173,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -773,7 +773,7 @@
   <options>
     <description>LADE 002</description>
     <name>002-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 002</description>
@@ -1282,7 +1282,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test002Lijn3/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test002Lijn3/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test002Lijn3/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -178,7 +178,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -718,7 +718,7 @@
   <options>
     <description>LADE 002</description>
     <name>002-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 002</description>
@@ -1268,7 +1268,7 @@
   <options>
     <description>LADE 003</description>
     <name>003-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 003</description>
@@ -1843,7 +1843,7 @@
   <options>
     <description>LADE 004</description>
     <name>004-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 004</description>
@@ -2403,7 +2403,7 @@
   <options>
     <description>LADE 005</description>
     <name>005-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 005</description>
@@ -2952,7 +2952,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test017SpoelbakVerpakkingVhoss/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test017SpoelbakVerpakkingVhoss/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test017SpoelbakVerpakkingVhoss/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -108,7 +108,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -537,7 +537,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test021MetGekoppeldeSpaceStep/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test021MetGekoppeldeSpaceStep/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test021MetGekoppeldeSpaceStep/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -273,7 +273,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -987,6 +987,26 @@
   </options>
   <options>
     <description>LADE 001</description>
+    <name>001-Spacestep.breedte</name>
+    <value>736</value>
+  </options>
+  <options>
+    <description>LADE 001</description>
+    <name>001-Spacestep.hoogte</name>
+    <value>190</value>
+  </options>
+  <options>
+    <description>LADE 001</description>
+    <name>001-Spacestep.diepte</name>
+    <value>555</value>
+  </options>
+  <options>
+    <description>LADE 001</description>
+    <name>001-Spacestep.kleur</name>
+    <value>OG-M</value>
+  </options>
+  <options>
+    <description>LADE 001</description>
     <name>001-Verkoopordernummer</name>
     <value>null</value>
   </options>
@@ -1078,7 +1098,7 @@
   <options>
     <description>LADE 002</description>
     <name>002-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 002</description>
@@ -1792,6 +1812,26 @@
   </options>
   <options>
     <description>LADE 002</description>
+    <name>002-Spacestep.breedte</name>
+    <value>736</value>
+  </options>
+  <options>
+    <description>LADE 002</description>
+    <name>002-Spacestep.hoogte</name>
+    <value>190</value>
+  </options>
+  <options>
+    <description>LADE 002</description>
+    <name>002-Spacestep.diepte</name>
+    <value>555</value>
+  </options>
+  <options>
+    <description>LADE 002</description>
+    <name>002-Spacestep.kleur</name>
+    <value>OG-M</value>
+  </options>
+  <options>
+    <description>LADE 002</description>
     <name>002-Verkoopordernummer</name>
     <value>null</value>
   </options>
@@ -1837,7 +1877,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test004/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test004/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test004/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -153,7 +153,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -692,7 +692,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test010MetVHoss/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test010MetVHoss/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test010MetVHoss/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -138,7 +138,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -628,7 +628,7 @@
   <options>
     <description>LADE 002</description>
     <name>002-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 002</description>
@@ -1118,7 +1118,7 @@
   <options>
     <description>LADE 003</description>
     <name>003-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 003</description>
@@ -1608,7 +1608,7 @@
   <options>
     <description>LADE 004</description>
     <name>004-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 004</description>
@@ -2098,7 +2098,7 @@
   <options>
     <description>LADE 005</description>
     <name>005-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 005</description>
@@ -2588,7 +2588,7 @@
   <options>
     <description>LADE 006</description>
     <name>006-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 006</description>
@@ -3078,7 +3078,7 @@
   <options>
     <description>LADE 007</description>
     <name>007-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 007</description>
@@ -3568,7 +3568,7 @@
   <options>
     <description>LADE 008</description>
     <name>008-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 008</description>
@@ -4058,7 +4058,7 @@
   <options>
     <description>LADE 009</description>
     <name>009-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 009</description>
@@ -4548,7 +4548,7 @@
   <options>
     <description>LADE 010</description>
     <name>010-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 010</description>
@@ -5038,7 +5038,7 @@
   <options>
     <description>LADE 011</description>
     <name>011-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 011</description>
@@ -5528,7 +5528,7 @@
   <options>
     <description>LADE 012</description>
     <name>012-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 012</description>
@@ -6018,7 +6018,7 @@
   <options>
     <description>LADE 013</description>
     <name>013-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 013</description>
@@ -6508,7 +6508,7 @@
   <options>
     <description>LADE 014</description>
     <name>014-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 014</description>
@@ -6998,7 +6998,7 @@
   <options>
     <description>LADE 015</description>
     <name>015-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 015</description>
@@ -7488,7 +7488,7 @@
   <options>
     <description>LADE 016</description>
     <name>016-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 016</description>
@@ -7978,7 +7978,7 @@
   <options>
     <description>LADE 017</description>
     <name>017-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 017</description>
@@ -8468,7 +8468,7 @@
   <options>
     <description>LADE 018</description>
     <name>018-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 018</description>
@@ -9018,7 +9018,7 @@
   <options>
     <description>LADE 019</description>
     <name>019-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 019</description>
@@ -9568,7 +9568,7 @@
   <options>
     <description>LADE 020</description>
     <name>020-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 020</description>
@@ -10118,7 +10118,7 @@
   <options>
     <description>LADE 021</description>
     <name>021-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 021</description>
@@ -10668,7 +10668,7 @@
   <options>
     <description>LADE 022</description>
     <name>022-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 022</description>
@@ -11218,7 +11218,7 @@
   <options>
     <description>LADE 023</description>
     <name>023-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 023</description>
@@ -11768,7 +11768,7 @@
   <options>
     <description>LADE 024</description>
     <name>024-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 024</description>
@@ -12318,7 +12318,7 @@
   <options>
     <description>LADE 025</description>
     <name>025-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 025</description>
@@ -12868,7 +12868,7 @@
   <options>
     <description>LADE 026</description>
     <name>026-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 026</description>
@@ -13418,7 +13418,7 @@
   <options>
     <description>LADE 027</description>
     <name>027-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 027</description>
@@ -13968,7 +13968,7 @@
   <options>
     <description>LADE 028</description>
     <name>028-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 028</description>
@@ -14458,7 +14458,7 @@
   <options>
     <description>LADE 029</description>
     <name>029-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 029</description>
@@ -14948,7 +14948,7 @@
   <options>
     <description>LADE 030</description>
     <name>030-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 030</description>
@@ -15438,7 +15438,7 @@
   <options>
     <description>LADE 031</description>
     <name>031-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 031</description>
@@ -15928,7 +15928,7 @@
   <options>
     <description>LADE 032</description>
     <name>032-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 032</description>
@@ -16418,7 +16418,7 @@
   <options>
     <description>LADE 033</description>
     <name>033-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 033</description>
@@ -16908,7 +16908,7 @@
   <options>
     <description>LADE 034</description>
     <name>034-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 034</description>
@@ -17398,7 +17398,7 @@
   <options>
     <description>LADE 035</description>
     <name>035-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 035</description>
@@ -17888,7 +17888,7 @@
   <options>
     <description>LADE 036</description>
     <name>036-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 036</description>
@@ -18378,7 +18378,7 @@
   <options>
     <description>LADE 037</description>
     <name>037-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 037</description>
@@ -18868,7 +18868,7 @@
   <options>
     <description>LADE 038</description>
     <name>038-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 038</description>
@@ -19358,7 +19358,7 @@
   <options>
     <description>LADE 039</description>
     <name>039-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 039</description>
@@ -19848,7 +19848,7 @@
   <options>
     <description>LADE 040</description>
     <name>040-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 040</description>
@@ -20297,7 +20297,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test007/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test007/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test007/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -178,7 +178,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -788,7 +788,7 @@
   <options>
     <description>LADE 002</description>
     <name>002-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 002</description>
@@ -1398,7 +1398,7 @@
   <options>
     <description>LADE 003</description>
     <name>003-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 003</description>
@@ -1928,7 +1928,7 @@
   <options>
     <description>LADE 004</description>
     <name>004-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 004</description>
@@ -2458,7 +2458,7 @@
   <options>
     <description>LADE 005</description>
     <name>005-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 005</description>
@@ -2988,7 +2988,7 @@
   <options>
     <description>LADE 006</description>
     <name>006-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 006</description>
@@ -3518,7 +3518,7 @@
   <options>
     <description>LADE 007</description>
     <name>007-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 007</description>
@@ -4068,7 +4068,7 @@
   <options>
     <description>LADE 008</description>
     <name>008-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 008</description>
@@ -4618,7 +4618,7 @@
   <options>
     <description>LADE 009</description>
     <name>009-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 009</description>
@@ -5168,7 +5168,7 @@
   <options>
     <description>LADE 010</description>
     <name>010-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 010</description>
@@ -5677,7 +5677,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test008/StartBatch/15000_0002.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test008/StartBatch/15000_0002.xml	(.../15000_0002.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test008/StartBatch/15000_0002.xml	(.../15000_0002.xml)	(revision 72935)
@@ -158,7 +158,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -727,7 +727,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestDesignZijkant/StartBatch/15000_0001.xml
===================================================================
diff -u -r72927 -r72935
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestDesignZijkant/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72927)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestDesignZijkant/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72935)
@@ -153,7 +153,7 @@
   <options>
     <description>LADE 001</description>
     <name>001-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 001</description>
@@ -703,7 +703,7 @@
   <options>
     <description>LADE 002</description>
     <name>002-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 002</description>
@@ -1253,7 +1253,7 @@
   <options>
     <description>LADE 003</description>
     <name>003-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 003</description>
@@ -1803,7 +1803,7 @@
   <options>
     <description>LADE 004</description>
     <name>004-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 004</description>
@@ -2343,7 +2343,7 @@
   <options>
     <description>LADE 005</description>
     <name>005-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 005</description>
@@ -2883,7 +2883,7 @@
   <options>
     <description>LADE 006</description>
     <name>006-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 006</description>
@@ -3433,7 +3433,7 @@
   <options>
     <description>LADE 007</description>
     <name>007-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 007</description>
@@ -3993,7 +3993,7 @@
   <options>
     <description>LADE 008</description>
     <name>008-FSC-claim</name>
-    <value>NonApplicable</value>
+    <value>null</value>
   </options>
   <options>
     <description>LADE 008</description>
@@ -4512,7 +4512,10 @@
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
       <vh-mes-production-plugin_deliverymode>DI1</vh-mes-production-plugin_deliverymode>
       <vh-mes-production-plugin_customername>UNITTEST KLANT</vh-mes-production-plugin_customername>
+      <vh-mes-production-plugin_logo>Logo\Logo VHZwart.svg</vh-mes-production-plugin_logo>
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
+      <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
+      <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
     </text>