diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
index 4a463b29..4f45b46b 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
@@ -297,8 +297,20 @@
                 </node>
                 <node concept="1jxXqW" id="27bTNFfbVEe" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbUSe" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
+              <node concept="liA8E" id="2BgB$z0LwU_" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                <node concept="1bVj0M" id="2BgB$z0LwUA" role="37wK5m">
+                  <node concept="3clFbS" id="2BgB$z0LwUB" role="1bW5cS">
+                    <node concept="3clFbF" id="2BgB$z0LwUC" role="3cqZAp">
+                      <node concept="2OqwBi" id="2BgB$z0LwUD" role="3clFbG">
+                        <node concept="2WthIp" id="2BgB$z0LwUE" role="2Oq$k0" />
+                        <node concept="2XshWL" id="2BgB$z0LwUF" role="2OqNvi">
+                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
             <node concept="liA8E" id="27bTNFfbxw5" role="2OqNvi">
@@ -377,8 +389,20 @@
                 </node>
                 <node concept="1jxXqW" id="27bTNFfbWaD" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="4ZGicUZkUjM" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
+              <node concept="liA8E" id="2BgB$z0LEnt" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                <node concept="1bVj0M" id="2BgB$z0LEnu" role="37wK5m">
+                  <node concept="3clFbS" id="2BgB$z0LEnv" role="1bW5cS">
+                    <node concept="3clFbF" id="2BgB$z0LEnw" role="3cqZAp">
+                      <node concept="2OqwBi" id="2BgB$z0LEnx" role="3clFbG">
+                        <node concept="2WthIp" id="2BgB$z0LEny" role="2Oq$k0" />
+                        <node concept="2XshWL" id="2BgB$z0LEnz" role="2OqNvi">
+                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
             <node concept="liA8E" id="27bTNFfbwTW" role="2OqNvi">
@@ -457,8 +481,20 @@
                 </node>
                 <node concept="1jxXqW" id="27bTNFfbW_l" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwVf" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
+              <node concept="liA8E" id="2BgB$z0LLkJ" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                <node concept="1bVj0M" id="2BgB$z0LLkK" role="37wK5m">
+                  <node concept="3clFbS" id="2BgB$z0LLkL" role="1bW5cS">
+                    <node concept="3clFbF" id="2BgB$z0LLkM" role="3cqZAp">
+                      <node concept="2OqwBi" id="2BgB$z0LLkN" role="3clFbG">
+                        <node concept="2WthIp" id="2BgB$z0LLkO" role="2Oq$k0" />
+                        <node concept="2XshWL" id="2BgB$z0LLkP" role="2OqNvi">
+                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
             <node concept="liA8E" id="27bTNFfbwVg" role="2OqNvi">
@@ -491,8 +527,20 @@
                 </node>
                 <node concept="1jxXqW" id="27bTNFfbWDf" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwVT" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
+              <node concept="liA8E" id="2BgB$z0LMIC" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                <node concept="1bVj0M" id="2BgB$z0LMID" role="37wK5m">
+                  <node concept="3clFbS" id="2BgB$z0LMIE" role="1bW5cS">
+                    <node concept="3clFbF" id="2BgB$z0LMIF" role="3cqZAp">
+                      <node concept="2OqwBi" id="2BgB$z0LMIG" role="3clFbG">
+                        <node concept="2WthIp" id="2BgB$z0LMIH" role="2Oq$k0" />
+                        <node concept="2XshWL" id="2BgB$z0LMII" role="2OqNvi">
+                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
             <node concept="liA8E" id="27bTNFfbwVU" role="2OqNvi">
@@ -525,8 +573,20 @@
                 </node>
                 <node concept="1jxXqW" id="RcyXiSVPlQ" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="4ZGicUYZkQw" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
+              <node concept="liA8E" id="73aHugggP6K" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                <node concept="1bVj0M" id="73aHugggP6L" role="37wK5m">
+                  <node concept="3clFbS" id="73aHugggP6M" role="1bW5cS">
+                    <node concept="3clFbF" id="73aHugggP6N" role="3cqZAp">
+                      <node concept="2OqwBi" id="73aHugggP6O" role="3clFbG">
+                        <node concept="2WthIp" id="73aHugggP6P" role="2Oq$k0" />
+                        <node concept="2XshWL" id="73aHugggP6Q" role="2OqNvi">
+                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
             <node concept="liA8E" id="RcyXiSVPlS" role="2OqNvi">
@@ -559,8 +619,20 @@
                 </node>
                 <node concept="1jxXqW" id="47tET_XohmB" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="47tET_XohmC" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
+              <node concept="liA8E" id="73aHuggheTU" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                <node concept="1bVj0M" id="73aHuggheTV" role="37wK5m">
+                  <node concept="3clFbS" id="73aHuggheTW" role="1bW5cS">
+                    <node concept="3clFbF" id="73aHuggheTX" role="3cqZAp">
+                      <node concept="2OqwBi" id="73aHuggheTY" role="3clFbG">
+                        <node concept="2WthIp" id="73aHuggheTZ" role="2Oq$k0" />
+                        <node concept="2XshWL" id="73aHuggheU0" role="2OqNvi">
+                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
             <node concept="liA8E" id="47tET_XohmD" role="2OqNvi">
@@ -593,8 +665,20 @@
                 </node>
                 <node concept="1jxXqW" id="47tET_XoiCF" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="47tET_XoiCG" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
+              <node concept="liA8E" id="73aHugghosD" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                <node concept="1bVj0M" id="73aHugghosE" role="37wK5m">
+                  <node concept="3clFbS" id="73aHugghosF" role="1bW5cS">
+                    <node concept="3clFbF" id="73aHugghosG" role="3cqZAp">
+                      <node concept="2OqwBi" id="73aHugghosH" role="3clFbG">
+                        <node concept="2WthIp" id="73aHugghosI" role="2Oq$k0" />
+                        <node concept="2XshWL" id="73aHugghosJ" role="2OqNvi">
+                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
             <node concept="liA8E" id="47tET_XoiCH" role="2OqNvi">