diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/generator/template/main@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/generator/template/main@generator.mps
index c56597e16..0fd3df49a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/generator/template/main@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/generator/template/main@generator.mps
@@ -33,9 +33,6 @@
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
-      <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" />
@@ -65,7 +62,6 @@
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -85,7 +81,6 @@
       </concept>
       <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <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>
@@ -106,9 +101,6 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
-        <child id="1079359253376" name="expression" index="1eOMHV" />
-      </concept>
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
@@ -297,18 +289,11 @@
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
       </concept>
-      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
-        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
-      </concept>
       <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <concept id="1145567426890" name="jetbrains.mps.lang.smodel.structure.SNodeListCreator" flags="nn" index="2T8Vx0">
         <child id="1145567471833" name="createdType" index="2T96Bj" />
       </concept>
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
-      <concept id="2644386474302386080" name="jetbrains.mps.lang.smodel.structure.PropertyIdRefExpression" flags="nn" index="355D3s">
-        <reference id="2644386474302386081" name="conceptDeclaration" index="355D3t" />
-        <reference id="2644386474302386082" name="propertyDeclaration" index="355D3u" />
-      </concept>
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
@@ -385,7 +370,7 @@
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
-      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+      <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
@@ -3212,227 +3197,426 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="2pNNFK" id="7RPG7Ru$yTi" role="3o6s8t">
-                    <property role="2pNNFO" value="arg" />
+                  <node concept="2pNNFK" id="yHjyt5xH5E" role="3o6s8t">
                     <property role="qg3DV" value="true" />
-                    <node concept="2pNUuL" id="7RPG7Ru_8uH" role="2pNNFR">
+                    <property role="2pNNFO" value="arg" />
+                    <node concept="2pNUuL" id="yHjyt5xH5F" role="2pNNFR">
                       <property role="2pNUuO" value="value" />
-                      <node concept="2pMdtt" id="7RPG7Ru_abQ" role="2pMdts">
-                        <property role="2pMdty" value="-Xmx512m" />
-                        <node concept="17Uvod" id="7RPG7RuF6QL" role="lGtFl">
+                      <node concept="2pMdtt" id="yHjyt5xH5G" role="2pMdts">
+                        <property role="2pMdty" value="-Xmx1024m" />
+                        <node concept="17Uvod" id="yHjyt5xH5H" role="lGtFl">
                           <property role="2qtEX9" value="text" />
                           <property role="P4ACc" value="479c7a8c-02f9-43b5-9139-d910cb22f298/6666499814681541919/6666499814681541920" />
-                          <node concept="3zFVjK" id="7RPG7RuF6QO" role="3zH0cK">
-                            <node concept="3clFbS" id="7RPG7RuF6QP" role="2VODD2">
-                              <node concept="3cpWs8" id="7RPG7RvcFqU" role="3cqZAp">
-                                <node concept="3cpWsn" id="7RPG7RvcFqX" role="3cpWs9">
-                                  <property role="TrG5h" value="mpsAspect" />
-                                  <node concept="3Tqbb2" id="7RPG7RvcFqS" role="1tU5fm">
-                                    <ref role="ehGHo" to="kdzh:5D0zVz80y2D" resolve="BuildMpsAspect" />
-                                  </node>
-                                  <node concept="2OqwBi" id="jC3lHUGe0X" role="33vP2m">
-                                    <node concept="2OqwBi" id="jC3lHUGaUT" role="2Oq$k0">
-                                      <node concept="2OqwBi" id="7RPG7Ru_iDC" role="2Oq$k0">
-                                        <node concept="3Tsc0h" id="7RPG7Ru_iDD" role="2OqNvi">
-                                          <ref role="3TtcxE" to="3ior:34DbxDwQPuJ" resolve="aspects" />
-                                        </node>
-                                        <node concept="2OqwBi" id="3pzPpUGjxBe" role="2Oq$k0">
-                                          <node concept="1iwH7S" id="3pzPpUGjxrr" role="2Oq$k0" />
-                                          <node concept="1psM6Z" id="6Z57pH4ITfb" role="2OqNvi">
-                                            <ref role="1psM6Y" node="6Z57pH4ITf8" resolve="buildProject" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="v3k3i" id="jC3lHUGcXn" role="2OqNvi">
-                                        <node concept="chp4Y" id="jC3lHUGdqC" role="v3oSu">
-                                          <ref role="cht4Q" to="kdzh:5D0zVz80y2D" resolve="BuildMpsAspect" />
-                                        </node>
+                          <node concept="3zFVjK" id="yHjyt5xH5I" role="3zH0cK">
+                            <node concept="3clFbS" id="yHjyt5xH5J" role="2VODD2">
+                              <node concept="3clFbF" id="yHjyt5xH5K" role="3cqZAp">
+                                <node concept="2OqwBi" id="yHjyt5xH5L" role="3clFbG">
+                                  <node concept="30H73N" id="yHjyt5xH5M" role="2Oq$k0" />
+                                  <node concept="3TrcHB" id="yHjyt5xH5N" role="2OqNvi">
+                                    <ref role="3TsBF5" to="kdzh:QkG2t1bKwB" resolve="path" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1ps_y7" id="yHjyt5xH5O" role="lGtFl">
+                      <node concept="1ps_xZ" id="yHjyt5xH5P" role="1ps_xO">
+                        <property role="TrG5h" value="jvmargs" />
+                        <node concept="2jfdEK" id="yHjyt5xH5Q" role="1ps_xN">
+                          <node concept="3clFbS" id="yHjyt5xH5R" role="2VODD2">
+                            <node concept="3clFbJ" id="yHjyt5xH60" role="3cqZAp">
+                              <node concept="3clFbS" id="yHjyt5xH61" role="3clFbx">
+                                <node concept="3cpWs6" id="yHjyt5xH62" role="3cqZAp">
+                                  <node concept="Xl_RD" id="yHjyt5xH63" role="3cqZAk">
+                                    <property role="Xl_RC" value="-Xss2048k -Xmx1024m" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="22lmx$" id="yHjyt5xH64" role="3clFbw">
+                                <node concept="2OqwBi" id="yHjyt5xH65" role="3uHU7B">
+                                  <node concept="2OqwBi" id="yHjyt5yiaZ" role="2Oq$k0">
+                                    <node concept="30H73N" id="yHjyt5yhcf" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="yHjyt5yjTd" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="dc1n:38ougpFqnKp" resolve="jvmArgs" />
+                                    </node>
+                                  </node>
+                                  <node concept="3w_OXm" id="yHjyt5xH67" role="2OqNvi" />
+                                </node>
+                                <node concept="2OqwBi" id="yHjyt5yM0S" role="3uHU7w">
+                                  <node concept="2OqwBi" id="yHjyt5yn$Q" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="yHjyt5yldn" role="2Oq$k0">
+                                      <node concept="30H73N" id="yHjyt5ykyu" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="yHjyt5ynez" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="dc1n:38ougpFqnKp" resolve="jvmArgs" />
                                       </node>
                                     </node>
-                                    <node concept="1uHKPH" id="jC3lHUGfdr" role="2OqNvi" />
+                                    <node concept="3Tsc0h" id="yHjyt5yojv" role="2OqNvi">
+                                      <ref role="3TtcxE" to="3ior:4gdvEeQzbDb" resolve="parts" />
+                                    </node>
                                   </node>
+                                  <node concept="1v1jN8" id="yHjyt5yMPK" role="2OqNvi" />
                                 </node>
                               </node>
-                              <node concept="3clFbH" id="7RPG7RvdXCN" role="3cqZAp" />
-                              <node concept="3cpWs8" id="7RPG7Rvcc_E" role="3cqZAp">
-                                <node concept="3cpWsn" id="7RPG7Rvcc_H" role="3cpWs9">
-                                  <property role="TrG5h" value="heapSize" />
-                                  <node concept="10Oyi0" id="7RPG7Rvcc_C" role="1tU5fm" />
+                            </node>
+                            <node concept="3cpWs8" id="yHjyt5xH6d" role="3cqZAp">
+                              <node concept="3cpWsn" id="yHjyt5xH6e" role="3cpWs9">
+                                <property role="TrG5h" value="project" />
+                                <node concept="3Tqbb2" id="yHjyt5xH6f" role="1tU5fm">
+                                  <ref role="ehGHo" to="3ior:4RPz6WoY4Cj" resolve="BuildProject" />
                                 </node>
-                              </node>
-                              <node concept="3SKdUt" id="7RPG7RvdlkG" role="3cqZAp">
-                                <node concept="1PaTwC" id="ATZLwXo0iR" role="1aUNEU">
-                                  <node concept="3oM_SD" id="ATZLwXo0iS" role="1PaTwD">
-                                    <property role="3oM_SC" value="0" />
-                                  </node>
-                                  <node concept="3oM_SD" id="ATZLwXo0iT" role="1PaTwD">
-                                    <property role="3oM_SC" value="as" />
-                                  </node>
-                                  <node concept="3oM_SD" id="ATZLwXo0iU" role="1PaTwD">
-                                    <property role="3oM_SC" value="default" />
-                                  </node>
-                                  <node concept="3oM_SD" id="ATZLwXo0iV" role="1PaTwD">
-                                    <property role="3oM_SC" value="value" />
+                                <node concept="1PxgMI" id="yHjyt5xH6g" role="33vP2m">
+                                  <node concept="2OqwBi" id="yHjyt5xH6h" role="1m5AlR">
+                                    <node concept="2Rxl7S" id="yHjyt5xH6i" role="2OqNvi" />
+                                    <node concept="30H73N" id="yHjyt5xH6j" role="2Oq$k0" />
                                   </node>
-                                  <node concept="3oM_SD" id="ATZLwXo0iW" role="1PaTwD">
-                                    <property role="3oM_SC" value="and" />
-                                  </node>
-                                  <node concept="3oM_SD" id="ATZLwXo0iX" role="1PaTwD">
-                                    <property role="3oM_SC" value="0" />
+                                  <node concept="chp4Y" id="yHjyt5xH6k" role="3oSUPX">
+                                    <ref role="cht4Q" to="3ior:4RPz6WoY4Cj" resolve="BuildProject" />
                                   </node>
-                                  <node concept="3oM_SD" id="ATZLwXo0iY" role="1PaTwD">
-                                    <property role="3oM_SC" value="as" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3cpWs8" id="yHjyt5xH6l" role="3cqZAp">
+                              <node concept="3cpWsn" id="yHjyt5xH6m" role="3cpWs9">
+                                <property role="TrG5h" value="macroHelper" />
+                                <node concept="3uibUv" id="yHjyt5xH6n" role="1tU5fm">
+                                  <ref role="3uigEE" to="o3n2:5FtnUVJR86u" resolve="MacroHelper" />
+                                </node>
+                                <node concept="2OqwBi" id="yHjyt5xH6o" role="33vP2m">
+                                  <node concept="2ShNRf" id="yHjyt5xH6p" role="2Oq$k0">
+                                    <node concept="1pGfFk" id="yHjyt5xH6q" role="2ShVmc">
+                                      <ref role="37wK5l" to="o3n2:5DY7s5F2Pa1" resolve="MacroContext" />
+                                      <node concept="37vLTw" id="yHjyt5xH6r" role="37wK5m">
+                                        <ref role="3cqZAo" node="yHjyt5xH6e" resolve="project" />
+                                      </node>
+                                      <node concept="1iwH7S" id="yHjyt5xH6s" role="37wK5m" />
+                                    </node>
                                   </node>
-                                  <node concept="3oM_SD" id="ATZLwXo0iZ" role="1PaTwD">
-                                    <property role="3oM_SC" value="heap" />
+                                  <node concept="liA8E" id="yHjyt5xH6t" role="2OqNvi">
+                                    <ref role="37wK5l" to="o3n2:5DY7s5F2PaT" resolve="getMacros" />
+                                    <node concept="37vLTw" id="yHjyt5xH6u" role="37wK5m">
+                                      <ref role="3cqZAo" node="yHjyt5xH6e" resolve="project" />
+                                    </node>
                                   </node>
-                                  <node concept="3oM_SD" id="ATZLwXo0j0" role="1PaTwD">
-                                    <property role="3oM_SC" value="size" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbF" id="yHjyt5xH6v" role="3cqZAp">
+                              <node concept="2OqwBi" id="yHjyt5xH6w" role="3clFbG">
+                                <node concept="2OqwBi" id="yHjyt5xH6x" role="2Oq$k0">
+                                  <node concept="30H73N" id="yHjyt5ytyW" role="2Oq$k0" />
+                                  <node concept="3TrEf2" id="yHjyt5xH6z" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="dc1n:38ougpFqnKp" resolve="jvmArgs" />
                                   </node>
-                                  <node concept="3oM_SD" id="ATZLwXo0j1" role="1PaTwD">
-                                    <property role="3oM_SC" value="should" />
+                                </node>
+                                <node concept="2qgKlT" id="yHjyt5xH6$" role="2OqNvi">
+                                  <ref role="37wK5l" to="vbkb:3NagsOfTioI" resolve="getText" />
+                                  <node concept="37vLTw" id="yHjyt5xH6_" role="37wK5m">
+                                    <ref role="3cqZAo" node="yHjyt5xH6m" resolve="macroHelper" />
                                   </node>
-                                  <node concept="3oM_SD" id="ATZLwXo0j2" role="1PaTwD">
-                                    <property role="3oM_SC" value="be" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1W57fq" id="yHjyt5xH6A" role="lGtFl">
+                      <node concept="3IZrLx" id="yHjyt5xH6B" role="3IZSJc">
+                        <node concept="3clFbS" id="yHjyt5xH6C" role="2VODD2">
+                          <node concept="3SKdUt" id="yHjyt5xH6D" role="3cqZAp">
+                            <node concept="1PaTwC" id="yHjyt5xH6E" role="1aUNEU">
+                              <node concept="3oM_SD" id="yHjyt5xH6F" role="1PaTwD">
+                                <property role="3oM_SC" value="in" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH6G" role="1PaTwD">
+                                <property role="3oM_SC" value="case" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH6H" role="1PaTwD">
+                                <property role="3oM_SC" value="there's" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH6I" role="1PaTwD">
+                                <property role="3oM_SC" value="reference" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH6J" role="1PaTwD">
+                                <property role="3oM_SC" value="to" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH6K" role="1PaTwD">
+                                <property role="3oM_SC" value="a" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH6L" role="1PaTwD">
+                                <property role="3oM_SC" value="macro" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH6M" role="1PaTwD">
+                                <property role="3oM_SC" value="variable," />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH6N" role="1PaTwD">
+                                <property role="3oM_SC" value="use" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH6O" role="1PaTwD">
+                                <property role="3oM_SC" value="`&lt;arg" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH6P" role="1PaTwD">
+                                <property role="3oM_SC" value="line&gt;`" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH6Q" role="1PaTwD">
+                                <property role="3oM_SC" value="attribute," />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3SKdUt" id="yHjyt5xH6R" role="3cqZAp">
+                            <node concept="1PaTwC" id="yHjyt5xH6S" role="1aUNEU">
+                              <node concept="3oM_SD" id="yHjyt5xH6T" role="1PaTwD">
+                                <property role="3oM_SC" value="otherwise," />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH6U" role="1PaTwD">
+                                <property role="3oM_SC" value="keep" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH6V" role="1PaTwD">
+                                <property role="3oM_SC" value="distinct" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH6W" role="1PaTwD">
+                                <property role="3oM_SC" value="`&lt;arg" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH6X" role="1PaTwD">
+                                <property role="3oM_SC" value="value&gt;`" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH6Y" role="1PaTwD">
+                                <property role="3oM_SC" value="to" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH6Z" role="1PaTwD">
+                                <property role="3oM_SC" value="generate" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH70" role="1PaTwD">
+                                <property role="3oM_SC" value="same" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH71" role="1PaTwD">
+                                <property role="3oM_SC" value="xml" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH72" role="1PaTwD">
+                                <property role="3oM_SC" value="files" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH73" role="1PaTwD">
+                                <property role="3oM_SC" value="as" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH74" role="1PaTwD">
+                                <property role="3oM_SC" value="before" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3SKdUt" id="yHjyt5xH75" role="3cqZAp">
+                            <node concept="1PaTwC" id="yHjyt5xH76" role="1aUNEU">
+                              <node concept="3oM_SD" id="yHjyt5xH77" role="1PaTwD">
+                                <property role="3oM_SC" value="FIXME" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH78" role="1PaTwD">
+                                <property role="3oM_SC" value="I" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH79" role="1PaTwD">
+                                <property role="3oM_SC" value="do" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7a" role="1PaTwD">
+                                <property role="3oM_SC" value="it" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7b" role="1PaTwD">
+                                <property role="3oM_SC" value="for" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7c" role="1PaTwD">
+                                <property role="3oM_SC" value="fun," />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7d" role="1PaTwD">
+                                <property role="3oM_SC" value="I" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7e" role="1PaTwD">
+                                <property role="3oM_SC" value="see" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7f" role="1PaTwD">
+                                <property role="3oM_SC" value="no" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7g" role="1PaTwD">
+                                <property role="3oM_SC" value="reason" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7h" role="1PaTwD">
+                                <property role="3oM_SC" value="not" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7i" role="1PaTwD">
+                                <property role="3oM_SC" value="to" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7j" role="1PaTwD">
+                                <property role="3oM_SC" value="use" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7k" role="1PaTwD">
+                                <property role="3oM_SC" value="jvmarg" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7l" role="1PaTwD">
+                                <property role="3oM_SC" value="line" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7m" role="1PaTwD">
+                                <property role="3oM_SC" value="universally" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7n" role="1PaTwD">
+                                <property role="3oM_SC" value="to" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7o" role="1PaTwD">
+                                <property role="3oM_SC" value="keep" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7p" role="1PaTwD">
+                                <property role="3oM_SC" value="this" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7q" role="1PaTwD">
+                                <property role="3oM_SC" value="code" />
+                              </node>
+                              <node concept="3oM_SD" id="yHjyt5xH7r" role="1PaTwD">
+                                <property role="3oM_SC" value="simple" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbF" id="yHjyt5xH7s" role="3cqZAp">
+                            <node concept="1Wc70l" id="yHjyt5xH7t" role="3clFbG">
+                              <node concept="3fqX7Q" id="yHjyt5xH7u" role="3uHU7w">
+                                <node concept="2OqwBi" id="yHjyt5xH7v" role="3fr31v">
+                                  <node concept="2OqwBi" id="yHjyt5xH7w" role="2Oq$k0">
+                                    <node concept="1iwH7S" id="yHjyt5xH7x" role="2Oq$k0" />
+                                    <node concept="1psM6Z" id="yHjyt5xH7y" role="2OqNvi">
+                                      <ref role="1psM6Y" node="yHjyt5xH5P" resolve="jvmargs" />
+                                    </node>
                                   </node>
-                                  <node concept="3oM_SD" id="ATZLwXo0j3" role="1PaTwD">
-                                    <property role="3oM_SC" value="distinguished" />
+                                  <node concept="liA8E" id="yHjyt5xH7z" role="2OqNvi">
+                                    <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
+                                    <node concept="Xl_RD" id="yHjyt5xH7$" role="37wK5m">
+                                      <property role="Xl_RC" value="$" />
+                                    </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbJ" id="7RPG7RvcbOE" role="3cqZAp">
-                                <node concept="3clFbS" id="7RPG7RvcbOH" role="3clFbx">
-                                  <node concept="3clFbF" id="7RPG7Rvd347" role="3cqZAp">
-                                    <node concept="37vLTI" id="7RPG7Rvd5fN" role="3clFbG">
-                                      <node concept="2OqwBi" id="7RPG7Rvd6U7" role="37vLTx">
-                                        <node concept="37vLTw" id="7RPG7Rvd6fv" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7RPG7RvcFqX" resolve="mpsAspect" />
-                                        </node>
-                                        <node concept="3TrcHB" id="7RPG7Rvd9r5" role="2OqNvi">
-                                          <ref role="3TsBF5" to="kdzh:6V3S4ekuLVH" resolve="generationMaxHeapSizeInMb" />
-                                        </node>
-                                      </node>
-                                      <node concept="37vLTw" id="7RPG7Rvd346" role="37vLTJ">
-                                        <ref role="3cqZAo" node="7RPG7Rvcc_H" resolve="heapSize" />
-                                      </node>
-                                    </node>
+                              <node concept="2OqwBi" id="yHjyt5xH7_" role="3uHU7B">
+                                <node concept="2OqwBi" id="yHjyt5xH7A" role="2Oq$k0">
+                                  <node concept="1iwH7S" id="yHjyt5xH7B" role="2Oq$k0" />
+                                  <node concept="1psM6Z" id="yHjyt5xH7C" role="2OqNvi">
+                                    <ref role="1psM6Y" node="yHjyt5xH5P" resolve="jvmargs" />
                                   </node>
                                 </node>
-                                <node concept="1Wc70l" id="7RPG7RvAv97" role="3clFbw">
-                                  <node concept="2OqwBi" id="7RPG7RvAxhH" role="3uHU7B">
-                                    <node concept="37vLTw" id="7RPG7RvAwai" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7RPG7RvcFqX" resolve="mpsAspect" />
-                                    </node>
-                                    <node concept="3x8VRR" id="7RPG7RvAzNd" role="2OqNvi" />
-                                  </node>
-                                  <node concept="1eOMI4" id="7RPG7RvAtAH" role="3uHU7w">
-                                    <node concept="2OqwBi" id="7RPG7RvAtAI" role="1eOMHV">
-                                      <node concept="2OqwBi" id="7RPG7RvAtAJ" role="2Oq$k0">
-                                        <node concept="2JrnkZ" id="7RPG7RvAtAK" role="2Oq$k0">
-                                          <node concept="37vLTw" id="7RPG7RvAtAL" role="2JrQYb">
-                                            <ref role="3cqZAo" node="7RPG7RvcFqX" resolve="mpsAspect" />
-                                          </node>
-                                        </node>
-                                        <node concept="liA8E" id="7RPG7RvAtAM" role="2OqNvi">
-                                          <ref role="37wK5l" to="mhbf:~SNode.getProperty(org.jetbrains.mps.openapi.language.SProperty)" resolve="getProperty" />
-                                          <node concept="355D3s" id="1Lb1CYjWaRi" role="37wK5m">
-                                            <ref role="355D3t" to="kdzh:5D0zVz80y2D" resolve="BuildMpsAspect" />
-                                            <ref role="355D3u" to="kdzh:6V3S4ekuLVH" resolve="generationMaxHeapSizeInMb" />
-                                          </node>
+                                <node concept="17RvpY" id="yHjyt5xH7D" role="2OqNvi" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="gft3U" id="yHjyt5xH7E" role="UU_$l">
+                        <node concept="2pNNFK" id="yHjyt5xH7F" role="gfFT$">
+                          <property role="2pNNFO" value="arg" />
+                          <property role="qg3DV" value="true" />
+                          <node concept="2pNUuL" id="yHjyt5xH7G" role="2pNNFR">
+                            <property role="2pNUuO" value="line" />
+                            <node concept="2pMdtt" id="yHjyt5xH7H" role="2pMdts">
+                              <node concept="17Uvod" id="yHjyt5xH7I" role="lGtFl">
+                                <property role="2qtEX9" value="text" />
+                                <property role="P4ACc" value="479c7a8c-02f9-43b5-9139-d910cb22f298/6666499814681541919/6666499814681541920" />
+                                <node concept="3zFVjK" id="yHjyt5xH7J" role="3zH0cK">
+                                  <node concept="3clFbS" id="yHjyt5xH7K" role="2VODD2">
+                                    <node concept="3clFbF" id="yHjyt5xH7L" role="3cqZAp">
+                                      <node concept="2OqwBi" id="yHjyt5xH7M" role="3clFbG">
+                                        <node concept="1iwH7S" id="yHjyt5xH7N" role="2Oq$k0" />
+                                        <node concept="1psM6Z" id="yHjyt5xH7O" role="2OqNvi">
+                                          <ref role="1psM6Y" node="yHjyt5xH5P" resolve="jvmargs" />
                                         </node>
                                       </node>
-                                      <node concept="17RvpY" id="7RPG7RvAtAO" role="2OqNvi" />
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="9aQIb" id="7RPG7Rvd2oa" role="9aQIa">
-                                  <node concept="3clFbS" id="7RPG7Rvd2ob" role="9aQI4">
-                                    <node concept="3SKdUt" id="7RPG7Rvdf7$" role="3cqZAp">
-                                      <node concept="1PaTwC" id="ATZLwXo0j4" role="1aUNEU">
-                                        <node concept="3oM_SD" id="ATZLwXo0j5" role="1PaTwD">
-                                          <property role="3oM_SC" value="default" />
-                                        </node>
-                                        <node concept="3oM_SD" id="ATZLwXo0j6" role="1PaTwD">
-                                          <property role="3oM_SC" value="size" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="3clFbF" id="7RPG7Rvdas5" role="3cqZAp">
-                                      <node concept="37vLTI" id="7RPG7RvddhL" role="3clFbG">
-                                        <node concept="3cmrfG" id="7RPG7Rvddzs" role="37vLTx">
-                                          <property role="3cmrfH" value="512" />
-                                        </node>
-                                        <node concept="37vLTw" id="7RPG7Rvdas4" role="37vLTJ">
-                                          <ref role="3cqZAo" node="7RPG7Rvcc_H" resolve="heapSize" />
-                                        </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1WS0z7" id="yHjyt5xH7P" role="lGtFl">
+                      <node concept="3JmXsc" id="yHjyt5xH7Q" role="3Jn$fo">
+                        <node concept="3clFbS" id="yHjyt5xH7R" role="2VODD2">
+                          <node concept="3cpWs8" id="yHjyt5xH7S" role="3cqZAp">
+                            <node concept="3cpWsn" id="yHjyt5xH7T" role="3cpWs9">
+                              <property role="TrG5h" value="rv" />
+                              <node concept="2I9FWS" id="yHjyt5xH7U" role="1tU5fm">
+                                <ref role="2I9WkF" to="kdzh:QkG2t1bKw$" resolve="GeneratorInternal_String" />
+                              </node>
+                              <node concept="2ShNRf" id="yHjyt5xH7V" role="33vP2m">
+                                <node concept="Tc6Ow" id="yHjyt5xH7W" role="2ShVmc" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2Gpval" id="yHjyt5xH7X" role="3cqZAp">
+                            <node concept="2GrKxI" id="yHjyt5xH7Y" role="2Gsz3X">
+                              <property role="TrG5h" value="s" />
+                            </node>
+                            <node concept="3clFbS" id="yHjyt5xH7Z" role="2LFqv$">
+                              <node concept="3cpWs8" id="yHjyt5xH80" role="3cqZAp">
+                                <node concept="3cpWsn" id="yHjyt5xH81" role="3cpWs9">
+                                  <property role="TrG5h" value="n" />
+                                  <node concept="3Tqbb2" id="yHjyt5xH82" role="1tU5fm">
+                                    <ref role="ehGHo" to="kdzh:QkG2t1bKw$" resolve="GeneratorInternal_String" />
+                                  </node>
+                                  <node concept="2ShNRf" id="yHjyt5xH83" role="33vP2m">
+                                    <node concept="3zrR0B" id="yHjyt5xH84" role="2ShVmc">
+                                      <node concept="3Tqbb2" id="yHjyt5xH85" role="3zrR0E">
+                                        <ref role="ehGHo" to="kdzh:QkG2t1bKw$" resolve="GeneratorInternal_String" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbH" id="7RPG7Rvc8aM" role="3cqZAp" />
-                              <node concept="3clFbF" id="7RPG7RvbWuK" role="3cqZAp">
-                                <node concept="3cpWs3" id="7RPG7Rvc2pM" role="3clFbG">
-                                  <node concept="Xl_RD" id="7RPG7Rvc2pR" role="3uHU7w">
-                                    <property role="Xl_RC" value="m" />
+                              <node concept="3clFbF" id="yHjyt5xH86" role="3cqZAp">
+                                <node concept="37vLTI" id="yHjyt5xH87" role="3clFbG">
+                                  <node concept="2GrUjf" id="yHjyt5xH88" role="37vLTx">
+                                    <ref role="2Gs0qQ" node="yHjyt5xH7Y" resolve="s" />
                                   </node>
-                                  <node concept="3cpWs3" id="7RPG7RvbXUo" role="3uHU7B">
-                                    <node concept="Xl_RD" id="7RPG7RvbWuJ" role="3uHU7B">
-                                      <property role="Xl_RC" value="-Xmx" />
+                                  <node concept="2OqwBi" id="yHjyt5xH89" role="37vLTJ">
+                                    <node concept="37vLTw" id="yHjyt5xH8a" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="yHjyt5xH81" resolve="n" />
                                     </node>
-                                    <node concept="37vLTw" id="7RPG7Rvc11z" role="3uHU7w">
-                                      <ref role="3cqZAo" node="7RPG7Rvcc_H" resolve="heapSize" />
+                                    <node concept="3TrcHB" id="yHjyt5xH8b" role="2OqNvi">
+                                      <ref role="3TsBF5" to="kdzh:QkG2t1bKwB" resolve="path" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2pNNFK" id="5VsGoLBnHa8" role="3o6s8t">
-                    <property role="qg3DV" value="true" />
-                    <property role="2pNNFO" value="arg" />
-                    <node concept="2pNUuL" id="5VsGoLBnHa9" role="2pNNFR">
-                      <property role="2pNUuO" value="value" />
-                      <node concept="2pMdtt" id="5VsGoLBnHaa" role="2pMdts">
-                        <property role="2pMdty" value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5071" />
-                        <node concept="17Uvod" id="5VsGoLBnHab" role="lGtFl">
-                          <property role="2qtEX9" value="text" />
-                          <property role="P4ACc" value="479c7a8c-02f9-43b5-9139-d910cb22f298/6666499814681541919/6666499814681541920" />
-                          <node concept="3zFVjK" id="5VsGoLBnHac" role="3zH0cK">
-                            <node concept="3clFbS" id="5VsGoLBnHad" role="2VODD2">
-                              <node concept="3clFbF" id="5VsGoLBnHae" role="3cqZAp">
-                                <node concept="2OqwBi" id="5VsGoLBnHaf" role="3clFbG">
-                                  <node concept="30H73N" id="5VsGoLBnHag" role="2Oq$k0" />
-                                  <node concept="3TrcHB" id="5VsGoLBnV4V" role="2OqNvi">
-                                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                              <node concept="3clFbF" id="yHjyt5xH8c" role="3cqZAp">
+                                <node concept="2OqwBi" id="yHjyt5xH8d" role="3clFbG">
+                                  <node concept="37vLTw" id="yHjyt5xH8e" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="yHjyt5xH7T" resolve="rv" />
+                                  </node>
+                                  <node concept="TSZUe" id="yHjyt5xH8f" role="2OqNvi">
+                                    <node concept="37vLTw" id="yHjyt5xH8g" role="25WWJ7">
+                                      <ref role="3cqZAo" node="yHjyt5xH81" resolve="n" />
+                                    </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="1WS0z7" id="5VsGoLBnHai" role="lGtFl">
-                      <node concept="3JmXsc" id="5VsGoLBnHaj" role="3Jn$fo">
-                        <node concept="3clFbS" id="5VsGoLBnHak" role="2VODD2">
-                          <node concept="3clFbF" id="5VsGoLBnNh$" role="3cqZAp">
-                            <node concept="2OqwBi" id="5VsGoLBnRfq" role="3clFbG">
-                              <node concept="2OqwBi" id="5VsGoLBnOzg" role="2Oq$k0">
-                                <node concept="30H73N" id="5VsGoLBnNhz" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="5VsGoLBnPFL" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="dc1n:38ougpFqnKp" resolve="jvmArgs" />
+                            <node concept="2OqwBi" id="yHjyt5xH8h" role="2GsD0m">
+                              <node concept="2OqwBi" id="yHjyt5xH8i" role="2Oq$k0">
+                                <node concept="1iwH7S" id="yHjyt5xH8j" role="2Oq$k0" />
+                                <node concept="1psM6Z" id="yHjyt5xH8k" role="2OqNvi">
+                                  <ref role="1psM6Y" node="yHjyt5xH5P" resolve="jvmargs" />
                                 </node>
                               </node>
-                              <node concept="3Tsc0h" id="5VsGoLBnSvf" role="2OqNvi">
-                                <ref role="3TtcxE" to="3ior:4gdvEeQzbDb" resolve="parts" />
+                              <node concept="liA8E" id="yHjyt5xH8l" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~String.split(java.lang.String,int)" resolve="split" />
+                                <node concept="Xl_RD" id="yHjyt5xH8m" role="37wK5m">
+                                  <property role="Xl_RC" value=" " />
+                                </node>
+                                <node concept="3cmrfG" id="yHjyt5xH8n" role="37wK5m">
+                                  <property role="3cmrfH" value="0" />
+                                </node>
                               </node>
                             </node>
                           </node>
+                          <node concept="3cpWs6" id="yHjyt5xH8o" role="3cqZAp">
+                            <node concept="37vLTw" id="yHjyt5xH8p" role="3cqZAk">
+                              <ref role="3cqZAo" node="yHjyt5xH7T" resolve="rv" />
+                            </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 14b3a9913..2687aef2f 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
@@ -15288,8 +15288,8 @@
       <property role="3MWwXZ" value="MainClass" />
       <ref role="30Vec$" node="5jJR9m7XASm" resolve="org.iets3.opensource.interpreterExecutor" />
       <node concept="NbPM2" id="5iD3V$BSj$B" role="1psgkv">
-        <node concept="3Mxwew" id="5iD3V$BSj$A" role="3MwsjC">
-          <property role="3MwjfP" value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5071" />
+        <node concept="3Mxwew" id="yHjyt5yb1m" role="3MwsjC">
+          <property role="3MwjfP" value="-Xss2048k -Xmx4096m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5071" />
         </node>
       </node>
       <node concept="398BVA" id="7Lttyc2W9kv" role="1YJTkC">