diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps
index f23885cf..311e65a4 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps
@@ -70,6 +70,9 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="8356039341262087992" name="line" index="1aUNEU" />
+      </concept>
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
@@ -131,6 +134,14 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
+      <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="ng" index="3oM_SD">
+        <property id="155656958578482949" name="value" index="3oM_SC" />
+      </concept>
+      <concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="ng" index="1PaTwC">
+        <child id="2535923850359271783" name="elements" index="1PaTwD" />
+      </concept>
+    </language>
   </registry>
   <node concept="1lH9Xt" id="7u0sJ20Oy8r">
     <property role="TrG5h" value="ClosuresWithCollections" />
@@ -167,23 +178,68 @@
       <property role="TrG5h" value="closureParamInference" />
       <node concept="3cqZAl" id="5pvXCF9sDdE" role="3clF45" />
       <node concept="3clFbS" id="5pvXCF9sDdF" role="3clF47">
+        <node concept="3SKdUt" id="2Qsys8cXswZ" role="3cqZAp">
+          <node concept="1PaTwC" id="2Qsys8cXsx0" role="1aUNEU">
+            <node concept="3oM_SD" id="2Qsys8cXsx1" role="1PaTwD">
+              <property role="3oM_SC" value="FIXME" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyt" role="1PaTwD">
+              <property role="3oM_SC" value="runtime" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyw" role="1PaTwD">
+              <property role="3oM_SC" value="errors" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsy$" role="1PaTwD">
+              <property role="3oM_SC" value="must" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyD" role="1PaTwD">
+              <property role="3oM_SC" value="not" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyJ" role="1PaTwD">
+              <property role="3oM_SC" value="be" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyQ" role="1PaTwD">
+              <property role="3oM_SC" value="ignored," />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXszA" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXszJ" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXszT" role="1PaTwD">
+              <property role="3oM_SC" value="temporary" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXs$4" role="1PaTwD">
+              <property role="3oM_SC" value="test" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXs$g" role="1PaTwD">
+              <property role="3oM_SC" value="fix" />
+            </node>
+          </node>
+        </node>
         <node concept="2Hmddi" id="5pvXCF9sDdG" role="3cqZAp">
           <node concept="2OqwBi" id="5pvXCF9sDdH" role="2Hmdds">
-            <node concept="2YIFZM" id="5pvXCF9sDdI" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="5pvXCF9sDdJ" role="37wK5m">
-                <node concept="2WthIp" id="5pvXCF9sDdK" role="2Oq$k0" />
-                <node concept="2XshWL" id="5pvXCF9sDdL" role="2OqNvi">
-                  <ref role="2WH_rO" node="7u0sJ20Oy8x" resolve="resolve" />
-                  <node concept="2tJFMh" id="5pvXCF9sDdM" role="2XxRq1">
-                    <node concept="ZC_QK" id="5pvXCF9sETl" role="2tJFKM">
-                      <ref role="2aWVGs" to="kui3:554EtBHyc2K" resolve="ClosureParamInference" />
+            <node concept="2OqwBi" id="2Qsys8cXsjI" role="2Oq$k0">
+              <node concept="2YIFZM" id="5pvXCF9sDdI" role="2Oq$k0">
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                <node concept="2OqwBi" id="5pvXCF9sDdJ" role="37wK5m">
+                  <node concept="2WthIp" id="5pvXCF9sDdK" role="2Oq$k0" />
+                  <node concept="2XshWL" id="5pvXCF9sDdL" role="2OqNvi">
+                    <ref role="2WH_rO" node="7u0sJ20Oy8x" resolve="resolve" />
+                    <node concept="2tJFMh" id="5pvXCF9sDdM" role="2XxRq1">
+                      <node concept="ZC_QK" id="5pvXCF9sETl" role="2tJFKM">
+                        <ref role="2aWVGs" to="kui3:554EtBHyc2K" resolve="ClosureParamInference" />
+                      </node>
                     </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="5pvXCF9sDdO" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="2Qsys8cXstB" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
-              <node concept="1jxXqW" id="5pvXCF9sDdO" role="37wK5m" />
             </node>
             <node concept="liA8E" id="5pvXCF9sDdP" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.containers@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.containers@tests.mps
index 1dc49ed9..5d7fbf31 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.containers@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.containers@tests.mps
@@ -241,23 +241,68 @@
       <property role="TrG5h" value="operationsSequence" />
       <node concept="3cqZAl" id="3Z1xyIw63GY" role="3clF45" />
       <node concept="3clFbS" id="3Z1xyIw63GZ" role="3clF47">
+        <node concept="3SKdUt" id="2Qsys8cXswZ" role="3cqZAp">
+          <node concept="1PaTwC" id="2Qsys8cXsx0" role="1aUNEU">
+            <node concept="3oM_SD" id="2Qsys8cXsx1" role="1PaTwD">
+              <property role="3oM_SC" value="FIXME" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyt" role="1PaTwD">
+              <property role="3oM_SC" value="runtime" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyw" role="1PaTwD">
+              <property role="3oM_SC" value="errors" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsy$" role="1PaTwD">
+              <property role="3oM_SC" value="must" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyD" role="1PaTwD">
+              <property role="3oM_SC" value="not" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyJ" role="1PaTwD">
+              <property role="3oM_SC" value="be" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyQ" role="1PaTwD">
+              <property role="3oM_SC" value="ignored," />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXszA" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXszJ" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXszT" role="1PaTwD">
+              <property role="3oM_SC" value="temporary" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXs$4" role="1PaTwD">
+              <property role="3oM_SC" value="test" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXs$g" role="1PaTwD">
+              <property role="3oM_SC" value="fix" />
+            </node>
+          </node>
+        </node>
         <node concept="2Hmddi" id="3Z1xyIw63H0" role="3cqZAp">
           <node concept="2OqwBi" id="3Z1xyIw63H1" role="2Hmdds">
-            <node concept="2YIFZM" id="3Z1xyIw63H2" role="2Oq$k0">
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <node concept="2OqwBi" id="3Z1xyIw63H3" role="37wK5m">
-                <node concept="2WthIp" id="3Z1xyIw63H4" role="2Oq$k0" />
-                <node concept="2XshWL" id="3Z1xyIw63H5" role="2OqNvi">
-                  <ref role="2WH_rO" node="1oUE7CX3Xkf" resolve="resolve" />
-                  <node concept="2tJFMh" id="3Z1xyIw63H6" role="2XxRq1">
-                    <node concept="ZC_QK" id="3Z1xyIw63Vi" role="2tJFKM">
-                      <ref role="2aWVGs" to="a4lx:3Z1xyIvNBmG" resolve="SequenceOperations" />
+            <node concept="2OqwBi" id="2Qsys8cXsS3" role="2Oq$k0">
+              <node concept="2YIFZM" id="3Z1xyIw63H2" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="3Z1xyIw63H3" role="37wK5m">
+                  <node concept="2WthIp" id="3Z1xyIw63H4" role="2Oq$k0" />
+                  <node concept="2XshWL" id="3Z1xyIw63H5" role="2OqNvi">
+                    <ref role="2WH_rO" node="1oUE7CX3Xkf" resolve="resolve" />
+                    <node concept="2tJFMh" id="3Z1xyIw63H6" role="2XxRq1">
+                      <node concept="ZC_QK" id="3Z1xyIw63Vi" role="2tJFKM">
+                        <ref role="2aWVGs" to="a4lx:3Z1xyIvNBmG" resolve="SequenceOperations" />
+                      </node>
                     </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="3Z1xyIw63H8" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="2Qsys8cXt0n" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
-              <node concept="1jxXqW" id="3Z1xyIw63H8" role="37wK5m" />
             </node>
             <node concept="liA8E" id="3Z1xyIw63H9" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps
index ea7df0ec..b5098567 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps
@@ -217,23 +217,68 @@
       <property role="TrG5h" value="intByteConversion" />
       <node concept="3cqZAl" id="5s5QomKHHK2" role="3clF45" />
       <node concept="3clFbS" id="5s5QomKHHK6" role="3clF47">
+        <node concept="3SKdUt" id="2Qsys8cXswZ" role="3cqZAp">
+          <node concept="1PaTwC" id="2Qsys8cXsx0" role="1aUNEU">
+            <node concept="3oM_SD" id="2Qsys8cXsx1" role="1PaTwD">
+              <property role="3oM_SC" value="FIXME" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyt" role="1PaTwD">
+              <property role="3oM_SC" value="runtime" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyw" role="1PaTwD">
+              <property role="3oM_SC" value="errors" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsy$" role="1PaTwD">
+              <property role="3oM_SC" value="must" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyD" role="1PaTwD">
+              <property role="3oM_SC" value="not" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyJ" role="1PaTwD">
+              <property role="3oM_SC" value="be" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyQ" role="1PaTwD">
+              <property role="3oM_SC" value="ignored," />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXszA" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXszJ" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXszT" role="1PaTwD">
+              <property role="3oM_SC" value="temporary" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXs$4" role="1PaTwD">
+              <property role="3oM_SC" value="test" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXs$g" role="1PaTwD">
+              <property role="3oM_SC" value="fix" />
+            </node>
+          </node>
+        </node>
         <node concept="2Hmddi" id="27bTNFfbxdu" role="3cqZAp">
           <node concept="2OqwBi" id="27bTNFfbxdv" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxdw" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfc0ig" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc0ih" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc0ii" role="2OqNvi">
-                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc0ij" role="2XxRq1">
-                    <node concept="ZC_QK" id="27bTNFfc0ik" role="2tJFKM">
-                      <ref role="2aWVGs" to="yg5v:5s5QomKHFub" resolve="IntByteConversion" />
+            <node concept="2OqwBi" id="2Qsys8cXtjc" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbxdw" role="2Oq$k0">
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                <node concept="2OqwBi" id="27bTNFfc0ig" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfc0ih" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfc0ii" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfc0ij" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfc0ik" role="2tJFKM">
+                        <ref role="2aWVGs" to="yg5v:5s5QomKHFub" resolve="IntByteConversion" />
+                      </node>
                     </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfc0kf" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="2Qsys8cXtrs" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
-              <node concept="1jxXqW" id="27bTNFfc0kf" role="37wK5m" />
             </node>
             <node concept="liA8E" id="27bTNFfbxdz" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
@@ -246,23 +291,68 @@
       <property role="TrG5h" value="charConversion" />
       <node concept="3cqZAl" id="2HYHa0WIt70" role="3clF45" />
       <node concept="3clFbS" id="2HYHa0WIt71" role="3clF47">
+        <node concept="3SKdUt" id="2Qsys8cXtxB" role="3cqZAp">
+          <node concept="1PaTwC" id="2Qsys8cXtxC" role="1aUNEU">
+            <node concept="3oM_SD" id="2Qsys8cXtxD" role="1PaTwD">
+              <property role="3oM_SC" value="FIXME" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtxE" role="1PaTwD">
+              <property role="3oM_SC" value="runtime" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtxF" role="1PaTwD">
+              <property role="3oM_SC" value="errors" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtxG" role="1PaTwD">
+              <property role="3oM_SC" value="must" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtxH" role="1PaTwD">
+              <property role="3oM_SC" value="not" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtxI" role="1PaTwD">
+              <property role="3oM_SC" value="be" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtxJ" role="1PaTwD">
+              <property role="3oM_SC" value="ignored," />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtxK" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtxL" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtxM" role="1PaTwD">
+              <property role="3oM_SC" value="temporary" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtxN" role="1PaTwD">
+              <property role="3oM_SC" value="test" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtxO" role="1PaTwD">
+              <property role="3oM_SC" value="fix" />
+            </node>
+          </node>
+        </node>
         <node concept="2Hmddi" id="27bTNFfbxe0" role="3cqZAp">
           <node concept="2OqwBi" id="27bTNFfbxe1" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxe2" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfc0DT" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc0DU" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc0DV" role="2OqNvi">
-                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc0DW" role="2XxRq1">
-                    <node concept="ZC_QK" id="27bTNFfc0DX" role="2tJFKM">
-                      <ref role="2aWVGs" to="yg5v:3Cu2imBSO5x" resolve="CharConversion" />
+            <node concept="2OqwBi" id="2Qsys8cXt$d" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbxe2" role="2Oq$k0">
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                <node concept="2OqwBi" id="27bTNFfc0DT" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfc0DU" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfc0DV" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfc0DW" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfc0DX" role="2tJFKM">
+                        <ref role="2aWVGs" to="yg5v:3Cu2imBSO5x" resolve="CharConversion" />
+                      </node>
                     </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfc0FS" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="2Qsys8cXtGE" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
-              <node concept="1jxXqW" id="27bTNFfc0FS" role="37wK5m" />
             </node>
             <node concept="liA8E" id="27bTNFfbxe5" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
@@ -304,23 +394,68 @@
       <property role="TrG5h" value="shortConversion" />
       <node concept="3cqZAl" id="6EY0p2ym72q" role="3clF45" />
       <node concept="3clFbS" id="6EY0p2ym72r" role="3clF47">
+        <node concept="3SKdUt" id="2Qsys8cXtNk" role="3cqZAp">
+          <node concept="1PaTwC" id="2Qsys8cXtNl" role="1aUNEU">
+            <node concept="3oM_SD" id="2Qsys8cXtNm" role="1PaTwD">
+              <property role="3oM_SC" value="FIXME" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtNn" role="1PaTwD">
+              <property role="3oM_SC" value="runtime" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtNo" role="1PaTwD">
+              <property role="3oM_SC" value="errors" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtNp" role="1PaTwD">
+              <property role="3oM_SC" value="must" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtNq" role="1PaTwD">
+              <property role="3oM_SC" value="not" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtNr" role="1PaTwD">
+              <property role="3oM_SC" value="be" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtNs" role="1PaTwD">
+              <property role="3oM_SC" value="ignored," />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtNt" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtNu" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtNv" role="1PaTwD">
+              <property role="3oM_SC" value="temporary" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtNw" role="1PaTwD">
+              <property role="3oM_SC" value="test" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXtNx" role="1PaTwD">
+              <property role="3oM_SC" value="fix" />
+            </node>
+          </node>
+        </node>
         <node concept="2Hmddi" id="27bTNFfbxey" role="3cqZAp">
           <node concept="2OqwBi" id="27bTNFfbxez" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxe$" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfc0HJ" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc0HK" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc0HL" role="2OqNvi">
-                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc0HM" role="2XxRq1">
-                    <node concept="ZC_QK" id="27bTNFfc0HN" role="2tJFKM">
-                      <ref role="2aWVGs" to="yg5v:6EY0p2ylujy" resolve="IntShortConversion" />
+            <node concept="2OqwBi" id="2Qsys8cXtRe" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbxe$" role="2Oq$k0">
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                <node concept="2OqwBi" id="27bTNFfc0HJ" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfc0HK" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfc0HL" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfc0HM" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfc0HN" role="2tJFKM">
+                        <ref role="2aWVGs" to="yg5v:6EY0p2ylujy" resolve="IntShortConversion" />
+                      </node>
                     </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfc0JI" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="2Qsys8cXu1T" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
-              <node concept="1jxXqW" id="27bTNFfc0JI" role="37wK5m" />
             </node>
             <node concept="liA8E" id="27bTNFfbxeB" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
@@ -534,23 +669,68 @@
       <property role="TrG5h" value="primitiveTypes" />
       <node concept="3cqZAl" id="7AyqXCdNg70" role="3clF45" />
       <node concept="3clFbS" id="7AyqXCdNg71" role="3clF47">
+        <node concept="3SKdUt" id="2Qsys8cXu8x" role="3cqZAp">
+          <node concept="1PaTwC" id="2Qsys8cXu8y" role="1aUNEU">
+            <node concept="3oM_SD" id="2Qsys8cXu8z" role="1PaTwD">
+              <property role="3oM_SC" value="FIXME" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXu8$" role="1PaTwD">
+              <property role="3oM_SC" value="runtime" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXu8_" role="1PaTwD">
+              <property role="3oM_SC" value="errors" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXu8A" role="1PaTwD">
+              <property role="3oM_SC" value="must" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXu8B" role="1PaTwD">
+              <property role="3oM_SC" value="not" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXu8C" role="1PaTwD">
+              <property role="3oM_SC" value="be" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXu8D" role="1PaTwD">
+              <property role="3oM_SC" value="ignored," />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXu8E" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXu8F" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXu8G" role="1PaTwD">
+              <property role="3oM_SC" value="temporary" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXu8H" role="1PaTwD">
+              <property role="3oM_SC" value="test" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXu8I" role="1PaTwD">
+              <property role="3oM_SC" value="fix" />
+            </node>
+          </node>
+        </node>
         <node concept="2Hmddi" id="27bTNFfbxgE" role="3cqZAp">
           <node concept="2OqwBi" id="27bTNFfbxgF" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxgG" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfc1bY" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc1bZ" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc1c0" role="2OqNvi">
-                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc1c1" role="2XxRq1">
-                    <node concept="ZC_QK" id="27bTNFfc1c2" role="2tJFKM">
-                      <ref role="2aWVGs" to="yg5v:5XJPBczwaPg" resolve="PrimitiveTypes" />
+            <node concept="2OqwBi" id="2Qsys8cXub7" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbxgG" role="2Oq$k0">
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                <node concept="2OqwBi" id="27bTNFfc1bY" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfc1bZ" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfc1c0" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfc1c1" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfc1c2" role="2tJFKM">
+                        <ref role="2aWVGs" to="yg5v:5XJPBczwaPg" resolve="PrimitiveTypes" />
+                      </node>
                     </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfc1dX" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="2Qsys8cXujY" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
-              <node concept="1jxXqW" id="27bTNFfc1dX" role="37wK5m" />
             </node>
             <node concept="liA8E" id="27bTNFfbxgJ" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
@@ -563,23 +743,68 @@
       <property role="TrG5h" value="rawConversions" />
       <node concept="3cqZAl" id="3XUOzow_cBR" role="3clF45" />
       <node concept="3clFbS" id="3XUOzow_cBS" role="3clF47">
+        <node concept="3SKdUt" id="2Qsys8cXuq0" role="3cqZAp">
+          <node concept="1PaTwC" id="2Qsys8cXuq1" role="1aUNEU">
+            <node concept="3oM_SD" id="2Qsys8cXuq2" role="1PaTwD">
+              <property role="3oM_SC" value="FIXME" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuq3" role="1PaTwD">
+              <property role="3oM_SC" value="runtime" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuq4" role="1PaTwD">
+              <property role="3oM_SC" value="errors" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuq5" role="1PaTwD">
+              <property role="3oM_SC" value="must" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuq6" role="1PaTwD">
+              <property role="3oM_SC" value="not" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuq7" role="1PaTwD">
+              <property role="3oM_SC" value="be" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuq8" role="1PaTwD">
+              <property role="3oM_SC" value="ignored," />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuq9" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuqa" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuqb" role="1PaTwD">
+              <property role="3oM_SC" value="temporary" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuqc" role="1PaTwD">
+              <property role="3oM_SC" value="test" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuqd" role="1PaTwD">
+              <property role="3oM_SC" value="fix" />
+            </node>
+          </node>
+        </node>
         <node concept="2Hmddi" id="3XUOzow_cBT" role="3cqZAp">
           <node concept="2OqwBi" id="3XUOzow_cBU" role="2Hmdds">
-            <node concept="2YIFZM" id="3XUOzow_cBV" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="3XUOzow_cBW" role="37wK5m">
-                <node concept="2WthIp" id="3XUOzow_cBX" role="2Oq$k0" />
-                <node concept="2XshWL" id="3XUOzow_cBY" role="2OqNvi">
-                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="3XUOzow_cBZ" role="2XxRq1">
-                    <node concept="ZC_QK" id="3XUOzow_eOE" role="2tJFKM">
-                      <ref role="2aWVGs" to="yg5v:3XUOzowrzqi" resolve="RawConversions" />
+            <node concept="2OqwBi" id="2Qsys8cXuuc" role="2Oq$k0">
+              <node concept="2YIFZM" id="3XUOzow_cBV" role="2Oq$k0">
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                <node concept="2OqwBi" id="3XUOzow_cBW" role="37wK5m">
+                  <node concept="2WthIp" id="3XUOzow_cBX" role="2Oq$k0" />
+                  <node concept="2XshWL" id="3XUOzow_cBY" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="3XUOzow_cBZ" role="2XxRq1">
+                      <node concept="ZC_QK" id="3XUOzow_eOE" role="2tJFKM">
+                        <ref role="2aWVGs" to="yg5v:3XUOzowrzqi" resolve="RawConversions" />
+                      </node>
                     </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="3XUOzow_cC1" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="2Qsys8cXuDh" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
-              <node concept="1jxXqW" id="3XUOzow_cC1" role="37wK5m" />
             </node>
             <node concept="liA8E" id="3XUOzow_cC2" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
@@ -679,23 +904,68 @@
       <property role="TrG5h" value="LUB" />
       <node concept="3cqZAl" id="PltxfHwhDD" role="3clF45" />
       <node concept="3clFbS" id="PltxfHwhDH" role="3clF47">
+        <node concept="3SKdUt" id="2Qsys8cXuKg" role="3cqZAp">
+          <node concept="1PaTwC" id="2Qsys8cXuKh" role="1aUNEU">
+            <node concept="3oM_SD" id="2Qsys8cXuKi" role="1PaTwD">
+              <property role="3oM_SC" value="FIXME" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuKj" role="1PaTwD">
+              <property role="3oM_SC" value="runtime" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuKk" role="1PaTwD">
+              <property role="3oM_SC" value="errors" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuKl" role="1PaTwD">
+              <property role="3oM_SC" value="must" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuKm" role="1PaTwD">
+              <property role="3oM_SC" value="not" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuKn" role="1PaTwD">
+              <property role="3oM_SC" value="be" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuKo" role="1PaTwD">
+              <property role="3oM_SC" value="ignored," />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuKp" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuKq" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuKr" role="1PaTwD">
+              <property role="3oM_SC" value="temporary" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuKs" role="1PaTwD">
+              <property role="3oM_SC" value="test" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXuKt" role="1PaTwD">
+              <property role="3oM_SC" value="fix" />
+            </node>
+          </node>
+        </node>
         <node concept="2Hmddi" id="PltxfHwhRP" role="3cqZAp">
           <node concept="2OqwBi" id="PltxfHwhRQ" role="2Hmdds">
-            <node concept="2YIFZM" id="PltxfHwhRR" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="PltxfHwhRS" role="37wK5m">
-                <node concept="2WthIp" id="PltxfHwhRT" role="2Oq$k0" />
-                <node concept="2XshWL" id="PltxfHwhRU" role="2OqNvi">
-                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="PltxfHwhRV" role="2XxRq1">
-                    <node concept="ZC_QK" id="PltxfHwhYE" role="2tJFKM">
-                      <ref role="2aWVGs" to="yg5v:2VOKs1ArylV" resolve="Lub" />
+            <node concept="2OqwBi" id="2Qsys8cXuMQ" role="2Oq$k0">
+              <node concept="2YIFZM" id="PltxfHwhRR" role="2Oq$k0">
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                <node concept="2OqwBi" id="PltxfHwhRS" role="37wK5m">
+                  <node concept="2WthIp" id="PltxfHwhRT" role="2Oq$k0" />
+                  <node concept="2XshWL" id="PltxfHwhRU" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="PltxfHwhRV" role="2XxRq1">
+                      <node concept="ZC_QK" id="PltxfHwhYE" role="2tJFKM">
+                        <ref role="2aWVGs" to="yg5v:2VOKs1ArylV" resolve="Lub" />
+                      </node>
                     </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="PltxfHwhRX" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="2Qsys8cXuW7" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
-              <node concept="1jxXqW" id="PltxfHwhRX" role="37wK5m" />
             </node>
             <node concept="liA8E" id="PltxfHwhRY" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps
index 99fd7193..9b1e1781 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps
@@ -316,6 +316,9 @@
         </node>
         <node concept="2Hmddi" id="2i6cuYR69K6" role="3cqZAp">
           <node concept="2OqwBi" id="2i6cuYR69K7" role="2Hmdds">
+            <node concept="liA8E" id="2i6cuYR69Kf" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
             <node concept="2OqwBi" id="5BtuWK4VdWa" role="2Oq$k0">
               <node concept="2YIFZM" id="2i6cuYR69K8" role="2Oq$k0">
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
@@ -337,9 +340,6 @@
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="2i6cuYR69Kf" role="2OqNvi">
-              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
-            </node>
           </node>
         </node>
       </node>
@@ -351,26 +351,71 @@
       <property role="TrG5h" value="ComplexTypeErasure" />
       <node concept="3cqZAl" id="1TH_SRmAKUN" role="3clF45" />
       <node concept="3clFbS" id="1TH_SRmAKUO" role="3clF47">
+        <node concept="3SKdUt" id="2Qsys8cXswZ" role="3cqZAp">
+          <node concept="1PaTwC" id="2Qsys8cXsx0" role="1aUNEU">
+            <node concept="3oM_SD" id="2Qsys8cXsx1" role="1PaTwD">
+              <property role="3oM_SC" value="FIXME" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyt" role="1PaTwD">
+              <property role="3oM_SC" value="runtime" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyw" role="1PaTwD">
+              <property role="3oM_SC" value="errors" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsy$" role="1PaTwD">
+              <property role="3oM_SC" value="must" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyD" role="1PaTwD">
+              <property role="3oM_SC" value="not" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyJ" role="1PaTwD">
+              <property role="3oM_SC" value="be" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyQ" role="1PaTwD">
+              <property role="3oM_SC" value="ignored," />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXszA" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXszJ" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXszT" role="1PaTwD">
+              <property role="3oM_SC" value="temporary" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXs$4" role="1PaTwD">
+              <property role="3oM_SC" value="test" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXs$g" role="1PaTwD">
+              <property role="3oM_SC" value="fix" />
+            </node>
+          </node>
+        </node>
         <node concept="2Hmddi" id="27bTNFfbxig" role="3cqZAp">
           <node concept="2OqwBi" id="27bTNFfbxih" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxii" role="2Oq$k0">
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <node concept="2OqwBi" id="27bTNFfc4Cj" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc4Ck" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc4Cl" role="2OqNvi">
-                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc4Cm" role="2XxRq1">
-                    <node concept="ZC_QK" id="27bTNFfc4Cn" role="2tJFKM">
-                      <ref role="2aWVGs" to="wqtl:61vfVfpb5w1" resolve="ComplexTypeErasure" />
+            <node concept="liA8E" id="27bTNFfbxil" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
+            <node concept="2OqwBi" id="2Qsys8cXvfc" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbxii" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfc4Cj" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfc4Ck" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfc4Cl" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfc4Cm" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfc4Cn" role="2tJFKM">
+                        <ref role="2aWVGs" to="wqtl:61vfVfpb5w1" resolve="ComplexTypeErasure" />
+                      </node>
                     </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfc4Ei" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="2Qsys8cXvm6" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
-              <node concept="1jxXqW" id="27bTNFfc4Ei" role="37wK5m" />
-            </node>
-            <node concept="liA8E" id="27bTNFfbxil" role="2OqNvi">
-              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
         </node>
@@ -578,6 +623,9 @@
         </node>
         <node concept="2Hmddi" id="1TH_SRmLuzl" role="3cqZAp">
           <node concept="2OqwBi" id="1TH_SRmLuzm" role="2Hmdds">
+            <node concept="liA8E" id="1TH_SRmLuzu" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
             <node concept="2OqwBi" id="5BtuWK4Veja" role="2Oq$k0">
               <node concept="2OqwBi" id="5o9$c3zUbSC" role="2Oq$k0">
                 <node concept="2YIFZM" id="1TH_SRmLuzn" role="2Oq$k0">
@@ -604,9 +652,6 @@
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="1TH_SRmLuzu" role="2OqNvi">
-              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
-            </node>
           </node>
         </node>
       </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
index 5a7ab18f..194a564a 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
@@ -75,6 +75,9 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="8356039341262087992" name="line" index="1aUNEU" />
+      </concept>
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
@@ -136,6 +139,14 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
+      <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="ng" index="3oM_SD">
+        <property id="155656958578482949" name="value" index="3oM_SC" />
+      </concept>
+      <concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="ng" index="1PaTwC">
+        <child id="2535923850359271783" name="elements" index="1PaTwD" />
+      </concept>
+    </language>
   </registry>
   <node concept="2XOHcx" id="1N_0WA5DT60">
     <property role="2XOHcw" value="${mpscore_home}" />
@@ -210,23 +221,68 @@
       <property role="TrG5h" value="HelloWorld" />
       <node concept="3cqZAl" id="1N_0WA5DT8H" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
+        <node concept="3SKdUt" id="2Qsys8cXswZ" role="3cqZAp">
+          <node concept="1PaTwC" id="2Qsys8cXsx0" role="1aUNEU">
+            <node concept="3oM_SD" id="2Qsys8cXsx1" role="1PaTwD">
+              <property role="3oM_SC" value="FIXME" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyt" role="1PaTwD">
+              <property role="3oM_SC" value="runtime" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyw" role="1PaTwD">
+              <property role="3oM_SC" value="errors" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsy$" role="1PaTwD">
+              <property role="3oM_SC" value="must" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyD" role="1PaTwD">
+              <property role="3oM_SC" value="not" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyJ" role="1PaTwD">
+              <property role="3oM_SC" value="be" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXsyQ" role="1PaTwD">
+              <property role="3oM_SC" value="ignored," />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXszA" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXszJ" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXszT" role="1PaTwD">
+              <property role="3oM_SC" value="temporary" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXs$4" role="1PaTwD">
+              <property role="3oM_SC" value="test" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8cXs$g" role="1PaTwD">
+              <property role="3oM_SC" value="fix" />
+            </node>
+          </node>
+        </node>
         <node concept="2Hmddi" id="27bTNFfbxkQ" role="3cqZAp">
           <node concept="2OqwBi" id="27bTNFfbxkR" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxkS" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfc5Qu" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc5Qx" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc5Qz" role="2OqNvi">
-                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc5Se" role="2XxRq1">
-                    <node concept="ZC_QK" id="27bTNFfc5Sf" role="2tJFKM">
-                      <ref role="2aWVGs" to="bs09:3Qp4N06bAlL" resolve="HelloWorld" />
+            <node concept="2OqwBi" id="2Qsys8cXvBo" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbxkS" role="2Oq$k0">
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                <node concept="2OqwBi" id="27bTNFfc5Qu" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfc5Qx" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfc5Qz" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfc5Se" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfc5Sf" role="2tJFKM">
+                        <ref role="2aWVGs" to="bs09:3Qp4N06bAlL" resolve="HelloWorld" />
+                      </node>
                     </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfc4fk" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="2Qsys8cXvGe" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
-              <node concept="1jxXqW" id="27bTNFfc4fk" role="37wK5m" />
             </node>
             <node concept="liA8E" id="27bTNFfbxkV" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />