diff --git a/src/test/java/de/caritas/cob/userservice/api/facade/EmailNotificationFacadeTest.java b/src/test/java/de/caritas/cob/userservice/api/facade/EmailNotificationFacadeTest.java
index 79b400e1c..bdf420439 100644
--- a/src/test/java/de/caritas/cob/userservice/api/facade/EmailNotificationFacadeTest.java
+++ b/src/test/java/de/caritas/cob/userservice/api/facade/EmailNotificationFacadeTest.java
@@ -787,17 +787,6 @@ void sendNewMessageNotification_Should_LogError_WhenSessionServiceFails() {
     verify(mailService).sendEmailNotification(Mockito.any());
   }
 
-  @Test
-  void sendNewFeedbackMessageNotification_Should_LogErrorAndSendNoMails_WhenSessionIsNotFound() {
-
-    when(sessionService.getSessionByFeedbackGroupId(RC_FEEDBACK_GROUP_ID)).thenReturn(null);
-
-    emailNotificationFacade.sendNewFeedbackMessageNotification(
-        RC_FEEDBACK_GROUP_ID, CONSULTANT_ID, null);
-
-    verify(logger, atLeastOnce()).error(anyString(), anyString());
-  }
-
   @Test
   void
       sendNewFeedbackMessageNotification_Should_LogErrorAndSendNoMails_WhenNoConsultantIsAssignedToSession() {
diff --git a/src/test/java/de/caritas/cob/userservice/api/facade/assignsession/AssignEnquiryFacadeTest.java b/src/test/java/de/caritas/cob/userservice/api/facade/assignsession/AssignEnquiryFacadeTest.java
index f6cc87d73..ac67d1893 100644
--- a/src/test/java/de/caritas/cob/userservice/api/facade/assignsession/AssignEnquiryFacadeTest.java
+++ b/src/test/java/de/caritas/cob/userservice/api/facade/assignsession/AssignEnquiryFacadeTest.java
@@ -288,38 +288,6 @@ void assignEnquiry_Should_LogError_WhenAddPeerConsultantToFeedbackGroupFails() {
             U25_SESSION_WITHOUT_CONSULTANT, CONSULTANT_WITH_AGENCY, IN_PROGRESS);
   }
 
-  @Test
-  void assignEnquiry_Should_LogError_WhenRemoveSystemMessagesFromGroupFails() {
-    doThrow(new InternalServerErrorException("error"))
-        .when(rocketChatFacade)
-        .removeSystemMessagesFromRocketChatGroup(Mockito.any());
-
-    assignEnquiryFacade.assignRegisteredEnquiry(
-        U25_SESSION_WITHOUT_CONSULTANT, CONSULTANT_WITH_AGENCY);
-
-    verifyConsultantAndSessionHaveBeenChecked(
-        U25_SESSION_WITHOUT_CONSULTANT, CONSULTANT_WITH_AGENCY);
-    verify(sessionService, times(1))
-        .updateConsultantAndStatusForSession(
-            U25_SESSION_WITHOUT_CONSULTANT, CONSULTANT_WITH_AGENCY, IN_PROGRESS);
-  }
-
-  @Test
-  void assignEnquiry_Should_LogError_When_RemoveSystemMessagesFromFeedbackChatFails() {
-    doThrow(new InternalServerErrorException("error"))
-        .when(rocketChatFacade)
-        .removeSystemMessagesFromRocketChatGroup(Mockito.any());
-
-    assignEnquiryFacade.assignRegisteredEnquiry(
-        U25_SESSION_WITHOUT_CONSULTANT, CONSULTANT_WITH_AGENCY);
-
-    verifyConsultantAndSessionHaveBeenChecked(
-        U25_SESSION_WITHOUT_CONSULTANT, CONSULTANT_WITH_AGENCY);
-    verify(sessionService, times(1))
-        .updateConsultantAndStatusForSession(
-            U25_SESSION_WITHOUT_CONSULTANT, CONSULTANT_WITH_AGENCY, IN_PROGRESS);
-  }
-
   @Test
   void assignEnquiry_Should_AddPeerConsultantToFeedbackGroup_WhenSessionHasFeedbackIsTrue() {
     assignEnquiryFacade.assignRegisteredEnquiry(