diff --git a/gradle.properties b/gradle.properties
index 9ab1f324035f24f23107a2f2653ad33bd43543f9..dd1bef8ebf684568c46d06cc7018534cda662a79 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 theGroup=ee.sm.ti.teis
-theVersion=1.6.0
-commonsVersion=1.8.0
+theVersion=1.7.0
+commonsVersion=1.10.0
 officeApiGatewayVersion=1.8.0
 pluginVersion=1.1.1
 mapstructVersion=1.3.0.Final
diff --git a/service/src/main/java/ee/sm/ti/teis/officials/config/QueueConfig.java b/service/src/main/java/ee/sm/ti/teis/officials/config/QueueConfig.java
index 78816555f655cae505488486c7136c5b6382c241..57f7058572e6298f6c9fa2aae053807da5c8ae8e 100644
--- a/service/src/main/java/ee/sm/ti/teis/officials/config/QueueConfig.java
+++ b/service/src/main/java/ee/sm/ti/teis/officials/config/QueueConfig.java
@@ -9,11 +9,7 @@ import ee.sm.ti.teis.configuration.TeisQueue;
 import ee.sm.ti.teis.domain.officials.Office;
 import ee.sm.ti.teis.domain.officials.OfficialUser;
 import ee.sm.ti.teis.domain.officials.OfficialsGroup;
-import ee.sm.ti.teis.domainrequest.DomainCreateDTO;
-import ee.sm.ti.teis.domainrequest.DomainDeleteDTO;
-import ee.sm.ti.teis.domainrequest.DomainQueryDTO;
-import ee.sm.ti.teis.domainrequest.DomainRequestDTO;
-import ee.sm.ti.teis.domainrequest.DomainUpdateDTO;
+import ee.sm.ti.teis.domainrequest.*;
 import ee.sm.ti.teis.officegateway.official.request.*;
 import ee.sm.ti.teis.servicecommon.util.TestDataImportService;
 import org.springframework.context.annotation.Configuration;
@@ -55,7 +51,7 @@ public class QueueConfig implements QueueList {
 
     @Override
     public void updateQueues(ArrayList<TeisQueue> queues) {
-        String queueName = "officials-service" + TestDataImportService.RESET_TEST_DATA_QUEUE_SUFIX;
+        String queueName = "officials-service" + TestDataImportService.RESET_TEST_DATA_QUEUE_SUFFIX;
         addGwQueue(queues, "gwResetTestData", TestDataImportService.RESET_TEST_DATA_ROUTING_KEY, queueName);
 
         addGwQueue(queues, "gwCreateUserQueue", CreateOfficialUserRequest.ROUTING_KEY, GW_CREATE_OFFICIAL_USER_QUEUE);
diff --git a/service/src/main/java/ee/sm/ti/teis/officials/test/ResetTestDataListener.java b/service/src/main/java/ee/sm/ti/teis/officials/test/ResetTestDataListener.java
index 2a5d1faa2961905e08b68ab54c1a9b27a0165e7d..abc3f5535a0cc7dc8966bae499a69f10b5de42be 100644
--- a/service/src/main/java/ee/sm/ti/teis/officials/test/ResetTestDataListener.java
+++ b/service/src/main/java/ee/sm/ti/teis/officials/test/ResetTestDataListener.java
@@ -2,18 +2,21 @@ package ee.sm.ti.teis.officials.test;
 
 import ee.sm.ti.teis.servicecommon.util.TestDataImportService;
 import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
+import static ee.sm.ti.teis.servicecommon.util.TestDataImportService.*;
+
 @Service
-@AllArgsConstructor
+@RequiredArgsConstructor
 @Profile({"dev", "local", "test"})
 public class ResetTestDataListener {
 
-    private TestDataImportService testDataImportService;
+    private final TestDataImportService testDataImportService;
 
-    @RabbitListener(queues = {"officials-service" + TestDataImportService.RESET_TEST_DATA_QUEUE_SUFIX})
+    @RabbitListener(queues = {"officials-service" + RESET_TEST_DATA_QUEUE_SUFFIX})
     public void resetTestData(String providedMagicString) {
         testDataImportService.resetTestData(providedMagicString);
     }