diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
index 5d915f8..9d46599 100644
--- a/.idea/checkstyle-idea.xml
+++ b/.idea/checkstyle-idea.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CheckStyle-IDEA" serialisationVersion="2">
-    <checkstyleVersion>8.7</checkstyleVersion>
-    <scanScope>JavaOnlyWithTests</scanScope>
-    <suppressErrors>true</suppressErrors>
+    <checkstyleVersion>10.10.0</checkstyleVersion>
+    <scanScope>JavaOnly</scanScope>
+    <copyLibs>true</copyLibs>
+    <scanBeforeCheckin>true</scanBeforeCheckin>
     <option name="thirdPartyClasspath" />
     <option name="activeLocationIds">
-      <option value="62816b97-f73e-4dd3-8875-58d127dbc90c" />
+      <option value="afe30dd8-be2e-4040-96fe-f882b8aab694" />
     </option>
     <option name="locations">
       <list>
         <ConfigurationLocation id="bundled-sun-checks" type="BUNDLED" scope="All" description="Sun Checks">(bundled)</ConfigurationLocation>
         <ConfigurationLocation id="bundled-google-checks" type="BUNDLED" scope="All" description="Google Checks">(bundled)</ConfigurationLocation>
-        <ConfigurationLocation id="62816b97-f73e-4dd3-8875-58d127dbc90c" type="HTTP_URL" scope="All" description="OAP">https://raw.githubusercontent.com/oaplatform/oap-maven/master/.idea/checkstyle.xml</ConfigurationLocation>
+        <ConfigurationLocation id="afe30dd8-be2e-4040-96fe-f882b8aab694" type="HTTP_URL" scope="All" description="oap">https://raw.githubusercontent.com/oaplatform/oap-maven/master/.idea/checkstyle.xml</ConfigurationLocation>
       </list>
     </option>
   </component>
diff --git a/oap-mail-test/pom.xml b/oap-mail-test/pom.xml
new file mode 100644
index 0000000..5fe6b93
--- /dev/null
+++ b/oap-mail-test/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ The MIT License (MIT)
+  ~
+  ~ Copyright (c) Open Application Platform Authors
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all
+  ~ copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  ~ SOFTWARE.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <name>oap-mail-test</name>
+    <artifactId>oap-mail-test</artifactId>
+
+    <parent>
+        <groupId>oap</groupId>
+        <artifactId>oap-mail-parent</artifactId>
+        <version>${oap-mail.project.version}</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>oap</groupId>
+            <artifactId>oap-mail</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>oap</groupId>
+            <artifactId>oap-stdlib-test</artifactId>
+            <version>${oap.deps.oap.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${oap.deps.lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/oap-mail/src/main/java/oap/mail/test/MailBox.java b/oap-mail-test/src/main/java/oap/mail/test/MailBox.java
similarity index 100%
rename from oap-mail/src/main/java/oap/mail/test/MailBox.java
rename to oap-mail-test/src/main/java/oap/mail/test/MailBox.java
diff --git a/oap-mail/src/main/java/oap/mail/test/MessageAssertion.java b/oap-mail-test/src/main/java/oap/mail/test/MessageAssertion.java
similarity index 100%
rename from oap-mail/src/main/java/oap/mail/test/MessageAssertion.java
rename to oap-mail-test/src/main/java/oap/mail/test/MessageAssertion.java
diff --git a/oap-mail/src/main/java/oap/mail/test/MessagesAssertion.java b/oap-mail-test/src/main/java/oap/mail/test/MessagesAssertion.java
similarity index 100%
rename from oap-mail/src/main/java/oap/mail/test/MessagesAssertion.java
rename to oap-mail-test/src/main/java/oap/mail/test/MessagesAssertion.java
diff --git a/oap-mail/src/test/java/oap/mail/MailQueueTest.java b/oap-mail-test/src/test/java/oap/mail/MailQueueTest.java
similarity index 100%
rename from oap-mail/src/test/java/oap/mail/MailQueueTest.java
rename to oap-mail-test/src/test/java/oap/mail/MailQueueTest.java
diff --git a/oap-mail/src/test/java/oap/mail/TemplateTest.java b/oap-mail-test/src/test/java/oap/mail/TemplateTest.java
similarity index 100%
rename from oap-mail/src/test/java/oap/mail/TemplateTest.java
rename to oap-mail-test/src/test/java/oap/mail/TemplateTest.java
diff --git a/oap-mail/src/test/java/oap/mail/TestGMail.java b/oap-mail-test/src/test/java/oap/mail/TestGMail.java
similarity index 100%
rename from oap-mail/src/test/java/oap/mail/TestGMail.java
rename to oap-mail-test/src/test/java/oap/mail/TestGMail.java
diff --git a/oap-mail/src/test/java/oap/mail/message/TextMessageParserTest.java b/oap-mail-test/src/test/java/oap/mail/message/TextMessageParserTest.java
similarity index 100%
rename from oap-mail/src/test/java/oap/mail/message/TextMessageParserTest.java
rename to oap-mail-test/src/test/java/oap/mail/message/TextMessageParserTest.java
diff --git a/oap-mail/src/test/java/oap/mail/message/xml/XmlMessageParserTest.java b/oap-mail-test/src/test/java/oap/mail/message/xml/XmlMessageParserTest.java
similarity index 100%
rename from oap-mail/src/test/java/oap/mail/message/xml/XmlMessageParserTest.java
rename to oap-mail-test/src/test/java/oap/mail/message/xml/XmlMessageParserTest.java
diff --git a/oap-mail/src/test/java/oap/mail/velocity/FormatDateDirectiveTest.java b/oap-mail-test/src/test/java/oap/mail/velocity/FormatDateDirectiveTest.java
similarity index 100%
rename from oap-mail/src/test/java/oap/mail/velocity/FormatDateDirectiveTest.java
rename to oap-mail-test/src/test/java/oap/mail/velocity/FormatDateDirectiveTest.java
diff --git a/oap-mail/src/test/java/oap/mail/velocity/XPathDirectiveTest.java b/oap-mail-test/src/test/java/oap/mail/velocity/XPathDirectiveTest.java
similarity index 100%
rename from oap-mail/src/test/java/oap/mail/velocity/XPathDirectiveTest.java
rename to oap-mail-test/src/test/java/oap/mail/velocity/XPathDirectiveTest.java
diff --git a/oap-mail/src/test/resources/logback-test.xml b/oap-mail-test/src/test/resources/logback-test.xml
similarity index 100%
rename from oap-mail/src/test/resources/logback-test.xml
rename to oap-mail-test/src/test/resources/logback-test.xml
diff --git a/oap-mail/src/test/resources/oap/mail/TemplateTest/include.txt b/oap-mail-test/src/test/resources/oap/mail/TemplateTest/include.txt
similarity index 100%
rename from oap-mail/src/test/resources/oap/mail/TemplateTest/include.txt
rename to oap-mail-test/src/test/resources/oap/mail/TemplateTest/include.txt
diff --git a/oap-mail/src/test/resources/oap/mail/message/TextMessageParserTest/att1.mail b/oap-mail-test/src/test/resources/oap/mail/message/TextMessageParserTest/att1.mail
similarity index 100%
rename from oap-mail/src/test/resources/oap/mail/message/TextMessageParserTest/att1.mail
rename to oap-mail-test/src/test/resources/oap/mail/message/TextMessageParserTest/att1.mail
diff --git a/oap-mail/src/test/resources/oap/mail/message/TextMessageParserTest/att2.mail b/oap-mail-test/src/test/resources/oap/mail/message/TextMessageParserTest/att2.mail
similarity index 100%
rename from oap-mail/src/test/resources/oap/mail/message/TextMessageParserTest/att2.mail
rename to oap-mail-test/src/test/resources/oap/mail/message/TextMessageParserTest/att2.mail
diff --git a/oap-mail/src/test/resources/oap/mail/message/TextMessageParserTest/subject.mail b/oap-mail-test/src/test/resources/oap/mail/message/TextMessageParserTest/subject.mail
similarity index 100%
rename from oap-mail/src/test/resources/oap/mail/message/TextMessageParserTest/subject.mail
rename to oap-mail-test/src/test/resources/oap/mail/message/TextMessageParserTest/subject.mail
diff --git a/oap-mail/src/test/resources/oap/mail/message/xml/XmlMessageParserTest/mail.xmail b/oap-mail-test/src/test/resources/oap/mail/message/xml/XmlMessageParserTest/mail.xmail
similarity index 100%
rename from oap-mail/src/test/resources/oap/mail/message/xml/XmlMessageParserTest/mail.xmail
rename to oap-mail-test/src/test/resources/oap/mail/message/xml/XmlMessageParserTest/mail.xmail
diff --git a/oap-mail/src/test/resources/oap/mail/message/xml/XmlMessageParserTest/simple.xmail b/oap-mail-test/src/test/resources/oap/mail/message/xml/XmlMessageParserTest/simple.xmail
similarity index 100%
rename from oap-mail/src/test/resources/oap/mail/message/xml/XmlMessageParserTest/simple.xmail
rename to oap-mail-test/src/test/resources/oap/mail/message/xml/XmlMessageParserTest/simple.xmail
diff --git a/oap-mail/src/test/resources/oap/mail/message/xml/XmlMessageParserTest/text-attachment.xmail b/oap-mail-test/src/test/resources/oap/mail/message/xml/XmlMessageParserTest/text-attachment.xmail
similarity index 100%
rename from oap-mail/src/test/resources/oap/mail/message/xml/XmlMessageParserTest/text-attachment.xmail
rename to oap-mail-test/src/test/resources/oap/mail/message/xml/XmlMessageParserTest/text-attachment.xmail
diff --git a/oap-mail/src/test/resources/oap/mail/velocity/XPathDirectiveTest/test.xml b/oap-mail-test/src/test/resources/oap/mail/velocity/XPathDirectiveTest/test.xml
similarity index 100%
rename from oap-mail/src/test/resources/oap/mail/velocity/XPathDirectiveTest/test.xml
rename to oap-mail-test/src/test/resources/oap/mail/velocity/XPathDirectiveTest/test.xml
diff --git a/oap-mail/src/test/resources/tux.jpeg b/oap-mail-test/src/test/resources/tux.jpeg
similarity index 100%
rename from oap-mail/src/test/resources/tux.jpeg
rename to oap-mail-test/src/test/resources/tux.jpeg
diff --git a/oap-mail/src/test/resources/xjapanese.xmail b/oap-mail-test/src/test/resources/xjapanese.xmail
similarity index 100%
rename from oap-mail/src/test/resources/xjapanese.xmail
rename to oap-mail-test/src/test/resources/xjapanese.xmail
diff --git a/pom.xml b/pom.xml
index 80faa7c..ab44333 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,13 +44,14 @@
 
     <modules>
         <module>oap-mail</module>
+        <module>oap-mail-test</module>
         <module>oap-mail-sendgrid</module>
     </modules>
 
     <properties>
-        <oap-mail.project.version>21.0.1</oap-mail.project.version>
+        <oap-mail.project.version>21.1.0</oap-mail.project.version>
 
-        <oap.deps.oap.version>21.1.2</oap.deps.oap.version>
+        <oap.deps.oap.version>21.2.0</oap.deps.oap.version>
 
         <oap.deps.sendgrid.version>4.9.3</oap.deps.sendgrid.version>
         <oap.deps.lombok.version>1.18.30</oap.deps.lombok.version>