diff --git a/src/test/java/de/ozgcloud/xta/test/app/data/XtaMessageRepositoryTest.java b/src/test/java/de/ozgcloud/xta/test/app/data/XtaMessageRepositoryTest.java
index 69a7aefab8c21a65bac70c49b48e3cd7e452e49c..af7fe1a6223ca4bac704049b2f28896fae44bf42 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/data/XtaMessageRepositoryTest.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/data/XtaMessageRepositoryTest.java
@@ -87,6 +87,13 @@ public class XtaMessageRepositoryTest {
 			xtaMessageRepository.save(message);
 		}
 
+		@Test
+		void shouldDeleteMessage() {
+			xtaMessageRepository.delete(MESSAGE_ID);
+
+			assertThat(xtaMessageRepository.get(MESSAGE_ID)).isEmpty();
+		}
+
 		@Test
 		void shouldDeleteTemporaryFiles() {
 			assertThat(messageFile.file()).exists();
diff --git a/src/test/java/de/ozgcloud/xta/test/app/factory/XtaGetMessageRequestTestFactory.java b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaGetMessageRequestTestFactory.java
index ae594bb01278bcf1b278186e394f8ee8e5c30432..0e3426c89f76604a1202eac54fc0eccf106573ee 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/factory/XtaGetMessageRequestTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaGetMessageRequestTestFactory.java
@@ -5,7 +5,7 @@ import static de.ozgcloud.xta.test.app.factory.XtaMessageMetaDataTestFactory.*;
 import de.ozgcloud.xta.test.app.model.XtaGetMessageRequest;
 
 public class XtaGetMessageRequestTestFactory {
-	public static String VALID_MESSAGE_ID = "urn:de:xta:messageid:application:000ca2fe-f4e1-45c2-8233-3a0eb760bd16";
+	public static final String VALID_MESSAGE_ID = "urn:de:xta:messageid:application:000ca2fe-f4e1-45c2-8233-3a0eb760bd16";
 
 	public static XtaGetMessageRequest.XtaGetMessageRequestBuilder createBuilder() {
 		return XtaGetMessageRequest.builder()
diff --git a/src/test/java/de/ozgcloud/xta/test/app/service/XtaMessageServiceTest.java b/src/test/java/de/ozgcloud/xta/test/app/service/XtaMessageServiceTest.java
index 495193ac23e661adbc370eb11c8c2a264bfe8531..6723c0e40c5cb749249d82aa4f8062f4e82511ba 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/service/XtaMessageServiceTest.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/service/XtaMessageServiceTest.java
@@ -63,8 +63,8 @@ public class XtaMessageServiceTest {
 	@Nested
 	class TestGetStatusList {
 
-		private final int MAX_LIST_ITEMS = 50;
-		private final int MESSAGE_COUNT = 2;
+		private static final int MAX_LIST_ITEMS = 50;
+		private static final int MESSAGE_COUNT = 2;
 
 		private final XtaMessageMetaDataListingRequest messageMetaDataListingRequest = XtaMessageMetaDataListingRequest.builder()
 				.clientIdentifier(READER_IDENTIFIER)