diff --git a/guava/pom.xml b/guava/pom.xml
index a7b4e79e34..0a50fad2c3 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -92,7 +92,7 @@
 
     <properties>
         <!-- util -->
-        <guava.version>19.0</guava.version>
+        <guava.version>21.0</guava.version>
         <commons-lang3.version>3.5</commons-lang3.version>
         <commons-collections4.version>4.1</commons-collections4.version>
 
diff --git a/guava19/src/test/java/com/baeldung/guava/MultimapTest.java b/guava/src/test/java/org/baeldung/guava/GuavaMultiMapTest.java
similarity index 95%
rename from guava19/src/test/java/com/baeldung/guava/MultimapTest.java
rename to guava/src/test/java/org/baeldung/guava/GuavaMultiMapTest.java
index c984ab1e4b..5e80dd2f87 100644
--- a/guava19/src/test/java/com/baeldung/guava/MultimapTest.java
+++ b/guava/src/test/java/org/baeldung/guava/GuavaMultiMapTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava;
+package org.baeldung.guava;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
@@ -11,7 +11,8 @@ import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 
-public class MultimapTest {
+
+public class GuavaMultiMapTest {
 
     @Test
     public void givenMap_whenAddTwoValuesForSameKey_shouldOverridePreviousKey() {
@@ -59,4 +60,4 @@ public class MultimapTest {
         //then
         assertEquals(1, map.size());
     }
-}
+}
\ No newline at end of file
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaStringTest.java b/guava/src/test/java/org/baeldung/guava/GuavaStringTest.java
index be230a9b0e..cedbe60d91 100644
--- a/guava/src/test/java/org/baeldung/guava/GuavaStringTest.java
+++ b/guava/src/test/java/org/baeldung/guava/GuavaStringTest.java
@@ -8,10 +8,9 @@ import static org.junit.Assert.assertTrue;
 
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
+import com.google.common.collect.*;
 import org.junit.Test;
 
 import com.google.common.base.CharMatcher;
@@ -19,9 +18,6 @@ import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.base.Predicate;
 import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 
 public class GuavaStringTest {