diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index 4c8f7f21..3ae18c7e 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -535,6 +535,98 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="2DIFeUB7ncx" role="3cqZAp" />
+        <node concept="1nLNNL" id="2DIFeUB7n66" role="3cqZAp">
+          <node concept="1nLNMm" id="2DIFeUB7n67" role="1nLNNK">
+            <node concept="0eUR_" id="2DIFeUB7n68" role="0UC6o" />
+            <node concept="3Aq93q" id="2DIFeUB7n6g" role="1nLNMb">
+              <property role="3ArMco" value="false" />
+              <node concept="3I6sU6" id="2DIFeUB7n6h" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2DIFeUB7n6i" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2DIFeUB7n6j" role="3I6s78">
+                    <ref role="3AqCNq" node="3IIf9OArhmN" resolve="convert" />
+                    <node concept="1HFMs5" id="2DIFeUB7n6k" role="3AunhB">
+                      <node concept="a7P8L" id="2DIFeUB7seu" role="1uarlU">
+                        <ref role="a7OzE" node="7mB3viLi4pQ" resolve="A" />
+                      </node>
+                      <node concept="ns1u0" id="2DIFeUB7n6m" role="1uarlW">
+                        <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
+                        <node concept="nsMwS" id="2DIFeUB7n6n" role="ns1xD">
+                          <ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
+                          <node concept="Xl_RD" id="2DIFeUB7n6o" role="nsMwV">
+                            <property role="Xl_RC" value="String" />
+                          </node>
+                        </node>
+                        <node concept="nsMwS" id="2DIFeUB7n6p" role="ns1xD">
+                          <ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
+                          <node concept="1nq8_$" id="2DIFeUB7n6q" role="nsMwV">
+                            <node concept="a7P8L" id="2DIFeUB7sez" role="1nq8_t">
+                              <ref role="a7OzE" node="7mB3viLi4pZ" resolve="AVal" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1HFMs5" id="2DIFeUB7n6s" role="3AunhB">
+                      <node concept="a7P8L" id="2DIFeUB7seA" role="1uarlU">
+                        <ref role="a7OzE" node="7mB3viLi4qh" resolve="B" />
+                      </node>
+                      <node concept="ns1u0" id="2DIFeUB7n6u" role="1uarlW">
+                        <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
+                        <node concept="nsMwS" id="2DIFeUB7n6v" role="ns1xD">
+                          <ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
+                          <node concept="Xl_RD" id="2DIFeUB7n6w" role="nsMwV">
+                            <property role="Xl_RC" value="String" />
+                          </node>
+                        </node>
+                        <node concept="nsMwS" id="2DIFeUB7n6x" role="ns1xD">
+                          <ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
+                          <node concept="1nq8_$" id="2DIFeUB7n6y" role="nsMwV">
+                            <node concept="a7P8L" id="2DIFeUB7seD" role="1nq8_t">
+                              <ref role="a7OzE" node="7mB3viLi4qx" resolve="BVal" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq9_M" id="2DIFeUB7n6$" role="1nLNMa">
+              <node concept="3I6sU6" id="2DIFeUB7n6_" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2DIFeUB7n6A" role="3I6sU7">
+                  <node concept="3wWvb2" id="2DIFeUB7n6B" role="3I6s78">
+                    <node concept="2dkUwp" id="2DIFeUB7n6C" role="3wWo3s">
+                      <node concept="2YIFZM" id="2DIFeUB7n6D" role="3uHU7B">
+                        <ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String)" resolve="valueOf" />
+                        <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
+                        <node concept="1TmgYN" id="2DIFeUB7n6E" role="37wK5m">
+                          <node concept="1nq8_$" id="2DIFeUB7n6F" role="1Tms7$">
+                            <node concept="a7P8L" id="2DIFeUB7seG" role="1nq8_t">
+                              <ref role="a7OzE" node="7mB3viLi4pZ" resolve="AVal" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2YIFZM" id="2DIFeUB7n6H" role="3uHU7w">
+                        <ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String)" resolve="valueOf" />
+                        <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
+                        <node concept="1TmgYN" id="2DIFeUB7n6I" role="37wK5m">
+                          <node concept="1nq8_$" id="2DIFeUB7n6J" role="1Tms7$">
+                            <node concept="a7P8L" id="2DIFeUB7seJ" role="1nq8_t">
+                              <ref role="a7OzE" node="7mB3viLi4qx" resolve="BVal" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbH" id="7mB3viLien3" role="3cqZAp" />
         <node concept="1nLNNL" id="7mB3viLiewM" role="3cqZAp">
           <node concept="1nLNMm" id="7mB3viLiewO" role="1nLNNK">
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
index a565fd58..d720b462 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
@@ -230,9 +230,6 @@
         <property id="8477760168144047169" name="name" index="34yo6P" />
         <property id="8477760168145258292" name="val" index="34TwF0" />
       </concept>
-      <concept id="8477760168143982781" name="jetbrains.mps.typechecking.testlang.structure.Int" flags="ng" index="34yDP9">
-        <property id="8477760168143982782" name="val" index="34yDPa" />
-      </concept>
       <concept id="8477760168143925028" name="jetbrains.mps.typechecking.testlang.structure.VarDeclStmt" flags="ng" index="34yUbg">
         <child id="8477760168143925044" name="decl" index="34yUb0" />
         <child id="8477760168143925046" name="init" index="34yUb2" />
@@ -1754,7 +1751,7 @@
                     <node concept="2YFouu" id="3IIf9OA4zNd" role="3vwVQn">
                       <node concept="2c44tf" id="3IIf9OA4zNe" role="3uHU7B">
                         <node concept="34yo6O" id="7mB3viLiDA8" role="2c44tc">
-                          <property role="34yo6P" value="Integer" />
+                          <property role="34yo6P" value="String" />
                           <property role="34TwF0" value="123" />
                         </node>
                       </node>
@@ -1770,7 +1767,7 @@
                       </node>
                       <node concept="2c44tf" id="7mB3viLiFZo" role="3uHU7B">
                         <node concept="34yo6O" id="7mB3viLiFZp" role="2c44tc">
-                          <property role="34yo6P" value="Integer" />
+                          <property role="34yo6P" value="String" />
                           <property role="34TwF0" value="1234" />
                         </node>
                       </node>
@@ -2019,7 +2016,7 @@
                 </node>
                 <node concept="2c44tf" id="4BHjwwGESbl" role="JA92f">
                   <node concept="34yo6O" id="7mB3viLeK$h" role="2c44tc">
-                    <property role="34yo6P" value="Integer" />
+                    <property role="34yo6P" value="String" />
                     <property role="34TwF0" value="123" />
                   </node>
                 </node>
@@ -2054,8 +2051,8 @@
           <node concept="34yUbh" id="7mB3viLdNfV" role="34yUb0">
             <property role="TrG5h" value="bar" />
           </node>
-          <node concept="34yDP9" id="7mB3viLdNg5" role="34yUb2">
-            <property role="34yDPa" value="123" />
+          <node concept="34$_Ec" id="2DIFeUB7BAT" role="34yUb2">
+            <property role="34$_Ed" value="123" />
           </node>
           <node concept="3xLA65" id="7mB3viLoFYN" role="lGtFl">
             <property role="TrG5h" value="bar" />
@@ -2065,8 +2062,8 @@
           <node concept="34yUbh" id="7mB3viLioHH" role="34yUb0">
             <property role="TrG5h" value="qux" />
           </node>
-          <node concept="34yDP9" id="7mB3viLioHI" role="34yUb2">
-            <property role="34yDPa" value="1234" />
+          <node concept="34$_Ec" id="2DIFeUB7BE9" role="34yUb2">
+            <property role="34$_Ed" value="1234" />
           </node>
         </node>
         <node concept="3xLA65" id="7mB3viLoFoM" role="lGtFl">
@@ -2144,7 +2141,7 @@
           <node concept="2YFouu" id="3KwBCAAB$Qd" role="3vwVQn">
             <node concept="2c44tf" id="3KwBCAAB$Qe" role="3uHU7B">
               <node concept="34yo6O" id="7mB3viLoH6n" role="2c44tc">
-                <property role="34yo6P" value="Integer" />
+                <property role="34yo6P" value="String" />
                 <property role="34TwF0" value="123" />
               </node>
             </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/models/jetbrains.mps.coderules.typechecking.testlang.sandbox.test.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/models/jetbrains.mps.coderules.typechecking.testlang.sandbox.test.mps
index 43a852aa..e144b5bf 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/models/jetbrains.mps.coderules.typechecking.testlang.sandbox.test.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/models/jetbrains.mps.coderules.typechecking.testlang.sandbox.test.mps
@@ -10,9 +10,6 @@
       <concept id="8456919074565735802" name="jetbrains.mps.typechecking.testlang.structure.Root" flags="ng" index="0U$pH">
         <child id="8456919074565735822" name="stmt" index="0U$qp" />
       </concept>
-      <concept id="8477760168143982781" name="jetbrains.mps.typechecking.testlang.structure.Int" flags="ng" index="34yDP9">
-        <property id="8477760168143982782" name="val" index="34yDPa" />
-      </concept>
       <concept id="8477760168143925028" name="jetbrains.mps.typechecking.testlang.structure.VarDeclStmt" flags="ng" index="34yUbg">
         <child id="8477760168143925044" name="decl" index="34yUb0" />
         <child id="8477760168143925046" name="init" index="34yUb2" />
@@ -42,16 +39,16 @@
       <node concept="34yUbh" id="7mB3viLdNfV" role="34yUb0">
         <property role="TrG5h" value="bar" />
       </node>
-      <node concept="34yDP9" id="7mB3viLdNg5" role="34yUb2">
-        <property role="34yDPa" value="123" />
+      <node concept="34$_Ec" id="2DIFeUB7hka" role="34yUb2">
+        <property role="34$_Ed" value="123" />
       </node>
     </node>
     <node concept="34yUbg" id="7mB3viLioHG" role="0U$qp">
       <node concept="34yUbh" id="7mB3viLioHH" role="34yUb0">
         <property role="TrG5h" value="qux" />
       </node>
-      <node concept="34yDP9" id="7mB3viLioHI" role="34yUb2">
-        <property role="34yDPa" value="1234" />
+      <node concept="34$_Ec" id="2DIFeUB7hkc" role="34yUb2">
+        <property role="34$_Ed" value="1234" />
       </node>
     </node>
   </node>