diff --git a/core-java-modules/core-java-collections-maps/pom.xml b/core-java-modules/core-java-collections-maps/pom.xml
index b459213e17..c0dd705c1c 100644
--- a/core-java-modules/core-java-collections-maps/pom.xml
+++ b/core-java-modules/core-java-collections-maps/pom.xml
@@ -26,17 +26,10 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <properties>
         <commons-collections4.version>4.1</commons-collections4.version>
         <assertj.version>3.6.1</assertj.version>
-        <spring.version>5.2.5.RELEASE</spring.version>
     </properties>
 </project>
diff --git a/java-collections-maps-3/pom.xml b/java-collections-maps-3/pom.xml
index a397eaa033..3888623a7f 100644
--- a/java-collections-maps-3/pom.xml
+++ b/java-collections-maps-3/pom.xml
@@ -8,13 +8,13 @@
         <version>0.0.1-SNAPSHOT</version>
         <relativePath>../parent-java</relativePath>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>java-collections-maps-3</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>java-collections-maps-3</name>
     <packaging>jar</packaging>
-         
+
     <dependencies>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/java-collections-maps-3/src/test/java/com/baeldung/map/caseinsensitivekeys/CaseInsensitiveMapUnitTest.java b/java-collections-maps-3/src/test/java/com/baeldung/map/caseinsensitivekeys/CaseInsensitiveMapUnitTest.java
index 833807c692..b12080e368 100644
--- a/java-collections-maps-3/src/test/java/com/baeldung/map/caseinsensitivekeys/CaseInsensitiveMapUnitTest.java
+++ b/java-collections-maps-3/src/test/java/com/baeldung/map/caseinsensitivekeys/CaseInsensitiveMapUnitTest.java
@@ -1,94 +1,38 @@
 package com.baeldung.map.caseinsensitivekeys;
 
 import org.apache.commons.collections4.map.CaseInsensitiveMap;
+import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.util.LinkedCaseInsensitiveMap;
-import java.util.Map;
-import java.util.TreeMap;
 import static org.junit.Assert.*;
 
+import java.util.TreeMap;
+
 public class CaseInsensitiveMapUnitTest {
     @Test
     public void givenCaseInsensitiveTreeMap_whenTwoEntriesAdded_thenSizeIsOne(){
-        Map<String, Integer> treeMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+        TreeMap<String, Integer> treeMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
         treeMap.put("abc", 1);
         treeMap.put("ABC", 2);
 
-        assertEquals(1, treeMap.size());
-    }
-
-    @Test
-    public void givenCommonsCaseInsensitiveMap_whenTwoEntriesAdded_thenSizeIsOne(){
-        Map<String, Integer> commonsHashMap = new CaseInsensitiveMap<>();
-        commonsHashMap.put("abc", 1);
-        commonsHashMap.put("ABC", 2);
-
-        assertEquals(1, commonsHashMap.size());
-    }
-
-    @Test
-    public void givenLinkedCaseInsensitiveMap_whenTwoEntriesAdded_thenSizeIsOne(){
-        Map<String, Integer> linkedHashMap = new LinkedCaseInsensitiveMap<>();
-        linkedHashMap.put("abc", 1);
-        linkedHashMap.put("ABC", 2);
-
-        assertEquals(1, linkedHashMap.size());
-    }
-
-    @Test
-    public void givenCaseInsensitiveTreeMap_whenSameEntryAdded_thenValueUpdated(){
-        Map<String, Integer> treeMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-        treeMap.put("abc", 1);
-        treeMap.put("ABC", 2);
-
-        assertEquals(2, treeMap.get("aBc").intValue());
-        assertEquals(2, treeMap.get("ABc").intValue());
+        assertEquals(treeMap.size(), 1);
     }
 
     @Test
     public void givenCommonsCaseInsensitiveMap_whenSameEntryAdded_thenValueUpdated(){
-        Map<String, Integer> commonsHashMap = new CaseInsensitiveMap<>();
+        CaseInsensitiveMap<String, Integer> commonsHashMap = new CaseInsensitiveMap<>();
         commonsHashMap.put("abc", 1);
         commonsHashMap.put("ABC", 2);
 
-        assertEquals(2, commonsHashMap.get("aBc").intValue());
-        assertEquals(2, commonsHashMap.get("ABc").intValue());
-    }
-
-    @Test
-    public void givenLinkedCaseInsensitiveMap_whenSameEntryAdded_thenValueUpdated(){
-        Map<String, Integer> linkedHashMap = new LinkedCaseInsensitiveMap<>();
-        linkedHashMap.put("abc", 1);
-        linkedHashMap.put("ABC", 2);
-
-        assertEquals(2, linkedHashMap.get("aBc").intValue());
-        assertEquals(2, linkedHashMap.get("ABc").intValue());
-    }
-
-    @Test
-    public void givenCaseInsensitiveTreeMap_whenEntryRemoved_thenSizeIsZero(){
-        Map<String, Integer> treeMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-        treeMap.put("abc", 3);
-        treeMap.remove("aBC");
-
-        assertEquals(0, treeMap.size());
-    }
-
-    @Test
-    public void givenCommonsCaseInsensitiveMap_whenEntryRemoved_thenSizeIsZero(){
-        Map<String, Integer> commonsHashMap = new CaseInsensitiveMap<>();
-        commonsHashMap.put("abc", 3);
-        commonsHashMap.remove("aBC");
-
-        assertEquals(0, commonsHashMap.size());
+        Assert.assertEquals(commonsHashMap.get("aBc"), (Integer)2);
     }
 
     @Test
     public void givenLinkedCaseInsensitiveMap_whenEntryRemoved_thenSizeIsZero(){
-        Map<String, Integer> linkedHashMap = new LinkedCaseInsensitiveMap<>();
+        LinkedCaseInsensitiveMap<Integer> linkedHashMap = new LinkedCaseInsensitiveMap<>();
         linkedHashMap.put("abc", 3);
         linkedHashMap.remove("aBC");
 
-        assertEquals(0, linkedHashMap.size());
+        Assert.assertEquals(linkedHashMap.size(), 0);
     }
 }
diff --git a/java-collections-maps/src/test/java/com/baeldung/map/CaseInsensitiveMapUnitTest.java b/java-collections-maps/src/test/java/com/baeldung/map/CaseInsensitiveMapUnitTest.java
deleted file mode 100644
index a2171aa326..0000000000
--- a/java-collections-maps/src/test/java/com/baeldung/map/CaseInsensitiveMapUnitTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.baeldung.map;
-
-import org.apache.commons.collections4.map.CaseInsensitiveMap;
-import org.junit.Test;
-import org.springframework.util.LinkedCaseInsensitiveMap;
-import static org.junit.Assert.*;
-
-import java.util.TreeMap;
-
-public class CaseInsensitiveMapUnitTest {
-    @Test
-    public void givenCaseInsensitiveTreeMap_whenTwoEntriesAdded_thenSizeIsOne(){
-        TreeMap<String, Integer> treeMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-        treeMap.put("abc", 1);
-        treeMap.put("ABC", 2);
-
-        assertEquals(treeMap.size(), 1);
-    }
-
-    @Test
-    public void givenCommonsCaseInsensitiveMap_whenSameEntryAdded_thenValueUpdated(){
-        CaseInsensitiveMap<String, Integer> commonsHashMap = new CaseInsensitiveMap<>();
-        commonsHashMap.put("abc", 1);
-        commonsHashMap.put("ABC", 2);
-
-        assertEquals(commonsHashMap.get("aBc"), (Integer)2);
-    }
-
-    @Test
-    public void givenLinkedCaseInsensitiveMap_whenEntryRemoved_thenSizeIsZero(){
-        LinkedCaseInsensitiveMap<Integer> linkedHashMap = new LinkedCaseInsensitiveMap<>();
-        linkedHashMap.put("abc", 3);
-        linkedHashMap.remove("aBC");
-
-        assertEquals(linkedHashMap.size(), 0);
-    }
-}