diff --git a/src/test/java/zw/qantra/tm/domain/services/processors/workflows/handlers/CleanupHandlerTest.java b/src/test/java/zw/qantra/tm/domain/services/processors/workflows/handlers/CleanupHandlerTest.java
index b0caa52..e07bc89 100644
--- a/src/test/java/zw/qantra/tm/domain/services/processors/workflows/handlers/CleanupHandlerTest.java
+++ b/src/test/java/zw/qantra/tm/domain/services/processors/workflows/handlers/CleanupHandlerTest.java
@@ -12,11 +12,17 @@ import zw.qantra.tm.domain.enums.RequestType;
 import zw.qantra.tm.domain.enums.Status;
 import zw.qantra.tm.domain.models.Provider;
 import zw.qantra.tm.domain.models.Transaction;
-import zw.qantra.tm.domain.services.ProviderService;
 import zw.qantra.tm.domain.repositories.ProviderRepository;
+import zw.qantra.tm.domain.repositories.UserRepository;
+import zw.qantra.tm.domain.services.ProviderService;
+import zw.qantra.tm.domain.services.UserService;
 import zw.qantra.tm.exceptions.ApiException;
 
+import java.util.Optional;
+import java.util.UUID;
+
 import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
@@ -25,9 +31,15 @@ class CleanupHandlerTest {
     @Mock
     private ProviderService providerService;
 
+    @Mock
+    private UserService userService;
+
     @Mock
     private ProviderRepository providerRepository;
 
+    @Mock
+    private UserRepository userRepository;
+
     @InjectMocks
     private CleanupHandler handler;
 
@@ -37,6 +49,7 @@ class CleanupHandlerTest {
     void setUp() {
         transaction = new Transaction();
         transaction.setType(RequestType.CONFIRM);
+        transaction.setUserId("fbf3d8f5-d737-4ddc-8ab4-d06c3bb75f55");
         transaction.setBillClientId("client-123");
         transaction.setDebitPhone("+263771234567");
         transaction.setCreditPhone("+263778901234");
@@ -44,6 +57,8 @@ class CleanupHandlerTest {
         transaction.setRegion("ZW");
 
         lenient().when(providerService.getProviderRepository()).thenReturn(providerRepository);
+        lenient().when(userService.getUserRepository()).thenReturn(userRepository);
+        lenient().when(userRepository.findById(any(UUID.class))).thenReturn(Optional.empty());
     }
 
     @Test