diff --git a/tests/test_main.py b/tests/test_main.py
index f6de31e..d5ae1b7 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -22,7 +22,6 @@ def default_boardgame_test(to_test_boardgame: boardgame_classes.BoardGame):
     assert type(to_test_boardgame.min_playing_time) == int
     assert type(to_test_boardgame.max_playing_time) == int
     assert type(to_test_boardgame.min_age) == int
-    assert type(to_test_boardgame.type) == boardgame_classes.BoardgameType
 
 
 def default_statistic_test(to_test_statistic: statistic_classes.StatisticBase):
@@ -38,7 +37,7 @@ def test_retrieve_boardgame():
     response = client.get("/boardgame?id=373167")
     assert response.status_code == 200
 
-    returned_boardgame = boardgame_classes.BoardGame.model_validate(response.json())
+    returned_boardgame = boardgame_classes.BoardGamePublic.model_validate(response.json())
 
     default_boardgame_test(returned_boardgame)
 
@@ -46,30 +45,30 @@ def test_retrieve_owned():
     response = client.get("/owned")
     assert response.status_code == 200
 
-    returned_boardgame = boardgame_classes.OwnedBoardGame.model_validate(response.json()[0])
+    returned_boardgame = boardgame_classes.BoardGamePublic.model_validate(response.json()[0])
 
     default_boardgame_test(returned_boardgame)
-    assert type(returned_boardgame.price_paid) == float
-    assert type(returned_boardgame.acquisition_date) == date
-    assert type(returned_boardgame.acquired_from) == str
+    assert type(returned_boardgame.owned_info.price_paid) == float
+    assert type(returned_boardgame.owned_info.acquisition_date) == date
+    assert type(returned_boardgame.owned_info.acquired_from) == str
 
 
 def test_retrieve_wishlist():
     response = client.get("/wishlist")
     assert response.status_code == 200
 
-    returned_boardgame = boardgame_classes.WishlistBoardGame.model_validate(response.json()[0])
+    returned_boardgame = boardgame_classes.BoardGamePublic.model_validate(response.json()[0])
 
     default_boardgame_test(returned_boardgame)
-    assert type(returned_boardgame.wishlist_priority) == int
-    assert returned_boardgame.wishlist_priority > 0
+    assert type(returned_boardgame.wishlist_info.wishlist_priority) == int
+    assert returned_boardgame.wishlist_info.wishlist_priority > 0
 
 
 def test_retrieve_plays():
     response = client.get("/plays")
     assert response.status_code == 200
 
-    returned_play = play_classes.PlayPublicWithPlayers.model_validate(response.json()[0])
+    returned_play = play_classes.PlayPublic.model_validate(response.json()[0])
 
     assert type(returned_play.boardgame_id) == int
     assert type(returned_play.play_date) == date
@@ -126,7 +125,4 @@ def test_retrieve_game_order_statistic():
 
     default_statistic_test(returned_statistic)
     assert type(returned_statistic.result) == list
-    assert type(returned_statistic.result[0]) in [
-        boardgame_classes.BoardGame, boardgame_classes.BoardGameExpansion,
-        boardgame_classes.OwnedBoardGame, boardgame_classes.OwnedBoardGameExpansion,
-        boardgame_classes.WishlistBoardGame, boardgame_classes.WishlistBoardGameExpansion]
\ No newline at end of file
+    assert type(returned_statistic.result[0]) == boardgame_classes.BoardGame
\ No newline at end of file