diff --git a/client/src/graphql/gql/queries/myActivity.gql b/client/src/graphql/gql/queries/myActivity.gql
index 46201edc..e4ec9313 100644
--- a/client/src/graphql/gql/queries/myActivity.gql
+++ b/client/src/graphql/gql/queries/myActivity.gql
@@ -5,7 +5,11 @@ query MyActivityQuery {
 	      id
         title
         contents
-        type
+        type {
+          id
+          type
+          category
+        }
         slug
 	      bookmarks {
 	        id
@@ -13,11 +17,6 @@ query MyActivityQuery {
           note {
             id
             text
-          }
-          instrument {
-            id
-            type
-            contents
           }
 	      }
 	    }
diff --git a/server/assignments/schema/queries.py b/server/assignments/schema/queries.py
index ae25ddf2..83c12822 100644
--- a/server/assignments/schema/queries.py
+++ b/server/assignments/schema/queries.py
@@ -1,7 +1,6 @@
 from graphene import relay
 from graphene_django.filter import DjangoFilterConnectionField
 
-from assignments.models import StudentSubmission
 from assignments.schema.types import AssignmentNode, StudentSubmissionNode
 
 
diff --git a/server/assignments/tests/test_myassignments.py b/server/assignments/tests/test_myassignments.py
index ff9399fe..b7a4e205 100644
--- a/server/assignments/tests/test_myassignments.py
+++ b/server/assignments/tests/test_myassignments.py
@@ -1,12 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# ITerativ GmbH
-# http://www.iterativ.ch/
-#
-# Copyright (c) 2019 ITerativ GmbH. All rights reserved.
-#
-# Created on 2019-04-11
-# @author: chrigu <christian.cueni@iterativ.ch>
 from django.conf import settings
 import json
 
@@ -119,6 +110,29 @@ class MyAssignemntsText(DefaultUserTestCase):
                       }
                     }
                   }
+                  myInstrumentActivity {
+                      edges {
+                        node {
+                          id
+                        title
+                        contents
+                        type {
+                          id
+                          type
+                          category
+                        }
+                        slug
+                          bookmarks {
+                            id
+                          uuid
+                          note {
+                            id
+                            text
+                          }
+                          }
+                        }
+                      }
+                    }
                 }
 
                 '''