diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidEventListener.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidEventListener.java
index b98ce1eb2e5021a7305d75ea6aaff48ff31d835b..815fa7a7bf15292abdf7247c4a763e8764cbfe07 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidEventListener.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidEventListener.java
@@ -34,7 +34,6 @@ import org.springframework.context.event.EventListener;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.stereotype.Component;
 
-import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
 import de.ozgcloud.bescheid.attacheditem.AttachedItemService;
 import de.ozgcloud.bescheid.binaryfile.BinaryFileService;
 import de.ozgcloud.bescheid.common.callcontext.CurrentUserService;
@@ -84,9 +83,7 @@ class BescheidEventListener {
 	private final BinaryFileService fileService;
 	private final NachrichtService nachrichtService;
 	private final AttachedItemService attachedItemService;
-	private final BescheidFeatureProperties featureProperties;
 	private final DocumentService documentService;
-	private final OzgCloudCommandService commandService;
 
 	private final ApplicationEventPublisher eventPublisher;
 	private final CurrentUserService userService;
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/document/DocumentService.java b/bescheid-manager/src/main/java/de/ozgcloud/document/DocumentService.java
index 832f0d8f53fd4075156c6975cea9c5e2e3cbdd02..25838cf4939ce8d9b2db28ac1f2bf404a83304e7 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/document/DocumentService.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/document/DocumentService.java
@@ -29,8 +29,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import de.ozgcloud.apilib.common.command.OzgCloudCommand;
@@ -62,14 +62,14 @@ public class DocumentService {
 	private final DocumentMapper documentMapper;
 
 	public String createBescheidDocument(Command command) {
-		return createBescheidDocument(command,  buildItemMap(command));
+		return createBescheidDocument(command, buildItemMap(command));
 	}
 
 	public String createBescheidDocument(Command command, Bescheid bescheid) {
 		return createBescheidDocument(command, buildItemMap(bescheid));
 	}
 
-	public String createBescheidDocument(Command command, Map<String, Object> itemMap) {
+	String createBescheidDocument(Command command, Map<String, Object> itemMap) {
 		validateBescheidItem(command.getRelationId());
 		var ozgCloudCommand = buildCreateDocumentOzgCommand(command, buildAttachedItem(command, itemMap));
 		var executedCommand = commandService.createAndWaitUntilDone(ozgCloudCommand);
@@ -116,6 +116,7 @@ public class DocumentService {
 				FIELD_DOCUMENT_FILE, bescheid.getBescheidFileId().toString(),
 				FIELD_NACHRICHT_TEXT, bescheid.getNachrichtText().orElse(StringUtils.EMPTY));
 	}
+
 	public Document getDocument(String id) {
 		return documentMapper.fromAttachedItem(attachedItemService.getItem(id));
 	}
diff --git a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java
index 584249a7b1ebd554982e32b843f086703e6e7496..3126ecfe5b5f98c41749c406cd426253a65b053e 100644
--- a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java
+++ b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java
@@ -1,5 +1,7 @@
 package de.ozgcloud.bescheid.smartdocuments;
 
+import static org.assertj.core.api.Assertions.*;
+
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +35,7 @@ class SmartDocumentsBescheidRemoteServiceITCase {
 
 		System.out.println(bescheid.getBescheidFileName());
 		System.out.println(bescheid.getBescheidFile().getAbsolutePath());
+		assertThat(bescheid.getBescheidFileName()).isNotEmpty();
 	}
 
 }
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidDocumentITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidDocumentITCase.java
index 2f92bdab4e516fb2f0075e00e2b2591b4b6e00bd..54cfc7b0679835e54404911bcb0c8945533ed8d7 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidDocumentITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidDocumentITCase.java
@@ -50,7 +50,7 @@ import de.ozgcloud.common.test.ITCase;
 import de.ozgcloud.vorgang.VorgangManagerServerApplication;
 import de.ozgcloud.vorgang.command.CommandTestFactory;
 
-public class BescheidDocumentITCase {
+class BescheidDocumentITCase {
 
 	@Nested
 	@SpringBootTest(classes = VorgangManagerServerApplication.class)
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java
index 3459b1eb82b422055ba37bbe8553a184e9c91a7e..7ad895b21ec134170700f9a29ddac0df905f05cd 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java
@@ -49,7 +49,6 @@ import org.springframework.test.annotation.DirtiesContext;
 
 import com.mongodb.client.gridfs.model.GridFSFile;
 
-import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
 import de.ozgcloud.bescheid.attacheditem.AttachedItemService;
 import de.ozgcloud.bescheid.attacheditem.BescheidItem;
 import de.ozgcloud.bescheid.common.callcontext.CallContextUser;
@@ -80,11 +79,7 @@ class BescheidEventListenerITCase {
 	@Autowired
 	private ApplicationEventPublisher eventPublisher;
 	@SpyBean
-	private BescheidEventListener eventListener;
-	@SpyBean
 	private TestEventListener bescheidDocumentCreatedEventListener;
-	@Autowired
-	private CommandMapper mapper;
 
 	@Autowired
 	private MongoOperations mongoOperations;
@@ -118,8 +113,7 @@ class BescheidEventListenerITCase {
 
 		Awaitility.await().atMost(60, TimeUnit.SECONDS).untilAsserted(() -> {
 			verify(bescheidDocumentCreatedEventListener).onBescheidDocumentCreated(bescheidDocumentCreatedEventCaptor.capture());
-			var bescheidDocument = getBescheidDocument();
-			assertThat(bescheidDocument).isNotNull();
+			assertThat(getBescheidDocument()).isNotNull();
 		});
 	}
 
@@ -147,7 +141,7 @@ class BescheidEventListenerITCase {
 	}
 
 	private CommandCreatedEvent buildCommandCreatedEvent(String vorgangId, String bescheidItemId) {
-		var command= CommandTestFactory.createBuilder()
+		var command = CommandTestFactory.createBuilder()
 				.vorgangId(vorgangId)
 				.relationId(bescheidItemId)
 				.order(BescheidEventListener.CREATE_BESCHEID_DOCUMENT_ORDER)
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/TestEventListener.java b/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/TestEventListener.java
index 8bdce71b100372e8673a30b8b2d16b33b2f5d34f..d83594222eb584cd76212de870f9d3ee0ba753a0 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/TestEventListener.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/TestEventListener.java
@@ -28,7 +28,7 @@ import org.springframework.context.event.EventListener;
 import de.ozgcloud.command.CommandFailedEvent;
 import de.ozgcloud.document.BescheidDocumentCreatedEvent;
 
-public class TestEventListener {
+class TestEventListener {
 
 	@EventListener
 	public void onBescheidDocumentCreated(BescheidDocumentCreatedEvent event) {