diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit4AssertionsUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit4AssertionsUnitTest.java
index 7e74c2dace..236a43036b 100644
--- a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit4AssertionsUnitTest.java
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit4AssertionsUnitTest.java
@@ -1,5 +1,6 @@
 package com.baeldung.junit5vsjunit4assertions;
 
+import org.hamcrest.MatcherAssert;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -30,7 +31,7 @@ public class Junit4AssertionsUnitTest {
 
     @Test
     public void whenAssertingArraysEquality_thenEqual() {
-        char[] expected = { 'J', 'u', 'n', 'i', 't' };
+        char[] expected = {'J', 'u', 'n', 'i', 't'};
         char[] actual = "Junit".toCharArray();
 
         assertArrayEquals(expected, actual);
@@ -95,7 +96,7 @@ public class Junit4AssertionsUnitTest {
 
     @Test
     public void testAssertThatHasItems() {
-        assertThat(Arrays.asList("Java", "Kotlin", "Scala"), hasItems("Java", "Kotlin"));
+        MatcherAssert.assertThat(Arrays.asList("Java", "Kotlin", "Scala"), hasItems("Java", "Kotlin"));
     }
 
 }
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java
index 40b9143a71..1ba0b7ba8a 100644
--- a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vsjunit4assertions/Junit5AssertionsUnitTest.java
@@ -1,42 +1,29 @@
 package com.baeldung.junit5vsjunit4assertions;
 
-import static java.time.Duration.ofSeconds;
-import static java.util.Arrays.asList;
-import static org.junit.jupiter.api.Assertions.assertAll;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertIterableEquals;
-import static org.junit.jupiter.api.Assertions.assertLinesMatch;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTimeout;
-import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.BooleanSupplier;
+import java.util.function.Supplier;
 
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
+import static java.time.Duration.ofSeconds;
+import static java.util.Arrays.asList;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Unit test that demonstrate the different assertions available within JUnit 4
  */
 @DisplayName("Test case for assertions")
-public class Junit5AssertionsUnitTest {
+class Junit5AssertionsUnitTest {
 
     @Test
     @DisplayName("Arrays should be equals")
-    public void whenAssertingArraysEquality_thenEqual() {
+    void whenAssertingArraysEquality_thenEqual() {
         char[] expected = {'J', 'u', 'p', 'i', 't', 'e', 'r'};
         char[] actual = "Jupiter".toCharArray();
 
@@ -45,7 +32,7 @@ public class Junit5AssertionsUnitTest {
 
     @Test
     @DisplayName("The area of two polygons should be equal")
-    public void whenAssertingEquality_thenEqual() {
+    void whenAssertingEquality_thenEqual() {
         float square = 2 * 2;
         float rectangle = 2 * 2;
 
@@ -53,7 +40,7 @@ public class Junit5AssertionsUnitTest {
     }
 
     @Test
-    public void whenAssertingEqualityWithDelta_thenEqual() {
+    void whenAssertingEqualityWithDelta_thenEqual() {
         float square = 2 * 2;
         float rectangle = 3 * 2;
         float delta = 2;
@@ -62,27 +49,28 @@ public class Junit5AssertionsUnitTest {
     }
 
     @Test
-    public void whenAssertingConditions_thenVerified() {
+    void whenAssertingConditions_thenVerified() {
         assertTrue(5 > 4, "5 is greater the 4");
         assertTrue(null == null, "null is equal to null");
     }
 
     @Test
-    public void whenAssertingNull_thenTrue() {
+    void whenAssertingNull_thenTrue() {
         Object cat = null;
 
-        assertNull(cat, () -> "The cat should be null");
+        Supplier<String> messageSupplier = () -> "The cat should be null";
+        assertNull(cat, messageSupplier);
     }
 
     @Test
-    public void whenAssertingNotNull_thenTrue() {
+    void whenAssertingNotNull_thenTrue() {
         Object dog = new Object();
 
         assertNotNull(dog, () -> "The dog should not be null");
     }
 
     @Test
-    public void whenAssertingSameObject_thenSuccessfull() {
+    void whenAssertingSameObject_thenSuccessful() {
         String language = "Java";
         Optional<String> optional = Optional.of(language);
 
@@ -90,32 +78,31 @@ public class Junit5AssertionsUnitTest {
     }
 
     @Test
-    public void givenBooleanSupplier_whenAssertingCondition_thenVerified() {
+    void givenBooleanSupplier_whenAssertingCondition_thenVerified() {
         BooleanSupplier condition = () -> 5 > 6;
 
         assertFalse(condition, "5 is not greater then 6");
     }
 
     @Test
-    @Disabled
-    public void whenFailingATest_thenFailed() {
-        // Test not completed
+    @Disabled("Test not completed")
+    void whenFailingATest_thenFailed() {
         fail("FAIL - test not completed");
     }
 
     @Test
-    public void givenMultipleAssertion_whenAssertingAll_thenOK() {
+    void givenMultipleAssertion_whenAssertingAll_thenOK() {
         Object obj = null;
         assertAll(
-           "heading",
-           () -> assertEquals(4, 2 * 2, "4 is 2 times 2"),
-           () -> assertEquals("java", "JAVA".toLowerCase()),
-           () -> assertEquals(obj, null, "null is equal to null")
+                "heading",
+                () -> assertEquals(4, 2 * 2, "4 is 2 times 2"),
+                () -> assertEquals("java", "JAVA".toLowerCase()),
+                () -> assertNull(obj, "obj is null")
         );
     }
 
     @Test
-    public void givenTwoLists_whenAssertingIterables_thenEquals() {
+    void givenTwoLists_whenAssertingIterables_thenEquals() {
         Iterable<String> al = new ArrayList<>(asList("Java", "Junit", "Test"));
         Iterable<String> ll = new LinkedList<>(asList("Java", "Junit", "Test"));
 
@@ -123,36 +110,36 @@ public class Junit5AssertionsUnitTest {
     }
 
     @Test
-    public void whenAssertingTimeout_thenNotExceeded() {
+    void whenAssertingTimeout_thenNotExceeded() {
         assertTimeout(
-          ofSeconds(2),
-          () -> {
-            // code that requires less then 2 minutes to execute
-            Thread.sleep(1000);
-          }
+                ofSeconds(2),
+                () -> {
+                    // code that requires less than 2 minutes to execute
+                    Thread.sleep(1000);
+                }
         );
     }
 
     @Test
-    public void whenAssertingTimeoutPreemptively_thenNotExceeded() {
+    void whenAssertingTimeoutPreemptively_thenNotExceeded() {
         assertTimeoutPreemptively(
-          ofSeconds(2),
-          () -> {
-            // code that requires less then 2 minutes to execute
-            Thread.sleep(1000);
-          }
+                ofSeconds(2),
+                () -> {
+                    // code that requires less than 2 minutes to execute
+                    Thread.sleep(1000);
+                }
         );
     }
 
     @Test
-    public void whenAssertingEquality_thenNotEqual() {
+    void whenAssertingEquality_thenNotEqual() {
         Integer value = 5; // result of an algorithm
 
         assertNotEquals(0, value, "The result cannot be 0");
     }
 
     @Test
-    public void whenAssertingEqualityListOfStrings_thenEqual() {
+    void whenAssertingEqualityListOfStrings_thenEqual() {
         List<String> expected = asList("Java", "\\d+", "JUnit");
         List<String> actual = asList("Java", "11", "JUnit");
 
@@ -162,16 +149,16 @@ public class Junit5AssertionsUnitTest {
     @Test
     void whenAssertingException_thenThrown() {
         Throwable exception = assertThrows(
-          IllegalArgumentException.class,
-          () -> {
-            throw new IllegalArgumentException("Exception message");
-          }
+                IllegalArgumentException.class,
+                () -> {
+                    throw new IllegalArgumentException("Exception message");
+                }
         );
         assertEquals("Exception message", exception.getMessage());
     }
 
     @Test
-    public void testConvertToDoubleThrowException() {
+    void testConvertToDoubleThrowException() {
         String age = "eighteen";
         assertThrows(NumberFormatException.class, () -> {
             convertToInt(age);