diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java
index 440c3e40ab..b22707f10a 100644
--- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java
+++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java
@@ -1,35 +1,34 @@
 package com.baeldung;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.function.Executable;
 
 import java.util.ConcurrentModificationException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.function.Executable;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class ExceptionUnitTest {
+class ExceptionUnitTest {
 
     @Test
     void shouldThrowException() {
         Throwable exception = assertThrows(UnsupportedOperationException.class, () -> {
             throw new UnsupportedOperationException("Not supported");
         });
-        assertEquals(exception.getMessage(), "Not supported");
+
+        assertEquals("Not supported", exception.getMessage());
     }
 
     @Test
     void assertThrowsException() {
         String str = null;
-        assertThrows(IllegalArgumentException.class, () -> {
-            Integer.valueOf(str);
-        });
+        assertThrows(IllegalArgumentException.class, () -> Integer.valueOf(str));
     }
 
     @Test
-    public void whenModifyMapDuringIteration_thenThrowExecption() {
+    void whenModifyMapDuringIteration_thenThrowException() {
         Map<Integer, String> hashmap = new HashMap<>();
         hashmap.put(1, "One");
         hashmap.put(2, "Two");
diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/FirstUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/FirstUnitTest.java
index c47a70e52f..a5304d3402 100644
--- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/FirstUnitTest.java
+++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/FirstUnitTest.java
@@ -1,12 +1,12 @@
 package com.baeldung;
 
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 class FirstUnitTest {
 
@@ -14,20 +14,24 @@ class FirstUnitTest {
     void lambdaExpressions() {
         List<Integer> numbers = Arrays.asList(1, 2, 3);
         assertTrue(numbers.stream()
-            .mapToInt(i -> i)
-            .sum() > 5, "Sum should be greater than 5");
+                .mapToInt(Integer::intValue)
+                .sum() > 5, "Sum should be greater than 5");
     }
 
     @Disabled("test to show MultipleFailuresError")
     @Test
     void groupAssertions() {
-        int[] numbers = { 0, 1, 2, 3, 4 };
-        assertAll("numbers", () -> assertEquals(numbers[0], 1), () -> assertEquals(numbers[3], 3), () -> assertEquals(numbers[4], 1));
+        int[] numbers = {0, 1, 2, 3, 4};
+        assertAll("numbers",
+                () -> assertEquals(numbers[0], 1),
+                () -> assertEquals(numbers[3], 3),
+                () -> assertEquals(numbers[4], 1)
+        );
     }
 
     @Test
-    @Disabled
+    @Disabled("Disabled test example")
     void disabledTest() {
-        assertTrue(false);
+        fail();
     }
 }
diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java
index 252bbdb2ce..bc64bc0804 100644
--- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java
+++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java
@@ -1,16 +1,10 @@
 package com.baeldung;
 
+import org.junit.jupiter.api.*;
+
 import java.util.logging.Logger;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-
-public class JUnit5NewFeaturesUnitTest {
+class JUnit5NewFeaturesUnitTest {
 
     private static final Logger log = Logger.getLogger(JUnit5NewFeaturesUnitTest.class.getName());
 
@@ -28,7 +22,6 @@ public class JUnit5NewFeaturesUnitTest {
     @Test
     void testSingleSuccessTest() {
         log.info("Success");
-
     }
 
     @Test
diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/LiveTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/LiveTest.java
index c23eeb5afa..524ea58328 100644
--- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/LiveTest.java
+++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/LiveTest.java
@@ -1,28 +1,28 @@
 package com.baeldung;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.TestFactory;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;
 
-import org.junit.jupiter.api.DynamicTest;
-import org.junit.jupiter.api.TestFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class LiveTest {
+class LiveTest {
 
     private List<String> in = new ArrayList<>(Arrays.asList("Hello", "Yes", "No"));
     private List<String> out = new ArrayList<>(Arrays.asList("Cześć", "Tak", "Nie"));
 
     @TestFactory
-    public Stream<DynamicTest> translateDynamicTestsFromStream() {
+    Stream<DynamicTest> translateDynamicTestsFromStream() {
 
         return in.stream()
-            .map(word -> DynamicTest.dynamicTest("Test translate " + word, () -> {
-                int id = in.indexOf(word);
-                assertEquals(out.get(id), translate(word));
-            }));
+                .map(word -> DynamicTest.dynamicTest("Test translate " + word, () -> {
+                    int id = in.indexOf(word);
+                    assertEquals(out.get(id), translate(word));
+                }));
     }
 
     private String translate(String word) {
diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java
index 80201a3f44..c1eba0d557 100644
--- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java
+++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java
@@ -1,28 +1,26 @@
 package com.baeldung.migration.junit5;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import static org.junit.jupiter.api.Assumptions.assumingThat;
-
 import org.junit.jupiter.api.Test;
 
-public class AssumptionUnitTest {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assumptions.*;
+
+class AssumptionUnitTest {
 
     @Test
-    public void trueAssumption() {
+    void trueAssumption() {
         assumeTrue(5 > 1, () -> "5 is greater the 1");
         assertEquals(5 + 2, 7);
     }
 
     @Test
-    public void falseAssumption() {
+    void falseAssumption() {
         assumeFalse(5 < 1, () -> "5 is less then 1");
         assertEquals(5 + 2, 7);
     }
 
     @Test
-    public void assumptionThat() {
+    void assumptionThat() {
         String someString = "Just a string";
         assumingThat(someString.equals("Just a string"), () -> assertEquals(2 + 2, 4));
     }