diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java
index 74dde658e..184475398 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java
+++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java
@@ -24,6 +24,7 @@ import com.omertron.themoviedbapi.model.Artwork;
 import com.omertron.themoviedbapi.model.ArtworkType;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import org.slf4j.LoggerFactory;
 
@@ -37,11 +38,11 @@ public class WrapperImages extends WrapperBase {
      */
 
     @JsonProperty("backdrops")
-    private List<Artwork> backdrops;
+    private List<Artwork> backdrops = Collections.EMPTY_LIST;
     @JsonProperty("posters")
-    private List<Artwork> posters;
+    private List<Artwork> posters = Collections.EMPTY_LIST;
     @JsonProperty("profiles")
-    private List<Artwork> profiles;
+    private List<Artwork> profiles = Collections.EMPTY_LIST;
 
     public WrapperImages() {
         super(LoggerFactory.getLogger(WrapperImages.class));
diff --git a/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java b/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java
index 8149cee42..7a46df29b 100644
--- a/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java
@@ -25,6 +25,7 @@ import com.omertron.themoviedbapi.model.Collection;
 import com.omertron.themoviedbapi.model.CollectionInfo;
 import com.omertron.themoviedbapi.model.Company;
 import com.omertron.themoviedbapi.model.Genre;
+import com.omertron.themoviedbapi.model.JobDepartment;
 import com.omertron.themoviedbapi.model.Keyword;
 import com.omertron.themoviedbapi.model.KeywordMovie;
 import com.omertron.themoviedbapi.model.MovieChanges;
@@ -34,6 +35,7 @@ import com.omertron.themoviedbapi.model.MovieList;
 import com.omertron.themoviedbapi.model.Person;
 import com.omertron.themoviedbapi.model.PersonCredit;
 import com.omertron.themoviedbapi.model.ReleaseInfo;
+import com.omertron.themoviedbapi.model.Reviews;
 import com.omertron.themoviedbapi.model.TmdbConfiguration;
 import com.omertron.themoviedbapi.model.TokenAuthorisation;
 import com.omertron.themoviedbapi.model.TokenSession;
@@ -586,7 +588,7 @@ public class TheMovieDbApiTest {
         LOG.info("searchList");
         String query = "watch";
         int page = 0;
-        List result = tmdb.searchList(query, LANGUAGE_DEFAULT, page);
+        List<MovieList> result = tmdb.searchList(query, LANGUAGE_DEFAULT, page);
         assertFalse("No lists found", result == null);
         assertTrue("No lists found", result.size() > 0);
     }
@@ -672,7 +674,7 @@ public class TheMovieDbApiTest {
     public void testGetReviews() throws Exception {
         LOG.info("getReviews");
         int page = 0;
-        List result = tmdb.getReviews(ID_MOVIE_THE_AVENGERS, LANGUAGE_DEFAULT, page);
+        List<Reviews> result = tmdb.getReviews(ID_MOVIE_THE_AVENGERS, LANGUAGE_DEFAULT, page);
 
         assertFalse("No reviews found", result.isEmpty());
     }
@@ -705,7 +707,7 @@ public class TheMovieDbApiTest {
     public void testGetPersonPopular_int() throws Exception {
         LOG.info("getPersonPopular");
         int page = 0;
-        List result = tmdb.getPersonPopular(page);
+        List<Person> result = tmdb.getPersonPopular(page);
         assertFalse("No popular people", result.isEmpty());
     }
 
@@ -757,7 +759,7 @@ public class TheMovieDbApiTest {
     @Test
     public void testGetJobs() throws Exception {
         LOG.info("getJobs");
-        List result = tmdb.getJobs();
+        List<JobDepartment> result = tmdb.getJobs();
         assertFalse("No jobs found", result.isEmpty());
     }
 }