diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/models/org.iets3.core.junit.interpreter.run.configuration.plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/models/org.iets3.core.junit.interpreter.run.configuration.plugin.mps
index 3bd3bd711..4c952f549 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/models/org.iets3.core.junit.interpreter.run.configuration.plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/models/org.iets3.core.junit.interpreter.run.configuration.plugin.mps
@@ -106,10 +106,6 @@
       <concept id="7520713872864775836" name="jetbrains.mps.lang.plugin.standalone.structure.StandalonePluginDescriptor" flags="ng" index="2DaZZR" />
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1224071154655" name="jetbrains.mps.baseLanguage.structure.AsExpression" flags="nn" index="0kSF2">
-        <child id="1224071154657" name="classifierType" index="0kSFW" />
-        <child id="1224071154656" name="expression" index="0kSFX" />
-      </concept>
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
         <child id="1219921048460" name="componentType" index="8Xvag" />
@@ -3875,50 +3871,6 @@
                     </node>
                   </node>
                 </node>
-                <node concept="1X3_iC" id="VT_taQv9zR" role="lGtFl">
-                  <property role="3V$3am" value="statement" />
-                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                  <node concept="3clFbJ" id="4MenVKnibpy" role="8Wnug">
-                    <node concept="3clFbS" id="4MenVKnibp$" role="3clFbx">
-                      <node concept="2xdQw9" id="4MenVKniF9c" role="3cqZAp">
-                        <property role="2xdLsb" value="gZ5fh_4/error" />
-                        <node concept="3cpWs3" id="4MenVKniS7C" role="9lYJi">
-                          <node concept="2OqwBi" id="4MenVKniY5s" role="3uHU7w">
-                            <node concept="37vLTw" id="4MenVKniVQ6" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3ZOWdXPxuGS" resolve="wrapper" />
-                            </node>
-                            <node concept="liA8E" id="4MenVKniZ6s" role="2OqNvi">
-                              <ref role="37wK5l" to="sfqd:56tRMpP_ej$" resolve="getFqName" />
-                            </node>
-                          </node>
-                          <node concept="Xl_RD" id="4MenVKniF9e" role="3uHU7B">
-                            <property role="Xl_RC" value="ITestItemContainer not as container:" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3fqX7Q" id="4MenVKniC9p" role="3clFbw">
-                      <node concept="2OqwBi" id="4MenVKniC9r" role="3fr31v">
-                        <node concept="2OqwBi" id="4MenVKniC9s" role="2Oq$k0">
-                          <node concept="0kSF2" id="4MenVKniC9t" role="2Oq$k0">
-                            <node concept="3uibUv" id="4MenVKniC9u" role="0kSFW">
-                              <ref role="3uigEE" to="sfqd:2BZ01qXwV_j" resolve="TestDescriptorWrapper" />
-                            </node>
-                            <node concept="37vLTw" id="4MenVKniC9v" role="0kSFX">
-                              <ref role="3cqZAo" node="3ZOWdXPxuGS" resolve="wrapper" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="4MenVKniC9w" role="2OqNvi">
-                            <ref role="37wK5l" to="sfqd:4chG8iI8_oR" resolve="getDescriptor" />
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="4MenVKniC9x" role="2OqNvi">
-                          <ref role="37wK5l" to="4u8o:2v6DJPJt3gn" resolve="isContainer" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
               </node>
               <node concept="2OqwBi" id="57Vjo2T_95i" role="3clFbw">
                 <node concept="37vLTw" id="57Vjo2T_7u5" role="2Oq$k0">
@@ -3951,48 +3903,6 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="1X3_iC" id="VT_taQvc$Y" role="lGtFl">
-                        <property role="3V$3am" value="statement" />
-                        <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                        <node concept="3clFbJ" id="4MenVKniZW4" role="8Wnug">
-                          <node concept="3clFbS" id="4MenVKniZW5" role="3clFbx">
-                            <node concept="2xdQw9" id="4MenVKniZW6" role="3cqZAp">
-                              <property role="2xdLsb" value="gZ5fh_4/error" />
-                              <node concept="3cpWs3" id="4MenVKniZW7" role="9lYJi">
-                                <node concept="2OqwBi" id="4MenVKniZW8" role="3uHU7w">
-                                  <node concept="37vLTw" id="4MenVKniZW9" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3ZOWdXPxuGS" resolve="wrapper" />
-                                  </node>
-                                  <node concept="liA8E" id="4MenVKniZWa" role="2OqNvi">
-                                    <ref role="37wK5l" to="sfqd:56tRMpP_ej$" resolve="getFqName" />
-                                  </node>
-                                </node>
-                                <node concept="Xl_RD" id="4MenVKniZWb" role="3uHU7B">
-                                  <property role="Xl_RC" value="AbstractTestItem as container:" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="4MenVKniZWd" role="3clFbw">
-                            <node concept="2OqwBi" id="4MenVKniZWe" role="2Oq$k0">
-                              <node concept="0kSF2" id="4MenVKniZWf" role="2Oq$k0">
-                                <node concept="3uibUv" id="4MenVKniZWg" role="0kSFW">
-                                  <ref role="3uigEE" to="sfqd:2BZ01qXwV_j" resolve="TestDescriptorWrapper" />
-                                </node>
-                                <node concept="37vLTw" id="4MenVKniZWh" role="0kSFX">
-                                  <ref role="3cqZAo" node="3ZOWdXPxuGS" resolve="wrapper" />
-                                </node>
-                              </node>
-                              <node concept="liA8E" id="4MenVKniZWi" role="2OqNvi">
-                                <ref role="37wK5l" to="sfqd:4chG8iI8_oR" resolve="getDescriptor" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="4MenVKniZWj" role="2OqNvi">
-                              <ref role="37wK5l" to="4u8o:2v6DJPJt3gn" resolve="isContainer" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
                     </node>
                     <node concept="2OqwBi" id="57Vjo2TA9ZR" role="3clFbw">
                       <node concept="37vLTw" id="57Vjo2TA8ER" role="2Oq$k0">
@@ -4409,217 +4319,184 @@
                   </node>
                 </node>
               </node>
-              <node concept="3J1_TO" id="1ZjgyFGBkQ8" role="3cqZAp">
-                <node concept="3uVAMA" id="1ZjgyFGBkQ9" role="1zxBo5">
-                  <node concept="XOnhg" id="1ZjgyFGBkQa" role="1zc67B">
-                    <property role="TrG5h" value="e" />
-                    <node concept="nSUau" id="1ZjgyFGBkQb" role="1tU5fm">
-                      <node concept="3uibUv" id="1ZjgyFGBkQc" role="nSUat">
-                        <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
-                      </node>
-                    </node>
+              <node concept="3cpWs8" id="1ZjgyFGBkRk" role="3cqZAp">
+                <node concept="3cpWsn" id="1ZjgyFGBkRl" role="3cpWs9">
+                  <property role="TrG5h" value="testResult" />
+                  <node concept="3uibUv" id="1ZjgyFGBkRm" role="1tU5fm">
+                    <ref role="3uigEE" to="xk6s:ub9nkyOIeW" resolve="EvalResult" />
                   </node>
-                  <node concept="3clFbS" id="1ZjgyFGBkQd" role="1zc67A">
-                    <node concept="1X3_iC" id="4eVkykfOL7M" role="lGtFl">
-                      <property role="3V$3am" value="statement" />
-                      <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                      <node concept="3clFbF" id="1ZjgyFGBkQe" role="8Wnug">
-                        <node concept="1rXfSq" id="1ZjgyFGBkQf" role="3clFbG">
-                          <ref role="37wK5l" node="4UL3Yhl2qIO" resolve="errOut" />
-                          <node concept="2OqwBi" id="1ZjgyFGBkQg" role="37wK5m">
-                            <node concept="37vLTw" id="1ZjgyFGBkQh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1ZjgyFGBkQa" resolve="e" />
-                            </node>
-                            <node concept="liA8E" id="1ZjgyFGBkQi" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
+                  <node concept="2OqwBi" id="1ZjgyFGBkRn" role="33vP2m">
+                    <node concept="37vLTw" id="1ZjgyFGCPqQ" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1ZjgyFGBkSe" resolve="item" />
                     </node>
-                  </node>
-                </node>
-                <node concept="3clFbS" id="1ZjgyFGBkQj" role="1zxBo7">
-                  <node concept="3cpWs8" id="1ZjgyFGBkRk" role="3cqZAp">
-                    <node concept="3cpWsn" id="1ZjgyFGBkRl" role="3cpWs9">
-                      <property role="TrG5h" value="testResult" />
-                      <node concept="3uibUv" id="1ZjgyFGBkRm" role="1tU5fm">
-                        <ref role="3uigEE" to="xk6s:ub9nkyOIeW" resolve="EvalResult" />
-                      </node>
-                      <node concept="2OqwBi" id="1ZjgyFGBkRn" role="33vP2m">
-                        <node concept="37vLTw" id="1ZjgyFGCPqQ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1ZjgyFGBkSe" resolve="item" />
-                        </node>
-                        <node concept="2qgKlT" id="1ZjgyFGBkRp" role="2OqNvi">
-                          <ref role="37wK5l" to="xk6s:4KZjPKUdEYm" resolve="executeTest" />
-                        </node>
-                      </node>
+                    <node concept="2qgKlT" id="1ZjgyFGBkRp" role="2OqNvi">
+                      <ref role="37wK5l" to="xk6s:4KZjPKUdEYm" resolve="executeTest" />
                     </node>
                   </node>
-                  <node concept="3clFbJ" id="1ZjgyFGBkRJ" role="3cqZAp">
-                    <node concept="3clFbS" id="1ZjgyFGBkRK" role="3clFbx">
-                      <node concept="3clFbJ" id="6mKf5uiWEzt" role="3cqZAp">
-                        <node concept="3clFbS" id="6mKf5uiWEzv" role="3clFbx">
-                          <node concept="3clFbF" id="3hBC0mRQcBS" role="3cqZAp">
-                            <node concept="2OqwBi" id="3hBC0mRQdUn" role="3clFbG">
-                              <node concept="37vLTw" id="3hBC0mRQcBQ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3hBC0mRNSRj" resolve="reporter" />
-                              </node>
-                              <node concept="liA8E" id="3hBC0mRQgzW" role="2OqNvi">
-                                <ref role="37wK5l" to="707k:2doG_VG7LJG" resolve="testCaseFailed" />
-                                <node concept="2OqwBi" id="63re9eQK$zJ" role="37wK5m">
-                                  <node concept="37vLTw" id="63re9eQKzw5" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1ZjgyFGBkSc" resolve="wrapper" />
-                                  </node>
-                                  <node concept="liA8E" id="63re9eQK_Pa" role="2OqNvi">
-                                    <ref role="37wK5l" to="sfqd:56tRMpP_ej$" resolve="getFqName" />
-                                  </node>
-                                </node>
-                                <node concept="37vLTw" id="63re9eQKD81" role="37wK5m">
-                                  <ref role="3cqZAo" node="1ZjgyFGBkSe" resolve="item" />
-                                </node>
-                                <node concept="2OqwBi" id="3hBC0mRQ_qm" role="37wK5m">
-                                  <node concept="2OqwBi" id="6mKf5uiWYDQ" role="2Oq$k0">
-                                    <node concept="2OqwBi" id="3hBC0mRQxfG" role="2Oq$k0">
-                                      <node concept="37vLTw" id="3hBC0mRQqjn" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1ZjgyFGBkRl" resolve="testResult" />
-                                      </node>
-                                      <node concept="liA8E" id="3hBC0mRQ$p2" role="2OqNvi">
-                                        <ref role="37wK5l" to="xk6s:7LZDtvgGM7M" resolve="getException" />
-                                      </node>
-                                    </node>
-                                    <node concept="liA8E" id="6mKf5uiX0Gz" role="2OqNvi">
-                                      <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
-                                    </node>
-                                  </node>
-                                  <node concept="liA8E" id="3hBC0mRQSGi" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~String.toString()" resolve="toString" />
-                                  </node>
-                                </node>
-                                <node concept="Xl_RD" id="6mKf5uiX5O6" role="37wK5m">
-                                  <property role="Xl_RC" value="" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3y3z36" id="6mKf5uiWL$z" role="3clFbw">
-                          <node concept="10Nm6u" id="6mKf5uiWNn7" role="3uHU7w" />
-                          <node concept="2OqwBi" id="6mKf5uiWJnT" role="3uHU7B">
-                            <node concept="37vLTw" id="6mKf5uiWIdg" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1ZjgyFGBkRl" resolve="testResult" />
-                            </node>
-                            <node concept="liA8E" id="6mKf5uiWKwy" role="2OqNvi">
-                              <ref role="37wK5l" to="xk6s:7LZDtvgGM7M" resolve="getException" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="6mKf5uiWOc9" role="3cqZAp">
-                        <node concept="2OqwBi" id="6mKf5uiWOca" role="3clFbG">
-                          <node concept="37vLTw" id="6mKf5uiWOcb" role="2Oq$k0">
+                </node>
+              </node>
+              <node concept="3clFbJ" id="1ZjgyFGBkRJ" role="3cqZAp">
+                <node concept="3clFbS" id="1ZjgyFGBkRK" role="3clFbx">
+                  <node concept="3clFbJ" id="6mKf5uiWEzt" role="3cqZAp">
+                    <node concept="3clFbS" id="6mKf5uiWEzv" role="3clFbx">
+                      <node concept="3clFbF" id="3hBC0mRQcBS" role="3cqZAp">
+                        <node concept="2OqwBi" id="3hBC0mRQdUn" role="3clFbG">
+                          <node concept="37vLTw" id="3hBC0mRQcBQ" role="2Oq$k0">
                             <ref role="3cqZAo" node="3hBC0mRNSRj" resolve="reporter" />
                           </node>
-                          <node concept="liA8E" id="6mKf5uiWOcc" role="2OqNvi">
+                          <node concept="liA8E" id="3hBC0mRQgzW" role="2OqNvi">
                             <ref role="37wK5l" to="707k:2doG_VG7LJG" resolve="testCaseFailed" />
-                            <node concept="2OqwBi" id="6mKf5uiWOcd" role="37wK5m">
-                              <node concept="37vLTw" id="6mKf5uiWOce" role="2Oq$k0">
+                            <node concept="2OqwBi" id="63re9eQK$zJ" role="37wK5m">
+                              <node concept="37vLTw" id="63re9eQKzw5" role="2Oq$k0">
                                 <ref role="3cqZAo" node="1ZjgyFGBkSc" resolve="wrapper" />
                               </node>
-                              <node concept="liA8E" id="6mKf5uiWOcf" role="2OqNvi">
+                              <node concept="liA8E" id="63re9eQK_Pa" role="2OqNvi">
                                 <ref role="37wK5l" to="sfqd:56tRMpP_ej$" resolve="getFqName" />
                               </node>
                             </node>
-                            <node concept="37vLTw" id="6mKf5uiWOcg" role="37wK5m">
+                            <node concept="37vLTw" id="63re9eQKD81" role="37wK5m">
                               <ref role="3cqZAo" node="1ZjgyFGBkSe" resolve="item" />
                             </node>
-                            <node concept="2OqwBi" id="6mKf5uiWOch" role="37wK5m">
-                              <node concept="2OqwBi" id="6mKf5uiWOci" role="2Oq$k0">
-                                <node concept="37vLTw" id="6mKf5uiWOcj" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1ZjgyFGBkRl" resolve="testResult" />
+                            <node concept="2OqwBi" id="3hBC0mRQ_qm" role="37wK5m">
+                              <node concept="2OqwBi" id="6mKf5uiWYDQ" role="2Oq$k0">
+                                <node concept="2OqwBi" id="3hBC0mRQxfG" role="2Oq$k0">
+                                  <node concept="37vLTw" id="3hBC0mRQqjn" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="1ZjgyFGBkRl" resolve="testResult" />
+                                  </node>
+                                  <node concept="liA8E" id="3hBC0mRQ$p2" role="2OqNvi">
+                                    <ref role="37wK5l" to="xk6s:7LZDtvgGM7M" resolve="getException" />
+                                  </node>
                                 </node>
-                                <node concept="liA8E" id="6mKf5uiWOck" role="2OqNvi">
-                                  <ref role="37wK5l" to="xk6s:ub9nkyPUM2" resolve="getErrorMessage" />
+                                <node concept="liA8E" id="6mKf5uiX0Gz" role="2OqNvi">
+                                  <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                                 </node>
                               </node>
-                              <node concept="liA8E" id="6mKf5uiWOcl" role="2OqNvi">
-                                <ref role="37wK5l" to="oq0c:4AahbtV9xyO" resolve="toString" />
+                              <node concept="liA8E" id="3hBC0mRQSGi" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~String.toString()" resolve="toString" />
                               </node>
                             </node>
-                            <node concept="Xl_RD" id="6mKf5uiXfa_" role="37wK5m">
+                            <node concept="Xl_RD" id="6mKf5uiX5O6" role="37wK5m">
                               <property role="Xl_RC" value="" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbF" id="3ViSmQmtmdR" role="3cqZAp">
-                        <node concept="2OqwBi" id="3ViSmQmtnsn" role="3clFbG">
-                          <node concept="37vLTw" id="3ViSmQmtmdP" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3ViSmQmi268" resolve="runListener" />
-                          </node>
-                          <node concept="liA8E" id="3ViSmQmtrA1" role="2OqNvi">
-                            <ref role="37wK5l" node="3ViSmQmsqN_" resolve="testFailureForEvalResult" />
-                            <node concept="37vLTw" id="3ViSmQmtu3t" role="37wK5m">
-                              <ref role="3cqZAo" node="3ViSmQmb0ZY" resolve="testDescription" />
-                            </node>
-                            <node concept="37vLTw" id="3ViSmQmtxlc" role="37wK5m">
-                              <ref role="3cqZAo" node="1ZjgyFGBkRl" resolve="testResult" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="1ZjgyFGBkRQ" role="3cqZAp">
-                        <node concept="3uNrnE" id="1ZjgyFGBkRR" role="3clFbG">
-                          <node concept="37vLTw" id="1ZjgyFGBkRS" role="2$L3a6">
-                            <ref role="3cqZAo" node="6UkhXJgOoXx" resolve="myFailureCount" />
-                          </node>
-                        </node>
-                      </node>
                     </node>
-                    <node concept="3fqX7Q" id="1ZjgyFGBkRT" role="3clFbw">
-                      <node concept="2OqwBi" id="1ZjgyFGBkRU" role="3fr31v">
-                        <node concept="37vLTw" id="1ZjgyFGBkRV" role="2Oq$k0">
+                    <node concept="3y3z36" id="6mKf5uiWL$z" role="3clFbw">
+                      <node concept="10Nm6u" id="6mKf5uiWNn7" role="3uHU7w" />
+                      <node concept="2OqwBi" id="6mKf5uiWJnT" role="3uHU7B">
+                        <node concept="37vLTw" id="6mKf5uiWIdg" role="2Oq$k0">
                           <ref role="3cqZAo" node="1ZjgyFGBkRl" resolve="testResult" />
                         </node>
-                        <node concept="liA8E" id="1ZjgyFGBkRW" role="2OqNvi">
-                          <ref role="37wK5l" to="xk6s:ub9nkyPULV" resolve="isOk" />
+                        <node concept="liA8E" id="6mKf5uiWKwy" role="2OqNvi">
+                          <ref role="37wK5l" to="xk6s:7LZDtvgGM7M" resolve="getException" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="3hBC0mRPQBD" role="3cqZAp">
-                    <node concept="2OqwBi" id="3hBC0mRPRYk" role="3clFbG">
-                      <node concept="37vLTw" id="3hBC0mRPQBB" role="2Oq$k0">
+                  <node concept="3clFbF" id="6mKf5uiWOc9" role="3cqZAp">
+                    <node concept="2OqwBi" id="6mKf5uiWOca" role="3clFbG">
+                      <node concept="37vLTw" id="6mKf5uiWOcb" role="2Oq$k0">
                         <ref role="3cqZAo" node="3hBC0mRNSRj" resolve="reporter" />
                       </node>
-                      <node concept="liA8E" id="3hBC0mRPTmU" role="2OqNvi">
-                        <ref role="37wK5l" to="707k:2doG_VG7LJA" resolve="testCaseFinished" />
-                        <node concept="2OqwBi" id="3hBC0mRPW4v" role="37wK5m">
-                          <node concept="37vLTw" id="3hBC0mRPW4w" role="2Oq$k0">
+                      <node concept="liA8E" id="6mKf5uiWOcc" role="2OqNvi">
+                        <ref role="37wK5l" to="707k:2doG_VG7LJG" resolve="testCaseFailed" />
+                        <node concept="2OqwBi" id="6mKf5uiWOcd" role="37wK5m">
+                          <node concept="37vLTw" id="6mKf5uiWOce" role="2Oq$k0">
                             <ref role="3cqZAo" node="1ZjgyFGBkSc" resolve="wrapper" />
                           </node>
-                          <node concept="liA8E" id="3hBC0mRPW4x" role="2OqNvi">
+                          <node concept="liA8E" id="6mKf5uiWOcf" role="2OqNvi">
                             <ref role="37wK5l" to="sfqd:56tRMpP_ej$" resolve="getFqName" />
                           </node>
                         </node>
-                        <node concept="37vLTw" id="63re9eQKOFk" role="37wK5m">
+                        <node concept="37vLTw" id="6mKf5uiWOcg" role="37wK5m">
                           <ref role="3cqZAo" node="1ZjgyFGBkSe" resolve="item" />
                         </node>
+                        <node concept="2OqwBi" id="6mKf5uiWOch" role="37wK5m">
+                          <node concept="2OqwBi" id="6mKf5uiWOci" role="2Oq$k0">
+                            <node concept="37vLTw" id="6mKf5uiWOcj" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1ZjgyFGBkRl" resolve="testResult" />
+                            </node>
+                            <node concept="liA8E" id="6mKf5uiWOck" role="2OqNvi">
+                              <ref role="37wK5l" to="xk6s:ub9nkyPUM2" resolve="getErrorMessage" />
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="6mKf5uiWOcl" role="2OqNvi">
+                            <ref role="37wK5l" to="oq0c:4AahbtV9xyO" resolve="toString" />
+                          </node>
+                        </node>
+                        <node concept="Xl_RD" id="6mKf5uiXfa_" role="37wK5m">
+                          <property role="Xl_RC" value="" />
+                        </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="3ViSmQmddF_" role="3cqZAp">
-                    <node concept="2OqwBi" id="3ViSmQmddFA" role="3clFbG">
-                      <node concept="37vLTw" id="3ViSmQmddFB" role="2Oq$k0">
+                  <node concept="3clFbF" id="3ViSmQmtmdR" role="3cqZAp">
+                    <node concept="2OqwBi" id="3ViSmQmtnsn" role="3clFbG">
+                      <node concept="37vLTw" id="3ViSmQmtmdP" role="2Oq$k0">
                         <ref role="3cqZAo" node="3ViSmQmi268" resolve="runListener" />
                       </node>
-                      <node concept="liA8E" id="3ViSmQmddFC" role="2OqNvi">
-                        <ref role="37wK5l" node="56tRMpP_bxW" resolve="testFinished" />
-                        <node concept="37vLTw" id="3ViSmQmddFD" role="37wK5m">
+                      <node concept="liA8E" id="3ViSmQmtrA1" role="2OqNvi">
+                        <ref role="37wK5l" node="3ViSmQmsqN_" resolve="testFailureForEvalResult" />
+                        <node concept="37vLTw" id="3ViSmQmtu3t" role="37wK5m">
                           <ref role="3cqZAo" node="3ViSmQmb0ZY" resolve="testDescription" />
                         </node>
+                        <node concept="37vLTw" id="3ViSmQmtxlc" role="37wK5m">
+                          <ref role="3cqZAo" node="1ZjgyFGBkRl" resolve="testResult" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="1ZjgyFGBkRQ" role="3cqZAp">
+                    <node concept="3uNrnE" id="1ZjgyFGBkRR" role="3clFbG">
+                      <node concept="37vLTw" id="1ZjgyFGBkRS" role="2$L3a6">
+                        <ref role="3cqZAo" node="6UkhXJgOoXx" resolve="myFailureCount" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3fqX7Q" id="1ZjgyFGBkRT" role="3clFbw">
+                  <node concept="2OqwBi" id="1ZjgyFGBkRU" role="3fr31v">
+                    <node concept="37vLTw" id="1ZjgyFGBkRV" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1ZjgyFGBkRl" resolve="testResult" />
+                    </node>
+                    <node concept="liA8E" id="1ZjgyFGBkRW" role="2OqNvi">
+                      <ref role="37wK5l" to="xk6s:ub9nkyPULV" resolve="isOk" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="3hBC0mRPQBD" role="3cqZAp">
+                <node concept="2OqwBi" id="3hBC0mRPRYk" role="3clFbG">
+                  <node concept="37vLTw" id="3hBC0mRPQBB" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3hBC0mRNSRj" resolve="reporter" />
+                  </node>
+                  <node concept="liA8E" id="3hBC0mRPTmU" role="2OqNvi">
+                    <ref role="37wK5l" to="707k:2doG_VG7LJA" resolve="testCaseFinished" />
+                    <node concept="2OqwBi" id="3hBC0mRPW4v" role="37wK5m">
+                      <node concept="37vLTw" id="3hBC0mRPW4w" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1ZjgyFGBkSc" resolve="wrapper" />
+                      </node>
+                      <node concept="liA8E" id="3hBC0mRPW4x" role="2OqNvi">
+                        <ref role="37wK5l" to="sfqd:56tRMpP_ej$" resolve="getFqName" />
                       </node>
                     </node>
+                    <node concept="37vLTw" id="63re9eQKOFk" role="37wK5m">
+                      <ref role="3cqZAo" node="1ZjgyFGBkSe" resolve="item" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="3ViSmQmddF_" role="3cqZAp">
+                <node concept="2OqwBi" id="3ViSmQmddFA" role="3clFbG">
+                  <node concept="37vLTw" id="3ViSmQmddFB" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3ViSmQmi268" resolve="runListener" />
+                  </node>
+                  <node concept="liA8E" id="3ViSmQmddFC" role="2OqNvi">
+                    <ref role="37wK5l" node="56tRMpP_bxW" resolve="testFinished" />
+                    <node concept="37vLTw" id="3ViSmQmddFD" role="37wK5m">
+                      <ref role="3cqZAo" node="3ViSmQmb0ZY" resolve="testDescription" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -13070,11 +12947,11 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbC" id="7uphSj4iMhb" role="3clFbw">
-                      <node concept="10Nm6u" id="7uphSj4iMDz" role="3uHU7w" />
+                    <node concept="3y3z36" id="11SxwQxL_Or" role="3clFbw">
                       <node concept="37vLTw" id="7uphSj4iLOS" role="3uHU7B">
                         <ref role="3cqZAo" node="5gyVhZ1bmnf" resolve="pointer" />
                       </node>
+                      <node concept="10Nm6u" id="7uphSj4iMDz" role="3uHU7w" />
                     </node>
                   </node>
                 </node>
@@ -13412,11 +13289,11 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbC" id="7uphSj4jN3e" role="3clFbw">
-                      <node concept="10Nm6u" id="7uphSj4jN3f" role="3uHU7w" />
+                    <node concept="3y3z36" id="11SxwQxLBYO" role="3clFbw">
                       <node concept="37vLTw" id="7uphSj4jN3g" role="3uHU7B">
                         <ref role="3cqZAo" node="5gyVhZ1bmlW" resolve="pointer" />
                       </node>
+                      <node concept="10Nm6u" id="7uphSj4jN3f" role="3uHU7w" />
                     </node>
                   </node>
                 </node>
@@ -13725,29 +13602,6 @@
             </node>
           </node>
         </node>
-        <node concept="1X3_iC" id="1DCOeq7g7YQ" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="56tRMpP_byX" role="8Wnug">
-            <node concept="2OqwBi" id="56tRMpP_byY" role="3clFbG">
-              <node concept="2OqwBi" id="56tRMpP_byZ" role="2Oq$k0">
-                <node concept="37vLTw" id="2BHiRxgm71M" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3ViSmQmjxH5" resolve="failure" />
-                </node>
-                <node concept="liA8E" id="56tRMpP_bz1" role="2OqNvi">
-                  <ref role="37wK5l" to="k76n:~Failure.getException()" resolve="getException" />
-                </node>
-              </node>
-              <node concept="liA8E" id="56tRMpP_bz2" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Throwable.printStackTrace(java.io.PrintStream)" resolve="printStackTrace" />
-                <node concept="10M0yZ" id="7wORwlIHr_o" role="37wK5m">
-                  <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
-                  <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="7wORwlIHyUm" role="3cqZAp">
           <node concept="1rXfSq" id="7wORwlIHyUk" role="3clFbG">
             <ref role="37wK5l" node="4e85Rl_q8Gl" resolve="flush" />
@@ -13826,29 +13680,6 @@
                   </node>
                 </node>
               </node>
-              <node concept="1X3_iC" id="1DCOeq7fCKJ" role="lGtFl">
-                <property role="3V$3am" value="statement" />
-                <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                <node concept="3clFbF" id="3ViSmQmtcrL" role="8Wnug">
-                  <node concept="2OqwBi" id="3ViSmQmtdIE" role="3clFbG">
-                    <node concept="10M0yZ" id="3ViSmQmtcVk" role="2Oq$k0">
-                      <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
-                      <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
-                    </node>
-                    <node concept="liA8E" id="3ViSmQmtf$P" role="2OqNvi">
-                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object)" resolve="println" />
-                      <node concept="2OqwBi" id="3ViSmQmt6_3" role="37wK5m">
-                        <node concept="37vLTw" id="3ViSmQmt5Tr" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3ViSmQmsqNC" resolve="evalResult" />
-                        </node>
-                        <node concept="2OwXpG" id="3ViSmQmt76U" role="2OqNvi">
-                          <ref role="2Oxat5" to="xk6s:ub9nkyQiZj" resolve="errorMessage" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
             </node>
           </node>
         </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
index 21e0fdc7f..ec6800871 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
@@ -15381,7 +15381,7 @@
       </node>
     </node>
     <node concept="398rNT" id="7C9J_PY1CSN" role="1l3spd">
-      <property role="TrG5h" value="iets3.interpreter.output" />
+      <property role="TrG5h" value="iets3.interpreterExecutor.genPath" />
       <node concept="398BVA" id="7C9J_PY1Imm" role="398pKh">
         <ref role="398BVh" node="7OQaAJRI74t" resolve="iets3.github.opensource.home" />
         <node concept="2Ry0Ak" id="7C9J_PY1Imp" role="iGT6I">
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.interpreterExecutor/models/org.iets3.opensource.interpreterExecutor.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.interpreterExecutor/models/org.iets3.opensource.interpreterExecutor.mps
index 89f6b2578..df29eafc9 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.interpreterExecutor/models/org.iets3.opensource.interpreterExecutor.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.interpreterExecutor/models/org.iets3.opensource.interpreterExecutor.mps
@@ -6,6 +6,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
@@ -23,9 +24,6 @@
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
-        <child id="1082485599096" name="statements" index="9aQI4" />
-      </concept>
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
@@ -83,7 +81,6 @@
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
       </concept>
@@ -140,11 +137,18 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
+      <concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
+        <property id="2034914114981261751" name="severity" index="RRSoG" />
+        <child id="2034914114981261753" name="message" index="RRSoy" />
+      </concept>
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -190,7 +194,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -215,7 +218,7 @@
       <node concept="3Tm6S6" id="2s5RXbi0rUr" role="1B3o_S" />
       <node concept="17QB3L" id="2s5RXbi0udc" role="1tU5fm" />
       <node concept="Xl_RD" id="2s5RXbi0vKp" role="33vP2m">
-        <property role="Xl_RC" value="iets3.interpreter.output" />
+        <property role="Xl_RC" value="iets3.interpreterExecutor.genPath" />
       </node>
     </node>
     <node concept="2tJIrI" id="7Z6s7w42A0l" role="jymVt" />
@@ -238,18 +241,10 @@
         </node>
         <node concept="3clFbJ" id="4iotRn3sQe2" role="3cqZAp">
           <node concept="3clFbS" id="4iotRn3sQe4" role="3clFbx">
-            <node concept="3clFbF" id="5loVtKOcWSe" role="3cqZAp">
-              <node concept="2OqwBi" id="5loVtKOcWSf" role="3clFbG">
-                <node concept="10M0yZ" id="5loVtKOdliY" role="2Oq$k0">
-                  <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
-                  <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
-                </node>
-                <node concept="liA8E" id="5loVtKOcWSh" role="2OqNvi">
-                  <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
-                  <node concept="Xl_RD" id="5loVtKOcWSi" role="37wK5m">
-                    <property role="Xl_RC" value="Argument 'platform' must not be null!" />
-                  </node>
-                </node>
+            <node concept="RRSsy" id="3xNo32qTvs5" role="3cqZAp">
+              <property role="RRSoG" value="gZ5fh_4/error" />
+              <node concept="Xl_RD" id="3xNo32qT_ay" role="RRSoy">
+                <property role="Xl_RC" value="Argument 'platform' must not be null!" />
               </node>
             </node>
             <node concept="3cpWs6" id="4iotRn3ubXG" role="3cqZAp" />
@@ -282,18 +277,10 @@
         </node>
         <node concept="3clFbJ" id="4iotRn3udnF" role="3cqZAp">
           <node concept="3clFbS" id="4iotRn3udnH" role="3clFbx">
-            <node concept="3clFbF" id="4iotRn3uilC" role="3cqZAp">
-              <node concept="2OqwBi" id="4iotRn3uilD" role="3clFbG">
-                <node concept="10M0yZ" id="5loVtKOdkSG" role="2Oq$k0">
-                  <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
-                  <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
-                </node>
-                <node concept="liA8E" id="4iotRn3uilF" role="2OqNvi">
-                  <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
-                  <node concept="Xl_RD" id="4iotRn3uilG" role="37wK5m">
-                    <property role="Xl_RC" value="Repository not found!" />
-                  </node>
-                </node>
+            <node concept="RRSsy" id="3xNo32qTD0O" role="3cqZAp">
+              <property role="RRSoG" value="gZ5fh_4/error" />
+              <node concept="Xl_RD" id="3xNo32qTFOc" role="RRSoy">
+                <property role="Xl_RC" value="Repository not found!" />
               </node>
             </node>
             <node concept="3cpWs6" id="4iotRn3ugw0" role="3cqZAp" />
@@ -324,6 +311,23 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbJ" id="3xNo32qUBrl" role="3cqZAp">
+          <node concept="3clFbS" id="3xNo32qUBrn" role="3clFbx">
+            <node concept="RRSsy" id="3xNo32qUItU" role="3cqZAp">
+              <property role="RRSoG" value="gZ5fh_4/error" />
+              <node concept="Xl_RD" id="3xNo32qUItW" role="RRSoy">
+                <property role="Xl_RC" value="Could not get required path macros!" />
+              </node>
+            </node>
+            <node concept="3cpWs6" id="3xNo32qUH6H" role="3cqZAp" />
+          </node>
+          <node concept="3clFbC" id="3xNo32qUFAp" role="3clFbw">
+            <node concept="10Nm6u" id="3xNo32qUGqm" role="3uHU7w" />
+            <node concept="37vLTw" id="3xNo32qUEIX" role="3uHU7B">
+              <ref role="3cqZAo" node="2s5RXbhZ1Lh" resolve="pathMacros" />
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="2s5RXbhZH0x" role="3cqZAp">
           <node concept="3cpWsn" id="2s5RXbhZH0y" role="3cpWs9">
             <property role="TrG5h" value="macroNames" />
@@ -345,24 +349,51 @@
         </node>
         <node concept="3clFbJ" id="2s5RXbhZxtS" role="3cqZAp">
           <node concept="3clFbS" id="2s5RXbhZxtU" role="3clFbx">
-            <node concept="3clFbF" id="2s5RXbhZQi1" role="3cqZAp">
-              <node concept="2OqwBi" id="2s5RXbhZVDv" role="3clFbG">
-                <node concept="10M0yZ" id="2s5RXbhZU8c" role="2Oq$k0">
-                  <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
-                  <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+            <node concept="RRSsy" id="3xNo32qTJC4" role="3cqZAp">
+              <property role="RRSoG" value="gZ5fh_4/error" />
+              <node concept="3cpWs3" id="2s5RXbi0Ce3" role="RRSoy">
+                <node concept="Xl_RD" id="2s5RXbi0_oq" role="3uHU7w">
+                  <property role="Xl_RC" value="' in MPS/File/Settings../Path Variables" />
                 </node>
-                <node concept="liA8E" id="2s5RXbhZX3c" role="2OqNvi">
-                  <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
-                  <node concept="3cpWs3" id="2s5RXbi0Ce3" role="37wK5m">
-                    <node concept="Xl_RD" id="2s5RXbi0_oq" role="3uHU7w">
-                      <property role="Xl_RC" value="' in MPS/File/Settings../Path Variables" />
+                <node concept="3cpWs3" id="2s5RXbi0_oi" role="3uHU7B">
+                  <node concept="Xl_RD" id="2s5RXbi0_oo" role="3uHU7B">
+                    <property role="Xl_RC" value="You need to specify '" />
+                  </node>
+                  <node concept="37vLTw" id="3xNo32qTMSZ" role="3uHU7w">
+                    <ref role="3cqZAo" node="2s5RXbi0ues" resolve="outputPathMacro" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="RRSsy" id="5eJiSDhlaVz" role="3cqZAp">
+              <property role="RRSoG" value="gZ5fh_4/error" />
+              <node concept="Xl_RD" id="5eJiSDhlaVB" role="RRSoy">
+                <property role="Xl_RC" value="\tFound macros:" />
+              </node>
+            </node>
+            <node concept="3clFbF" id="5eJiSDhg43o" role="3cqZAp">
+              <node concept="2OqwBi" id="5eJiSDhg7Tn" role="3clFbG">
+                <node concept="37vLTw" id="5eJiSDhg43m" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2s5RXbhZH0y" resolve="macroNames" />
+                </node>
+                <node concept="liA8E" id="5eJiSDhgcj3" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~Iterable.forEach(java.util.function.Consumer)" resolve="forEach" />
+                  <node concept="1bVj0M" id="5eJiSDhgdbR" role="37wK5m">
+                    <node concept="gl6BB" id="5eJiSDhgdc1" role="1bW2Oz">
+                      <property role="TrG5h" value="name" />
+                      <node concept="2jxLKc" id="5eJiSDhgdc2" role="1tU5fm" />
                     </node>
-                    <node concept="3cpWs3" id="2s5RXbi0_oi" role="3uHU7B">
-                      <node concept="Xl_RD" id="2s5RXbi0_oo" role="3uHU7B">
-                        <property role="Xl_RC" value="You need to specify '" />
-                      </node>
-                      <node concept="37vLTw" id="2s5RXbi0DgD" role="3uHU7w">
-                        <ref role="3cqZAo" node="2s5RXbi0ues" resolve="outputPathMacro" />
+                    <node concept="3clFbS" id="5eJiSDhgdc5" role="1bW5cS">
+                      <node concept="RRSsy" id="5eJiSDhgiOk" role="3cqZAp">
+                        <property role="RRSoG" value="gZ5fh_4/error" />
+                        <node concept="3cpWs3" id="5eJiSDhgnbw" role="RRSoy">
+                          <node concept="37vLTw" id="5eJiSDhgnT6" role="3uHU7w">
+                            <ref role="3cqZAo" node="5eJiSDhgdc1" resolve="name" />
+                          </node>
+                          <node concept="Xl_RD" id="5eJiSDhgiOm" role="3uHU7B">
+                            <property role="Xl_RC" value="\t" />
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -404,26 +435,18 @@
         </node>
         <node concept="3clFbJ" id="5n6kXNmda6Z" role="3cqZAp">
           <node concept="3clFbS" id="5n6kXNmda71" role="3clFbx">
-            <node concept="3clFbF" id="2s5RXbi0J$b" role="3cqZAp">
-              <node concept="2OqwBi" id="2s5RXbi0J$c" role="3clFbG">
-                <node concept="10M0yZ" id="2s5RXbi0J$d" role="2Oq$k0">
-                  <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
-                  <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+            <node concept="RRSsy" id="3xNo32qTPUy" role="3cqZAp">
+              <property role="RRSoG" value="gZ5fh_4/error" />
+              <node concept="3cpWs3" id="2s5RXbi0J$f" role="RRSoy">
+                <node concept="Xl_RD" id="2s5RXbi0J$g" role="3uHU7w">
+                  <property role="Xl_RC" value="' in MPS/File/Settings../Path Variables must not be empty!" />
                 </node>
-                <node concept="liA8E" id="2s5RXbi0J$e" role="2OqNvi">
-                  <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
-                  <node concept="3cpWs3" id="2s5RXbi0J$f" role="37wK5m">
-                    <node concept="Xl_RD" id="2s5RXbi0J$g" role="3uHU7w">
-                      <property role="Xl_RC" value="' in MPS/File/Settings../Path Variables must not be empty!" />
-                    </node>
-                    <node concept="3cpWs3" id="2s5RXbi0J$h" role="3uHU7B">
-                      <node concept="Xl_RD" id="2s5RXbi0J$i" role="3uHU7B">
-                        <property role="Xl_RC" value="The path variable'" />
-                      </node>
-                      <node concept="37vLTw" id="2s5RXbi0J$j" role="3uHU7w">
-                        <ref role="3cqZAo" node="2s5RXbi0ues" resolve="outputPathMacro" />
-                      </node>
-                    </node>
+                <node concept="3cpWs3" id="2s5RXbi0J$h" role="3uHU7B">
+                  <node concept="Xl_RD" id="2s5RXbi0J$i" role="3uHU7B">
+                    <property role="Xl_RC" value="The path variable'" />
+                  </node>
+                  <node concept="37vLTw" id="3xNo32qTSo8" role="3uHU7w">
+                    <ref role="3cqZAo" node="2s5RXbi0ues" resolve="outputPathMacro" />
                   </node>
                 </node>
               </node>
@@ -486,6 +509,10 @@
               <node concept="2OqwBi" id="wLSoj1u$_n" role="2Oq$k0">
                 <node concept="3$u5V9" id="wLSoj1u$_o" role="2OqNvi">
                   <node concept="1bVj0M" id="wLSoj1u$_p" role="23t8la">
+                    <node concept="gl6BB" id="3xNo32qUaGK" role="1bW2Oz">
+                      <property role="TrG5h" value="it" />
+                      <node concept="2jxLKc" id="3xNo32qUaGL" role="1tU5fm" />
+                    </node>
                     <node concept="3clFbS" id="wLSoj1u$_q" role="1bW5cS">
                       <node concept="3cpWs8" id="wLSoj1u$_r" role="3cqZAp">
                         <node concept="3cpWsn" id="wLSoj1u$_s" role="3cpWs9">
@@ -518,7 +545,7 @@
                                       <ref role="37wK5l" to="sfqd:1KnTQt4Oin7" resolve="tryToWrap" />
                                       <ref role="1Pybhc" to="sfqd:1KnTQt4Oin6" resolve="TestNodeWrapperFactory" />
                                       <node concept="37vLTw" id="wLSoj1u$_v" role="37wK5m">
-                                        <ref role="3cqZAo" node="wLSoj1u$_y" resolve="it" />
+                                        <ref role="3cqZAo" node="3xNo32qUaGK" resolve="it" />
                                       </node>
                                     </node>
                                   </node>
@@ -545,7 +572,7 @@
                                                 </node>
                                                 <node concept="2OqwBi" id="1ZA6TCDgZUz" role="3uHU7w">
                                                   <node concept="37vLTw" id="1ZA6TCDgKFw" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="wLSoj1u$_y" resolve="it" />
+                                                    <ref role="3cqZAo" node="3xNo32qUaGK" resolve="it" />
                                                   </node>
                                                   <node concept="I4A8Y" id="1ZA6TCDh0EJ" role="2OqNvi" />
                                                 </node>
@@ -563,7 +590,7 @@
                                         <node concept="TSZUe" id="1ZA6TCDhf2d" role="2OqNvi">
                                           <node concept="2OqwBi" id="1ZA6TCDhges" role="25WWJ7">
                                             <node concept="37vLTw" id="1ZA6TCDhfJ3" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="wLSoj1u$_y" resolve="it" />
+                                              <ref role="3cqZAo" node="3xNo32qUaGK" resolve="it" />
                                             </node>
                                             <node concept="I4A8Y" id="1ZA6TCDhhqB" role="2OqNvi" />
                                           </node>
@@ -580,7 +607,7 @@
                                         <node concept="3JPx81" id="1ZA6TCDhcQR" role="2OqNvi">
                                           <node concept="2OqwBi" id="1ZA6TCDhcQS" role="25WWJ7">
                                             <node concept="37vLTw" id="1ZA6TCDhcQT" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="wLSoj1u$_y" resolve="it" />
+                                              <ref role="3cqZAo" node="3xNo32qUaGK" resolve="it" />
                                             </node>
                                             <node concept="I4A8Y" id="1ZA6TCDhcQU" role="2OqNvi" />
                                           </node>
@@ -606,10 +633,6 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="wLSoj1u$_y" role="1bW2Oz">
-                      <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="wLSoj1u$_z" role="1tU5fm" />
-                    </node>
                   </node>
                 </node>
                 <node concept="2YIFZM" id="wLSoj1u$_$" role="2Oq$k0">
@@ -626,20 +649,13 @@
         </node>
         <node concept="3clFbJ" id="5loVtKOcJUG" role="3cqZAp">
           <node concept="3clFbS" id="5loVtKOcJUI" role="3clFbx">
-            <node concept="3clFbF" id="5loVtKOcNmM" role="3cqZAp">
-              <node concept="2OqwBi" id="5loVtKOcO5d" role="3clFbG">
-                <node concept="10M0yZ" id="5loVtKOdj$$" role="2Oq$k0">
-                  <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
-                  <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
-                </node>
-                <node concept="liA8E" id="5loVtKOcP7b" role="2OqNvi">
-                  <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
-                  <node concept="Xl_RD" id="5loVtKOcPjN" role="37wK5m">
-                    <property role="Xl_RC" value="&lt;&lt;&lt; No Nodes of concept 'ITestItemContainer' was found &gt;&gt;&gt;" />
-                  </node>
-                </node>
+            <node concept="RRSsy" id="3xNo32qUfXz" role="3cqZAp">
+              <property role="RRSoG" value="gZ5fksE/warn" />
+              <node concept="Xl_RD" id="5loVtKOcPjN" role="RRSoy">
+                <property role="Xl_RC" value="No Nodes of concept 'ITestItemContainer' was found!" />
               </node>
             </node>
+            <node concept="3cpWs6" id="3xNo32qUqR_" role="3cqZAp" />
           </node>
           <node concept="3clFbC" id="5loVtKOcMt$" role="3clFbw">
             <node concept="3cmrfG" id="5loVtKOcN9o" role="3uHU7w">
@@ -652,55 +668,6 @@
               <node concept="34oBXx" id="5loVtKOcLpq" role="2OqNvi" />
             </node>
           </node>
-          <node concept="9aQIb" id="1ZA6TCDg2jX" role="9aQIa">
-            <node concept="3clFbS" id="1ZA6TCDg2jY" role="9aQI4">
-              <node concept="3clFbF" id="1ZA6TCDhmAY" role="3cqZAp">
-                <node concept="2OqwBi" id="1ZA6TCDhoBw" role="3clFbG">
-                  <node concept="37vLTw" id="1ZA6TCDhmAW" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1ZA6TCDfQ7W" resolve="buffer" />
-                  </node>
-                  <node concept="liA8E" id="1ZA6TCDhpti" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~StringBuffer.insert(int,java.lang.String)" resolve="insert" />
-                    <node concept="3cmrfG" id="1ZA6TCDhpVM" role="37wK5m">
-                      <property role="3cmrfH" value="0" />
-                    </node>
-                    <node concept="2YIFZM" id="1ZA6TCDhsBu" role="37wK5m">
-                      <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
-                      <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                      <node concept="Xl_RD" id="1ZA6TCDhsBv" role="37wK5m">
-                        <property role="Xl_RC" value="\tFound %d test models:%n" />
-                      </node>
-                      <node concept="2OqwBi" id="1ZA6TCDh$0f" role="37wK5m">
-                        <node concept="37vLTw" id="1ZA6TCDhyZw" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1ZA6TCDh1Dn" resolve="models" />
-                        </node>
-                        <node concept="34oBXx" id="1ZA6TCDh$Vn" role="2OqNvi" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="1ZA6TCDg5E0" role="3cqZAp">
-                <node concept="2OqwBi" id="1ZA6TCDglMa" role="3clFbG">
-                  <node concept="10M0yZ" id="1ZA6TCDgl5$" role="2Oq$k0">
-                    <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
-                    <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
-                  </node>
-                  <node concept="liA8E" id="1ZA6TCDgnr$" role="2OqNvi">
-                    <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
-                    <node concept="2OqwBi" id="1ZA6TCDgs0M" role="37wK5m">
-                      <node concept="37vLTw" id="1ZA6TCDgp_y" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1ZA6TCDfQ7W" resolve="buffer" />
-                      </node>
-                      <node concept="liA8E" id="1ZA6TCDgumR" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~StringBuffer.toString()" resolve="toString" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
         </node>
         <node concept="3cpWs8" id="6Bg9Ew20FmU" role="3cqZAp">
           <node concept="3cpWsn" id="6Bg9Ew20FmV" role="3cpWs9">
@@ -844,6 +811,10 @@
                               </node>
                               <node concept="2es0OD" id="5PQvhzyjkj_" role="2OqNvi">
                                 <node concept="1bVj0M" id="5PQvhzyjkjB" role="23t8la">
+                                  <node concept="gl6BB" id="3xNo32qU$aZ" role="1bW2Oz">
+                                    <property role="TrG5h" value="it" />
+                                    <node concept="2jxLKc" id="3xNo32qU$b0" role="1tU5fm" />
+                                  </node>
                                   <node concept="3clFbS" id="5PQvhzyjkjC" role="1bW5cS">
                                     <node concept="3clFbF" id="5PQvhzyjllF" role="3cqZAp">
                                       <node concept="2OqwBi" id="5PQvhzyjnjp" role="3clFbG">
@@ -852,16 +823,12 @@
                                         </node>
                                         <node concept="TSZUe" id="5PQvhzyjp1A" role="2OqNvi">
                                           <node concept="37vLTw" id="5PQvhzyjqhD" role="25WWJ7">
-                                            <ref role="3cqZAo" node="5PQvhzyjkjD" resolve="it" />
+                                            <ref role="3cqZAo" node="3xNo32qU$aZ" resolve="it" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="5PQvhzyjkjD" role="1bW2Oz">
-                                    <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="5PQvhzyjkjE" role="1tU5fm" />
-                                  </node>
                                 </node>
                               </node>
                             </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.interpreterExecutor/org.iets3.opensource.interpreterExecutor.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.interpreterExecutor/org.iets3.opensource.interpreterExecutor.msd
index c81f0982b..e3ea5bf34 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.interpreterExecutor/org.iets3.opensource.interpreterExecutor.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.interpreterExecutor/org.iets3.opensource.interpreterExecutor.msd
@@ -22,6 +22,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />