diff --git a/pom.xml b/pom.xml
index 5b4d935177..db3bb56fb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,33 +203,25 @@
 			<id>default</id>
 			<build>
 				<plugins>
+				
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-surefire-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>integration-test</phase>
-								<goals>
-									<goal>test</goal>
-								</goals>
-								<configuration>
-									<excludes>
-										<exclude>**/*ManualTest.java</exclude>
-										<exclude>**/*LiveTest.java</exclude>
-									</excludes>
-									<includes>
-										<include>**/*IntegrationTest.java</include>
-										<include>**/*IntTest.java</include>
-									</includes>
-								</configuration>
-							</execution>
-						</executions>
+						<version>${maven-surefire-plugin.version}</version>
 						<configuration>
-							<systemPropertyVariables>
-								<test.mime>json</test.mime>
-							</systemPropertyVariables>
+							<forkCount>3</forkCount>
+							<reuseForks>true</reuseForks>
+							<excludes>
+								<exclude>**/*IntegrationTest.java</exclude>
+								<exclude>**/*IntTest.java</exclude>
+								<exclude>**/*LongRunningUnitTest.java</exclude>
+								<exclude>**/*ManualTest.java</exclude>
+								<exclude>**/JdbcTest.java</exclude>
+								<exclude>**/*LiveTest.java</exclude>
+							</excludes>
 						</configuration>
 					</plugin>
+
 				</plugins>
 			</build>
 
@@ -580,47 +572,25 @@
 				<!-- group 1 - OK, 27min, 7911Kb log, 8 failusres -->
 
 				<!-- group 2 -->
-				
-				<!-- <module>testing-modules/mockito</module>
-				<module>testing-modules/mockito-2</module>
-				<module>testing-modules/mocks</module>
-				<module>mustache</module>
-				<module>mvn-wrapper</module>
-				<module>noexception</module>
-				<module>orientdb</module>
-				<module>osgi</module>
-				<module>orika</module>
-				<module>patterns</module>
-				<module>pdf</module>
-				<module>protobuffer</module>
-				<module>persistence-modules/querydsl</module>
-				<module>reactor-core</module>
-				<module>persistence-modules/redis</module>
-				<module>testing-modules/rest-assured</module>
-				<module>testing-modules/rest-testing</module>
-				<module>resteasy</module>
-				<module>rxjava</module>
-				<module>spring-swagger-codegen</module>
-				<module>testing-modules/selenium-junit-testng</module>
-				<module>persistence-modules/solr</module>
-				<module>spark-java</module>
-				<module>spring-4</module>
-				<module>spring-5</module>
-				<module>spring-5-reactive</module>
-				<module>spring-5-mvc</module>
-				<module>spring-5-security</module>
-				<module>spring-activiti</module>
-				<module>spring-akka</module>
-				<module>spring-amqp</module>
-				<module>spring-all</module>
-				<module>spring-amqp-simple</module>
-				<module>spring-apache-camel</module>
-				<module>spring-batch</module> -->
-				
+
+				<!-- <module>testing-modules/mockito</module> <module>testing-modules/mockito-2</module> 
+					<module>testing-modules/mocks</module> <module>mustache</module> <module>mvn-wrapper</module> 
+					<module>noexception</module> <module>orientdb</module> <module>osgi</module> 
+					<module>orika</module> <module>patterns</module> <module>pdf</module> <module>protobuffer</module> 
+					<module>persistence-modules/querydsl</module> <module>reactor-core</module> 
+					<module>persistence-modules/redis</module> <module>testing-modules/rest-assured</module> 
+					<module>testing-modules/rest-testing</module> <module>resteasy</module> <module>rxjava</module> 
+					<module>spring-swagger-codegen</module> <module>testing-modules/selenium-junit-testng</module> 
+					<module>persistence-modules/solr</module> <module>spark-java</module> <module>spring-4</module> 
+					<module>spring-5</module> <module>spring-5-reactive</module> <module>spring-5-mvc</module> 
+					<module>spring-5-security</module> <module>spring-activiti</module> <module>spring-akka</module> 
+					<module>spring-amqp</module> <module>spring-all</module> <module>spring-amqp-simple</module> 
+					<module>spring-apache-camel</module> <module>spring-batch</module> -->
+
 				<!-- group 2 - Pass, 11-16 min, 42 test failures, 4,020 KB -->
-				
+
 				<!-- group 3.1 -->
-				
+
 				<module>spring-bom</module>
 				<module>spring-boot</module>
 				<module>spring-boot-keycloak</module>
@@ -646,12 +616,12 @@
 				<module>persistence-modules/spring-data-neo4j</module>
 				<module>persistence-modules/spring-data-redis</module>
 				<module>spring-data-rest</module>
-				
+
 				<!-- group 3.1 - Pass, 23 min, 35 failed tests, 7,942 KB -->
-				
+
 				<!-- group 3.2 -->
-				
-				<!--  -->
+
+				<!-- -->
 				<module>persistence-modules/spring-data-solr</module>
 				<module>spring-dispatcher-servlet</module>
 				<module>spring-exceptions</module>
@@ -684,94 +654,49 @@
 				<module>spring-rest-query-language</module>
 				<module>spring-rest</module>
 				<module>spring-rest-simple</module>
-				
+
 
 				<!-- group 3.2 - Pass, 8 minutes, 1 failed test, 2,294 KB log -->
-				<!-- group 3 - X -->
-				
+				<!-- group 3 - Pass, 25 minutes, 36 failed tests, 10,163 KB log -->
+
 				<!-- group 4 -->
 
-				<!-- <module>spring-security-acl</module>
-				<module>spring-security-cache-control</module>
-				<module>spring-security-client/spring-security-jsp-authentication</module>
-				<module>spring-security-client/spring-security-jsp-authorize</module>
-				<module>spring-security-client/spring-security-jsp-config</module>
-				<module>spring-security-client/spring-security-mvc</module>
-				<module>spring-security-client/spring-security-thymeleaf-authentication</module>
-				<module>spring-security-client/spring-security-thymeleaf-authorize</module>
-				<module>spring-security-client/spring-security-thymeleaf-config</module>
-				<module>spring-security-core</module>
-				<module>spring-security-mvc-boot</module>
-				<module>spring-security-mvc-custom</module>
-				<module>spring-security-mvc-digest-auth</module>
-				<module>spring-security-mvc-ldap</module>
-				<module>spring-security-mvc-login</module>
-				<module>spring-security-mvc-persisted-remember-me</module>
-				<module>spring-security-mvc-session</module>
-				<module>spring-security-mvc-socket</module>
-				<module>spring-security-openid</module>
-				<module>spring-security-react</module>
-				<module>spring-security-rest-basic-auth</module>
-				<module>spring-security-rest-custom</module>
-				<module>spring-security-rest</module>
-				<module>spring-security-sso</module>
-				<module>spring-security-x509</module>
-				<module>spring-session</module>
-				<module>spring-sleuth</module>
-				<module>spring-social-login</module>
-				<module>spring-spel</module>
-				<module>spring-state-machine</module>
-				<module>spring-thymeleaf</module>
-				<module>spring-userservice</module>
-				<module>spring-zuul</module>
-				<module>spring-reactor</module>
-				<module>spring-vertx</module>
-				<module>spring-jinq</module>
-				<module>spring-rest-embedded-tomcat</module>
-				<module>testing-modules/testing</module>
-				<module>testing-modules/testng</module>
-				<module>video-tutorials</module>
-				<module>xml</module>
-				<module>xmlunit-2</module>
-				<module>struts-2</module>
-				<module>apache-velocity</module>
-				<module>apache-solrj</module>
-				<module>rabbitmq</module>
-				<module>vertx</module>
-				<module>persistence-modules/spring-data-gemfire</module>
-				<module>mybatis</module>
-				<module>spring-drools</module>
-				<module>drools</module>
-				<module>persistence-modules/liquibase</module>
-				<module>spring-boot-property-exp</module>
-				<module>testing-modules/mockserver</module>
-				<module>testing-modules/test-containers</module>
-				<module>undertow</module>
-				<module>vertx-and-rxjava</module>
-				<module>saas</module>
-				<module>deeplearning4j</module>
-				<module>lucene</module>
-				<module>vraptor</module>
-				<module>persistence-modules/java-cockroachdb</module>
-				<module>spring-security-thymeleaf</module>
-				<module>persistence-modules/java-jdbi</module>
-				<module>jersey</module>
-				<module>java-spi</module>
-				<module>performance-tests</module>
-				<module>twilio</module>
-				<module>spring-boot-ctx-fluent</module>
-				<module>java-ee-8-security-api</module>
-				<module>spring-webflux-amqp</module>
-				<module>antlr</module>
-				<module>maven-archetype</module>
-				<module>apache-meecrowave</module> -->
-				
+				<!-- <module>spring-security-acl</module> <module>spring-security-cache-control</module> 
+					<module>spring-security-client/spring-security-jsp-authentication</module> 
+					<module>spring-security-client/spring-security-jsp-authorize</module> <module>spring-security-client/spring-security-jsp-config</module> 
+					<module>spring-security-client/spring-security-mvc</module> <module>spring-security-client/spring-security-thymeleaf-authentication</module> 
+					<module>spring-security-client/spring-security-thymeleaf-authorize</module> 
+					<module>spring-security-client/spring-security-thymeleaf-config</module> 
+					<module>spring-security-core</module> <module>spring-security-mvc-boot</module> 
+					<module>spring-security-mvc-custom</module> <module>spring-security-mvc-digest-auth</module> 
+					<module>spring-security-mvc-ldap</module> <module>spring-security-mvc-login</module> 
+					<module>spring-security-mvc-persisted-remember-me</module> <module>spring-security-mvc-session</module> 
+					<module>spring-security-mvc-socket</module> <module>spring-security-openid</module> 
+					<module>spring-security-react</module> <module>spring-security-rest-basic-auth</module> 
+					<module>spring-security-rest-custom</module> <module>spring-security-rest</module> 
+					<module>spring-security-sso</module> <module>spring-security-x509</module> 
+					<module>spring-session</module> <module>spring-sleuth</module> <module>spring-social-login</module> 
+					<module>spring-spel</module> <module>spring-state-machine</module> <module>spring-thymeleaf</module> 
+					<module>spring-userservice</module> <module>spring-zuul</module> <module>spring-reactor</module> 
+					<module>spring-vertx</module> <module>spring-jinq</module> <module>spring-rest-embedded-tomcat</module> 
+					<module>testing-modules/testing</module> <module>testing-modules/testng</module> 
+					<module>video-tutorials</module> <module>xml</module> <module>xmlunit-2</module> 
+					<module>struts-2</module> <module>apache-velocity</module> <module>apache-solrj</module> 
+					<module>rabbitmq</module> <module>vertx</module> <module>persistence-modules/spring-data-gemfire</module> 
+					<module>mybatis</module> <module>spring-drools</module> <module>drools</module> 
+					<module>persistence-modules/liquibase</module> <module>spring-boot-property-exp</module> 
+					<module>testing-modules/mockserver</module> <module>testing-modules/test-containers</module> 
+					<module>undertow</module> <module>vertx-and-rxjava</module> <module>saas</module> 
+					<module>deeplearning4j</module> <module>lucene</module> <module>vraptor</module> 
+					<module>persistence-modules/java-cockroachdb</module> <module>spring-security-thymeleaf</module> 
+					<module>persistence-modules/java-jdbi</module> <module>jersey</module> <module>java-spi</module> 
+					<module>performance-tests</module> <module>twilio</module> <module>spring-boot-ctx-fluent</module> 
+					<module>java-ee-8-security-api</module> <module>spring-webflux-amqp</module> 
+					<module>antlr</module> <module>maven-archetype</module> <module>apache-meecrowave</module> -->
+
 				<!-- group 4 - OK, 12 min, 3,961 KB log, 12 failed tests -->
 
-				<!-- 
-				<module>libraries</module>
-				<module>jmeter</module>
-				 -->
+				<!-- <module>libraries</module> <module>jmeter</module> -->
 
 			</modules>