diff --git a/pom.xml b/pom.xml
index 1c2a13b..db99c28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -313,7 +313,13 @@
             <artifactId>json-path</artifactId>
             <version>0.9.1</version>
             <scope>test</scope>          
-        </dependency>                              
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <scope>test</scope>          
+        </dependency>        
+                      
     </dependencies>
 
     <build>
diff --git a/src/test/java/com/arnellconsulting/tps/rest/controllers/TimeEntryControllerTest.java b/src/test/java/com/arnellconsulting/tps/rest/controllers/TimeEntryControllerTest.java
index 99fa4cd..733762e 100644
--- a/src/test/java/com/arnellconsulting/tps/rest/controllers/TimeEntryControllerTest.java
+++ b/src/test/java/com/arnellconsulting/tps/rest/controllers/TimeEntryControllerTest.java
@@ -26,9 +26,7 @@
 import com.arnellconsulting.tps.service.TpsService;
 import java.util.ArrayList;
 import java.util.List;
-import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.startsWith;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDateTime;
 import static org.junit.Assert.assertThat;
@@ -40,9 +38,6 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,9 +52,6 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
@@ -159,8 +151,8 @@ public void testList() throws Exception {
 
     @Test
     public void testListWithDefinedRange() throws Exception {
-        final DateTime fromDate = new DateTime(0);
-        final DateTime toDate = new DateTime(1);
+        final LocalDateTime fromDate = new LocalDateTime(0);
+        final LocalDateTime toDate = new LocalDateTime(1);
         when(
                 tpsServiceMock.getTimeEntriesForPerson(
                         Mockito.anyLong(),