diff --git a/pom.xml b/pom.xml
index eff74cfe70..24c2080f8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -664,23 +664,23 @@
 				<module>spring-boot-libraries</module>
 
 				
-                                <!-- <module>spring-cloud</module> --> <!-- BAEL-14304 -->
-				<!-- <module>spring-cloud-bus</module> --> <!-- BAEL-14304 -->
+				<module>spring-cloud</module>
+				<module>spring-cloud-bus</module>
 				<!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
-                                <!-- <module>spring-cloud-data-flow</module> --> <!-- BAEL-14304 -->
+				<module>spring-cloud-data-flow</module>
 
 				<module>spring-core</module>
 				<module>spring-core-2</module>
 				<module>spring-cucumber</module>
 
 				<module>spring-data-rest</module>
-				<!-- <module>spring-data-rest-querydsl</module> --> <!-- BAEL-14304 -->
+				<module>spring-data-rest-querydsl</module>
 				<module>spring-dispatcher-servlet</module>
 				<module>spring-drools</module>
 				<module>spring-di</module>
 
 				<module>spring-ehcache</module>
-				<!-- <module>spring-ejb</module> BAEL-14304 -->
+				<module>spring-ejb</module>
 				<module>spring-exceptions</module>
 
 				<module>spring-freemarker</module>
@@ -752,7 +752,7 @@
 				<module>spring-security-stormpath</module>
 				<module>spring-security-thymeleaf</module>
 				<module>spring-security-x509</module>
-				<!-- <module>spring-session</module> BAEL-14304 -->
+				<module>spring-session</module>
 				<module>spring-sleuth</module>
 				<module>spring-soap</module>
 				<module>spring-social-login</module>
@@ -763,10 +763,10 @@
 
 				<module>spring-thymeleaf</module>
 
-				<!-- <module>spring-vault</module> BAEL-14304 -->
+				<module>spring-vault</module>
 				<module>spring-vertx</module>
 
-				<!-- <module>spring-webflux-amqp</module> BAEL-14304 --> <!-- long --> 
+				<module>spring-webflux-amqp</module> <!-- long --> 
 
 				<module>spring-zuul</module>
 
diff --git a/spring-cloud-bus/spring-cloud-config-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud-bus/spring-cloud-config-client/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 91%
rename from spring-cloud-bus/spring-cloud-config-client/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-cloud-bus/spring-cloud-config-client/src/test/java/org/baeldung/SpringContextLiveTest.java
index a5ab1342a1..8a33efef43 100644
--- a/spring-cloud-bus/spring-cloud-config-client/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-cloud-bus/spring-cloud-config-client/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -9,7 +9,7 @@ import com.baeldung.SpringCloudConfigClientApplication;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SpringCloudConfigClientApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
 	@Test
 	public void contextLoads() {
diff --git a/spring-cloud-data-flow/pom.xml b/spring-cloud-data-flow/pom.xml
index f3382067f9..32e16c72fc 100644
--- a/spring-cloud-data-flow/pom.xml
+++ b/spring-cloud-data-flow/pom.xml
@@ -13,7 +13,7 @@
     </parent>
 
     <modules>
-        <module>spring-cloud-data-flow-stream</module>
+        <module>spring-cloud-data-flow-stream-processing</module>
         <module>spring-cloud-data-flow-etl</module>
         <module>batch-job</module>
         <module>apache-spark-job</module>
diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 92%
rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/SpringContextLiveTest.java
index 83cb8067cf..980c096f5e 100644
--- a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -8,7 +8,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = DataFlowServerApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 91%
rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/org/baeldung/SpringContextLiveTest.java
index c456f69979..5be4f9c077 100644
--- a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -8,7 +8,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = DataFlowShellApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void contextLoads() {
diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextTest.java b/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java
similarity index 90%
rename from spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextTest.java
rename to spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java
index a2d1cd1087..a3cbb3310d 100644
--- a/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextTest.java
+++ b/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java
@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/SpringContextTest.java b/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/SpringContextLiveTest.java
similarity index 91%
rename from spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/SpringContextTest.java
rename to spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/SpringContextLiveTest.java
index 73fcbe55f0..3be4d96964 100644
--- a/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/SpringContextTest.java
+++ b/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/SpringContextLiveTest.java
@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = VaultSampleApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-data-rest-querydsl/src/test/java/org/baeldung/SpringContextTest.java b/spring-data-rest-querydsl/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 91%
rename from spring-data-rest-querydsl/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-data-rest-querydsl/src/test/java/org/baeldung/SpringContextLiveTest.java
index 5e68a8e64f..5cb0a8167e 100644
--- a/spring-data-rest-querydsl/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-data-rest-querydsl/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -9,7 +9,7 @@ import com.baeldung.Application;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-ejb/spring-ejb-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-ejb/spring-ejb-client/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 92%
rename from spring-ejb/spring-ejb-client/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-ejb/spring-ejb-client/src/test/java/org/baeldung/SpringContextLiveTest.java
index 3e9af8a336..bbd3b6c2ba 100644
--- a/spring-ejb/spring-ejb-client/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-ejb/spring-ejb-client/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -9,7 +9,7 @@ import com.baeldung.springejbclient.SpringEjbClientApplication;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SpringEjbClientApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextTest.java b/spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 92%
rename from spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextLiveTest.java
index 307d31a809..b41f2b0338 100644
--- a/spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -8,7 +8,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SpringSessionMongoDBApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-session/spring-session-redis/src/test/java/org/baeldung/SpringContextTest.java b/spring-session/spring-session-redis/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 92%
rename from spring-session/spring-session-redis/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-session/spring-session-redis/src/test/java/org/baeldung/SpringContextLiveTest.java
index 994f93c24f..b23ce7dbbb 100644
--- a/spring-session/spring-session-redis/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-session/spring-session-redis/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -9,7 +9,7 @@ import com.baeldung.spring.session.SessionWebApplication;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SessionWebApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-vault/src/test/java/org/baeldung/SpringContextTest.java b/spring-vault/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 92%
rename from spring-vault/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-vault/src/test/java/org/baeldung/SpringContextLiveTest.java
index 95abe622fa..1b3db59ecb 100644
--- a/spring-vault/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-vault/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -8,7 +8,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SpringVaultApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-webflux-amqp/src/test/java/org/baeldung/SpringContextTest.java b/spring-webflux-amqp/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 92%
rename from spring-webflux-amqp/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-webflux-amqp/src/test/java/org/baeldung/SpringContextLiveTest.java
index 88d29d5ac0..effe8d2cfa 100644
--- a/spring-webflux-amqp/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-webflux-amqp/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -8,7 +8,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SpringWebfluxAmqpApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {