diff --git a/internal/driven/storage/memory/battlestrg/storage_test.go b/internal/driven/storage/memory/battlestrg/storage_test.go
index a30dced..97a65bb 100644
--- a/internal/driven/storage/memory/battlestrg/storage_test.go
+++ b/internal/driven/storage/memory/battlestrg/storage_test.go
@@ -16,12 +16,17 @@ func TestSaveGetBattle(t *testing.T) {
 	strg := battlestrg.New()
 	expBattle := newBattle()
 
+	// get battle, supposedly the returned battle is nil
+	battle, err := strg.GetBattle(context.Background(), expBattle.GameID)
+	require.NoError(t, err)
+	require.Nil(t, battle, "battle is not nil")
+
 	// save battle
-	err := strg.SaveBattle(context.Background(), *expBattle)
+	err = strg.SaveBattle(context.Background(), *expBattle)
 	require.NoError(t, err)
 
 	// get battle
-	battle, err := strg.GetBattle(context.Background(), expBattle.GameID)
+	battle, err = strg.GetBattle(context.Background(), expBattle.GameID)
 	require.NoError(t, err)
 
 	// ensure battle is equal to expBattle
diff --git a/internal/driven/storage/memory/gamestrg/storage_test.go b/internal/driven/storage/memory/gamestrg/storage_test.go
index 8069684..b15f3e7 100644
--- a/internal/driven/storage/memory/gamestrg/storage_test.go
+++ b/internal/driven/storage/memory/gamestrg/storage_test.go
@@ -16,12 +16,17 @@ func TestSaveGetGame(t *testing.T) {
 	strg := gamestrg.New()
 	expGame := initNewGame()
 
+	// get game, supposedly the returned game is nil
+	game, err := strg.GetGame(context.Background(), expGame.ID)
+	require.NoError(t, err)
+	require.Nil(t, game, "game is not nil")
+
 	// save game
-	err := strg.SaveGame(context.Background(), *expGame)
+	err = strg.SaveGame(context.Background(), *expGame)
 	require.NoError(t, err)
 
 	// get game
-	game, err := strg.GetGame(context.Background(), expGame.ID)
+	game, err = strg.GetGame(context.Background(), expGame.ID)
 	require.NoError(t, err)
 
 	// ensure game is equal to newGame