diff --git a/services/contracts/src/main/java/com/workup/contracts/RabbitMQListener.java b/services/contracts/src/main/java/com/workup/contracts/RabbitMQListener.java
index 7866e3dd..6c60bcff 100644
--- a/services/contracts/src/main/java/com/workup/contracts/RabbitMQListener.java
+++ b/services/contracts/src/main/java/com/workup/contracts/RabbitMQListener.java
@@ -1,12 +1,9 @@
 package com.workup.contracts;
 
 import com.workup.contracts.commands.*;
-
-import com.workup.shared.commands.contracts.requests.*;
-import com.workup.shared.commands.contracts.responses.*;
-
 import com.workup.shared.commands.Command;
 import com.workup.shared.commands.CommandRequest;
+import com.workup.shared.commands.contracts.requests.*;
 import com.workup.shared.commands.contracts.requests.ContractTerminationRequest;
 import com.workup.shared.commands.contracts.requests.EvaluateMilestoneRequest;
 import com.workup.shared.commands.contracts.requests.GetContractRequest;
@@ -16,6 +13,7 @@
 import com.workup.shared.commands.contracts.requests.MarkPaymentCompletedRequest;
 import com.workup.shared.commands.contracts.requests.ProgressMilestoneRequest;
 import com.workup.shared.commands.contracts.requests.ViewContractMilestonesRequest;
+import com.workup.shared.commands.contracts.responses.*;
 import com.workup.shared.commands.contracts.responses.ContractTerminationResponse;
 import com.workup.shared.commands.contracts.responses.EvaluateMilestoneResponse;
 import com.workup.shared.commands.contracts.responses.GetContractResponse;
@@ -26,7 +24,6 @@
 import com.workup.shared.commands.contracts.responses.ProgressMilestoneResponse;
 import com.workup.shared.commands.contracts.responses.ViewContractMilestonesResponse;
 import com.workup.shared.enums.HttpStatusCode;
-
 import com.workup.shared.enums.ServiceQueueNames;
 import java.util.concurrent.CompletableFuture;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
diff --git a/services/contracts/src/test/java/com/workup/contracts/ContractsApplicationTests.java b/services/contracts/src/test/java/com/workup/contracts/ContractsApplicationTests.java
index 6271c5a5..1b31740d 100644
--- a/services/contracts/src/test/java/com/workup/contracts/ContractsApplicationTests.java
+++ b/services/contracts/src/test/java/com/workup/contracts/ContractsApplicationTests.java
@@ -1,6 +1,5 @@
 package com.workup.contracts;
 
-
 import com.workup.contracts.logger.ContractsLogger;
 import com.workup.contracts.logger.LoggingLevel;
 import com.workup.contracts.repositories.ContractMilestoneRepository;
@@ -21,7 +20,7 @@
 import org.testcontainers.containers.RabbitMQContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import org.springframework.boot.test.context.SpringBootTest;
+
 @SpringBootTest
 @Testcontainers
 @Import(TestConfigBase.class)
@@ -233,8 +232,3 @@ void PrintContractTest2() {
     }
   }
 }
-
-
-
-
-
diff --git a/services/contracts/src/test/java/com/workup/contracts/TestConfigBase.java b/services/contracts/src/test/java/com/workup/contracts/TestConfigBase.java
new file mode 100644
index 00000000..acf2801d
--- /dev/null
+++ b/services/contracts/src/test/java/com/workup/contracts/TestConfigBase.java
@@ -0,0 +1,14 @@
+package com.workup.contracts;
+
+import com.workup.shared.enums.ServiceQueueNames;
+import org.springframework.amqp.core.Queue;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+
+@TestConfiguration
+public class TestConfigBase {
+  @Bean
+  public Queue contractsQueueMock() {
+    return new Queue(ServiceQueueNames.CONTRACTS);
+  }
+}