diff --git a/src/main/java/com/uditagarwal/algoritms/DoublyLinkedList.java b/src/main/java/com/uditagarwal/algoritms/DoublyLinkedList.java
index a797513..9d66089 100644
--- a/src/main/java/com/uditagarwal/algoritms/DoublyLinkedList.java
+++ b/src/main/java/com/uditagarwal/algoritms/DoublyLinkedList.java
@@ -1,7 +1,6 @@
 package com.uditagarwal.algoritms;
 
 import com.uditagarwal.algoritms.exceptions.InvalidElementException;
-import lombok.Getter;
 
 import java.util.NoSuchElementException;
 
@@ -48,7 +47,7 @@ public void detachNode(DoublyLinkedListNode<E> node) {
      * @param node Node to be added.
      */
     public void addNodeAtLast(DoublyLinkedListNode<E> node) {
-        DoublyLinkedListNode tailPrev = dummyTail.prev;
+        DoublyLinkedListNode<E> tailPrev = dummyTail.prev;
         tailPrev.next = node;
         node.next = dummyTail;
         dummyTail.prev = node;
@@ -74,16 +73,14 @@ public boolean isItemPresent() {
         return dummyHead.next != dummyTail;
     }
 
-    public DoublyLinkedListNode getFirstNode() throws NoSuchElementException {
-        DoublyLinkedListNode item = null;
+    public DoublyLinkedListNode<E> getFirstNode() throws NoSuchElementException {
         if (!isItemPresent()) {
             return null;
         }
         return dummyHead.next;
     }
 
-    public DoublyLinkedListNode getLastNode() throws NoSuchElementException {
-        DoublyLinkedListNode item = null;
+    public DoublyLinkedListNode<E> getLastNode() throws NoSuchElementException {
         if (!isItemPresent()) {
             return null;
         }
diff --git a/src/main/java/com/uditagarwal/algoritms/DoublyLinkedListNode.java b/src/main/java/com/uditagarwal/algoritms/DoublyLinkedListNode.java
index 662d56c..fcfa031 100644
--- a/src/main/java/com/uditagarwal/algoritms/DoublyLinkedListNode.java
+++ b/src/main/java/com/uditagarwal/algoritms/DoublyLinkedListNode.java
@@ -18,4 +18,9 @@ public DoublyLinkedListNode(E element) {
         this.next = null;
         this.prev = null;
     }
+
+    public E getElement() {
+        return this.element;
+    }
+
 }
diff --git a/src/test/java/com/uditagarwal/CacheTest.java b/src/test/java/com/uditagarwal/TestCacheTest.java
similarity index 97%
rename from src/test/java/com/uditagarwal/CacheTest.java
rename to src/test/java/com/uditagarwal/TestCacheTest.java
index 219d7b0..c0223b3 100644
--- a/src/test/java/com/uditagarwal/CacheTest.java
+++ b/src/test/java/com/uditagarwal/TestCacheTest.java
@@ -12,7 +12,7 @@
  * Copyright (c) 2019, lld-cache.
  * All rights reserved.
  */
-public class CacheTest {
+public class TestCacheTest {
 
     Cache<Integer, Integer> cache;
 
diff --git a/src/test/java/com/uditagarwal/algoritms/DoublyLinkedListTest.java b/src/test/java/com/uditagarwal/algoritms/TestDoublyLinkedListTest.java
similarity index 91%
rename from src/test/java/com/uditagarwal/algoritms/DoublyLinkedListTest.java
rename to src/test/java/com/uditagarwal/algoritms/TestDoublyLinkedListTest.java
index dd37176..771c66f 100644
--- a/src/test/java/com/uditagarwal/algoritms/DoublyLinkedListTest.java
+++ b/src/test/java/com/uditagarwal/algoritms/TestDoublyLinkedListTest.java
@@ -7,7 +7,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-class DoublyLinkedListTest {
+class TestDoublyLinkedListTest {
 
     @Test
     void testDLLAddition() {
@@ -39,9 +39,7 @@ void testDLLNodeDetachment() {
         DoublyLinkedList<Integer> dll = new DoublyLinkedList<>();
 
         DoublyLinkedListNode<Integer> node1 = dll.addElementAtLast(1);
-        DoublyLinkedListNode<Integer> node2 = dll.addElementAtLast(2);
         DoublyLinkedListNode<Integer> node3 = dll.addElementAtLast(3);
-        DoublyLinkedListNode<Integer> node4 = dll.addElementAtLast(4);
         DoublyLinkedListNode<Integer> node5 = dll.addElementAtLast(5);
 
         verifyDLL(dll, ImmutableList.of(1, 2, 3, 4, 5));
@@ -67,7 +65,7 @@ void verifyDLL(DoublyLinkedList<Integer> dll, List<Integer> expectedListElements
         for (Integer expectedListElement : expectedListElements) {
             assertNotNull(currentNode);
             assertEquals(expectedListElement, currentNode.getElement());
-            currentNode = currentNode.getNext();
+            currentNode = currentNode.next;
         }
         assertNull(currentNode.next);
     }
diff --git a/src/test/java/com/uditagarwal/cache/policies/LRUEvictionPolicyTest.java b/src/test/java/com/uditagarwal/cache/policies/TestLRUEvictionPolicyTest.java
similarity index 97%
rename from src/test/java/com/uditagarwal/cache/policies/LRUEvictionPolicyTest.java
rename to src/test/java/com/uditagarwal/cache/policies/TestLRUEvictionPolicyTest.java
index 09695e1..2331d4d 100644
--- a/src/test/java/com/uditagarwal/cache/policies/LRUEvictionPolicyTest.java
+++ b/src/test/java/com/uditagarwal/cache/policies/TestLRUEvictionPolicyTest.java
@@ -5,7 +5,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-class LRUEvictionPolicyTest {
+class TestLRUEvictionPolicyTest {
     private LRUEvictionPolicy<Integer> lruEvictionPolicy;
 
     @BeforeEach