diff --git a/spring-state-machine/pom.xml b/spring-state-machine/pom.xml
index 5393626083..bec03c39e8 100644
--- a/spring-state-machine/pom.xml
+++ b/spring-state-machine/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>baeldung-spring-state-machine</artifactId>
+    <artifactId>spring-state-machine</artifactId>
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -27,5 +27,32 @@
             <version>4.11</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.jayway.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>1.7.0</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <testFailureIgnore>true</testFailureIgnore>
+                    <excludes>
+                        <exclude>**/*IntegrationTest.java</exclude>
+                        <exclude>**/*LiveTest.java</exclude>
+                    </excludes>
+                    <systemPropertyVariables>
+                        <!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file
diff --git a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/applicationreview/ApplicationReviewEvents.java b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/applicationreview/ApplicationReviewEvents.java
index 971fc5dde7..300bd6027e 100644
--- a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/applicationreview/ApplicationReviewEvents.java
+++ b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/applicationreview/ApplicationReviewEvents.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.stateMachine.applicationReview;
+package com.baeldung.spring.statemachine.applicationreview;
 
 public enum ApplicationReviewEvents {
     APPROVE, REJECT
diff --git a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/applicationreview/ApplicationReviewStates.java b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/applicationreview/ApplicationReviewStates.java
index 1df2db1f86..3d173e7471 100644
--- a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/applicationreview/ApplicationReviewStates.java
+++ b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/applicationreview/ApplicationReviewStates.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.stateMachine.applicationReview;
+package com.baeldung.spring.statemachine.applicationreview;
 
 public enum ApplicationReviewStates {
     PEER_REVIEW, PRINCIPAL_REVIEW, APPROVED, REJECTED
diff --git a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/ForkJoinStateMachineConfiguration.java b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/ForkJoinStateMachineConfiguration.java
index c55104a627..3a3e632c51 100644
--- a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/ForkJoinStateMachineConfiguration.java
+++ b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/ForkJoinStateMachineConfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.stateMachine.config;
+package com.baeldung.spring.statemachine.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/HierarchicalStateMachineConfiguration.java b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/HierarchicalStateMachineConfiguration.java
index 708dbd3077..2bf9405c39 100644
--- a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/HierarchicalStateMachineConfiguration.java
+++ b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/HierarchicalStateMachineConfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.stateMachine.config;
+package com.baeldung.spring.statemachine.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.statemachine.config.EnableStateMachine;
diff --git a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/JunctionStateMachineConfiguration.java b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/JunctionStateMachineConfiguration.java
index e1bae10fb7..2f48a9dbb5 100644
--- a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/JunctionStateMachineConfiguration.java
+++ b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/JunctionStateMachineConfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.stateMachine.config;
+package com.baeldung.spring.statemachine.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleEnumStateMachineConfiguration.java b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleEnumStateMachineConfiguration.java
index 4e11851644..5339dea7d0 100644
--- a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleEnumStateMachineConfiguration.java
+++ b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleEnumStateMachineConfiguration.java
@@ -1,19 +1,13 @@
-package com.baeldung.spring.stateMachine.config;
+package com.baeldung.spring.statemachine.config;
 
-import com.baeldung.spring.stateMachine.applicationReview.ApplicationReviewEvents;
-import com.baeldung.spring.stateMachine.applicationReview.ApplicationReviewStates;
-import org.springframework.context.annotation.Bean;
+import com.baeldung.spring.statemachine.applicationreview.ApplicationReviewEvents;
+import com.baeldung.spring.statemachine.applicationreview.ApplicationReviewStates;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.statemachine.action.Action;
 import org.springframework.statemachine.config.EnableStateMachine;
 import org.springframework.statemachine.config.StateMachineConfigurerAdapter;
 import org.springframework.statemachine.config.builders.StateMachineConfigurationConfigurer;
 import org.springframework.statemachine.config.builders.StateMachineStateConfigurer;
 import org.springframework.statemachine.config.builders.StateMachineTransitionConfigurer;
-import org.springframework.statemachine.guard.Guard;
-
-import java.util.Arrays;
-import java.util.HashSet;
 
 @Configuration
 @EnableStateMachine
diff --git a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleStateMachineConfiguration.java b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleStateMachineConfiguration.java
index bb7556f97f..e9b448f6e7 100644
--- a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleStateMachineConfiguration.java
+++ b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleStateMachineConfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.stateMachine.config;
+package com.baeldung.spring.statemachine.config;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/StateMachineListener.java b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/StateMachineListener.java
index bb7859c683..47a274404e 100644
--- a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/StateMachineListener.java
+++ b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/StateMachineListener.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.stateMachine.config;
+package com.baeldung.spring.statemachine.config;
 
 import org.springframework.statemachine.listener.StateMachineListenerAdapter;
 import org.springframework.statemachine.state.State;
diff --git a/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/ForkJoinStateMachineTest.java b/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/ForkJoinStateMachineTest.java
index 416da5f0fe..7b4b1928ea 100644
--- a/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/ForkJoinStateMachineTest.java
+++ b/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/ForkJoinStateMachineTest.java
@@ -1,15 +1,14 @@
-package com.baeldung.spring.stateMachine;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
+package com.baeldung.spring.statemachine;
 
+import com.baeldung.spring.statemachine.config.ForkJoinStateMachineConfiguration;
 import org.junit.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.statemachine.StateMachine;
 
-import com.baeldung.spring.stateMachine.config.ForkJoinStateMachineConfiguration;
+import java.util.Arrays;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class ForkJoinStateMachineTest {
 
diff --git a/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/HierarchicalStateMachineTest.java b/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/HierarchicalStateMachineTest.java
index 3557a63211..d2944be173 100644
--- a/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/HierarchicalStateMachineTest.java
+++ b/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/HierarchicalStateMachineTest.java
@@ -1,14 +1,14 @@
-package com.baeldung.spring.stateMachine;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
+package com.baeldung.spring.statemachine;
 
+import com.baeldung.spring.statemachine.config.HierarchicalStateMachineConfiguration;
 import org.junit.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.statemachine.StateMachine;
 
-import com.baeldung.spring.stateMachine.config.HierarchicalStateMachineConfiguration;
+import java.util.Arrays;
+
+import static org.junit.Assert.assertEquals;
+
 
 public class HierarchicalStateMachineTest {
 
diff --git a/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/JunctionStateMachineTest.java b/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/JunctionStateMachineTest.java
index d0c1225c9b..f01683638b 100644
--- a/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/JunctionStateMachineTest.java
+++ b/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/JunctionStateMachineTest.java
@@ -1,17 +1,16 @@
-package com.baeldung.spring.stateMachine;
+package com.baeldung.spring.statemachine;
 
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.statemachine.StateMachine;
 
-import com.baeldung.spring.stateMachine.config.JunctionStateMachineConfiguration;
 
 public class JunctionStateMachineTest {
 
     @Test
     public void whenTransitioningToJunction_thenArriveAtSubJunctionNode() {
-        AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(JunctionStateMachineConfiguration.class);
+        AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(com.baeldung.spring.statemachine.config.JunctionStateMachineConfiguration.class);
         StateMachine stateMachine = ctx.getBean(StateMachine.class);
         stateMachine.start();
 
diff --git a/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateEnumMachineTest.java b/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateEnumMachineTest.java
index 1fd7bd85f0..257ed8768c 100644
--- a/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateEnumMachineTest.java
+++ b/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateEnumMachineTest.java
@@ -1,16 +1,15 @@
-package com.baeldung.spring.stateMachine;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+package com.baeldung.spring.statemachine;
 
+import com.baeldung.spring.statemachine.applicationreview.ApplicationReviewEvents;
+import com.baeldung.spring.statemachine.applicationreview.ApplicationReviewStates;
+import com.baeldung.spring.statemachine.config.SimpleEnumStateMachineConfiguration;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.statemachine.StateMachine;
 
-import com.baeldung.spring.stateMachine.applicationReview.ApplicationReviewEvents;
-import com.baeldung.spring.stateMachine.applicationReview.ApplicationReviewStates;
-import com.baeldung.spring.stateMachine.config.SimpleEnumStateMachineConfiguration;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class StateEnumMachineTest {
 
diff --git a/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineBuilderTest.java b/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineBuilderTest.java
index cdd1e951e0..a5e4d07f18 100644
--- a/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineBuilderTest.java
+++ b/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineBuilderTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.stateMachine;
+package com.baeldung.spring.statemachine;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineTest.java b/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineIntegrationTest.java
similarity index 88%
rename from spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineTest.java
rename to spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineIntegrationTest.java
index 9409f66f4f..d7b26eeb97 100644
--- a/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineTest.java
+++ b/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineIntegrationTest.java
@@ -1,16 +1,15 @@
-package com.baeldung.spring.stateMachine;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+package com.baeldung.spring.statemachine;
 
+import com.baeldung.spring.statemachine.config.SimpleStateMachineConfiguration;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.statemachine.StateMachine;
 
-import com.baeldung.spring.stateMachine.config.SimpleStateMachineConfiguration;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
-public class StateMachineTest {
+public class StateMachineIntegrationTest {
 
     private AnnotationConfigApplicationContext ctx;
     private StateMachine stateMachine;
@@ -34,7 +33,7 @@ public class StateMachineTest {
     }
 
     @Test
-    public void whenSimpleStringMachineActionState_thenActionExecuted() {
+    public void whenSimpleStringMachineActionState_thenActionExecuted() throws InterruptedException {
 
         stateMachine.sendEvent("E3");
         assertEquals("S3", stateMachine.getState().getId());
diff --git a/spring-zuul/pom.xml b/spring-zuul/pom.xml
index 50b20b8791..02fe589a3a 100644
--- a/spring-zuul/pom.xml
+++ b/spring-zuul/pom.xml
@@ -45,7 +45,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${maven-surefire-plugin.version}</version>
                     <configuration>
                         <testFailureIgnore>true</testFailureIgnore>
                         <excludes>