diff --git a/guava/src/test/java/org/baeldung/guava/GuavaCacheTest.java b/guava/src/test/java/org/baeldung/guava/GuavaCacheTest.java
index df006498f4..aae2cf18f5 100644
--- a/guava/src/test/java/org/baeldung/guava/GuavaCacheTest.java
+++ b/guava/src/test/java/org/baeldung/guava/GuavaCacheTest.java
@@ -2,6 +2,7 @@ package org.baeldung.guava;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -24,70 +25,66 @@ public class GuavaCacheTest {
     public void whenCacheMiss_thenAutoLoad() {
         final CacheLoader<String, String> loader = new CacheLoader<String, String>() {
             @Override
-            public String load(final String key) {
+            public final String load(final String key) {
                 return key.toUpperCase();
             }
         };
-
         final LoadingCache<String, String> cache = CacheBuilder.newBuilder().build(loader);
         assertEquals(0, cache.size());
         assertEquals("HELLO", cache.getUnchecked("hello"));
         assertEquals(1, cache.size());
-
     }
 
     @Test
     public void whenCacheReachMaxSize_thenEviction() {
         final CacheLoader<String, String> loader = new CacheLoader<String, String>() {
             @Override
-            public String load(final String key) {
+            public final String load(final String key) {
                 return key.toUpperCase();
             }
         };
-
         final LoadingCache<String, String> cache = CacheBuilder.newBuilder().maximumSize(3).build(loader);
-        assertEquals(0, cache.size());
         cache.getUnchecked("first");
         cache.getUnchecked("second");
         cache.getUnchecked("third");
         cache.getUnchecked("forth");
         assertEquals(3, cache.size());
+        assertNull(cache.getIfPresent("first"));
+        assertEquals("FORTH", cache.getIfPresent("forth"));
     }
 
     @Test
     public void whenCacheReachMaxWeight_thenEviction() {
         final CacheLoader<String, String> loader = new CacheLoader<String, String>() {
             @Override
-            public String load(final String key) {
+            public final String load(final String key) {
                 return key.toUpperCase();
             }
         };
-
         final Weigher<String, String> weighByLength = new Weigher<String, String>() {
             @Override
             public int weigh(final String key, final String value) {
                 return value.length();
             }
         };
-
         final LoadingCache<String, String> cache = CacheBuilder.newBuilder().maximumWeight(16).weigher(weighByLength).build(loader);
-        assertEquals(0, cache.size());
         cache.getUnchecked("first");
         cache.getUnchecked("second");
         cache.getUnchecked("third");
         cache.getUnchecked("last");
         assertEquals(3, cache.size());
+        assertNull(cache.getIfPresent("first"));
+        assertEquals("LAST", cache.getIfPresent("last"));
     }
 
     @Test
     public void whenEntryIdle_thenEviction() throws InterruptedException {
         final CacheLoader<String, String> loader = new CacheLoader<String, String>() {
             @Override
-            public String load(final String key) {
+            public final String load(final String key) {
                 return key.toUpperCase();
             }
         };
-
         final LoadingCache<String, String> cache = CacheBuilder.newBuilder().expireAfterAccess(2, TimeUnit.MILLISECONDS).build(loader);
         cache.getUnchecked("hello");
         assertEquals(1, cache.size());
@@ -95,83 +92,70 @@ public class GuavaCacheTest {
         Thread.sleep(300);
         cache.getUnchecked("test");
         assertEquals(1, cache.size());
+        assertNull(cache.getIfPresent("hello"));
     }
 
     @Test
     public void whenEntryLiveTimeExpire_thenEviction() throws InterruptedException {
         final CacheLoader<String, String> loader = new CacheLoader<String, String>() {
             @Override
-            public String load(final String key) {
+            public final String load(final String key) {
                 return key.toUpperCase();
             }
         };
-
         final LoadingCache<String, String> cache = CacheBuilder.newBuilder().expireAfterWrite(2, TimeUnit.MILLISECONDS).build(loader);
         cache.getUnchecked("hello");
         assertEquals(1, cache.size());
         Thread.sleep(300);
         cache.getUnchecked("test");
         assertEquals(1, cache.size());
+        assertNull(cache.getIfPresent("hello"));
     }
 
     @Test
     public void whenWeekKeyHasNoRef_thenRemoveFromCache() {
         final CacheLoader<String, String> loader = new CacheLoader<String, String>() {
             @Override
-            public String load(final String key) {
+            public final String load(final String key) {
                 return key.toUpperCase();
             }
         };
-
         final LoadingCache<String, String> cache = CacheBuilder.newBuilder().weakKeys().build(loader);
-        assertEquals(0, cache.size());
-
     }
 
     @Test
     public void whenSoftValue_thenRemoveFromCache() {
         final CacheLoader<String, String> loader = new CacheLoader<String, String>() {
             @Override
-            public String load(final String key) {
+            public final String load(final String key) {
                 return key.toUpperCase();
             }
         };
-
         final LoadingCache<String, String> cache = CacheBuilder.newBuilder().softValues().build(loader);
-        assertEquals(0, cache.size());
-
     }
 
     @Test
     public void whenNullValue_thenOptional() {
-
         final CacheLoader<String, Optional<String>> loader = new CacheLoader<String, Optional<String>>() {
             @Override
-            public Optional<String> load(final String key) {
-
+            public final Optional<String> load(final String key) {
                 return Optional.fromNullable(getSuffix(key));
             }
         };
-
         final LoadingCache<String, Optional<String>> cache = CacheBuilder.newBuilder().build(loader);
-
         assertEquals("txt", cache.getUnchecked("text.txt").get());
-
         assertFalse(cache.getUnchecked("hello").isPresent());
-
     }
 
     @Test
     public void whenLiveTimeEnd_thenRefresh() {
         final CacheLoader<String, String> loader = new CacheLoader<String, String>() {
             @Override
-            public String load(final String key) {
+            public final String load(final String key) {
                 return key.toUpperCase();
             }
         };
-
         final LoadingCache<String, String> cache = CacheBuilder.newBuilder().refreshAfterWrite(1, TimeUnit.MINUTES).build(loader);
-        assertEquals(0, cache.size());
     }
 
 
@@ -179,49 +163,40 @@ public class GuavaCacheTest {
     public void whenPreloadCache_thenUsePutAll() {
         final CacheLoader<String, String> loader = new CacheLoader<String, String>() {
             @Override
-            public String load(final String key) {
+            public final String load(final String key) {
                 return key.toUpperCase();
             }
         };
-
         final LoadingCache<String, String> cache = CacheBuilder.newBuilder().build(loader);
-        assertEquals(0, cache.size());
         final Map<String, String> map = new HashMap<String, String>();
         map.put("first", "FIRST");
         map.put("second", "SECOND");
         cache.putAll(map);
-
         assertEquals(2, cache.size());
-
     }
 
     @Test
     public void whenEntryRemovedFromCache_thenNotify() {
         final CacheLoader<String, String> loader = new CacheLoader<String, String>() {
             @Override
-            public String load(final String key) {
+            public final String load(final String key) {
                 return key.toUpperCase();
             }
         };
-
         final RemovalListener<String, String> listener = new RemovalListener<String, String>() {
-
             @Override
             public void onRemoval(final RemovalNotification<String, String> n) {
                 if (n.wasEvicted()) {
                     final String cause = n.getCause().name();
                     assertEquals(RemovalCause.SIZE.toString(), cause);
                 }
-
             }
         };
-
         final LoadingCache<String, String> cache = CacheBuilder.newBuilder().maximumSize(3).removalListener(listener).build(loader);
         cache.getUnchecked("first");
         cache.getUnchecked("second");
         cache.getUnchecked("third");
         cache.getUnchecked("last");
-
         assertEquals(3, cache.size());
     }