diff --git a/flips/src/main/java/com/baeldung/flips/model/Foo.java b/flips/src/main/java/com/baeldung/flips/model/Foo.java
index d98abb79a9..be15bee15c 100644
--- a/flips/src/main/java/com/baeldung/flips/model/Foo.java
+++ b/flips/src/main/java/com/baeldung/flips/model/Foo.java
@@ -1,11 +1,12 @@
 package com.baeldung.flips.model;
 
 import lombok.Data;
+import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
 @Data
 @RequiredArgsConstructor
 public class Foo {
-  private final String name;
-  private final int id;
+    @NonNull private final String name;
+    @NonNull private final int id;
 }
diff --git a/flips/src/test/java/com/baeldung/flips/controller/FlipControllerTest.java b/flips/src/test/java/com/baeldung/flips/controller/FlipControllerTest.java
index 1b8c78e2a4..8fd9c4e340 100644
--- a/flips/src/test/java/com/baeldung/flips/controller/FlipControllerTest.java
+++ b/flips/src/test/java/com/baeldung/flips/controller/FlipControllerTest.java
@@ -20,7 +20,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
     "first.active.after=2999-03-15T00:00:00Z",
     "logging.level.org.flips=info"
 
-})
+}, webEnvironment = SpringBootTest.WebEnvironment.MOCK)
 @AutoConfigureMockMvc
 @ActiveProfiles("dev")
 public class FlipControllerTest {
diff --git a/spring-4/src/main/java/com/baeldung/flips/model/Foo.java b/spring-4/src/main/java/com/baeldung/flips/model/Foo.java
index d98abb79a9..be15bee15c 100644
--- a/spring-4/src/main/java/com/baeldung/flips/model/Foo.java
+++ b/spring-4/src/main/java/com/baeldung/flips/model/Foo.java
@@ -1,11 +1,12 @@
 package com.baeldung.flips.model;
 
 import lombok.Data;
+import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
 @Data
 @RequiredArgsConstructor
 public class Foo {
-  private final String name;
-  private final int id;
+    @NonNull private final String name;
+    @NonNull private final int id;
 }
diff --git a/spring-4/src/test/java/com/baeldung/flips/controller/FlipControllerTest.java b/spring-4/src/test/java/com/baeldung/flips/controller/FlipControllerTest.java
index 1b8c78e2a4..8fd9c4e340 100644
--- a/spring-4/src/test/java/com/baeldung/flips/controller/FlipControllerTest.java
+++ b/spring-4/src/test/java/com/baeldung/flips/controller/FlipControllerTest.java
@@ -20,7 +20,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
     "first.active.after=2999-03-15T00:00:00Z",
     "logging.level.org.flips=info"
 
-})
+}, webEnvironment = SpringBootTest.WebEnvironment.MOCK)
 @AutoConfigureMockMvc
 @ActiveProfiles("dev")
 public class FlipControllerTest {
diff --git a/spring-boot/src/test/java/com/baeldung/intro/AppLiveTest.java b/spring-boot/src/test/java/com/baeldung/intro/AppLiveTest.java
index 2c0152b97f..83b893ae5c 100644
--- a/spring-boot/src/test/java/com/baeldung/intro/AppLiveTest.java
+++ b/spring-boot/src/test/java/com/baeldung/intro/AppLiveTest.java
@@ -16,7 +16,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK)
 @AutoConfigureMockMvc
 @TestPropertySource(properties = { "security.basic.enabled=false" })
 public class AppLiveTest {
diff --git a/spring-mvc-forms-thymeleaf/pom.xml b/spring-mvc-forms-thymeleaf/pom.xml
index b6e931edda..408e7643d2 100644
--- a/spring-mvc-forms-thymeleaf/pom.xml
+++ b/spring-mvc-forms-thymeleaf/pom.xml
@@ -68,6 +68,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <thymeleaf.version>3.0.9.RELEASE</thymeleaf.version>
     </properties>
 
 </project>
diff --git a/spring-mvc-forms-thymeleaf/src/test/java/com/baeldung/sessionattrs/TodoControllerWithScopedProxyIntegrationTest.java b/spring-mvc-forms-thymeleaf/src/test/java/com/baeldung/sessionattrs/TodoControllerWithScopedProxyIntegrationTest.java
index a8a6ce469d..037d4f9d71 100644
--- a/spring-mvc-forms-thymeleaf/src/test/java/com/baeldung/sessionattrs/TodoControllerWithScopedProxyIntegrationTest.java
+++ b/spring-mvc-forms-thymeleaf/src/test/java/com/baeldung/sessionattrs/TodoControllerWithScopedProxyIntegrationTest.java
@@ -1,6 +1,7 @@
 package com.baeldung.sessionattrs;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -22,7 +23,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.context.WebApplicationContext;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK)
 @AutoConfigureMockMvc
 @Import(TestConfig.class)
 public class TodoControllerWithScopedProxyIntegrationTest {
@@ -47,7 +48,7 @@ public class TodoControllerWithScopedProxyIntegrationTest {
             .andReturn();
 
         TodoItem item = (TodoItem) result.getModelAndView().getModel().get("todo");
-        assertTrue(StringUtils.isEmpty(item.getDescription()));
+        assertFalse(StringUtils.isEmpty(item.getDescription()));
     }
 
     @Test
diff --git a/spring-mvc-forms-thymeleaf/src/test/java/com/baeldung/sessionattrs/TodoControllerWithSessionAttributesIntegrationTest.java b/spring-mvc-forms-thymeleaf/src/test/java/com/baeldung/sessionattrs/TodoControllerWithSessionAttributesIntegrationTest.java
index b1caac5756..101f4f71d9 100644
--- a/spring-mvc-forms-thymeleaf/src/test/java/com/baeldung/sessionattrs/TodoControllerWithSessionAttributesIntegrationTest.java
+++ b/spring-mvc-forms-thymeleaf/src/test/java/com/baeldung/sessionattrs/TodoControllerWithSessionAttributesIntegrationTest.java
@@ -22,7 +22,7 @@ import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.FlashMap;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK)
 @AutoConfigureMockMvc
 public class TodoControllerWithSessionAttributesIntegrationTest {