diff --git a/client/cypress/integration/frontend/instruments/instruments-page.spec.js b/client/cypress/integration/frontend/instruments/instruments-page.spec.js
index 8bb11746..fb8db3ee 100644
--- a/client/cypress/integration/frontend/instruments/instruments-page.spec.js
+++ b/client/cypress/integration/frontend/instruments/instruments-page.spec.js
@@ -1,21 +1,33 @@
 describe('Instruments Page', () => {
   beforeEach(() => {
     cy.setup();
+    const languageCategory = {
+      name: 'Sprache & Kommunikation',
+      id: 'LANGUAGE_COMMUNICATION',
+      foreground: '#000000',
+      background: '#00ffff'
+    };
+    const societyCategory = {
+      name: 'Gesellschaft',
+      id: 'SOCIETY',
+      foreground: '#ffffff',
+      background: '#000fff'
+    };
     const analyse = {
       name: 'Analyse',
-      category: 'LANGUAGE_COMMUNICATION',
+      category: languageCategory,
       type: 'analyse',
     };
 
     const argumentation = {
       name: 'Argumentation',
-      category: 'LANGUAGE_COMMUNICATION',
+      category: languageCategory,
       type: 'argumentation',
     };
 
     const ethik = {
       name: 'Ethik',
-      category: 'SOCIETY',
+      category: societyCategory,
       type: 'ethik',
     };
 
@@ -47,13 +59,13 @@ describe('Instruments Page', () => {
             argumentation,
             {
               name: 'Beschreibung',
-              category: 'LANGUAGE_COMMUNICATION',
+              category: languageCategory,
               type: 'beschreibung',
             },
             ethik,
             {
               name: 'Identität und Sozialisation',
-              category: 'SOCIETY',
+              category: societyCategory,
               type: 'identitt-und-sozialisation',
             },
           ],
diff --git a/server/assignments/tests/test_myassignments.py b/server/assignments/tests/test_myassignments.py
index b7a4e205..68e6adfd 100644
--- a/server/assignments/tests/test_myassignments.py
+++ b/server/assignments/tests/test_myassignments.py
@@ -16,9 +16,9 @@ from users.models import User
 from users.services import create_users
 
 
-class MyAssignemntsText(DefaultUserTestCase):
+class MyAssignmentsTest(DefaultUserTestCase):
     def setUp(self):
-        super(MyAssignemntsText, self).setUp()
+        super(MyAssignmentsTest, self).setUp()
         self.assignment = AssignmentFactory(
             owner=self.teacher
         )
@@ -119,7 +119,10 @@ class MyAssignemntsText(DefaultUserTestCase):
                         type {
                           id
                           type
-                          category
+                          category {
+                            id
+                            name
+                          }
                         }
                         slug
                           bookmarks {