diff --git a/pom.xml b/pom.xml
index a5ac904..8716ea6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,11 +83,6 @@
 			<artifactId>jakarta.persistence-api</artifactId>
 			<version>3.1.0</version>
 		</dependency>
-		<dependency>
-			<groupId>com.googlecode.libphonenumber</groupId>
-			<artifactId>libphonenumber</artifactId>
-			<version>8.12.10</version>
-		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
@@ -167,12 +162,7 @@
         <dependency>
             <groupId>com.googlecode.libphonenumber</groupId>
             <artifactId>libphonenumber</artifactId>
-            <version>8.13.36</version> <!-- Use the latest version -->
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-mail</artifactId>
-            <version>3.1.5</version>
+            <version>8.13.36</version>
         </dependency>
         <!-- Maven -->
         <dependency>
diff --git a/src/main/java/zw/qantra/tm/domain/services/processors/workflows/handlers/GatewayPaymentHandler.java b/src/main/java/zw/qantra/tm/domain/services/processors/workflows/handlers/GatewayPaymentHandler.java
index bc4f72b..faf98ca 100644
--- a/src/main/java/zw/qantra/tm/domain/services/processors/workflows/handlers/GatewayPaymentHandler.java
+++ b/src/main/java/zw/qantra/tm/domain/services/processors/workflows/handlers/GatewayPaymentHandler.java
@@ -62,7 +62,6 @@ public class GatewayPaymentHandler implements HandlerInterface {
         try {
             // MAIN TRANSACTION LOGIC!
             transaction = (Transaction) transactionProcessorInterface.process(transaction);
-            transaction.setPaymentStatus(transaction.getPaymentStatus());
             transaction.setPollingStatus(Status.PENDING);
             transactionService.save(transaction);
 
diff --git a/src/test/java/zw/qantra/tm/domain/services/processors/workflows/handlers/PollStatusHandlerTest.java b/src/test/java/zw/qantra/tm/domain/services/processors/workflows/handlers/PollStatusHandlerTest.java
index 411d2b8..477351e 100644
--- a/src/test/java/zw/qantra/tm/domain/services/processors/workflows/handlers/PollStatusHandlerTest.java
+++ b/src/test/java/zw/qantra/tm/domain/services/processors/workflows/handlers/PollStatusHandlerTest.java
@@ -49,6 +49,7 @@ class PollStatusHandlerTest {
         transaction.setUserId("user-1");
         transaction.setPaymentProcessorLabel("ecocash");
         transaction.setAuthType(AuthType.MOBILE);
+        transaction.setPaymentStatus(Status.SUCCESS); // Required for polling to proceed
     }
 
     @Test
@@ -59,7 +60,7 @@ class PollStatusHandlerTest {
                 .thenReturn(transactionProcessor);
         when(transactionProcessor.poll(any(Transaction.class))).thenAnswer(invocation -> {
             Transaction tx = invocation.getArgument(0);
-            tx.setStatus(Status.SUCCESS);
+            tx.setPollingStatus(Status.SUCCESS);
             return tx;
         });
         when(transactionService.save(any(Transaction.class))).thenReturn(transaction);
@@ -127,7 +128,7 @@ class PollStatusHandlerTest {
                 .thenReturn(transactionProcessor);
         when(transactionProcessor.poll(any(Transaction.class))).thenAnswer(invocation -> {
             Transaction tx = invocation.getArgument(0);
-            tx.setStatus(Status.SUCCESS);
+            tx.setPollingStatus(Status.SUCCESS);
             return tx;
         });
         when(transactionService.save(any(Transaction.class))).thenReturn(transaction);
@@ -146,7 +147,7 @@ class PollStatusHandlerTest {
                 .thenReturn(transactionProcessor);
         when(transactionProcessor.poll(any(Transaction.class))).thenAnswer(invocation -> {
             Transaction tx = invocation.getArgument(0);
-            tx.setStatus(Status.SUCCESS);
+            tx.setPollingStatus(Status.SUCCESS);
             return tx;
         });
         when(transactionService.save(any(Transaction.class))).thenReturn(transaction);
diff --git a/src/test/resources/application-test.properties b/src/test/resources/application-test.properties
index c59a575..5504e47 100644
--- a/src/test/resources/application-test.properties
+++ b/src/test/resources/application-test.properties
@@ -19,6 +19,14 @@ spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.ser
 
 # Disable jobrunr for tests
 jobrunr.enabled=false
+jobrunr.dashboard.enabled=false
+jobrunr.storage.enabled=false
+
+# Use in-memory database for JobRunr if enabled
+spring.datasource.jobrunr.url=jdbc:h2:mem:jobrunr-test;DB_CLOSE_DELAY=-1
+spring.datasource.jobrunr.driver-class-name=org.h2.Driver
+spring.datasource.jobrunr.username=sa
+spring.datasource.jobrunr.password=
 
 # Disable mail for tests
-spring.mail.enabled=false
\ No newline at end of file
+spring.mail.enabled=false