diff --git a/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/LanguageServletIntegrationTest.java b/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/LanguageServletLiveTest.java
similarity index 95%
rename from web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/LanguageServletIntegrationTest.java
rename to web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/LanguageServletLiveTest.java
index 893ba06ce4..c539ce63b9 100644
--- a/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/LanguageServletIntegrationTest.java
+++ b/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/LanguageServletLiveTest.java
@@ -12,7 +12,7 @@ import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 import org.junit.Test;
 
-public class LanguageServletIntegrationTest {
+public class LanguageServletLiveTest {
 
     @Test
     public void whenGetRequestUsingHttpClient_thenResponseBodyContainsDefaultLanguage() throws Exception {
diff --git a/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/SanitizeParametersRequestIntegrationTest.java b/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/SanitizeParametersRequestLiveTest.java
similarity index 95%
rename from web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/SanitizeParametersRequestIntegrationTest.java
rename to web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/SanitizeParametersRequestLiveTest.java
index 047d5431f6..5fffea1824 100644
--- a/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/SanitizeParametersRequestIntegrationTest.java
+++ b/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/SanitizeParametersRequestLiveTest.java
@@ -14,7 +14,7 @@ import org.apache.http.util.EntityUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class SanitizeParametersRequestIntegrationTest {
+public class SanitizeParametersRequestLiveTest {
 
     private static String PARAM_INPUT;
 
diff --git a/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/SanitizeParametersRequestWrapperUnitTest.java b/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/SanitizeParametersRequestWrapperUnitTest.java
index 4f246e0953..029cf41d1c 100644
--- a/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/SanitizeParametersRequestWrapperUnitTest.java
+++ b/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/SanitizeParametersRequestWrapperUnitTest.java
@@ -1,8 +1,8 @@
 package com.baeldung.setparam;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.mockito.Mockito.when;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -18,7 +18,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 @RunWith(MockitoJUnitRunner.class)
 public class SanitizeParametersRequestWrapperUnitTest {
 
-    private String NEW_VALUE = "NEW VALUE";
+    private static final String NEW_VALUE = "NEW VALUE";
 
     private Map<String, String[]> parameterMap;
 
@@ -37,7 +37,7 @@ public class SanitizeParametersRequestWrapperUnitTest {
         SanitizeParametersRequestWrapper wrapper = new SanitizeParametersRequestWrapper(request);
         String actualValue = wrapper.getParameter("input");
 
-        assertEquals(actualValue, "&lt;script&gt;alert('Hello');&lt;/script&gt;");
+        assertEquals("&lt;script&gt;alert('Hello');&lt;/script&gt;", actualValue);
     }
 
     @Test(expected = UnsupportedOperationException.class)
@@ -54,7 +54,7 @@ public class SanitizeParametersRequestWrapperUnitTest {
 
         firstCallValues[0] = NEW_VALUE;
         String[] secondCallValues = wrapper.getParameterValues("input");
-        assertNotEquals(firstCallValues, secondCallValues);
+        assertThat(secondCallValues).doesNotContain(NEW_VALUE);
     }
 
 }
\ No newline at end of file
diff --git a/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/SetParameterRequestWrapperUnitTest.java b/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/SetParameterRequestWrapperUnitTest.java
index 32343abb93..8ef5307d44 100644
--- a/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/SetParameterRequestWrapperUnitTest.java
+++ b/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/SetParameterRequestWrapperUnitTest.java
@@ -1,7 +1,7 @@
 package com.baeldung.setparam;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.mockito.Mockito.when;
 
 import java.util.HashMap;
@@ -18,7 +18,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 @RunWith(MockitoJUnitRunner.class)
 public class SetParameterRequestWrapperUnitTest {
 
-    private String NEW_VALUE = "NEW VALUE";
+    private static final String NEW_VALUE = "NEW VALUE";
 
     private Map<String, String[]> parameterMap;
 
@@ -38,7 +38,7 @@ public class SetParameterRequestWrapperUnitTest {
         wrapper.setParameter("newInput", "newInputValue");
         String actualValue = wrapper.getParameter("newInput");
 
-        assertEquals(actualValue, "newInputValue");
+        assertEquals("newInputValue", actualValue);
     }
 
     @Test(expected = UnsupportedOperationException.class)
@@ -55,7 +55,7 @@ public class SetParameterRequestWrapperUnitTest {
 
         firstCallValues[0] = NEW_VALUE;
         String[] secondCallValues = wrapper.getParameterValues("input");
-        assertNotEquals(firstCallValues, secondCallValues);
+        assertThat(secondCallValues).doesNotContain(NEW_VALUE);
     }
 
 }
\ No newline at end of file
diff --git a/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/UnsanitizedParametersRequestIntegrationTest.java b/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/UnsanitizedParametersRequestLiveTest.java
similarity index 95%
rename from web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/UnsanitizedParametersRequestIntegrationTest.java
rename to web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/UnsanitizedParametersRequestLiveTest.java
index a00944b6a4..f6cc566bfc 100644
--- a/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/UnsanitizedParametersRequestIntegrationTest.java
+++ b/web-modules/javax-servlets-2/src/test/java/com/baeldung/setparam/UnsanitizedParametersRequestLiveTest.java
@@ -14,7 +14,7 @@ import org.apache.http.util.EntityUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class UnsanitizedParametersRequestIntegrationTest {
+public class UnsanitizedParametersRequestLiveTest {
 
     private static final String TAG_SCRIPT = "<script>alert('Hello');</script>";