diff --git a/src/test/java/de/ozgcloud/xta/client/XtaClientITCase.java b/src/test/java/de/ozgcloud/xta/client/XtaClientITCase.java
index 0a244ea890e783196ba7be4f7c85ccbd06d93689..9f535b87aeb16b0d664b3f089c6d944f1c06d7c2 100644
--- a/src/test/java/de/ozgcloud/xta/client/XtaClientITCase.java
+++ b/src/test/java/de/ozgcloud/xta/client/XtaClientITCase.java
@@ -44,10 +44,10 @@ class XtaClientITCase {
 	@BeforeEach
 	@SneakyThrows
 	void setup() {
-		processMessageDummy = (message) -> {
+		processMessageDummy = message -> {
 		};
 		supportCheckedMetadataItems = new ArrayList<>();
-		isSupportedDummy = (metaData) -> true;
+		isSupportedDummy = metaData -> true;
 		processedMessages = new ArrayList<>();
 		silentTestClient = XTA_TEST_SERVER_SETUP_EXTENSION.getSilentTestClient();
 
@@ -99,7 +99,7 @@ class XtaClientITCase {
 		void shouldThrowExceptionOnConnectionFailure() {
 			setupClientWithoutTrustStore();
 
-			assertThatThrownBy(() -> testClient.fetchMessages((message) -> fail("Should not process any message!")))
+			assertThatThrownBy(() -> testClient.fetchMessages(message -> fail("Should not process any message!")))
 					.isInstanceOf(XtaClientException.class);
 		}
 
@@ -303,7 +303,7 @@ class XtaClientITCase {
 
 		@SneakyThrows
 		private List<XtaTransportReport> fetchMessages() {
-			return testClient.fetchMessages((message) -> {
+			return testClient.fetchMessages(message -> {
 				processedMessages.add(message);
 				processMessageDummy.accept(message);
 			});
diff --git a/src/test/java/de/ozgcloud/xta/client/extension/XtaServerSetupExtensionTestUtil.java b/src/test/java/de/ozgcloud/xta/client/extension/XtaServerSetupExtensionTestUtil.java
index 4718256914515533376d7ab18642059aa0349d4e..4af13131f1b7ff95280a40c6163f9f11e8087523 100644
--- a/src/test/java/de/ozgcloud/xta/client/extension/XtaServerSetupExtensionTestUtil.java
+++ b/src/test/java/de/ozgcloud/xta/client/extension/XtaServerSetupExtensionTestUtil.java
@@ -153,9 +153,11 @@ public class XtaServerSetupExtensionTestUtil {
 				.build();
 	}
 
-	public static XtaMessageMetaData withoutMessageSize(XtaMessageMetaData metaData) {
+	public static XtaMessageMetaData withoutMessageSizeAndDelivery(XtaMessageMetaData metaData) {
 		return metaData.toBuilder()
 				.messageSize(null)
+				.deliveryAttributesDelivery(null)
+				.deliveryAttributesOrigin(null)
 				.build();
 	}
 
@@ -325,10 +327,10 @@ public class XtaServerSetupExtensionTestUtil {
 			// ignoring size since it may be null for transport report (due to message closed?)
 			assertThat(transportReports)
 					.extracting(XtaTransportReport::metaData)
-					.extracting(XtaServerSetupExtensionTestUtil::withoutMessageSize)
+					.extracting(XtaServerSetupExtensionTestUtil::withoutMessageSizeAndDelivery)
 					.containsExactlyElementsOf(processedMessages.stream()
 							.map(XtaMessage::metaData)
-							.map(XtaServerSetupExtensionTestUtil::withoutMessageSize)
+							.map(XtaServerSetupExtensionTestUtil::withoutMessageSizeAndDelivery)
 							.toList());
 		}