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 18c04411..99fd7193 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
@@ -286,23 +286,56 @@
       <property role="TrG5h" value="NestedGenerics" />
       <node concept="3cqZAl" id="2i6cuYR69K4" role="3clF45" />
       <node concept="3clFbS" id="2i6cuYR69K5" role="3clF47">
+        <node concept="3SKdUt" id="5BtuWK4VeE1" role="3cqZAp">
+          <node concept="1PaTwC" id="5BtuWK4VeE2" role="1aUNEU">
+            <node concept="3oM_SD" id="5BtuWK4VeE3" role="1PaTwD">
+              <property role="3oM_SC" value="fixme:" />
+            </node>
+            <node concept="3oM_SD" id="5BtuWK4VeE4" role="1PaTwD">
+              <property role="3oM_SC" value="temporarily" />
+            </node>
+            <node concept="3oM_SD" id="5BtuWK4VeE5" role="1PaTwD">
+              <property role="3oM_SC" value="disabled" />
+            </node>
+            <node concept="3oM_SD" id="5BtuWK4VeE6" role="1PaTwD">
+              <property role="3oM_SC" value="skipLocal" />
+            </node>
+            <node concept="3oM_SD" id="5BtuWK4VeE7" role="1PaTwD">
+              <property role="3oM_SC" value="(in" />
+            </node>
+            <node concept="3oM_SD" id="5BtuWK4VeE8" role="1PaTwD">
+              <property role="3oM_SC" value="anticipation" />
+            </node>
+            <node concept="3oM_SD" id="5BtuWK4VeE9" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="5BtuWK4VeEa" role="1PaTwD">
+              <property role="3oM_SC" value="MPSCR-63)" />
+            </node>
+          </node>
+        </node>
         <node concept="2Hmddi" id="2i6cuYR69K6" role="3cqZAp">
           <node concept="2OqwBi" id="2i6cuYR69K7" role="2Hmdds">
-            <node concept="2YIFZM" id="2i6cuYR69K8" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="2i6cuYR69K9" role="37wK5m">
-                <node concept="2WthIp" id="2i6cuYR69Ka" role="2Oq$k0" />
-                <node concept="2XshWL" id="2i6cuYR69Kb" role="2OqNvi">
-                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="2i6cuYR69Kc" role="2XxRq1">
-                    <node concept="ZC_QK" id="2i6cuYR6ai2" role="2tJFKM">
-                      <ref role="2aWVGs" to="wqtl:2i6cuYR5KJp" resolve="NestedGenerics" />
+            <node concept="2OqwBi" id="5BtuWK4VdWa" role="2Oq$k0">
+              <node concept="2YIFZM" id="2i6cuYR69K8" role="2Oq$k0">
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                <node concept="2OqwBi" id="2i6cuYR69K9" role="37wK5m">
+                  <node concept="2WthIp" id="2i6cuYR69Ka" role="2Oq$k0" />
+                  <node concept="2XshWL" id="2i6cuYR69Kb" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="2i6cuYR69Kc" role="2XxRq1">
+                      <node concept="ZC_QK" id="2i6cuYR6ai2" role="2tJFKM">
+                        <ref role="2aWVGs" to="wqtl:2i6cuYR5KJp" resolve="NestedGenerics" />
+                      </node>
                     </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="2i6cuYR69Ke" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="5BtuWK4Ve8A" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
-              <node concept="1jxXqW" id="2i6cuYR69Ke" role="37wK5m" />
             </node>
             <node concept="liA8E" id="2i6cuYR69Kf" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
@@ -475,6 +508,34 @@
       <property role="TrG5h" value="Bounds" />
       <node concept="3cqZAl" id="1TH_SRmLuzj" role="3clF45" />
       <node concept="3clFbS" id="1TH_SRmLuzk" role="3clF47">
+        <node concept="3SKdUt" id="5BtuWK4VeA9" role="3cqZAp">
+          <node concept="1PaTwC" id="5BtuWK4VeAa" role="1aUNEU">
+            <node concept="3oM_SD" id="5BtuWK4VeDn" role="1PaTwD">
+              <property role="3oM_SC" value="fixme:" />
+            </node>
+            <node concept="3oM_SD" id="5BtuWK4VeDj" role="1PaTwD">
+              <property role="3oM_SC" value="temporarily" />
+            </node>
+            <node concept="3oM_SD" id="5BtuWK4VeDq" role="1PaTwD">
+              <property role="3oM_SC" value="disabled" />
+            </node>
+            <node concept="3oM_SD" id="5BtuWK4VeDu" role="1PaTwD">
+              <property role="3oM_SC" value="skipLocal" />
+            </node>
+            <node concept="3oM_SD" id="5BtuWK4VeDz" role="1PaTwD">
+              <property role="3oM_SC" value="(in" />
+            </node>
+            <node concept="3oM_SD" id="5BtuWK4VeDD" role="1PaTwD">
+              <property role="3oM_SC" value="anticipation" />
+            </node>
+            <node concept="3oM_SD" id="5BtuWK4VeDK" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="5BtuWK4VeDS" role="1PaTwD">
+              <property role="3oM_SC" value="MPSCR-63)" />
+            </node>
+          </node>
+        </node>
         <node concept="3SKdUt" id="5o9$c3zUci1" role="3cqZAp">
           <node concept="1PaTwC" id="5o9$c3zUci2" role="1aUNEU">
             <node concept="3oM_SD" id="5o9$c3zUci4" role="1PaTwD">
@@ -517,25 +578,30 @@
         </node>
         <node concept="2Hmddi" id="1TH_SRmLuzl" role="3cqZAp">
           <node concept="2OqwBi" id="1TH_SRmLuzm" role="2Hmdds">
-            <node concept="2OqwBi" id="5o9$c3zUbSC" role="2Oq$k0">
-              <node concept="2YIFZM" id="1TH_SRmLuzn" role="2Oq$k0">
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="1TH_SRmLuzo" role="37wK5m">
-                  <node concept="2WthIp" id="1TH_SRmLuzp" role="2Oq$k0" />
-                  <node concept="2XshWL" id="1TH_SRmLuzq" role="2OqNvi">
-                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="1TH_SRmLuzr" role="2XxRq1">
-                      <node concept="ZC_QK" id="1TH_SRmLvZX" role="2tJFKM">
-                        <ref role="2aWVGs" to="wqtl:1TH_SRmEWFy" resolve="Bounds" />
+            <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">
+                  <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                  <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                  <node concept="2OqwBi" id="1TH_SRmLuzo" role="37wK5m">
+                    <node concept="2WthIp" id="1TH_SRmLuzp" role="2Oq$k0" />
+                    <node concept="2XshWL" id="1TH_SRmLuzq" role="2OqNvi">
+                      <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                      <node concept="2tJFMh" id="1TH_SRmLuzr" role="2XxRq1">
+                        <node concept="ZC_QK" id="1TH_SRmLvZX" role="2tJFKM">
+                          <ref role="2aWVGs" to="wqtl:1TH_SRmEWFy" resolve="Bounds" />
+                        </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="1jxXqW" id="1TH_SRmLuzt" role="37wK5m" />
+                </node>
+                <node concept="liA8E" id="5o9$c3zUc8X" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
                 </node>
-                <node concept="1jxXqW" id="1TH_SRmLuzt" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="5o9$c3zUc8X" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
+              <node concept="liA8E" id="5BtuWK4Vevi" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
             <node concept="liA8E" id="1TH_SRmLuzu" role="2OqNvi">