diff --git a/AKModel/availability/forms.py b/AKModel/availability/forms.py
index 994949a8ef98eadad4eef68b5a94c3abfdf9979b..24a7c4f031974cad0c89ddb6afebf86a485a08fd 100644
--- a/AKModel/availability/forms.py
+++ b/AKModel/availability/forms.py
@@ -183,7 +183,7 @@ class AvailabilitiesFormMixin(forms.Form):
         for avail in availabilities:
             setattr(avail, reference_name, instance.id)
 
-    def _replace_availabilities(self, instance, availabilities: [Availability]):
+    def _replace_availabilities(self, instance, availabilities: list[Availability]):
         """
         Replace the existing list of availabilities belonging to an entity with a new, updated one
 
diff --git a/AKModel/tests/test_json_export.py b/AKModel/tests/test_json_export.py
index cbd3701333de5128ca54c2e5764e2b7722079b83..e8aac8fed36ba4f6917c3e22e87ae2ebec739775 100644
--- a/AKModel/tests/test_json_export.py
+++ b/AKModel/tests/test_json_export.py
@@ -78,7 +78,13 @@ class JSONExportTest(TestCase):
             for participant in self.export_dict["participants"]
         }
 
-        self.ak_slots = AKSlot.objects.filter(event__slug=event.slug).all()
+        self.ak_slots = (
+            AKSlot.objects.filter(event__slug=event.slug)
+            .select_related("ak")
+            .prefetch_related("ak__conflicts")
+            .prefetch_related("ak__prerequisites")
+            .all()
+        )
         self.rooms = Room.objects.filter(event__slug=event.slug).all()
         self.slots_in_an_hour = 1 / self.export_dict["timeslots"]["info"]["duration"]
         self.event = event
@@ -563,7 +569,7 @@ class JSONExportTest(TestCase):
 
                     # test if time availability of room is restricted
                     if not Availability.is_event_covered(
-                        room.event, room.availabilities.all()
+                        event, room.availabilities.all()
                     ):
                         time_constraints.add(f"availability-room-{room.pk}")