diff --git a/build.gradle b/build.gradle
index 39a5d7335..bcf7ea4ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -224,6 +224,21 @@ task buildLanguages(type: BuildLanguages, dependsOn: prebuild) {
     script "$buildDir/scripts/build-languages.xml"
 }
 
+task execTestsByInterpreter(type: TestLanguages, dependsOn: buildLanguages) {
+    script "$buildDir/scripts/build-testInterpreter.xml"
+    targets "generate","build"
+    doLast {
+        ant.taskdef(name: 'junitInterpreterReport',
+                classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
+                classpath: configurations.junitAnt.asPath)
+        ant.junitInterpreterReport(toDir: "$buildDir", toFile: "TEST-InterpreterTestSuites.xml") {
+            fileset(dir: "$buildDir", includes: '**/TEST-InterpreterTestSuites.xml')
+            report(format: 'frames', todir: "$buildDir/junitInterpreterReport")
+        }
+        ant.echo("JUnit Interpreter report placed into $buildDir/junitInterpreterReport/index.html")
+    }
+}
+
 
 task buildAndRunTests(type: TestLanguages, dependsOn: buildLanguages) {
     script "$buildDir/scripts/build-tests.xml"
diff --git a/code/languages/org.iets3.opensource/.mps/modules.xml b/code/languages/org.iets3.opensource/.mps/modules.xml
index c6e4f2f4a..f4eaf6b05 100644
--- a/code/languages/org.iets3.opensource/.mps/modules.xml
+++ b/code/languages/org.iets3.opensource/.mps/modules.xml
@@ -139,10 +139,10 @@
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.typetags.units.si/org.iets3.core.expr.typetags.units.si.msd" folder="expr.lang-advanced" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.util.interpreter/org.iets3.core.expr.util.interpreter.msd" folder="expr.lang-advanced" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.junit.interpreter.run.configuration/org.iets3.core.junit.interpreter.run.configuration.msd" folder="core" />
-      <modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.TestExecutorByInterpreter/org.iets3.opensource.TestExecutorByInterpreter.msd" folder="_build" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.allScripts.build/org.iets3.opensource.allScripts.build.msd" folder="_build" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.build.gentests.rt/org.iets3.opensource.build.gentests.rt.msd" folder="_build" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.build/org.iets3.opensource.build.msd" folder="_build" />
+      <modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.interpreterExecutor/org.iets3.opensource.interpreterExecutor.msd" folder="_build" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.linters/org.iets3.opensource.linters.msd" folder="linters" />
       <modulePath path="$PROJECT_DIR$/solutions/playground/playground.msd" folder="expr.tests" />
       <modulePath path="$PROJECT_DIR$/solutions/test.ex.core.expr.genjava/test.ex.core.expr.genjava.msd" folder="expr.genjava" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/models/org.iets3.core.junit.interpreter.run.configuration.plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/models/org.iets3.core.junit.interpreter.run.configuration.plugin.mps
index 4cadbd69f..a69ee1d0f 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/models/org.iets3.core.junit.interpreter.run.configuration.plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/models/org.iets3.core.junit.interpreter.run.configuration.plugin.mps
@@ -3750,9 +3750,6 @@
       </node>
       <node concept="3Tm1VV" id="3ZOWdXPxqjz" role="1B3o_S" />
       <node concept="3cqZAl" id="3ZOWdXPxqNX" role="3clF45" />
-      <node concept="2AHcQZ" id="6UkhXJgKwug" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
-      </node>
     </node>
     <node concept="2tJIrI" id="3ZOWdXP$ylz" role="jymVt" />
     <node concept="3clFb_" id="3ZOWdXPxuGE" role="jymVt">
@@ -4333,9 +4330,6 @@
     </node>
     <node concept="2tJIrI" id="4UL3Yhl8Erl" role="jymVt" />
     <node concept="3Tm1VV" id="2XSAFHY1998" role="1B3o_S" />
-    <node concept="3uibUv" id="6UkhXJgK1cW" role="EKbjA">
-      <ref role="3uigEE" to="34h4:5Ti9jVZ8rCq" resolve="TestExecutor" />
-    </node>
     <node concept="3clFb_" id="6UkhXJgKy3g" role="jymVt">
       <property role="TrG5h" value="init" />
       <property role="DiZV1" value="false" />
@@ -4442,9 +4436,6 @@
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="6UkhXJgKy3o" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
-      </node>
     </node>
     <node concept="2tJIrI" id="4UL3Yhl8C1x" role="jymVt" />
     <node concept="3clFb_" id="6UkhXJgK_MH" role="jymVt">
@@ -4505,9 +4496,6 @@
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="6UkhXJgK_MP" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
-      </node>
     </node>
   </node>
   <node concept="2DaZZR" id="68oKK$hzCZQ" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/org.iets3.core.junit.interpreter.run.configuration.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/org.iets3.core.junit.interpreter.run.configuration.msd
index c28160f9c..296888d24 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/org.iets3.core.junit.interpreter.run.configuration.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/org.iets3.core.junit.interpreter.run.configuration.msd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="org.iets3.core.junit.interpreter.run.configuration" uuid="bacb5ddc-bd96-4d54-a76e-63aeb598f7fb" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -12,7 +12,7 @@
   </facets>
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
-    <dependency reexport="true">f618e99a-2641-465c-bb54-31fe76f9e285(jetbrains.mps.baseLanguage.unitTest.execution)</dependency>
+    <dependency reexport="false">f618e99a-2641-465c-bb54-31fe76f9e285(jetbrains.mps.baseLanguage.unitTest.execution)</dependency>
     <dependency reexport="false">019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)</dependency>
     <dependency reexport="true">bf659d6c-5638-4ea1-972b-4d492b5a91f2(jetbrains.mps.execution.configurations.implementation.plugin)</dependency>
     <dependency reexport="false">04b376d5-fc16-403b-a344-c68b30193c6a(jetbrains.mps.execution.library)</dependency>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
index 09f61dca2..f4569b819 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
@@ -953,7 +953,6 @@
         </node>
         <node concept="1SiIV0" id="2MB0tFbRiVn" role="3bR37C">
           <node concept="3bR9La" id="2MB0tFbRiVo" role="1SiIV1">
-            <property role="3bR36h" value="true" />
             <ref role="3bR37D" to="ffeo:5xa9wY2vhbf" resolve="jetbrains.mps.baseLanguage.unitTest.execution" />
           </node>
         </node>
@@ -15393,96 +15392,95 @@
     </node>
     <node concept="2G$12M" id="5loVtKO0ksX" role="3989C9">
       <property role="TrG5h" value="testExecutor" />
-      <node concept="1E1JtA" id="7OQaAJRCS6v" role="2G$12L">
+      <node concept="1E1JtA" id="5jJR9m7XASm" role="2G$12L">
         <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="org.iets3.opensource.TestExecutorByInterpreter" />
+        <property role="TrG5h" value="org.iets3.opensource.interpreterExecutor" />
         <property role="3LESm3" value="26c41006-651b-45a4-aced-69694c3d5234" />
-        <property role="aoJFB" value="eYcmk9QOli/sources" />
-        <node concept="398BVA" id="7OQaAJRCSMb" role="3LF7KH">
+        <node concept="398BVA" id="5jJR9m7XASo" role="3LF7KH">
           <ref role="398BVh" node="7OQaAJRI74_" resolve="iets3.lang.opensource" />
-          <node concept="2Ry0Ak" id="7OQaAJRCSOH" role="iGT6I">
+          <node concept="2Ry0Ak" id="5jJR9m7XASs" role="iGT6I">
             <property role="2Ry0Am" value="solutions" />
-            <node concept="2Ry0Ak" id="5loVtKNYUDI" role="2Ry0An">
-              <property role="2Ry0Am" value="org.iets3.opensource.TestExecutorByInterpreter" />
-              <node concept="2Ry0Ak" id="4u2ErA3v9$X" role="2Ry0An">
-                <property role="2Ry0Am" value="org.iets3.opensource.TestExecutorByInterpreter.msd" />
+            <node concept="2Ry0Ak" id="5jJR9m7XTM8" role="2Ry0An">
+              <property role="2Ry0Am" value="org.iets3.opensource.interpreterExecutor" />
+              <node concept="2Ry0Ak" id="5jJR9m7XTMb" role="2Ry0An">
+                <property role="2Ry0Am" value="org.iets3.opensource.interpreterExecutor.msd" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="7OQaAJRCT9o" role="3bR37C">
-          <node concept="3bR9La" id="7OQaAJRCT9p" role="1SiIV1">
-            <ref role="3bR37D" node="ub9nkyRnyj" resolve="org.iets3.core.expr.tests" />
+        <node concept="1SiIV0" id="5jJR9m7XASz" role="3bR37C">
+          <node concept="3bR9La" id="5jJR9m7XAS$" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7OQaAJRCT9u" role="3bR37C">
-          <node concept="3bR9La" id="7OQaAJRCT9v" role="1SiIV1">
+        <node concept="1SiIV0" id="5jJR9m7XAS_" role="3bR37C">
+          <node concept="3bR9La" id="5jJR9m7XASA" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7OQaAJRCT9$" role="3bR37C">
-          <node concept="3bR9La" id="7OQaAJRCT9_" role="1SiIV1">
+        <node concept="1SiIV0" id="5jJR9m7XASB" role="3bR37C">
+          <node concept="3bR9La" id="5jJR9m7XASC" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:5xa9wY2vhbf" resolve="jetbrains.mps.baseLanguage.unitTest.execution" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="5jJR9m7XASD" role="3bR37C">
+          <node concept="3bR9La" id="5jJR9m7XASE" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7OQaAJRCT9A" role="3bR37C">
-          <node concept="3bR9La" id="7OQaAJRCT9B" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:5xa9wY2vhbf" resolve="jetbrains.mps.baseLanguage.unitTest.execution" />
+        <node concept="1SiIV0" id="5jJR9m7XASF" role="3bR37C">
+          <node concept="3bR9La" id="5jJR9m7XASG" role="1SiIV1">
+            <ref role="3bR37D" node="2MB0tFbRiNf" resolve="org.iets3.core.junit.interpreter.run.configuration" />
           </node>
         </node>
-        <node concept="1BupzO" id="7OQaAJRCT9N" role="3bR31x">
+        <node concept="1SiIV0" id="5jJR9m7XASH" role="3bR37C">
+          <node concept="3bR9La" id="5jJR9m7XASI" role="1SiIV1">
+            <ref role="3bR37D" node="ub9nkyRnyj" resolve="org.iets3.core.expr.tests" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="5jJR9m7XAT3" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
           <property role="1HemKv" value="true" />
-          <node concept="3LXTmp" id="4u2ErA3vypt" role="1HemKq">
-            <node concept="398BVA" id="4u2ErA3vypi" role="3LXTmr">
+          <node concept="3LXTmp" id="5jJR9m7XAT4" role="1HemKq">
+            <node concept="398BVA" id="5jJR9m7XASS" role="3LXTmr">
               <ref role="398BVh" node="7OQaAJRI74_" resolve="iets3.lang.opensource" />
-              <node concept="2Ry0Ak" id="4u2ErA3vypj" role="iGT6I">
+              <node concept="2Ry0Ak" id="5jJR9m7XAST" role="iGT6I">
                 <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="4u2ErA3vypk" role="2Ry0An">
-                  <property role="2Ry0Am" value="org.iets3.opensource.TestExecutorByInterpreter" />
-                  <node concept="2Ry0Ak" id="4u2ErA3vypl" role="2Ry0An">
+                <node concept="2Ry0Ak" id="5jJR9m7XASU" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.iets3.opensource.interpreter.executor" />
+                  <node concept="2Ry0Ak" id="5jJR9m7XASV" role="2Ry0An">
                     <property role="2Ry0Am" value="models" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3qWCbU" id="4u2ErA3vypu" role="3LXTna">
+            <node concept="3qWCbU" id="5jJR9m7XAT5" role="3LXTna">
               <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
             </node>
           </node>
         </node>
-        <node concept="3rtmxn" id="2U5AnelaqMe" role="3bR31x">
-          <node concept="3LXTmp" id="2U5AnelaqMf" role="3rtmxm">
-            <node concept="398BVA" id="2U5AnelaqMg" role="3LXTmr">
+        <node concept="3rtmxn" id="5jJR9m7XAUy" role="3bR31x">
+          <node concept="3LXTmp" id="5jJR9m7XAUz" role="3rtmxm">
+            <node concept="398BVA" id="5jJR9m7XAU$" role="3LXTmr">
               <ref role="398BVh" node="7OQaAJRI74_" resolve="iets3.lang.opensource" />
-              <node concept="2Ry0Ak" id="2U5AnelaqMh" role="iGT6I">
+              <node concept="2Ry0Ak" id="5jJR9m7XAU_" role="iGT6I">
                 <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="2U5AnelaqMi" role="2Ry0An">
-                  <property role="2Ry0Am" value="org.iets3.core.JunitInterpreterTest" />
+                <node concept="2Ry0Ak" id="5jJR9m7XAUA" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.iets3.opensource.interpreter.executor" />
                 </node>
               </node>
             </node>
-            <node concept="3qWCbU" id="2U5AnelaqMk" role="3LXTna">
-              <property role="3qWCbO" value="icons/**, resources/**" />
+            <node concept="3qWCbU" id="5jJR9m7XAUC" role="3LXTna">
+              <property role="3qWCbO" value="icons/**" />
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="4u2ErA3vype" role="3bR37C">
-          <node concept="3bR9La" id="4u2ErA3vypf" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4u2ErA3vypg" role="3bR37C">
-          <node concept="3bR9La" id="4u2ErA3vyph" role="1SiIV1">
-            <ref role="3bR37D" node="2MB0tFbRiNf" resolve="org.iets3.core.junit.interpreter.run.configuration" />
-          </node>
-        </node>
       </node>
     </node>
     <node concept="1YJUtn" id="7Lttyc2Ti3W" role="1hWBAP">
       <property role="3MWwXZ" value="MainClass" />
-      <ref role="30Vec$" node="7OQaAJRCS6v" resolve="org.iets3.core.InterpreterTestExecutor" />
+      <ref role="30Vec$" node="5jJR9m7XASm" resolve="org.iets3.opensource.interpreterExecutor" />
       <node concept="398BVA" id="7Lttyc2W9kv" role="1YJTkC">
         <ref role="398BVh" node="7OQaAJRI74_" resolve="iets3.lang.opensource" />
         <node concept="2Ry0Ak" id="7Lttyc2W9rm" role="iGT6I">
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.TestExecutorByInterpreter/models/org.iets3.opensource.TestExecutorByInterpreter.TestExecutorByInterpreter.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.interpreterExecutor/models/org.iets3.opensource.interpreterExecutor.mps
similarity index 99%
rename from code/languages/org.iets3.opensource/solutions/org.iets3.opensource.TestExecutorByInterpreter/models/org.iets3.opensource.TestExecutorByInterpreter.TestExecutorByInterpreter.mps
rename to code/languages/org.iets3.opensource/solutions/org.iets3.opensource.interpreterExecutor/models/org.iets3.opensource.interpreterExecutor.mps
index ebfd8f338..361179217 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.TestExecutorByInterpreter/models/org.iets3.opensource.TestExecutorByInterpreter.TestExecutorByInterpreter.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.interpreterExecutor/models/org.iets3.opensource.interpreterExecutor.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:e6296aef-14ff-4b06-8295-6014b91a9014(org.iets3.opensource.TestExecutorByInterpreter.TestExecutorByInterpreter)">
+<model ref="r:e6296aef-14ff-4b06-8295-6014b91a9014(org.iets3.opensource.interpreterExecutor)">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -16,7 +16,6 @@
     <import index="4o98" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.core.platform(MPS.Core/)" />
     <import index="sfqd" ref="r:63a75970-913d-4a7b-99e2-8ca72ff6f509(jetbrains.mps.baseLanguage.unitTest.execution.client)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="tpnd" ref="r:00000000-0000-4000-0000-011c89590405(jetbrains.mps.baseLanguage.unitTest.execution)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.TestExecutorByInterpreter/org.iets3.opensource.TestExecutorByInterpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.interpreterExecutor/org.iets3.opensource.interpreterExecutor.msd
similarity index 96%
rename from code/languages/org.iets3.opensource/solutions/org.iets3.opensource.TestExecutorByInterpreter/org.iets3.opensource.TestExecutorByInterpreter.msd
rename to code/languages/org.iets3.opensource/solutions/org.iets3.opensource.interpreterExecutor/org.iets3.opensource.interpreterExecutor.msd
index 6ac46c3db..c81f0982b 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.TestExecutorByInterpreter/org.iets3.opensource.TestExecutorByInterpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.interpreterExecutor/org.iets3.opensource.interpreterExecutor.msd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.opensource.TestExecutorByInterpreter" uuid="26c41006-651b-45a4-aced-69694c3d5234" moduleVersion="0">
+<solution name="org.iets3.opensource.interpreterExecutor" uuid="26c41006-651b-45a4-aced-69694c3d5234" moduleVersion="0">
   <models>
     <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="no" type="java">
+    <facet compile="mps" classes="mps" ext="yes" type="java">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -81,7 +81,7 @@
     <module reference="d441fba0-f46b-43cd-b723-dad7b65da615(org.iets3.core.expr.tests)" version="0" />
     <module reference="71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel)" version="2" />
     <module reference="bacb5ddc-bd96-4d54-a76e-63aeb598f7fb(org.iets3.core.junit.interpreter.run.configuration)" version="0" />
-    <module reference="26c41006-651b-45a4-aced-69694c3d5234(org.iets3.opensource.TestExecutorByInterpreter)" version="0" />
+    <module reference="26c41006-651b-45a4-aced-69694c3d5234(org.iets3.opensource.interpreterExecutor)" version="0" />
     <module reference="63b449db-0918-4a4a-a891-2c430ab133e4(org.junit.junit5)" version="0" />
   </dependencyVersions>
 </solution>