diff --git a/build.gradle b/build.gradle
index 6566f6bee..93c97db01 100644
--- a/build.gradle
+++ b/build.gradle
@@ -224,21 +224,6 @@ 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 "build"
-    doLast {
-        ant.taskdef(name: 'junitInterpreterReport',
-                classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
-                classpath: configurations.junitAnt.asPath)
-        ant.junitInterpreterReport {
-            fileset(dir: "$buildDir", includes: '**/TEST*.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 8649f7492..2e5bc28d8 100644
--- a/code/languages/org.iets3.opensource/.mps/modules.xml
+++ b/code/languages/org.iets3.opensource/.mps/modules.xml
@@ -83,7 +83,6 @@
       <modulePath path="$PROJECT_DIR$/languages/test.ts.expr.os.validNameConcept/test.ts.expr.os.validNameConcept.mpl" folder="expr.tests" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.components.core.interpreter/org.iets3.components.core.interpreter.msd" folder="comp" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.components.core.sandbox/org.iets3.components.core.sandbox.msd" folder="comp" />
-      <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.InterpreterTestExecutor/org.iets3.core.InterpreterTestExecutor.msd" folder="core" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.JunitInterpreterTest/org.iets3.core.JunitInterpreterTest.msd" folder="core" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.adt.interpreter/org.iets3.core.expr.adt.interpreter.msd" folder="expr.lang-advanced" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.base.collections.stubs/org.iets3.core.expr.base.collections.stubs.msd" folder="expr.lang-core" />
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 e3fc27c91..8fc1654f3 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
@@ -113,13 +113,6 @@
         <reference id="4903714810883702018" name="macro" index="3Mxwex" />
       </concept>
     </language>
-    <language id="427a473d-5177-432c-9905-bcbceb71b996" name="jetbrains.mps.build.mps.runner">
-      <concept id="4173297143638950526" name="jetbrains.mps.build.mps.runner.structure.BuildSolutionRunnerAspect" flags="ng" index="_awnq">
-        <property id="2265409456634484378" name="classSimpleName" index="3MWwXZ" />
-        <reference id="6102524510011680401" name="solution" index="30Vec$" />
-      </concept>
-      <concept id="4173297143638832582" name="jetbrains.mps.build.mps.runner.structure.BuildSolutionRunnerPlugin" flags="ng" index="_l39y" />
-    </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -14728,227 +14721,5 @@
     <node concept="55IIr" id="1YwzPHwBxn1" role="auvoZ" />
     <node concept="1l3spV" id="1YwzPHwBxn2" role="1l3spN" />
   </node>
-  <node concept="1l3spW" id="7OQaAJRI72P">
-    <property role="TrG5h" value="org.iets3.opensource.interpreter.testExecutor" />
-    <property role="2DA0ip" value="../../../../../build/scripts" />
-    <property role="turDy" value="build-testInterpreter.xml" />
-    <node concept="m$_wf" id="5loVtKO0krH" role="3989C9">
-      <property role="m$_wk" value="testExecutor" />
-      <node concept="3_J27D" id="5loVtKO0krJ" role="m$_yQ">
-        <node concept="3Mxwew" id="5loVtKO0ksn" role="3MwsjC">
-          <property role="3MwjfP" value="testExecutor" />
-        </node>
-      </node>
-      <node concept="3_J27D" id="5loVtKO0krL" role="m_cZH">
-        <node concept="3Mxwew" id="5loVtKO0kuV" role="3MwsjC">
-          <property role="3MwjfP" value="testExecutor" />
-        </node>
-      </node>
-      <node concept="3_J27D" id="5loVtKO0krN" role="m$_w8">
-        <node concept="3Mxwey" id="5loVtKO0ku5" role="3MwsjC">
-          <ref role="3Mxwex" node="2I_jb36R5Ye" resolve="version" />
-        </node>
-      </node>
-      <node concept="m$_yC" id="5loVtKO0ksl" role="m$_yJ">
-        <ref role="m$_y1" node="5loVtKNYW0J" resolve="org.iets3.core.JUnitInterpreterTest" />
-      </node>
-      <node concept="m$f5U" id="5loVtKO0kuX" role="m$_yh">
-        <ref role="m$f5T" node="5loVtKO0ksX" resolve="testExecutor" />
-      </node>
-    </node>
-    <node concept="2igEWh" id="wLSoj1MVqs" role="1hWBAP">
-      <property role="3UIfUI" value="4096" />
-    </node>
-    <node concept="10PD9b" id="2U5AnekTBPu" role="10PD9s" />
-    <node concept="2sgV4H" id="2U5AnekTBPz" role="1l3spa">
-      <ref role="1l3spb" to="ffeo:3IKDaVZmzS6" resolve="mps" />
-      <node concept="398BVA" id="2U5AnekTBRh" role="2JcizS">
-        <ref role="398BVh" node="7OQaAJRI74x" resolve="mps.home" />
-      </node>
-    </node>
-    <node concept="398rNT" id="7OQaAJRI74t" role="1l3spd">
-      <property role="TrG5h" value="iets3.github.opensource.home" />
-      <node concept="55IIr" id="7OQaAJRI74u" role="398pKh">
-        <node concept="2Ry0Ak" id="7OQaAJRI74v" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="7OQaAJRI74w" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="398rNT" id="7OQaAJRI74x" role="1l3spd">
-      <property role="TrG5h" value="mps.home" />
-      <node concept="398BVA" id="7OQaAJRI74y" role="398pKh">
-        <ref role="398BVh" node="7OQaAJRI74t" resolve="iets3.github.opensource.home" />
-        <node concept="2Ry0Ak" id="7OQaAJRI74z" role="iGT6I">
-          <property role="2Ry0Am" value="build" />
-          <node concept="2Ry0Ak" id="7OQaAJRI74$" role="2Ry0An">
-            <property role="2Ry0Am" value="mps" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="398rNT" id="7OQaAJRI74_" role="1l3spd">
-      <property role="TrG5h" value="iets3.lang.opensource" />
-      <node concept="398BVA" id="7OQaAJRI74A" role="398pKh">
-        <ref role="398BVh" node="7OQaAJRI74t" resolve="iets3.github.opensource.home" />
-        <node concept="2Ry0Ak" id="7OQaAJRI74B" role="iGT6I">
-          <property role="2Ry0Am" value="code" />
-          <node concept="2Ry0Ak" id="7OQaAJRI74C" role="2Ry0An">
-            <property role="2Ry0Am" value="languages" />
-            <node concept="2Ry0Ak" id="7OQaAJRI74D" role="2Ry0An">
-              <property role="2Ry0Am" value="org.iets3.opensource" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="398rNT" id="2U5Anele3KX" role="1l3spd">
-      <property role="TrG5h" value="iets3.artifacts.root" />
-      <node concept="398BVA" id="2U5Anele3KY" role="398pKh">
-        <ref role="398BVh" node="7OQaAJRI74t" resolve="iets3.github.opensource.home" />
-        <node concept="2Ry0Ak" id="2U5Anele3KZ" role="iGT6I">
-          <property role="2Ry0Am" value="build" />
-          <node concept="2Ry0Ak" id="5loVtKO5kwP" role="2Ry0An">
-            <property role="2Ry0Am" value="artifacts" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="398rNT" id="7OQaAJRI74E" role="1l3spd">
-      <property role="TrG5h" value="dependencies.root" />
-      <node concept="398BVA" id="7OQaAJRI74F" role="398pKh">
-        <ref role="398BVh" node="7OQaAJRI74t" resolve="iets3.github.opensource.home" />
-        <node concept="2Ry0Ak" id="7OQaAJRI74G" role="iGT6I">
-          <property role="2Ry0Am" value="build" />
-          <node concept="2Ry0Ak" id="7OQaAJRI74H" role="2Ry0An">
-            <property role="2Ry0Am" value="dependencies" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="398rNT" id="7OQaAJRI74I" role="1l3spd">
-      <property role="TrG5h" value="dependencies.mbeddr.platform" />
-      <node concept="398BVA" id="7OQaAJRI74J" role="398pKh">
-        <ref role="398BVh" node="7OQaAJRI74E" resolve="dependencies.root" />
-        <node concept="2Ry0Ak" id="7OQaAJRI74K" role="iGT6I">
-          <property role="2Ry0Am" value="com.mbeddr.platform" />
-        </node>
-      </node>
-    </node>
-    <node concept="55IIr" id="7OQaAJRI72Q" role="auvoZ" />
-    <node concept="1l3spV" id="7OQaAJRI72R" role="1l3spN">
-      <node concept="m$_wl" id="5loVtKO0X_7" role="39821P">
-        <ref role="m_rDy" node="5loVtKO0krH" resolve="testExecutor" />
-        <node concept="pUk6x" id="5loVtKO0X_b" role="pUk7w" />
-      </node>
-    </node>
-    <node concept="3b7kt6" id="7OQaAJRI73q" role="10PD9s" />
-    <node concept="_l39y" id="7OQaAJRI72U" role="10PD9s" />
-    <node concept="2sgV4H" id="2U5AnekTjUj" role="1l3spa">
-      <ref role="1l3spb" to="al5i:3AVJcIMlF8l" resolve="com.mbeddr.platform" />
-      <node concept="398BVA" id="2U5AnekTjVb" role="2JcizS">
-        <ref role="398BVh" node="7OQaAJRI74I" resolve="dependencies.mbeddr.platform" />
-      </node>
-    </node>
-    <node concept="2sgV4H" id="2U5Anele3Kt" role="1l3spa">
-      <ref role="1l3spb" node="5wLtKNeSRPl" resolve="org.iets3.opensource" />
-      <node concept="398BVA" id="2U5Anele3Ku" role="2JcizS">
-        <ref role="398BVh" node="2U5Anele3KX" resolve="iets3.artifacts.root" />
-        <node concept="2Ry0Ak" id="5loVtKO5kwN" role="iGT6I">
-          <property role="2Ry0Am" value="org.iets3.opensource" />
-        </node>
-      </node>
-    </node>
-    <node concept="_awnq" id="2U5AnelaqDb" role="1hWBAP">
-      <property role="3MWwXZ" value="MainClass" />
-      <ref role="30Vec$" node="7OQaAJRCS6v" resolve="org.iets3.core.JunitInterpreterTest" />
-    </node>
-    <node concept="2G$12M" id="5loVtKO0ksX" role="3989C9">
-      <property role="TrG5h" value="testExecutor" />
-      <node concept="1E1JtA" id="7OQaAJRCS6v" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="org.iets3.core.InterpreterTestExecutor" />
-        <property role="3LESm3" value="d1ccc7a6-9c76-498d-963f-c1b46fa699a2" />
-        <property role="aoJFB" value="eYcmk9QOli/sources" />
-        <node concept="398BVA" id="7OQaAJRCSMb" role="3LF7KH">
-          <ref role="398BVh" node="7OQaAJRI74_" resolve="iets3.lang.opensource" />
-          <node concept="2Ry0Ak" id="7OQaAJRCSOH" role="iGT6I">
-            <property role="2Ry0Am" value="solutions" />
-            <node concept="2Ry0Ak" id="5loVtKNYUDI" role="2Ry0An">
-              <property role="2Ry0Am" value="org.iets3.core.InterpreterTestExecutor" />
-              <node concept="2Ry0Ak" id="5loVtKNZ04L" role="2Ry0An">
-                <property role="2Ry0Am" value="org.iets3.core.InterpreterTestExecutor.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>
-        </node>
-        <node concept="1SiIV0" id="7OQaAJRCT9u" role="3bR37C">
-          <node concept="3bR9La" id="7OQaAJRCT9v" 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">
-            <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>
-        </node>
-        <node concept="1BupzO" id="7OQaAJRCT9N" role="3bR31x">
-          <property role="3ZfqAx" value="models" />
-          <property role="1Hdu6h" value="true" />
-          <property role="1HemKv" value="true" />
-          <node concept="3LXTmp" id="5loVtKNYUE2" role="1HemKq">
-            <node concept="398BVA" id="5loVtKNYUDR" role="3LXTmr">
-              <ref role="398BVh" node="7OQaAJRI74_" resolve="iets3.lang.opensource" />
-              <node concept="2Ry0Ak" id="5loVtKNYUDS" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="5loVtKNYUDT" role="2Ry0An">
-                  <property role="2Ry0Am" value="org.iets3.core.InterpreterTestExecutor" />
-                  <node concept="2Ry0Ak" id="5loVtKNYUDU" role="2Ry0An">
-                    <property role="2Ry0Am" value="models" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3qWCbU" id="5loVtKNYUE3" 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">
-              <ref role="398BVh" node="7OQaAJRI74_" resolve="iets3.lang.opensource" />
-              <node concept="2Ry0Ak" id="2U5AnelaqMh" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="2U5AnelaqMi" role="2Ry0An">
-                  <property role="2Ry0Am" value="org.iets3.core.JunitInterpreterTest" />
-                </node>
-              </node>
-            </node>
-            <node concept="3qWCbU" id="2U5AnelaqMk" role="3LXTna">
-              <property role="3qWCbO" value="icons/**, resources/**" />
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5loVtKNZ04N" role="3bR37C">
-          <node concept="3bR9La" id="5loVtKNZ04O" role="1SiIV1">
-            <ref role="3bR37D" node="5loVtKNYZtf" resolve="org.iets3.core.JunitInterpreterTest" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
 </model>