diff --git a/src/test/java/de/ozgcloud/xta/client/core/XtaClientServiceTest.java b/src/test/java/de/ozgcloud/xta/client/core/XtaClientServiceTest.java
index 266ffd9cb2ad1129e3b5fcfb982b59c476a67b9e..9ef4b29191c8bff65505dd2f4edbe4d824b42dbb 100644
--- a/src/test/java/de/ozgcloud/xta/client/core/XtaClientServiceTest.java
+++ b/src/test/java/de/ozgcloud/xta/client/core/XtaClientServiceTest.java
@@ -20,11 +20,13 @@ import org.mockito.Spy;
 
 import de.ozgcloud.xta.client.config.XtaClientConfig;
 import de.ozgcloud.xta.client.exception.ClientRuntimeException;
+import de.ozgcloud.xta.client.factory.XtaMessageMetaDataListingTestFactory;
 import de.ozgcloud.xta.client.factory.XtaMessageMetaDataTestFactory;
 import de.ozgcloud.xta.client.factory.XtaMessageTestFactory;
 import de.ozgcloud.xta.client.factory.XtaTransportReportTestFactory;
 import de.ozgcloud.xta.client.model.XtaMessage;
 import de.ozgcloud.xta.client.model.XtaMessageMetaData;
+import de.ozgcloud.xta.client.model.XtaMessageMetaDataListing;
 import de.ozgcloud.xta.client.model.XtaTransportReport;
 import genv3.de.xoev.transport.xta.x211.PermissionDeniedException;
 import genv3.de.xoev.transport.xta.x211.XTAWSTechnicalProblemException;
@@ -107,7 +109,7 @@ class XtaClientServiceTest {
 
 			service.closeMessage(message);
 
-			verify(service).logError(anyString(), xtaWSTechnicalProblemException);
+			verify(service).logError(anyString(), eq(xtaWSTechnicalProblemException));
 		}
 
 	}
@@ -149,7 +151,7 @@ class XtaClientServiceTest {
 
 			service.getMessage(messageMetaData);
 
-			verify(service).logError(anyString(), xtaWSTechnicalProblemException);
+			verify(service).logError(anyString(), eq(xtaWSTechnicalProblemException));
 		}
 	}
 
@@ -160,6 +162,8 @@ class XtaClientServiceTest {
 		@Mock
 		private XTAWSTechnicalProblemException xtaWSTechnicalProblemException;
 
+		private final XtaMessageMetaDataListing listing = XtaMessageMetaDataListingTestFactory.create();
+
 		@BeforeEach
 		void mock() {
 			when(config.getMaxListItems()).thenReturn(MAX_LIST_ITEMS);
@@ -169,11 +173,11 @@ class XtaClientServiceTest {
 		@Test
 		@SneakyThrows
 		void shouldReturn() {
-			doReturn(messageMetaData).when(wrapper).getStatusList(SELF_IDENTIFIER, MAX_LIST_ITEMS);
+			doReturn(listing).when(wrapper).getStatusList(SELF_IDENTIFIER, MAX_LIST_ITEMS);
 
 			var result = service.getStatusList(SELF_IDENTIFIER);
 
-			assertThat(result).isEqualTo(messageMetaData);
+			assertThat(result).contains(listing);
 		}
 
 		@DisplayName("should return empty if exception")
@@ -195,7 +199,7 @@ class XtaClientServiceTest {
 
 			service.getStatusList(SELF_IDENTIFIER);
 
-			verify(service).logError(anyString(), xtaWSTechnicalProblemException);
+			verify(service).logError(anyString(), eq(xtaWSTechnicalProblemException));
 		}
 	}
 
@@ -261,7 +265,7 @@ class XtaClientServiceTest {
 		@BeforeEach
 		@SneakyThrows
 		void mock() {
-			doReturn(message).when(service).getXtaMessageWithMessageId(message);
+			doReturn(message).when(service).getXtaMessageWithMessageId(messageWithoutMessageId);
 		}
 
 		@DisplayName("should call send message")