diff --git a/db/structure.sql b/db/structure.sql
index 3a1fc2335..0473427f9 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -2751,6 +2751,14 @@ ALTER TABLE ONLY public.points
     ADD CONSTRAINT fk_rails_a62cbb8aca FOREIGN KEY (tool_id) REFERENCES public.tools(id);
 
 
+--
+-- Name: farmware_envs fk_rails_ab55c3a1d1; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.farmware_envs
+    ADD CONSTRAINT fk_rails_ab55c3a1d1 FOREIGN KEY (device_id) REFERENCES public.devices(id);
+
+
 --
 -- Name: primary_nodes fk_rails_bca7fee3b9; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -2759,14 +2767,6 @@ ALTER TABLE ONLY public.primary_nodes
     ADD CONSTRAINT fk_rails_bca7fee3b9 FOREIGN KEY (sequence_id) REFERENCES public.sequences(id);
 
 
---
--- Name: farmware_envs fk_rails_bdadc396eb; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.farmware_envs
-    ADD CONSTRAINT fk_rails_bdadc396eb FOREIGN KEY (device_id) REFERENCES public.devices(id);
-
-
 --
 -- Name: alerts fk_rails_c0132c78be; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
diff --git a/frontend/connectivity/__tests__/connect_device/event_listeners_test.ts b/frontend/connectivity/__tests__/connect_device/event_listeners_test.ts
index ac1f6e95d..f8bb6453f 100644
--- a/frontend/connectivity/__tests__/connect_device/event_listeners_test.ts
+++ b/frontend/connectivity/__tests__/connect_device/event_listeners_test.ts
@@ -14,7 +14,8 @@ jest.mock("../../../device", () => { return { getDevice: () => mockBot }; });
 jest.mock("../../ping_mqtt", () => { return { startPinging: jest.fn() }; });
 
 import { getDevice } from "../../../device";
-import { attachEventListeners, BROADCAST_CHANNEL } from "../../connect_device";
+import { FbjsEventName } from "farmbot/dist/constants";
+import { attachEventListeners } from "../../connect_device";
 import { startPinging } from "../../ping_mqtt";
 
 describe("attachEventListeners", () => {
@@ -22,15 +23,15 @@ describe("attachEventListeners", () => {
     const dev = getDevice();
     attachEventListeners(dev, jest.fn(), jest.fn());
     [
-      "legacy_status",
-      "logs",
-      "malformed",
-      "offline",
-      "online",
-      "online",
-      "sent",
-      "status_v8",
-      BROADCAST_CHANNEL,
+      FbjsEventName.legacy_status,
+      FbjsEventName.logs,
+      FbjsEventName.malformed,
+      FbjsEventName.offline,
+      FbjsEventName.online,
+      FbjsEventName.online,
+      FbjsEventName.sent,
+      FbjsEventName.upsert,
+      FbjsEventName.publicBroadcast,
     ].map(e => expect(dev.on).toHaveBeenCalledWith(e, expect.any(Function)));
     [
       "message",
diff --git a/frontend/connectivity/connect_device.ts b/frontend/connectivity/connect_device.ts
index 2f32688fc..ca0b56670 100644
--- a/frontend/connectivity/connect_device.ts
+++ b/frontend/connectivity/connect_device.ts
@@ -192,6 +192,13 @@ export const attachEventListeners =
       //   console.dir(x, y);
       //   debugger;
       // });
+      // bot.on("*", (p: {}, e: string) => {
+      //   if (e === "sent") {
+      //     return;
+      //   } else {
+      //     console.dir(e, p);
+      //   }
+      // });
       bot.on(FbjsEventName.malformed, onMalformed);
       bot.client.subscribe(FbjsEventName.publicBroadcast);
       bot.on(FbjsEventName.publicBroadcast, onPublicBroadcast);
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 30d8133d5..7852a05be 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,3 +1,5 @@
+require "spec_helper"
+
 describe User do
   describe "#new" do
     it "Creates a new user" do