diff --git a/test/chess/store/game_test.exs b/test/chess/store/game_test.exs
new file mode 100644
index 0000000..8ff9498
--- /dev/null
+++ b/test/chess/store/game_test.exs
@@ -0,0 +1,20 @@
+defmodule Chess.GameTest do
+  use Chess.DataCase
+
+  describe "game" do
+    alias Chess.Store.Game
+
+    @valid_attrs %{board: %{}}
+    @invalid_attrs %{}
+
+    test "changeset with valid attributes" do
+      changeset = Game.changeset(%Game{}, @valid_attrs)
+      assert changeset.valid?
+    end
+
+    test "changeset with invalid attributes" do
+      changeset = Game.changeset(%Game{}, @invalid_attrs)
+      refute changeset.valid?
+    end
+  end
+end
diff --git a/test/models/game_test.exs b/test/models/game_test.exs
deleted file mode 100644
index 687b783..0000000
--- a/test/models/game_test.exs
+++ /dev/null
@@ -1,18 +0,0 @@
-defmodule Chess.GameTest do
-  use Chess.ModelCase
-
-  alias Chess.Store.Game
-
-  @valid_attrs %{board: %{}}
-  @invalid_attrs %{}
-
-  test "changeset with valid attributes" do
-    changeset = Game.changeset(%Game{}, @valid_attrs)
-    assert changeset.valid?
-  end
-
-  test "changeset with invalid attributes" do
-    changeset = Game.changeset(%Game{}, @invalid_attrs)
-    refute changeset.valid?
-  end
-end
diff --git a/test/support/model_case.ex b/test/support/data_case.ex
similarity index 92%
rename from test/support/model_case.ex
rename to test/support/data_case.ex
index 5296891..344b18c 100644
--- a/test/support/model_case.ex
+++ b/test/support/data_case.ex
@@ -1,4 +1,4 @@
-defmodule Chess.ModelCase do
+defmodule Chess.DataCase do
   @moduledoc """
   This module defines the test case to be used by
   model tests.
@@ -21,7 +21,7 @@ defmodule Chess.ModelCase do
       import Ecto
       import Ecto.Changeset
       import Ecto.Query
-      import Chess.ModelCase
+      import Chess.DataCase
     end
   end
 
@@ -59,7 +59,7 @@ defmodule Chess.ModelCase do
   """
   def errors_on(struct, data) do
     struct.__struct__.changeset(struct, data)
-    |> Ecto.Changeset.traverse_errors(&Chess.ErrorHelpers.translate_error/1)
+    |> Ecto.Changeset.traverse_errors(&ChessWeb.ErrorHelpers.translate_error/1)
     |> Enum.flat_map(fn {key, errors} -> for msg <- errors, do: {key, msg} end)
   end
 end