diff --git a/src/mokka/pom.xml b/src/mokka/pom.xml
index da130c8..64b8d9b 100644
--- a/src/mokka/pom.xml
+++ b/src/mokka/pom.xml
@@ -160,6 +160,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -171,12 +172,6 @@
             <version>3.3.0</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock</artifactId>
-            <version>2.25.1</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <!--
diff --git a/src/mokka/src/main/java/pl/hycom/mokka/Application.java b/src/mokka/src/main/java/pl/hycom/mokka/Application.java
index 890838b..1cbb54b 100644
--- a/src/mokka/src/main/java/pl/hycom/mokka/Application.java
+++ b/src/mokka/src/main/java/pl/hycom/mokka/Application.java
@@ -2,10 +2,6 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.data.envers.repository.support.EnversRevisionRepositoryFactoryBean;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * Main class for spring-boot mokka ui application
@@ -13,9 +9,6 @@
  * @author Michal Adamczyk, HYCOM S.A.
  */
 @SpringBootApplication
-@EnableJpaRepositories(repositoryFactoryBeanClass = EnversRevisionRepositoryFactoryBean.class)
-@EnableAsync
-@EnableScheduling
 public class Application {
 
     public static void main(String[] args) {
diff --git a/src/mokka/src/main/java/pl/hycom/mokka/AsyncConfiguration.java b/src/mokka/src/main/java/pl/hycom/mokka/AsyncConfiguration.java
new file mode 100644
index 0000000..b9adc57
--- /dev/null
+++ b/src/mokka/src/main/java/pl/hycom/mokka/AsyncConfiguration.java
@@ -0,0 +1,12 @@
+package pl.hycom.mokka;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+/**
+ * @author Piotr Kulasek-Szwed <piotr.kulasek-szwed@hycom.pl>
+ */
+@Configuration
+@EnableAsync
+public class AsyncConfiguration {
+}
diff --git a/src/mokka/src/main/java/pl/hycom/mokka/RepositoryConfiguration.java b/src/mokka/src/main/java/pl/hycom/mokka/RepositoryConfiguration.java
new file mode 100644
index 0000000..f76ad38
--- /dev/null
+++ b/src/mokka/src/main/java/pl/hycom/mokka/RepositoryConfiguration.java
@@ -0,0 +1,15 @@
+package pl.hycom.mokka;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.envers.repository.support.EnversRevisionRepositoryFactoryBean;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+
+/**
+ * @author Piotr Kulasek-Szwed <piotr.kulasek-szwed@hycom.pl>
+ */
+@Configuration
+@EnableJpaRepositories(
+    repositoryFactoryBeanClass = EnversRevisionRepositoryFactoryBean.class
+)
+public class RepositoryConfiguration {
+}
diff --git a/src/mokka/src/main/java/pl/hycom/mokka/SchedulingConfiguration.java b/src/mokka/src/main/java/pl/hycom/mokka/SchedulingConfiguration.java
new file mode 100644
index 0000000..0298143
--- /dev/null
+++ b/src/mokka/src/main/java/pl/hycom/mokka/SchedulingConfiguration.java
@@ -0,0 +1,12 @@
+package pl.hycom.mokka;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ * @author Piotr Kulasek-Szwed <piotr.kulasek-szwed@hycom.pl>
+ */
+@Configuration
+@EnableScheduling
+public class SchedulingConfiguration {
+}
diff --git a/src/mokka/src/main/java/pl/hycom/mokka/service/payment/DefaultPaymentStatusService.java b/src/mokka/src/main/java/pl/hycom/mokka/service/payment/DefaultPaymentStatusService.java
index ef25039..d59cb11 100644
--- a/src/mokka/src/main/java/pl/hycom/mokka/service/payment/DefaultPaymentStatusService.java
+++ b/src/mokka/src/main/java/pl/hycom/mokka/service/payment/DefaultPaymentStatusService.java
@@ -4,9 +4,11 @@
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.tomcat.util.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
@@ -14,6 +16,7 @@
 import org.springframework.web.client.RestTemplate;
 import pl.hycom.mokka.service.payment.constant.BlueMediaConstants;
 import pl.hycom.mokka.service.payment.pojo.BlueMediaPayment;
+import pl.hycom.mokka.util.validation.DefaultHashGenerator;
 import pl.hycom.mokka.util.validation.HashAlgorithm;
 import pl.hycom.mokka.util.validation.HashGenerator;
 
@@ -36,11 +39,20 @@
 public class DefaultPaymentStatusService implements PaymentStatusService {
 
     private static final String DATE_FORMAT = "yyyyMMddHHmmss";
-    @Resource
+
+    private final RestTemplate restTemplate;
+
+    @Setter
     private HashGenerator hashGenerator;
+
     @Value("${paymentSchema}")
     private String paymentSchema;
 
+
+    public DefaultPaymentStatusService(RestTemplateBuilder builder) {
+        restTemplate = builder.build();
+        hashGenerator = new DefaultHashGenerator();
+    }
     /**
      * Generates rest post request with SUCCESS status
      * @param blueMediaPayment BlueMediaPayment model
@@ -84,7 +96,6 @@ private void updatePaymentStatus(String status, BlueMediaPayment blueMediaPaymen
             String base64String=new String(bytesEncoded);
             log.info("Request transformed to Base64:["+base64String+"]");
             params.add(BlueMediaConstants.TRANSACTIONS, base64String);
-            RestTemplate restTemplate = new RestTemplate();
             ResponseEntity<String> response = restTemplate.postForEntity(blueMediaPayment.getNotificationURL() , params, String.class);
             log.info("Response status: [{}]", response.getStatusCode());
             log.info("Response body: [{}]", response.getBody());
diff --git a/src/mokka/src/test/java/pl/hycom/mokka/AbstractTest.java b/src/mokka/src/test/java/pl/hycom/mokka/AbstractTest.java
index 0115857..4b04a60 100644
--- a/src/mokka/src/test/java/pl/hycom/mokka/AbstractTest.java
+++ b/src/mokka/src/test/java/pl/hycom/mokka/AbstractTest.java
@@ -3,16 +3,16 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author Mariusz Krysztofowicz (mariusz.krysztofowicz@hycom.pl)
  */
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = Application.class)
 @AutoConfigureTestDatabase
-@TestPropertySource(locations = "classpath:test.properties")
+@ActiveProfiles("test")
 public abstract class AbstractTest {
 
 }
diff --git a/src/mokka/src/test/java/pl/hycom/mokka/endpoint/FileControllerTest.java b/src/mokka/src/test/java/pl/hycom/mokka/endpoint/FileControllerTest.java
index 791070b..93b2ef3 100644
--- a/src/mokka/src/test/java/pl/hycom/mokka/endpoint/FileControllerTest.java
+++ b/src/mokka/src/test/java/pl/hycom/mokka/endpoint/FileControllerTest.java
@@ -7,7 +7,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-
 import pl.hycom.mokka.AbstractTest;
 
 import static io.restassured.RestAssured.expect;
diff --git a/src/mokka/src/test/java/pl/hycom/mokka/service/impl/DefaultPaymentStatusServiceTest.java b/src/mokka/src/test/java/pl/hycom/mokka/service/impl/DefaultPaymentStatusServiceTest.java
index 51deb0a..5987dcf 100644
--- a/src/mokka/src/test/java/pl/hycom/mokka/service/impl/DefaultPaymentStatusServiceTest.java
+++ b/src/mokka/src/test/java/pl/hycom/mokka/service/impl/DefaultPaymentStatusServiceTest.java
@@ -4,7 +4,10 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.client.RestClientTest;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.client.MockRestServiceServer;
 import pl.hycom.mokka.service.payment.DefaultPaymentStatusService;
 import pl.hycom.mokka.service.payment.pojo.BlueMediaPayment;
@@ -16,9 +19,11 @@
 /**
  * @author Mariusz Krysztofowicz (mariusz.krysztofowicz@hycom.pl)
  */
-@Disabled
+@RestClientTest(DefaultPaymentStatusService.class)
+@ActiveProfiles("test")
 public class DefaultPaymentStatusServiceTest{
 
+    @Autowired
     private DefaultPaymentStatusService defaultPaymentStatusService;
 
     @Autowired
@@ -26,8 +31,7 @@ public class DefaultPaymentStatusServiceTest{
 
     @BeforeEach
     public void init() {
-        defaultPaymentStatusService = new DefaultPaymentStatusService();//new DefaultHashGenerator());
-        this.server.expect(requestTo("/soap/webservice-http/payment"))
+        this.server.expect(requestTo("http://localhost:48080/soap/webservice-http/payment"))
             .andRespond(withSuccess("OK", MediaType.TEXT_PLAIN));
     }
 
diff --git a/src/mokka/src/test/java/pl/hycom/mokka/ui/payment/PaymentControllerTest.java b/src/mokka/src/test/java/pl/hycom/mokka/ui/payment/PaymentControllerTest.java
index c5f583d..b08475a 100644
--- a/src/mokka/src/test/java/pl/hycom/mokka/ui/payment/PaymentControllerTest.java
+++ b/src/mokka/src/test/java/pl/hycom/mokka/ui/payment/PaymentControllerTest.java
@@ -1,6 +1,5 @@
 package pl.hycom.mokka.ui.payment;
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
@@ -12,7 +11,6 @@
 
 import javax.annotation.Resource;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
 
 /**
  * @author Jakub Muras <jakub.muras@hycom.pl>
diff --git a/src/mokka/src/test/resources/test.properties b/src/mokka/src/test/resources/application-test.properties
similarity index 100%
rename from src/mokka/src/test/resources/test.properties
rename to src/mokka/src/test/resources/application-test.properties