diff --git a/pom.xml b/pom.xml
index 3bd5ba1180..0d92269dfd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1315,6 +1315,7 @@
                  <module>persistence-modules/sirix</module>
                  <module>quarkus-vs-springboot</module>
                  <module>spring-boot-modules/spring-boot-cassandre</module>
+                 <module>testing-modules/testing-assertions</module>
             </modules>
         </profile>
 
@@ -1367,6 +1368,7 @@
                 <module>persistence-modules/sirix</module>
                 <module>quarkus-vs-springboot</module>
                 <module>spring-boot-modules/spring-boot-cassandre</module>
+                <module>testing-modules/testing-assertions</module>
             </modules>
         </profile>
     </profiles>
diff --git a/testing-modules/pom.xml b/testing-modules/pom.xml
index 28c743b2b3..58ea74484e 100644
--- a/testing-modules/pom.xml
+++ b/testing-modules/pom.xml
@@ -42,7 +42,6 @@
         <module>spring-testing-2</module>
         <module>spring-testing</module>
         <module>test-containers</module>
-        <module>testing-assertions</module>
         <module>testing-libraries-2</module>
         <module>testing-libraries</module>
         <module>testng</module>
diff --git a/testing-modules/testing-assertions/src/main/java/com/baeldung/object/type/Deciduous.java b/testing-modules/testing-assertions/src/main/java/com/baeldung/object/type/Deciduous.java
new file mode 100644
index 0000000000..ae96446a63
--- /dev/null
+++ b/testing-modules/testing-assertions/src/main/java/com/baeldung/object/type/Deciduous.java
@@ -0,0 +1,15 @@
+package com.baeldung.object.type;
+
+public class Deciduous implements Tree {
+
+    private String name;
+
+    public Deciduous(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public boolean isEvergreen() {
+        return false;
+    }
+}
diff --git a/testing-modules/testing-assertions/src/main/java/com/baeldung/object/type/Evergreen.java b/testing-modules/testing-assertions/src/main/java/com/baeldung/object/type/Evergreen.java
new file mode 100644
index 0000000000..56cda60d22
--- /dev/null
+++ b/testing-modules/testing-assertions/src/main/java/com/baeldung/object/type/Evergreen.java
@@ -0,0 +1,16 @@
+package com.baeldung.object.type;
+
+public class Evergreen implements Tree {
+
+    private String name;
+
+    public Evergreen(String name) {
+        this.name = name;
+    }
+
+
+    @Override
+    public boolean isEvergreen() {
+        return true;
+    }
+}
diff --git a/testing-modules/testing-assertions/src/main/java/com/baeldung/object/type/Tree.java b/testing-modules/testing-assertions/src/main/java/com/baeldung/object/type/Tree.java
new file mode 100644
index 0000000000..0230c61e38
--- /dev/null
+++ b/testing-modules/testing-assertions/src/main/java/com/baeldung/object/type/Tree.java
@@ -0,0 +1,6 @@
+package com.baeldung.object.type;
+
+public interface Tree {
+
+    public boolean isEvergreen();
+}
diff --git a/testing-modules/testing-assertions/src/main/java/com/baeldung/object/type/TreeSorter.java b/testing-modules/testing-assertions/src/main/java/com/baeldung/object/type/TreeSorter.java
new file mode 100644
index 0000000000..af4a6e5ef8
--- /dev/null
+++ b/testing-modules/testing-assertions/src/main/java/com/baeldung/object/type/TreeSorter.java
@@ -0,0 +1,19 @@
+package com.baeldung.object.type;
+
+import java.util.List;
+
+public class TreeSorter {
+    protected Tree sortTree(String name) {
+
+        final List<String> deciduous = List.of("Beech", "Birch", "Ash", "Whitebeam", "Hornbeam", "Hazel & Willow");
+        final List<String> evergreen = List.of("Cedar", "Holly", "Laurel", "Olive", "Pine");
+
+        if (deciduous.contains(name)) {
+            return new Deciduous(name);
+        } else if (evergreen.contains(name)) {
+            return new Evergreen(name);
+        } else {
+            throw new RuntimeException("Tree could not be classified");
+        }
+    }
+}
diff --git a/testing-modules/testing-assertions/src/test/java/com/baeldung/object/type/TreeSorterAssertJUnitTest.java b/testing-modules/testing-assertions/src/test/java/com/baeldung/object/type/TreeSorterAssertJUnitTest.java
new file mode 100644
index 0000000000..74b0eec4d9
--- /dev/null
+++ b/testing-modules/testing-assertions/src/test/java/com/baeldung/object/type/TreeSorterAssertJUnitTest.java
@@ -0,0 +1,22 @@
+package com.baeldung.object.type;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class TreeSorterAssertJUnitTest {
+    private final TreeSorter tested = new TreeSorter();
+
+    @Test
+    public void sortTreeShouldReturnEvergreen_WhenPineIsPassed() {
+        Tree tree = tested.sortTree("Pine");
+        assertThat(tree).isExactlyInstanceOf(Evergreen.class);
+    }
+
+    @Test
+    public void sortTreeShouldReturnDecidious_WhenBirchIsPassed() {
+        Tree tree = tested.sortTree("Birch");
+        assertThat(tree).hasSameClassAs(new Deciduous("Birch"));
+    }
+
+}
\ No newline at end of file
diff --git a/testing-modules/testing-assertions/src/test/java/com/baeldung/object/type/TreeSorterHamcrestUnitTest.java b/testing-modules/testing-assertions/src/test/java/com/baeldung/object/type/TreeSorterHamcrestUnitTest.java
new file mode 100644
index 0000000000..7d35d5c0d0
--- /dev/null
+++ b/testing-modules/testing-assertions/src/test/java/com/baeldung/object/type/TreeSorterHamcrestUnitTest.java
@@ -0,0 +1,28 @@
+package com.baeldung.object.type;
+
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class TreeSorterHamcrestUnitTest {
+    private final TreeSorter tested = new TreeSorter();
+
+    @Test
+    public void sortTreeShouldReturnEvergreen_WhenPineIsPassed() {
+        Tree tree = tested.sortTree("Pine");
+        //with JUnit assertEquals:
+        assertEquals(tree.getClass(), Evergreen.class);
+        //with Hamcrest instanceOf:
+        assertThat(tree, instanceOf(Evergreen.class));
+
+    }
+
+    @Test
+    public void sortTreeShouldReturnDecidious_WhenBirchIsPassed() {
+        Tree tree = tested.sortTree("Birch");
+        assertThat(tree, instanceOf(Deciduous.class));
+    }
+
+}
\ No newline at end of file