diff --git a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
index 0ae73f0a3..a774036e2 100644
--- a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
+++ b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
@@ -19,7 +19,10 @@
  */
 package com.omertron.themoviedbapi;
 
+import com.omertron.themoviedbapi.enumeration.ExternalSource;
 import com.omertron.themoviedbapi.enumeration.MediaType;
+import com.omertron.themoviedbapi.enumeration.SearchType;
+import com.omertron.themoviedbapi.enumeration.SortBy;
 import com.omertron.themoviedbapi.methods.TmdbAccount;
 import com.omertron.themoviedbapi.methods.TmdbAuthentication;
 import com.omertron.themoviedbapi.methods.TmdbCertifications;
@@ -39,40 +42,37 @@ import com.omertron.themoviedbapi.methods.TmdbPeople;
 import com.omertron.themoviedbapi.methods.TmdbReviews;
 import com.omertron.themoviedbapi.methods.TmdbSearch;
 import com.omertron.themoviedbapi.methods.TmdbTV;
-import com.omertron.themoviedbapi.model2.account.Account;
 import com.omertron.themoviedbapi.model.AlternativeTitle;
-import com.omertron.themoviedbapi.model2.artwork.Artwork;
 import com.omertron.themoviedbapi.model.Certification;
+import com.omertron.themoviedbapi.model.Genre;
+import com.omertron.themoviedbapi.model.MovieDb;
+import com.omertron.themoviedbapi.model.MovieList;
+import com.omertron.themoviedbapi.model.ReleaseInfo;
+import com.omertron.themoviedbapi.model.Translation;
+import com.omertron.themoviedbapi.model.Video;
 import com.omertron.themoviedbapi.model.change.ChangedMedia;
+import com.omertron.themoviedbapi.model.keyword.Keyword;
+import com.omertron.themoviedbapi.model.keyword.KeywordMovie;
+import com.omertron.themoviedbapi.model.person.Person;
+import com.omertron.themoviedbapi.model2.FindResults;
+import com.omertron.themoviedbapi.model2.StatusCode;
+import com.omertron.themoviedbapi.model2.account.Account;
+import com.omertron.themoviedbapi.model2.artwork.Artwork;
+import com.omertron.themoviedbapi.model2.authentication.TokenAuthorisation;
+import com.omertron.themoviedbapi.model2.authentication.TokenSession;
 import com.omertron.themoviedbapi.model2.collection.Collection;
 import com.omertron.themoviedbapi.model2.collection.CollectionInfo;
 import com.omertron.themoviedbapi.model2.company.Company;
 import com.omertron.themoviedbapi.model2.config.Configuration;
-import com.omertron.themoviedbapi.model2.discover.Discover;
-import com.omertron.themoviedbapi.model.Genre;
 import com.omertron.themoviedbapi.model2.config.JobDepartment;
-import com.omertron.themoviedbapi.model.keyword.Keyword;
-import com.omertron.themoviedbapi.model.keyword.KeywordMovie;
-import com.omertron.themoviedbapi.model.MovieDb;
+import com.omertron.themoviedbapi.model2.discover.Discover;
 import com.omertron.themoviedbapi.model2.list.ListItem;
-import com.omertron.themoviedbapi.model.MovieList;
-import com.omertron.themoviedbapi.model.person.Person;
-import com.omertron.themoviedbapi.model.ReleaseInfo;
-import com.omertron.themoviedbapi.model2.review.Review;
-import com.omertron.themoviedbapi.model2.StatusCode;
-import com.omertron.themoviedbapi.enumeration.ExternalSource;
-import com.omertron.themoviedbapi.enumeration.SearchType;
-import com.omertron.themoviedbapi.enumeration.SortBy;
-import com.omertron.themoviedbapi.model2.FindResults;
+import com.omertron.themoviedbapi.model2.list.UserList;
+import com.omertron.themoviedbapi.model2.movie.MovieBasic;
 import com.omertron.themoviedbapi.model2.network.Network;
 import com.omertron.themoviedbapi.model2.person.CreditInfo;
-import com.omertron.themoviedbapi.model2.authentication.TokenAuthorisation;
-import com.omertron.themoviedbapi.model2.authentication.TokenSession;
-import com.omertron.themoviedbapi.model.Translation;
-import com.omertron.themoviedbapi.model.Video;
-import com.omertron.themoviedbapi.model2.movie.MovieBasic;
+import com.omertron.themoviedbapi.model2.review.Review;
 import com.omertron.themoviedbapi.model2.tv.TVBasic;
-import com.omertron.themoviedbapi.model2.list.UserList;
 import com.omertron.themoviedbapi.results.TmdbResultsList;
 import com.omertron.themoviedbapi.results.TmdbResultsMap;
 import com.omertron.themoviedbapi.tools.HttpTools;
@@ -1155,7 +1155,7 @@ public class TheMovieDbApi {
 
     //<editor-fold defaultstate="collapsed" desc="People">
 
-    null;
+    //TODO: Methods here
 
 
     //</editor-fold>
diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbConfigurationTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbConfigurationTest.java
index 324e34800..f7e06ce9e 100644
--- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbConfigurationTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbConfigurationTest.java
@@ -70,7 +70,7 @@ public class TmdbConfigurationTest extends AbstractTests {
      *
      * @throws com.omertron.themoviedbapi.MovieDbException
      */
-//    @Test
+    @Test
     public void testGetConfig() throws MovieDbException {
         LOG.info("getConfig");
         Configuration result = instance.getConfig();
@@ -88,7 +88,7 @@ public class TmdbConfigurationTest extends AbstractTests {
      *
      * @throws MovieDbException
      */
-//    @Test
+    @Test
     public void testCreateImageUrl() throws MovieDbException {
         LOG.info("createImageUrl");
         Configuration config = instance.getConfig();
@@ -102,7 +102,7 @@ public class TmdbConfigurationTest extends AbstractTests {
      *
      * @throws com.omertron.themoviedbapi.MovieDbException
      */
-//    @Test
+    @Test
     public void testGetJobs() throws MovieDbException {
         LOG.info("getJobs");
         TmdbResultsList<JobDepartment> result = instance.getJobs();
diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbDiscoverTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbDiscoverTest.java
index e99443916..2462d02c2 100644
--- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbDiscoverTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbDiscoverTest.java
@@ -66,7 +66,7 @@ public class TmdbDiscoverTest extends AbstractTests {
      *
      * @throws com.omertron.themoviedbapi.MovieDbException
      */
-//    @Test
+    @Test
     public void testGetDiscoverMovie() throws MovieDbException {
         LOG.info("getDiscoverMovie");
         Discover discover = new Discover();