diff --git a/farmbot_core/config/test.exs b/farmbot_core/config/test.exs
index 8d150ddb..1264f3e1 100644
--- a/farmbot_core/config/test.exs
+++ b/farmbot_core/config/test.exs
@@ -4,14 +4,13 @@ use Mix.Config
 # To ensure other timers have time to timeout
 config :farmbot_core, FarmbotCore.AssetMonitor, checkup_time_ms: 500
 
-config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FarmEvent,
-  checkup_time_ms: 1000
+config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FarmEvent, checkup_time_ms: 1000
 
 config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.RegimenInstance,
   checkup_time_ms: 1000
 
 config :farmbot_celery_script, FarmbotCeleryScript.SysCalls,
-  sys_calls: Farmbot.TestSupport.CeleryScript.TestSysCalls
+  sys_calls: FarmbotCeleryScript.SysCalls.Stubs
 
 config :farmbot_core, FarmbotCore.FirmwareOpenTask, attempt_threshold: 0
 
diff --git a/farmbot_core/mix.lock b/farmbot_core/mix.lock
index 779400aa..f00ac5a7 100644
--- a/farmbot_core/mix.lock
+++ b/farmbot_core/mix.lock
@@ -24,6 +24,7 @@
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm"},
   "mime": {:hex, :mime, "1.3.0", "5e8d45a39e95c650900d03f897fbf99ae04f60ab1daa4a34c7a20a5151b7a5fe", [:mix], [], "hexpm"},
   "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm"},
+  "mimic": {:hex, :mimic, "1.1.3", "3bad83d5271b4faa7bbfef587417a6605cbbc802a353395d446a1e5f46fe7115", [:mix], [], "hexpm"},
   "muontrap": {:hex, :muontrap, "0.5.0", "0b885a4095e990000d519441bccb8f037a9c4c35908720e7814a516a606be278", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
   "nerves_uart": {:hex, :nerves_uart, "1.2.0", "195424116b925cd3bf9d666be036c2a80655e6ca0f8d447e277667a60005c50e", [:mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
   "nimble_parsec": {:hex, :nimble_parsec, "0.5.3", "def21c10a9ed70ce22754fdeea0810dafd53c2db3219a0cd54cf5526377af1c6", [:mix], [], "hexpm"},
diff --git a/farmbot_core/test/asset_workers/device_worker_test.exs b/farmbot_core/test/asset_workers/device_worker_test.exs
index ef1d7d73..34b11ed2 100644
--- a/farmbot_core/test/asset_workers/device_worker_test.exs
+++ b/farmbot_core/test/asset_workers/device_worker_test.exs
@@ -3,7 +3,6 @@ defmodule FarmbotCore.DeviceWorkerTest do
   alias Farmbot.TestSupport.AssetFixtures
   alias FarmbotCore.Asset.Device
   alias FarmbotCore.AssetWorker
-  alias Farmbot.TestSupport.CeleryScript.TestSysCalls
 
   def fresh_device(needs_reset \\ true) do
     params = %{needs_reset: needs_reset}
@@ -13,16 +12,15 @@ defmodule FarmbotCore.DeviceWorkerTest do
 
   describe "devices" do
     test "triggering of factory reset during init" do
-      {:ok, _} = TestSysCalls.checkout()
       test_pid = self()
       dev = fresh_device()
 
-      :ok =
-        TestSysCalls.handle(TestSysCalls, fn
-          kind, args ->
-            send(test_pid, {kind, args})
-            :ok
-        end)
+      # :ok =
+      #   Stubs.handle(Stubs, fn
+      #     kind, args ->
+      #       send(test_pid, {kind, args})
+      #       :ok
+      #   end)
 
       {:ok, _pid} = AssetWorker.start_link(dev, [])
       assert_receive {:factory_reset, ["farmbot_os"]}
@@ -30,16 +28,15 @@ defmodule FarmbotCore.DeviceWorkerTest do
   end
 
   test "triggering of factory reset during update" do
-    {:ok, _} = TestSysCalls.checkout()
     test_pid = self()
     dev = fresh_device(false)
 
-    :ok =
-      TestSysCalls.handle(TestSysCalls, fn
-        kind, args ->
-          send(test_pid, {kind, args})
-          :ok
-      end)
+    # :ok =
+    #   Stubs.handle(Stubs, fn
+    #     kind, args ->
+    #       send(test_pid, {kind, args})
+    #       :ok
+    #   end)
 
     {:ok, pid} = AssetWorker.start_link(dev, [])
     refute_receive {:factory_reset, ["farmbot_os"]}