diff --git a/lib/scopes_web/common.ex b/lib/scopes_web/common.ex
new file mode 100644
index 0000000..9c624a4
--- /dev/null
+++ b/lib/scopes_web/common.ex
@@ -0,0 +1,6 @@
+defmodule ScopesWeb.Common do
+
+  defimpl Phoenix.HTML.Safe, for: Map do
+    def to_iodata(_data), do: "{}"
+  end
+end
diff --git a/mix.exs b/mix.exs
index 0012073..62570a6 100644
--- a/mix.exs
+++ b/mix.exs
@@ -9,7 +9,6 @@ defmodule Scopes.MixProject do
       elixirc_paths: elixirc_paths(Mix.env()),
       start_permanent: Mix.env() == :prod,
       aliases: aliases(),
-      consolidate_protocols: Mix.env() != :test,
       deps: deps()
     ]
   end
diff --git a/test/scopes_web/live/message_live_test.exs b/test/scopes_web/live/message_live_test.exs
index 6523c85..d6c0df9 100644
--- a/test/scopes_web/live/message_live_test.exs
+++ b/test/scopes_web/live/message_live_test.exs
@@ -4,8 +4,6 @@ defmodule ScopesWeb.MessageLiveTest do
   import Phoenix.LiveViewTest
   import Scopes.CoreFixtures
 
-  defimpl Phoenix.HTML.Safe, for: Map, do: (def to_iodata(%{}), do: "{}")
-
   @create_attrs %{domain: "some domain", item: "some item", action: "some action", class: "some class"}
   @update_attrs %{domain: "some updated domain", item: "some updated item", action: "some updated action", class: "some updated class"}
   @invalid_attrs %{domain: nil, item: nil, action: nil, class: nil}
diff --git a/test/support/fixtures/core_fixtures.ex b/test/support/fixtures/core_fixtures.ex
index 069544d..4dc28f1 100644
--- a/test/support/fixtures/core_fixtures.ex
+++ b/test/support/fixtures/core_fixtures.ex
@@ -11,11 +11,11 @@ defmodule Scopes.CoreFixtures do
     {:ok, message} =
       attrs
       |> Enum.into(%{
+        domain: "some domain",
         action: "some action",
         class: "some class",
-        #data: %{},
-        domain: "some domain",
-        item: "some item"
+        item: "some item",
+        data: %{}
       })
       |> Scopes.Core.create_message()