diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/models/xml4JUnit.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/models/xml4JUnit.mps
index eb0055f7d..345be4d49 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/models/xml4JUnit.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/models/xml4JUnit.mps
@@ -196,13 +196,6 @@
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </concept>
     </language>
     <language id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp">
       <concept id="1175161300324" name="jetbrains.mps.baseLanguage.regexp.structure.LineEndRegexp" flags="ng" index="2t4AhP" />
@@ -210,6 +203,7 @@
         <property id="1174482761807" name="text" index="1OCb_u" />
       </concept>
       <concept id="1174482804200" name="jetbrains.mps.baseLanguage.regexp.structure.PlusRegexp" flags="ng" index="1OClNT" />
+      <concept id="1174482808826" name="jetbrains.mps.baseLanguage.regexp.structure.StarRegexp" flags="ng" index="1OCmVF" />
       <concept id="1174484562151" name="jetbrains.mps.baseLanguage.regexp.structure.SeqRegexp" flags="ng" index="1OJ37Q" />
       <concept id="1174485167097" name="jetbrains.mps.baseLanguage.regexp.structure.BinaryRegexp" flags="ng" index="1OLmFC">
         <child id="1174485176897" name="left" index="1OLpdg" />
@@ -7622,309 +7616,283 @@
         <node concept="3Tqbb2" id="5ZZgOa8NuTK" role="1tU5fm" />
       </node>
       <node concept="3clFbS" id="5ZZgOa8NuTL" role="3clF47">
-        <node concept="3clFbF" id="5ZZgOa8NCsu" role="3cqZAp">
-          <node concept="37vLTI" id="5ZZgOa8NCOh" role="3clFbG">
-            <node concept="2ShNRf" id="5ZZgOa8ND5k" role="37vLTx">
-              <node concept="HV5vD" id="5ZZgOa8NEsy" role="2ShVmc">
-                <property role="373rjd" value="true" />
-                <ref role="HV5vE" node="5ZZgOa8J6dA" resolve="Testsuite" />
+        <node concept="3clFbJ" id="7dTa4FRQvWo" role="3cqZAp">
+          <node concept="3clFbS" id="7dTa4FRQvWq" role="3clFbx">
+            <node concept="3clFbF" id="5ZZgOa8NCsu" role="3cqZAp">
+              <node concept="37vLTI" id="5ZZgOa8NCOh" role="3clFbG">
+                <node concept="2ShNRf" id="5ZZgOa8ND5k" role="37vLTx">
+                  <node concept="HV5vD" id="5ZZgOa8NEsy" role="2ShVmc">
+                    <property role="373rjd" value="true" />
+                    <ref role="HV5vE" node="5ZZgOa8J6dA" resolve="Testsuite" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="5ZZgOa8NCst" role="37vLTJ">
+                  <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
+                </node>
               </node>
             </node>
-            <node concept="37vLTw" id="5ZZgOa8NCst" role="37vLTJ">
-              <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5ZZgOa8NF0p" role="3cqZAp">
-          <node concept="2OqwBi" id="5ZZgOa8NFgC" role="3clFbG">
-            <node concept="37vLTw" id="5ZZgOa8NF0n" role="2Oq$k0">
-              <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
-            </node>
-            <node concept="liA8E" id="5ZZgOa8NFKS" role="2OqNvi">
-              <ref role="37wK5l" node="5ZZgOa8J6gR" resolve="setName" />
-              <node concept="Xl_RD" id="4YUGyHBFEZO" role="37wK5m">
-                <property role="Xl_RC" value="JUnit Jupiter" />
+            <node concept="3clFbF" id="5ZZgOa8NF0p" role="3cqZAp">
+              <node concept="2OqwBi" id="5ZZgOa8NFgC" role="3clFbG">
+                <node concept="37vLTw" id="5ZZgOa8NF0n" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
+                </node>
+                <node concept="liA8E" id="5ZZgOa8NFKS" role="2OqNvi">
+                  <ref role="37wK5l" node="5ZZgOa8J6gR" resolve="setName" />
+                  <node concept="Xl_RD" id="7dTa4FRQqq6" role="37wK5m">
+                    <property role="Xl_RC" value="JUnit Jupiter" />
+                  </node>
+                </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6A$Q$veHHdc" role="3cqZAp">
-          <node concept="2OqwBi" id="6A$Q$veHHOZ" role="3clFbG">
-            <node concept="37vLTw" id="6A$Q$veHHda" role="2Oq$k0">
-              <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
-            </node>
-            <node concept="liA8E" id="6A$Q$veHIvb" role="2OqNvi">
-              <ref role="37wK5l" node="5ZZgOa8J6hN" resolve="setErrors" />
-              <node concept="Xl_RD" id="6A$Q$veI747" role="37wK5m">
-                <property role="Xl_RC" value="0" />
+            <node concept="3clFbF" id="6A$Q$veHHdc" role="3cqZAp">
+              <node concept="2OqwBi" id="6A$Q$veHHOZ" role="3clFbG">
+                <node concept="37vLTw" id="6A$Q$veHHda" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
+                </node>
+                <node concept="liA8E" id="6A$Q$veHIvb" role="2OqNvi">
+                  <ref role="37wK5l" node="5ZZgOa8J6hN" resolve="setErrors" />
+                  <node concept="Xl_RD" id="6A$Q$veI747" role="37wK5m">
+                    <property role="Xl_RC" value="0" />
+                  </node>
+                </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6A$Q$veHIWz" role="3cqZAp">
-          <node concept="2OqwBi" id="6A$Q$veHIW$" role="3clFbG">
-            <node concept="37vLTw" id="6A$Q$veHIW_" role="2Oq$k0">
-              <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
-            </node>
-            <node concept="liA8E" id="6A$Q$veHIWA" role="2OqNvi">
-              <ref role="37wK5l" node="5ZZgOa8J6hv" resolve="setFailures" />
-              <node concept="Xl_RD" id="6A$Q$veI8ng" role="37wK5m">
-                <property role="Xl_RC" value="0" />
+            <node concept="3clFbF" id="6A$Q$veHIWz" role="3cqZAp">
+              <node concept="2OqwBi" id="6A$Q$veHIW$" role="3clFbG">
+                <node concept="37vLTw" id="6A$Q$veHIW_" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
+                </node>
+                <node concept="liA8E" id="6A$Q$veHIWA" role="2OqNvi">
+                  <ref role="37wK5l" node="5ZZgOa8J6hv" resolve="setFailures" />
+                  <node concept="Xl_RD" id="6A$Q$veI8ng" role="37wK5m">
+                    <property role="Xl_RC" value="0" />
+                  </node>
+                </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4YUGyHBFgLn" role="3cqZAp">
-          <node concept="2OqwBi" id="4YUGyHBFhHh" role="3clFbG">
-            <node concept="37vLTw" id="4YUGyHBFgLl" role="2Oq$k0">
-              <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
-            </node>
-            <node concept="liA8E" id="4YUGyHBFizR" role="2OqNvi">
-              <ref role="37wK5l" node="5ZZgOa8J6jZ" resolve="setPackage" />
-              <node concept="Xl_RD" id="4YUGyHBI7OS" role="37wK5m">
-                <property role="Xl_RC" value="" />
+            <node concept="3clFbF" id="4YUGyHBFgLn" role="3cqZAp">
+              <node concept="2OqwBi" id="4YUGyHBFhHh" role="3clFbG">
+                <node concept="37vLTw" id="4YUGyHBFgLl" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
+                </node>
+                <node concept="liA8E" id="4YUGyHBFizR" role="2OqNvi">
+                  <ref role="37wK5l" node="5ZZgOa8J6jZ" resolve="setPackage" />
+                  <node concept="Xl_RD" id="4YUGyHBI7OS" role="37wK5m">
+                    <property role="Xl_RC" value="" />
+                  </node>
+                </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4YUGyHBI0fH" role="3cqZAp">
-          <node concept="2OqwBi" id="4YUGyHBI0fI" role="3clFbG">
-            <node concept="37vLTw" id="4YUGyHBI0fJ" role="2Oq$k0">
-              <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
-            </node>
-            <node concept="liA8E" id="4YUGyHBI0fK" role="2OqNvi">
-              <ref role="37wK5l" node="5ZZgOa8J6iJ" resolve="setSkipped" />
-              <node concept="Xl_RD" id="4YUGyHBI4Ws" role="37wK5m">
-                <property role="Xl_RC" value="0" />
+            <node concept="3clFbF" id="4YUGyHBI0fH" role="3cqZAp">
+              <node concept="2OqwBi" id="4YUGyHBI0fI" role="3clFbG">
+                <node concept="37vLTw" id="4YUGyHBI0fJ" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
+                </node>
+                <node concept="liA8E" id="4YUGyHBI0fK" role="2OqNvi">
+                  <ref role="37wK5l" node="5ZZgOa8J6iJ" resolve="setSkipped" />
+                  <node concept="Xl_RD" id="4YUGyHBI4Ws" role="37wK5m">
+                    <property role="Xl_RC" value="0" />
+                  </node>
+                </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4YUGyHBI11B" role="3cqZAp">
-          <node concept="2OqwBi" id="4YUGyHBI11C" role="3clFbG">
-            <node concept="37vLTw" id="4YUGyHBI11D" role="2Oq$k0">
-              <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
-            </node>
-            <node concept="liA8E" id="4YUGyHBI11E" role="2OqNvi">
-              <ref role="37wK5l" node="5ZZgOa8J6jn" resolve="setHostname" />
-              <node concept="1rXfSq" id="4YUGyHBI11F" role="37wK5m">
-                <ref role="37wK5l" node="2doG_VG7Ma_" resolve="hostname" />
+            <node concept="3clFbF" id="4YUGyHBI11B" role="3cqZAp">
+              <node concept="2OqwBi" id="4YUGyHBI11C" role="3clFbG">
+                <node concept="37vLTw" id="4YUGyHBI11D" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
+                </node>
+                <node concept="liA8E" id="4YUGyHBI11E" role="2OqNvi">
+                  <ref role="37wK5l" node="5ZZgOa8J6jn" resolve="setHostname" />
+                  <node concept="1rXfSq" id="4YUGyHBI11F" role="37wK5m">
+                    <ref role="37wK5l" node="2doG_VG7Ma_" resolve="hostname" />
+                  </node>
+                </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4YUGyHBF_KN" role="3cqZAp">
-          <node concept="2OqwBi" id="4YUGyHBFAIF" role="3clFbG">
-            <node concept="37vLTw" id="4YUGyHBF_KL" role="2Oq$k0">
-              <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
-            </node>
-            <node concept="liA8E" id="4YUGyHBFBCP" role="2OqNvi">
-              <ref role="37wK5l" node="5ZZgOa8J6jF" resolve="setId" />
-              <node concept="2YIFZM" id="4YUGyHBHVlq" role="37wK5m">
-                <ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
-                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                <node concept="2OqwBi" id="4YUGyHBHPXO" role="37wK5m">
-                  <node concept="2OqwBi" id="4YUGyHBHNB9" role="2Oq$k0">
-                    <node concept="37vLTw" id="4YUGyHBHN09" role="2Oq$k0">
-                      <ref role="3cqZAo" node="5ZZgOa8N$6s" resolve="root" />
-                    </node>
-                    <node concept="liA8E" id="4YUGyHBHOzx" role="2OqNvi">
-                      <ref role="37wK5l" node="5ZZgOa8J6sa" resolve="getTestsuite" />
+            <node concept="3clFbF" id="4YUGyHBF_KN" role="3cqZAp">
+              <node concept="2OqwBi" id="4YUGyHBFAIF" role="3clFbG">
+                <node concept="37vLTw" id="4YUGyHBF_KL" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
+                </node>
+                <node concept="liA8E" id="4YUGyHBFBCP" role="2OqNvi">
+                  <ref role="37wK5l" node="5ZZgOa8J6jF" resolve="setId" />
+                  <node concept="2YIFZM" id="4YUGyHBHVlq" role="37wK5m">
+                    <ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
+                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                    <node concept="2OqwBi" id="4YUGyHBHPXO" role="37wK5m">
+                      <node concept="2OqwBi" id="4YUGyHBHNB9" role="2Oq$k0">
+                        <node concept="37vLTw" id="4YUGyHBHN09" role="2Oq$k0">
+                          <ref role="3cqZAo" node="5ZZgOa8N$6s" resolve="root" />
+                        </node>
+                        <node concept="liA8E" id="4YUGyHBHOzx" role="2OqNvi">
+                          <ref role="37wK5l" node="5ZZgOa8J6sa" resolve="getTestsuite" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="4YUGyHBHSeQ" role="2OqNvi">
+                        <ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
+                      </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="4YUGyHBHSeQ" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
-                  </node>
                 </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4YUGyHBFYi8" role="3cqZAp">
-          <node concept="2OqwBi" id="4YUGyHBFZrO" role="3clFbG">
-            <node concept="37vLTw" id="4YUGyHBFYi6" role="2Oq$k0">
-              <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
-            </node>
-            <node concept="liA8E" id="4YUGyHBG0nH" role="2OqNvi">
-              <ref role="37wK5l" node="5ZZgOa8J6j3" resolve="setTimestamp" />
-              <node concept="1rXfSq" id="4YUGyHBHuhu" role="37wK5m">
-                <ref role="37wK5l" node="2doG_VG7Ma4" resolve="timeStamp" />
-                <node concept="2ShNRf" id="4YUGyHBHvvJ" role="37wK5m">
-                  <node concept="1pGfFk" id="4YUGyHBHy83" role="2ShVmc">
-                    <property role="373rjd" value="true" />
-                    <ref role="37wK5l" to="33ny:~Date.&lt;init&gt;(long)" resolve="Date" />
-                    <node concept="2YIFZM" id="4YUGyHBHAtT" role="37wK5m">
-                      <ref role="37wK5l" to="wyt6:~System.currentTimeMillis()" resolve="currentTimeMillis" />
-                      <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+            <node concept="3clFbF" id="4YUGyHBFYi8" role="3cqZAp">
+              <node concept="2OqwBi" id="4YUGyHBFZrO" role="3clFbG">
+                <node concept="37vLTw" id="4YUGyHBFYi6" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
+                </node>
+                <node concept="liA8E" id="4YUGyHBG0nH" role="2OqNvi">
+                  <ref role="37wK5l" node="5ZZgOa8J6j3" resolve="setTimestamp" />
+                  <node concept="1rXfSq" id="4YUGyHBHuhu" role="37wK5m">
+                    <ref role="37wK5l" node="2doG_VG7Ma4" resolve="timeStamp" />
+                    <node concept="2ShNRf" id="4YUGyHBHvvJ" role="37wK5m">
+                      <node concept="1pGfFk" id="4YUGyHBHy83" role="2ShVmc">
+                        <property role="373rjd" value="true" />
+                        <ref role="37wK5l" to="33ny:~Date.&lt;init&gt;(long)" resolve="Date" />
+                        <node concept="2YIFZM" id="4YUGyHBHAtT" role="37wK5m">
+                          <ref role="37wK5l" to="wyt6:~System.currentTimeMillis()" resolve="currentTimeMillis" />
+                          <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="1X3_iC" id="4YUGyHBFUl5" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3cpWs8" id="4YUGyHBEZwp" role="8Wnug">
-            <node concept="3cpWsn" id="4YUGyHBEZwq" role="3cpWs9">
-              <property role="TrG5h" value="property" />
-              <node concept="3uibUv" id="4YUGyHBEZ4L" role="1tU5fm">
-                <ref role="3uigEE" node="5ZZgOa8J64H" resolve="Property" />
-              </node>
-              <node concept="2ShNRf" id="4YUGyHBEZwr" role="33vP2m">
-                <node concept="HV5vD" id="4YUGyHBEZws" role="2ShVmc">
-                  <property role="373rjd" value="true" />
-                  <ref role="HV5vE" node="5ZZgOa8J64H" resolve="Property" />
+            <node concept="3clFbF" id="6CJuGuzsR9q" role="3cqZAp">
+              <node concept="2OqwBi" id="6CJuGuzsU7U" role="3clFbG">
+                <node concept="37vLTw" id="6CJuGuzsR9o" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
                 </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1X3_iC" id="4YUGyHBFUl6" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="4YUGyHBF13n" role="8Wnug">
-            <node concept="2OqwBi" id="4YUGyHBF1VX" role="3clFbG">
-              <node concept="37vLTw" id="4YUGyHBF13l" role="2Oq$k0">
-                <ref role="3cqZAo" node="4YUGyHBEZwq" resolve="property" />
-              </node>
-              <node concept="liA8E" id="4YUGyHBF2H$" role="2OqNvi">
-                <ref role="37wK5l" node="5ZZgOa8J65h" resolve="setName" />
-                <node concept="Xl_RD" id="4YUGyHBF3kg" role="37wK5m">
-                  <property role="Xl_RC" value="line.separator" />
+                <node concept="liA8E" id="6CJuGuzsWUU" role="2OqNvi">
+                  <ref role="37wK5l" node="5ZZgOa8J6gz" resolve="setSystemErr" />
+                  <node concept="Xl_RD" id="6CJuGuzt37o" role="37wK5m">
+                    <property role="Xl_RC" value="" />
+                  </node>
                 </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="1X3_iC" id="4YUGyHBFUl7" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="4YUGyHBF5zj" role="8Wnug">
-            <node concept="2OqwBi" id="4YUGyHBF6ko" role="3clFbG">
-              <node concept="37vLTw" id="4YUGyHBF5zh" role="2Oq$k0">
-                <ref role="3cqZAo" node="4YUGyHBEZwq" resolve="property" />
-              </node>
-              <node concept="liA8E" id="4YUGyHBF6XZ" role="2OqNvi">
-                <ref role="37wK5l" node="5ZZgOa8J65_" resolve="setValue" />
-                <node concept="Xl_RD" id="4YUGyHBF9zW" role="37wK5m">
-                  <property role="Xl_RC" value="&amp;#xa;" />
+            <node concept="3clFbF" id="6CJuGuzt8hj" role="3cqZAp">
+              <node concept="2OqwBi" id="6CJuGuzt9sr" role="3clFbG">
+                <node concept="37vLTw" id="6CJuGuzt8hh" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
+                </node>
+                <node concept="liA8E" id="6CJuGuztcTY" role="2OqNvi">
+                  <ref role="37wK5l" node="5ZZgOa8J6gf" resolve="setSystemOut" />
+                  <node concept="Xl_RD" id="6CJuGuztehy" role="37wK5m">
+                    <property role="Xl_RC" value="" />
+                  </node>
                 </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="1X3_iC" id="4YUGyHBFUl8" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="4YUGyHBFbvo" role="8Wnug">
-            <node concept="2OqwBi" id="4YUGyHBFbvp" role="3clFbG">
-              <node concept="37vLTw" id="4YUGyHBFbvq" role="2Oq$k0">
-                <ref role="3cqZAo" node="4YUGyHBEZwq" resolve="property" />
-              </node>
-              <node concept="liA8E" id="4YUGyHBFbvr" role="2OqNvi">
-                <ref role="37wK5l" node="5ZZgOa8J65h" resolve="setName" />
-                <node concept="Xl_RD" id="4YUGyHBFbvs" role="37wK5m">
-                  <property role="Xl_RC" value="file.encoding" />
+            <node concept="3cpWs8" id="2n_ldglonB7" role="3cqZAp">
+              <node concept="3cpWsn" id="2n_ldglonB8" role="3cpWs9">
+                <property role="TrG5h" value="propterties" />
+                <node concept="3uibUv" id="2n_ldglonB9" role="1tU5fm">
+                  <ref role="3uigEE" node="5ZZgOa8J62I" resolve="Properties" />
+                </node>
+                <node concept="2ShNRf" id="2n_ldglovC_" role="33vP2m">
+                  <node concept="HV5vD" id="2n_ldgloyEm" role="2ShVmc">
+                    <property role="373rjd" value="true" />
+                    <ref role="HV5vE" node="5ZZgOa8J62I" resolve="Properties" />
+                  </node>
                 </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="1X3_iC" id="4YUGyHBFUl9" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="4YUGyHBFbvj" role="8Wnug">
-            <node concept="2OqwBi" id="4YUGyHBFbvk" role="3clFbG">
-              <node concept="37vLTw" id="4YUGyHBFbvl" role="2Oq$k0">
-                <ref role="3cqZAo" node="4YUGyHBEZwq" resolve="property" />
-              </node>
-              <node concept="liA8E" id="4YUGyHBFbvm" role="2OqNvi">
-                <ref role="37wK5l" node="5ZZgOa8J65_" resolve="setValue" />
-                <node concept="Xl_RD" id="4YUGyHBFbvn" role="37wK5m">
-                  <property role="Xl_RC" value="UTF-8" />
+            <node concept="3cpWs8" id="4YUGyHBEZwp" role="3cqZAp">
+              <node concept="3cpWsn" id="4YUGyHBEZwq" role="3cpWs9">
+                <property role="TrG5h" value="property" />
+                <node concept="3uibUv" id="4YUGyHBEZ4L" role="1tU5fm">
+                  <ref role="3uigEE" node="5ZZgOa8J64H" resolve="Property" />
+                </node>
+                <node concept="2ShNRf" id="4YUGyHBEZwr" role="33vP2m">
+                  <node concept="HV5vD" id="4YUGyHBEZws" role="2ShVmc">
+                    <property role="373rjd" value="true" />
+                    <ref role="HV5vE" node="5ZZgOa8J64H" resolve="Property" />
+                  </node>
                 </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="1X3_iC" id="4YUGyHBFUla" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="4YUGyHBFabV" role="8Wnug">
-            <node concept="2OqwBi" id="4YUGyHBFabW" role="3clFbG">
-              <node concept="37vLTw" id="4YUGyHBFabX" role="2Oq$k0">
-                <ref role="3cqZAo" node="4YUGyHBEZwq" resolve="property" />
-              </node>
-              <node concept="liA8E" id="4YUGyHBFabY" role="2OqNvi">
-                <ref role="37wK5l" node="5ZZgOa8J65h" resolve="setName" />
-                <node concept="Xl_RD" id="4YUGyHBFabZ" role="37wK5m">
-                  <property role="Xl_RC" value="file.separator" />
+            <node concept="3clFbF" id="4YUGyHBFbvo" role="3cqZAp">
+              <node concept="2OqwBi" id="4YUGyHBFbvp" role="3clFbG">
+                <node concept="37vLTw" id="4YUGyHBFbvq" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4YUGyHBEZwq" resolve="property" />
+                </node>
+                <node concept="liA8E" id="4YUGyHBFbvr" role="2OqNvi">
+                  <ref role="37wK5l" node="5ZZgOa8J65h" resolve="setName" />
+                  <node concept="Xl_RD" id="4YUGyHBFbvs" role="37wK5m">
+                    <property role="Xl_RC" value="file.encoding" />
+                  </node>
                 </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="1X3_iC" id="4YUGyHBFUlb" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="4YUGyHBFabQ" role="8Wnug">
-            <node concept="2OqwBi" id="4YUGyHBFabR" role="3clFbG">
-              <node concept="37vLTw" id="4YUGyHBFabS" role="2Oq$k0">
-                <ref role="3cqZAo" node="4YUGyHBEZwq" resolve="property" />
-              </node>
-              <node concept="liA8E" id="4YUGyHBFabT" role="2OqNvi">
-                <ref role="37wK5l" node="5ZZgOa8J65_" resolve="setValue" />
-                <node concept="Xl_RD" id="4YUGyHBFabU" role="37wK5m">
-                  <property role="Xl_RC" value="/;" />
+            <node concept="3clFbF" id="4YUGyHBFbvj" role="3cqZAp">
+              <node concept="2OqwBi" id="4YUGyHBFbvk" role="3clFbG">
+                <node concept="37vLTw" id="4YUGyHBFbvl" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4YUGyHBEZwq" resolve="property" />
+                </node>
+                <node concept="liA8E" id="4YUGyHBFbvm" role="2OqNvi">
+                  <ref role="37wK5l" node="5ZZgOa8J65_" resolve="setValue" />
+                  <node concept="Xl_RD" id="4YUGyHBFbvn" role="37wK5m">
+                    <property role="Xl_RC" value="UTF-8" />
+                  </node>
                 </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="1X3_iC" id="4YUGyHBHr3z" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="4YUGyHBEJuZ" role="8Wnug">
-            <node concept="2OqwBi" id="4YUGyHBEP4k" role="3clFbG">
-              <node concept="2OqwBi" id="4YUGyHBELDg" role="2Oq$k0">
-                <node concept="2OqwBi" id="4YUGyHBEKeI" role="2Oq$k0">
-                  <node concept="37vLTw" id="4YUGyHBEJuX" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
+            <node concept="3clFbF" id="2n_ldgloPWQ" role="3cqZAp">
+              <node concept="2OqwBi" id="2n_ldgloWM9" role="3clFbG">
+                <node concept="2OqwBi" id="2n_ldgloSQQ" role="2Oq$k0">
+                  <node concept="37vLTw" id="2n_ldgloPWO" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2n_ldglonB8" resolve="propterties" />
                   </node>
-                  <node concept="liA8E" id="4YUGyHBEL0n" role="2OqNvi">
-                    <ref role="37wK5l" node="5ZZgOa8J6fv" resolve="getProperties" />
+                  <node concept="liA8E" id="2n_ldgloUQI" role="2OqNvi">
+                    <ref role="37wK5l" node="5ZZgOa8J634" resolve="getProperty" />
                   </node>
                 </node>
-                <node concept="2OwXpG" id="4YUGyHBEMuI" role="2OqNvi">
-                  <ref role="2Oxat5" node="5ZZgOa8J62W" resolve="property" />
+                <node concept="liA8E" id="2n_ldglp1jO" role="2OqNvi">
+                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
+                  <node concept="37vLTw" id="2n_ldglp2lG" role="37wK5m">
+                    <ref role="3cqZAo" node="4YUGyHBEZwq" resolve="property" />
+                  </node>
                 </node>
               </node>
-              <node concept="liA8E" id="4YUGyHBESeJ" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
-                <node concept="37vLTw" id="4YUGyHBEZwt" role="37wK5m">
-                  <ref role="3cqZAo" node="4YUGyHBEZwq" resolve="property" />
+            </node>
+            <node concept="3clFbF" id="4YUGyHBEJuZ" role="3cqZAp">
+              <node concept="2OqwBi" id="4YUGyHBEKeI" role="3clFbG">
+                <node concept="37vLTw" id="4YUGyHBEJuX" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
+                </node>
+                <node concept="liA8E" id="4YUGyHBEL0n" role="2OqNvi">
+                  <ref role="37wK5l" node="5ZZgOa8J6fA" resolve="setProperties" />
+                  <node concept="37vLTw" id="2n_ldgloGhv" role="37wK5m">
+                    <ref role="3cqZAo" node="2n_ldglonB8" resolve="propterties" />
+                  </node>
                 </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5ZZgOa8NGBF" role="3cqZAp">
-          <node concept="2OqwBi" id="5ZZgOa8NIy2" role="3clFbG">
-            <node concept="2OqwBi" id="5ZZgOa8NGL6" role="2Oq$k0">
-              <node concept="37vLTw" id="5ZZgOa8NGBD" role="2Oq$k0">
-                <ref role="3cqZAo" node="5ZZgOa8N$6s" resolve="root" />
-              </node>
-              <node concept="liA8E" id="5ZZgOa8NHh7" role="2OqNvi">
-                <ref role="37wK5l" node="5ZZgOa8J6sa" resolve="getTestsuite" />
+            <node concept="3clFbF" id="5ZZgOa8NGBF" role="3cqZAp">
+              <node concept="2OqwBi" id="5ZZgOa8NIy2" role="3clFbG">
+                <node concept="2OqwBi" id="5ZZgOa8NGL6" role="2Oq$k0">
+                  <node concept="37vLTw" id="5ZZgOa8NGBD" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5ZZgOa8N$6s" resolve="root" />
+                  </node>
+                  <node concept="liA8E" id="5ZZgOa8NHh7" role="2OqNvi">
+                    <ref role="37wK5l" node="5ZZgOa8J6sa" resolve="getTestsuite" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="5ZZgOa8NMMt" role="2OqNvi">
+                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
+                  <node concept="37vLTw" id="5ZZgOa8NNc4" role="37wK5m">
+                    <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
+                  </node>
+                </node>
               </node>
             </node>
-            <node concept="liA8E" id="5ZZgOa8NMMt" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
-              <node concept="37vLTw" id="5ZZgOa8NNc4" role="37wK5m">
-                <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
-              </node>
+          </node>
+          <node concept="3clFbC" id="7dTa4FRQynu" role="3clFbw">
+            <node concept="10Nm6u" id="7dTa4FRQA8y" role="3uHU7w" />
+            <node concept="37vLTw" id="7dTa4FRQxih" role="3uHU7B">
+              <ref role="3cqZAo" node="5ZZgOa8N$Ue" resolve="currentSuite" />
             </node>
           </node>
         </node>
@@ -8030,8 +7998,27 @@
             </node>
             <node concept="liA8E" id="5ZZgOa8NRTI" role="2OqNvi">
               <ref role="37wK5l" node="5ZZgOa8J5Vy" resolve="setName" />
-              <node concept="37vLTw" id="5ZZgOa8NShh" role="37wK5m">
-                <ref role="3cqZAo" node="5ZZgOa8NuU0" resolve="testCaseFQname" />
+              <node concept="1rXfSq" id="5cMf_o7FxqT" role="37wK5m">
+                <ref role="37wK5l" node="2doG_VG7M8M" resolve="shortName" />
+                <node concept="37vLTw" id="5cMf_o7FyiR" role="37wK5m">
+                  <ref role="3cqZAo" node="5ZZgOa8NuU0" resolve="testCaseFQname" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5cMf_o7EZbA" role="3cqZAp">
+          <node concept="2OqwBi" id="5cMf_o7F0ad" role="3clFbG">
+            <node concept="37vLTw" id="5cMf_o7EZb$" role="2Oq$k0">
+              <ref role="3cqZAo" node="5ZZgOa8N_I0" resolve="currentCase" />
+            </node>
+            <node concept="liA8E" id="5cMf_o7F1bB" role="2OqNvi">
+              <ref role="37wK5l" node="5ZZgOa8J5Wu" resolve="setClassname" />
+              <node concept="1rXfSq" id="5cMf_o7FewY" role="37wK5m">
+                <ref role="37wK5l" node="2doG_VG7M9k" resolve="prefix" />
+                <node concept="37vLTw" id="5cMf_o7FhRP" role="37wK5m">
+                  <ref role="3cqZAo" node="5ZZgOa8NuU0" resolve="testCaseFQname" />
+                </node>
               </node>
             </node>
           </node>
@@ -8297,7 +8284,27 @@
             </node>
           </node>
           <node concept="3uVAMA" id="5ZZgOa8O9KY" role="1zxBo5">
-            <node concept="3clFbS" id="5ZZgOa8O9KZ" role="1zc67A" />
+            <node concept="3clFbS" id="5ZZgOa8O9KZ" role="1zc67A">
+              <node concept="3clFbF" id="yHjyt5CkwI" role="3cqZAp">
+                <node concept="2OqwBi" id="yHjyt5CpBs" role="3clFbG">
+                  <node concept="10M0yZ" id="yHjyt5CnJp" role="2Oq$k0">
+                    <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
+                    <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                  </node>
+                  <node concept="liA8E" id="yHjyt5CtYQ" role="2OqNvi">
+                    <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                    <node concept="2OqwBi" id="yHjyt5CwlL" role="37wK5m">
+                      <node concept="37vLTw" id="yHjyt5CuT2" role="2Oq$k0">
+                        <ref role="3cqZAo" node="5ZZgOa8O9L0" resolve="e" />
+                      </node>
+                      <node concept="liA8E" id="yHjyt5C$7f" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="XOnhg" id="5ZZgOa8O9L0" role="1zc67B">
               <property role="TrG5h" value="e" />
               <node concept="nSUau" id="5ZZgOa8O9L1" role="1tU5fm">
@@ -8391,6 +8398,85 @@
         </node>
       </node>
     </node>
+    <node concept="3clFb_" id="2doG_VG7M9k" role="jymVt">
+      <property role="TrG5h" value="prefix" />
+      <node concept="17QB3L" id="2doG_VG7M9l" role="3clF45" />
+      <node concept="3Tm6S6" id="2doG_VG7M9m" role="1B3o_S" />
+      <node concept="3clFbS" id="2doG_VG7M9n" role="3clF47">
+        <node concept="3cpWs8" id="2doG_VG7M9o" role="3cqZAp">
+          <node concept="3cpWsn" id="2doG_VG7M9p" role="3cpWs9">
+            <property role="TrG5h" value="matcher" />
+            <node concept="3uibUv" id="2doG_VG7M9q" role="1tU5fm">
+              <ref role="3uigEE" to="ni5j:~Matcher" resolve="Matcher" />
+            </node>
+            <node concept="2OqwBi" id="2doG_VG7M9r" role="33vP2m">
+              <node concept="1Qi9sc" id="2doG_VG7M9s" role="2Oq$k0">
+                <node concept="1OJ37Q" id="2doG_VG7M9t" role="1QigWp">
+                  <node concept="1Tukvm" id="2doG_VG7M9u" role="1OLpdg">
+                    <property role="TrG5h" value="prefix" />
+                    <node concept="1OCmVF" id="2doG_VG7M9v" role="1TuGhC">
+                      <node concept="1T2EwR" id="2doG_VG7M9w" role="1OLDsb" />
+                    </node>
+                  </node>
+                  <node concept="1OJ37Q" id="2doG_VG7M9x" role="1OLqdY">
+                    <node concept="1OC9wW" id="2doG_VG7M9y" role="1OLpdg">
+                      <property role="1OCb_u" value="." />
+                    </node>
+                    <node concept="1OJ37Q" id="2doG_VG7M9z" role="1OLqdY">
+                      <node concept="1OClNT" id="2doG_VG7M9$" role="1OLpdg">
+                        <node concept="1SSPPM" id="2doG_VG7M9_" role="1OLDsb">
+                          <node concept="1T6I$Y" id="2doG_VG7M9A" role="1T5LoC">
+                            <property role="1T6KD9" value="." />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2t4AhP" id="2doG_VG7M9B" role="1OLqdY" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="2doG_VG7M9C" role="2OqNvi">
+                <ref role="37wK5l" to="ni5j:~Pattern.matcher(java.lang.CharSequence)" resolve="matcher" />
+                <node concept="37vLTw" id="2BHiRxgm9pZ" role="37wK5m">
+                  <ref role="3cqZAo" node="2doG_VG7M9O" resolve="testFQname" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2doG_VG7M9E" role="3cqZAp">
+          <node concept="3K4zz7" id="2doG_VG7M9F" role="3clFbG">
+            <node concept="2OqwBi" id="2doG_VG7M9G" role="3K4E3e">
+              <node concept="37vLTw" id="3GM_nagTwfo" role="2Oq$k0">
+                <ref role="3cqZAo" node="2doG_VG7M9p" resolve="matcher" />
+              </node>
+              <node concept="liA8E" id="2doG_VG7M9I" role="2OqNvi">
+                <ref role="37wK5l" to="ni5j:~Matcher.group(int)" resolve="group" />
+                <node concept="3cmrfG" id="2doG_VG7M9J" role="37wK5m">
+                  <property role="3cmrfH" value="1" />
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="2BHiRxgm7sP" role="3K4GZi">
+              <ref role="3cqZAo" node="2doG_VG7M9O" resolve="testFQname" />
+            </node>
+            <node concept="2OqwBi" id="2doG_VG7M9L" role="3K4Cdx">
+              <node concept="37vLTw" id="3GM_nagT_zW" role="2Oq$k0">
+                <ref role="3cqZAo" node="2doG_VG7M9p" resolve="matcher" />
+              </node>
+              <node concept="liA8E" id="2doG_VG7M9N" role="2OqNvi">
+                <ref role="37wK5l" to="ni5j:~Matcher.matches()" resolve="matches" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="2doG_VG7M9O" role="3clF46">
+        <property role="TrG5h" value="testFQname" />
+        <node concept="17QB3L" id="2doG_VG7M9P" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5cMf_o7F9PZ" role="jymVt" />
     <node concept="3clFb_" id="2doG_VG7Ma4" role="jymVt">
       <property role="TrG5h" value="timeStamp" />
       <node concept="37vLTG" id="2doG_VG7Ma5" role="3clF46">