diff --git a/service/src/test/java/com/myhome/services/unit/MailSDJpaServiceTest.java b/service/src/test/java/com/myhome/services/unit/MailSDJpaServiceTest.java
index 32055af0..4858aaad 100644
--- a/service/src/test/java/com/myhome/services/unit/MailSDJpaServiceTest.java
+++ b/service/src/test/java/com/myhome/services/unit/MailSDJpaServiceTest.java
@@ -7,7 +7,6 @@
 import helpers.TestUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.springframework.context.support.ResourceBundleMessageSource;
@@ -24,7 +23,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.doThrow;
 
@@ -59,7 +57,7 @@ void sendPasswordRecoverCodeMailException() {
     // given
     MimeMessage mimeMessage = new MimeMessage((Session)null);
     User user = getTestUser();
-    given(emailTemplateEngine.process(eq(""), any(Context.class)))
+    given(emailTemplateEngine.process(any(String.class), any(Context.class)))
         .willReturn("HTML");
     given(mailSender.createMimeMessage())
         .willReturn(mimeMessage);
@@ -77,7 +75,7 @@ void sendPasswordSuccessfullyChangedMailException() {
     // given
     MimeMessage mimeMessage = new MimeMessage((Session)null);
     User user = getTestUser();
-    given(emailTemplateEngine.process(eq(""), any(Context.class)))
+    given(emailTemplateEngine.process(any(String.class), any(Context.class)))
         .willReturn("HTML");
     given(mailSender.createMimeMessage())
         .willReturn(mimeMessage);
@@ -95,7 +93,7 @@ void sendEmailConfirmedMailException() {
     // given
     MimeMessage mimeMessage = new MimeMessage((Session)null);
     User user = getTestUser();
-    given(emailTemplateEngine.process(eq(""), any(Context.class)))
+    given(emailTemplateEngine.process(any(String.class), any(Context.class)))
         .willReturn("HTML");
     given(mailSender.createMimeMessage())
         .willReturn(mimeMessage);
@@ -115,7 +113,7 @@ void sendEmailCreatedMailException() {
     token.setToken("token");
     MimeMessage mimeMessage = new MimeMessage((Session)null);
     User user = getTestUser();
-    given(emailTemplateEngine.process(eq(""), any(Context.class)))
+    given(emailTemplateEngine.process(any(String.class), any(Context.class)))
         .willReturn("HTML");
     given(mailSender.createMimeMessage())
         .willReturn(mimeMessage);
diff --git a/service/src/test/java/helpers/TestUtils.java b/service/src/test/java/helpers/TestUtils.java
index d61ec4b4..35557ed1 100644
--- a/service/src/test/java/helpers/TestUtils.java
+++ b/service/src/test/java/helpers/TestUtils.java
@@ -1,7 +1,5 @@
 package helpers;
 
-import com.myhome.configuration.properties.mail.EmailTemplateLocalizationProperties;
-import com.myhome.configuration.properties.mail.EmailTemplateProperties;
 import com.myhome.configuration.properties.mail.MailProperties;
 import com.myhome.controllers.dto.PaymentDto;
 import com.myhome.controllers.dto.UserDto;
@@ -19,7 +17,6 @@
 import java.time.LocalDate;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -184,7 +181,7 @@ public static class MailPropertiesHelper {
     public static MailProperties getTestMailProperties() {
       MailProperties testMailProperties = new MailProperties();
       testMailProperties.setHost("test host");
-      testMailProperties.setUsername("test username");
+      testMailProperties.setUsername("testUsername");
       testMailProperties.setPassword("test password");
       testMailProperties.setPort(0);
       testMailProperties.setProtocol("test protocol");
@@ -193,22 +190,6 @@ public static MailProperties getTestMailProperties() {
       return testMailProperties;
     }
 
-    public static EmailTemplateProperties getTestMailTemplateProperties() {
-      EmailTemplateProperties testMailTemplate = new EmailTemplateProperties();
-      testMailTemplate.setPath("test path");
-      testMailTemplate.setEncoding("test encoding");
-      testMailTemplate.setMode("test mode");
-      testMailTemplate.setCache(false);
-      return testMailTemplate;
-    }
-
-    public static EmailTemplateLocalizationProperties getTestLocalizationMailProperties() {
-      EmailTemplateLocalizationProperties testTemplatesLocalization = new EmailTemplateLocalizationProperties();
-      testTemplatesLocalization.setPath("test path");
-      testTemplatesLocalization.setEncoding("test encodig");
-      testTemplatesLocalization.setCacheSeconds(0);
-      return testTemplatesLocalization;
-    }
   }
 
   public static class PaymentHelpers {