From 507a5f0e0bb83b8155746b5a5e3a0298f56b308e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ciar=C3=A1n=20Ainsworth?= <sporiff@funkwhale.audio>
Date: Tue, 27 Sep 2022 17:37:48 +0200
Subject: [PATCH] Create subdirs for test data

---
 tests/data/{ => activity}/activity.json                       | 0
 tests/data/{ => albums}/album.json                            | 0
 tests/data/{albums.json => albums/paginated_album_list.json}  | 0
 tests/data/{artist.json => artists/artist_with_albums.json}   | 0
 .../paginated_artist_with_albums_list.json}                   | 0
 tests/data/{ => artists}/simple_artist.json                   | 0
 tests/data/{ => attachments}/attachment.json                  | 0
 tests/data/{ => auth}/subsonic.json                           | 0
 tests/data/{ => auth}/user_details.json                       | 0
 tests/data/{ => auth}/user_me.json                            | 0
 tests/data/{ => auth}/verify_email.json                       | 0
 tests/data/{ => auth}/verify_email_request.json               | 0
 tests/data/{ => channels}/channel.json                        | 0
 .../{channels.json => channels/paginated_channel_list.json}   | 0
 tests/data/{ => common}/api_mutation.json                     | 0
 tests/data/{ => common}/paginated_api_mutation_list.json      | 0
 tests/data/{ => favorites}/favorites_all.json                 | 0
 .../paginated_user_track_favorite_list.json}                  | 0
 tests/data/{ => favorites}/track_favorite_write.json          | 0
 tests/data/{ => favorites}/track_favorite_write_request.json  | 0
 tests/data/{ => federation}/federation_inbox_item.json        | 0
 tests/data/{ => federation}/federation_inbox_item_list.json   | 0
 tests/data/{ => federation}/library_follow.json               | 0
 tests/data/{ => federation}/library_follow_all.json           | 0
 tests/data/{ => federation}/library_follow_request.json       | 0
 .../paginated_library_follow_list.json}                       | 0
 tests/data/{ => history}/listening.json                       | 0
 tests/data/{ => history}/listening_write.json                 | 0
 tests/data/{ => history}/listening_write_request.json         | 0
 .../paginated_listening_list.json}                            | 0
 tests/data/{settings.json => instance/global_preference.json} | 0
 tests/data/{ => instance}/global_preference_request.json      | 0
 tests/data/{nodeinfo.json => instance/nodeinfo_2_0.json}      | 0
 .../{ => instance}/patched_global_preference_request.json     | 0
 tests/data/{ => libraries}/library.json                       | 0
 tests/data/{ => licenses}/license.json                        | 0
 .../{licenses.json => licenses/paginated_license_list.json}   | 0
 tests/data/{ => manage}/manage_album.json                     | 0
 tests/data/{ => manage}/manage_album_stats.json               | 0
 tests/data/{ => manage}/manage_artist.json                    | 0
 tests/data/{ => manage}/manage_channel.json                   | 0
 tests/data/{ => manage}/manage_channel_stats.json             | 0
 tests/data/{ => manage}/manage_domain.json                    | 0
 tests/data/{ => manage}/manage_domain_nodeinfo.json           | 0
 tests/data/{ => manage}/manage_instance_policy.json           | 0
 tests/data/{ => manage}/manage_invitation.json                | 0
 tests/data/{ => manage}/manage_invitation_request.json        | 0
 tests/data/{ => manage}/manage_library.json                   | 0
 tests/data/{ => manage}/manage_library_stats.json             | 0
 tests/data/{ => manage}/manage_note.json                      | 0
 tests/data/{ => manage}/manage_note_request.json              | 0
 tests/data/{ => manage}/manage_report.json                    | 0
 tests/data/{ => manage}/manage_report_request.json            | 0
 tests/data/{ => manage}/manage_track.json                     | 0
 tests/data/{ => manage}/manage_upload.json                    | 0
 tests/data/{ => manage}/manage_user.json                      | 0
 tests/data/{ => manage}/manage_user_request.json              | 0
 tests/data/{ => manage}/paginated_manage_actor_list.json      | 0
 tests/data/{ => manage}/paginated_manage_album_list.json      | 0
 tests/data/{ => manage}/paginated_manage_artist_list.json     | 0
 tests/data/{ => manage}/paginated_manage_channel_list.json    | 0
 tests/data/{ => manage}/paginated_manage_domain_list.json     | 0
 .../{ => manage}/paginated_manage_instance_policy_list.json   | 0
 tests/data/{ => manage}/paginated_manage_invitation_list.json | 0
 tests/data/{ => manage}/paginated_manage_library_list.json    | 0
 tests/data/{ => manage}/paginated_manage_note_list.json       | 0
 tests/data/{ => manage}/paginated_manage_report_list.json     | 0
 tests/data/{ => manage}/paginated_manage_track_list.json      | 0
 tests/data/{ => manage}/paginated_manage_upload_list.json     | 0
 tests/data/{ => manage}/paginated_manage_user_list.json       | 0
 .../data/{ => manage}/paginated_manage_user_request_list.json | 0
 tests/data/{ => manage}/patched_manage_report_request.json    | 0
 tests/data/{ => oauth}/paginated_application_list.json        | 0
 .../paginated_playlist_list.json}                             | 0
 tests/data/{ => playlists}/playlist.json                      | 0
 tests/data/{radios.json => radios/paginated_radio_list.json}  | 0
 tests/data/{ => radios}/radio.json                            | 0
 tests/data/{ => radios}/radio_filters.json                    | 0
 tests/data/{ => radios}/radio_session.json                    | 0
 tests/data/{ => radios}/radio_session_request.json            | 0
 tests/data/{ => rate_limit}/rate_limit.json                   | 0
 .../data/{ => subscriptions}/paginated_subscription_list.json | 0
 tests/data/{ => subscriptions}/subscription.json              | 0
 tests/data/{ => subscriptions}/subscription_all.json          | 0
 tests/data/{tags.json => tags/paginated_tag_list.json}        | 0
 tests/data/{ => tags}/tag.json                                | 0
 tests/data/{tracks.json => tracks/paginated_track_list.json}  | 0
 tests/data/{ => tracks}/track.json                            | 0
 tests/data/{ => tracks}/track_album.json                      | 0
 tests/data/{ => uploads}/paginated_upload_for_owner_list.json | 0
 tests/data/{ => uploads}/upload_for_owner.json                | 0
 tests/data/{ => uploads}/upload_for_owner_metadata.json       | 0
 tests/unit/test_model_activity_object.py                      | 2 +-
 tests/unit/test_model_activity_related_object.py              | 2 +-
 tests/unit/test_model_album.py                                | 2 +-
 tests/unit/test_model_all_favorite.py                         | 2 +-
 tests/unit/test_model_artist_with_albums.py                   | 2 +-
 tests/unit/test_model_attachment.py                           | 2 +-
 tests/unit/test_model_channel.py                              | 2 +-
 tests/unit/test_model_global_preference.py                    | 2 +-
 tests/unit/test_model_global_preference_request.py            | 2 +-
 tests/unit/test_model_inbox_item.py                           | 2 +-
 tests/unit/test_model_library.py                              | 2 +-
 tests/unit/test_model_library_follow.py                       | 2 +-
 tests/unit/test_model_library_follow_all.py                   | 2 +-
 tests/unit/test_model_library_follow_request.py               | 2 +-
 tests/unit/test_model_license.py                              | 2 +-
 tests/unit/test_model_listening.py                            | 2 +-
 tests/unit/test_model_listening_write.py                      | 2 +-
 tests/unit/test_model_listening_write_request.py              | 2 +-
 tests/unit/test_model_manage_album.py                         | 4 ++--
 tests/unit/test_model_manage_artist.py                        | 2 +-
 tests/unit/test_model_manage_channel.py                       | 4 ++--
 tests/unit/test_model_manage_domain.py                        | 2 +-
 tests/unit/test_model_manage_instance_policy.py               | 2 +-
 tests/unit/test_model_manage_invitation.py                    | 2 +-
 tests/unit/test_model_manage_invitation_request.py            | 2 +-
 tests/unit/test_model_manage_library.py                       | 4 ++--
 tests/unit/test_model_manage_note.py                          | 2 +-
 tests/unit/test_model_manage_note_request.py                  | 2 +-
 tests/unit/test_model_manage_report.py                        | 2 +-
 tests/unit/test_model_manage_report_request.py                | 2 +-
 tests/unit/test_model_manage_track.py                         | 2 +-
 tests/unit/test_model_manage_upload.py                        | 2 +-
 tests/unit/test_model_manage_user.py                          | 2 +-
 tests/unit/test_model_manage_user_request.py                  | 2 +-
 tests/unit/test_model_node_info_20.py                         | 2 +-
 tests/unit/test_model_paginated_album_list.py                 | 2 +-
 tests/unit/test_model_paginated_application_list.py           | 2 +-
 tests/unit/test_model_paginated_artist_with_albums_list.py    | 2 +-
 tests/unit/test_model_paginated_channel_list.py               | 2 +-
 tests/unit/test_model_paginated_inbox_item_list.py            | 2 +-
 tests/unit/test_model_paginated_library_follow_list.py        | 2 +-
 tests/unit/test_model_paginated_license_list.py               | 2 +-
 tests/unit/test_model_paginated_listening_list.py             | 2 +-
 tests/unit/test_model_paginated_manage_actor_list.py          | 2 +-
 tests/unit/test_model_paginated_manage_album_list.py          | 2 +-
 tests/unit/test_model_paginated_manage_artist_list.py         | 2 +-
 tests/unit/test_model_paginated_manage_channel_list.py        | 2 +-
 tests/unit/test_model_paginated_manage_domain_list.py         | 2 +-
 .../unit/test_model_paginated_manage_instance_policy_list.py  | 2 +-
 tests/unit/test_model_paginated_manage_invitation_list.py     | 2 +-
 tests/unit/test_model_paginated_manage_library_list.py        | 2 +-
 tests/unit/test_model_paginated_manage_note_list.py           | 2 +-
 tests/unit/test_model_paginated_manage_report_list.py         | 2 +-
 tests/unit/test_model_paginated_manage_track_list.py          | 2 +-
 tests/unit/test_model_paginated_manage_upload_list.py         | 2 +-
 tests/unit/test_model_paginated_manage_user_list.py           | 2 +-
 tests/unit/test_model_paginated_manage_user_request_list.py   | 2 +-
 tests/unit/test_model_paginated_playlist_list.py              | 2 +-
 tests/unit/test_model_paginated_radio_list.py                 | 2 +-
 tests/unit/test_model_paginated_subscription_list.py          | 2 +-
 tests/unit/test_model_paginated_tag_list.py                   | 2 +-
 tests/unit/test_model_paginated_track_list.py                 | 2 +-
 tests/unit/test_model_paginated_upload_for_owner_list.py      | 2 +-
 tests/unit/test_model_paginated_user_track_favorite_list.py   | 2 +-
 tests/unit/test_model_patched_global_preference_request.py    | 2 +-
 tests/unit/test_model_patched_manage_report_request.py        | 2 +-
 tests/unit/test_model_playlist.py                             | 2 +-
 tests/unit/test_model_radio.py                                | 2 +-
 tests/unit/test_model_radio_session.py                        | 2 +-
 tests/unit/test_model_radio_session_request.py                | 2 +-
 tests/unit/test_model_rate_limit.py                           | 2 +-
 tests/unit/test_model_simple_artist.py                        | 2 +-
 tests/unit/test_model_subscription.py                         | 4 ++--
 tests/unit/test_model_tag.py                                  | 2 +-
 tests/unit/test_model_track.py                                | 2 +-
 tests/unit/test_model_track_album.py                          | 2 +-
 tests/unit/test_model_track_metadata.py                       | 2 +-
 tests/unit/test_model_upload_for_owner.py                     | 2 +-
 tests/unit/test_model_user_details.py                         | 2 +-
 tests/unit/test_model_user_track_favorite_write.py            | 2 +-
 tests/unit/test_model_user_track_favorite_write_request.py    | 2 +-
 tests/unit/test_model_user_write.py                           | 2 +-
 tests/unit/test_model_verify_email.py                         | 2 +-
 tests/unit/test_model_verify_email_request.py                 | 2 +-
 176 files changed, 88 insertions(+), 88 deletions(-)
 rename tests/data/{ => activity}/activity.json (100%)
 rename tests/data/{ => albums}/album.json (100%)
 rename tests/data/{albums.json => albums/paginated_album_list.json} (100%)
 rename tests/data/{artist.json => artists/artist_with_albums.json} (100%)
 rename tests/data/{artists.json => artists/paginated_artist_with_albums_list.json} (100%)
 rename tests/data/{ => artists}/simple_artist.json (100%)
 rename tests/data/{ => attachments}/attachment.json (100%)
 rename tests/data/{ => auth}/subsonic.json (100%)
 rename tests/data/{ => auth}/user_details.json (100%)
 rename tests/data/{ => auth}/user_me.json (100%)
 rename tests/data/{ => auth}/verify_email.json (100%)
 rename tests/data/{ => auth}/verify_email_request.json (100%)
 rename tests/data/{ => channels}/channel.json (100%)
 rename tests/data/{channels.json => channels/paginated_channel_list.json} (100%)
 rename tests/data/{ => common}/api_mutation.json (100%)
 rename tests/data/{ => common}/paginated_api_mutation_list.json (100%)
 rename tests/data/{ => favorites}/favorites_all.json (100%)
 rename tests/data/{favorites.json => favorites/paginated_user_track_favorite_list.json} (100%)
 rename tests/data/{ => favorites}/track_favorite_write.json (100%)
 rename tests/data/{ => favorites}/track_favorite_write_request.json (100%)
 rename tests/data/{ => federation}/federation_inbox_item.json (100%)
 rename tests/data/{ => federation}/federation_inbox_item_list.json (100%)
 rename tests/data/{ => federation}/library_follow.json (100%)
 rename tests/data/{ => federation}/library_follow_all.json (100%)
 rename tests/data/{ => federation}/library_follow_request.json (100%)
 rename tests/data/{library_follow_list.json => federation/paginated_library_follow_list.json} (100%)
 rename tests/data/{ => history}/listening.json (100%)
 rename tests/data/{ => history}/listening_write.json (100%)
 rename tests/data/{ => history}/listening_write_request.json (100%)
 rename tests/data/{listenings.json => history/paginated_listening_list.json} (100%)
 rename tests/data/{settings.json => instance/global_preference.json} (100%)
 rename tests/data/{ => instance}/global_preference_request.json (100%)
 rename tests/data/{nodeinfo.json => instance/nodeinfo_2_0.json} (100%)
 rename tests/data/{ => instance}/patched_global_preference_request.json (100%)
 rename tests/data/{ => libraries}/library.json (100%)
 rename tests/data/{ => licenses}/license.json (100%)
 rename tests/data/{licenses.json => licenses/paginated_license_list.json} (100%)
 rename tests/data/{ => manage}/manage_album.json (100%)
 rename tests/data/{ => manage}/manage_album_stats.json (100%)
 rename tests/data/{ => manage}/manage_artist.json (100%)
 rename tests/data/{ => manage}/manage_channel.json (100%)
 rename tests/data/{ => manage}/manage_channel_stats.json (100%)
 rename tests/data/{ => manage}/manage_domain.json (100%)
 rename tests/data/{ => manage}/manage_domain_nodeinfo.json (100%)
 rename tests/data/{ => manage}/manage_instance_policy.json (100%)
 rename tests/data/{ => manage}/manage_invitation.json (100%)
 rename tests/data/{ => manage}/manage_invitation_request.json (100%)
 rename tests/data/{ => manage}/manage_library.json (100%)
 rename tests/data/{ => manage}/manage_library_stats.json (100%)
 rename tests/data/{ => manage}/manage_note.json (100%)
 rename tests/data/{ => manage}/manage_note_request.json (100%)
 rename tests/data/{ => manage}/manage_report.json (100%)
 rename tests/data/{ => manage}/manage_report_request.json (100%)
 rename tests/data/{ => manage}/manage_track.json (100%)
 rename tests/data/{ => manage}/manage_upload.json (100%)
 rename tests/data/{ => manage}/manage_user.json (100%)
 rename tests/data/{ => manage}/manage_user_request.json (100%)
 rename tests/data/{ => manage}/paginated_manage_actor_list.json (100%)
 rename tests/data/{ => manage}/paginated_manage_album_list.json (100%)
 rename tests/data/{ => manage}/paginated_manage_artist_list.json (100%)
 rename tests/data/{ => manage}/paginated_manage_channel_list.json (100%)
 rename tests/data/{ => manage}/paginated_manage_domain_list.json (100%)
 rename tests/data/{ => manage}/paginated_manage_instance_policy_list.json (100%)
 rename tests/data/{ => manage}/paginated_manage_invitation_list.json (100%)
 rename tests/data/{ => manage}/paginated_manage_library_list.json (100%)
 rename tests/data/{ => manage}/paginated_manage_note_list.json (100%)
 rename tests/data/{ => manage}/paginated_manage_report_list.json (100%)
 rename tests/data/{ => manage}/paginated_manage_track_list.json (100%)
 rename tests/data/{ => manage}/paginated_manage_upload_list.json (100%)
 rename tests/data/{ => manage}/paginated_manage_user_list.json (100%)
 rename tests/data/{ => manage}/paginated_manage_user_request_list.json (100%)
 rename tests/data/{ => manage}/patched_manage_report_request.json (100%)
 rename tests/data/{ => oauth}/paginated_application_list.json (100%)
 rename tests/data/{playlists.json => playlists/paginated_playlist_list.json} (100%)
 rename tests/data/{ => playlists}/playlist.json (100%)
 rename tests/data/{radios.json => radios/paginated_radio_list.json} (100%)
 rename tests/data/{ => radios}/radio.json (100%)
 rename tests/data/{ => radios}/radio_filters.json (100%)
 rename tests/data/{ => radios}/radio_session.json (100%)
 rename tests/data/{ => radios}/radio_session_request.json (100%)
 rename tests/data/{ => rate_limit}/rate_limit.json (100%)
 rename tests/data/{ => subscriptions}/paginated_subscription_list.json (100%)
 rename tests/data/{ => subscriptions}/subscription.json (100%)
 rename tests/data/{ => subscriptions}/subscription_all.json (100%)
 rename tests/data/{tags.json => tags/paginated_tag_list.json} (100%)
 rename tests/data/{ => tags}/tag.json (100%)
 rename tests/data/{tracks.json => tracks/paginated_track_list.json} (100%)
 rename tests/data/{ => tracks}/track.json (100%)
 rename tests/data/{ => tracks}/track_album.json (100%)
 rename tests/data/{ => uploads}/paginated_upload_for_owner_list.json (100%)
 rename tests/data/{ => uploads}/upload_for_owner.json (100%)
 rename tests/data/{ => uploads}/upload_for_owner_metadata.json (100%)

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 9902df8..6690845 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 72c21ff..c56c5b9 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 1348544..ac81bb9 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 43965c8..334d636 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 2c781c7..5b7b034 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 b16379c..f78d094 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 bb312ea..14518bc 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 e6411bb..db0be51 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 d2d983d..59e7334 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 4cf3b1d..029f5b5 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 2f7b8dc..0ae26b2 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 a96d334..5f487fa 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 7568e29..868a55c 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 8de46cd..0b096e7 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 8d1c921..273f49f 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 b59263b..6d0643c 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 32b887b..cf50037 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 936e5e8..1290a4f 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 c5cb1a7..fe309eb 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 99e1910..6c12ca9 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 a18c798..823d637 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 2efc947..818178a 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 c99414f..2dfef49 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 852a499..9a1246c 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 1d4085e..89a07ce 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 2323999..edb8c90 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 8519662..6cdf8d8 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 68472d9..3b281e3 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 cc496c0..42b1731 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 edce0a1..f9b1d1a 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 277dec6..5eef1d7 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 0e5bc7e..b75e24b 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 7599c00..970a667 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 aabc921..fb2e536 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 1de29d4..ec35fd6 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 a1838de..4a85be0 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 7eed7c4..595fb39 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 31b7f3a..a841097 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 87aeedc..130b3fc 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 3e1096b..ebddfd0 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 45f84e8..6be57e0 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 c859513..f126ccf 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 2f59f70..e236c5d 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 22dd458..cc5124b 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 b7e9520..70a2869 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 80fd487..2e50f2f 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 fbd8c36..54eb894 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 06071d7..d1e89a9 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 ed9d4ea..dff91ca 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 8f596ff..bc46fe7 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 6db57ab..ead1a41 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 d8b735f..d60fffc 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 738893a..2f3b703 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 b55f4f3..6a2d1f8 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 58b2bc8..35963ac 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 3d78861..aaaa551 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 41ffc3a..dc9b0e9 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 6af1488..e60a53a 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 aef9110..2a35651 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 e7c8417..4e5d35d 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 5ca9741..7154297 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 70d781c..872ecc9 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 e980e96..8831a89 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 e419194..50a0d0a 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 18c450b..c489a19 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 560533b..a79ce3f 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 4f0fb32..4c64eb3 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 675cfdf..97fa9f9 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 b8f64ef..3691ab8 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 b5b38a7..fc9d246 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 cbd087e..52281da 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 a1b6da6..f29a0f1 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 61b79d5..b193dcd 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 d6cee40..38d6b4d 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 9c6ee31..b5f017b 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 3b5cf88..c328485 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 1e98c87..c628fec 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 9b61006..74c15f1 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 29f86b1..fda5962 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 bd166ed..f7d4248 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 065f624..ba3f3df 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 6ebe946..4925cef 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 895ee33..89b0af0 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 87ef854..4afd323 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)
-- 
GitLab