Extract test helper classes into separate redistributable module

.mps/modules.xml

@@ -13,6 +13,7 @@
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules.build/jetbrains.mps.coderules.build.msd" folder="coderules.build" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules.runtime/jetbrains.mps.coderules.runtime.msd" folder="coderules" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd" folder="coderules.test" />
+      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd" folder="typechecking.test" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd" folder="typechecking.test" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/jetbrains.mps.coderules.typechecking.testlang.sandbox.msd" folder="typechecking.test" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/jetbrains.mps.coderules.typechecking.ui.msd" folder="typechecking" />

build.xml

@@ -876,6 +876,73 @@
       <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.ui-models" prefix="module/models" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.testhelper.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.testhelper.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.coderules.testhelper.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.coderules.testhelper" type="solution" uuid="02473356-2f59-4de1-ba87-e88f9d606180">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
+          <module ref="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" kind="rt" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="rt" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="rt" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt" />
+          <module ref="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" kind="rt" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" kind="rt" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
+          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
+          <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
+          <module ref="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)" kind="cl" />
+          <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
+          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
+          <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
+          <module ref="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" kind="cl" />
+          <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="cl" />
+          <module ref="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
+        </dependencies>
+        <uses>
+          <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
+          <language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
+          <language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
+          <language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
+          <language id="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" />
+          <language id="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" />
+          <language id="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" />
+          <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
+          <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
+        </uses>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.coderules.testhelper-src.jar" descriptor="jetbrains.mps.coderules.testhelper.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.coderules.testhelper.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.testhelper" />
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.testhelper/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.testhelper.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.testhelper-models">
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.testhelper/models" includes="**/*.mps, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.coderules.testhelper-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.testhelper/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.testhelper-models" prefix="module/models" />
+    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.test.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.test.jar/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.coderules.test.jar/META-INF/module.xml">
@@ -1552,6 +1619,7 @@
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
           <module ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" kind="cl" />
           <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
+          <module ref="02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
           <module ref="f9bad4b1-59da-4f20-8feb-9f4cc4ad872e(jetbrains.mps.coderules.typechecking.testlang.sandbox)" kind="cl" />
           <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
@@ -1570,7 +1638,6 @@
           <language id="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" />
           <language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
           <language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
-          <language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
           <language id="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" />
           <language id="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" />
           <language id="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" />
@@ -1578,7 +1645,6 @@
           <language id="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" />
           <language id="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" />
           <language id="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" />
-          <language id="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" />
           <language id="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" />
           <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
           <language id="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" />
@@ -2514,6 +2580,73 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.logic-languageModels1" prefix="module/languageModels" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.logic-generator-template1" prefix="module/generator/template" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.testhelper.jar1" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.testhelper.jar1/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.coderules.testhelper.jar1/META-INF/module.xml">
+      <module namespace="jetbrains.mps.coderules.testhelper" type="solution" uuid="02473356-2f59-4de1-ba87-e88f9d606180">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
+          <module ref="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" kind="rt" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="rt" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="rt" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt" />
+          <module ref="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" kind="rt" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" kind="rt" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
+          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
+          <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
+          <module ref="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)" kind="cl" />
+          <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
+          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
+          <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
+          <module ref="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" kind="cl" />
+          <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="cl" />
+          <module ref="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
+        </dependencies>
+        <uses>
+          <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
+          <language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
+          <language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
+          <language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
+          <language id="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" />
+          <language id="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" />
+          <language id="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" />
+          <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
+          <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
+        </uses>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.coderules.testhelper-src.jar" descriptor="jetbrains.mps.coderules.testhelper.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.tmp}/default/jebtrains.mps.coderules-0.9-SNAPSHOT.zip/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.testhelper.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.testhelper" />
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.testhelper/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.testhelper.jar1" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.testhelper-models1">
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.testhelper/models" includes="**/*.mps, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.tmp}/default/jebtrains.mps.coderules-0.9-SNAPSHOT.zip/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.testhelper-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.testhelper/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.testhelper-models1" prefix="module/models" />
+    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.coderules.jar1" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.coderules.jar1/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.lang.coderules.jar1/META-INF/module.xml">
@@ -3186,7 +3319,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.jetbrains.mps.coderules.build, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking#01, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.coderules.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.typechecking.testlang, java.compile.jetbrains.mps.typechecking.testlang#3575255234175341581, java.compile.jetbrains.mps.coderules.typechecking.testlang.sandbox, java.compile.jetbrains.mps.coderules.typechecking.test, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.lang.controlflow, java.compile.jetbrains.mps.lang.controlflow#01, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.controlflow.ui, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.ui, java.compile.jetbrains.mps.coderules.test" />
+  <target name="compileJava" depends="java.compile.jetbrains.mps.coderules.build, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking#01, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.coderules.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.java.modules.cycle.2, java.compile.jetbrains.mps.coderules.testhelper, java.compile.jetbrains.mps.typechecking.testlang, java.compile.jetbrains.mps.typechecking.testlang#3575255234175341581, java.compile.jetbrains.mps.coderules.typechecking.testlang.sandbox, java.compile.jetbrains.mps.coderules.typechecking.test, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.lang.controlflow, java.compile.jetbrains.mps.lang.controlflow#01, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.controlflow.ui, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.ui, java.compile.jetbrains.mps.coderules.test" />
   
   <target name="processResources" />
   
@@ -3358,6 +3491,7 @@
         <module file="${basedir}/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl" />
       </chunk>
       <chunk>
+        <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/jetbrains.mps.coderules.typechecking.testlang.sandbox.msd" />
       </chunk>
@@ -4045,6 +4179,175 @@
     </javac>
   </target>
   
+  <target name="java.compile.java.modules.cycle.2" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.coderules.typechecking.testlang.sandbox, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.typechecking.testlang, fetchDependencies">
+    <mkdir dir="${build.tmp}/java.modules.cycle.2" />
+    <javac destdir="${build.tmp}/java.modules.cycle.2" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.testhelper/source_gen" />
+        <path location="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.test/source_gen" />
+        <pathelement path="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.test/test_gen/" />
+      </src>
+      <classpath>
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-context.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-references.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-test.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.2.18.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.3.7.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.14.jar" />
+        <fileset file="${artifacts.mps}/lib/junit4.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
+        <fileset file="${artifacts.mps}/lib/jdom.jar" />
+        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
+        <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking.testlang.sandbox" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.test" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang" />
+      </classpath>
+    </javac>
+  </target>
+  
+  <target name="java.compile.jetbrains.mps.coderules.testhelper" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.2, fetchDependencies">
+    <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.testhelper/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules.testhelper" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.coderules.testhelper" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.testhelper/source_gen" />
+      </src>
+      <classpath>
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-context.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-references.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking" />
+        <fileset file="${artifacts.mps}/lib/mps-test.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.2.18.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.3.7.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.14.jar" />
+        <fileset file="${artifacts.mps}/lib/junit4.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
+        <fileset file="${artifacts.mps}/lib/jdom.jar" />
+        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
+        <pathelement path="${build.tmp}/java.modules.cycle.2" />
+      </classpath>
+    </javac>
+  </target>
+  
   <target name="java.compile.jetbrains.mps.typechecking.testlang" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang" />
@@ -4171,7 +4474,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.coderules.typechecking.test" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.coderules.typechecking.testlang.sandbox, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.typechecking.testlang, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.coderules.typechecking.test" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.coderules.typechecking.testlang.sandbox, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.typechecking.testlang, java.compile.java.modules.cycle.2, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking.test" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -4255,6 +4558,7 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
+        <pathelement path="${build.tmp}/java.modules.cycle.2" />
       </classpath>
     </javac>
   </target>
@@ -5137,6 +5441,7 @@
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
       <pathelement location="${build.layout}/deploy/jetbrains.mps.coderules.jar" />
       <pathelement location="${build.layout}/deploy/jetbrains.mps.coderules.runtime.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.coderules.testhelper.jar" />
       <pathelement location="${build.layout}/deploy/jetbrains.mps.coderules.typechecking.jar" />
       <pathelement location="${build.layout}/deploy/jetbrains.mps.lang.coderules.jar" />
       <pathelement location="${build.layout}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
@@ -5233,6 +5538,7 @@
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/generator/source_gen" />
+    <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.testhelper/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.test/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.test/test_gen" />

coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps

@@ -1417,6 +1417,125 @@
           </node>
         </node>
       </node>
+      <node concept="1E1JtA" id="4XsNDZX1tUA" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="jetbrains.mps.coderules.testhelper" />
+        <property role="3LESm3" value="02473356-2f59-4de1-ba87-e88f9d606180" />
+        <node concept="55IIr" id="4XsNDZX1tUD" role="3LF7KH">
+          <node concept="2Ry0Ak" id="4XsNDZX1u0j" role="iGT6I">
+            <property role="2Ry0Am" value="coderules" />
+            <node concept="2Ry0Ak" id="4XsNDZX1u2C" role="2Ry0An">
+              <property role="2Ry0Am" value="solutions" />
+              <node concept="2Ry0Ak" id="4XsNDZX1u4X" role="2Ry0An">
+                <property role="2Ry0Am" value="jetbrains.mps.coderules.testhelper" />
+                <node concept="2Ry0Ak" id="4XsNDZX1u7i" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.coderules.testhelper.msd" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4XsNDZX1ud4" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX1ud5" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4XsNDZX1ud6" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX1ud7" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4XsNDZX1ud8" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX1ud9" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:ymnOULAU0H" resolve="jetbrains.mps.lang.test" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4XsNDZX1uda" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX1udb" role="1SiIV1">
+            <ref role="3bR37D" node="5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4XsNDZX1udc" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX1udd" role="1SiIV1">
+            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.coderules.typechecking" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4XsNDZX1ude" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX1udf" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4XsNDZX1udg" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX1udh" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6Lc2" resolve="jetbrains.mps.lang.typesystem" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4XsNDZX1udi" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX1udj" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4XsNDZX1udk" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX1udl" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4XsNDZX1udm" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX1udn" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4XsNDZX1udo" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX1udp" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4XsNDZX1udq" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX1udr" role="1SiIV1">
+            <ref role="3bR37D" node="7mB3viLwG3m" resolve="jetbrains.mps.coderules.typechecking.test" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4XsNDZX1uds" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX1udt" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4XsNDZX1udu" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX1udv" role="1SiIV1">
+            <ref role="3bR37D" node="NKt6yomVLS" resolve="jetbrains.mps.lang.typechecking.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4XsNDZX1udw" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX1udx" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUx6U" resolve="jetbrains.mps.lang.coderules" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="4XsNDZX1udG" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="4XsNDZX1udH" role="1HemKq">
+            <node concept="398BVA" id="4XsNDZX1udy" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="4XsNDZX1udz" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="4XsNDZX1ud$" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="4XsNDZX1ud_" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules.testhelper" />
+                    <node concept="2Ry0Ak" id="4XsNDZX1udA" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4XsNDZX1udI" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2G$12M" id="5pz4PwHqqGu" role="3989C9">
       <property role="TrG5h" value="typechecking-test" />
@@ -1749,6 +1868,11 @@
             <ref role="3bR37D" to="ffeo:ymnOULAU0H" resolve="jetbrains.mps.lang.test" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4XsNDZX1um2" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX1um3" role="1SiIV1">
+            <ref role="3bR37D" node="4XsNDZX1tUA" resolve="jetbrains.mps.coderules.testhelper" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="78H58oeeFzd" role="3989C9">
@@ -3173,6 +3297,9 @@
         <node concept="L2wRC" id="6Yb9hAqybAz" role="39821P">
           <ref role="L2wRA" node="6Yb9hAqy9L2" resolve="jetbrains.mps.coderules.ui" />
         </node>
+        <node concept="L2wRC" id="4XsNDZX1usk" role="39821P">
+          <ref role="L2wRA" node="4XsNDZX1tUA" resolve="jetbrains.mps.coderules.testhelper" />
+        </node>
         <node concept="L2wRC" id="1Lr58WFPiHz" role="39821P">
           <ref role="L2wRA" node="1Lr58WFO94R" resolve="jetbrains.mps.coderules.test" />
         </node>
@@ -3395,6 +3522,9 @@
             <node concept="L2wRC" id="65DJywFk8Gh" role="39821P">
               <ref role="L2wRA" node="7BVjoXzUxkQ" resolve="jetbrains.mps.logic" />
             </node>
+            <node concept="L2wRC" id="4XsNDZX1ux6" role="39821P">
+              <ref role="L2wRA" node="4XsNDZX1tUA" resolve="jetbrains.mps.coderules.testhelper" />
+            </node>
             <node concept="L2wRC" id="65DJywFk8jS" role="39821P">
               <ref role="L2wRA" node="7BVjoXzUx6U" resolve="jetbrains.mps.lang.coderules" />
             </node>

coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="jetbrains.mps.coderules.testhelper" uuid="02473356-2f59-4de1-ba87-e88f9d606180" moduleVersion="0" compileInMPS="true">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <facets>
+    <facet type="java">
+      <classes generated="true" path="${module}/classes_gen" />
+    </facet>
+  </facets>
+  <sourcePath />
+  <dependencies>
+    <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
+    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
+    <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
+    <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)</dependency>
+    <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
+    <dependency reexport="false">c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)</dependency>
+    <dependency reexport="false">8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)</dependency>
+    <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)</dependency>
+    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
+    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
+    <dependency reexport="false">f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)</dependency>
+    <dependency reexport="false">c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)</dependency>
+    <dependency reexport="false">7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</dependency>
+    <dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
+  </dependencies>
+  <languageVersions>
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
+    <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="1" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <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="17" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
+    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)" version="0" />
+    <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
+    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
+    <module reference="02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)" version="0" />
+    <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
+    <module reference="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
+    <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
+    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
+    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
+    <module reference="9e98f4e2-decf-4e97-bf80-9109e8b759aa(jetbrains.mps.lang.feedback.context)" version="0" />
+    <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+    <module reference="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+    <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
+    <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
+    <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
+    <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
+    <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
+  </dependencyVersions>
+</solution>
+

coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:20f81ae9-fed0-48fa-893d-6c6b658e3dee(jetbrains.mps.coderules.typechecking.test.util)">
+<model ref="r:a07b09f7-cbf3-40d9-ae10-40da3926c5fa(jetbrains.mps.coderules.testhelper.testutil)">
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>

coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd

@@ -31,6 +31,7 @@
     <dependency reexport="false">f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)</dependency>
+    <dependency reexport="false">02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
@@ -72,6 +73,7 @@
     <module reference="f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
     <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
+    <module reference="02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)" version="0" />
     <module reference="f9bad4b1-59da-4f20-8feb-9f4cc4ad872e(jetbrains.mps.coderules.typechecking.testlang.sandbox)" version="0" />

coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps

@@ -25,12 +25,12 @@
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="sppd" ref="r:0e60ac07-77c3-4d5c-b40d-73e8fd128592(jetbrains.mps.coderules.typechecking.testlang.sandbox.test)" />
     <import index="qulx" ref="r:ec0979fb-ae37-4823-9eaa-8550d9f5c6fd(jetbrains.mps.typechecking.testlang.structure)" />
-    <import index="hfva" ref="r:20f81ae9-fed0-48fa-893d-6c6b658e3dee(jetbrains.mps.coderules.typechecking.test.util)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="7ed7" ref="r:48788b84-8ecd-41f5-ad03-cc8c09b1f186(jetbrains.mps.lang.coderules.analysis)" />
     <import index="zuft" ref="r:65f97255-4bb1-4783-acd6-a4ed5a1088e2(jetbrains.mps.typechecking.testlang.types)" />
     <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
     <import index="psoy" ref="r:78313117-90ee-47a5-a91e-b5213df7f611(jetbrains.mps.coderules.runtime.result)" />
+    <import index="hmoe" ref="r:a07b09f7-cbf3-40d9-ae10-40da3926c5fa(jetbrains.mps.coderules.testhelper.testutil)" />
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" implicit="true" />
@@ -487,11 +487,11 @@
                 <node concept="3cpWsn" id="tyIfzC3OTC" role="3cpWs9">
                   <property role="TrG5h" value="launcher" />
                   <node concept="3uibUv" id="tyIfzC3OTD" role="1tU5fm">
-                    <ref role="3uigEE" to="hfva:tyIfzC0ZNj" resolve="IncrementalLauncher" />
+                    <ref role="3uigEE" to="hmoe:tyIfzC0ZNj" resolve="IncrementalLauncher" />
                   </node>
                   <node concept="2ShNRf" id="tyIfzC3Sr4" role="33vP2m">
                     <node concept="1pGfFk" id="tyIfzC3Sr3" role="2ShVmc">
-                      <ref role="37wK5l" to="hfva:WJTIIoUgQU" resolve="CollectingIncrementalLauncher" />
+                      <ref role="37wK5l" to="hmoe:WJTIIoUgQU" resolve="CollectingIncrementalLauncher" />
                       <node concept="37vLTw" id="tyIfzC3W$o" role="37wK5m">
                         <ref role="3cqZAo" node="tyIfzC3L6a" resolve="repo" />
                       </node>
@@ -523,7 +523,7 @@
                       <ref role="3cqZAo" node="tyIfzC3OTC" resolve="launcher" />
                     </node>
                     <node concept="liA8E" id="tyIfzC4y1T" role="2OqNvi">
-                      <ref role="37wK5l" to="hfva:tyIfzC3x3f" resolve="produceProgram" />
+                      <ref role="37wK5l" to="hmoe:tyIfzC3x3f" resolve="produceProgram" />
                       <node concept="2ShNRf" id="3j46jeGDMzS" role="37wK5m">
                         <node concept="2HTt$P" id="3j46jeGDOff" role="2ShVmc">
                           <node concept="3Tqbb2" id="3j46jeGDOmu" role="2HTBi0" />
@@ -537,7 +537,7 @@
                           <ref role="3cqZAo" node="tyIfzC3OTC" resolve="launcher" />
                         </node>
                         <node concept="liA8E" id="3j46jeGQWI$" role="2OqNvi">
-                          <ref role="37wK5l" to="hfva:3j46jeGMWII" resolve="getCheckQuery" />
+                          <ref role="37wK5l" to="hmoe:3j46jeGMWII" resolve="getCheckQuery" />
                         </node>
                       </node>
                     </node>
@@ -561,7 +561,7 @@
                       <ref role="3cqZAo" node="tyIfzC3OTC" resolve="launcher" />
                     </node>
                     <node concept="liA8E" id="4VntlICnMya" role="2OqNvi">
-                      <ref role="37wK5l" to="hfva:4VntlICnjoD" resolve="getProgramSpec" />
+                      <ref role="37wK5l" to="hmoe:4VntlICnjoD" resolve="getProgramSpec" />
                     </node>
                   </node>
                   <node concept="37vLTw" id="4VntlICnIU3" role="37vLTJ">

samples/fitch/build.xml

@@ -24,6 +24,7 @@
   <property name="mpsBootstrapCore.version.eap" value="${import.mps.mpsBootstrapCore.version.eap}" />
   <property name="mpsBootstrapCore.version" value="${import.mps.mpsBootstrapCore.version}" />
   <property name="coderules.ci.build.num" value="${import.coderules.coderules.ci.build.num}" />
+  <property name="coderules.ci.mps.release" value="${import.coderules.coderules.ci.mps.release}" />
   <property name="coderules.test.jvmargs" value="${import.coderules.coderules.test.jvmargs}" />
   <property name="environment" value="env" />
   <property name="env.JAVA_HOME" value="${java.home}/.." />
@@ -787,7 +788,7 @@
       <zipfileset file="${basedir}/solutions/samples.fitch.demo/samples.fitch.demo.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-samples.fitch.demo-models" prefix="module/models" />
     </jar>
-    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}coderules.ci.build.num=${coderules.ci.build.num}${line.separator}coderules.test.jvmargs=${coderules.test.jvmargs}</echo>
+    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}coderules.ci.build.num=${coderules.ci.build.num}${line.separator}coderules.ci.mps.release=${coderules.ci.mps.release}${line.separator}coderules.test.jvmargs=${coderules.test.jvmargs}</echo>
   </target>
   
   <target name="buildDependents" />

samples/lambdacalc/build.xml

@@ -24,6 +24,7 @@
   <property name="mpsBootstrapCore.version.eap" value="${import.mps.mpsBootstrapCore.version.eap}" />
   <property name="mpsBootstrapCore.version" value="${import.mps.mpsBootstrapCore.version}" />
   <property name="coderules.ci.build.num" value="${import.coderules.coderules.ci.build.num}" />
+  <property name="coderules.ci.mps.release" value="${import.coderules.coderules.ci.mps.release}" />
   <property name="coderules.test.jvmargs" value="${import.coderules.coderules.test.jvmargs}" />
   <property name="environment" value="env" />
   <property name="env.JAVA_HOME" value="${java.home}/.." />
@@ -182,6 +183,7 @@
           <module ref="e55e6749-03cb-4ea7-9695-2322bab791c1(jetbrains.mps.lang.test.matcher)" kind="rt" />
           <module ref="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
+          <module ref="02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
           <module ref="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)" kind="cl" />
           <module ref="af858d84-85f2-42f4-a854-0b3c6b5cd482(samples.lambdacalc)" kind="cl" />
@@ -221,7 +223,7 @@
       <zipfileset file="${basedir}/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-samples.lambdacalc.demo-models" prefix="module/models" />
     </jar>
-    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}coderules.ci.build.num=${coderules.ci.build.num}${line.separator}coderules.test.jvmargs=${coderules.test.jvmargs}</echo>
+    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}coderules.ci.build.num=${coderules.ci.build.num}${line.separator}coderules.ci.mps.release=${coderules.ci.mps.release}${line.separator}coderules.test.jvmargs=${coderules.test.jvmargs}</echo>
   </target>
   
   <target name="buildDependents" />
@@ -254,6 +256,7 @@
       <plugin path="${artifacts.mps}/plugins/mps-testing" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.runtime.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.testhelper.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.test.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.testlang.sandbox.jar" />
@@ -525,6 +528,7 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.testhelper.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.test.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
@@ -550,6 +554,7 @@
     <path id="mps.libraries.path">
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.runtime.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.testhelper.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.test.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.testlang.sandbox.jar" />

samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps

@@ -299,6 +299,11 @@
             <ref role="3bR37D" to="zqd8:7mB3viLwG3m" resolve="jetbrains.mps.coderules.typechecking.test" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4XsNDZX9sdp" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX9sdq" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:4XsNDZX1tUA" resolve="jetbrains.mps.coderules.testhelper" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2sgV4H" id="7E7FS_VaV_9" role="1l3spa">

samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.incremental@tests.mps

@@ -15,7 +15,7 @@
     <import index="ysck" ref="r:64f472af-c4b1-4900-9ea3-aec5c51b6e6e(samples.lambdacalc.demo)" />
     <import index="8tt8" ref="r:e74c1bfc-387b-4b4b-abee-2eb77ee510ec(samples.lambdacalc.structure)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.coderules.typechecking.service)" />
-    <import index="hfva" ref="r:20f81ae9-fed0-48fa-893d-6c6b658e3dee(jetbrains.mps.coderules.typechecking.test.util)" />
+    <import index="hmoe" ref="r:a07b09f7-cbf3-40d9-ae10-40da3926c5fa(jetbrains.mps.coderules.testhelper.testutil)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
@@ -346,14 +346,14 @@
                                                   <node concept="2OqwBi" id="5SC$dmoGuA8" role="2Oq$k0">
                                                     <node concept="2OqwBi" id="5SC$dmoGuA9" role="2Oq$k0">
                                                       <node concept="2YIFZM" id="5SC$dmoGuAa" role="2Oq$k0">
-                                                        <ref role="1Pybhc" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                                                        <ref role="1Pybhc" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
-                                                        <ref role="37wK5l" to="hfva:WJTIIokwcy" resolve="forCheck" />
+                                                        <ref role="37wK5l" to="hmoe:WJTIIokwcy" resolve="forCheck" />
                                                         <node concept="3xONca" id="5SC$dmoGzSg" role="37wK5m">
                                                           <ref role="3xOPvv" node="5SC$dmoGrxF" resolve="Demo1" />
                                                         </node>
                                                       </node>
                                                       <node concept="liA8E" id="5SC$dmoGuAc" role="2OqNvi">
-                                                        <ref role="37wK5l" to="hfva:5SC$dmosfAW" resolve="customMatcher" />
+                                                        <ref role="37wK5l" to="hmoe:5SC$dmosfAW" resolve="customMatcher" />
                                                         <node concept="1bVj0M" id="5SC$dmoGuAd" role="37wK5m">
                                                           <node concept="3clFbS" id="5SC$dmoGuAe" role="1bW5cS">
                                                             <node concept="3clFbF" id="5SC$dmoGuAf" role="3cqZAp">
@@ -369,11 +369,11 @@
                                                       </node>
                                                     </node>
                                                     <node concept="liA8E" id="5SC$dmoGuAj" role="2OqNvi">
-                                                      <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                                                      <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                                                     </node>
                                                   </node>
                                                   <node concept="liA8E" id="5SC$dmoGuAk" role="2OqNvi">
-                                                    <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                                    <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                                     <node concept="3xONca" id="5SC$dmoG$x0" role="37wK5m">
                                                       <ref role="3xOPvv" node="5SC$dmoGry9" resolve="zapp" />
                                                     </node>
@@ -383,7 +383,7 @@
                                                   </node>
                                                 </node>
                                                 <node concept="liA8E" id="4MWjU0Nkg23" role="2OqNvi">
-                                                  <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                                  <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                                   <node concept="2OqwBi" id="4MWjU0NkJ3F" role="37wK5m">
                                                     <node concept="3xONca" id="4MWjU0Nkhbw" role="2Oq$k0">
                                                       <ref role="3xOPvv" node="4MWjU0Nkf8p" resolve="z_lvb" />
@@ -398,7 +398,7 @@
                                                 </node>
                                               </node>
                                               <node concept="liA8E" id="5SC$dmoGuAq" role="2OqNvi">
-                                                <ref role="37wK5l" to="hfva:3j46jeGYR4z" resolve="subtest" />
+                                                <ref role="37wK5l" to="hmoe:3j46jeGYR4z" resolve="subtest" />
                                                 <node concept="Xl_RD" id="5SC$dmoGuAr" role="37wK5m">
                                                   <property role="Xl_RC" value="replace correct" />
                                                 </node>
@@ -406,7 +406,7 @@
                                                   <node concept="37vLTG" id="5SC$dmoGuAt" role="1bW2Oz">
                                                     <property role="TrG5h" value="tester" />
                                                     <node concept="3uibUv" id="5SC$dmoGuAu" role="1tU5fm">
-                                                      <ref role="3uigEE" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                                                      <ref role="3uigEE" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                                                     </node>
                                                   </node>
                                                   <node concept="3clFbS" id="5SC$dmoGuAv" role="1bW5cS">
@@ -444,15 +444,15 @@
                                               </node>
                                             </node>
                                             <node concept="liA8E" id="5SC$dmoGuAO" role="2OqNvi">
-                                              <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                                              <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                                             </node>
                                           </node>
                                           <node concept="liA8E" id="5SC$dmoGuAP" role="2OqNvi">
-                                            <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                                            <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                                           </node>
                                         </node>
                                         <node concept="liA8E" id="5SC$dmoGDfS" role="2OqNvi">
-                                          <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                          <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                           <node concept="3xONca" id="5SC$dmoGFsG" role="37wK5m">
                                             <ref role="3xOPvv" node="5SC$dmoGry9" resolve="zapp" />
                                           </node>
@@ -467,7 +467,7 @@
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="4MWjU0Nkj8u" role="2OqNvi">
-                                        <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                        <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                         <node concept="2OqwBi" id="4MWjU0NkMad" role="37wK5m">
                                           <node concept="3xONca" id="4MWjU0Nkkl8" role="2Oq$k0">
                                             <ref role="3xOPvv" node="4MWjU0Nkf8p" resolve="z_lvb" />
@@ -492,11 +492,11 @@
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="5SC$dmoGuAQ" role="2OqNvi">
-                                      <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                                      <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="4MWjU0NjCcb" role="2OqNvi">
-                                    <ref role="37wK5l" to="hfva:3j46jeGYR4z" resolve="subtest" />
+                                    <ref role="37wK5l" to="hmoe:3j46jeGYR4z" resolve="subtest" />
                                     <node concept="Xl_RD" id="4MWjU0NjCcc" role="37wK5m">
                                       <property role="Xl_RC" value="replace another correct" />
                                     </node>
@@ -504,7 +504,7 @@
                                       <node concept="37vLTG" id="4MWjU0NjCce" role="1bW2Oz">
                                         <property role="TrG5h" value="tester" />
                                         <node concept="3uibUv" id="4MWjU0NjCcf" role="1tU5fm">
-                                          <ref role="3uigEE" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                                          <ref role="3uigEE" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                                         </node>
                                       </node>
                                       <node concept="3clFbS" id="4MWjU0NjCcg" role="1bW5cS">
@@ -542,15 +542,15 @@
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="4MWjU0NjGYF" role="2OqNvi">
-                                  <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                                  <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                                 </node>
                               </node>
                               <node concept="liA8E" id="4MWjU0NjJN3" role="2OqNvi">
-                                <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                                <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                               </node>
                             </node>
                             <node concept="liA8E" id="4MWjU0NjLP$" role="2OqNvi">
-                              <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                              <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                               <node concept="3xONca" id="4MWjU0NjNy6" role="37wK5m">
                                 <ref role="3xOPvv" node="5SC$dmoGry9" resolve="zapp" />
                               </node>
@@ -567,7 +567,7 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="4MWjU0NkmXm" role="2OqNvi">
-                            <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                            <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                             <node concept="2OqwBi" id="4MWjU0NkSQg" role="37wK5m">
                               <node concept="3xONca" id="4MWjU0Nkodg" role="2Oq$k0">
                                 <ref role="3xOPvv" node="4MWjU0Nkf8p" resolve="z_lvb" />
@@ -594,11 +594,11 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="4MWjU0NjQOF" role="2OqNvi">
-                          <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                          <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                         </node>
                       </node>
                       <node concept="liA8E" id="5SC$dmoGuBb" role="2OqNvi">
-                        <ref role="37wK5l" to="hfva:3j46jeGYR4z" resolve="subtest" />
+                        <ref role="37wK5l" to="hmoe:3j46jeGYR4z" resolve="subtest" />
                         <node concept="Xl_RD" id="5SC$dmoGuBc" role="37wK5m">
                           <property role="Xl_RC" value="replace back correct" />
                         </node>
@@ -606,7 +606,7 @@
                           <node concept="37vLTG" id="5SC$dmoGuBe" role="1bW2Oz">
                             <property role="TrG5h" value="tester" />
                             <node concept="3uibUv" id="5SC$dmoGuBf" role="1tU5fm">
-                              <ref role="3uigEE" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                              <ref role="3uigEE" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                             </node>
                           </node>
                           <node concept="3clFbS" id="5SC$dmoGuBg" role="1bW5cS">
@@ -644,15 +644,15 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="5SC$dmoGuBs" role="2OqNvi">
-                      <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                      <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                     </node>
                   </node>
                   <node concept="liA8E" id="5SC$dmoGuBt" role="2OqNvi">
-                    <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                    <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                   </node>
                 </node>
                 <node concept="liA8E" id="5SC$dmoGuBu" role="2OqNvi">
-                  <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                  <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                   <node concept="3xONca" id="5SC$dmoH1$h" role="37wK5m">
                     <ref role="3xOPvv" node="5SC$dmoGry9" resolve="zapp" />
                   </node>
@@ -662,7 +662,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4MWjU0Nkq7A" role="2OqNvi">
-                <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                 <node concept="2OqwBi" id="4MWjU0NkTRm" role="37wK5m">
                   <node concept="3xONca" id="4MWjU0Nkq7B" role="2Oq$k0">
                     <ref role="3xOPvv" node="4MWjU0Nkf8p" resolve="z_lvb" />
@@ -677,7 +677,7 @@
               </node>
             </node>
             <node concept="liA8E" id="5SC$dmoGuB$" role="2OqNvi">
-              <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+              <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
             </node>
           </node>
         </node>
@@ -713,14 +713,14 @@
                                                       <node concept="2OqwBi" id="1DIG_2lKXcb" role="2Oq$k0">
                                                         <node concept="2OqwBi" id="1DIG_2lKXcc" role="2Oq$k0">
                                                           <node concept="2YIFZM" id="1DIG_2lKXcd" role="2Oq$k0">
-                                                            <ref role="1Pybhc" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                                                            <ref role="1Pybhc" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
-                                                            <ref role="37wK5l" to="hfva:WJTIIokwcy" resolve="forCheck" />
+                                                            <ref role="37wK5l" to="hmoe:WJTIIokwcy" resolve="forCheck" />
                                                             <node concept="3xONca" id="1DIG_2lKXce" role="37wK5m">
                                                               <ref role="3xOPvv" node="5SC$dmoGrxF" resolve="Demo1" />
                                                             </node>
                                                           </node>
                                                           <node concept="liA8E" id="1DIG_2lKXcf" role="2OqNvi">
-                                                            <ref role="37wK5l" to="hfva:5SC$dmosfAW" resolve="customMatcher" />
+                                                            <ref role="37wK5l" to="hmoe:5SC$dmosfAW" resolve="customMatcher" />
                                                             <node concept="1bVj0M" id="1DIG_2lKXcg" role="37wK5m">
                                                               <node concept="3clFbS" id="1DIG_2lKXch" role="1bW5cS">
                                                                 <node concept="3clFbF" id="1DIG_2lKXci" role="3cqZAp">
@@ -736,11 +736,11 @@
                                                           </node>
                                                         </node>
                                                         <node concept="liA8E" id="1DIG_2lKXcm" role="2OqNvi">
-                                                          <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                                                          <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                                                         </node>
                                                       </node>
                                                       <node concept="liA8E" id="1DIG_2lKXcn" role="2OqNvi">
-                                                        <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                                        <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                                         <node concept="3xONca" id="1DIG_2lKXco" role="37wK5m">
                                                           <ref role="3xOPvv" node="5SC$dmoGry9" resolve="zapp" />
                                                         </node>
@@ -750,7 +750,7 @@
                                                       </node>
                                                     </node>
                                                     <node concept="liA8E" id="1DIG_2lKXcr" role="2OqNvi">
-                                                      <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                                      <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                                       <node concept="2OqwBi" id="1DIG_2lKXcs" role="37wK5m">
                                                         <node concept="3xONca" id="1DIG_2lKXct" role="2Oq$k0">
                                                           <ref role="3xOPvv" node="4MWjU0Nkf8p" resolve="z_lvb" />
@@ -765,7 +765,7 @@
                                                     </node>
                                                   </node>
                                                   <node concept="liA8E" id="1DIG_2lKXcx" role="2OqNvi">
-                                                    <ref role="37wK5l" to="hfva:3j46jeGYR4z" resolve="subtest" />
+                                                    <ref role="37wK5l" to="hmoe:3j46jeGYR4z" resolve="subtest" />
                                                     <node concept="Xl_RD" id="1DIG_2lKXcy" role="37wK5m">
                                                       <property role="Xl_RC" value="replace fun" />
                                                     </node>
@@ -773,7 +773,7 @@
                                                       <node concept="37vLTG" id="1DIG_2lKXc$" role="1bW2Oz">
                                                         <property role="TrG5h" value="tester" />
                                                         <node concept="3uibUv" id="1DIG_2lKXc_" role="1tU5fm">
-                                                          <ref role="3uigEE" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                                                          <ref role="3uigEE" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                                                         </node>
                                                       </node>
                                                       <node concept="3clFbS" id="1DIG_2lKXcA" role="1bW5cS">
@@ -811,15 +811,15 @@
                                                   </node>
                                                 </node>
                                                 <node concept="liA8E" id="1DIG_2lKXcO" role="2OqNvi">
-                                                  <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                                                  <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                                                 </node>
                                               </node>
                                               <node concept="liA8E" id="1DIG_2lKXcP" role="2OqNvi">
-                                                <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                                                <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                                               </node>
                                             </node>
                                             <node concept="liA8E" id="1DIG_2lLhyE" role="2OqNvi">
-                                              <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                              <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                               <node concept="2OqwBi" id="1DIG_2lLjV0" role="37wK5m">
                                                 <node concept="3xONca" id="1DIG_2lLjDX" role="2Oq$k0">
                                                   <ref role="3xOPvv" node="5SC$dmoGry9" resolve="zapp" />
@@ -837,7 +837,7 @@
                                             </node>
                                           </node>
                                           <node concept="liA8E" id="1DIG_2lKXcQ" role="2OqNvi">
-                                            <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                            <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                             <node concept="3xONca" id="1DIG_2lKXcR" role="37wK5m">
                                               <ref role="3xOPvv" node="5SC$dmoGry9" resolve="zapp" />
                                             </node>
@@ -847,7 +847,7 @@
                                           </node>
                                         </node>
                                         <node concept="liA8E" id="1DIG_2lKXcW" role="2OqNvi">
-                                          <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                          <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                           <node concept="2OqwBi" id="1DIG_2lKXcX" role="37wK5m">
                                             <node concept="3xONca" id="1DIG_2lKXcY" role="2Oq$k0">
                                               <ref role="3xOPvv" node="4MWjU0Nkf8p" resolve="z_lvb" />
@@ -862,11 +862,11 @@
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="1DIG_2lKXd6" role="2OqNvi">
-                                        <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                                        <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="1DIG_2lKXd7" role="2OqNvi">
-                                      <ref role="37wK5l" to="hfva:3j46jeGYR4z" resolve="subtest" />
+                                      <ref role="37wK5l" to="hmoe:3j46jeGYR4z" resolve="subtest" />
                                       <node concept="Xl_RD" id="1DIG_2lKXd8" role="37wK5m">
                                         <property role="Xl_RC" value="replace arg" />
                                       </node>
@@ -874,7 +874,7 @@
                                         <node concept="37vLTG" id="1DIG_2lKXda" role="1bW2Oz">
                                           <property role="TrG5h" value="tester" />
                                           <node concept="3uibUv" id="1DIG_2lKXdb" role="1tU5fm">
-                                            <ref role="3uigEE" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                                            <ref role="3uigEE" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                                           </node>
                                         </node>
                                         <node concept="3clFbS" id="1DIG_2lKXdc" role="1bW5cS">
@@ -912,15 +912,15 @@
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="1DIG_2lKXdq" role="2OqNvi">
-                                    <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                                    <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="1DIG_2lKXdr" role="2OqNvi">
-                                  <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                                  <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                                 </node>
                               </node>
                               <node concept="liA8E" id="1DIG_2lKXds" role="2OqNvi">
-                                <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                 <node concept="3xONca" id="1DIG_2lKXdt" role="37wK5m">
                                   <ref role="3xOPvv" node="5SC$dmoGry9" resolve="zapp" />
                                 </node>
@@ -930,7 +930,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="1DIG_2lKXdy" role="2OqNvi">
-                              <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                              <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                               <node concept="2OqwBi" id="1DIG_2lKXdz" role="37wK5m">
                                 <node concept="3xONca" id="1DIG_2lKXd$" role="2Oq$k0">
                                   <ref role="3xOPvv" node="4MWjU0Nkf8p" resolve="z_lvb" />
@@ -945,11 +945,11 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="1DIG_2lKXdG" role="2OqNvi">
-                            <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                            <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                           </node>
                         </node>
                         <node concept="liA8E" id="1DIG_2lKXdH" role="2OqNvi">
-                          <ref role="37wK5l" to="hfva:3j46jeGYR4z" resolve="subtest" />
+                          <ref role="37wK5l" to="hmoe:3j46jeGYR4z" resolve="subtest" />
                           <node concept="Xl_RD" id="1DIG_2lKXdI" role="37wK5m">
                             <property role="Xl_RC" value="replace back correct" />
                           </node>
@@ -957,7 +957,7 @@
                             <node concept="37vLTG" id="1DIG_2lKXdK" role="1bW2Oz">
                               <property role="TrG5h" value="tester" />
                               <node concept="3uibUv" id="1DIG_2lKXdL" role="1tU5fm">
-                                <ref role="3uigEE" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                                <ref role="3uigEE" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                               </node>
                             </node>
                             <node concept="3clFbS" id="1DIG_2lKXdM" role="1bW5cS">
@@ -995,15 +995,15 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="1DIG_2lKXe0" role="2OqNvi">
-                        <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                        <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                       </node>
                     </node>
                     <node concept="liA8E" id="1DIG_2lKXe1" role="2OqNvi">
-                      <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                      <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                     </node>
                   </node>
                   <node concept="liA8E" id="1DIG_2lLOCY" role="2OqNvi">
-                    <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                    <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                     <node concept="2OqwBi" id="1DIG_2lLT3p" role="37wK5m">
                       <node concept="3xONca" id="1DIG_2lLS0s" role="2Oq$k0">
                         <ref role="3xOPvv" node="5SC$dmoGry9" resolve="zapp" />
@@ -1027,7 +1027,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="1DIG_2lKXe2" role="2OqNvi">
-                  <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                  <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                   <node concept="3xONca" id="1DIG_2lKXe3" role="37wK5m">
                     <ref role="3xOPvv" node="5SC$dmoGry9" resolve="zapp" />
                   </node>
@@ -1040,7 +1040,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="1DIG_2lKXe6" role="2OqNvi">
-                <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                 <node concept="2OqwBi" id="1DIG_2lKXe7" role="37wK5m">
                   <node concept="3xONca" id="1DIG_2lKXe8" role="2Oq$k0">
                     <ref role="3xOPvv" node="4MWjU0Nkf8p" resolve="z_lvb" />
@@ -1058,7 +1058,7 @@
               </node>
             </node>
             <node concept="liA8E" id="1DIG_2lKXec" role="2OqNvi">
-              <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+              <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
             </node>
           </node>
         </node>
@@ -1295,14 +1295,14 @@
                                       <node concept="2OqwBi" id="5SC$dmorcvH" role="2Oq$k0">
                                         <node concept="2OqwBi" id="5SC$dmosAdQ" role="2Oq$k0">
                                           <node concept="2YIFZM" id="5SC$dmor024" role="2Oq$k0">
-                                            <ref role="37wK5l" to="hfva:WJTIIokwcy" resolve="forCheck" />
+                                            <ref role="37wK5l" to="hmoe:WJTIIokwcy" resolve="forCheck" />
-                                            <ref role="1Pybhc" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                                            <ref role="1Pybhc" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                                             <node concept="3xONca" id="5SC$dmotsbI" role="37wK5m">
                                               <ref role="3xOPvv" node="5SC$dmor04k" resolve="Fix" />
                                             </node>
                                           </node>
                                           <node concept="liA8E" id="5SC$dmosAtr" role="2OqNvi">
-                                            <ref role="37wK5l" to="hfva:5SC$dmosfAW" resolve="customMatcher" />
+                                            <ref role="37wK5l" to="hmoe:5SC$dmosfAW" resolve="customMatcher" />
                                             <node concept="1bVj0M" id="5SC$dmoBQZX" role="37wK5m">
                                               <node concept="3clFbS" id="5SC$dmoBQZY" role="1bW5cS">
                                                 <node concept="3clFbF" id="5SC$dmoBRiQ" role="3cqZAp">
@@ -1318,11 +1318,11 @@
                                           </node>
                                         </node>
                                         <node concept="liA8E" id="5SC$dmordh1" role="2OqNvi">
-                                          <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                                          <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="5SC$dmoraXP" role="2OqNvi">
-                                        <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                        <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                         <node concept="3xONca" id="5SC$dmo_5LV" role="37wK5m">
                                           <ref role="3xOPvv" node="5SC$dmotUr$" resolve="fix_app1" />
                                         </node>
@@ -1339,7 +1339,7 @@
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="5SC$dmoEEqE" role="2OqNvi">
-                                      <ref role="37wK5l" to="hfva:3j46jeGYR4z" resolve="subtest" />
+                                      <ref role="37wK5l" to="hmoe:3j46jeGYR4z" resolve="subtest" />
                                       <node concept="Xl_RD" id="5SC$dmoEEBt" role="37wK5m">
                                         <property role="Xl_RC" value="replace correct" />
                                       </node>
@@ -1347,7 +1347,7 @@
                                         <node concept="37vLTG" id="5SC$dmoEF$x" role="1bW2Oz">
                                           <property role="TrG5h" value="tester" />
                                           <node concept="3uibUv" id="5SC$dmoEFEN" role="1tU5fm">
-                                            <ref role="3uigEE" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                                            <ref role="3uigEE" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                                           </node>
                                         </node>
                                         <node concept="3clFbS" id="5SC$dmoEFlJ" role="1bW5cS">
@@ -1399,19 +1399,19 @@
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="5SC$dmoEKxn" role="2OqNvi">
-                                    <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                                    <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="5SC$dmoEZ1S" role="2OqNvi">
-                                  <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                                  <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                                 </node>
                               </node>
                               <node concept="liA8E" id="5SC$dmoF0eU" role="2OqNvi">
-                                <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                                <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                               </node>
                             </node>
                             <node concept="liA8E" id="5SC$dmoF1mC" role="2OqNvi">
-                              <ref role="37wK5l" to="hfva:3j46jeGYR4z" resolve="subtest" />
+                              <ref role="37wK5l" to="hmoe:3j46jeGYR4z" resolve="subtest" />
                               <node concept="Xl_RD" id="5SC$dmoF1Ja" role="37wK5m">
                                 <property role="Xl_RC" value="replace incorrect" />
                               </node>
@@ -1419,7 +1419,7 @@
                                 <node concept="37vLTG" id="5SC$dmoF2Ks" role="1bW2Oz">
                                   <property role="TrG5h" value="tester" />
                                   <node concept="3uibUv" id="5SC$dmoF2Kt" role="1tU5fm">
-                                    <ref role="3uigEE" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                                    <ref role="3uigEE" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                                   </node>
                                 </node>
                                 <node concept="3clFbS" id="5SC$dmoF2Ku" role="1bW5cS">
@@ -1447,22 +1447,22 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="5SC$dmoF7VA" role="2OqNvi">
-                            <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                            <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                           </node>
                         </node>
                         <node concept="liA8E" id="5SC$dmoF9yq" role="2OqNvi">
-                          <ref role="37wK5l" to="hfva:WJTIIomjLv" resolve="ensureFailed" />
+                          <ref role="37wK5l" to="hmoe:WJTIIomjLv" resolve="ensureFailed" />
                           <node concept="3xONca" id="5SC$dmoF9Y3" role="37wK5m">
                             <ref role="3xOPvv" node="5SC$dmotUr$" resolve="fix_app1" />
                           </node>
                         </node>
                       </node>
                       <node concept="liA8E" id="5SC$dmoFdaM" role="2OqNvi">
-                        <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                        <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                       </node>
                     </node>
                     <node concept="liA8E" id="5SC$dmoFDMl" role="2OqNvi">
-                      <ref role="37wK5l" to="hfva:3j46jeGYR4z" resolve="subtest" />
+                      <ref role="37wK5l" to="hmoe:3j46jeGYR4z" resolve="subtest" />
                       <node concept="Xl_RD" id="5SC$dmoFDMm" role="37wK5m">
                         <property role="Xl_RC" value="replace back incorrect" />
                       </node>
@@ -1470,7 +1470,7 @@
                         <node concept="37vLTG" id="5SC$dmoFDMo" role="1bW2Oz">
                           <property role="TrG5h" value="tester" />
                           <node concept="3uibUv" id="5SC$dmoFDMp" role="1tU5fm">
-                            <ref role="3uigEE" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                            <ref role="3uigEE" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                           </node>
                         </node>
                         <node concept="3clFbS" id="5SC$dmoFDMq" role="1bW5cS">
@@ -1501,15 +1501,15 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="5SC$dmoFKxR" role="2OqNvi">
-                    <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                    <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                   </node>
                 </node>
                 <node concept="liA8E" id="5SC$dmoFMKd" role="2OqNvi">
-                  <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                  <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                 </node>
               </node>
               <node concept="liA8E" id="5SC$dmoFPTG" role="2OqNvi">
-                <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                 <node concept="3xONca" id="5SC$dmoFPTH" role="37wK5m">
                   <ref role="3xOPvv" node="5SC$dmotUr$" resolve="fix_app1" />
                 </node>
@@ -1526,7 +1526,7 @@
               </node>
             </node>
             <node concept="liA8E" id="5SC$dmoFSwU" role="2OqNvi">
-              <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+              <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
             </node>
           </node>
         </node>

samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd

@@ -16,6 +16,7 @@
     <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)</dependency>
     <dependency reexport="false">af858d84-85f2-42f4-a854-0b3c6b5cd482(samples.lambdacalc)</dependency>
     <dependency reexport="false">c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)</dependency>
+    <dependency reexport="false">02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
@@ -40,6 +41,7 @@
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
+    <module reference="02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />

samples/mpscore/build.xml

@@ -24,6 +24,7 @@
   <property name="mpsBootstrapCore.version.eap" value="${import.mps.mpsBootstrapCore.version.eap}" />
   <property name="mpsBootstrapCore.version" value="${import.mps.mpsBootstrapCore.version}" />
   <property name="coderules.ci.build.num" value="${import.coderules.coderules.ci.build.num}" />
+  <property name="coderules.ci.mps.release" value="${import.coderules.coderules.ci.mps.release}" />
   <property name="coderules.test.jvmargs" value="${import.coderules.coderules.test.jvmargs}" />
   <property name="environment" value="env" />
   <property name="env.JAVA_HOME" value="${java.home}/.." />
@@ -428,9 +429,6 @@
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguageInternalExt/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguageInternalExt-generator.jar" />
     </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguageExt-models1">
-      <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguageExt/models" includes="**/*.mps, **/*.mpsr, **/.model" />
-    </copyModels>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguageInternalExt-models">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguageInternalExt/models" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
@@ -451,7 +449,6 @@
         <exclude name="**/*.mps" />
       </fileset>
       <zipfileset file="${basedir}/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguageExt-models1" prefix="module/models" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguageInternalExt-models" prefix="module/models" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguageInternalExt-generator-templates" prefix="module/generator/templates" />
     </jar>
@@ -1357,6 +1354,7 @@
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
           <module ref="df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)" kind="cl" />
           <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
+          <module ref="02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
           <module ref="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
@@ -1494,6 +1492,7 @@
           <module ref="9e36d2ee-c59c-4580-9e81-646748d0614b(jetbrains.mps.baseLanguage.closuresExt)" kind="cl" />
           <module ref="c1f5ad88-21f4-4e0e-927c-48b1ca0c2334(jetbrains.mps.baseLanguage.collectionsExt)" kind="cl" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
+          <module ref="02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
           <module ref="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)" kind="cl" />
         </dependencies>
@@ -1731,15 +1730,9 @@
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.smodelExt/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.smodelExt-generator.jar" />
     </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguage.closuresExt-models1">
-      <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.closuresExt/models" includes="**/*.mps, **/*.mpsr, **/.model" />
-    </copyModels>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.smodelExt-models">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.smodelExt/models" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguage.closuresExt-generator-templates1">
-      <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.closuresExt/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
-    </copyModels>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.smodelExt-generator-templates">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.smodelExt/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
@@ -1757,9 +1750,7 @@
         <exclude name="**/*.mps" />
       </fileset>
       <zipfileset file="${basedir}/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguage.closuresExt-models1" prefix="module/models" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.smodelExt-models" prefix="module/models" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguage.closuresExt-generator-templates1" prefix="module/generator/templates" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.smodelExt-generator-templates" prefix="module/generator/templates" />
     </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodelExt.test.jar" />
@@ -1815,9 +1806,6 @@
       <fileset dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.lang.smodelExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.smodelExt.test.jar" />
     </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-jetbrains.mps.baseLanguage.closuresExt.test-models1">
-      <fileset dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models" includes="**/*.mps, **/*.mpsr, **/.model" />
-    </copyModels>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-jetbrains.mps.lang.smodelExt-models">
       <fileset dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.lang.smodelExt/models" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
@@ -1829,7 +1817,6 @@
         <exclude name="**/*.mps" />
       </fileset>
       <zipfileset file="${basedir}/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-jetbrains.mps.baseLanguage.closuresExt.test-models1" prefix="module/models" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-jetbrains.mps.lang.smodelExt-models" prefix="module/models" />
     </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystemExt.jar" />
@@ -2838,7 +2825,7 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.logicExt-models" prefix="module/models" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.logicExt-generator-templates" prefix="module/generator/templates" />
     </jar>
-    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}coderules.ci.build.num=${coderules.ci.build.num}${line.separator}coderules.test.jvmargs=${coderules.test.jvmargs}</echo>
+    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}coderules.ci.build.num=${coderules.ci.build.num}${line.separator}coderules.ci.mps.release=${coderules.ci.mps.release}${line.separator}coderules.test.jvmargs=${coderules.test.jvmargs}</echo>
   </target>
   
   <target name="buildDependents" />
@@ -2871,6 +2858,7 @@
       <plugin path="${artifacts.mps}/plugins/mps-testing" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.runtime.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.testhelper.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.test.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.testlang.sandbox.jar" />
@@ -4340,6 +4328,7 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.testhelper.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.test.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
@@ -4428,6 +4417,7 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.testhelper.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.test.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
@@ -5163,6 +5153,7 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.testhelper.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.test.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
@@ -5505,6 +5496,7 @@
     <path id="mps.libraries.path">
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.runtime.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.testhelper.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.test.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.testlang.sandbox.jar" />

samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/jetbrains.mps.baseLanguage.collectionsExt.test.msd

@@ -22,6 +22,7 @@
     <dependency reexport="false">0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)</dependency>
     <dependency reexport="false">c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)</dependency>
     <dependency reexport="false">fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)</dependency>
+    <dependency reexport="false">02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
@@ -60,6 +61,7 @@
     <module reference="88dcbb14-19c3-4776-8f81-33611ca4d87c(jetbrains.mps.baseLanguage.sequence)" version="0" />
     <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
+    <module reference="02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />

samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.incremental@tests.mps

@@ -12,12 +12,12 @@
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
   </languages>
   <imports>
-    <import index="hfva" ref="r:20f81ae9-fed0-48fa-893d-6c6b658e3dee(jetbrains.mps.coderules.typechecking.test.util)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="e9ez" ref="r:ffe541d0-0912-42c1-800b-d2f22dd8a4c8(jetbrains.mps.baseLanguage.closuresExt.types)" />
     <import index="kqnc" ref="r:92b96158-68e6-4f53-a32b-36e2b456fe01(jetbrains.mps.baseLanguageExt.types)" />
+    <import index="hmoe" ref="r:a07b09f7-cbf3-40d9-ae10-40da3926c5fa(jetbrains.mps.coderules.testhelper.testutil)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="tp2c" ref="r:00000000-0000-4000-0000-011c89590338(jetbrains.mps.baseLanguage.closures.structure)" implicit="true" />
     <import index="tp2q" ref="r:00000000-0000-4000-0000-011c8959032e(jetbrains.mps.baseLanguage.collections.structure)" implicit="true" />
@@ -362,18 +362,18 @@
                                           <node concept="2OqwBi" id="MSv3owtSQr" role="2Oq$k0">
                                             <node concept="2OqwBi" id="MSv3owtS3W" role="2Oq$k0">
                                               <node concept="2YIFZM" id="MSv3owtRFn" role="2Oq$k0">
-                                                <ref role="37wK5l" to="hfva:WJTIIokwcy" resolve="forCheck" />
+                                                <ref role="37wK5l" to="hmoe:WJTIIokwcy" resolve="forCheck" />
-                                                <ref role="1Pybhc" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                                                <ref role="1Pybhc" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                                                 <node concept="3xONca" id="MSv3owtRZn" role="37wK5m">
                                                   <ref role="3xOPvv" node="MSv3owtPfl" resolve="demo2" />
                                                 </node>
                                               </node>
                                               <node concept="liA8E" id="MSv3owtSw5" role="2OqNvi">
-                                                <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                                                <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                                               </node>
                                             </node>
                                             <node concept="liA8E" id="MSv3owtTkS" role="2OqNvi">
-                                              <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                              <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                               <node concept="3xONca" id="MSv3owtTFq" role="37wK5m">
                                                 <ref role="3xOPvv" node="MSv3owu372" resolve="closure1" />
                                               </node>
@@ -387,7 +387,7 @@
                                             </node>
                                           </node>
                                           <node concept="liA8E" id="MSv3owtUFt" role="2OqNvi">
-                                            <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                                            <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                                             <node concept="1bVj0M" id="MSv3owtV3x" role="37wK5m">
                                               <node concept="3clFbS" id="MSv3owtV3y" role="1bW5cS">
                                                 <node concept="3clFbH" id="MSv3owtVf6" role="3cqZAp" />
@@ -417,15 +417,15 @@
                                           </node>
                                         </node>
                                         <node concept="liA8E" id="MSv3owtXnv" role="2OqNvi">
-                                          <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                                          <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="MSv3owtZkf" role="2OqNvi">
-                                        <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                                        <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="MSv3owu0xA" role="2OqNvi">
-                                      <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                      <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                       <node concept="3xONca" id="MSv3owu0Y$" role="37wK5m">
                                         <ref role="3xOPvv" node="MSv3owu372" resolve="closure1" />
                                       </node>
@@ -439,11 +439,11 @@
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="MSv3owu2uu" role="2OqNvi">
-                                    <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                                    <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="MSv3owu6gu" role="2OqNvi">
-                                  <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                                  <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                                   <node concept="1bVj0M" id="MSv3owu6Ka" role="37wK5m">
                                     <node concept="3clFbS" id="MSv3owu6Kb" role="1bW5cS">
                                       <node concept="3clFbH" id="MSv3owu73i" role="3cqZAp" />
@@ -466,18 +466,18 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="MSv3owuglS" role="2OqNvi">
-                                <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                                <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                               </node>
                             </node>
                             <node concept="liA8E" id="MSv3owui0j" role="2OqNvi">
-                              <ref role="37wK5l" to="hfva:WJTIIow7$m" resolve="ensureNoFailures" />
+                              <ref role="37wK5l" to="hmoe:WJTIIow7$m" resolve="ensureNoFailures" />
                               <node concept="3xONca" id="MSv3owujgI" role="37wK5m">
                                 <ref role="3xOPvv" node="MSv3owu372" resolve="closure1" />
                               </node>
                             </node>
                           </node>
                           <node concept="liA8E" id="MSv3owukKF" role="2OqNvi">
-                            <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                            <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                             <node concept="3xONca" id="MSv3owulmd" role="37wK5m">
                               <ref role="3xOPvv" node="MSv3owu372" resolve="closure1" />
                             </node>
@@ -489,18 +489,18 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="MSv3owunAY" role="2OqNvi">
-                          <ref role="37wK5l" to="hfva:WJTIIomjLv" resolve="ensureFailed" />
+                          <ref role="37wK5l" to="hmoe:WJTIIomjLv" resolve="ensureFailed" />
                           <node concept="3xONca" id="MSv3owuoJN" role="37wK5m">
                             <ref role="3xOPvv" node="MSv3owu5p1" resolve="assign_closure1call" />
                           </node>
                         </node>
                       </node>
                       <node concept="liA8E" id="MSv3owuqC1" role="2OqNvi">
-                        <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                        <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                       </node>
                     </node>
                     <node concept="liA8E" id="MSv3owusIz" role="2OqNvi">
-                      <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                      <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                       <node concept="1bVj0M" id="MSv3owutnX" role="37wK5m">
                         <node concept="3clFbS" id="MSv3owutnY" role="1bW5cS">
                           <node concept="3clFbH" id="MSv3owutRC" role="3cqZAp" />
@@ -565,15 +565,15 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="MSv3owvyxw" role="2OqNvi">
-                    <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                    <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                   </node>
                 </node>
                 <node concept="liA8E" id="MSv3owvA65" role="2OqNvi">
-                  <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                  <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                 </node>
               </node>
               <node concept="liA8E" id="MSv3owvDer" role="2OqNvi">
-                <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                 <node concept="3xONca" id="MSv3owvFJ4" role="37wK5m">
                   <ref role="3xOPvv" node="MSv3owu372" resolve="closure1" />
                 </node>
@@ -587,7 +587,7 @@
               </node>
             </node>
             <node concept="liA8E" id="MSv3owvMjl" role="2OqNvi">
-              <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+              <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
             </node>
           </node>
         </node>
@@ -616,18 +616,18 @@
                                         <node concept="2OqwBi" id="MSv3owwufm" role="2Oq$k0">
                                           <node concept="2OqwBi" id="MSv3owwsQ7" role="2Oq$k0">
                                             <node concept="2YIFZM" id="MSv3owws9A" role="2Oq$k0">
-                                              <ref role="37wK5l" to="hfva:WJTIIokwcy" resolve="forCheck" />
+                                              <ref role="37wK5l" to="hmoe:WJTIIokwcy" resolve="forCheck" />
-                                              <ref role="1Pybhc" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                                              <ref role="1Pybhc" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                                               <node concept="3xONca" id="MSv3owwsIQ" role="37wK5m">
                                                 <ref role="3xOPvv" node="MSv3owtPfl" resolve="demo2" />
                                               </node>
                                             </node>
                                             <node concept="liA8E" id="MSv3owwtBW" role="2OqNvi">
-                                              <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                                              <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                                             </node>
                                           </node>
                                           <node concept="liA8E" id="MSv3owwwdt" role="2OqNvi">
-                                            <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                            <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                             <node concept="3xONca" id="MSv3owwwdu" role="37wK5m">
                                               <ref role="3xOPvv" node="MSv3owu372" resolve="closure1" />
                                             </node>
@@ -641,7 +641,7 @@
                                           </node>
                                         </node>
                                         <node concept="liA8E" id="MSv3owwxSg" role="2OqNvi">
-                                          <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                                          <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                                           <node concept="1bVj0M" id="MSv3owwyx_" role="37wK5m">
                                             <node concept="3clFbS" id="MSv3owwyxA" role="1bW5cS">
                                               <node concept="3clFbH" id="MSv3owwyFJ" role="3cqZAp" />
@@ -699,11 +699,11 @@
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="MSv3owwVa_" role="2OqNvi">
-                                        <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                                        <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="MSv3owx0eF" role="2OqNvi">
-                                      <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                      <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                       <node concept="3xONca" id="MSv3owx1jQ" role="37wK5m">
                                         <ref role="3xOPvv" node="MSv3owu372" resolve="closure1" />
                                       </node>
@@ -720,18 +720,18 @@
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="MSv3owwXrt" role="2OqNvi">
-                                    <ref role="37wK5l" to="hfva:WJTIIomjLv" resolve="ensureFailed" />
+                                    <ref role="37wK5l" to="hmoe:WJTIIomjLv" resolve="ensureFailed" />
                                     <node concept="3xONca" id="MSv3owx2LS" role="37wK5m">
                                       <ref role="3xOPvv" node="MSv3owvHle" resolve="closure1call" />
                                     </node>
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="MSv3owx4WI" role="2OqNvi">
-                                  <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                                  <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                                 </node>
                               </node>
                               <node concept="liA8E" id="MSv3owx6H5" role="2OqNvi">
-                                <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                                <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                                 <node concept="1bVj0M" id="MSv3owx7Vs" role="37wK5m">
                                   <node concept="3clFbS" id="MSv3owx7Vt" role="1bW5cS">
                                     <node concept="3clFbH" id="MSv3owx8yx" role="3cqZAp" />
@@ -786,15 +786,15 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="MSv3owxjGF" role="2OqNvi">
-                              <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                              <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                             </node>
                           </node>
                           <node concept="liA8E" id="MSv3owxr2Q" role="2OqNvi">
-                            <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                            <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                           </node>
                         </node>
                         <node concept="liA8E" id="MSv3owxmTd" role="2OqNvi">
-                          <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                          <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                           <node concept="3xONca" id="MSv3owxo84" role="37wK5m">
                             <ref role="3xOPvv" node="MSv3owvHle" resolve="closure1call" />
                           </node>
@@ -806,11 +806,11 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="MSv3owx$SC" role="2OqNvi">
-                        <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                        <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                       </node>
                     </node>
                     <node concept="liA8E" id="MSv3owxCtr" role="2OqNvi">
-                      <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                      <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                       <node concept="1bVj0M" id="MSv3owxDPP" role="37wK5m">
                         <node concept="3clFbS" id="MSv3owxDPQ" role="1bW5cS">
                           <node concept="3clFbH" id="MSv3owxEEl" role="3cqZAp" />
@@ -864,11 +864,11 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="MSv3owxWwD" role="2OqNvi">
-                    <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                    <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                   </node>
                 </node>
                 <node concept="liA8E" id="MSv3owy0v2" role="2OqNvi">
-                  <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                  <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                   <node concept="3xONca" id="MSv3owy1QP" role="37wK5m">
                     <ref role="3xOPvv" node="MSv3owu372" resolve="closure1" />
                   </node>
@@ -882,14 +882,14 @@
                 </node>
               </node>
               <node concept="liA8E" id="MSv3owy76J" role="2OqNvi">
-                <ref role="37wK5l" to="hfva:WJTIIomjLv" resolve="ensureFailed" />
+                <ref role="37wK5l" to="hmoe:WJTIIomjLv" resolve="ensureFailed" />
                 <node concept="3xONca" id="MSv3owy8B8" role="37wK5m">
                   <ref role="3xOPvv" node="MSv3owvHle" resolve="closure1call" />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="MSv3owyfHX" role="2OqNvi">
-              <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+              <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
             </node>
           </node>
         </node>
@@ -920,18 +920,18 @@
                                             <node concept="2OqwBi" id="MSv3owsFtG" role="2Oq$k0">
                                               <node concept="2OqwBi" id="MSv3owsijj" role="2Oq$k0">
                                                 <node concept="2YIFZM" id="MSv3owsg$S" role="2Oq$k0">
-                                                  <ref role="37wK5l" to="hfva:WJTIIokwcy" resolve="forCheck" />
+                                                  <ref role="37wK5l" to="hmoe:WJTIIokwcy" resolve="forCheck" />
-                                                  <ref role="1Pybhc" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                                                  <ref role="1Pybhc" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                                                   <node concept="3xONca" id="MSv3owsgLx" role="37wK5m">
                                                     <ref role="3xOPvv" node="MSv3owrveQ" resolve="demo1" />
                                                   </node>
                                                 </node>
                                                 <node concept="liA8E" id="MSv3owsizh" role="2OqNvi">
-                                                  <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                                                  <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                                                 </node>
                                               </node>
                                               <node concept="liA8E" id="MSv3owsFu4" role="2OqNvi">
-                                                <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                                <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                                 <node concept="3xONca" id="MSv3owsFu5" role="37wK5m">
                                                   <ref role="3xOPvv" node="MSv3ows_Ek" resolve="it1_ref" />
                                                 </node>
@@ -951,7 +951,7 @@
                                               </node>
                                             </node>
                                             <node concept="liA8E" id="MSv3owshU2" role="2OqNvi">
-                                              <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                                              <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                                               <node concept="1bVj0M" id="MSv3owshYk" role="37wK5m">
                                                 <node concept="3clFbS" id="MSv3owshYl" role="1bW5cS">
                                                   <node concept="3clFbH" id="MSv3owsi4p" role="3cqZAp" />
@@ -978,11 +978,11 @@
                                             </node>
                                           </node>
                                           <node concept="liA8E" id="MSv3owsku5" role="2OqNvi">
-                                            <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                                            <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                                           </node>
                                         </node>
                                         <node concept="liA8E" id="MSv3ows_kH" role="2OqNvi">
-                                          <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                          <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                           <node concept="3xONca" id="MSv3owsBhK" role="37wK5m">
                                             <ref role="3xOPvv" node="MSv3ows_Ek" resolve="it1_ref" />
                                           </node>
@@ -1002,7 +1002,7 @@
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="MSv3owsQeq" role="2OqNvi">
-                                        <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                        <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                         <node concept="3xONca" id="MSv3owsQer" role="37wK5m">
                                           <ref role="3xOPvv" node="MSv3owsgb8" resolve="op1select" />
                                         </node>
@@ -1028,15 +1028,15 @@
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="MSv3owsQS8" role="2OqNvi">
-                                      <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                                      <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="MSv3owsNvd" role="2OqNvi">
-                                    <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                                    <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="MSv3owsnyr" role="2OqNvi">
-                                  <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                                  <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                                   <node concept="1bVj0M" id="MSv3owsoP_" role="37wK5m">
                                     <node concept="3clFbS" id="MSv3owsoPA" role="1bW5cS">
                                       <node concept="3clFbH" id="MSv3owsp9S" role="3cqZAp" />
@@ -1063,11 +1063,11 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="MSv3owsrFU" role="2OqNvi">
-                                <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                                <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                               </node>
                             </node>
                             <node concept="liA8E" id="MSv3owsGZG" role="2OqNvi">
-                              <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                              <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                               <node concept="3xONca" id="MSv3owsGZH" role="37wK5m">
                                 <ref role="3xOPvv" node="MSv3ows_Ek" resolve="it1_ref" />
                               </node>
@@ -1087,7 +1087,7 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="MSv3owsJJa" role="2OqNvi">
-                            <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                            <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                             <node concept="3xONca" id="MSv3owsK8T" role="37wK5m">
                               <ref role="3xOPvv" node="MSv3owsgb8" resolve="op1select" />
                             </node>
@@ -1113,18 +1113,18 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="MSv3owsL6D" role="2OqNvi">
-                          <ref role="37wK5l" to="hfva:WJTIIomjLv" resolve="ensureFailed" />
+                          <ref role="37wK5l" to="hmoe:WJTIIomjLv" resolve="ensureFailed" />
                           <node concept="3xONca" id="MSv3owsLLL" role="37wK5m">
                             <ref role="3xOPvv" node="MSv3owspY2" resolve="assignSeq0" />
                           </node>
                         </node>
                       </node>
                       <node concept="liA8E" id="MSv3owszkR" role="2OqNvi">
-                        <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                        <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                       </node>
                     </node>
                     <node concept="liA8E" id="MSv3owsUyq" role="2OqNvi">
-                      <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                      <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                       <node concept="1bVj0M" id="MSv3owsVBp" role="37wK5m">
                         <node concept="3clFbS" id="MSv3owsVBq" role="1bW5cS">
                           <node concept="3clFbH" id="MSv3owsWf6" role="3cqZAp" />
@@ -1151,11 +1151,11 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="MSv3owsZej" role="2OqNvi">
-                    <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                    <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                   </node>
                 </node>
                 <node concept="liA8E" id="MSv3owt3sI" role="2OqNvi">
-                  <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                  <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                   <node concept="3xONca" id="MSv3owt3sJ" role="37wK5m">
                     <ref role="3xOPvv" node="MSv3ows_Ek" resolve="it1_ref" />
                   </node>
@@ -1175,11 +1175,11 @@
                 </node>
               </node>
               <node concept="liA8E" id="MSv3owt5Ih" role="2OqNvi">
-                <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
               </node>
             </node>
             <node concept="liA8E" id="MSv3owt878" role="2OqNvi">
-              <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+              <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
             </node>
           </node>
         </node>
@@ -1211,19 +1211,19 @@
                                   <node concept="2OqwBi" id="MSv3owFzhU" role="2Oq$k0">
                                     <node concept="2OqwBi" id="6jc_Ygd4faK" role="2Oq$k0">
                                       <node concept="2YIFZM" id="MSv3owFwUP" role="2Oq$k0">
-                                        <ref role="37wK5l" to="hfva:WJTIIokwcy" resolve="forCheck" />
+                                        <ref role="37wK5l" to="hmoe:WJTIIokwcy" resolve="forCheck" />
-                                        <ref role="1Pybhc" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                                        <ref role="1Pybhc" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                                         <node concept="3xONca" id="MSv3owFyl0" role="37wK5m">
                                           <ref role="3xOPvv" node="MSv3owD8lL" resolve="demo5" />
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="6jc_Ygd4hGF" role="2OqNvi">
-                                        <ref role="37wK5l" to="hfva:6jc_YgcCZ4$" resolve="rulesTest" />
+                                        <ref role="37wK5l" to="hmoe:6jc_YgcCZ4$" resolve="rulesTest" />
                                         <node concept="1bVj0M" id="6jc_Ygd4jAM" role="37wK5m">
                                           <node concept="37vLTG" id="6jc_Ygd4k2F" role="1bW2Oz">
                                             <property role="TrG5h" value="rules" />
                                             <node concept="3uibUv" id="6jc_Ygd4BNM" role="1tU5fm">
-                                              <ref role="3uigEE" to="hfva:6jc_YgcDVh0" resolve="RulesTestBuilder" />
+                                              <ref role="3uigEE" to="hmoe:6jc_YgcDVh0" resolve="RulesTestBuilder" />
                                             </node>
                                           </node>
                                           <node concept="3clFbS" id="6jc_Ygd4jAN" role="1bW5cS">
@@ -1234,7 +1234,7 @@
                                                   <ref role="3cqZAo" node="6jc_Ygd4k2F" resolve="rules" />
                                                 </node>
                                                 <node concept="liA8E" id="6jc_Ygd4HH0" role="2OqNvi">
-                                                  <ref role="37wK5l" to="hfva:6jc_Ygd14A_" resolve="ensureExist" />
+                                                  <ref role="37wK5l" to="hmoe:6jc_Ygd14A_" resolve="ensureExist" />
                                                   <node concept="3xONca" id="6jc_Ygd4IsZ" role="37wK5m">
                                                     <ref role="3xOPvv" node="MSv3owFypI" resolve="GWorker_decl" />
                                                   </node>
@@ -1255,11 +1255,11 @@
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="MSv3owF$Oe" role="2OqNvi">
-                                      <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                                      <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="MSv3owHzk0" role="2OqNvi">
-                                    <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                    <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                     <node concept="3xONca" id="MSv3owHzk1" role="37wK5m">
                                       <ref role="3xOPvv" node="MSv3owHesO" resolve="closure5accept_call" />
                                     </node>
@@ -1279,7 +1279,7 @@
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="MSv3owFBNk" role="2OqNvi">
-                                  <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                                  <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                                   <node concept="1bVj0M" id="MSv3owFDgu" role="37wK5m">
                                     <node concept="3clFbS" id="MSv3owFDgv" role="1bW5cS">
                                       <node concept="3clFbH" id="MSv3owFDjz" role="3cqZAp" />
@@ -1376,16 +1376,16 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="MSv3owGDBm" role="2OqNvi">
-                                <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                                <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                               </node>
                             </node>
                             <node concept="liA8E" id="6jc_Ygd50EU" role="2OqNvi">
-                              <ref role="37wK5l" to="hfva:6jc_YgcCZ4$" resolve="rulesTest" />
+                              <ref role="37wK5l" to="hmoe:6jc_YgcCZ4$" resolve="rulesTest" />
                               <node concept="1bVj0M" id="6jc_Ygd50EV" role="37wK5m">
                                 <node concept="37vLTG" id="6jc_Ygd50EW" role="1bW2Oz">
                                   <property role="TrG5h" value="rules" />
                                   <node concept="3uibUv" id="6jc_Ygd50EX" role="1tU5fm">
-                                    <ref role="3uigEE" to="hfva:6jc_YgcDVh0" resolve="RulesTestBuilder" />
+                                    <ref role="3uigEE" to="hmoe:6jc_YgcDVh0" resolve="RulesTestBuilder" />
                                   </node>
                                 </node>
                                 <node concept="3clFbS" id="6jc_Ygd50EY" role="1bW5cS">
@@ -1410,7 +1410,7 @@
                                         <ref role="3cqZAo" node="6jc_Ygd50EW" resolve="rules" />
                                       </node>
                                       <node concept="liA8E" id="6jc_Ygd50F3" role="2OqNvi">
-                                        <ref role="37wK5l" to="hfva:6jc_Ygd2IAL" resolve="ensureRemoved" />
+                                        <ref role="37wK5l" to="hmoe:6jc_Ygd2IAL" resolve="ensureRemoved" />
                                         <node concept="3xONca" id="6jc_Ygd50F4" role="37wK5m">
                                           <ref role="3xOPvv" node="MSv3owFypI" resolve="GWorker_decl" />
                                         </node>
@@ -1431,18 +1431,18 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="MSv3owGHlE" role="2OqNvi">
-                            <ref role="37wK5l" to="hfva:WJTIIomjLv" resolve="ensureFailed" />
+                            <ref role="37wK5l" to="hmoe:WJTIIomjLv" resolve="ensureFailed" />
                             <node concept="3xONca" id="MSv3owGKL_" role="37wK5m">
                               <ref role="3xOPvv" node="MSv3owDcAx" resolve="closure5" />
                             </node>
                           </node>
                         </node>
                         <node concept="liA8E" id="MSv3owGNgl" role="2OqNvi">
-                          <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                          <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                         </node>
                       </node>
                       <node concept="liA8E" id="MSv3owGRwE" role="2OqNvi">
-                        <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                        <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                         <node concept="1bVj0M" id="MSv3owGTpQ" role="37wK5m">
                           <node concept="3clFbS" id="MSv3owGTpR" role="1bW5cS">
                             <node concept="3clFbH" id="MSv3owGTSZ" role="3cqZAp" />
@@ -1460,16 +1460,16 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="MSv3owH5F_" role="2OqNvi">
-                      <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                      <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                     </node>
                   </node>
                   <node concept="liA8E" id="6jc_Ygd5KLL" role="2OqNvi">
-                    <ref role="37wK5l" to="hfva:6jc_YgcCZ4$" resolve="rulesTest" />
+                    <ref role="37wK5l" to="hmoe:6jc_YgcCZ4$" resolve="rulesTest" />
                     <node concept="1bVj0M" id="6jc_Ygd5KLM" role="37wK5m">
                       <node concept="37vLTG" id="6jc_Ygd5KLN" role="1bW2Oz">
                         <property role="TrG5h" value="rules" />
                         <node concept="3uibUv" id="6jc_Ygd5KLO" role="1tU5fm">
-                          <ref role="3uigEE" to="hfva:6jc_YgcDVh0" resolve="RulesTestBuilder" />
+                          <ref role="3uigEE" to="hmoe:6jc_YgcDVh0" resolve="RulesTestBuilder" />
                         </node>
                       </node>
                       <node concept="3clFbS" id="6jc_Ygd5KLP" role="1bW5cS">
@@ -1494,7 +1494,7 @@
                               <ref role="3cqZAo" node="6jc_Ygd5KLN" resolve="rules" />
                             </node>
                             <node concept="liA8E" id="6jc_Ygd5KLU" role="2OqNvi">
-                              <ref role="37wK5l" to="hfva:6jc_Ygd2VDk" resolve="ensureAdded" />
+                              <ref role="37wK5l" to="hmoe:6jc_Ygd2VDk" resolve="ensureAdded" />
                               <node concept="3xONca" id="6jc_Ygd5KLV" role="37wK5m">
                                 <ref role="3xOPvv" node="MSv3owFypI" resolve="GWorker_decl" />
                               </node>
@@ -1515,11 +1515,11 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="6jc_Ygd5Xoq" role="2OqNvi">
-                  <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                  <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                 </node>
               </node>
               <node concept="liA8E" id="MSv3owHlu$" role="2OqNvi">
-                <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                 <node concept="3xONca" id="MSv3owHn$F" role="37wK5m">
                   <ref role="3xOPvv" node="MSv3owHesO" resolve="closure5accept_call" />
                 </node>
@@ -1539,7 +1539,7 @@
               </node>
             </node>
             <node concept="liA8E" id="MSv3owHvzE" role="2OqNvi">
-              <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+              <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
             </node>
           </node>
         </node>
@@ -1572,18 +1572,18 @@
                                                 <node concept="2OqwBi" id="MSv3owIe_i" role="2Oq$k0">
                                                   <node concept="2OqwBi" id="MSv3owDgXQ" role="2Oq$k0">
                                                     <node concept="2YIFZM" id="MSv3owDfFi" role="2Oq$k0">
-                                                      <ref role="37wK5l" to="hfva:WJTIIokwcy" resolve="forCheck" />
+                                                      <ref role="37wK5l" to="hmoe:WJTIIokwcy" resolve="forCheck" />
-                                                      <ref role="1Pybhc" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                                                      <ref role="1Pybhc" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                                                       <node concept="3xONca" id="MSv3owDgRX" role="37wK5m">
                                                         <ref role="3xOPvv" node="MSv3owD8lL" resolve="demo5" />
                                                       </node>
                                                     </node>
                                                     <node concept="liA8E" id="MSv3owDiiC" role="2OqNvi">
-                                                      <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                                                      <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                                                     </node>
                                                   </node>
                                                   <node concept="liA8E" id="MSv3owIfCh" role="2OqNvi">
-                                                    <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                                    <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                                     <node concept="3xONca" id="MSv3owIfCi" role="37wK5m">
                                                       <ref role="3xOPvv" node="MSv3owHesO" resolve="closure5accept_call" />
                                                     </node>
@@ -1603,7 +1603,7 @@
                                                   </node>
                                                 </node>
                                                 <node concept="liA8E" id="MSv3owDkS2" role="2OqNvi">
-                                                  <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                                                  <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                                                   <node concept="1bVj0M" id="MSv3owDm7B" role="37wK5m">
                                                     <node concept="3clFbS" id="MSv3owDm7C" role="1bW5cS">
                                                       <node concept="3clFbH" id="MSv3owDmeO" role="3cqZAp" />
@@ -1692,16 +1692,16 @@
                                                 </node>
                                               </node>
                                               <node concept="liA8E" id="MSv3owD_C4" role="2OqNvi">
-                                                <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                                                <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                                               </node>
                                             </node>
                                             <node concept="liA8E" id="2uP4pET0bl" role="2OqNvi">
-                                              <ref role="37wK5l" to="hfva:6jc_YgcCZ4$" resolve="rulesTest" />
+                                              <ref role="37wK5l" to="hmoe:6jc_YgcCZ4$" resolve="rulesTest" />
                                               <node concept="1bVj0M" id="2uP4pET2Ia" role="37wK5m">
                                                 <node concept="37vLTG" id="2uP4pET3BT" role="1bW2Oz">
                                                   <property role="TrG5h" value="rules" />
                                                   <node concept="3uibUv" id="2uP4pET59a" role="1tU5fm">
-                                                    <ref role="3uigEE" to="hfva:6jc_YgcDVh0" resolve="RulesTestBuilder" />
+                                                    <ref role="3uigEE" to="hmoe:6jc_YgcDVh0" resolve="RulesTestBuilder" />
                                                   </node>
                                                 </node>
                                                 <node concept="3clFbS" id="2uP4pET2Ic" role="1bW5cS">
@@ -1712,7 +1712,7 @@
                                                         <ref role="3cqZAo" node="2uP4pET3BT" resolve="rules" />
                                                       </node>
                                                       <node concept="liA8E" id="2uP4pETisC" role="2OqNvi">
-                                                        <ref role="37wK5l" to="hfva:6jc_Ygd36ar" resolve="ensureUpdated" />
+                                                        <ref role="37wK5l" to="hmoe:6jc_Ygd36ar" resolve="ensureUpdated" />
                                                         <node concept="3xONca" id="2uP4pETj09" role="37wK5m">
                                                           <ref role="3xOPvv" node="MSv3owDmk9" resolve="workerMethod" />
                                                         </node>
@@ -1810,7 +1810,7 @@
                                                         <ref role="3cqZAo" node="2uP4pET3BT" resolve="rules" />
                                                       </node>
                                                       <node concept="liA8E" id="2uP4pET7nJ" role="2OqNvi">
-                                                        <ref role="37wK5l" to="hfva:6jc_Ygd36ar" resolve="ensureUpdated" />
+                                                        <ref role="37wK5l" to="hmoe:6jc_Ygd36ar" resolve="ensureUpdated" />
                                                         <node concept="3xONca" id="2uP4pET87J" role="37wK5m">
                                                           <ref role="3xOPvv" node="2uP4pET7ZU" resolve="workerMethodCallOp" />
                                                         </node>
@@ -1831,18 +1831,18 @@
                                             </node>
                                           </node>
                                           <node concept="liA8E" id="MSv3owDD5P" role="2OqNvi">
-                                            <ref role="37wK5l" to="hfva:WJTIIomjLv" resolve="ensureFailed" />
+                                            <ref role="37wK5l" to="hmoe:WJTIIomjLv" resolve="ensureFailed" />
                                             <node concept="3xONca" id="MSv3owDGfj" role="37wK5m">
                                               <ref role="3xOPvv" node="MSv3owDcAx" resolve="closure5" />
                                             </node>
                                           </node>
                                         </node>
                                         <node concept="liA8E" id="MSv3owDIE9" role="2OqNvi">
-                                          <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                                          <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="MSv3owDMaq" role="2OqNvi">
-                                        <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                                        <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                                         <node concept="1bVj0M" id="MSv3owDNVl" role="37wK5m">
                                           <node concept="3clFbS" id="MSv3owDNVm" role="1bW5cS">
                                             <node concept="3clFbH" id="MSv3owDOrF" role="3cqZAp" />
@@ -1878,15 +1878,15 @@
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="MSv3owE3tD" role="2OqNvi">
-                                      <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                                      <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="MSv3owE7q4" role="2OqNvi">
-                                    <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                                    <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="MSv3owIiJ_" role="2OqNvi">
-                                  <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                  <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                   <node concept="3xONca" id="MSv3owIiJA" role="37wK5m">
                                     <ref role="3xOPvv" node="MSv3owHesO" resolve="closure5accept_call" />
                                   </node>
@@ -1906,11 +1906,11 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="MSv3owEbd7" role="2OqNvi">
-                                <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                                <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                               </node>
                             </node>
                             <node concept="liA8E" id="MSv3owEfjH" role="2OqNvi">
-                              <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                              <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                               <node concept="1bVj0M" id="MSv3owEh8B" role="37wK5m">
                                 <node concept="3clFbS" id="MSv3owEh8C" role="1bW5cS">
                                   <node concept="3clFbH" id="MSv3owEhNG" role="3cqZAp" />
@@ -1982,22 +1982,22 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="MSv3owEOqb" role="2OqNvi">
-                            <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                            <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                           </node>
                         </node>
                         <node concept="liA8E" id="MSv3owER2X" role="2OqNvi">
-                          <ref role="37wK5l" to="hfva:WJTIIomjLv" resolve="ensureFailed" />
+                          <ref role="37wK5l" to="hmoe:WJTIIomjLv" resolve="ensureFailed" />
                           <node concept="3xONca" id="MSv3owETgQ" role="37wK5m">
                             <ref role="3xOPvv" node="MSv3owDcAx" resolve="closure5" />
                           </node>
                         </node>
                       </node>
                       <node concept="liA8E" id="MSv3owEXli" role="2OqNvi">
-                        <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                        <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                       </node>
                     </node>
                     <node concept="liA8E" id="MSv3owEZT6" role="2OqNvi">
-                      <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                      <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                       <node concept="1bVj0M" id="MSv3owF2p4" role="37wK5m">
                         <node concept="3clFbS" id="MSv3owF2p5" role="1bW5cS">
                           <node concept="3clFbH" id="MSv3owF3i9" role="3cqZAp" />
@@ -2045,15 +2045,15 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="MSv3owI0MT" role="2OqNvi">
-                    <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                    <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                   </node>
                 </node>
                 <node concept="liA8E" id="MSv3owI6TA" role="2OqNvi">
-                  <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                  <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                 </node>
               </node>
               <node concept="liA8E" id="MSv3owIm2T" role="2OqNvi">
-                <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                 <node concept="3xONca" id="MSv3owIm2U" role="37wK5m">
                   <ref role="3xOPvv" node="MSv3owHesO" resolve="closure5accept_call" />
                 </node>
@@ -2073,7 +2073,7 @@
               </node>
             </node>
             <node concept="liA8E" id="MSv3owIcoH" role="2OqNvi">
-              <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+              <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
             </node>
           </node>
         </node>
@@ -2094,18 +2094,18 @@
                         <node concept="2OqwBi" id="MSv3owK6lj" role="2Oq$k0">
                           <node concept="2OqwBi" id="MSv3owK2OM" role="2Oq$k0">
                             <node concept="2YIFZM" id="MSv3owK15T" role="2Oq$k0">
-                              <ref role="37wK5l" to="hfva:WJTIIokwcy" resolve="forCheck" />
+                              <ref role="37wK5l" to="hmoe:WJTIIokwcy" resolve="forCheck" />
-                              <ref role="1Pybhc" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                              <ref role="1Pybhc" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                               <node concept="3xONca" id="MSv3owK2Kf" role="37wK5m">
                                 <ref role="3xOPvv" node="MSv3owD8lL" resolve="demo5" />
                               </node>
                             </node>
                             <node concept="liA8E" id="MSv3owK4Bj" role="2OqNvi">
-                              <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                              <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                             </node>
                           </node>
                           <node concept="liA8E" id="MSv3owK87a" role="2OqNvi">
-                            <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                            <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                             <node concept="1bVj0M" id="MSv3owK8WP" role="37wK5m">
                               <node concept="3clFbS" id="MSv3owK8WQ" role="1bW5cS">
                                 <node concept="3clFbH" id="MSv3owK9Xd" role="3cqZAp" />
@@ -2182,22 +2182,22 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="MSv3owKWYY" role="2OqNvi">
-                          <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                          <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                         </node>
                       </node>
                       <node concept="liA8E" id="MSv3owL80i" role="2OqNvi">
-                        <ref role="37wK5l" to="hfva:WJTIIomjLv" resolve="ensureFailed" />
+                        <ref role="37wK5l" to="hmoe:WJTIIomjLv" resolve="ensureFailed" />
                         <node concept="3xONca" id="MSv3owL9LK" role="37wK5m">
                           <ref role="3xOPvv" node="MSv3owDcAx" resolve="closure5" />
                         </node>
                       </node>
                     </node>
                     <node concept="liA8E" id="MSv3owLcjO" role="2OqNvi">
-                      <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                      <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                     </node>
                   </node>
                   <node concept="liA8E" id="MSv3owLkkP" role="2OqNvi">
-                    <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                    <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                     <node concept="1bVj0M" id="MSv3owLmcZ" role="37wK5m">
                       <node concept="3clFbS" id="MSv3owLmd0" role="1bW5cS">
                         <node concept="3clFbH" id="MSv3owLmvP" role="3cqZAp" />
@@ -2240,15 +2240,15 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="MSv3owLwgA" role="2OqNvi">
-                  <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                  <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                 </node>
               </node>
               <node concept="liA8E" id="MSv3owL$C0" role="2OqNvi">
-                <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
               </node>
             </node>
             <node concept="liA8E" id="MSv3owLCW$" role="2OqNvi">
-              <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+              <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
             </node>
           </node>
         </node>
@@ -2919,18 +2919,18 @@
                         <node concept="2OqwBi" id="MSv3owBrFA" role="2Oq$k0">
                           <node concept="2OqwBi" id="MSv3owBl53" role="2Oq$k0">
                             <node concept="2YIFZM" id="MSv3owBjVy" role="2Oq$k0">
-                              <ref role="37wK5l" to="hfva:WJTIIokwcy" resolve="forCheck" />
+                              <ref role="37wK5l" to="hmoe:WJTIIokwcy" resolve="forCheck" />
-                              <ref role="1Pybhc" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                              <ref role="1Pybhc" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                               <node concept="3xONca" id="MSv3owD0QX" role="37wK5m">
                                 <ref role="3xOPvv" node="MSv3owD0Pa" resolve="demo3" />
                               </node>
                             </node>
                             <node concept="liA8E" id="MSv3owBmgO" role="2OqNvi">
-                              <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                              <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                             </node>
                           </node>
                           <node concept="liA8E" id="MSv3owBsQH" role="2OqNvi">
-                            <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                            <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                             <node concept="3xONca" id="MSv3owBPyF" role="37wK5m">
                               <ref role="3xOPvv" node="MSv3owBOtI" resolve="closure3" />
                             </node>
@@ -2943,7 +2943,7 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="MSv3owC3G2" role="2OqNvi">
-                          <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                          <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                           <node concept="3xONca" id="MSv3owC66I" role="37wK5m">
                             <ref role="3xOPvv" node="MSv3owC4RJ" resolve="closure3invoke1" />
                           </node>
@@ -2953,7 +2953,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="MSv3owBQXf" role="2OqNvi">
-                        <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                        <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                         <node concept="1bVj0M" id="MSv3owBS5j" role="37wK5m">
                           <node concept="3clFbS" id="MSv3owBS5k" role="1bW5cS">
                             <node concept="3clFbH" id="MSv3owBSft" role="3cqZAp" />
@@ -2982,15 +2982,15 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="MSv3owC1aF" role="2OqNvi">
-                      <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                      <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                     </node>
                   </node>
                   <node concept="liA8E" id="MSv3owCd1j" role="2OqNvi">
-                    <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                    <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                   </node>
                 </node>
                 <node concept="liA8E" id="MSv3owCeJS" role="2OqNvi">
-                  <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                  <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                   <node concept="3xONca" id="MSv3owCeJT" role="37wK5m">
                     <ref role="3xOPvv" node="MSv3owBOtI" resolve="closure3" />
                   </node>
@@ -3003,7 +3003,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="MSv3owC9rT" role="2OqNvi">
-                <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                 <node concept="3xONca" id="MSv3owCaCP" role="37wK5m">
                   <ref role="3xOPvv" node="MSv3owC4RJ" resolve="closure3invoke1" />
                 </node>
@@ -3013,7 +3013,7 @@
               </node>
             </node>
             <node concept="liA8E" id="MSv3owChYq" role="2OqNvi">
-              <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+              <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
             </node>
           </node>
         </node>
@@ -3049,14 +3049,14 @@
                                       <node concept="2OqwBi" id="MSv3owz92C" role="2Oq$k0">
                                         <node concept="2OqwBi" id="MSv3owyS3K" role="2Oq$k0">
                                           <node concept="2YIFZM" id="MSv3owyJNd" role="2Oq$k0">
-                                            <ref role="37wK5l" to="hfva:WJTIIokwcy" resolve="forCheck" />
+                                            <ref role="37wK5l" to="hmoe:WJTIIokwcy" resolve="forCheck" />
-                                            <ref role="1Pybhc" to="hfva:WJTIIojUvH" resolve="IncrementalTestBuilder" />
+                                            <ref role="1Pybhc" to="hmoe:WJTIIojUvH" resolve="IncrementalTestBuilder" />
                                             <node concept="3xONca" id="MSv3owyKCs" role="37wK5m">
                                               <ref role="3xOPvv" node="MSv3owyBGr" resolve="demo4" />
                                             </node>
                                           </node>
                                           <node concept="liA8E" id="MSv3owyT1J" role="2OqNvi">
-                                            <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                            <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                             <node concept="3xONca" id="MSv3owyU68" role="37wK5m">
                                               <ref role="3xOPvv" node="MSv3owyOw0" resolve="closure4" />
                                             </node>
@@ -3073,7 +3073,7 @@
                                           </node>
                                         </node>
                                         <node concept="liA8E" id="MSv3owza6b" role="2OqNvi">
-                                          <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                          <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                           <node concept="3xONca" id="MSv3owzb7W" role="37wK5m">
                                             <ref role="3xOPvv" node="MSv3owyNNi" resolve="rec4_invoke1" />
                                           </node>
@@ -3085,7 +3085,7 @@
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="MSv3owzd5r" role="2OqNvi">
-                                        <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                                        <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                                         <node concept="3xONca" id="MSv3owze9m" role="37wK5m">
                                           <ref role="3xOPvv" node="MSv3owyOkq" resolve="rec4_invoke2" />
                                         </node>
@@ -3097,11 +3097,11 @@
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="MSv3owzeCr" role="2OqNvi">
-                                      <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                                      <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="MSv3owyR13" role="2OqNvi">
-                                    <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                                    <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                                     <node concept="1bVj0M" id="MSv3owyRSW" role="37wK5m">
                                       <node concept="3clFbS" id="MSv3owyRSX" role="1bW5cS">
                                         <node concept="3clFbH" id="MSv3owyS1e" role="3cqZAp" />
@@ -3173,18 +3173,18 @@
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="MSv3owz3R6" role="2OqNvi">
-                                  <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                                  <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                                 </node>
                               </node>
                               <node concept="liA8E" id="MSv3owz7Co" role="2OqNvi">
-                                <ref role="37wK5l" to="hfva:WJTIIomjLv" resolve="ensureFailed" />
+                                <ref role="37wK5l" to="hmoe:WJTIIomjLv" resolve="ensureFailed" />
                                 <node concept="3xONca" id="7Q6gf6XLeBB" role="37wK5m">
                                   <ref role="3xOPvv" node="MSv3owyNJv" resolve="assign_rec4" />
                                 </node>
                               </node>
                             </node>
                             <node concept="liA8E" id="7Q6gf6XLke4" role="2OqNvi">
-                              <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                              <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                               <node concept="3xONca" id="7Q6gf6XLnRZ" role="37wK5m">
                                 <ref role="3xOPvv" node="MSv3owyOw0" resolve="closure4" />
                               </node>
@@ -3201,11 +3201,11 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="7Q6gf6XLttn" role="2OqNvi">
-                            <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+                            <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
                           </node>
                         </node>
                         <node concept="liA8E" id="MSv3owzkoc" role="2OqNvi">
-                          <ref role="37wK5l" to="hfva:6dzPt95xjsW" resolve="also" />
+                          <ref role="37wK5l" to="hmoe:6dzPt95xjsW" resolve="also" />
                           <node concept="1bVj0M" id="MSv3owzlRz" role="37wK5m">
                             <node concept="3clFbS" id="MSv3owzlR$" role="1bW5cS">
                               <node concept="3clFbH" id="MSv3owzmaA" role="3cqZAp" />
@@ -3270,11 +3270,11 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="MSv3ow$TUJ" role="2OqNvi">
-                        <ref role="37wK5l" to="hfva:WJTIIom1yI" resolve="relaunch" />
+                        <ref role="37wK5l" to="hmoe:WJTIIom1yI" resolve="relaunch" />
                       </node>
                     </node>
                     <node concept="liA8E" id="MSv3ow_iZ4" role="2OqNvi">
-                      <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                      <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                       <node concept="3xONca" id="MSv3ow_iZ5" role="37wK5m">
                         <ref role="3xOPvv" node="MSv3owyOw0" resolve="closure4" />
                       </node>
@@ -3289,7 +3289,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="MSv3ow_6_7" role="2OqNvi">
-                    <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                    <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                     <node concept="3xONca" id="MSv3ow_9o0" role="37wK5m">
                       <ref role="3xOPvv" node="MSv3owyNNi" resolve="rec4_invoke1" />
                     </node>
@@ -3299,7 +3299,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="MSv3ow_m56" role="2OqNvi">
-                  <ref role="37wK5l" to="hfva:WJTIIomj2Y" resolve="ensureType" />
+                  <ref role="37wK5l" to="hmoe:WJTIIomj2Y" resolve="ensureType" />
                   <node concept="3xONca" id="MSv3ow_pEy" role="37wK5m">
                     <ref role="3xOPvv" node="MSv3owyOkq" resolve="rec4_invoke2" />
                   </node>
@@ -3311,11 +3311,11 @@
                 </node>
               </node>
               <node concept="liA8E" id="MSv3ow_0ew" role="2OqNvi">
-                <ref role="37wK5l" to="hfva:WJTIIooHck" resolve="ensureNoFailures" />
+                <ref role="37wK5l" to="hmoe:WJTIIooHck" resolve="ensureNoFailures" />
               </node>
             </node>
             <node concept="liA8E" id="MSv3ow_FTx" role="2OqNvi">
-              <ref role="37wK5l" to="hfva:WJTIIokFTj" resolve="ensureStable" />
+              <ref role="37wK5l" to="hmoe:WJTIIokFTj" resolve="ensureStable" />
             </node>
           </node>
         </node>

samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd

@@ -28,6 +28,7 @@
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
+    <dependency reexport="false">02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
@@ -71,6 +72,7 @@
     <module reference="df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
     <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
+    <module reference="02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />

samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps

@@ -285,23 +285,6 @@
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
           <property role="1HemKv" value="true" />
-          <node concept="3LXTmp" id="6Dg__VJQ3Ba" role="1HemKq">
-            <node concept="398BVA" id="6Dg__VJQ3Bb" role="3LXTmr">
-              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.mpscore_home" />
-              <node concept="2Ry0Ak" id="6Dg__VJQ3Bc" role="iGT6I">
-                <property role="2Ry0Am" value="languages" />
-                <node concept="2Ry0Ak" id="6Dg__VJQ3Bd" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguage.closuresExt" />
-                  <node concept="2Ry0Ak" id="6Dg__VJQ3Be" role="2Ry0An">
-                    <property role="2Ry0Am" value="models" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3qWCbU" id="6Dg__VJQ3Bf" role="3LXTna">
-              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-            </node>
-          </node>
           <node concept="3LXTmp" id="6Dg__VJQ4ao" role="1HemKq">
             <node concept="398BVA" id="6Dg__VJQ4ag" role="3LXTmr">
               <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.mpscore_home" />
@@ -332,26 +315,6 @@
             <property role="3ZfqAx" value="generator/templates" />
             <property role="1Hdu6h" value="true" />
             <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="6Dg__VJQ3Bm" role="1HemKq">
-              <node concept="398BVA" id="6Dg__VJQ3Bn" role="3LXTmr">
-                <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.mpscore_home" />
-                <node concept="2Ry0Ak" id="6Dg__VJQ3Bo" role="iGT6I">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="6Dg__VJQ3Bp" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.baseLanguage.closuresExt" />
-                    <node concept="2Ry0Ak" id="6Dg__VJQ3Bq" role="2Ry0An">
-                      <property role="2Ry0Am" value="generator" />
-                      <node concept="2Ry0Ak" id="6Dg__VJQ3Br" role="2Ry0An">
-                        <property role="2Ry0Am" value="templates" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3qWCbU" id="6Dg__VJQ3Bs" role="3LXTna">
-                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-              </node>
-            </node>
             <node concept="3LXTmp" id="6Dg__VJQ4aA" role="1HemKq">
               <node concept="398BVA" id="6Dg__VJQ4as" role="3LXTmr">
                 <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.mpscore_home" />
@@ -474,23 +437,6 @@
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
           <property role="1HemKv" value="true" />
-          <node concept="3LXTmp" id="6Dg__VJQ2Of" role="1HemKq">
-            <node concept="398BVA" id="6Dg__VJQ2Og" role="3LXTmr">
-              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.mpscore_home" />
-              <node concept="2Ry0Ak" id="6Dg__VJQ2Oh" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="6Dg__VJQ2Oi" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguage.closuresExt.test" />
-                  <node concept="2Ry0Ak" id="6Dg__VJQ2Oj" role="2Ry0An">
-                    <property role="2Ry0Am" value="models" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3qWCbU" id="6Dg__VJQ2Ok" role="3LXTna">
-              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-            </node>
-          </node>
           <node concept="3LXTmp" id="6Dg__VJQ3eu" role="1HemKq">
             <node concept="398BVA" id="6Dg__VJQ3em" role="3LXTmr">
               <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.mpscore_home" />
@@ -1246,23 +1192,6 @@
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
           <property role="1HemKv" value="true" />
-          <node concept="3LXTmp" id="7gMIJIxVu3d" role="1HemKq">
-            <node concept="398BVA" id="7gMIJIxVu3e" role="3LXTmr">
-              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.mpscore_home" />
-              <node concept="2Ry0Ak" id="7gMIJIxVu3f" role="iGT6I">
-                <property role="2Ry0Am" value="languages" />
-                <node concept="2Ry0Ak" id="7gMIJIxVu3g" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt" />
-                  <node concept="2Ry0Ak" id="7gMIJIxVu3h" role="2Ry0An">
-                    <property role="2Ry0Am" value="models" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3qWCbU" id="7gMIJIxVu3i" role="3LXTna">
-              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-            </node>
-          </node>
           <node concept="3LXTmp" id="7gMIJIxVucm" role="1HemKq">
             <node concept="398BVA" id="7gMIJIxVuce" role="3LXTmr">
               <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.mpscore_home" />
@@ -1649,6 +1578,11 @@
             <ref role="3bR37D" to="zqd8:5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4XsNDZX9sgj" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX9sgk" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:4XsNDZX1tUA" resolve="jetbrains.mps.coderules.testhelper" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="69UmpDmJW3w" role="2G$12L">
         <property role="TrG5h" value="typechecking.samples.baseLanguage" />
@@ -2330,6 +2264,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4XsNDZX9shP" role="3bR37C">
+          <node concept="3bR9La" id="4XsNDZX9shQ" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:4XsNDZX1tUA" resolve="jetbrains.mps.coderules.testhelper" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6$MmqWflyOZ" role="2G$12L">
         <property role="BnDLt" value="true" />