diff --git a/unisportomat/quiz/fixtures/criteria.json b/unisportomat/quiz/fixtures/criteria.json
index 584ded6433489d92a803179cea13f8313434e63b..597ae13c3cd90f3df8ae5c05215809a2b0013d29 100644
--- a/unisportomat/quiz/fixtures/criteria.json
+++ b/unisportomat/quiz/fixtures/criteria.json
@@ -2,6 +2,7 @@
   {
     "model": "quiz.criterion",
     "pk": 1,
+    "question": 1,
     "fields": {
       "name": "Outdoorsport"
     }
diff --git a/unisportomat/quiz/models.py b/unisportomat/quiz/models.py
index 9da7addf3b8646bc3bbff7eb342ce95e78e9fc07..9a7b5b18510fdc173a512afbf3959659ca51319b 100644
--- a/unisportomat/quiz/models.py
+++ b/unisportomat/quiz/models.py
@@ -72,7 +72,8 @@ class Sport(models.Model):
         rating_obj, _ = CriterionRating.objects.get_or_create(
             sport=self, criterion=criterion, defaults={"rating": rating}
         )
-        rating_obj.rating = validate_rating(rating)
+        validate_rating(rating)
+        rating_obj.rating = rating
         rating_obj.save()
         return rating_obj
 
diff --git a/unisportomat/quiz/tests.py b/unisportomat/quiz/tests.py
index 4eec6834aaa3e46e0b2f459cde3fb40b8a26e541..80149025adbcb2b810b96ea4226dc47158511346 100644
--- a/unisportomat/quiz/tests.py
+++ b/unisportomat/quiz/tests.py
@@ -386,7 +386,12 @@ class Modeltranslation_Two_Languages_Test(TestCase):
 class APITest(APITestCase):
     """Tests the Django API"""
 
-    fixtures = ["sports.json", "criteria.json", "criterion_ratings.json"]
+    fixtures = [
+        "sports.json",
+        "criteria.json",
+        "criterion_ratings.json",
+        "questions.json",
+    ]
 
     def test_get_sport_returns_correct_data(self):
         """Test the API endpoint /sport/{id}"""
@@ -495,8 +500,8 @@ class APITest(APITestCase):
 
         response = self.client.get(reverse("incomplete"))
 
-        self.assertEqual(len(response.data), 1)
-        self.assertEqual(response.data[0]["name"], "Jiu Jitsu")
+        self.assertEqual(len(response.data["results"]), 1)
+        self.assertEqual(response.data["results"][0]["name"], "Jiu Jitsu")
 
     def test_get_criteria(self):
         """
diff --git a/unisportomat/quiz/views.py b/unisportomat/quiz/views.py
index 61475227a6264fed9666d33ea09617e51b0a7631..8d7e0cf870f1e7abe163f32f9f1b45b1dde0a76a 100644
--- a/unisportomat/quiz/views.py
+++ b/unisportomat/quiz/views.py
@@ -217,7 +217,7 @@ class IncompleteSportView(APIView):
         """
 
         paginator = PageNumberWithPageSizePagination()
-        queryset = Sport.objects.iterator()
+        queryset = Sport.objects.all().order_by("name")
         queryset = paginator.paginate_queryset(queryset, request)
 
         incomplete_sport_list = []