diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/TaskController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/TaskController.java
index d72909593..ef0eb47e1 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/TaskController.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/TaskController.java
@@ -7,6 +7,7 @@ import java.util.Objects;
 import java.util.stream.Stream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.hateoas.PagedModel.PageMetadata;
 import org.springframework.hateoas.config.EnableHypermediaSupport;
 import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType;
@@ -92,12 +93,11 @@ public class TaskController extends AbstractPagingController {
 
   private static final String INDEFINITE = "";
 
-  private TaskService taskService;
-
-  private TaskRepresentationModelAssembler taskRepresentationModelAssembler;
-
-  private TaskSummaryRepresentationModelAssembler taskSummaryRepresentationModelAssembler;
+  private final TaskService taskService;
+  private final TaskRepresentationModelAssembler taskRepresentationModelAssembler;
+  private final TaskSummaryRepresentationModelAssembler taskSummaryRepresentationModelAssembler;
 
+  @Autowired
   TaskController(
       TaskService taskService,
       TaskRepresentationModelAssembler taskRepresentationModelAssembler,
@@ -171,8 +171,7 @@ public class TaskController extends AbstractPagingController {
   @Transactional(rollbackFor = Exception.class)
   public ResponseEntity<TaskRepresentationModel> selectAndClaimTask(
       @RequestParam MultiValueMap<String, String> params)
-      throws TaskNotFoundException, InvalidStateException, InvalidOwnerException,
-          NotAuthorizedException, InvalidArgumentException {
+      throws InvalidOwnerException, NotAuthorizedException, InvalidArgumentException {
 
     LOGGER.debug("Entry to selectAndClaimTask");
 
diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationControllerIntTest.java
index 80722f04c..3e9593b04 100644
--- a/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationControllerIntTest.java
+++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationControllerIntTest.java
@@ -110,12 +110,10 @@ class ClassificationControllerIntTest {
     assertThat(response.getBody().getContent()).hasSize(5);
     assertThat(response.getBody().getContent().iterator().next().getKey()).isEqualTo("L1050");
     assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
-    String href = response.getBody().getRequiredLink(IanaLinkRelations.SELF).getHref();
-    assertThat(
-            href.endsWith(
-                "/api/v1/classifications?"
-                    + "domain=DOMAIN_A&sort-by=key&order=asc&page-size=5&page=2"))
-        .isTrue();
+    assertThat(response.getBody().getRequiredLink(IanaLinkRelations.SELF).getHref())
+        .endsWith(
+            "/api/v1/classifications?"
+                + "domain=DOMAIN_A&sort-by=key&order=asc&page-size=5&page=2");
     assertThat(response.getBody().getLink(IanaLinkRelations.FIRST)).isNotNull();
     assertThat(response.getBody().getLink(IanaLinkRelations.LAST)).isNotNull();
     assertThat(response.getBody().getLink(IanaLinkRelations.NEXT)).isNotNull();