diff --git a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/ApplyForTaskWebController.java b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/ApplyForTaskWebController.java
index 8fb10ee..52bc45a 100644
--- a/roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/ApplyForTaskWebController.java
+++ b/roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/ApplyForTaskWebController.java
@@ -45,8 +45,8 @@ public class ApplyForTaskWebController {
 
         try {
 
-            String executorType = command.getTaskType().toString();
-            String executorURI = command.getExecutorURI().toString();
+            String executorType = command.getTaskType().getValue().toString();
+            String executorURI = command.getExecutorURI().getValue().toString();
 
             String jsonPayLoad = new JSONObject()
                 .put("executorType", executorType)
@@ -56,7 +56,7 @@ public class ApplyForTaskWebController {
             HttpHeaders responseHeaders = new HttpHeaders();
             responseHeaders.add("Content-Type", "application/json");
 
-            return new ResponseEntity<>(jsonPayLoad, responseHeaders, HttpStatus.OK);
+            return new ResponseEntity<>(jsonPayLoad, responseHeaders, HttpStatus.CREATED);
         } catch (ConstraintViolationException e) {
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage());
         }
diff --git a/roster/src/test/java/ch/unisg/roster/roster/AddNewAssignmentToRosterServiceSystemTest.java b/roster/src/test/java/ch/unisg/roster/roster/AddNewAssignmentToRosterServiceSystemTest.java
index 0e101ad..8df4d0a 100644
--- a/roster/src/test/java/ch/unisg/roster/roster/AddNewAssignmentToRosterServiceSystemTest.java
+++ b/roster/src/test/java/ch/unisg/roster/roster/AddNewAssignmentToRosterServiceSystemTest.java
@@ -35,14 +35,12 @@ public class AddNewAssignmentToRosterServiceSystemTest {
         ResponseEntity response = whenAddNewAssignmentToRoster(rosterItemId, executorType, executorURI);
 
         System.out.println(response.getBody().toString());
-        response.getBody().
+
         JSONObject responseJson = new JSONObject(response.getBody().toString());
-        String respRosterItemId = responseJson.getString("rosterItemId");
         String respExecutorType = responseJson.getString("executorType");
         String respExecutorURI = responseJson.getString("executorURI");
 
         then(response.getStatusCode()).isEqualTo(HttpStatus.CREATED);
-        then(respRosterItemId).isEqualTo(rosterItemId);
         then(respExecutorType).isEqualTo(executorType);
         then(respExecutorURI).isEqualTo(executorURI);
         then(Roster.getInstance().getRosterMap().size()).isEqualTo(1);
diff --git a/roster/src/test/java/ch/unisg/roster/roster/adapter/in/web/ApplyForTaskWebControllerTest.java b/roster/src/test/java/ch/unisg/roster/roster/adapter/in/web/ApplyForTaskWebControllerTest.java
index bcbd45c..fce0387 100644
--- a/roster/src/test/java/ch/unisg/roster/roster/adapter/in/web/ApplyForTaskWebControllerTest.java
+++ b/roster/src/test/java/ch/unisg/roster/roster/adapter/in/web/ApplyForTaskWebControllerTest.java
@@ -61,7 +61,6 @@ public class ApplyForTaskWebControllerTest {
             .content(jsonPayLoad))
             .andExpect(status().is2xxSuccessful());
 
-        //TODO: No idea why this does not work yet
         then(applyForTaskUseCase).should()
             .applyForTask(new ApplyForTaskCommand(new ExecutorType(executorType), new ExecutorURI(executorURI)));