diff --git a/bin/testfiles/BatchTestLocal.csv b/bin/testfiles/BatchTestLocal.csv
index fbb7e3d8102..fb648dda164 100644
--- a/bin/testfiles/BatchTestLocal.csv
+++ b/bin/testfiles/BatchTestLocal.csv
@@ -1,133 +1,133 @@
-label,responseCode,responseMessage,dataType,success,failureMessage,bytes,grpThreads,allThreads,URL,Filename,SampleCount,ErrorCount
-Setup 1,200,OK,text,true,,0,1,1,null,,1,0
-Java 1 C1=1,200,OK,text,true,,10,1,1,null,,1,0
-Java 1 C1=1,200,OK,text,true,,10,1,1,null,,1,0
-Java 1 C1=1,200,OK,text,true,,10,1,1,null,,1,0
-Loop5 C1=1 C2=1 C3=1,200,OK,text,true,,0,1,1,null,,1,0
-Loop5 C1=1 C2=2 C3=2,200,OK,text,true,,0,1,1,null,,1,0
-Loop5 C1=1 C2=3 C3=3,200,OK,text,true,,0,1,1,null,,1,0
-If Test C1=1 C2=3 C3=3,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=1 C2=3 C3=3,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=1 C2=3 C3=3,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=1 C2=3 C3=3,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Loop5 C1=1 C2=4 C3=4,200,OK,text,true,,0,1,1,null,,1,0
-Loop5 C1=1 C2=5 C3=5,200,OK,text,true,,0,1,1,null,,1,0
-Java If once 1,,,text,false,,0,1,1,null,,1,1
-Java If once 2,200,OK,text,true,,0,1,1,null,,1,0
-Java If all 1,,,text,false,,0,1,1,null,,1,1
-Java OK,200,OK,text,true,,0,1,1,null,,1,0
-Java If once 1,,,text,false,,0,1,1,null,,1,1
-Java If once 2,200,OK,text,true,,0,1,1,null,,1,0
-Java If all 1,,,text,false,,0,1,1,null,,1,1
-Java OK,200,OK,text,true,,0,1,1,null,,1,0
-Java 1 C1=2,200,OK,text,true,,10,1,1,null,,1,0
-Java 1 C1=2,200,OK,text,true,,10,1,1,null,,1,0
-Java 1 C1=2,200,OK,text,true,,10,1,1,null,,1,0
-Loop5 C1=2 C2=1 C3=6,200,OK,text,true,,0,1,1,null,,1,0
-If Test C1=2 C2=1 C3=6,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=2 C2=1 C3=6,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=2 C2=1 C3=6,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=2 C2=1 C3=6,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Loop5 C1=2 C2=2 C3=7,200,OK,text,true,,0,1,1,null,,1,0
-Loop5 C1=2 C2=3 C3=8,200,OK,text,true,,0,1,1,null,,1,0
-Loop5 C1=2 C2=4 C3=9,200,OK,text,true,,0,1,1,null,,1,0
-If Test C1=2 C2=4 C3=9,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=2 C2=4 C3=9,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=2 C2=4 C3=9,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=2 C2=4 C3=9,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Loop5 C1=2 C2=5 C3=10,200,OK,text,true,,0,1,1,null,,1,0
-Java If once 1,,,text,false,,0,1,1,null,,1,1
-Java If once 2,200,OK,text,true,,0,1,1,null,,1,0
-Java If all 1,,,text,false,,0,1,1,null,,1,1
-Java OK,200,OK,text,true,,0,1,1,null,,1,0
-Java If once 1,,,text,false,,0,1,1,null,,1,1
-Java If once 2,200,OK,text,true,,0,1,1,null,,1,0
-Java If all 1,,,text,false,,0,1,1,null,,1,1
-Java OK,200,OK,text,true,,0,1,1,null,,1,0
-Java 1 C1=1,200,OK,text,true,,10,1,1,null,,1,0
-Java 1 C1=1,200,OK,text,true,,10,1,1,null,,1,0
-Java 1 C1=1,200,OK,text,true,,10,1,1,null,,1,0
-Loop5 C1=1 C2=1 C3=11,200,OK,text,true,,0,1,1,null,,1,0
-Loop5 C1=1 C2=2 C3=12,200,OK,text,true,,0,1,1,null,,1,0
-If Test C1=1 C2=2 C3=12,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=1 C2=2 C3=12,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=1 C2=2 C3=12,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=1 C2=2 C3=12,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Loop5 C1=1 C2=3 C3=13,200,OK,text,true,,0,1,1,null,,1,0
-Loop5 C1=1 C2=4 C3=14,200,OK,text,true,,0,1,1,null,,1,0
-Loop5 C1=1 C2=5 C3=15,200,OK,text,true,,0,1,1,null,,1,0
-If Test C1=1 C2=5 C3=15,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=1 C2=5 C3=15,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=1 C2=5 C3=15,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=1 C2=5 C3=15,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Java If once 1,,,text,false,,0,1,1,null,,1,1
-Java If once 2,200,OK,text,true,,0,1,1,null,,1,0
-Java If all 1,,,text,false,,0,1,1,null,,1,1
-Java OK,200,OK,text,true,,0,1,1,null,,1,0
-Java If once 1,,,text,false,,0,1,1,null,,1,1
-Java If once 2,200,OK,text,true,,0,1,1,null,,1,0
-Java If all 1,,,text,false,,0,1,1,null,,1,1
-Java OK,200,OK,text,true,,0,1,1,null,,1,0
-Java 1 C1=2,200,OK,text,true,,10,1,1,null,,1,0
-Java 1 C1=2,200,OK,text,true,,10,1,1,null,,1,0
-Java 1 C1=2,200,OK,text,true,,10,1,1,null,,1,0
-Loop5 C1=2 C2=1 C3=16,200,OK,text,true,,0,1,1,null,,1,0
-Loop5 C1=2 C2=2 C3=17,200,OK,text,true,,0,1,1,null,,1,0
-Loop5 C1=2 C2=3 C3=18,200,OK,text,true,,0,1,1,null,,1,0
-If Test C1=2 C2=3 C3=18,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=2 C2=3 C3=18,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=2 C2=3 C3=18,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Loop3 C1=2 C2=3 C3=18,200,OK,text,true,,0,1,1,null,,1,0
-Module,200,OK,text,true,,0,1,1,null,,1,0
-Loop5 C1=2 C2=4 C3=19,200,OK,text,true,,0,1,1,null,,1,0
-Loop5 C1=2 C2=5 C3=20,200,OK,text,true,,0,1,1,null,,1,0
-Java If once 1,,,text,false,,0,1,1,null,,1,1
-Java If once 2,200,OK,text,true,,0,1,1,null,,1,0
-Java If all 1,,,text,false,,0,1,1,null,,1,1
-Java OK,200,OK,text,true,,0,1,1,null,,1,0
-Java If once 1,,,text,false,,0,1,1,null,,1,1
-Java If once 2,200,OK,text,true,,0,1,1,null,,1,0
-Java If all 1,,,text,false,,0,1,1,null,,1,1
-Java OK,200,OK,text,true,,0,1,1,null,,1,0
-1 1,200,OK,text,true,,0,1,1,null,,1,0
-2 2,200,OK,text,true,,0,1,1,null,,1,0
-3 3,200,OK,text,true,,0,1,1,null,,1,0
-0 4,200,OK,text,true,,0,1,1,null,,1,0
-NAME USER1,200,OK,text,true,,0,1,1,null,,1,0
-TG1 = 3,200,OK,text,true,,0,1,1,null,,1,0
-TG OO = 1,200,OK,text,true,,0,1,1,null,,1,0
-TG Loop =3,200,OK,text,true,,0,1,1,null,,1,0
-TG2 = 3,200,OK,text,true,,0,1,1,null,,1,0
-TG1 = 3,200,OK,text,true,,0,1,1,null,,1,0
-TG Loop =3,200,OK,text,true,,0,1,1,null,,1,0
-TG2 = 3,200,OK,text,true,,0,1,1,null,,1,0
-TG1 = 3,200,OK,text,true,,0,1,1,null,,1,0
-TG Loop =3,200,OK,text,true,,0,1,1,null,,1,0
-TG2 = 3,200,OK,text,true,,0,1,1,null,,1,0
-CSV_VAR=2,200,OK,text,true,,0,1,1,null,,1,0
-CSV_VAR=3,200,OK,text,true,,0,1,1,null,,1,0
-CSV_VAR=1,200,OK,text,true,,0,1,1,null,,1,0
-CSV_VAR=2,200,OK,text,true,,0,1,1,null,,1,0
-BSH Counter: 1,200,OK,text,true,,0,1,1,null,,1,0
-BSH Counter: 2,200,OK,text,true,,0,1,1,null,,1,0
-BSH Counter: 3,200,OK,text,true,,0,1,1,null,,1,0
-BSF Sampler,200,OK,text,true,,3,1,1,null,,1,0
-JSR223 Sampler,200,OK,text,true,,3,1,1,null,,1,0
-Post 1,200,OK,text,true,,0,1,1,null,,1,0
+label,responseCode,responseMessage,dataType,success,failureMessage,bytes,URL,Filename,SampleCount,ErrorCount
+Setup 1,200,OK,text,true,,0,null,,1,0
+Java 1 C1=1,200,OK,text,true,,10,null,,1,0
+Java 1 C1=1,200,OK,text,true,,10,null,,1,0
+Java 1 C1=1,200,OK,text,true,,10,null,,1,0
+Loop5 C1=1 C2=1 C3=1,200,OK,text,true,,0,null,,1,0
+Loop5 C1=1 C2=2 C3=2,200,OK,text,true,,0,null,,1,0
+Loop5 C1=1 C2=3 C3=3,200,OK,text,true,,0,null,,1,0
+If Test C1=1 C2=3 C3=3,200,OK,text,true,,0,null,,1,0
+Loop3 C1=1 C2=3 C3=3,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Loop3 C1=1 C2=3 C3=3,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Loop3 C1=1 C2=3 C3=3,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Loop5 C1=1 C2=4 C3=4,200,OK,text,true,,0,null,,1,0
+Loop5 C1=1 C2=5 C3=5,200,OK,text,true,,0,null,,1,0
+Java If once 1,,,text,false,,0,null,,1,1
+Java If once 2,200,OK,text,true,,0,null,,1,0
+Java If all 1,,,text,false,,0,null,,1,1
+Java OK,200,OK,text,true,,0,null,,1,0
+Java If once 1,,,text,false,,0,null,,1,1
+Java If once 2,200,OK,text,true,,0,null,,1,0
+Java If all 1,,,text,false,,0,null,,1,1
+Java OK,200,OK,text,true,,0,null,,1,0
+Java 1 C1=2,200,OK,text,true,,10,null,,1,0
+Java 1 C1=2,200,OK,text,true,,10,null,,1,0
+Java 1 C1=2,200,OK,text,true,,10,null,,1,0
+Loop5 C1=2 C2=1 C3=6,200,OK,text,true,,0,null,,1,0
+If Test C1=2 C2=1 C3=6,200,OK,text,true,,0,null,,1,0
+Loop3 C1=2 C2=1 C3=6,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Loop3 C1=2 C2=1 C3=6,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Loop3 C1=2 C2=1 C3=6,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Loop5 C1=2 C2=2 C3=7,200,OK,text,true,,0,null,,1,0
+Loop5 C1=2 C2=3 C3=8,200,OK,text,true,,0,null,,1,0
+Loop5 C1=2 C2=4 C3=9,200,OK,text,true,,0,null,,1,0
+If Test C1=2 C2=4 C3=9,200,OK,text,true,,0,null,,1,0
+Loop3 C1=2 C2=4 C3=9,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Loop3 C1=2 C2=4 C3=9,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Loop3 C1=2 C2=4 C3=9,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Loop5 C1=2 C2=5 C3=10,200,OK,text,true,,0,null,,1,0
+Java If once 1,,,text,false,,0,null,,1,1
+Java If once 2,200,OK,text,true,,0,null,,1,0
+Java If all 1,,,text,false,,0,null,,1,1
+Java OK,200,OK,text,true,,0,null,,1,0
+Java If once 1,,,text,false,,0,null,,1,1
+Java If once 2,200,OK,text,true,,0,null,,1,0
+Java If all 1,,,text,false,,0,null,,1,1
+Java OK,200,OK,text,true,,0,null,,1,0
+Java 1 C1=1,200,OK,text,true,,10,null,,1,0
+Java 1 C1=1,200,OK,text,true,,10,null,,1,0
+Java 1 C1=1,200,OK,text,true,,10,null,,1,0
+Loop5 C1=1 C2=1 C3=11,200,OK,text,true,,0,null,,1,0
+Loop5 C1=1 C2=2 C3=12,200,OK,text,true,,0,null,,1,0
+If Test C1=1 C2=2 C3=12,200,OK,text,true,,0,null,,1,0
+Loop3 C1=1 C2=2 C3=12,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Loop3 C1=1 C2=2 C3=12,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Loop3 C1=1 C2=2 C3=12,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Loop5 C1=1 C2=3 C3=13,200,OK,text,true,,0,null,,1,0
+Loop5 C1=1 C2=4 C3=14,200,OK,text,true,,0,null,,1,0
+Loop5 C1=1 C2=5 C3=15,200,OK,text,true,,0,null,,1,0
+If Test C1=1 C2=5 C3=15,200,OK,text,true,,0,null,,1,0
+Loop3 C1=1 C2=5 C3=15,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Loop3 C1=1 C2=5 C3=15,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Loop3 C1=1 C2=5 C3=15,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Java If once 1,,,text,false,,0,null,,1,1
+Java If once 2,200,OK,text,true,,0,null,,1,0
+Java If all 1,,,text,false,,0,null,,1,1
+Java OK,200,OK,text,true,,0,null,,1,0
+Java If once 1,,,text,false,,0,null,,1,1
+Java If once 2,200,OK,text,true,,0,null,,1,0
+Java If all 1,,,text,false,,0,null,,1,1
+Java OK,200,OK,text,true,,0,null,,1,0
+Java 1 C1=2,200,OK,text,true,,10,null,,1,0
+Java 1 C1=2,200,OK,text,true,,10,null,,1,0
+Java 1 C1=2,200,OK,text,true,,10,null,,1,0
+Loop5 C1=2 C2=1 C3=16,200,OK,text,true,,0,null,,1,0
+Loop5 C1=2 C2=2 C3=17,200,OK,text,true,,0,null,,1,0
+Loop5 C1=2 C2=3 C3=18,200,OK,text,true,,0,null,,1,0
+If Test C1=2 C2=3 C3=18,200,OK,text,true,,0,null,,1,0
+Loop3 C1=2 C2=3 C3=18,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Loop3 C1=2 C2=3 C3=18,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Loop3 C1=2 C2=3 C3=18,200,OK,text,true,,0,null,,1,0
+Module,200,OK,text,true,,0,null,,1,0
+Loop5 C1=2 C2=4 C3=19,200,OK,text,true,,0,null,,1,0
+Loop5 C1=2 C2=5 C3=20,200,OK,text,true,,0,null,,1,0
+Java If once 1,,,text,false,,0,null,,1,1
+Java If once 2,200,OK,text,true,,0,null,,1,0
+Java If all 1,,,text,false,,0,null,,1,1
+Java OK,200,OK,text,true,,0,null,,1,0
+Java If once 1,,,text,false,,0,null,,1,1
+Java If once 2,200,OK,text,true,,0,null,,1,0
+Java If all 1,,,text,false,,0,null,,1,1
+Java OK,200,OK,text,true,,0,null,,1,0
+1 1,200,OK,text,true,,0,null,,1,0
+2 2,200,OK,text,true,,0,null,,1,0
+3 3,200,OK,text,true,,0,null,,1,0
+0 4,200,OK,text,true,,0,null,,1,0
+NAME USER1,200,OK,text,true,,0,null,,1,0
+TG1 = 3,200,OK,text,true,,0,null,,1,0
+TG OO = 1,200,OK,text,true,,0,null,,1,0
+TG Loop =3,200,OK,text,true,,0,null,,1,0
+TG2 = 3,200,OK,text,true,,0,null,,1,0
+TG1 = 3,200,OK,text,true,,0,null,,1,0
+TG Loop =3,200,OK,text,true,,0,null,,1,0
+TG2 = 3,200,OK,text,true,,0,null,,1,0
+TG1 = 3,200,OK,text,true,,0,null,,1,0
+TG Loop =3,200,OK,text,true,,0,null,,1,0
+TG2 = 3,200,OK,text,true,,0,null,,1,0
+CSV_VAR=2,200,OK,text,true,,0,null,,1,0
+CSV_VAR=3,200,OK,text,true,,0,null,,1,0
+CSV_VAR=1,200,OK,text,true,,0,null,,1,0
+CSV_VAR=2,200,OK,text,true,,0,null,,1,0
+BSH Counter: 1,200,OK,text,true,,0,null,,1,0
+BSH Counter: 2,200,OK,text,true,,0,null,,1,0
+BSH Counter: 3,200,OK,text,true,,0,null,,1,0
+BSF Sampler,200,OK,text,true,,3,null,,1,0
+JSR223 Sampler,200,OK,text,true,,3,null,,1,0
+Post 1,200,OK,text,true,,0,null,,1,0
diff --git a/bin/testfiles/BatchTestLocal.jmx b/bin/testfiles/BatchTestLocal.jmx
index 3cbdacd53a1..2b4d9ae030a 100644
--- a/bin/testfiles/BatchTestLocal.jmx
+++ b/bin/testfiles/BatchTestLocal.jmx
@@ -24,7 +24,7 @@
         </elementProp>
         <longProp name="ThreadGroup.end_time">1172922900000</longProp>
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
-        <stringProp name="ThreadGroup.ramp_time">10</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">20</stringProp>
         <stringProp name="TestPlan.comments">N.B. The ramp-up period is set so that the first thread will finish before the second.
 This is to ensure the test output is predictable, whilst still allowing testing of unshared counter etc</stringProp>
       </ThreadGroup>
@@ -316,7 +316,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
                 <bytes>true</bytes>
                 <url>true</url>
                 <fileName>true</fileName>
-                <threadCounts>true</threadCounts>
+                <threadCounts>false</threadCounts>
                 <sampleCount>true</sampleCount>
               </value>
             </objProp>
@@ -352,7 +352,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
                 <bytes>true</bytes>
                 <url>true</url>
                 <fileName>true</fileName>
-                <threadCounts>true</threadCounts>
+                <threadCounts>false</threadCounts>
                 <sampleCount>true</sampleCount>
               </value>
             </objProp>
@@ -793,7 +793,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
               <assertionsResultsToSave>0</assertionsResultsToSave>
               <bytes>true</bytes>
               <url>true</url>
-              <threadCounts>true</threadCounts>
+              <threadCounts>false</threadCounts>
               <sampleCount>true</sampleCount>
             </value>
           </objProp>
@@ -829,7 +829,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
               <bytes>true</bytes>
               <url>true</url>
               <fileName>true</fileName>
-              <threadCounts>true</threadCounts>
+              <threadCounts>false</threadCounts>
               <sampleCount>true</sampleCount>
             </value>
           </objProp>
@@ -865,7 +865,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
               <bytes>true</bytes>
               <url>true</url>
               <fileName>true</fileName>
-              <threadCounts>true</threadCounts>
+              <threadCounts>false</threadCounts>
               <sampleCount>true</sampleCount>
             </value>
           </objProp>
@@ -1181,7 +1181,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
               <bytes>true</bytes>
               <url>true</url>
               <fileName>true</fileName>
-              <threadCounts>true</threadCounts>
+              <threadCounts>false</threadCounts>
               <sampleCount>true</sampleCount>
             </value>
           </objProp>
@@ -1525,7 +1525,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
               <bytes>true</bytes>
               <url>true</url>
               <fileName>true</fileName>
-              <threadCounts>true</threadCounts>
+              <threadCounts>false</threadCounts>
               <sampleCount>true</sampleCount>
             </value>
           </objProp>
@@ -1561,7 +1561,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
               <bytes>true</bytes>
               <url>true</url>
               <fileName>true</fileName>
-              <threadCounts>true</threadCounts>
+              <threadCounts>false</threadCounts>
               <sampleCount>true</sampleCount>
             </value>
           </objProp>
@@ -1748,7 +1748,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
               <bytes>true</bytes>
               <url>true</url>
               <fileName>true</fileName>
-              <threadCounts>true</threadCounts>
+              <threadCounts>false</threadCounts>
               <sampleCount>true</sampleCount>
             </value>
           </objProp>
@@ -1784,7 +1784,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
               <bytes>true</bytes>
               <url>true</url>
               <fileName>true</fileName>
-              <threadCounts>true</threadCounts>
+              <threadCounts>false</threadCounts>
               <sampleCount>true</sampleCount>
             </value>
           </objProp>
@@ -1884,7 +1884,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
               <bytes>true</bytes>
               <url>true</url>
               <fileName>true</fileName>
-              <threadCounts>true</threadCounts>
+              <threadCounts>false</threadCounts>
               <sampleCount>true</sampleCount>
             </value>
           </objProp>
@@ -1920,7 +1920,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
               <bytes>true</bytes>
               <url>true</url>
               <fileName>true</fileName>
-              <threadCounts>true</threadCounts>
+              <threadCounts>false</threadCounts>
               <sampleCount>true</sampleCount>
             </value>
           </objProp>
@@ -2031,7 +2031,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
               <bytes>true</bytes>
               <url>true</url>
               <fileName>true</fileName>
-              <threadCounts>true</threadCounts>
+              <threadCounts>false</threadCounts>
               <sampleCount>true</sampleCount>
             </value>
           </objProp>
@@ -2067,7 +2067,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
               <bytes>true</bytes>
               <url>true</url>
               <fileName>true</fileName>
-              <threadCounts>true</threadCounts>
+              <threadCounts>false</threadCounts>
               <sampleCount>true</sampleCount>
             </value>
           </objProp>
@@ -2128,7 +2128,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
               <bytes>true</bytes>
               <url>true</url>
               <fileName>true</fileName>
-              <threadCounts>true</threadCounts>
+              <threadCounts>false</threadCounts>
               <sampleCount>true</sampleCount>
             </value>
           </objProp>
@@ -2164,7 +2164,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
               <bytes>true</bytes>
               <url>true</url>
               <fileName>true</fileName>
-              <threadCounts>true</threadCounts>
+              <threadCounts>false</threadCounts>
               <sampleCount>true</sampleCount>
             </value>
           </objProp>
@@ -2263,7 +2263,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
               <bytes>true</bytes>
               <url>true</url>
               <fileName>true</fileName>
-              <threadCounts>true</threadCounts>
+              <threadCounts>false</threadCounts>
               <sampleCount>true</sampleCount>
             </value>
           </objProp>
@@ -2299,7 +2299,7 @@ This is to ensure the test output is predictable, whilst still allowing testing
               <bytes>true</bytes>
               <url>true</url>
               <fileName>true</fileName>
-              <threadCounts>true</threadCounts>
+              <threadCounts>false</threadCounts>
               <sampleCount>true</sampleCount>
             </value>
           </objProp>
diff --git a/bin/testfiles/BatchTestLocal.xml b/bin/testfiles/BatchTestLocal.xml
index c307c944cd8..8c8343c4033 100644
--- a/bin/testfiles/BatchTestLocal.xml
+++ b/bin/testfiles/BatchTestLocal.xml
@@ -1,779 +1,779 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testResults version="1.2">
-<sample s="true" lb="Setup 1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Setup 1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
   <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
-<sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
   <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
-<sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
   <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
-<sample s="true" lb="Loop5 C1=1 C2=1 C3=1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=1 C2=1 C3=1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop5 C1=1 C2=2 C3=2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=1 C2=2 C3=2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop5 C1=1 C2=3 C3=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=1 C2=3 C3=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="If Test C1=1 C2=3 C3=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="If Test C1=1 C2=3 C3=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=1 C2=3 C3=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=1 C2=3 C3=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=1 C2=3 C3=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=1 C2=3 C3=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=1 C2=3 C3=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=1 C2=3 C3=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop5 C1=1 C2=4 C3=4" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=1 C2=4 C3=4" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop5 C1=1 C2=5 C3=5" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=1 C2=5 C3=5" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
+<sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
+<sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
+<sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
+<sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
   <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
-<sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
   <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
-<sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
   <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
-<sample s="true" lb="Loop5 C1=2 C2=1 C3=6" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=2 C2=1 C3=6" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="If Test C1=2 C2=1 C3=6" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="If Test C1=2 C2=1 C3=6" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=2 C2=1 C3=6" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=2 C2=1 C3=6" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=2 C2=1 C3=6" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=2 C2=1 C3=6" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=2 C2=1 C3=6" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=2 C2=1 C3=6" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop5 C1=2 C2=2 C3=7" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=2 C2=2 C3=7" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop5 C1=2 C2=3 C3=8" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=2 C2=3 C3=8" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop5 C1=2 C2=4 C3=9" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=2 C2=4 C3=9" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="If Test C1=2 C2=4 C3=9" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="If Test C1=2 C2=4 C3=9" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=2 C2=4 C3=9" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=2 C2=4 C3=9" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=2 C2=4 C3=9" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=2 C2=4 C3=9" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=2 C2=4 C3=9" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=2 C2=4 C3=9" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop5 C1=2 C2=5 C3=10" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=2 C2=5 C3=10" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
+<sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
+<sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
+<sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
+<sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
   <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
-<sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
   <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
-<sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
   <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
-<sample s="true" lb="Loop5 C1=1 C2=1 C3=11" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=1 C2=1 C3=11" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop5 C1=1 C2=2 C3=12" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=1 C2=2 C3=12" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="If Test C1=1 C2=2 C3=12" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="If Test C1=1 C2=2 C3=12" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=1 C2=2 C3=12" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=1 C2=2 C3=12" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=1 C2=2 C3=12" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=1 C2=2 C3=12" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=1 C2=2 C3=12" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=1 C2=2 C3=12" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop5 C1=1 C2=3 C3=13" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=1 C2=3 C3=13" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop5 C1=1 C2=4 C3=14" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=1 C2=4 C3=14" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop5 C1=1 C2=5 C3=15" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=1 C2=5 C3=15" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="If Test C1=1 C2=5 C3=15" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="If Test C1=1 C2=5 C3=15" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=1 C2=5 C3=15" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=1 C2=5 C3=15" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=1 C2=5 C3=15" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=1 C2=5 C3=15" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=1 C2=5 C3=15" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=1 C2=5 C3=15" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
+<sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
+<sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
+<sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
+<sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
   <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
-<sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
   <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
-<sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java 1 C1=2" rc="200" rm="OK" dt="text" by="10" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String">ResultData</responseData>
   <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SamplerData</samplerData>
 </sample>
-<sample s="true" lb="Loop5 C1=2 C2=1 C3=16" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=2 C2=1 C3=16" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop5 C1=2 C2=2 C3=17" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=2 C2=2 C3=17" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop5 C1=2 C2=3 C3=18" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=2 C2=3 C3=18" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="If Test C1=2 C2=3 C3=18" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="If Test C1=2 C2=3 C3=18" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=2 C2=3 C3=18" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=2 C2=3 C3=18" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=2 C2=3 C3=18" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=2 C2=3 C3=18" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop3 C1=2 C2=3 C3=18" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop3 C1=2 C2=3 C3=18" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Module" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop5 C1=2 C2=4 C3=19" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=2 C2=4 C3=19" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Loop5 C1=2 C2=5 C3=20" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Loop5 C1=2 C2=5 C3=20" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
+<sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
+<sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
+<sample s="false" lb="Java If once 1" rc="" rm="" dt="text" by="0" sc="1" ec="1">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java If once 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1" ng="1" na="1">
+<sample s="false" lb="Java If all 1" rc="" rm="" dt="text" by="0" sc="1" ec="1">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Java OK" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseData class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="1 1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="1 1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="2 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="2 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="3 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="3 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="0 4" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="0 4" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="TG1 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="TG1 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="TG OO = 1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="TG OO = 1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="TG Loop =3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="TG Loop =3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="TG2 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="TG2 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="TG1 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="TG1 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="TG Loop =3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="TG Loop =3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="TG2 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="TG2 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="TG1 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="TG1 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="TG Loop =3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="TG Loop =3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="TG2 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="TG2 = 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="CSV_VAR=2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="CSV_VAR=2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="CSV_VAR=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="CSV_VAR=3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="CSV_VAR=1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="CSV_VAR=1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="CSV_VAR=2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="CSV_VAR=2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
 </sample>
-<sample s="true" lb="BSH Counter: 1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="BSH Counter: 1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SampleResult.setSampleLabel("BSH Counter: 1");</samplerData>
 </sample>
-<sample s="true" lb="BSH Counter: 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="BSH Counter: 2" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SampleResult.setSampleLabel("BSH Counter: 2");</samplerData>
 </sample>
-<sample s="true" lb="BSH Counter: 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="BSH Counter: 3" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">SampleResult.setSampleLabel("BSH Counter: 3");</samplerData>
 </sample>
-<sample s="true" lb="BSF Sampler" rc="200" rm="OK" dt="text" by="3" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="BSF Sampler" rc="200" rm="OK" dt="text" by="3" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">12*12</samplerData>
 </sample>
-<sample s="true" lb="JSR223 Sampler" rc="200" rm="OK" dt="text" by="3" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="JSR223 Sampler" rc="200" rm="OK" dt="text" by="3" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>
   <samplerData class="java.lang.String">11*11</samplerData>
 </sample>
-<sample s="true" lb="Post 1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="Post 1" rc="200" rm="OK" dt="text" by="0" sc="1" ec="0">
   <responseHeader class="java.lang.String"/>
   <requestHeader class="java.lang.String"/>
   <responseFile class="java.lang.String"/>