diff --git a/testing-modules/testing/src/test/java/com/baeldung/testing/assertj/exceptions/Java8StyleAssertions.java b/testing-modules/testing/src/test/java/com/baeldung/testing/assertj/exceptions/Java8StyleAssertions.java
index 53f192bb2f..973b921654 100644
--- a/testing-modules/testing/src/test/java/com/baeldung/testing/assertj/exceptions/Java8StyleAssertions.java
+++ b/testing-modules/testing/src/test/java/com/baeldung/testing/assertj/exceptions/Java8StyleAssertions.java
@@ -5,19 +5,43 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import org.junit.Test;
 
 public class Java8StyleAssertions {
 
     @Test
-    public void whenDividingByZero_thenArithmeticException() {
+    public void whenGettingOutOfBoundsItem_thenIndexOutOfBoundsException() {
         assertThatThrownBy(() -> {
-            int numerator = 10;
-            int denominator = 0;
-            int quotient = numerator / denominator;
-        }).isInstanceOf(ArithmeticException.class)
-            .hasMessageContaining("/ by zero");
+            ArrayList<String> myStringList = new ArrayList<String>(Arrays.asList("Strine one", "String two"));
+            myStringList.get(2);
+        }).isInstanceOf(IndexOutOfBoundsException.class)
+            .hasMessageStartingWith("Index: 2")
+            .hasMessageContaining("2")
+            .hasMessageEndingWith("Size: 2")
+            .hasMessageContaining("Index: 2, Size: 2")
+            .hasMessage("Index: %s, Size: %s", 2, 2)
+            .hasMessageMatching("Index: \\d+, Size: \\d+")
+            .hasNoCause();
+    }
 
+    @Test
+    public void whenWrappingException_thenCauseInstanceOfWrappedExceptionType() {
+        assertThatThrownBy(() -> {
+            try {
+                throw new IOException();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }).isInstanceOf(RuntimeException.class)
+            .hasCauseInstanceOf(IOException.class)
+            .hasStackTraceContaining("IOException");
+    }
+
+    @Test
+    public void whenDividingByZero_thenArithmeticException() {
         assertThatExceptionOfType(ArithmeticException.class).isThrownBy(() -> {
             int numerator = 10;
             int denominator = 0;
@@ -25,7 +49,7 @@ public class Java8StyleAssertions {
         })
             .withMessageContaining("/ by zero");
 
-        // BDD style:
+        // Alternatively:
 
         // when
         Throwable thrown = catchThrowable(() -> {