diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30463c3cd3..9aeb4a93a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
 
 - A null pointer was fixed that was related to showing the documentation when the documentation tab is not opened.
 - The documentation Tool is now only updated when the selection changed.
+- com.mbeddr.mpsutil.compare: the diff preview feature now also works in external classes and not only test cases.
 
 ## com.mbeddr.mpsutil
 
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps
index 4a9aca6005..88ef2499cb 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps
@@ -20,10 +20,12 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
+    <import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" implicit="true" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
-      <concept id="1225467090849" name="jetbrains.mps.lang.test.structure.ProjectExpression" flags="nn" index="1jxXqW" />
       <concept id="1225978065297" name="jetbrains.mps.lang.test.structure.SimpleNodeTest" flags="ng" index="1LZb2c" />
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -115,6 +117,9 @@
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
     </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
       <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
@@ -529,7 +534,7 @@
                       <node concept="3clFbS" id="6Qumy0DZmBE" role="3clFbx">
                         <node concept="3clFbH" id="2RIzFJ7GzXl" role="3cqZAp">
                           <node concept="1sPUBX" id="2RIzFJ7HaPc" role="lGtFl">
-                            <ref role="v9R2y" node="2RIzFJ7Guov" resolve="switchDiffViewnContent" />
+                            <ref role="v9R2y" node="2RIzFJ7Guov" resolve="switchDiffViewContent" />
                           </node>
                         </node>
                       </node>
@@ -905,7 +910,7 @@
     </node>
   </node>
   <node concept="jVnub" id="2RIzFJ7Guov">
-    <property role="TrG5h" value="switchDiffViewnContent" />
+    <property role="TrG5h" value="switchDiffViewContent" />
     <node concept="3aamgX" id="2RIzFJ7GM5y" role="3aUrZf">
       <property role="36QftV" value="true" />
       <ref role="30HIoZ" to="8do3:DYlgnAyXkO" resolve="AssertNodeEquals" />
@@ -925,6 +930,31 @@
             </node>
             <node concept="9aQIb" id="2RIzFJ7GTOF" role="3cqZAp">
               <node concept="3clFbS" id="2RIzFJ7GTOG" role="9aQI4">
+                <node concept="3cpWs8" id="3iWn33TWTI" role="3cqZAp">
+                  <node concept="3cpWsn" id="3iWn33TWTJ" role="3cpWs9">
+                    <property role="TrG5h" value="repository" />
+                    <node concept="3uibUv" id="3iWn33TWTK" role="1tU5fm">
+                      <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                    </node>
+                    <node concept="2OqwBi" id="3iWn33U0$O" role="33vP2m">
+                      <node concept="2OqwBi" id="3iWn33TZ1U" role="2Oq$k0">
+                        <node concept="2YIFZM" id="3iWn33TYyb" role="2Oq$k0">
+                          <ref role="37wK5l" to="3a50:~MPSCoreComponents.getInstance()" resolve="getInstance" />
+                          <ref role="1Pybhc" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
+                        </node>
+                        <node concept="liA8E" id="3iWn33U0dn" role="2OqNvi">
+                          <ref role="37wK5l" to="3a50:~MPSCoreComponents.getPlatform()" resolve="getPlatform" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="3iWn33U0VU" role="2OqNvi">
+                        <ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
+                        <node concept="3VsKOn" id="3iWn33U2Cm" role="37wK5m">
+                          <ref role="3VsUkX" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
                 <node concept="3cpWs8" id="2RIzFJ7GTQa" role="3cqZAp">
                   <node concept="3cpWsn" id="2RIzFJ7GTQb" role="3cpWs9">
                     <property role="TrG5h" value="origExpected" />
@@ -992,11 +1022,8 @@
                       </node>
                       <node concept="liA8E" id="2RIzFJ7GTQD" role="2OqNvi">
                         <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
-                        <node concept="2OqwBi" id="2RIzFJ7GTQE" role="37wK5m">
-                          <node concept="1jxXqW" id="2RIzFJ7H1$E" role="2Oq$k0" />
-                          <node concept="liA8E" id="2RIzFJ7GTQG" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
-                          </node>
+                        <node concept="37vLTw" id="3iWn33U3WY" role="37wK5m">
+                          <ref role="3cqZAo" node="3iWn33TWTJ" resolve="repository" />
                         </node>
                       </node>
                     </node>
@@ -1061,11 +1088,8 @@
                         </node>
                         <node concept="liA8E" id="6Od11GYabM6" role="2OqNvi">
                           <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
-                          <node concept="2OqwBi" id="6Od11GYacGV" role="37wK5m">
-                            <node concept="1jxXqW" id="6Od11GYacax" role="2Oq$k0" />
-                            <node concept="liA8E" id="6Od11GYadnL" role="2OqNvi">
-                              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
-                            </node>
+                          <node concept="37vLTw" id="3iWn33UP_B" role="37wK5m">
+                            <ref role="3cqZAo" node="3iWn33TWTJ" resolve="repository" />
                           </node>
                         </node>
                       </node>
@@ -1138,11 +1162,8 @@
                     <node concept="37vLTw" id="6Od11GYap_v" role="37wK5m">
                       <ref role="3cqZAo" node="6Od11GYaj1i" resolve="input" />
                     </node>
-                    <node concept="2OqwBi" id="2RIzFJ7H23D" role="37wK5m">
-                      <node concept="1jxXqW" id="6Od11GY9g4Z" role="2Oq$k0" />
-                      <node concept="liA8E" id="2RIzFJ7H23F" role="2OqNvi">
-                        <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
-                      </node>
+                    <node concept="37vLTw" id="3iWn33U5qZ" role="37wK5m">
+                      <ref role="3cqZAo" node="3iWn33TWTJ" resolve="repository" />
                     </node>
                   </node>
                 </node>
@@ -1234,6 +1255,31 @@
             </node>
             <node concept="9aQIb" id="2RIzFJ7H6C7" role="3cqZAp">
               <node concept="3clFbS" id="2RIzFJ7H6C8" role="9aQI4">
+                <node concept="3cpWs8" id="3iWn33U5Ks" role="3cqZAp">
+                  <node concept="3cpWsn" id="3iWn33U5Kt" role="3cpWs9">
+                    <property role="TrG5h" value="repository" />
+                    <node concept="3uibUv" id="3iWn33U5Ku" role="1tU5fm">
+                      <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                    </node>
+                    <node concept="2OqwBi" id="3iWn33U5Kv" role="33vP2m">
+                      <node concept="2OqwBi" id="3iWn33U5Kw" role="2Oq$k0">
+                        <node concept="2YIFZM" id="3iWn33U5Kx" role="2Oq$k0">
+                          <ref role="37wK5l" to="3a50:~MPSCoreComponents.getInstance()" resolve="getInstance" />
+                          <ref role="1Pybhc" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
+                        </node>
+                        <node concept="liA8E" id="3iWn33U5Ky" role="2OqNvi">
+                          <ref role="37wK5l" to="3a50:~MPSCoreComponents.getPlatform()" resolve="getPlatform" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="3iWn33U5Kz" role="2OqNvi">
+                        <ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
+                        <node concept="3VsKOn" id="3iWn33U5K$" role="37wK5m">
+                          <ref role="3VsUkX" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
                 <node concept="3cpWs8" id="6Od11GYalx3" role="3cqZAp">
                   <node concept="3cpWsn" id="6Od11GYalx4" role="3cpWs9">
                     <property role="TrG5h" value="input" />
@@ -1277,11 +1323,8 @@
                         </node>
                         <node concept="liA8E" id="6Od11GYalxm" role="2OqNvi">
                           <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
-                          <node concept="2OqwBi" id="6Od11GYalxn" role="37wK5m">
-                            <node concept="1jxXqW" id="6Od11GYalxo" role="2Oq$k0" />
-                            <node concept="liA8E" id="6Od11GYalxp" role="2OqNvi">
-                              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
-                            </node>
+                          <node concept="37vLTw" id="3iWn33UOXp" role="37wK5m">
+                            <ref role="3cqZAo" node="3iWn33U5Kt" resolve="repository" />
                           </node>
                         </node>
                       </node>
@@ -1368,11 +1411,8 @@
                     <node concept="37vLTw" id="5oR1gCFTGbq" role="37wK5m">
                       <ref role="3cqZAo" node="6Od11GYalx4" resolve="input" />
                     </node>
-                    <node concept="2OqwBi" id="5oR1gCFTGbr" role="37wK5m">
-                      <node concept="1jxXqW" id="5oR1gCFTGbs" role="2Oq$k0" />
-                      <node concept="liA8E" id="5oR1gCFTGbt" role="2OqNvi">
-                        <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
-                      </node>
+                    <node concept="37vLTw" id="3iWn33U6sm" role="37wK5m">
+                      <ref role="3cqZAo" node="3iWn33U5Kt" resolve="repository" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps
index 853627e317..ff421494ef 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps
@@ -12,6 +12,7 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
@@ -69,6 +70,7 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
+      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
@@ -728,6 +730,41 @@
         </node>
       </node>
     </node>
+    <node concept="1LZb2c" id="3iWn33UB39" role="1SL9yI">
+      <property role="TrG5h" value="helperClass" />
+      <node concept="3cqZAl" id="3iWn33UB3a" role="3clF45" />
+      <node concept="3clFbS" id="3iWn33UB3b" role="3clF47">
+        <node concept="3clFbJ" id="3iWn33UB3c" role="3cqZAp">
+          <node concept="3clFbS" id="3iWn33UB3d" role="3clFbx">
+            <node concept="3cpWs6" id="3iWn33UB3e" role="3cqZAp" />
+          </node>
+          <node concept="3fqX7Q" id="3iWn33UB3f" role="3clFbw">
+            <node concept="2OqwBi" id="3iWn33UB3g" role="3fr31v">
+              <node concept="2WthIp" id="3iWn33UB3h" role="2Oq$k0" />
+              <node concept="2XshWL" id="3iWn33UB3i" role="2OqNvi">
+                <ref role="2WH_rO" node="3j0GERRSceI" resolve="testsEnabled" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3iWn33UB3j" role="3cqZAp" />
+        <node concept="3clFbF" id="3iWn33UBHi" role="3cqZAp">
+          <node concept="2YIFZM" id="3iWn33UBIH" role="3clFbG">
+            <ref role="37wK5l" node="3iWn33UAZJ" resolve="compare" />
+            <ref role="1Pybhc" node="3iWn33UAWP" resolve="HelperClass" />
+            <node concept="2OqwBi" id="3iWn33UBOa" role="37wK5m">
+              <node concept="2WthIp" id="3iWn33UBJK" role="2Oq$k0" />
+              <node concept="2XshWL" id="3iWn33UBSN" role="2OqNvi">
+                <ref role="2WH_rO" node="2RIzFJ7FNYX" resolve="expected" />
+              </node>
+            </node>
+            <node concept="3xONca" id="3iWn33UBV$" role="37wK5m">
+              <ref role="3xOPvv" node="6Qumy0DUPjP" resolve="wrong" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1LZb2c" id="5oR1gCFPHyE" role="1SL9yI">
       <property role="TrG5h" value="editibleFromMemory1" />
       <node concept="3cqZAl" id="5oR1gCFPHyF" role="3clF45" />
@@ -927,5 +964,32 @@
   <node concept="2XOHcx" id="4X7wieqDZ0B">
     <property role="2XOHcw" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.mpsutil" />
   </node>
+  <node concept="312cEu" id="3iWn33UAWP">
+    <property role="TrG5h" value="HelperClass" />
+    <node concept="2YIFZL" id="3iWn33UAZJ" role="jymVt">
+      <property role="TrG5h" value="compare" />
+      <node concept="3clFbS" id="3iWn33UAZM" role="3clF47">
+        <node concept="3GXo0L" id="3iWn33UBrh" role="3cqZAp">
+          <node concept="37vLTw" id="3iWn33UB$D" role="3tpDZB">
+            <ref role="3cqZAo" node="3iWn33UByy" resolve="expected" />
+          </node>
+          <node concept="37vLTw" id="3iWn33UBBL" role="3tpDZA">
+            <ref role="3cqZAo" node="3iWn33UB_l" resolve="actual" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3iWn33UAZ9" role="1B3o_S" />
+      <node concept="3cqZAl" id="3iWn33UB0k" role="3clF45" />
+      <node concept="37vLTG" id="3iWn33UByy" role="3clF46">
+        <property role="TrG5h" value="expected" />
+        <node concept="3Tqbb2" id="3iWn33UByx" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3iWn33UB_l" role="3clF46">
+        <property role="TrG5h" value="actual" />
+        <node concept="3Tqbb2" id="3iWn33UBAb" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="3iWn33UAWQ" role="1B3o_S" />
+  </node>
 </model>