diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRemoteServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRemoteServiceTest.java
index dab4e8bae0e87cd4e8da9505fdf824c8ee3a32fa..175a515febee5f39cae88681c17750ae3c857d79 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRemoteServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRemoteServiceTest.java
@@ -244,6 +244,7 @@ class ForwardingRemoteServiceTest {
 			verify(vorgangService).getById(VorgangTestFactory.ID);
 		}
 
+		@Test
 		void shouldBuildRouteForwardingRequest() {
 			sendEingang();
 
@@ -352,8 +353,6 @@ class ForwardingRemoteServiceTest {
 	@Nested
 	class TestCreateAttachmentFileSender {
 
-		@Mock
-		private StreamObserver<GrpcRouteForwardingResponse> responseObserver;
 		@Mock
 		private InputStream inputStream;
 		@Mock
@@ -437,7 +436,7 @@ class ForwardingRemoteServiceTest {
 	@Nested
 	class TestBuildGrpcAttachmentFile {
 
-		private IncomingFile file = IncomingFileTestFactory.create();
+		private final IncomingFile file = IncomingFileTestFactory.create();
 
 		@BeforeEach
 		void mock() {
@@ -452,7 +451,7 @@ class ForwardingRemoteServiceTest {
 		}
 
 		@Test
-		void shoudlReturnAttachmentMetadataRequest() {
+		void shouldReturnAttachmentMetadataRequest() {
 			var result = service.buildGrpcAttachmentFile(IncomingFileGroupTestFactory.NAME, file);
 
 			assertThat(result).isEqualTo(GrpcRouteForwardingRequestTestFactory.createWithAttachmentMetadata());
@@ -505,8 +504,6 @@ class ForwardingRemoteServiceTest {
 	@Nested
 	class TestCreateRepresentationFileSender {
 
-		@Mock
-		private StreamObserver<GrpcRouteForwardingResponse> responseObserver;
 		@Mock
 		private InputStream inputStream;
 		@Mock
@@ -665,7 +662,7 @@ class ForwardingRemoteServiceTest {
 	@Nested
 	class TestBuildGrpcRepresentationFile {
 
-		private IncomingFile file = IncomingFileTestFactory.create();
+		private final IncomingFile file = IncomingFileTestFactory.create();
 
 		@BeforeEach
 		void mock() {
@@ -680,7 +677,7 @@ class ForwardingRemoteServiceTest {
 		}
 
 		@Test
-		void shoudlReturnRepresentationMetadataRequest() {
+		void shouldReturnRepresentationMetadataRequest() {
 			var result = service.buildGrpcRepresentationFile(file);
 
 			assertThat(result).isEqualTo(GrpcRouteForwardingRequestTestFactory.createWithRepresentationMetadata());
@@ -704,7 +701,7 @@ class ForwardingRemoteServiceTest {
 		@Nested
 		class TestOnInterruptedException {
 
-			private InterruptedException exception = new InterruptedException();
+			private final InterruptedException exception = new InterruptedException();
 
 			@BeforeEach
 			@SneakyThrows
@@ -714,7 +711,7 @@ class ForwardingRemoteServiceTest {
 
 			@Test
 			void shouldThrowTechnicalException() {
-				assertThrows(TechnicalException.class, () -> waitForCompletion());
+				assertThrows(TechnicalException.class, TestWaitForCompletion.this::waitForCompletion);
 			}
 
 			@Test
@@ -732,7 +729,7 @@ class ForwardingRemoteServiceTest {
 		@Nested
 		class TestOnExecutionException {
 
-			private ExecutionException exception = new ExecutionException(new Exception());
+			private final ExecutionException exception = new ExecutionException(new Exception());
 
 			@BeforeEach
 			@SneakyThrows
@@ -742,14 +739,14 @@ class ForwardingRemoteServiceTest {
 
 			@Test
 			void shouldThrowTechnicalException() {
-				assertThrows(TechnicalException.class, () -> waitForCompletion());
+				assertThrows(TechnicalException.class, TestWaitForCompletion.this::waitForCompletion);
 			}
 		}
 
 		@Nested
 		class TestOnTimeoutException {
 
-			private TimeoutException exception = new TimeoutException();
+			private final TimeoutException exception = new TimeoutException();
 
 			@BeforeEach
 			@SneakyThrows
@@ -759,7 +756,7 @@ class ForwardingRemoteServiceTest {
 
 			@Test
 			void shouldThrowTechnicalException() {
-				assertThrows(TechnicalException.class, () -> waitForCompletion());
+				assertThrows(TechnicalException.class, TestWaitForCompletion.this::waitForCompletion);
 			}
 		}