diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps
index 8a65eba3..71667e78 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps
@@ -23,12 +23,16 @@
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
+      <concept id="2325284917965760583" name="jetbrains.mps.lang.test.structure.BeforeTestsMethod" flags="ig" index="0EjCn" />
+      <concept id="2325284917965760584" name="jetbrains.mps.lang.test.structure.AfterTestsMethod" flags="ig" index="0EjCo" />
       <concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
         <property id="5097124989038916363" name="projectPath" index="2XOHcw" />
       </concept>
       <concept id="1225467090849" name="jetbrains.mps.lang.test.structure.ProjectExpression" flags="nn" index="1jxXqW" />
       <concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
         <property id="6339244025081158986" name="needsNoWriteAction" index="3OwPAg" />
+        <child id="2325284917965993569" name="beforeTests" index="0EEgL" />
+        <child id="2325284917965993580" name="afterTests" index="0EEgW" />
         <child id="1216993439383" name="methods" index="1qtyYc" />
         <child id="1217501895093" name="testMethods" index="1SL9yI" />
       </concept>
@@ -60,6 +64,9 @@
         <child id="1164903359218" name="catchBody" index="TDEfX" />
         <child id="1164903359217" name="throwable" index="TDEfY" />
       </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
@@ -561,7 +568,7 @@
                             <node concept="2WthIp" id="3KwBCAA$IIb" role="2Oq$k0" />
                             <node concept="2XshWL" id="3KwBCAA$IIc" role="2OqNvi">
                               <ref role="2WH_rO" node="3KwBCAAvofQ" resolve="scheduleCommand" />
-                              <node concept="2YIFZM" id="NKt6yn9ky5" role="2XxRq1">
+                              <node concept="2YIFZM" id="5HLeEcg9enh" role="2XxRq1">
                                 <ref role="37wK5l" to="1yqb:3KwBCAA_eqP" resolve="requireEDT" />
                                 <ref role="1Pybhc" to="1yqb:3KwBCAA_ela" resolve="MPSSchedulers" />
                               </node>
@@ -993,6 +1000,47 @@
         </node>
       </node>
     </node>
+    <node concept="0EjCn" id="5HLeEcga4zu" role="0EEgL">
+      <node concept="3clFbS" id="5HLeEcga4zv" role="2VODD2">
+        <node concept="3clFbF" id="5HLeEcg9fRo" role="3cqZAp">
+          <node concept="2YIFZM" id="5HLeEcg9gMw" role="3clFbG">
+            <ref role="1Pybhc" to="f4yq:~RxSwingPlugins" resolve="RxSwingPlugins" />
+            <ref role="37wK5l" to="f4yq:~RxSwingPlugins.setOnSchedule(io.reactivex.functions.Function)" resolve="setOnSchedule" />
+            <node concept="1bVj0M" id="5HLeEcg9zi5" role="37wK5m">
+              <node concept="3clFbS" id="5HLeEcg9zi6" role="1bW5cS">
+                <node concept="3clFbF" id="5HLeEcg9z_x" role="3cqZAp">
+                  <node concept="37vLTw" id="5HLeEcg9z_w" role="3clFbG">
+                    <ref role="3cqZAo" node="5HLeEcg9zjh" resolve="run" />
+                  </node>
+                </node>
+              </node>
+              <node concept="37vLTG" id="5HLeEcg9zjh" role="1bW2Oz">
+                <property role="TrG5h" value="run" />
+                <node concept="3uibUv" id="5HLeEcg9zuv" role="1tU5fm">
+                  <ref role="3uigEE" to="wyt6:~Runnable" resolve="Runnable" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2mbQB8J3N58" role="3cqZAp">
+          <node concept="2YIFZM" id="2mbQB8J3N6$" role="3clFbG">
+            <ref role="37wK5l" to="m4y7:~Schedulers.start()" resolve="start" />
+            <ref role="1Pybhc" to="m4y7:~Schedulers" resolve="Schedulers" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="0EjCo" id="5HLeEcgaeBO" role="0EEgW">
+      <node concept="3clFbS" id="5HLeEcgaeBP" role="2VODD2">
+        <node concept="3clFbF" id="2mbQB8J3N7P" role="3cqZAp">
+          <node concept="2YIFZM" id="19wqdqNYiZp" role="3clFbG">
+            <ref role="1Pybhc" to="m4y7:~Schedulers" resolve="Schedulers" />
+            <ref role="37wK5l" to="m4y7:~Schedulers.shutdown()" resolve="shutdown" />
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="2XOHcx" id="7t5VLKGQVAO">
     <property role="2XOHcw" value="${coderules_home}" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index bea3c774..ce935122 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -94,6 +94,7 @@
     <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="mpcv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang.ref(JDK/)" />
     <import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
+    <import index="xi6c" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.functions(jetbrains.mps.coderules/)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -23727,6 +23728,28 @@
           </node>
         </node>
         <node concept="3clFbH" id="19wqdqO140O" role="3cqZAp" />
+        <node concept="3clFbF" id="5HLeEcg9fRo" role="3cqZAp">
+          <node concept="2YIFZM" id="5HLeEcg9gMw" role="3clFbG">
+            <ref role="37wK5l" to="f4yq:~RxSwingPlugins.setOnSchedule(io.reactivex.functions.Function)" resolve="setOnSchedule" />
+            <ref role="1Pybhc" to="f4yq:~RxSwingPlugins" resolve="RxSwingPlugins" />
+            <node concept="1bVj0M" id="5HLeEcg9zi5" role="37wK5m">
+              <node concept="3clFbS" id="5HLeEcg9zi6" role="1bW5cS">
+                <node concept="3clFbF" id="5HLeEcg9z_x" role="3cqZAp">
+                  <node concept="37vLTw" id="5HLeEcg9z_w" role="3clFbG">
+                    <ref role="3cqZAo" node="5HLeEcg9zjh" resolve="run" />
+                  </node>
+                </node>
+              </node>
+              <node concept="37vLTG" id="5HLeEcg9zjh" role="1bW2Oz">
+                <property role="TrG5h" value="run" />
+                <node concept="3uibUv" id="5HLeEcg9zuv" role="1tU5fm">
+                  <ref role="3uigEE" to="wyt6:~Runnable" resolve="Runnable" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="5HLeEcg9fpx" role="3cqZAp" />
         <node concept="3clFbF" id="2mbQB8J3N58" role="3cqZAp">
           <node concept="2YIFZM" id="2mbQB8J3N6$" role="3clFbG">
             <ref role="37wK5l" to="m4y7:~Schedulers.start()" resolve="start" />