diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
index 63a29f68..665b1b5f 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
@@ -2402,7 +2402,7 @@
               <node concept="37vLTw" id="3evPR3Eel4m" role="2Oq$k0">
                 <ref role="3cqZAo" node="3evPR3Eeirh" resolve="rdiff" />
               </node>
-              <node concept="liA8E" id="3evPR3Eelvw" role="2OqNvi">
+              <node concept="liA8E" id="65y6zSCCY33" role="2OqNvi">
                 <ref role="37wK5l" to="zx3l:~RulesDiff.getAdded()" resolve="getAdded" />
               </node>
             </node>
@@ -2471,8 +2471,8 @@
                         <node concept="37vLTw" id="3evPR3Eemw2" role="2Oq$k0">
                           <ref role="3cqZAo" node="3evPR3Eemw4" resolve="it" />
                         </node>
-                        <node concept="liA8E" id="3evPR3Eemw3" role="2OqNvi">
-                          <ref role="37wK5l" to="av0y:~Rule.tag()" resolve="tag" />
+                        <node concept="liA8E" id="65y6zSCD20r" role="2OqNvi">
+                          <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
                         </node>
                       </node>
                     </node>
@@ -2485,7 +2485,9 @@
               </node>
             </node>
             <node concept="A3Dl8" id="3evPR3Eemw6" role="1tU5fm">
-              <node concept="17QB3L" id="3evPR3Eemw7" role="A3Ik2" />
+              <node concept="3uibUv" id="65y6zSCD2j2" role="A3Ik2">
+                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              </node>
             </node>
           </node>
         </node>
@@ -2735,19 +2737,42 @@
                 <node concept="37vLTw" id="3evPR3EeopK" role="37vLTJ">
                   <ref role="3cqZAo" node="3evPR3EeopE" resolve="refRepr" />
                 </node>
-                <node concept="2OqwBi" id="3evPR3EeopL" role="37vLTx">
-                  <node concept="1eOMI4" id="3evPR3EeopM" role="2Oq$k0">
-                    <node concept="10QFUN" id="3evPR3EeopN" role="1eOMHV">
-                      <node concept="3Tqbb2" id="3evPR3EeopO" role="10QFUM">
-                        <ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                <node concept="3cpWs3" id="4vr5SAqV66P" role="37vLTx">
+                  <node concept="Xl_RD" id="4vr5SAqV67Z" role="3uHU7w">
+                    <property role="Xl_RC" value=")" />
+                  </node>
+                  <node concept="3cpWs3" id="4vr5SAqV4Lr" role="3uHU7B">
+                    <node concept="3cpWs3" id="4vr5SAqV4tZ" role="3uHU7B">
+                      <node concept="2OqwBi" id="3evPR3EeopL" role="3uHU7B">
+                        <node concept="1eOMI4" id="3evPR3EeopM" role="2Oq$k0">
+                          <node concept="10QFUN" id="3evPR3EeopN" role="1eOMHV">
+                            <node concept="3Tqbb2" id="3evPR3EeopO" role="10QFUM">
+                              <ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                            </node>
+                            <node concept="37vLTw" id="6uUkLpHmapZ" role="10QFUP">
+                              <ref role="3cqZAo" node="6uUkLpHm9vL" resolve="node" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3TrcHB" id="3evPR3EeopQ" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
                       </node>
-                      <node concept="37vLTw" id="6uUkLpHmapZ" role="10QFUP">
-                        <ref role="3cqZAo" node="6uUkLpHm9vL" resolve="node" />
+                      <node concept="Xl_RD" id="4vr5SAqV4Fq" role="3uHU7w">
+                        <property role="Xl_RC" value=" (" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="4vr5SAqV5vL" role="3uHU7w">
+                      <node concept="2OqwBi" id="4vr5SAqV54$" role="2Oq$k0">
+                        <node concept="37vLTw" id="4vr5SAqV4Z5" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6uUkLpHm9vL" resolve="node" />
+                        </node>
+                        <node concept="2yIwOk" id="4vr5SAqV5m5" role="2OqNvi" />
+                      </node>
+                      <node concept="liA8E" id="4vr5SAqV5RB" role="2OqNvi">
+                        <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
                       </node>
                     </node>
-                  </node>
-                  <node concept="3TrcHB" id="3evPR3EeopQ" role="2OqNvi">
-                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                   </node>
                 </node>
               </node>