diff --git a/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/comparation/ArrayListUnitTest.java b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/comparation/ArrayListUnitTest.java
new file mode 100644
index 0000000000..935be19e74
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/comparation/ArrayListUnitTest.java
@@ -0,0 +1,29 @@
+package com.baeldung.collections.comparation;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ArrayListUnitTest {
+
+    @Test
+    void givenList_whenItemAddedToSpecificIndex_thenItCanBeRetrieved() {
+        List<String> list = new ArrayList<>();
+        list.add("Daniel");
+        list.add(1, "Marko");
+        assertThat(list).hasSize(2);
+        assertThat(list.get(1)).isEqualTo("Marko");
+    }
+
+    @Test
+    void givenList_whenItemRemovedViaIndex_thenListSizeIsReduced() {
+        List<String> list = new ArrayList<>(Arrays.asList("Daniel", "Marko"));
+        list.remove(1);
+        assertThat(list).hasSize(1);
+    }
+
+}
diff --git a/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/comparation/ListVsMapUnitTest.java b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/comparation/ListVsMapUnitTest.java
new file mode 100644
index 0000000000..6507013fbf
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/comparation/ListVsMapUnitTest.java
@@ -0,0 +1,30 @@
+package com.baeldung.collections.comparation;
+
+import static org.assertj.core.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
+import java.util.*;
+
+class ListVsMapUnitTest {
+
+    @Test
+    void givenList_whenIteratingTroughValues_thenEachValueIsPresent() {
+        List<String> list = new ArrayList<>();
+        list.add("Daniel");
+        list.add("Marko");
+        for (String name : list) {
+            assertThat(name).isIn(list);
+        }
+    }
+
+    @Test
+    void givenMap_whenIteratingTroughValues_thenEachValueIsPresent() {
+        Map<Integer, String> map = new HashMap<>();
+        map.put(1, "Daniel");
+        map.put(2, "Marko");
+        for (String name : map.values()) {
+            assertThat(name).isIn(map.values());
+        }
+    }
+
+}