diff --git a/tests/data/activity.json b/tests/data/activity/activity.json
similarity index 100%
rename from tests/data/activity.json
rename to tests/data/activity/activity.json
diff --git a/tests/data/album.json b/tests/data/albums/album.json
similarity index 100%
rename from tests/data/album.json
rename to tests/data/albums/album.json
diff --git a/tests/data/albums.json b/tests/data/albums/paginated_album_list.json
similarity index 100%
rename from tests/data/albums.json
rename to tests/data/albums/paginated_album_list.json
diff --git a/tests/data/artist.json b/tests/data/artists/artist_with_albums.json
similarity index 100%
rename from tests/data/artist.json
rename to tests/data/artists/artist_with_albums.json
diff --git a/tests/data/artists.json b/tests/data/artists/paginated_artist_with_albums_list.json
similarity index 100%
rename from tests/data/artists.json
rename to tests/data/artists/paginated_artist_with_albums_list.json
diff --git a/tests/data/simple_artist.json b/tests/data/artists/simple_artist.json
similarity index 100%
rename from tests/data/simple_artist.json
rename to tests/data/artists/simple_artist.json
diff --git a/tests/data/attachment.json b/tests/data/attachments/attachment.json
similarity index 100%
rename from tests/data/attachment.json
rename to tests/data/attachments/attachment.json
diff --git a/tests/data/subsonic.json b/tests/data/auth/subsonic.json
similarity index 100%
rename from tests/data/subsonic.json
rename to tests/data/auth/subsonic.json
diff --git a/tests/data/user_details.json b/tests/data/auth/user_details.json
similarity index 100%
rename from tests/data/user_details.json
rename to tests/data/auth/user_details.json
diff --git a/tests/data/user_me.json b/tests/data/auth/user_me.json
similarity index 100%
rename from tests/data/user_me.json
rename to tests/data/auth/user_me.json
diff --git a/tests/data/verify_email.json b/tests/data/auth/verify_email.json
similarity index 100%
rename from tests/data/verify_email.json
rename to tests/data/auth/verify_email.json
diff --git a/tests/data/verify_email_request.json b/tests/data/auth/verify_email_request.json
similarity index 100%
rename from tests/data/verify_email_request.json
rename to tests/data/auth/verify_email_request.json
diff --git a/tests/data/channel.json b/tests/data/channels/channel.json
similarity index 100%
rename from tests/data/channel.json
rename to tests/data/channels/channel.json
diff --git a/tests/data/channels.json b/tests/data/channels/paginated_channel_list.json
similarity index 100%
rename from tests/data/channels.json
rename to tests/data/channels/paginated_channel_list.json
diff --git a/tests/data/api_mutation.json b/tests/data/common/api_mutation.json
similarity index 100%
rename from tests/data/api_mutation.json
rename to tests/data/common/api_mutation.json
diff --git a/tests/data/paginated_api_mutation_list.json b/tests/data/common/paginated_api_mutation_list.json
similarity index 100%
rename from tests/data/paginated_api_mutation_list.json
rename to tests/data/common/paginated_api_mutation_list.json
diff --git a/tests/data/favorites_all.json b/tests/data/favorites/favorites_all.json
similarity index 100%
rename from tests/data/favorites_all.json
rename to tests/data/favorites/favorites_all.json
diff --git a/tests/data/favorites.json b/tests/data/favorites/paginated_user_track_favorite_list.json
similarity index 100%
rename from tests/data/favorites.json
rename to tests/data/favorites/paginated_user_track_favorite_list.json
diff --git a/tests/data/track_favorite_write.json b/tests/data/favorites/track_favorite_write.json
similarity index 100%
rename from tests/data/track_favorite_write.json
rename to tests/data/favorites/track_favorite_write.json
diff --git a/tests/data/track_favorite_write_request.json b/tests/data/favorites/track_favorite_write_request.json
similarity index 100%
rename from tests/data/track_favorite_write_request.json
rename to tests/data/favorites/track_favorite_write_request.json
diff --git a/tests/data/federation_inbox_item.json b/tests/data/federation/federation_inbox_item.json
similarity index 100%
rename from tests/data/federation_inbox_item.json
rename to tests/data/federation/federation_inbox_item.json
diff --git a/tests/data/federation_inbox_item_list.json b/tests/data/federation/federation_inbox_item_list.json
similarity index 100%
rename from tests/data/federation_inbox_item_list.json
rename to tests/data/federation/federation_inbox_item_list.json
diff --git a/tests/data/library_follow.json b/tests/data/federation/library_follow.json
similarity index 100%
rename from tests/data/library_follow.json
rename to tests/data/federation/library_follow.json
diff --git a/tests/data/library_follow_all.json b/tests/data/federation/library_follow_all.json
similarity index 100%
rename from tests/data/library_follow_all.json
rename to tests/data/federation/library_follow_all.json
diff --git a/tests/data/library_follow_request.json b/tests/data/federation/library_follow_request.json
similarity index 100%
rename from tests/data/library_follow_request.json
rename to tests/data/federation/library_follow_request.json
diff --git a/tests/data/library_follow_list.json b/tests/data/federation/paginated_library_follow_list.json
similarity index 100%
rename from tests/data/library_follow_list.json
rename to tests/data/federation/paginated_library_follow_list.json
diff --git a/tests/data/listening.json b/tests/data/history/listening.json
similarity index 100%
rename from tests/data/listening.json
rename to tests/data/history/listening.json
diff --git a/tests/data/listening_write.json b/tests/data/history/listening_write.json
similarity index 100%
rename from tests/data/listening_write.json
rename to tests/data/history/listening_write.json
diff --git a/tests/data/listening_write_request.json b/tests/data/history/listening_write_request.json
similarity index 100%
rename from tests/data/listening_write_request.json
rename to tests/data/history/listening_write_request.json
diff --git a/tests/data/listenings.json b/tests/data/history/paginated_listening_list.json
similarity index 100%
rename from tests/data/listenings.json
rename to tests/data/history/paginated_listening_list.json
diff --git a/tests/data/settings.json b/tests/data/instance/global_preference.json
similarity index 100%
rename from tests/data/settings.json
rename to tests/data/instance/global_preference.json
diff --git a/tests/data/global_preference_request.json b/tests/data/instance/global_preference_request.json
similarity index 100%
rename from tests/data/global_preference_request.json
rename to tests/data/instance/global_preference_request.json
diff --git a/tests/data/nodeinfo.json b/tests/data/instance/nodeinfo_2_0.json
similarity index 100%
rename from tests/data/nodeinfo.json
rename to tests/data/instance/nodeinfo_2_0.json
diff --git a/tests/data/patched_global_preference_request.json b/tests/data/instance/patched_global_preference_request.json
similarity index 100%
rename from tests/data/patched_global_preference_request.json
rename to tests/data/instance/patched_global_preference_request.json
diff --git a/tests/data/library.json b/tests/data/libraries/library.json
similarity index 100%
rename from tests/data/library.json
rename to tests/data/libraries/library.json
diff --git a/tests/data/license.json b/tests/data/licenses/license.json
similarity index 100%
rename from tests/data/license.json
rename to tests/data/licenses/license.json
diff --git a/tests/data/licenses.json b/tests/data/licenses/paginated_license_list.json
similarity index 100%
rename from tests/data/licenses.json
rename to tests/data/licenses/paginated_license_list.json
diff --git a/tests/data/manage_album.json b/tests/data/manage/manage_album.json
similarity index 100%
rename from tests/data/manage_album.json
rename to tests/data/manage/manage_album.json
diff --git a/tests/data/manage_album_stats.json b/tests/data/manage/manage_album_stats.json
similarity index 100%
rename from tests/data/manage_album_stats.json
rename to tests/data/manage/manage_album_stats.json
diff --git a/tests/data/manage_artist.json b/tests/data/manage/manage_artist.json
similarity index 100%
rename from tests/data/manage_artist.json
rename to tests/data/manage/manage_artist.json
diff --git a/tests/data/manage_channel.json b/tests/data/manage/manage_channel.json
similarity index 100%
rename from tests/data/manage_channel.json
rename to tests/data/manage/manage_channel.json
diff --git a/tests/data/manage_channel_stats.json b/tests/data/manage/manage_channel_stats.json
similarity index 100%
rename from tests/data/manage_channel_stats.json
rename to tests/data/manage/manage_channel_stats.json
diff --git a/tests/data/manage_domain.json b/tests/data/manage/manage_domain.json
similarity index 100%
rename from tests/data/manage_domain.json
rename to tests/data/manage/manage_domain.json
diff --git a/tests/data/manage_domain_nodeinfo.json b/tests/data/manage/manage_domain_nodeinfo.json
similarity index 100%
rename from tests/data/manage_domain_nodeinfo.json
rename to tests/data/manage/manage_domain_nodeinfo.json
diff --git a/tests/data/manage_instance_policy.json b/tests/data/manage/manage_instance_policy.json
similarity index 100%
rename from tests/data/manage_instance_policy.json
rename to tests/data/manage/manage_instance_policy.json
diff --git a/tests/data/manage_invitation.json b/tests/data/manage/manage_invitation.json
similarity index 100%
rename from tests/data/manage_invitation.json
rename to tests/data/manage/manage_invitation.json
diff --git a/tests/data/manage_invitation_request.json b/tests/data/manage/manage_invitation_request.json
similarity index 100%
rename from tests/data/manage_invitation_request.json
rename to tests/data/manage/manage_invitation_request.json
diff --git a/tests/data/manage_library.json b/tests/data/manage/manage_library.json
similarity index 100%
rename from tests/data/manage_library.json
rename to tests/data/manage/manage_library.json
diff --git a/tests/data/manage_library_stats.json b/tests/data/manage/manage_library_stats.json
similarity index 100%
rename from tests/data/manage_library_stats.json
rename to tests/data/manage/manage_library_stats.json
diff --git a/tests/data/manage_note.json b/tests/data/manage/manage_note.json
similarity index 100%
rename from tests/data/manage_note.json
rename to tests/data/manage/manage_note.json
diff --git a/tests/data/manage_note_request.json b/tests/data/manage/manage_note_request.json
similarity index 100%
rename from tests/data/manage_note_request.json
rename to tests/data/manage/manage_note_request.json
diff --git a/tests/data/manage_report.json b/tests/data/manage/manage_report.json
similarity index 100%
rename from tests/data/manage_report.json
rename to tests/data/manage/manage_report.json
diff --git a/tests/data/manage_report_request.json b/tests/data/manage/manage_report_request.json
similarity index 100%
rename from tests/data/manage_report_request.json
rename to tests/data/manage/manage_report_request.json
diff --git a/tests/data/manage_track.json b/tests/data/manage/manage_track.json
similarity index 100%
rename from tests/data/manage_track.json
rename to tests/data/manage/manage_track.json
diff --git a/tests/data/manage_upload.json b/tests/data/manage/manage_upload.json
similarity index 100%
rename from tests/data/manage_upload.json
rename to tests/data/manage/manage_upload.json
diff --git a/tests/data/manage_user.json b/tests/data/manage/manage_user.json
similarity index 100%
rename from tests/data/manage_user.json
rename to tests/data/manage/manage_user.json
diff --git a/tests/data/manage_user_request.json b/tests/data/manage/manage_user_request.json
similarity index 100%
rename from tests/data/manage_user_request.json
rename to tests/data/manage/manage_user_request.json
diff --git a/tests/data/paginated_manage_actor_list.json b/tests/data/manage/paginated_manage_actor_list.json
similarity index 100%
rename from tests/data/paginated_manage_actor_list.json
rename to tests/data/manage/paginated_manage_actor_list.json
diff --git a/tests/data/paginated_manage_album_list.json b/tests/data/manage/paginated_manage_album_list.json
similarity index 100%
rename from tests/data/paginated_manage_album_list.json
rename to tests/data/manage/paginated_manage_album_list.json
diff --git a/tests/data/paginated_manage_artist_list.json b/tests/data/manage/paginated_manage_artist_list.json
similarity index 100%
rename from tests/data/paginated_manage_artist_list.json
rename to tests/data/manage/paginated_manage_artist_list.json
diff --git a/tests/data/paginated_manage_channel_list.json b/tests/data/manage/paginated_manage_channel_list.json
similarity index 100%
rename from tests/data/paginated_manage_channel_list.json
rename to tests/data/manage/paginated_manage_channel_list.json
diff --git a/tests/data/paginated_manage_domain_list.json b/tests/data/manage/paginated_manage_domain_list.json
similarity index 100%
rename from tests/data/paginated_manage_domain_list.json
rename to tests/data/manage/paginated_manage_domain_list.json
diff --git a/tests/data/paginated_manage_instance_policy_list.json b/tests/data/manage/paginated_manage_instance_policy_list.json
similarity index 100%
rename from tests/data/paginated_manage_instance_policy_list.json
rename to tests/data/manage/paginated_manage_instance_policy_list.json
diff --git a/tests/data/paginated_manage_invitation_list.json b/tests/data/manage/paginated_manage_invitation_list.json
similarity index 100%
rename from tests/data/paginated_manage_invitation_list.json
rename to tests/data/manage/paginated_manage_invitation_list.json
diff --git a/tests/data/paginated_manage_library_list.json b/tests/data/manage/paginated_manage_library_list.json
similarity index 100%
rename from tests/data/paginated_manage_library_list.json
rename to tests/data/manage/paginated_manage_library_list.json
diff --git a/tests/data/paginated_manage_note_list.json b/tests/data/manage/paginated_manage_note_list.json
similarity index 100%
rename from tests/data/paginated_manage_note_list.json
rename to tests/data/manage/paginated_manage_note_list.json
diff --git a/tests/data/paginated_manage_report_list.json b/tests/data/manage/paginated_manage_report_list.json
similarity index 100%
rename from tests/data/paginated_manage_report_list.json
rename to tests/data/manage/paginated_manage_report_list.json
diff --git a/tests/data/paginated_manage_track_list.json b/tests/data/manage/paginated_manage_track_list.json
similarity index 100%
rename from tests/data/paginated_manage_track_list.json
rename to tests/data/manage/paginated_manage_track_list.json
diff --git a/tests/data/paginated_manage_upload_list.json b/tests/data/manage/paginated_manage_upload_list.json
similarity index 100%
rename from tests/data/paginated_manage_upload_list.json
rename to tests/data/manage/paginated_manage_upload_list.json
diff --git a/tests/data/paginated_manage_user_list.json b/tests/data/manage/paginated_manage_user_list.json
similarity index 100%
rename from tests/data/paginated_manage_user_list.json
rename to tests/data/manage/paginated_manage_user_list.json
diff --git a/tests/data/paginated_manage_user_request_list.json b/tests/data/manage/paginated_manage_user_request_list.json
similarity index 100%
rename from tests/data/paginated_manage_user_request_list.json
rename to tests/data/manage/paginated_manage_user_request_list.json
diff --git a/tests/data/patched_manage_report_request.json b/tests/data/manage/patched_manage_report_request.json
similarity index 100%
rename from tests/data/patched_manage_report_request.json
rename to tests/data/manage/patched_manage_report_request.json
diff --git a/tests/data/paginated_application_list.json b/tests/data/oauth/paginated_application_list.json
similarity index 100%
rename from tests/data/paginated_application_list.json
rename to tests/data/oauth/paginated_application_list.json
diff --git a/tests/data/playlists.json b/tests/data/playlists/paginated_playlist_list.json
similarity index 100%
rename from tests/data/playlists.json
rename to tests/data/playlists/paginated_playlist_list.json
diff --git a/tests/data/playlist.json b/tests/data/playlists/playlist.json
similarity index 100%
rename from tests/data/playlist.json
rename to tests/data/playlists/playlist.json
diff --git a/tests/data/radios.json b/tests/data/radios/paginated_radio_list.json
similarity index 100%
rename from tests/data/radios.json
rename to tests/data/radios/paginated_radio_list.json
diff --git a/tests/data/radio.json b/tests/data/radios/radio.json
similarity index 100%
rename from tests/data/radio.json
rename to tests/data/radios/radio.json
diff --git a/tests/data/radio_filters.json b/tests/data/radios/radio_filters.json
similarity index 100%
rename from tests/data/radio_filters.json
rename to tests/data/radios/radio_filters.json
diff --git a/tests/data/radio_session.json b/tests/data/radios/radio_session.json
similarity index 100%
rename from tests/data/radio_session.json
rename to tests/data/radios/radio_session.json
diff --git a/tests/data/radio_session_request.json b/tests/data/radios/radio_session_request.json
similarity index 100%
rename from tests/data/radio_session_request.json
rename to tests/data/radios/radio_session_request.json
diff --git a/tests/data/rate_limit.json b/tests/data/rate_limit/rate_limit.json
similarity index 100%
rename from tests/data/rate_limit.json
rename to tests/data/rate_limit/rate_limit.json
diff --git a/tests/data/paginated_subscription_list.json b/tests/data/subscriptions/paginated_subscription_list.json
similarity index 100%
rename from tests/data/paginated_subscription_list.json
rename to tests/data/subscriptions/paginated_subscription_list.json
diff --git a/tests/data/subscription.json b/tests/data/subscriptions/subscription.json
similarity index 100%
rename from tests/data/subscription.json
rename to tests/data/subscriptions/subscription.json
diff --git a/tests/data/subscription_all.json b/tests/data/subscriptions/subscription_all.json
similarity index 100%
rename from tests/data/subscription_all.json
rename to tests/data/subscriptions/subscription_all.json
diff --git a/tests/data/tags.json b/tests/data/tags/paginated_tag_list.json
similarity index 100%
rename from tests/data/tags.json
rename to tests/data/tags/paginated_tag_list.json
diff --git a/tests/data/tag.json b/tests/data/tags/tag.json
similarity index 100%
rename from tests/data/tag.json
rename to tests/data/tags/tag.json
diff --git a/tests/data/tracks.json b/tests/data/tracks/paginated_track_list.json
similarity index 100%
rename from tests/data/tracks.json
rename to tests/data/tracks/paginated_track_list.json
diff --git a/tests/data/track.json b/tests/data/tracks/track.json
similarity index 100%
rename from tests/data/track.json
rename to tests/data/tracks/track.json
diff --git a/tests/data/track_album.json b/tests/data/tracks/track_album.json
similarity index 100%
rename from tests/data/track_album.json
rename to tests/data/tracks/track_album.json
diff --git a/tests/data/paginated_upload_for_owner_list.json b/tests/data/uploads/paginated_upload_for_owner_list.json
similarity index 100%
rename from tests/data/paginated_upload_for_owner_list.json
rename to tests/data/uploads/paginated_upload_for_owner_list.json
diff --git a/tests/data/upload_for_owner.json b/tests/data/uploads/upload_for_owner.json
similarity index 100%
rename from tests/data/upload_for_owner.json
rename to tests/data/uploads/upload_for_owner.json
diff --git a/tests/data/upload_for_owner_metadata.json b/tests/data/uploads/upload_for_owner_metadata.json
similarity index 100%
rename from tests/data/upload_for_owner_metadata.json
rename to tests/data/uploads/upload_for_owner_metadata.json
diff --git a/tests/unit/test_model_activity_object.py b/tests/unit/test_model_activity_object.py
index 9902df807ada9eb478d7c22d33493e17e4654c76..66908454aad4d2795a713b5a0ea844cf66f5362a 100644
--- a/tests/unit/test_model_activity_object.py
+++ b/tests/unit/test_model_activity_object.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.activity_object import ActivityObject
 
 
 def test_ActivityObject(load_data):
-    response = load_data("activity")
+    response = load_data("activity/activity")
     activity: ActivityObject = ActivityObject.from_dict(response)
 
     assert isinstance(activity, ActivityObject)
diff --git a/tests/unit/test_model_activity_related_object.py b/tests/unit/test_model_activity_related_object.py
index 72c21ff51bc3eb3c13fb72cb9d8400a1f0e66e93..c56c5b90a87757941eb9aae93c5d71e87e9282e6 100644
--- a/tests/unit/test_model_activity_related_object.py
+++ b/tests/unit/test_model_activity_related_object.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.activity_related_object import ActivityRelatedO
 
 
 def test_ActivityRelatedObject(load_data):
-    response = load_data("activity")
+    response = load_data("activity/activity")
     activity_related_object: ActivityRelatedObject = ActivityRelatedObject.from_dict(response)
 
     assert isinstance(activity_related_object, ActivityRelatedObject)
diff --git a/tests/unit/test_model_album.py b/tests/unit/test_model_album.py
index 13485441822237801e65288c89b51d23866cba60..ac81bb974f93e93a703f7a08f6b9f0f948f652db 100644
--- a/tests/unit/test_model_album.py
+++ b/tests/unit/test_model_album.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.album import Album
 
 
 def test_Album(load_data):
-    response = load_data("album")
+    response = load_data("albums/album")
     album: Album = Album.from_dict(response)
 
     assert isinstance(album, Album)
diff --git a/tests/unit/test_model_all_favorite.py b/tests/unit/test_model_all_favorite.py
index 43965c8bca07dc6cdbc9913de34018c466b92a01..334d636d4391aaddd9551720abc0a1bb872d45dc 100644
--- a/tests/unit/test_model_all_favorite.py
+++ b/tests/unit/test_model_all_favorite.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.all_favorite import AllFavorite
 
 
 def test_AllFavorite(load_data):
-    response = load_data("favorites_all")
+    response = load_data("favorites/favorites_all")
     favorites: AllFavorite = AllFavorite.from_dict(response)
 
     assert isinstance(favorites, AllFavorite)
diff --git a/tests/unit/test_model_artist_with_albums.py b/tests/unit/test_model_artist_with_albums.py
index 2c781c77f2fce3ef9f13d3ce76edd2d05f9fa11f..5b7b034ed27ebba66d7a657cea525f3c497a0440 100644
--- a/tests/unit/test_model_artist_with_albums.py
+++ b/tests/unit/test_model_artist_with_albums.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.artist_with_albums import ArtistWithAlbums
 
 
 def test_ArtistWithAlbums(load_data):
-    response = load_data("artist")
+    response = load_data("artists/artist_with_albums")
     artist: ArtistWithAlbums = ArtistWithAlbums.from_dict(response)
 
     assert isinstance(artist, ArtistWithAlbums)
diff --git a/tests/unit/test_model_attachment.py b/tests/unit/test_model_attachment.py
index b16379cd94006e75ef207eef1f075d38aeb9ede0..f78d09473dca782f301fb704d3a1cc5d2189b89c 100644
--- a/tests/unit/test_model_attachment.py
+++ b/tests/unit/test_model_attachment.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.attachment import Attachment
 
 
 def test_Attachment(load_data):
-    response = load_data("attachment")
+    response = load_data("attachments/attachment")
     attachment: Attachment = Attachment.from_dict(response)
 
     assert isinstance(attachment, Attachment)
diff --git a/tests/unit/test_model_channel.py b/tests/unit/test_model_channel.py
index bb312eac9ce7eb0ddd0850e57766543f4bc0cce0..14518bc01cf8c5b283a2edb11b20bbee13960b1d 100644
--- a/tests/unit/test_model_channel.py
+++ b/tests/unit/test_model_channel.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.channel import Channel
 
 
 def test_Channel(load_data):
-    response = load_data("channel")
+    response = load_data("channels/channel")
     channel: Channel = Channel.from_dict(response)
 
     assert isinstance(channel, Channel)
diff --git a/tests/unit/test_model_global_preference.py b/tests/unit/test_model_global_preference.py
index e6411bb3ba7407c8b0a2bc9338823b991c18d275..db0be51cdd5f21c92497cb5d1939fe79564a2b26 100644
--- a/tests/unit/test_model_global_preference.py
+++ b/tests/unit/test_model_global_preference.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.global_preference import GlobalPreference
 
 
 def test_GlobalPreference(load_data):
-    response = load_data("settings")
+    response = load_data("instance/global_preference")
     settings: GlobalPreference = GlobalPreference.from_dict(response)
 
     assert isinstance(settings, GlobalPreference)
diff --git a/tests/unit/test_model_global_preference_request.py b/tests/unit/test_model_global_preference_request.py
index d2d983d03b7652eec9b9d6739f6e479223b9f7a6..59e73348bd07d6de5048a22fb31a8b7c2ec7860d 100644
--- a/tests/unit/test_model_global_preference_request.py
+++ b/tests/unit/test_model_global_preference_request.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.global_preference_request import GlobalPreferen
 
 
 def test_GlobalPreferenceRequest(load_data):
-    response = load_data("global_preference_request")
+    response = load_data("instance/global_preference_request")
     preference_request: GlobalPreferenceRequest = GlobalPreferenceRequest.from_dict(response)
 
     assert isinstance(preference_request, GlobalPreferenceRequest)
diff --git a/tests/unit/test_model_inbox_item.py b/tests/unit/test_model_inbox_item.py
index 4cf3b1df6b8d1e72f2a7120742c36b4db8493fe4..029f5b56f998faf7cb8195a2f204ab95fe516da9 100644
--- a/tests/unit/test_model_inbox_item.py
+++ b/tests/unit/test_model_inbox_item.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.inbox_item import InboxItem
 
 
 def test_InboxItem(load_data):
-    response = load_data("federation_inbox_item")
+    response = load_data("federation/federation_inbox_item")
     inbox_item: InboxItem = InboxItem.from_dict(response)
 
     assert isinstance(inbox_item, InboxItem)
diff --git a/tests/unit/test_model_library.py b/tests/unit/test_model_library.py
index 2f7b8dca5c154af6b4b92ec92a4db42de7dd06ae..0ae26b2ec51506f7f33a3c2e7e6b373104955357 100644
--- a/tests/unit/test_model_library.py
+++ b/tests/unit/test_model_library.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.library import Library
 
 
 def test_Library(load_data):
-    response = load_data("library")
+    response = load_data("libraries/library")
     library: Library = Library.from_dict(response)
 
     assert isinstance(library, Library)
diff --git a/tests/unit/test_model_library_follow.py b/tests/unit/test_model_library_follow.py
index a96d334c7668a53974e7953b43012d4251360335..5f487fadb818aab310e5c6f42035a4971e970f84 100644
--- a/tests/unit/test_model_library_follow.py
+++ b/tests/unit/test_model_library_follow.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.library_follow import LibraryFollow
 
 
 def test_LibraryFollow(load_data):
-    response = load_data("library_follow")
+    response = load_data("federation/library_follow")
     library_follow: LibraryFollow = LibraryFollow.from_dict(response)
 
     assert isinstance(library_follow, LibraryFollow)
diff --git a/tests/unit/test_model_library_follow_all.py b/tests/unit/test_model_library_follow_all.py
index 7568e2943602a3da487c53a518cd7dae148ce8b5..868a55c843f08e918ce09f7ebcb84323e4cb4c99 100644
--- a/tests/unit/test_model_library_follow_all.py
+++ b/tests/unit/test_model_library_follow_all.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.library_follow import LibraryFollow
 
 
 def test_LibraryFollowAll(load_data):
-    response = load_data("library_follow")
+    response = load_data("federation/library_follow")
     library_follow_all: LibraryFollow = LibraryFollow.from_dict(response)
 
     assert isinstance(library_follow_all, LibraryFollow)
diff --git a/tests/unit/test_model_library_follow_request.py b/tests/unit/test_model_library_follow_request.py
index 8de46cdee02607832a5671817d1f168eaa2455f0..0b096e7a0de8b7f38444cf23d2ec84627a0cca71 100644
--- a/tests/unit/test_model_library_follow_request.py
+++ b/tests/unit/test_model_library_follow_request.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.library_follow_request import LibraryFollowRequ
 
 
 def test_LibraryFollowRequest(load_data):
-    response = load_data("library_follow_request")
+    response = load_data("federation/library_follow_request")
     follow_request: LibraryFollowRequest = LibraryFollowRequest.from_dict(response)
 
     assert isinstance(follow_request, LibraryFollowRequest)
diff --git a/tests/unit/test_model_license.py b/tests/unit/test_model_license.py
index 8d1c921d34d6d6f1004fc70fad71b54652c172fa..273f49f03a226dfc29dee1ae9ffe0c382fdcae53 100644
--- a/tests/unit/test_model_license.py
+++ b/tests/unit/test_model_license.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.license_ import License
 
 
 def test_License(load_data):
-    response = load_data("license")
+    response = load_data("licenses/license")
     license: License = License.from_dict(response)
 
     assert isinstance(license, License)
diff --git a/tests/unit/test_model_listening.py b/tests/unit/test_model_listening.py
index b59263b4560b5dcee4ddca59a2169d8316811ae0..6d0643cd39d03370238ca98e9eac021d9a160f2c 100644
--- a/tests/unit/test_model_listening.py
+++ b/tests/unit/test_model_listening.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.listening import Listening
 
 
 def test_Listening(load_data):
-    response = load_data("listening")
+    response = load_data("history/listening")
     listening: Listening = Listening.from_dict(response)
 
     assert isinstance(listening, Listening)
diff --git a/tests/unit/test_model_listening_write.py b/tests/unit/test_model_listening_write.py
index 32b887bf21e0ec1420f870fef63cec22ecc1fc8e..cf50037af6a74585bd35de86ec059c830195b47c 100644
--- a/tests/unit/test_model_listening_write.py
+++ b/tests/unit/test_model_listening_write.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.listening_write import ListeningWrite
 
 
 def test_ListeningWrite(load_data):
-    response = load_data("listening_write")
+    response = load_data("history/listening_write")
     listening: ListeningWrite = ListeningWrite.from_dict(response)
 
     assert isinstance(listening, ListeningWrite)
diff --git a/tests/unit/test_model_listening_write_request.py b/tests/unit/test_model_listening_write_request.py
index 936e5e88feb481cc851a00219004bdc843212977..1290a4f00992a201e410dc573375e8d1b573dfde 100644
--- a/tests/unit/test_model_listening_write_request.py
+++ b/tests/unit/test_model_listening_write_request.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.listening_write_request import ListeningWriteRe
 
 
 def test_ListeningWriteRequest(load_data):
-    response = load_data("listening_write_request")
+    response = load_data("history/listening_write_request")
     listening: ListeningWriteRequest = ListeningWriteRequest.from_dict(response)
 
     assert isinstance(listening, ListeningWriteRequest)
diff --git a/tests/unit/test_model_manage_album.py b/tests/unit/test_model_manage_album.py
index c5cb1a703acb0abca74511b366e47d96829bfc30..fe309eb685a65509e48756cf76a2a2868bef4f9c 100644
--- a/tests/unit/test_model_manage_album.py
+++ b/tests/unit/test_model_manage_album.py
@@ -2,14 +2,14 @@ from funkwhale_api_client.models.manage_album import ManageAlbum
 
 
 def test_ManageAlbum(load_data):
-    response = load_data("manage_album")
+    response = load_data("manage/manage_album")
     album: ManageAlbum = ManageAlbum.from_dict(response)
 
     assert isinstance(album, ManageAlbum)
 
 
 def test_ManageAlbumStats(load_data):
-    response = load_data("manage_album_stats")
+    response = load_data("manage/manage_album_stats")
     album_stats: ManageAlbum = ManageAlbum.from_dict(response)
 
     assert isinstance(album_stats, ManageAlbum)
diff --git a/tests/unit/test_model_manage_artist.py b/tests/unit/test_model_manage_artist.py
index 99e19105f866d10a6c50e2feb8c302113e988edd..6c12ca9c47197ac8aaaa6a5a29ac7c015f17a857 100644
--- a/tests/unit/test_model_manage_artist.py
+++ b/tests/unit/test_model_manage_artist.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.manage_artist import ManageArtist
 
 
 def test_ManageArtist(load_data):
-    response = load_data("manage_artist")
+    response = load_data("manage/manage_artist")
     artist: ManageArtist = ManageArtist.from_dict(response)
 
     assert isinstance(artist, ManageArtist)
diff --git a/tests/unit/test_model_manage_channel.py b/tests/unit/test_model_manage_channel.py
index a18c7981c25cfd47feafb0664a6c153ba95d2c6a..823d637f8e04e7f75f646aa39433d86ef65c77f2 100644
--- a/tests/unit/test_model_manage_channel.py
+++ b/tests/unit/test_model_manage_channel.py
@@ -2,14 +2,14 @@ from funkwhale_api_client.models.manage_channel import ManageChannel
 
 
 def test_ManageChannel(load_data):
-    response = load_data("manage_channel")
+    response = load_data("manage/manage_channel")
     channel: ManageChannel = ManageChannel.from_dict(response)
 
     assert isinstance(channel, ManageChannel)
 
 
 def test_ManageChannelStats(load_data):
-    response = load_data("manage_channel_stats")
+    response = load_data("manage/manage_channel_stats")
     channel_stats: ManageChannel = ManageChannel.from_dict(response)
 
     assert isinstance(channel_stats, ManageChannel)
diff --git a/tests/unit/test_model_manage_domain.py b/tests/unit/test_model_manage_domain.py
index 2efc9476911d258a31dd645ccf6aa672a05b069e..818178acd769eb76cdb2b35afb4366c4fdcbb743 100644
--- a/tests/unit/test_model_manage_domain.py
+++ b/tests/unit/test_model_manage_domain.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.manage_domain import ManageDomain
 
 
 def test_ManageDomain(load_data):
-    response = load_data("manage_domain")
+    response = load_data("manage/manage_domain")
     domain: ManageDomain = ManageDomain.from_dict(response)
 
     assert isinstance(domain, ManageDomain)
diff --git a/tests/unit/test_model_manage_instance_policy.py b/tests/unit/test_model_manage_instance_policy.py
index c99414f5f0e430b687d0d38b92cadc4a395bf745..2dfef4998951f01cce2fd9158fe292c322a0a185 100644
--- a/tests/unit/test_model_manage_instance_policy.py
+++ b/tests/unit/test_model_manage_instance_policy.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.manage_instance_policy import ManageInstancePol
 
 
 def test_ManageInstancePolicy(load_data):
-    response = load_data("manage_instance_policy")
+    response = load_data("manage/manage_instance_policy")
     policy: ManageInstancePolicy = ManageInstancePolicy.from_dict(response)
 
     assert isinstance(policy, ManageInstancePolicy)
diff --git a/tests/unit/test_model_manage_invitation.py b/tests/unit/test_model_manage_invitation.py
index 852a49947d643e83a6d44423f4b970eb0fb349fe..9a1246c514988f1bc09fa2846bf9027275abd911 100644
--- a/tests/unit/test_model_manage_invitation.py
+++ b/tests/unit/test_model_manage_invitation.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.manage_invitation import ManageInvitation
 
 
 def test_ManageInvitation(load_data):
-    response = load_data("manage_invitation")
+    response = load_data("manage/manage_invitation")
     invitation: ManageInvitation = ManageInvitation.from_dict(response)
 
     assert isinstance(invitation, ManageInvitation)
diff --git a/tests/unit/test_model_manage_invitation_request.py b/tests/unit/test_model_manage_invitation_request.py
index 1d4085ea6f147e05905b90aec30f00b0ddbe8394..89a07ce22ce0782a5de05944f6a4d6325b92ccb8 100644
--- a/tests/unit/test_model_manage_invitation_request.py
+++ b/tests/unit/test_model_manage_invitation_request.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.manage_invitation_request import ManageInvitati
 
 
 def test_ManageInvitationRequest(load_data):
-    response = load_data("manage_invitation_request")
+    response = load_data("manage/manage_invitation_request")
     request: ManageInvitationRequest = ManageInvitationRequest.from_dict(response)
 
     assert isinstance(request, ManageInvitationRequest)
diff --git a/tests/unit/test_model_manage_library.py b/tests/unit/test_model_manage_library.py
index 23239993e055b13caf49f8d72edbae346e0fc8a3..edb8c90777911b35ce570208500c7a8eee8ac644 100644
--- a/tests/unit/test_model_manage_library.py
+++ b/tests/unit/test_model_manage_library.py
@@ -2,14 +2,14 @@ from funkwhale_api_client.models.manage_library import ManageLibrary
 
 
 def test_ManageLibrary(load_data):
-    response = load_data("manage_library")
+    response = load_data("manage/manage_library")
     library: ManageLibrary = ManageLibrary.from_dict(response)
 
     assert isinstance(library, ManageLibrary)
 
 
 def test_ManageLibraryStats(load_data):
-    response = load_data("manage_library_stats")
+    response = load_data("manage/manage_library_stats")
     library_stats: ManageLibrary = ManageLibrary.from_dict(response)
 
     assert isinstance(library_stats, ManageLibrary)
diff --git a/tests/unit/test_model_manage_note.py b/tests/unit/test_model_manage_note.py
index 85196623d5f04d49bb1671c11271172a69de65db..6cdf8d839e19203a218b9e067f0d2802f1e17921 100644
--- a/tests/unit/test_model_manage_note.py
+++ b/tests/unit/test_model_manage_note.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.manage_note import ManageNote
 
 
 def test_ManageNote(load_data):
-    response = load_data("manage_note")
+    response = load_data("manage/manage_note")
     note: ManageNote = ManageNote.from_dict(response)
 
     assert isinstance(note, ManageNote)
diff --git a/tests/unit/test_model_manage_note_request.py b/tests/unit/test_model_manage_note_request.py
index 68472d9ba89a93e867a071b74552136b1081ed05..3b281e395941b7a1f3237dc12d664f3ac9a49dba 100644
--- a/tests/unit/test_model_manage_note_request.py
+++ b/tests/unit/test_model_manage_note_request.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.manage_note_request import ManageNoteRequest
 
 
 def test_ManageNoteRequest(load_data):
-    response = load_data("manage_note_request")
+    response = load_data("manage/manage_note_request")
     note: ManageNoteRequest = ManageNoteRequest.from_dict(response)
 
     assert isinstance(note, ManageNoteRequest)
diff --git a/tests/unit/test_model_manage_report.py b/tests/unit/test_model_manage_report.py
index cc496c079cbc02bf472756f1986c53df2e446050..42b17318aabf18d1ae5f2b5a99a43b27243d6e19 100644
--- a/tests/unit/test_model_manage_report.py
+++ b/tests/unit/test_model_manage_report.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.manage_report import ManageReport
 
 
 def test_ManageReport(load_data):
-    response = load_data("manage_report")
+    response = load_data("manage/manage_report")
     report: ManageReport = ManageReport.from_dict(response)
 
     assert isinstance(report, ManageReport)
diff --git a/tests/unit/test_model_manage_report_request.py b/tests/unit/test_model_manage_report_request.py
index edce0a1daea8274243314525aa8485a97707b1b1..f9b1d1a8dfa2fc5b44962d5811817c59d8c0f8ae 100644
--- a/tests/unit/test_model_manage_report_request.py
+++ b/tests/unit/test_model_manage_report_request.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.manage_report_request import ManageReportReques
 
 
 def test_ManageReportRequest(load_data):
-    response = load_data("manage_report_request")
+    response = load_data("manage/manage_report_request")
     request: ManageReportRequest = ManageReportRequest.from_dict(response)
 
     assert isinstance(request, ManageReportRequest)
diff --git a/tests/unit/test_model_manage_track.py b/tests/unit/test_model_manage_track.py
index 277dec6a1e5b9c6fc83eeed77113f4c1e20d6064..5eef1d718ee1dc13d6ed9f6e1db4a4cce0501b24 100644
--- a/tests/unit/test_model_manage_track.py
+++ b/tests/unit/test_model_manage_track.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.manage_track import ManageTrack
 
 
 def test_ManageTrack(load_data):
-    response = load_data("manage_track")
+    response = load_data("manage/manage_track")
     track: ManageTrack = ManageTrack.from_dict(response)
 
     assert isinstance(track, ManageTrack)
diff --git a/tests/unit/test_model_manage_upload.py b/tests/unit/test_model_manage_upload.py
index 0e5bc7e75e5bdcedd6dcd8887ab5deb74f5f9738..b75e24b8e6046915d68bc1a2ff9f77d4556a2879 100644
--- a/tests/unit/test_model_manage_upload.py
+++ b/tests/unit/test_model_manage_upload.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.manage_upload import ManageUpload
 
 
 def test_ManageUpload(load_data):
-    response = load_data("manage_upload")
+    response = load_data("manage/manage_upload")
     upload: ManageUpload = ManageUpload.from_dict(response)
 
     assert isinstance(upload, ManageUpload)
diff --git a/tests/unit/test_model_manage_user.py b/tests/unit/test_model_manage_user.py
index 7599c00ff03062f3b8a3ccf9d6fa1eb09379e447..970a667e4ee6349cafb6812a87a9ac51d0e1f814 100644
--- a/tests/unit/test_model_manage_user.py
+++ b/tests/unit/test_model_manage_user.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.manage_user import ManageUser
 
 
 def test_ManageUser(load_data):
-    response = load_data("manage_user")
+    response = load_data("manage/manage_user")
     user: ManageUser = ManageUser.from_dict(response)
 
     assert isinstance(user, ManageUser)
diff --git a/tests/unit/test_model_manage_user_request.py b/tests/unit/test_model_manage_user_request.py
index aabc9219a522642345db5923744a568fdcc70e32..fb2e53644238622370fd18e9532a87c6128bccf4 100644
--- a/tests/unit/test_model_manage_user_request.py
+++ b/tests/unit/test_model_manage_user_request.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.manage_user_request import ManageUserRequest
 
 
 def test_ManageUserRequest(load_data):
-    response = load_data("manage_user_request")
+    response = load_data("manage/manage_user_request")
     user_request: ManageUserRequest = ManageUserRequest.from_dict(response)
 
     assert isinstance(user_request, ManageUserRequest)
diff --git a/tests/unit/test_model_node_info_20.py b/tests/unit/test_model_node_info_20.py
index 1de29d46a20f1816c89128924eec7a90e7e9b335..ec35fd64ee4f3375e7d80633afd28d95024e94ea 100644
--- a/tests/unit/test_model_node_info_20.py
+++ b/tests/unit/test_model_node_info_20.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.node_info_20 import NodeInfo20
 
 
 def test_NodeInfo20(load_data):
-    response = load_data("nodeinfo")
+    response = load_data("instance/nodeinfo_2_0")
     nodeinfo: NodeInfo20 = NodeInfo20.from_dict(response)
 
     assert isinstance(nodeinfo, NodeInfo20)
diff --git a/tests/unit/test_model_paginated_album_list.py b/tests/unit/test_model_paginated_album_list.py
index a1838de30afe9798c4a71ba24c676a599aa7572f..4a85be0e85ee5aee60a813741dc4fe7880f94a6e 100644
--- a/tests/unit/test_model_paginated_album_list.py
+++ b/tests/unit/test_model_paginated_album_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_album_list import PaginatedAlbumList
 
 
 def test_PaginatedAlbumList(load_data):
-    response = load_data("albums")
+    response = load_data("albums/paginated_album_list")
     album_list: PaginatedAlbumList = PaginatedAlbumList.from_dict(response)
 
     assert isinstance(album_list, PaginatedAlbumList)
diff --git a/tests/unit/test_model_paginated_application_list.py b/tests/unit/test_model_paginated_application_list.py
index 7eed7c45c55a01feb006c2f04fba1aa3c941c336..595fb396244e19db9ad75c15606b60d021044ec5 100644
--- a/tests/unit/test_model_paginated_application_list.py
+++ b/tests/unit/test_model_paginated_application_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_application_list import PaginatedAppl
 
 
 def test_PaginatedApplicationList(load_data):
-    response = load_data("paginated_application_list")
+    response = load_data("oauth/paginated_application_list")
     application_list: PaginatedApplicationList = PaginatedApplicationList.from_dict(response)
 
     assert isinstance(application_list, PaginatedApplicationList)
diff --git a/tests/unit/test_model_paginated_artist_with_albums_list.py b/tests/unit/test_model_paginated_artist_with_albums_list.py
index 31b7f3ac15709cfbee554e7faa29fd18f71b6d4d..a8410971d0bf605b1d280972b29f2418b7671db9 100644
--- a/tests/unit/test_model_paginated_artist_with_albums_list.py
+++ b/tests/unit/test_model_paginated_artist_with_albums_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_artist_with_albums_list import Pagina
 
 
 def test_PaginatedArtistWithAlbumsList(load_data):
-    response = load_data("artists")
+    response = load_data("artists/paginated_artist_with_albums_list")
     artist_list: PaginatedArtistWithAlbumsList = PaginatedArtistWithAlbumsList.from_dict(response)
 
     assert isinstance(artist_list, PaginatedArtistWithAlbumsList)
diff --git a/tests/unit/test_model_paginated_channel_list.py b/tests/unit/test_model_paginated_channel_list.py
index 87aeedc141d00013ae896cbc0d84e0c4928349cb..130b3fc1e856affc738b53ff878fd4295b20507d 100644
--- a/tests/unit/test_model_paginated_channel_list.py
+++ b/tests/unit/test_model_paginated_channel_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_channel_list import PaginatedChannelL
 
 
 def test_PaginatedChannelList(load_data):
-    response = load_data("channels")
+    response = load_data("channels/paginated_channel_list")
     channels: PaginatedChannelList = PaginatedChannelList.from_dict(response)
 
     assert isinstance(channels, PaginatedChannelList)
diff --git a/tests/unit/test_model_paginated_inbox_item_list.py b/tests/unit/test_model_paginated_inbox_item_list.py
index 3e1096b0d864cc99a069277f9aa3e4e0c48eb641..ebddfd0c2d96a16917d0ee09fd71598a2782b39a 100644
--- a/tests/unit/test_model_paginated_inbox_item_list.py
+++ b/tests/unit/test_model_paginated_inbox_item_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_inbox_item_list import PaginatedInbox
 
 
 def test_PaginatedInboxItemList(load_data):
-    response = load_data("federation_inbox_item_list")
+    response = load_data("federation/federation_inbox_item_list")
     inbox_list: PaginatedInboxItemList = PaginatedInboxItemList.from_dict(response)
 
     assert isinstance(inbox_list, PaginatedInboxItemList)
diff --git a/tests/unit/test_model_paginated_library_follow_list.py b/tests/unit/test_model_paginated_library_follow_list.py
index 45f84e808fa0bf27ac1666e1c9d8d79e5383453a..6be57e02f8fea2d7a419dd35f4e07b504d889e58 100644
--- a/tests/unit/test_model_paginated_library_follow_list.py
+++ b/tests/unit/test_model_paginated_library_follow_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_library_follow_list import PaginatedL
 
 
 def test_PaginatedLibraryFollowList(load_data):
-    response = load_data("library_follow_list")
+    response = load_data("federation/paginated_library_follow_list")
     library_follows: PaginatedLibraryFollowList = PaginatedLibraryFollowList.from_dict(response)
 
     assert isinstance(library_follows, PaginatedLibraryFollowList)
diff --git a/tests/unit/test_model_paginated_license_list.py b/tests/unit/test_model_paginated_license_list.py
index c8595132534a1681c79471447bdd937672e41cad..f126ccf45c0f419f83fa2c6ef24fd3cde0ec8edc 100644
--- a/tests/unit/test_model_paginated_license_list.py
+++ b/tests/unit/test_model_paginated_license_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_license_list import PaginatedLicenseL
 
 
 def test_PaginatedLicenseList(load_data):
-    response = load_data("licenses")
+    response = load_data("licenses/paginated_license_list")
     license_list: PaginatedLicenseList = PaginatedLicenseList.from_dict(response)
 
     assert isinstance(license_list, PaginatedLicenseList)
diff --git a/tests/unit/test_model_paginated_listening_list.py b/tests/unit/test_model_paginated_listening_list.py
index 2f59f70510d62b8e3ecfb63ccf7cc29a2a57d67c..e236c5d9db31d444b29cc166ad259fef727de6cc 100644
--- a/tests/unit/test_model_paginated_listening_list.py
+++ b/tests/unit/test_model_paginated_listening_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_listening_list import PaginatedListen
 
 
 def test_PaginatedListeningList(load_data):
-    response = load_data("listenings")
+    response = load_data("history/paginated_listening_list")
     listenings_list: PaginatedListeningList = PaginatedListeningList.from_dict(response)
 
     assert isinstance(listenings_list, PaginatedListeningList)
diff --git a/tests/unit/test_model_paginated_manage_actor_list.py b/tests/unit/test_model_paginated_manage_actor_list.py
index 22dd458333683689add8d15ee37c12334415310b..cc5124b51ec0e4436d9e00049fb2e18831bc6328 100644
--- a/tests/unit/test_model_paginated_manage_actor_list.py
+++ b/tests/unit/test_model_paginated_manage_actor_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_manage_actor_list import PaginatedMan
 
 
 def test_PaginatedManageActorList(load_data):
-    response = load_data("paginated_manage_actor_list")
+    response = load_data("manage/paginated_manage_actor_list")
     actor_list: PaginatedManageActorList = PaginatedManageActorList.from_dict(response)
 
     assert isinstance(actor_list, PaginatedManageActorList)
diff --git a/tests/unit/test_model_paginated_manage_album_list.py b/tests/unit/test_model_paginated_manage_album_list.py
index b7e9520a23a68b3444232236403d26743d9789fe..70a2869910ce5eff6f92c7b612564a455bfbfb07 100644
--- a/tests/unit/test_model_paginated_manage_album_list.py
+++ b/tests/unit/test_model_paginated_manage_album_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_manage_album_list import PaginatedMan
 
 
 def test_PaginatedManageAlbumList(load_data):
-    response = load_data("paginated_manage_album_list")
+    response = load_data("manage/paginated_manage_album_list")
     album_list: PaginatedManageAlbumList = PaginatedManageAlbumList.from_dict(response)
 
     assert isinstance(album_list, PaginatedManageAlbumList)
diff --git a/tests/unit/test_model_paginated_manage_artist_list.py b/tests/unit/test_model_paginated_manage_artist_list.py
index 80fd487b23f244b4d5a6855fc887574673971dec..2e50f2f815a0f9030878ce216b6054c65c98ff31 100644
--- a/tests/unit/test_model_paginated_manage_artist_list.py
+++ b/tests/unit/test_model_paginated_manage_artist_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_manage_artist_list import PaginatedMa
 
 
 def test_PaginatedManageArtistList(load_data):
-    response = load_data("paginated_manage_artist_list")
+    response = load_data("manage/paginated_manage_artist_list")
     artist_list: PaginatedManageArtistList = PaginatedManageArtistList.from_dict(response)
 
     assert isinstance(artist_list, PaginatedManageArtistList)
diff --git a/tests/unit/test_model_paginated_manage_channel_list.py b/tests/unit/test_model_paginated_manage_channel_list.py
index fbd8c36e84dc9d11f8e085b44fe2bc56eac154fc..54eb894ca08e889662c40ad3b92a91cf2110b80c 100644
--- a/tests/unit/test_model_paginated_manage_channel_list.py
+++ b/tests/unit/test_model_paginated_manage_channel_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_manage_channel_list import PaginatedM
 
 
 def test_PaginatedManageChannelList(load_data):
-    response = load_data("paginated_manage_channel_list")
+    response = load_data("manage/paginated_manage_channel_list")
     channel_list: PaginatedManageChannelList = PaginatedManageChannelList.from_dict(response)
 
     assert isinstance(channel_list, PaginatedManageChannelList)
diff --git a/tests/unit/test_model_paginated_manage_domain_list.py b/tests/unit/test_model_paginated_manage_domain_list.py
index 06071d796875c9f8dff6063133c629c0b5ed4873..d1e89a9b43763f992a2aa24c7081a3f3e4ee8f34 100644
--- a/tests/unit/test_model_paginated_manage_domain_list.py
+++ b/tests/unit/test_model_paginated_manage_domain_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_manage_domain_list import PaginatedMa
 
 
 def test_PaginatedManageDomainList(load_data):
-    response = load_data("paginated_manage_domain_list")
+    response = load_data("manage/paginated_manage_domain_list")
     domain_list: PaginatedManageDomainList = PaginatedManageDomainList.from_dict(response)
 
     assert isinstance(domain_list, PaginatedManageDomainList)
diff --git a/tests/unit/test_model_paginated_manage_instance_policy_list.py b/tests/unit/test_model_paginated_manage_instance_policy_list.py
index ed9d4ea299be3ac9c4d7a4a23a2cf5fdb86d76ba..dff91ca4807e65e8c4ca2547f8c7ae296c02dca9 100644
--- a/tests/unit/test_model_paginated_manage_instance_policy_list.py
+++ b/tests/unit/test_model_paginated_manage_instance_policy_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_manage_instance_policy_list import Pa
 
 
 def test_PaginatedManageInstancePolicyList(load_data):
-    response = load_data("paginated_manage_instance_policy_list")
+    response = load_data("manage/paginated_manage_instance_policy_list")
     policy_list: PaginatedManageInstancePolicyList = PaginatedManageInstancePolicyList.from_dict(response)
 
     assert isinstance(policy_list, PaginatedManageInstancePolicyList)
diff --git a/tests/unit/test_model_paginated_manage_invitation_list.py b/tests/unit/test_model_paginated_manage_invitation_list.py
index 8f596ffe3b3e12bd93c3eb8741e33ca1df0480ae..bc46fe74272fb08009153a917fe7329540e3ebe8 100644
--- a/tests/unit/test_model_paginated_manage_invitation_list.py
+++ b/tests/unit/test_model_paginated_manage_invitation_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_manage_invitation_list import Paginat
 
 
 def test_PaginatedManageInvitationList(load_data):
-    response = load_data("paginated_manage_invitation_list")
+    response = load_data("manage/paginated_manage_invitation_list")
     invitation_list: PaginatedManageInvitationList = PaginatedManageInvitationList.from_dict(response)
 
     assert isinstance(invitation_list, PaginatedManageInvitationList)
diff --git a/tests/unit/test_model_paginated_manage_library_list.py b/tests/unit/test_model_paginated_manage_library_list.py
index 6db57abb7ee617cf038912e0cca4bad27de6cbc6..ead1a41e13c1dbeb2764f9ecb3962cdb185ae90a 100644
--- a/tests/unit/test_model_paginated_manage_library_list.py
+++ b/tests/unit/test_model_paginated_manage_library_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_manage_library_list import PaginatedM
 
 
 def test_PaginatedManageLibraryList(load_data):
-    response = load_data("paginated_manage_library_list")
+    response = load_data("manage/paginated_manage_library_list")
     library_list: PaginatedManageLibraryList = PaginatedManageLibraryList.from_dict(response)
 
     assert isinstance(library_list, PaginatedManageLibraryList)
diff --git a/tests/unit/test_model_paginated_manage_note_list.py b/tests/unit/test_model_paginated_manage_note_list.py
index d8b735f43d13640c214acbe6f5839cfc4049abbc..d60fffc8b4aeedfa6bbedebfd212b8d1faa99de2 100644
--- a/tests/unit/test_model_paginated_manage_note_list.py
+++ b/tests/unit/test_model_paginated_manage_note_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_manage_note_list import PaginatedMana
 
 
 def test_PaginatedManageNoteList(load_data):
-    response = load_data("paginated_manage_note_list")
+    response = load_data("manage/paginated_manage_note_list")
     note_list: PaginatedManageNoteList = PaginatedManageNoteList.from_dict(response)
 
     assert isinstance(note_list, PaginatedManageNoteList)
diff --git a/tests/unit/test_model_paginated_manage_report_list.py b/tests/unit/test_model_paginated_manage_report_list.py
index 738893a998004bb3db5bcd5a748b4d323b66a9c9..2f3b70363438c9c2c0dc9989cffda1b8d0f401e5 100644
--- a/tests/unit/test_model_paginated_manage_report_list.py
+++ b/tests/unit/test_model_paginated_manage_report_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_manage_report_list import PaginatedMa
 
 
 def test_PaginatedManageReportList(load_data):
-    response = load_data("paginated_manage_report_list")
+    response = load_data("manage/paginated_manage_report_list")
     report_list: PaginatedManageReportList = PaginatedManageReportList.from_dict(response)
 
     assert isinstance(report_list, PaginatedManageReportList)
diff --git a/tests/unit/test_model_paginated_manage_track_list.py b/tests/unit/test_model_paginated_manage_track_list.py
index b55f4f3abae9f305ac76b0dd61a96e1ee14da7bf..6a2d1f8c64d8ab3da4ef581c0c5ece8f780aff6b 100644
--- a/tests/unit/test_model_paginated_manage_track_list.py
+++ b/tests/unit/test_model_paginated_manage_track_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_manage_track_list import PaginatedMan
 
 
 def test_PaginatedManageTrackList(load_data):
-    response = load_data("paginated_manage_track_list")
+    response = load_data("manage/paginated_manage_track_list")
     track_list: PaginatedManageTrackList = PaginatedManageTrackList.from_dict(response)
 
     assert isinstance(track_list, PaginatedManageTrackList)
diff --git a/tests/unit/test_model_paginated_manage_upload_list.py b/tests/unit/test_model_paginated_manage_upload_list.py
index 58b2bc839691f27dbb590d208b222f8e37b464e7..35963acbd8cc2a158915465d9abeb66d1595dd9a 100644
--- a/tests/unit/test_model_paginated_manage_upload_list.py
+++ b/tests/unit/test_model_paginated_manage_upload_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_manage_upload_list import PaginatedMa
 
 
 def test_PaginatedManageUploadList(load_data):
-    response = load_data("paginated_manage_upload_list")
+    response = load_data("manage/paginated_manage_upload_list")
     upload_list: PaginatedManageUploadList = PaginatedManageUploadList.from_dict(response)
 
     assert isinstance(upload_list, PaginatedManageUploadList)
diff --git a/tests/unit/test_model_paginated_manage_user_list.py b/tests/unit/test_model_paginated_manage_user_list.py
index 3d788619bbec9545d3beac6476098bf74379408f..aaaa551a6db5dbc26e591139aa7513129ca013cc 100644
--- a/tests/unit/test_model_paginated_manage_user_list.py
+++ b/tests/unit/test_model_paginated_manage_user_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_manage_user_list import PaginatedMana
 
 
 def test_PaginatedManageUserList(load_data):
-    response = load_data("paginated_manage_user_list")
+    response = load_data("manage/paginated_manage_user_list")
     user_list: PaginatedManageUserList = PaginatedManageUserList.from_dict(response)
 
     assert isinstance(user_list, PaginatedManageUserList)
diff --git a/tests/unit/test_model_paginated_manage_user_request_list.py b/tests/unit/test_model_paginated_manage_user_request_list.py
index 41ffc3ab1d024cffb5d249b1bf6582899faccf7a..dc9b0e9c93273ce6e984aa33696c11a33a342532 100644
--- a/tests/unit/test_model_paginated_manage_user_request_list.py
+++ b/tests/unit/test_model_paginated_manage_user_request_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_manage_user_request_list import Pagin
 
 
 def test_PaginatedManageUserRequestList(load_data):
-    response = load_data("paginated_manage_user_request_list")
+    response = load_data("manage/paginated_manage_user_request_list")
     request_list: PaginatedManageUserRequestList = PaginatedManageUserRequestList.from_dict(response)
 
     assert isinstance(request_list, PaginatedManageUserRequestList)
diff --git a/tests/unit/test_model_paginated_playlist_list.py b/tests/unit/test_model_paginated_playlist_list.py
index 6af1488f6fa3f9cb7f2cac36620052e06a330194..e60a53a94bce9d329bbdf351dbf7b10b3657f867 100644
--- a/tests/unit/test_model_paginated_playlist_list.py
+++ b/tests/unit/test_model_paginated_playlist_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_playlist_list import PaginatedPlaylis
 
 
 def test_PaginatedPlaylistList(load_data):
-    response = load_data("playlists")
+    response = load_data("playlists/paginated_playlist_list")
     playlists: PaginatedPlaylistList = PaginatedPlaylistList.from_dict(response)
 
     assert isinstance(playlists, PaginatedPlaylistList)
diff --git a/tests/unit/test_model_paginated_radio_list.py b/tests/unit/test_model_paginated_radio_list.py
index aef9110ca16f69bf925f644b6261b69b351d51c7..2a35651ea1a6fce3dec04dd85b49f902dc76a1be 100644
--- a/tests/unit/test_model_paginated_radio_list.py
+++ b/tests/unit/test_model_paginated_radio_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_radio_list import PaginatedRadioList
 
 
 def test_PaginatedRadioList(load_data):
-    response = load_data("radios")
+    response = load_data("radios/paginated_radio_list")
     radios: PaginatedRadioList = PaginatedRadioList.from_dict(response)
 
     assert isinstance(radios, PaginatedRadioList)
diff --git a/tests/unit/test_model_paginated_subscription_list.py b/tests/unit/test_model_paginated_subscription_list.py
index e7c841741275bf821c35b0704f018a5672b2f864..4e5d35d8ee6612f2e4604acd7b256cfcece95bd9 100644
--- a/tests/unit/test_model_paginated_subscription_list.py
+++ b/tests/unit/test_model_paginated_subscription_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_subscription_list import PaginatedSub
 
 
 def test_Paginated_SubscriptionList(load_data):
-    response = load_data("paginated_subscription_list")
+    response = load_data("subscriptions/paginated_subscription_list")
     subscription_list: PaginatedSubscriptionList = PaginatedSubscriptionList.from_dict(response)
 
     assert isinstance(subscription_list, PaginatedSubscriptionList)
diff --git a/tests/unit/test_model_paginated_tag_list.py b/tests/unit/test_model_paginated_tag_list.py
index 5ca9741e3e506e2ab0b5c4df8c5f4e5e660c7149..715429733313a1b6fc930b169efd4c6345e121d7 100644
--- a/tests/unit/test_model_paginated_tag_list.py
+++ b/tests/unit/test_model_paginated_tag_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_tag_list import PaginatedTagList
 
 
 def test_PaginatedTagList(load_data):
-    response = load_data("tags")
+    response = load_data("tags/paginated_tag_list")
     tags: PaginatedTagList = PaginatedTagList.from_dict(response)
 
     assert isinstance(tags, PaginatedTagList)
diff --git a/tests/unit/test_model_paginated_track_list.py b/tests/unit/test_model_paginated_track_list.py
index 70d781cbd52417fa5324b2a60db2916920da3547..872ecc949fe6d704a841ad6ad6ad7dd4af825301 100644
--- a/tests/unit/test_model_paginated_track_list.py
+++ b/tests/unit/test_model_paginated_track_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_track_list import PaginatedTrackList
 
 
 def test_PaginatedTrackList(load_data):
-    response = load_data("tracks")
+    response = load_data("tracks/paginated_track_list")
     track_list: PaginatedTrackList = PaginatedTrackList.from_dict(response)
 
     assert isinstance(track_list, PaginatedTrackList)
diff --git a/tests/unit/test_model_paginated_upload_for_owner_list.py b/tests/unit/test_model_paginated_upload_for_owner_list.py
index e980e965e20e72df809e0dd509092c9f46bea970..8831a895be79bcdd1c73e5af226ec1c591231b01 100644
--- a/tests/unit/test_model_paginated_upload_for_owner_list.py
+++ b/tests/unit/test_model_paginated_upload_for_owner_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_upload_for_owner_list import Paginate
 
 
 def test_PaginatedUploadForOwnerList(load_data):
-    response = load_data("paginated_upload_for_owner_list")
+    response = load_data("uploads/paginated_upload_for_owner_list")
     upload_list: PaginatedUploadForOwnerList = PaginatedUploadForOwnerList.from_dict(response)
 
     assert isinstance(upload_list, PaginatedUploadForOwnerList)
diff --git a/tests/unit/test_model_paginated_user_track_favorite_list.py b/tests/unit/test_model_paginated_user_track_favorite_list.py
index e419194ba57d41fc8277b3c3520a13ca18992aa0..50a0d0afe7d6f03a7dbceb30631785dfc90e6f30 100644
--- a/tests/unit/test_model_paginated_user_track_favorite_list.py
+++ b/tests/unit/test_model_paginated_user_track_favorite_list.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.paginated_user_track_favorite_list import Pagin
 
 
 def test_PaginatedUserTrackFavoriteList(load_data):
-    response = load_data("favorites")
+    response = load_data("favorites/paginated_user_track_favorite_list")
     favorite: PaginatedUserTrackFavoriteList = PaginatedUserTrackFavoriteList.from_dict(response)
 
     assert isinstance(favorite, PaginatedUserTrackFavoriteList)
diff --git a/tests/unit/test_model_patched_global_preference_request.py b/tests/unit/test_model_patched_global_preference_request.py
index 18c450bb1308ad68cf3a1f5e3711dbc5cb7931c1..c489a190622be765112f069bf0d507b85f5e1eea 100644
--- a/tests/unit/test_model_patched_global_preference_request.py
+++ b/tests/unit/test_model_patched_global_preference_request.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.patched_global_preference_request import Patche
 
 
 def test_PatchedGlobalPreferenceRequest(load_data):
-    response = load_data("patched_global_preference_request")
+    response = load_data("instance/patched_global_preference_request")
     patch: PatchedGlobalPreferenceRequest = PatchedGlobalPreferenceRequest.from_dict(response)
 
     assert isinstance(patch, PatchedGlobalPreferenceRequest)
diff --git a/tests/unit/test_model_patched_manage_report_request.py b/tests/unit/test_model_patched_manage_report_request.py
index 560533b9f8aee57f9d244077c04fa7b70f98f3bc..a79ce3f9c12de1ffd7498dc66fd1fb8a08d42d23 100644
--- a/tests/unit/test_model_patched_manage_report_request.py
+++ b/tests/unit/test_model_patched_manage_report_request.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.patched_manage_report_request import PatchedMan
 
 
 def test_PatchedManageReportRequest(load_data):
-    response = load_data("patched_manage_report_request")
+    response = load_data("manage/patched_manage_report_request")
     request: PatchedManageReportRequest = PatchedManageReportRequest.from_dict(response)
 
     assert isinstance(request, PatchedManageReportRequest)
diff --git a/tests/unit/test_model_playlist.py b/tests/unit/test_model_playlist.py
index 4f0fb3270f2ed01de32ea98e5d1bf10da5e24d48..4c64eb3473974c29abd1c2c2133b361e5cdf8dca 100644
--- a/tests/unit/test_model_playlist.py
+++ b/tests/unit/test_model_playlist.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.playlist import Playlist
 
 
 def test_Playlist(load_data):
-    response = load_data("playlist")
+    response = load_data("playlists/playlist")
     playlist: Playlist = Playlist.from_dict(response)
 
     assert isinstance(playlist, Playlist)
diff --git a/tests/unit/test_model_radio.py b/tests/unit/test_model_radio.py
index 675cfdf25d2f691de374fa14f1e9f028761df99c..97fa9f9de803a8105aa4082be0c47cd76c81d8dc 100644
--- a/tests/unit/test_model_radio.py
+++ b/tests/unit/test_model_radio.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.radio import Radio
 
 
 def test_Radio(load_data):
-    response = load_data("radio")
+    response = load_data("radios/radio")
     radio: Radio = Radio.from_dict(response)
 
     assert isinstance(radio, Radio)
diff --git a/tests/unit/test_model_radio_session.py b/tests/unit/test_model_radio_session.py
index b8f64ef3e5f6a7fd97d422c5ad5f772941f0abda..3691ab8d8526e4ff68f2f10fca168227f06bd192 100644
--- a/tests/unit/test_model_radio_session.py
+++ b/tests/unit/test_model_radio_session.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.radio_session import RadioSession
 
 
 def test_RadioSession(load_data):
-    response = load_data("radio_session")
+    response = load_data("radios/radio_session")
     session: RadioSession = RadioSession.from_dict(response)
 
     assert isinstance(session, RadioSession)
diff --git a/tests/unit/test_model_radio_session_request.py b/tests/unit/test_model_radio_session_request.py
index b5b38a72bb711b54437ccce0b915098f86da7019..fc9d2465cdd328388757d5652bf035c702ad8491 100644
--- a/tests/unit/test_model_radio_session_request.py
+++ b/tests/unit/test_model_radio_session_request.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.radio_session_request import RadioSessionReques
 
 
 def test_RadioSessionRequest(load_data):
-    response = load_data("radio_session_request")
+    response = load_data("radios/radio_session_request")
     request: RadioSessionRequest = RadioSessionRequest.from_dict(response)
 
     assert isinstance(request, RadioSessionRequest)
diff --git a/tests/unit/test_model_rate_limit.py b/tests/unit/test_model_rate_limit.py
index cbd087e07ca60328b9ea1973eb46808c038b3b9a..52281dad968d3d692dde3065894b14fbfabd2483 100644
--- a/tests/unit/test_model_rate_limit.py
+++ b/tests/unit/test_model_rate_limit.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.rate_limit import RateLimit
 
 
 def test_RateLimit(load_data):
-    response = load_data("rate_limit")
+    response = load_data("rate_limit/rate_limit")
     rate_limit: RateLimit = RateLimit.from_dict(response)
 
     assert isinstance(rate_limit, RateLimit)
diff --git a/tests/unit/test_model_simple_artist.py b/tests/unit/test_model_simple_artist.py
index a1b6da66c76b20798e973b6f8da03551bb8cd8de..f29a0f1b38941320cc0d9bab844215fa05901cd8 100644
--- a/tests/unit/test_model_simple_artist.py
+++ b/tests/unit/test_model_simple_artist.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.simple_artist import SimpleArtist
 
 
 def test_SimpleArtist(load_data):
-    response = load_data("simple_artist")
+    response = load_data("artists/simple_artist")
     simple_artist: SimpleArtist = SimpleArtist.from_dict(response)
 
     assert isinstance(simple_artist, SimpleArtist)
diff --git a/tests/unit/test_model_subscription.py b/tests/unit/test_model_subscription.py
index 61b79d5cc1f61252e6ee77be39d233cd8eab138f..b193dcd7c3ff262cf36a0cb93979dede8ae39922 100644
--- a/tests/unit/test_model_subscription.py
+++ b/tests/unit/test_model_subscription.py
@@ -3,14 +3,14 @@ from funkwhale_api_client.models.subscription import Subscription
 
 
 def test_Subscription(load_data):
-    response = load_data("subscription")
+    response = load_data("subscriptions/subscription")
     subscription: Subscription = Subscription.from_dict(response)
 
     assert isinstance(subscription, Subscription)
 
 
 def test_SubscriptionAll(load_data):
-    response = load_data("subscription_all")
+    response = load_data("subscriptions/subscription_all")
     subscription_all: AllSubscriptions = AllSubscriptions.from_dict(response)
 
     assert isinstance(subscription_all, AllSubscriptions)
diff --git a/tests/unit/test_model_tag.py b/tests/unit/test_model_tag.py
index d6cee407fd808e2df45688e396eeac3142ebdb8e..38d6b4d6d28f7f30ebf2d59ffd2dd27b244b9de8 100644
--- a/tests/unit/test_model_tag.py
+++ b/tests/unit/test_model_tag.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.tag import Tag
 
 
 def test_Tag(load_data):
-    response = load_data("tag")
+    response = load_data("tags/tag")
     tag: Tag = Tag.from_dict(response)
 
     assert isinstance(tag, Tag)
diff --git a/tests/unit/test_model_track.py b/tests/unit/test_model_track.py
index 9c6ee31ce93c471b9708fba4b51fc505ced73366..b5f017b50d884490562ce7b7681d4a45928724c4 100644
--- a/tests/unit/test_model_track.py
+++ b/tests/unit/test_model_track.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.track import Track
 
 
 def test_Track(load_data):
-    response = load_data("track")
+    response = load_data("tracks/track")
     track: Track = Track.from_dict(response)
 
     assert isinstance(track, Track)
diff --git a/tests/unit/test_model_track_album.py b/tests/unit/test_model_track_album.py
index 3b5cf88b6f7fa0bcac4f0b5b81478f6a83f1d786..c32848578cf148a9f5af87dc043073683791edc3 100644
--- a/tests/unit/test_model_track_album.py
+++ b/tests/unit/test_model_track_album.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.track_album import TrackAlbum
 
 
 def test_TrackAlbum(load_data):
-    response = load_data("track_album")
+    response = load_data("tracks/track_album")
     track_album: TrackAlbum = TrackAlbum.from_dict(response)
 
     assert isinstance(track_album, TrackAlbum)
diff --git a/tests/unit/test_model_track_metadata.py b/tests/unit/test_model_track_metadata.py
index 1e98c878f3be90b27409fb0afcec1e8e628a38ea..c628fec4ebb748c4583cff3068cee3f4f4d659e0 100644
--- a/tests/unit/test_model_track_metadata.py
+++ b/tests/unit/test_model_track_metadata.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.track_metadata import TrackMetadata
 
 
 def test_UploadForOwnerMetadata(load_data):
-    response = load_data("upload_for_owner_metadata")
+    response = load_data("uploads/upload_for_owner_metadata")
     upload_metadata: TrackMetadata = TrackMetadata.from_dict(response)
 
     assert isinstance(upload_metadata, TrackMetadata)
diff --git a/tests/unit/test_model_upload_for_owner.py b/tests/unit/test_model_upload_for_owner.py
index 9b6100646669101eab761f499efce911e55c1be7..74c15f12b9883a4ad95eb2595cf0784c9d5f056e 100644
--- a/tests/unit/test_model_upload_for_owner.py
+++ b/tests/unit/test_model_upload_for_owner.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.upload_for_owner import UploadForOwner
 
 
 def test_UploadForOwner(load_data):
-    response = load_data("upload_for_owner")
+    response = load_data("uploads/upload_for_owner")
     upload: UploadForOwner = UploadForOwner.from_dict(response)
 
     assert isinstance(upload, UploadForOwner)
diff --git a/tests/unit/test_model_user_details.py b/tests/unit/test_model_user_details.py
index 29f86b19639161a4a7a7e11dda86abd81c10b2ee..fda59627db1db80a72c6e34622f3917ba6e6eb0c 100644
--- a/tests/unit/test_model_user_details.py
+++ b/tests/unit/test_model_user_details.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.user_details import UserDetails
 
 
 def test_UserDetails(load_data):
-    response = load_data("user_details")
+    response = load_data("auth/user_details")
     user_details: UserDetails = UserDetails.from_dict(response)
 
     assert isinstance(user_details, UserDetails)
diff --git a/tests/unit/test_model_user_track_favorite_write.py b/tests/unit/test_model_user_track_favorite_write.py
index bd166edd4ef8d03fe56bf3ff8de0370e18ad3ec7..f7d4248eb12218abee894e0cb5fd995594ebecca 100644
--- a/tests/unit/test_model_user_track_favorite_write.py
+++ b/tests/unit/test_model_user_track_favorite_write.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.user_track_favorite_write import UserTrackFavor
 
 
 def test_UserTrackFavoriteWrite(load_data):
-    response = load_data("track_favorite_write")
+    response = load_data("favorites/track_favorite_write")
     favorite: UserTrackFavoriteWrite = UserTrackFavoriteWrite.from_dict(response)
 
     assert isinstance(favorite, UserTrackFavoriteWrite)
diff --git a/tests/unit/test_model_user_track_favorite_write_request.py b/tests/unit/test_model_user_track_favorite_write_request.py
index 065f624451da0761160f63ca0d9ed63048a707a2..ba3f3df9fd0f5018cda596befff9645a75580afa 100644
--- a/tests/unit/test_model_user_track_favorite_write_request.py
+++ b/tests/unit/test_model_user_track_favorite_write_request.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.user_track_favorite_write_request import UserTr
 
 
 def test_UserTrackFavoriteWriteRequest(load_data):
-    response = load_data("track_favorite_write")
+    response = load_data("favorites/track_favorite_write")
     favorite: UserTrackFavoriteWriteRequest = UserTrackFavoriteWriteRequest.from_dict(response)
 
     assert isinstance(favorite, UserTrackFavoriteWriteRequest)
diff --git a/tests/unit/test_model_user_write.py b/tests/unit/test_model_user_write.py
index 6ebe946d918e2c919b972901d77305926104d45f..4925cefcf87bcd69dda5b657e5659b4cb7a3c56c 100644
--- a/tests/unit/test_model_user_write.py
+++ b/tests/unit/test_model_user_write.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.user_write import UserWrite
 
 
 def test_UserWrite(load_data):
-    response = load_data("user_me")
+    response = load_data("auth/user_me")
     user: UserWrite = UserWrite.from_dict(response)
 
     assert isinstance(user, UserWrite)
diff --git a/tests/unit/test_model_verify_email.py b/tests/unit/test_model_verify_email.py
index 895ee33a9c1c130dac38b79f23313098583cd10a..89b0af09ff856efab32edb439ac7e8aaffc3a099 100644
--- a/tests/unit/test_model_verify_email.py
+++ b/tests/unit/test_model_verify_email.py
@@ -6,7 +6,7 @@ from funkwhale_api_client.models.verify_email import VerifyEmail
 @pytest.mark.xfail
 # This is known to be broken, see https://dev.funkwhale.audio/funkwhale/funkwhale/-/issues/1877
 def test_VerifyEmail(load_data):
-    response = load_data("verify_email")
+    response = load_data("auth/verify_email")
     verify_email: VerifyEmail = VerifyEmail.from_dict(response)
 
     assert isinstance(verify_email, VerifyEmail)
diff --git a/tests/unit/test_model_verify_email_request.py b/tests/unit/test_model_verify_email_request.py
index 87ef854f7ec440c75c6a214230c5f8c7a4e48b0b..4afd323f475ca3e2475d46c5cacc001a4e2aca38 100644
--- a/tests/unit/test_model_verify_email_request.py
+++ b/tests/unit/test_model_verify_email_request.py
@@ -2,7 +2,7 @@ from funkwhale_api_client.models.verify_email_request import VerifyEmailRequest
 
 
 def test_VerifyEmailRequest(load_data):
-    response = load_data("verify_email_request")
+    response = load_data("auth/verify_email_request")
     email_request: VerifyEmailRequest = VerifyEmailRequest.from_dict(response)
 
     assert isinstance(email_request, VerifyEmailRequest)