diff --git a/frontend/tests/controllers/assignments-controller.test.ts b/frontend/tests/controllers/assignments-controller.test.ts
index 705b1953..7f3f85e0 100644
--- a/frontend/tests/controllers/assignments-controller.test.ts
+++ b/frontend/tests/controllers/assignments-controller.test.ts
@@ -1,6 +1,5 @@
 import { describe, it, expect, beforeEach } from "vitest";
 import { AssignmentController } from "../../src/controllers/assignments";
-import { AssignmentDTO } from "@dwengo-1/common/interfaces/assignment";
 
 describe("AssignmentController Tests", () => {
     let controller: AssignmentController;
diff --git a/frontend/tests/controllers/student-controller.test.ts b/frontend/tests/controllers/student-controller.test.ts
index 1a4905a6..5f93544d 100644
--- a/frontend/tests/controllers/student-controller.test.ts
+++ b/frontend/tests/controllers/student-controller.test.ts
@@ -1,5 +1,5 @@
 import { StudentController } from "../../src/controllers/students";
-import { beforeEach, describe, expect, it } from "vitest";
+import { beforeEach, describe, expect, it, test } from "vitest";
 
 describe("Test controller students", () => {
     let controller: StudentController;
@@ -18,13 +18,22 @@ describe("Test controller students", () => {
         const data = await controller.getByUsername(username);
         expect(data.student.username).to.equal(username);
     });
-
-    it("Get classes of student", async () => {
-        const students = await controller.getAll(true);
-
-        for (const student of students.students) {
-            const data = await controller.getClasses(student.username, true);
-            expect(data.classes).to.have.length.greaterThan(0);
-        }
-    });
 });
+
+const controller = new StudentController();
+
+test.each([
+        { username: 'Noordkaap', firstName: 'Stijn', lastName: 'Meuris' },
+        { username: 'DireStraits', firstName: 'Mark', lastName: 'Knopfler' },
+        { username: 'Tool', firstName: 'Maynard', lastName: 'Keenan' },
+        { username: 'SmashingPumpkins', firstName: 'Billy', lastName: 'Corgan' },
+        { username: 'PinkFloyd', firstName: 'David', lastName: 'Gilmoure' },
+        { username: 'TheDoors', firstName: 'Jim', lastName: 'Morisson' },
+        // ⚠️ Deze mag niet gebruikt worden in elke test!
+        { username: 'Nirvana', firstName: 'Kurt', lastName: 'Cobain' },
+        // Makes sure when logged in as leerling1, there exists a corresponding user
+        { username: 'testleerling1', firstName: 'Gerald', lastName: 'Schmittinger' },
+    ])('Get classes of student', async (student) => {
+    const data = await controller.getClasses(student.username, true);
+    expect(data.classes).to.have.length.greaterThan(0);
+})