diff --git a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/GraphQLDataFetchers.java b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/GraphQLDataFetchers.java
index f86a7997e0bca64d47a2922b9adee160b0af34c4..576ed558cf01a7777f8e3a7840dce6ce0a280cc3 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/GraphQLDataFetchers.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/GraphQLDataFetchers.java
@@ -75,14 +75,15 @@ public class GraphQLDataFetchers {
 
     public DataFetcher getKommentarDataFetcher() {
         return dataFetchingEnvironment -> {
-            System.out.println("inside fetcher");
             Kommentar kommentar = kommentarService.getById(dataFetchingEnvironment.getArgument("id"));
-            Map<String, String> kommentarAsMap = Map.of(
+            return kommentar;
+            /*Map<String, String> kommentarAsMap = Map.of(
                     "id", kommentar.getId(),
                     "createdBy", kommentar.getCreatedBy(),
                     "createdByName", kommentar.getCreatedByName(),
                     "text", kommentar.getText());
-            return kommentarAsMap;
+            return kommentarAsMap;*/
         };
     }
+
 }
\ No newline at end of file
diff --git a/goofy-server/src/main/resources/schema.graphqls b/goofy-server/src/main/resources/schema.graphqls
index f2d7a3e3e31593f270f13c60f24775dbe26113fb..9b27c6212e721dc9793a1c7439f10e18a640a458 100644
--- a/goofy-server/src/main/resources/schema.graphqls
+++ b/goofy-server/src/main/resources/schema.graphqls
@@ -2,6 +2,7 @@ type Query {
 	bookById(id: ID): Book
 	greeting: String
 	kommentar(id: ID): Kommentar
+	something: String
 }
 
 type Book {
@@ -18,8 +19,17 @@ type Author {
 }
 
 type Kommentar {
-	id: ID
+	id: ID!
 	createdBy: String
 	createdByName: String
-	text: String
+	text: String!
+	createdAt: ZonedDateTime
+}
+
+type ZonedDateTime {
+	year: Int
+	month: String
+	dayOfWeek: String
+	hour: Int
+	blurb: String
 }
\ No newline at end of file
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarCommandITCase.java b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarCommandITCase.java
index f715918f929239e4e5f667f8b979b3a7afdd2c0c..dc152539333e0c79d3d6494eba3af7bf8b31d5c8 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarCommandITCase.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarCommandITCase.java
@@ -53,19 +53,6 @@ class KommentarCommandITCase {
 			verify(remoteService).sendKommentarCommand(eq(KommentarTestFactory.ID), any());
 		}
 
-		@WithMockUser
-		@Nested
-		class TestEndpoint {
-
-			@Test
-			void createCommandWithInvalidText() throws Exception {
-			    ResultActions resultActions = mockMvc.perform(get(new URI("/api/kommentars/636fbb1b-3f77-4aac-8480-fdf0e2d52d9e")))
-						.andExpect(status().is2xxSuccessful());
-				System.out.println(resultActions.andReturn().getResponse().getStatus());
-			}
-
-		}
-
 		@WithMockUser
 		@DisplayName("should return validation error")
 		@Nested