diff --git a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/attacheditem/VorgangAttachedItemRemoteServiceTest.java b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/attacheditem/VorgangAttachedItemRemoteServiceTest.java
index 97473a38072617469fa6f861d56c25abf44ea19f..88259ab1300ec4b86712144b5c196f761c7a231a 100644
--- a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/attacheditem/VorgangAttachedItemRemoteServiceTest.java
+++ b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/attacheditem/VorgangAttachedItemRemoteServiceTest.java
@@ -151,6 +151,25 @@ class VorgangAttachedItemRemoteServiceTest {
 				assertThat(result).contains(item);
 			}
 
+			@Test
+			void shouldReturnEmptyWhenNotFound() {
+				when(bescheidItemMapper.fromFindVorgangAttachedItemResponse(any())).thenReturn(Stream.empty());
+
+				var result = service.findBescheidDraft(request);
+
+				assertThat(result).isEmpty();
+			}
+
+			@Test
+			void shouldReturnEmptyWhenNotDraft() {
+				when(bescheidItemMapper.fromFindVorgangAttachedItemResponse(any())).thenReturn(Stream.of(BescheidItemTestFactory.create()));
+				doReturn(false).when(service).hasStatusDraft(any());
+
+				var result = service.findBescheidDraft(request);
+
+				assertThat(result).isEmpty();
+			}
+
 			@Test
 			void shouldReturnLastBescheid() {
 				var item1 = BescheidItemTestFactory.createBuilder().bescheidData(Map.of(
@@ -201,6 +220,30 @@ class VorgangAttachedItemRemoteServiceTest {
 		}
 	}
 
+	@Nested
+	class TestHasStatusDraft {
+
+		@Test
+		void shouldReturnTrueIfDraft() {
+			var item = BescheidItemTestFactory.createBuilder().bescheidData(Map.of(BescheidItem.FIELD_STATUS, BescheidItem.Status.DRAFT.name()))
+					.build();
+
+			var result = service.hasStatusDraft(item);
+
+			assertThat(result).isTrue();
+		}
+
+		@Test
+		void shouldReturnFalseIfNotDraft() {
+			var item = BescheidItemTestFactory.createBuilder().bescheidData(Map.of(BescheidItem.FIELD_STATUS, BescheidItem.Status.BESCHEID.name()))
+					.build();
+
+			var result = service.hasStatusDraft(item);
+
+			assertThat(result).isFalse();
+		}
+	}
+
 	@Nested
 	class TestGetBescheid {