diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..ba4a7e3
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,4 @@
+[*.cs]
+
+# CS4014: Because this call is not awaited, execution of the current method continues before the call is completed
+dotnet_diagnostic.CS4014.severity = error
diff --git a/.gitignore b/.gitignore
index ceb05f0..c78ec96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,13 @@
 bin/
 obj/
 *.user
-Build/
\ No newline at end of file
+Build/
+*.DotSettings
+
+# Project specific
+TestApplication/config.json
+*.lock.json
+
+# Verify
+# https://github.com/VerifyTests/Verify#received-and-verified
+*.received.*
\ No newline at end of file
diff --git a/TMDbLib.sln b/TMDbLib.sln
index 498cd57..a33e9e6 100644
--- a/TMDbLib.sln
+++ b/TMDbLib.sln
@@ -11,6 +11,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{26BF5A0A-354A-46F5-A20C-0BEB5D45783A}"
 	ProjectSection(SolutionItems) = preProject
 		Directory.Build.props = Directory.Build.props
+		.editorconfig = .editorconfig
 		Readme.md = Readme.md
 	EndProjectSection
 EndProject
diff --git a/TMDbLib/Client/TMDbClient.cs b/TMDbLib/Client/TMDbClient.cs
index 7b3cf4e..ee3a9ae 100644
--- a/TMDbLib/Client/TMDbClient.cs
+++ b/TMDbLib/Client/TMDbClient.cs
@@ -11,6 +11,7 @@ using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using TMDbLib.Rest;
 
 namespace TMDbLib.Client
 {
@@ -157,7 +158,7 @@ namespace TMDbLib.Client
 
         public async Task<TMDbConfig> GetConfigAsync()
         {
-            TMDbConfig config = await _client.Create("configuration").ExecuteGet<TMDbConfig>(CancellationToken.None);
+            TMDbConfig config = await _client.Create("configuration").GetOfT<TMDbConfig>(CancellationToken.None);
 
             if (config == null)
                 throw new Exception("Unable to retrieve configuration");
@@ -243,7 +244,7 @@ namespace TMDbLib.Client
         /// - Use the 'AuthenticationGetUserSessionAsync' and 'AuthenticationCreateGuestSessionAsync' methods to optain the respective session ids.
         /// - User sessions have access to far for methods than guest sessions, these can currently only be used to rate media.
         /// </remarks>
-        public void SetSessionInformation(string sessionId, SessionType sessionType)
+        public async Task SetSessionInformationAsync(string sessionId, SessionType sessionType)
         {
             ActiveAccount = null;
             SessionId = sessionId;
@@ -259,7 +260,7 @@ namespace TMDbLib.Client
             {
                 try
                 {
-                    ActiveAccount = AccountGetDetailsAsync().Result;
+                    ActiveAccount = await AccountGetDetailsAsync().ConfigureAwait(false);
                 }
                 catch (Exception)
                 {
diff --git a/TMDbLib/Client/TMDbClientAccount.cs b/TMDbLib/Client/TMDbClientAccount.cs
index a574d4a..59d0c07 100644
--- a/TMDbLib/Client/TMDbClientAccount.cs
+++ b/TMDbLib/Client/TMDbClientAccount.cs
@@ -13,204 +13,7 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
-        /// <summary>
-        /// Change the favorite status of a specific movie. Either make the movie a favorite or remove that status depending on the supplied boolean value.
-        /// </summary>
-        /// <param name="mediaType">The type of media to influence</param>
-        /// <param name="mediaId">The id of the movie/tv show to influence</param>
-        /// <param name="isFavorite">True if you want the specified movie to be marked as favorite, false if not</param>
-        /// <param name="cancellationToken">Cancellation token</param>
-        /// <returns>True if the the movie's favorite status was successfully updated, false if not</returns>
-        /// <remarks>Requires a valid user session</remarks>
-        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<bool> AccountChangeFavoriteStatusAsync(MediaType mediaType, int mediaId, bool isFavorite, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            RequireSessionId(SessionType.UserSession);
-
-            RestRequest request = _client.Create("account/{accountId}/favorite");
-            request.AddUrlSegment("accountId", ActiveAccount.Id.ToString(CultureInfo.InvariantCulture));
-            request.SetBody(new { media_type = mediaType.GetDescription(), media_id = mediaId, favorite = isFavorite });
-            AddSessionId(request, SessionType.UserSession);
-
-            PostReply response = await request.ExecutePost<PostReply>(cancellationToken).ConfigureAwait(false);
-
-            // status code 1 = "Success" - Returned when adding a movie as favorite for the first time
-            // status code 13 = "The item/record was deleted successfully" - When removing an item as favorite, no matter if it exists or not
-            // status code 12 = "The item/record was updated successfully" - Used when an item is already marked as favorite and trying to do so doing again
-            return response.StatusCode == 1 || response.StatusCode == 12 || response.StatusCode == 13;
-        }
-
-        /// <summary>
-        /// Change the state of a specific movie on the users watchlist. Either add the movie to the list or remove it, depending on the specified boolean value.
-        /// </summary>
-        /// <param name="mediaType">The type of media to influence</param>
-        /// <param name="mediaId">The id of the movie/tv show to influence</param>
-        /// <param name="isOnWatchlist">True if you want the specified movie to be part of the watchlist, false if not</param>
-        /// <param name="cancellationToken">A cancellation token</param>
-        /// <returns>True if the the movie's status on the watchlist was successfully updated, false if not</returns>
-        /// <remarks>Requires a valid user session</remarks>
-        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<bool> AccountChangeWatchlistStatusAsync(MediaType mediaType, int mediaId, bool isOnWatchlist, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            RequireSessionId(SessionType.UserSession);
-
-            RestRequest request = _client.Create("account/{accountId}/watchlist");
-            request.AddUrlSegment("accountId", ActiveAccount.Id.ToString(CultureInfo.InvariantCulture));
-            request.SetBody(new { media_type = mediaType.GetDescription(), media_id = mediaId, watchlist = isOnWatchlist });
-            AddSessionId(request, SessionType.UserSession);
-
-            PostReply response = await request.ExecutePost<PostReply>(cancellationToken).ConfigureAwait(false);
-
-            // status code 1 = "Success"
-            // status code 13 = "The item/record was deleted successfully" - When removing an item from the watchlist, no matter if it exists or not
-            // status code 12 = "The item/record was updated successfully" - Used when an item is already on the watchlist and trying to add it again
-            return response.StatusCode == 1 || response.StatusCode == 12 || response.StatusCode == 13;
-        }
-
-        /// <summary>
-        /// Will retrieve the details of the account associated with the current session id
-        /// </summary>
-        /// <remarks>Requires a valid user session</remarks>
-        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<AccountDetails> AccountGetDetailsAsync(CancellationToken cancellationToken = default(CancellationToken))
-        {
-            RequireSessionId(SessionType.UserSession);
-
-            RestRequest request = _client.Create("account");
-            AddSessionId(request, SessionType.UserSession);
-
-            AccountDetails response = await request.ExecuteGet<AccountDetails>(cancellationToken).ConfigureAwait(false);
-
-            return response;
-        }
-
-        /// <summary>
-        /// Get a list of all the movies marked as favorite by the current user
-        /// </summary>
-        /// <remarks>Requires a valid user session</remarks>
-        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<SearchContainer<SearchMovie>> AccountGetFavoriteMoviesAsync(
-            int page = 1,
-            AccountSortBy sortBy = AccountSortBy.Undefined,
-            SortOrder sortOrder = SortOrder.Undefined,
-            string language = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return await GetAccountList<SearchMovie>(page, sortBy, sortOrder, language, AccountListsMethods.FavoriteMovies, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Get a list of all the tv shows marked as favorite by the current user
-        /// </summary>
-        /// <remarks>Requires a valid user session</remarks>
-        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<SearchContainer<SearchTv>> AccountGetFavoriteTvAsync(
-            int page = 1,
-            AccountSortBy sortBy = AccountSortBy.Undefined,
-            SortOrder sortOrder = SortOrder.Undefined,
-            string language = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return await GetAccountList<SearchTv>(page, sortBy, sortOrder, language, AccountListsMethods.FavoriteTv, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Retrieve all lists associated with the provided account id
-        /// This can be lists that were created by the user or lists marked as favorite
-        /// </summary>
-        /// <remarks>Requires a valid user session</remarks>
-        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<SearchContainer<AccountList>> AccountGetListsAsync(int page = 1, string language = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            RequireSessionId(SessionType.UserSession);
-
-            RestRequest request = _client.Create("account/{accountId}/lists");
-            request.AddUrlSegment("accountId", ActiveAccount.Id.ToString(CultureInfo.InvariantCulture));
-            AddSessionId(request, SessionType.UserSession);
-
-            if (page > 1)
-            {
-                request.AddQueryString("page", page.ToString());
-            }
-
-            language = language ?? DefaultLanguage;
-            if (!string.IsNullOrWhiteSpace(language))
-                request.AddQueryString("language", language);
-
-            SearchContainer<AccountList> response = await request.ExecuteGet<SearchContainer<AccountList>>(cancellationToken).ConfigureAwait(false);
-
-            return response;
-        }
-
-        /// <summary>
-        /// Get a list of all the movies on the current users match list
-        /// </summary>
-        /// <remarks>Requires a valid user session</remarks>
-        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<SearchContainer<SearchMovie>> AccountGetMovieWatchlistAsync(
-            int page = 1,
-            AccountSortBy sortBy = AccountSortBy.Undefined,
-            SortOrder sortOrder = SortOrder.Undefined,
-            string language = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return await GetAccountList<SearchMovie>(page, sortBy, sortOrder, language, AccountListsMethods.MovieWatchlist, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Get a list of all the movies rated by the current user
-        /// </summary>
-        /// <remarks>Requires a valid user session</remarks>
-        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<SearchContainer<SearchMovieWithRating>> AccountGetRatedMoviesAsync(
-            int page = 1,
-            AccountSortBy sortBy = AccountSortBy.Undefined,
-            SortOrder sortOrder = SortOrder.Undefined,
-            string language = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return await GetAccountList<SearchMovieWithRating>(page, sortBy, sortOrder, language, AccountListsMethods.RatedMovies, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Get a list of all the tv show episodes rated by the current user
-        /// </summary>
-        /// <remarks>Requires a valid user session</remarks>
-        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<SearchContainer<AccountSearchTvEpisode>> AccountGetRatedTvShowEpisodesAsync(
-            int page = 1,
-            AccountSortBy sortBy = AccountSortBy.Undefined,
-            SortOrder sortOrder = SortOrder.Undefined,
-            string language = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return await GetAccountList<AccountSearchTvEpisode>(page, sortBy, sortOrder, language, AccountListsMethods.RatedTvEpisodes, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Get a list of all the tv shows rated by the current user
-        /// </summary>
-        /// <remarks>Requires a valid user session</remarks>
-        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<SearchContainer<AccountSearchTv>> AccountGetRatedTvShowsAsync(
-            int page = 1,
-            AccountSortBy sortBy = AccountSortBy.Undefined,
-            SortOrder sortOrder = SortOrder.Undefined,
-            string language = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return await GetAccountList<AccountSearchTv>(page, sortBy, sortOrder, language, AccountListsMethods.RatedTv, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Get a list of all the tv shows on the current users match list
-        /// </summary>
-        /// <remarks>Requires a valid user session</remarks>
-        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<SearchContainer<SearchTv>> AccountGetTvWatchlistAsync(
-            int page = 1,
-            AccountSortBy sortBy = AccountSortBy.Undefined,
-            SortOrder sortOrder = SortOrder.Undefined,
-            string language = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return await GetAccountList<SearchTv>(page, sortBy, sortOrder, language, AccountListsMethods.TvWatchlist, cancellationToken).ConfigureAwait(false);
-        }
-
-        private async Task<SearchContainer<T>> GetAccountList<T>(int page, AccountSortBy sortBy, SortOrder sortOrder, string language, AccountListsMethods method, CancellationToken cancellationToken = default(CancellationToken))
+        private async Task<SearchContainer<T>> GetAccountListInternal<T>(int page, AccountSortBy sortBy, SortOrder sortOrder, string language, AccountListsMethods method, CancellationToken cancellationToken = default)
         {
             RequireSessionId(SessionType.UserSession);
 
@@ -231,11 +34,208 @@ namespace TMDbLib.Client
             if (!string.IsNullOrWhiteSpace(language))
                 request.AddParameter("language", language);
 
-            SearchContainer<T> response = await request.ExecuteGet<SearchContainer<T>>(cancellationToken).ConfigureAwait(false);
+            SearchContainer<T> response = await request.GetOfT<SearchContainer<T>>(cancellationToken).ConfigureAwait(false);
 
             return response;
         }
 
+        /// <summary>
+        /// Change the favorite status of a specific movie. Either make the movie a favorite or remove that status depending on the supplied boolean value.
+        /// </summary>
+        /// <param name="mediaType">The type of media to influence</param>
+        /// <param name="mediaId">The id of the movie/tv show to influence</param>
+        /// <param name="isFavorite">True if you want the specified movie to be marked as favorite, false if not</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <returns>True if the the movie's favorite status was successfully updated, false if not</returns>
+        /// <remarks>Requires a valid user session</remarks>
+        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
+        public async Task<bool> AccountChangeFavoriteStatusAsync(MediaType mediaType, int mediaId, bool isFavorite, CancellationToken cancellationToken = default)
+        {
+            RequireSessionId(SessionType.UserSession);
+
+            RestRequest request = _client.Create("account/{accountId}/favorite");
+            request.AddUrlSegment("accountId", ActiveAccount.Id.ToString(CultureInfo.InvariantCulture));
+            request.SetBody(new { media_type = mediaType.GetDescription(), media_id = mediaId, favorite = isFavorite });
+            AddSessionId(request, SessionType.UserSession);
+
+            PostReply response = await request.PostOfT<PostReply>(cancellationToken).ConfigureAwait(false);
+
+            // status code 1 = "Success" - Returned when adding a movie as favorite for the first time
+            // status code 13 = "The item/record was deleted successfully" - When removing an item as favorite, no matter if it exists or not
+            // status code 12 = "The item/record was updated successfully" - Used when an item is already marked as favorite and trying to do so doing again
+            return response.StatusCode == 1 || response.StatusCode == 12 || response.StatusCode == 13;
+        }
+
+        /// <summary>
+        /// Change the state of a specific movie on the users watchlist. Either add the movie to the list or remove it, depending on the specified boolean value.
+        /// </summary>
+        /// <param name="mediaType">The type of media to influence</param>
+        /// <param name="mediaId">The id of the movie/tv show to influence</param>
+        /// <param name="isOnWatchlist">True if you want the specified movie to be part of the watchlist, false if not</param>
+        /// <param name="cancellationToken">A cancellation token</param>
+        /// <returns>True if the the movie's status on the watchlist was successfully updated, false if not</returns>
+        /// <remarks>Requires a valid user session</remarks>
+        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
+        public async Task<bool> AccountChangeWatchlistStatusAsync(MediaType mediaType, int mediaId, bool isOnWatchlist, CancellationToken cancellationToken = default)
+        {
+            RequireSessionId(SessionType.UserSession);
+
+            RestRequest request = _client.Create("account/{accountId}/watchlist");
+            request.AddUrlSegment("accountId", ActiveAccount.Id.ToString(CultureInfo.InvariantCulture));
+            request.SetBody(new { media_type = mediaType.GetDescription(), media_id = mediaId, watchlist = isOnWatchlist });
+            AddSessionId(request, SessionType.UserSession);
+
+            PostReply response = await request.PostOfT<PostReply>(cancellationToken).ConfigureAwait(false);
+
+            // status code 1 = "Success"
+            // status code 13 = "The item/record was deleted successfully" - When removing an item from the watchlist, no matter if it exists or not
+            // status code 12 = "The item/record was updated successfully" - Used when an item is already on the watchlist and trying to add it again
+            return response.StatusCode == 1 || response.StatusCode == 12 || response.StatusCode == 13;
+        }
+
+        /// <summary>
+        /// Will retrieve the details of the account associated with the current session id
+        /// </summary>
+        /// <remarks>Requires a valid user session</remarks>
+        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
+        public async Task<AccountDetails> AccountGetDetailsAsync(CancellationToken cancellationToken = default)
+        {
+            RequireSessionId(SessionType.UserSession);
+
+            RestRequest request = _client.Create("account");
+            AddSessionId(request, SessionType.UserSession);
+
+            AccountDetails response = await request.GetOfT<AccountDetails>(cancellationToken).ConfigureAwait(false);
+
+            return response;
+        }
+
+        /// <summary>
+        /// Get a list of all the movies marked as favorite by the current user
+        /// </summary>
+        /// <remarks>Requires a valid user session</remarks>
+        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
+        public async Task<SearchContainer<SearchMovie>> AccountGetFavoriteMoviesAsync(
+            int page = 1,
+            AccountSortBy sortBy = AccountSortBy.Undefined,
+            SortOrder sortOrder = SortOrder.Undefined,
+            string language = null, CancellationToken cancellationToken = default)
+        {
+            return await GetAccountListInternal<SearchMovie>(page, sortBy, sortOrder, language, AccountListsMethods.FavoriteMovies, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Get a list of all the tv shows marked as favorite by the current user
+        /// </summary>
+        /// <remarks>Requires a valid user session</remarks>
+        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
+        public async Task<SearchContainer<SearchTv>> AccountGetFavoriteTvAsync(
+            int page = 1,
+            AccountSortBy sortBy = AccountSortBy.Undefined,
+            SortOrder sortOrder = SortOrder.Undefined,
+            string language = null, CancellationToken cancellationToken = default)
+        {
+            return await GetAccountListInternal<SearchTv>(page, sortBy, sortOrder, language, AccountListsMethods.FavoriteTv, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Retrieve all lists associated with the provided account id
+        /// This can be lists that were created by the user or lists marked as favorite
+        /// </summary>
+        /// <remarks>Requires a valid user session</remarks>
+        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
+        public async Task<SearchContainer<AccountList>> AccountGetListsAsync(int page = 1, string language = null, CancellationToken cancellationToken = default)
+        {
+            RequireSessionId(SessionType.UserSession);
+
+            RestRequest request = _client.Create("account/{accountId}/lists");
+            request.AddUrlSegment("accountId", ActiveAccount.Id.ToString(CultureInfo.InvariantCulture));
+            AddSessionId(request, SessionType.UserSession);
+
+            if (page > 1)
+            {
+                request.AddQueryString("page", page.ToString());
+            }
+
+            language = language ?? DefaultLanguage;
+            if (!string.IsNullOrWhiteSpace(language))
+                request.AddQueryString("language", language);
+
+            SearchContainer<AccountList> response = await request.GetOfT<SearchContainer<AccountList>>(cancellationToken).ConfigureAwait(false);
+
+            return response;
+        }
+
+        /// <summary>
+        /// Get a list of all the movies on the current users match list
+        /// </summary>
+        /// <remarks>Requires a valid user session</remarks>
+        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
+        public async Task<SearchContainer<SearchMovie>> AccountGetMovieWatchlistAsync(
+            int page = 1,
+            AccountSortBy sortBy = AccountSortBy.Undefined,
+            SortOrder sortOrder = SortOrder.Undefined,
+            string language = null, CancellationToken cancellationToken = default)
+        {
+            return await GetAccountListInternal<SearchMovie>(page, sortBy, sortOrder, language, AccountListsMethods.MovieWatchlist, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Get a list of all the movies rated by the current user
+        /// </summary>
+        /// <remarks>Requires a valid user session</remarks>
+        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
+        public async Task<SearchContainer<SearchMovieWithRating>> AccountGetRatedMoviesAsync(
+            int page = 1,
+            AccountSortBy sortBy = AccountSortBy.Undefined,
+            SortOrder sortOrder = SortOrder.Undefined,
+            string language = null, CancellationToken cancellationToken = default)
+        {
+            return await GetAccountListInternal<SearchMovieWithRating>(page, sortBy, sortOrder, language, AccountListsMethods.RatedMovies, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Get a list of all the tv show episodes rated by the current user
+        /// </summary>
+        /// <remarks>Requires a valid user session</remarks>
+        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
+        public async Task<SearchContainer<AccountSearchTvEpisode>> AccountGetRatedTvShowEpisodesAsync(
+            int page = 1,
+            AccountSortBy sortBy = AccountSortBy.Undefined,
+            SortOrder sortOrder = SortOrder.Undefined,
+            string language = null, CancellationToken cancellationToken = default)
+        {
+            return await GetAccountListInternal<AccountSearchTvEpisode>(page, sortBy, sortOrder, language, AccountListsMethods.RatedTvEpisodes, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Get a list of all the tv shows rated by the current user
+        /// </summary>
+        /// <remarks>Requires a valid user session</remarks>
+        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
+        public async Task<SearchContainer<AccountSearchTv>> AccountGetRatedTvShowsAsync(
+            int page = 1,
+            AccountSortBy sortBy = AccountSortBy.Undefined,
+            SortOrder sortOrder = SortOrder.Undefined,
+            string language = null, CancellationToken cancellationToken = default)
+        {
+            return await GetAccountListInternal<AccountSearchTv>(page, sortBy, sortOrder, language, AccountListsMethods.RatedTv, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Get a list of all the tv shows on the current users match list
+        /// </summary>
+        /// <remarks>Requires a valid user session</remarks>
+        /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
+        public async Task<SearchContainer<SearchTv>> AccountGetTvWatchlistAsync(
+            int page = 1,
+            AccountSortBy sortBy = AccountSortBy.Undefined,
+            SortOrder sortOrder = SortOrder.Undefined,
+            string language = null, CancellationToken cancellationToken = default)
+        {
+            return await GetAccountListInternal<SearchTv>(page, sortBy, sortOrder, language, AccountListsMethods.TvWatchlist, cancellationToken).ConfigureAwait(false);
+        }
+
         private enum AccountListsMethods
         {
             [EnumValue("favorite/movies")]
diff --git a/TMDbLib/Client/TMDbClientAuthentication.cs b/TMDbLib/Client/TMDbClientAuthentication.cs
index 26fbfae..1d7b39d 100644
--- a/TMDbLib/Client/TMDbClientAuthentication.cs
+++ b/TMDbLib/Client/TMDbClientAuthentication.cs
@@ -9,29 +9,29 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
-        public async Task<GuestSession> AuthenticationCreateGuestSessionAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<GuestSession> AuthenticationCreateGuestSessionAsync(CancellationToken cancellationToken = default)
         {
             RestRequest request = _client.Create("authentication/guest_session/new");
             //{
             //    DateFormat = "yyyy-MM-dd HH:mm:ss UTC"
             //};
 
-            RestResponse<GuestSession> response = await request.ExecuteGet<GuestSession>(cancellationToken).ConfigureAwait(false);
+            GuestSession response = await request.GetOfT<GuestSession>(cancellationToken).ConfigureAwait(false);
 
             return response;
         }
 
-        public async Task<UserSession> AuthenticationGetUserSessionAsync(string initialRequestToken, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<UserSession> AuthenticationGetUserSessionAsync(string initialRequestToken, CancellationToken cancellationToken = default)
         {
             RestRequest request = _client.Create("authentication/session/new");
             request.AddParameter("request_token", initialRequestToken);
 
-            RestResponse<UserSession> response = await request.ExecuteGet<UserSession>(cancellationToken).ConfigureAwait(false);
+            RestResponse<UserSession> response = await request.Get<UserSession>(cancellationToken).ConfigureAwait(false);
 
             if (response.StatusCode == HttpStatusCode.Unauthorized)
                 throw new UnauthorizedAccessException();
 
-            return response;
+            return await response.GetDataObject().ConfigureAwait(false);
         }
 
         /// <summary>
@@ -40,26 +40,26 @@ namespace TMDbLib.Client
         /// <param name="username">A valid TMDb username</param>
         /// <param name="password">The passoword for the provided login</param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<UserSession> AuthenticationGetUserSessionAsync(string username, string password, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<UserSession> AuthenticationGetUserSessionAsync(string username, string password, CancellationToken cancellationToken = default)
         {
             Token token = await AuthenticationRequestAutenticationTokenAsync(cancellationToken).ConfigureAwait(false);
             await AuthenticationValidateUserTokenAsync(token.RequestToken, username, password, cancellationToken).ConfigureAwait(false);
             return await AuthenticationGetUserSessionAsync(token.RequestToken, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<Token> AuthenticationRequestAutenticationTokenAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Token> AuthenticationRequestAutenticationTokenAsync(CancellationToken cancellationToken = default)
         {
             RestRequest request = _client.Create("authentication/token/new");
 
-            RestResponse<Token> response = await request.ExecuteGet<Token>(cancellationToken).ConfigureAwait(false);
-            Token token = response;
+            RestResponse<Token> response = await request.Get<Token>(cancellationToken).ConfigureAwait(false);
+            Token token = await response.GetDataObject().ConfigureAwait(false);
 
             token.AuthenticationCallback = response.GetHeader("Authentication-Callback");
 
             return token;
         }
 
-        public async Task AuthenticationValidateUserTokenAsync(string initialRequestToken, string username, string password, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task AuthenticationValidateUserTokenAsync(string initialRequestToken, string username, string password, CancellationToken cancellationToken = default)
         {
             RestRequest request = _client.Create("authentication/token/validate_with_login");
             request.AddParameter("request_token", initialRequestToken);
@@ -69,7 +69,7 @@ namespace TMDbLib.Client
             RestResponse response;
             try
             {
-                response = await request.ExecuteGet(cancellationToken).ConfigureAwait(false);
+                response = await request.Get(cancellationToken).ConfigureAwait(false);
             }
             catch (AggregateException ex)
             {
diff --git a/TMDbLib/Client/TMDbClientCertifications.cs b/TMDbLib/Client/TMDbClientCertifications.cs
index 8267ace..be6c5a4 100644
--- a/TMDbLib/Client/TMDbClientCertifications.cs
+++ b/TMDbLib/Client/TMDbClientCertifications.cs
@@ -7,20 +7,20 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
-        public async Task<CertificationsContainer> GetMovieCertificationsAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<CertificationsContainer> GetMovieCertificationsAsync(CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("certification/movie/list");
 
-            RestResponse<CertificationsContainer> resp = await req.ExecuteGet<CertificationsContainer>(cancellationToken).ConfigureAwait(false);
+            CertificationsContainer resp = await req.GetOfT<CertificationsContainer>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
 
-        public async Task<CertificationsContainer> GetTvCertificationsAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<CertificationsContainer> GetTvCertificationsAsync(CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("certification/tv/list");
 
-            RestResponse<CertificationsContainer> resp = await req.ExecuteGet<CertificationsContainer>(cancellationToken).ConfigureAwait(false);
+            CertificationsContainer resp = await req.GetOfT<CertificationsContainer>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
diff --git a/TMDbLib/Client/TMDbClientChanges.cs b/TMDbLib/Client/TMDbClientChanges.cs
index cc1e93c..0973fbb 100644
--- a/TMDbLib/Client/TMDbClientChanges.cs
+++ b/TMDbLib/Client/TMDbClientChanges.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using TMDbLib.Objects.Changes;
@@ -9,11 +10,20 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
-        private async Task<SearchContainer<ChangesListItem>> GetChanges(string type, int page = 0, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default(CancellationToken))
+        private async Task<T> GetChangesInternal<T>(string type, int page = 0, int? id = null, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default)
         {
-            RestRequest req = _client.Create("{type}/changes");
+            string resource;
+            if (id.HasValue)
+                resource = "{type}/{id}/changes";
+            else
+                resource = "{type}/changes";
+
+            RestRequest req = _client.Create(resource);
             req.AddUrlSegment("type", type);
 
+            if (id.HasValue)
+                req.AddUrlSegment("id", id.Value.ToString());
+
             if (page >= 1)
                 req.AddParameter("page", page.ToString());
             if (startDate.HasValue)
@@ -21,11 +31,14 @@ namespace TMDbLib.Client
             if (endDate != null)
                 req.AddParameter("end_date", endDate.Value.ToString("yyyy-MM-dd"));
 
-            RestResponse<SearchContainer<ChangesListItem>> resp = await req.ExecuteGet<SearchContainer<ChangesListItem>>(cancellationToken).ConfigureAwait(false);
-            SearchContainer<ChangesListItem> res = await resp.GetDataObject().ConfigureAwait(false);
+            RestResponse<T> resp = await req.Get<T>(cancellationToken).ConfigureAwait(false);
+            T res = await resp.GetDataObject().ConfigureAwait(false);
 
-            // https://github.com/LordMike/TMDbLib/issues/296
-            res.Results.RemoveAll(s => s.Id == 0);
+            if (res is SearchContainer<ChangesListItem> asSearch)
+            {
+                // https://github.com/LordMike/TMDbLib/issues/296
+                asSearch.Results.RemoveAll(s => s.Id == 0);
+            }
 
             return res;
         }
@@ -37,9 +50,9 @@ namespace TMDbLib.Client
 		/// You can then use the movie changes API to get the actual data that has been changed. (.GetMovieChangesAsync)
 		/// </summary>
 		/// <remarks>the change log system to support this was changed on October 5, 2012 and will only show movies that have been edited since.</remarks>
-        public async Task<SearchContainer<ChangesListItem>> GetChangesMoviesAsync(int page = 0, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<ChangesListItem>> GetMoviesChangesAsync(int page = 0, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default)
         {
-            return await GetChanges("movie", page, startDate, endDate, cancellationToken).ConfigureAwait(false);
+            return await GetChangesInternal<SearchContainer<ChangesListItem>>("movie", page, startDate: startDate, endDate: endDate, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -49,9 +62,9 @@ namespace TMDbLib.Client
 		/// You can then use the person changes API to get the actual data that has been changed.(.GetPersonChangesAsync)
 		/// </summary>
 		/// <remarks>the change log system to support this was changed on October 5, 2012 and will only show people that have been edited since.</remarks>
-        public async Task<SearchContainer<ChangesListItem>> GetChangesPeopleAsync(int page = 0, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<ChangesListItem>> GetPeopleChangesAsync(int page = 0, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default)
         {
-            return await GetChanges("person", page, startDate, endDate, cancellationToken).ConfigureAwait(false);
+            return await GetChangesInternal<SearchContainer<ChangesListItem>>("person", page, startDate: startDate, endDate: endDate, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -64,9 +77,33 @@ namespace TMDbLib.Client
 		/// the change log system to properly support TV was updated on May 13, 2014. 
 		/// You'll likely only find the edits made since then to be useful in the change log system.
 		/// </remarks>
-		public async Task<SearchContainer<ChangesListItem>> GetChangesTvAsync(int page = 0, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default(CancellationToken))
+		public async Task<SearchContainer<ChangesListItem>> GetTvChangesAsync(int page = 0, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default)
         {
-            return await GetChanges("tv", page, startDate, endDate, cancellationToken).ConfigureAwait(false);
+            return await GetChangesInternal<SearchContainer<ChangesListItem>>("tv", page, startDate: startDate, endDate: endDate, cancellationToken: cancellationToken).ConfigureAwait(false);
+        }
+
+        public async Task<IList<Change>> GetMovieChangesAsync(int movieId, int page = 0, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default)
+        {
+            ChangesContainer changesContainer = await GetChangesInternal<ChangesContainer>("movie", page, movieId, startDate, endDate, cancellationToken);
+            return changesContainer.Changes;
+        }
+
+        public async Task<IList<Change>> GetPersonChangesAsync(int personId, int page = 0, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default)
+        {
+            ChangesContainer changesContainer = await GetChangesInternal<ChangesContainer>("person", page, personId, startDate, endDate, cancellationToken).ConfigureAwait(false);
+            return changesContainer.Changes;
+        }
+
+        public async Task<IList<Change>> GetTvSeasonChangesAsync(int seasonId, int page = 0, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default)
+        {
+            ChangesContainer changesContainer = await GetChangesInternal<ChangesContainer>("tv/season", page, seasonId, startDate, endDate, cancellationToken).ConfigureAwait(false);
+            return changesContainer.Changes;
+        }
+
+        public async Task<IList<Change>> GetTvEpisodeChangesAsync(int episodeId, int page = 0, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default)
+        {
+            ChangesContainer changesContainer = await GetChangesInternal<ChangesContainer>("tv/episode", page, episodeId, startDate, endDate, cancellationToken).ConfigureAwait(false);
+            return changesContainer.Changes;
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLib/Client/TMDbClientCollections.cs b/TMDbLib/Client/TMDbClientCollections.cs
index be3268a..bd8ae06 100644
--- a/TMDbLib/Client/TMDbClientCollections.cs
+++ b/TMDbLib/Client/TMDbClientCollections.cs
@@ -12,12 +12,26 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
-        public async Task<Collection> GetCollectionAsync(int collectionId, CollectionMethods extraMethods = CollectionMethods.Undefined, CancellationToken cancellationToken = default(CancellationToken))
+        private async Task<T> GetCollectionMethodInternal<T>(int collectionId, CollectionMethods collectionMethod, string language = null, CancellationToken cancellationToken = default) where T : new()
+        {
+            RestRequest req = _client.Create("collection/{collectionId}/{method}");
+            req.AddUrlSegment("collectionId", collectionId.ToString());
+            req.AddUrlSegment("method", collectionMethod.GetDescription());
+
+            if (language != null)
+                req.AddParameter("language", language);
+
+            T resp = await req.GetOfT<T>(cancellationToken).ConfigureAwait(false);
+
+            return resp;
+        }
+
+        public async Task<Collection> GetCollectionAsync(int collectionId, CollectionMethods extraMethods = CollectionMethods.Undefined, CancellationToken cancellationToken = default)
         {
             return await GetCollectionAsync(collectionId, DefaultLanguage, null, extraMethods, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<Collection> GetCollectionAsync(int collectionId, string language, string includeImageLanguages, CollectionMethods extraMethods = CollectionMethods.Undefined, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Collection> GetCollectionAsync(int collectionId, string language, string includeImageLanguages, CollectionMethods extraMethods = CollectionMethods.Undefined, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("collection/{collectionId}");
             req.AddUrlSegment("collectionId", collectionId.ToString());
@@ -42,7 +56,7 @@ namespace TMDbLib.Client
 
             //req.DateFormat = "yyyy-MM-dd";
 
-            RestResponse<Collection> response = await req.ExecuteGet<Collection>(cancellationToken).ConfigureAwait(false);
+            RestResponse<Collection> response = await req.Get<Collection>(cancellationToken).ConfigureAwait(false);
 
             if (!response.IsValid)
                 return null;
@@ -55,23 +69,9 @@ namespace TMDbLib.Client
             return item;
         }
 
-        public async Task<ImagesWithId> GetCollectionImagesAsync(int collectionId, string language = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ImagesWithId> GetCollectionImagesAsync(int collectionId, string language = null, CancellationToken cancellationToken = default)
         {
-            return await GetCollectionMethod<ImagesWithId>(collectionId, CollectionMethods.Images, language, cancellationToken).ConfigureAwait(false);
+            return await GetCollectionMethodInternal<ImagesWithId>(collectionId, CollectionMethods.Images, language, cancellationToken).ConfigureAwait(false);
         }
-
-        private async Task<T> GetCollectionMethod<T>(int collectionId, CollectionMethods collectionMethod, string language = null, CancellationToken cancellationToken = default(CancellationToken)) where T : new()
-        {
-            RestRequest req = _client.Create("collection/{collectionId}/{method}");
-            req.AddUrlSegment("collectionId", collectionId.ToString());
-            req.AddUrlSegment("method", collectionMethod.GetDescription());
-
-            if (language != null)
-                req.AddParameter("language", language);
-
-            RestResponse<T> resp = await req.ExecuteGet<T>(cancellationToken).ConfigureAwait(false);
-
-            return resp;
         }
-    }
 }
\ No newline at end of file
diff --git a/TMDbLib/Client/TMDbClientCompanies.cs b/TMDbLib/Client/TMDbClientCompanies.cs
index cdc8498..39e82da 100644
--- a/TMDbLib/Client/TMDbClientCompanies.cs
+++ b/TMDbLib/Client/TMDbClientCompanies.cs
@@ -12,7 +12,24 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
-        public async Task<Company> GetCompanyAsync(int companyId, CompanyMethods extraMethods = CompanyMethods.Undefined, CancellationToken cancellationToken = default(CancellationToken))
+        private async Task<T> GetCompanyMethodInternal<T>(int companyId, CompanyMethods companyMethod, int page = 0, string language = null, CancellationToken cancellationToken = default) where T : new()
+        {
+            RestRequest req = _client.Create("company/{companyId}/{method}");
+            req.AddUrlSegment("companyId", companyId.ToString());
+            req.AddUrlSegment("method", companyMethod.GetDescription());
+
+            if (page >= 1)
+                req.AddParameter("page", page.ToString());
+            language = language ?? DefaultLanguage;
+            if (!string.IsNullOrWhiteSpace(language))
+                req.AddParameter("language", language);
+
+            T resp = await req.GetOfT<T>(cancellationToken).ConfigureAwait(false);
+
+            return resp;
+        }
+
+        public async Task<Company> GetCompanyAsync(int companyId, CompanyMethods extraMethods = CompanyMethods.Undefined, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("company/{companyId}");
             req.AddUrlSegment("companyId", companyId.ToString());
@@ -29,36 +46,19 @@ namespace TMDbLib.Client
 
             //req.DateFormat = "yyyy-MM-dd";
 
-            RestResponse<Company> resp = await req.ExecuteGet<Company>(cancellationToken).ConfigureAwait(false);
+            Company resp = await req.GetOfT<Company>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
 
-        private async Task<T> GetCompanyMethod<T>(int companyId, CompanyMethods companyMethod, int page = 0, string language = null, CancellationToken cancellationToken = default(CancellationToken)) where T : new()
-        {
-            RestRequest req = _client.Create("company/{companyId}/{method}");
-            req.AddUrlSegment("companyId", companyId.ToString());
-            req.AddUrlSegment("method", companyMethod.GetDescription());
-
-            if (page >= 1)
-                req.AddParameter("page", page.ToString());
-            language = language ?? DefaultLanguage;
-            if (!string.IsNullOrWhiteSpace(language))
-                req.AddParameter("language", language);
-
-            RestResponse<T> resp = await req.ExecuteGet<T>(cancellationToken).ConfigureAwait(false);
-
-            return resp;
-        }
-
-        public async Task<SearchContainerWithId<SearchMovie>> GetCompanyMoviesAsync(int companyId, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainerWithId<SearchMovie>> GetCompanyMoviesAsync(int companyId, int page = 0, CancellationToken cancellationToken = default)
         {
             return await GetCompanyMoviesAsync(companyId, DefaultLanguage, page, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainerWithId<SearchMovie>> GetCompanyMoviesAsync(int companyId, string language, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainerWithId<SearchMovie>> GetCompanyMoviesAsync(int companyId, string language, int page = 0, CancellationToken cancellationToken = default)
         {
-            return await GetCompanyMethod<SearchContainerWithId<SearchMovie>>(companyId, CompanyMethods.Movies, page, language, cancellationToken).ConfigureAwait(false);
+            return await GetCompanyMethodInternal<SearchContainerWithId<SearchMovie>>(companyId, CompanyMethods.Movies, page, language, cancellationToken).ConfigureAwait(false);
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLib/Client/TMDbClientConfiguration.cs b/TMDbLib/Client/TMDbClientConfiguration.cs
index 7ca0e59..fe882b1 100644
--- a/TMDbLib/Client/TMDbClientConfiguration.cs
+++ b/TMDbLib/Client/TMDbClientConfiguration.cs
@@ -13,47 +13,47 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
-        public async Task<APIConfiguration> GetAPIConfiguration(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<APIConfiguration> GetAPIConfiguration(CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("configuration");
 
-            RestResponse<APIConfiguration> response = await req.ExecuteGet<APIConfiguration>(cancellationToken).ConfigureAwait(false);
+            RestResponse<APIConfiguration> response = await req.Get<APIConfiguration>(cancellationToken).ConfigureAwait(false);
 
             return (await response.GetDataObject().ConfigureAwait(false));
         }
 
-        public async Task<List<Country>> GetCountriesAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<List<Country>> GetCountriesAsync(CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("configuration/countries");
 
-            RestResponse<List<Country>> response = await req.ExecuteGet<List<Country>>(cancellationToken).ConfigureAwait(false);
+            RestResponse<List<Country>> response = await req.Get<List<Country>>(cancellationToken).ConfigureAwait(false);
 
             return (await response.GetDataObject().ConfigureAwait(false));
         }
 
-        public async Task<List<Language>> GetLanguagesAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<List<Language>> GetLanguagesAsync(CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("configuration/languages");
 
-            RestResponse<List<Language>> response = await req.ExecuteGet<List<Language>>(cancellationToken).ConfigureAwait(false);
+            RestResponse<List<Language>> response = await req.Get<List<Language>>(cancellationToken).ConfigureAwait(false);
 
             return (await response.GetDataObject().ConfigureAwait(false));
         }
         
-        public async Task<List<string>> GetPrimaryTranslationsAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<List<string>> GetPrimaryTranslationsAsync(CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("configuration/primary_translations");
 
-            RestResponse<List<string>> response = await req.ExecuteGet<List<string>>(cancellationToken).ConfigureAwait(false);
+            RestResponse<List<string>> response = await req.Get<List<string>>(cancellationToken).ConfigureAwait(false);
 
             return (await response.GetDataObject().ConfigureAwait(false));
         }
 
-        public async Task<Timezones> GetTimezonesAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Timezones> GetTimezonesAsync(CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("timezones/list");
 
-            RestResponse<List<Dictionary<string, List<string>>>> resp = await req.ExecuteGet<List<Dictionary<string, List<string>>>>(cancellationToken).ConfigureAwait(false);
+            RestResponse<List<Dictionary<string, List<string>>>> resp = await req.Get<List<Dictionary<string, List<string>>>>(cancellationToken).ConfigureAwait(false);
 
             List<Dictionary<string, List<string>>> item = await resp.GetDataObject().ConfigureAwait(false);
 
@@ -77,11 +77,11 @@ namespace TMDbLib.Client
         /// Retrieves a list of departments and positions within
         /// </summary>
         /// <returns>Valid jobs and their departments</returns>
-        public async Task<List<Job>> GetJobsAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<List<Job>> GetJobsAsync(CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("configuration/jobs");
 
-            RestResponse<List<Job>> response = await req.ExecuteGet<List<Job>>(cancellationToken).ConfigureAwait(false);
+            RestResponse<List<Job>> response = await req.Get<List<Job>>(cancellationToken).ConfigureAwait(false);
 
             return (await response.GetDataObject().ConfigureAwait(false));
         }
diff --git a/TMDbLib/Client/TMDbClientCredit.cs b/TMDbLib/Client/TMDbClientCredit.cs
index 1846529..15dfe82 100644
--- a/TMDbLib/Client/TMDbClientCredit.cs
+++ b/TMDbLib/Client/TMDbClientCredit.cs
@@ -7,12 +7,12 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
-        public async Task<Credit> GetCreditsAsync(string id, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Credit> GetCreditsAsync(string id, CancellationToken cancellationToken = default)
         {
             return await GetCreditsAsync(id, DefaultLanguage, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<Credit> GetCreditsAsync(string id, string language, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Credit> GetCreditsAsync(string id, string language, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("credit/{id}");
 
@@ -21,7 +21,7 @@ namespace TMDbLib.Client
 
             req.AddUrlSegment("id", id);
 
-            RestResponse<Credit> resp = await req.ExecuteGet<Credit>(cancellationToken).ConfigureAwait(false);
+            Credit resp = await req.GetOfT<Credit>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
diff --git a/TMDbLib/Client/TMDbClientDiscover.cs b/TMDbLib/Client/TMDbClientDiscover.cs
index ec2f0a8..8d22b8f 100644
--- a/TMDbLib/Client/TMDbClientDiscover.cs
+++ b/TMDbLib/Client/TMDbClientDiscover.cs
@@ -18,7 +18,7 @@ namespace TMDbLib.Client
             return new DiscoverMovie(this);
         }
 
-        internal async Task<SearchContainer<T>> DiscoverPerformAsync<T>(string endpoint, string language, int page, SimpleNamedValueCollection parameters, CancellationToken cancellationToken = default(CancellationToken))
+        internal async Task<SearchContainer<T>> DiscoverPerformAsync<T>(string endpoint, string language, int page, SimpleNamedValueCollection parameters, CancellationToken cancellationToken = default)
         {
             RestRequest request = _client.Create(endpoint);
 
@@ -31,7 +31,7 @@ namespace TMDbLib.Client
             foreach (KeyValuePair<string, string> pair in parameters)
                 request.AddParameter(pair.Key, pair.Value);
 
-            RestResponse<SearchContainer<T>> response = await request.ExecuteGet<SearchContainer<T>>(cancellationToken).ConfigureAwait(false);
+            SearchContainer<T> response = await request.GetOfT<SearchContainer<T>>(cancellationToken).ConfigureAwait(false);
             return response;
         }
 
diff --git a/TMDbLib/Client/TMDbClientFind.cs b/TMDbLib/Client/TMDbClientFind.cs
index 4dff332..889261b 100644
--- a/TMDbLib/Client/TMDbClientFind.cs
+++ b/TMDbLib/Client/TMDbClientFind.cs
@@ -20,7 +20,7 @@ namespace TMDbLib.Client
         /// <param name="id">The id of the object you wish to located</param>
         /// <returns>A list of all objects in TMDb that matched your id</returns>
         /// <param name="cancellationToken">A cancellation token</param>
-        public Task<FindContainer> FindAsync(FindExternalSource source, string id, CancellationToken cancellationToken = default(CancellationToken))
+        public Task<FindContainer> FindAsync(FindExternalSource source, string id, CancellationToken cancellationToken = default)
         {
             return FindAsync(source, id, null, cancellationToken);
         }
@@ -37,7 +37,7 @@ namespace TMDbLib.Client
         /// <returns>A list of all objects in TMDb that matched your id</returns>
         /// <param name="language">If specified the api will attempt to return a localized result. ex: en,it,es.</param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<FindContainer> FindAsync(FindExternalSource source, string id, string language, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<FindContainer> FindAsync(FindExternalSource source, string id, string language, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("find/{id}");
 
@@ -49,7 +49,7 @@ namespace TMDbLib.Client
             if (!string.IsNullOrEmpty(language))
                 req.AddParameter("language", language);
 
-            RestResponse<FindContainer> resp = await req.ExecuteGet<FindContainer>(cancellationToken).ConfigureAwait(false);
+            FindContainer resp = await req.GetOfT<FindContainer>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
diff --git a/TMDbLib/Client/TMDbClientGenres.cs b/TMDbLib/Client/TMDbClientGenres.cs
index c9754c0..ccfded5 100644
--- a/TMDbLib/Client/TMDbClientGenres.cs
+++ b/TMDbLib/Client/TMDbClientGenres.cs
@@ -12,13 +12,13 @@ namespace TMDbLib.Client
     public partial class TMDbClient
     {
         [Obsolete("GetGenreMovies is deprecated, use DiscoverMovies instead")]
-        public async Task<SearchContainerWithId<SearchMovie>> GetGenreMoviesAsync(int genreId, int page = 0, bool? includeAllMovies = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainerWithId<SearchMovie>> GetGenreMoviesAsync(int genreId, int page = 0, bool? includeAllMovies = null, CancellationToken cancellationToken = default)
         {
             return await GetGenreMoviesAsync(genreId, DefaultLanguage, page, includeAllMovies, cancellationToken).ConfigureAwait(false);
         }
 
         [Obsolete("GetGenreMovies is deprecated, use DiscoverMovies instead")]
-        public async Task<SearchContainerWithId<SearchMovie>> GetGenreMoviesAsync(int genreId, string language, int page = 0, bool? includeAllMovies = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainerWithId<SearchMovie>> GetGenreMoviesAsync(int genreId, string language, int page = 0, bool? includeAllMovies = null, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("genre/{genreId}/movies");
             req.AddUrlSegment("genreId", genreId.ToString());
@@ -32,17 +32,17 @@ namespace TMDbLib.Client
             if (includeAllMovies.HasValue)
                 req.AddParameter("include_all_movies", includeAllMovies.Value ? "true" : "false");
 
-            RestResponse<SearchContainerWithId<SearchMovie>> resp = await req.ExecuteGet<SearchContainerWithId<SearchMovie>>(cancellationToken).ConfigureAwait(false);
+            SearchContainerWithId<SearchMovie> resp = await req.GetOfT<SearchContainerWithId<SearchMovie>>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
 
-        public async Task<List<Genre>> GetMovieGenresAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<List<Genre>> GetMovieGenresAsync(CancellationToken cancellationToken = default)
         {
             return await GetMovieGenresAsync(DefaultLanguage, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<List<Genre>> GetMovieGenresAsync(string language, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<List<Genre>> GetMovieGenresAsync(string language, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("genre/movie/list");
 
@@ -50,17 +50,17 @@ namespace TMDbLib.Client
             if (!string.IsNullOrWhiteSpace(language))
                 req.AddParameter("language", language);
 
-            RestResponse<GenreContainer> resp = await req.ExecuteGet<GenreContainer>(cancellationToken).ConfigureAwait(false);
+            RestResponse<GenreContainer> resp = await req.Get<GenreContainer>(cancellationToken).ConfigureAwait(false);
 
             return (await resp.GetDataObject().ConfigureAwait(false)).Genres;
         }
 
-        public async Task<List<Genre>> GetTvGenresAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<List<Genre>> GetTvGenresAsync(CancellationToken cancellationToken = default)
         {
             return await GetTvGenresAsync(DefaultLanguage, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<List<Genre>> GetTvGenresAsync(string language, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<List<Genre>> GetTvGenresAsync(string language, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("genre/tv/list");
 
@@ -68,7 +68,7 @@ namespace TMDbLib.Client
             if (!string.IsNullOrWhiteSpace(language))
                 req.AddParameter("language", language);
 
-            RestResponse<GenreContainer> resp = await req.ExecuteGet<GenreContainer>(cancellationToken).ConfigureAwait(false);
+            RestResponse<GenreContainer> resp = await req.Get<GenreContainer>(cancellationToken).ConfigureAwait(false);
 
             return (await resp.GetDataObject().ConfigureAwait(false)).Genres;
         }
diff --git a/TMDbLib/Client/TMDbClientGuestSessions.cs b/TMDbLib/Client/TMDbClientGuestSessions.cs
index 633eaa8..420e264 100644
--- a/TMDbLib/Client/TMDbClientGuestSessions.cs
+++ b/TMDbLib/Client/TMDbClientGuestSessions.cs
@@ -10,12 +10,12 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
-        public async Task<SearchContainer<SearchMovieWithRating>> GetGuestSessionRatedMoviesAsync(int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchMovieWithRating>> GetGuestSessionRatedMoviesAsync(int page = 0, CancellationToken cancellationToken = default)
         {
             return await GetGuestSessionRatedMoviesAsync(DefaultLanguage, page, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchMovieWithRating>> GetGuestSessionRatedMoviesAsync(string language, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchMovieWithRating>> GetGuestSessionRatedMoviesAsync(string language, int page = 0, CancellationToken cancellationToken = default)
         {
             RequireSessionId(SessionType.GuestSession);
 
@@ -29,17 +29,17 @@ namespace TMDbLib.Client
 
             AddSessionId(request, SessionType.GuestSession, ParameterType.UrlSegment);
 
-            RestResponse<SearchContainer<SearchMovieWithRating>> resp = await request.ExecuteGet<SearchContainer<SearchMovieWithRating>>(cancellationToken).ConfigureAwait(false);
+            SearchContainer<SearchMovieWithRating> resp = await request.GetOfT<SearchContainer<SearchMovieWithRating>>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
 
-        public async Task<SearchContainer<SearchTvShowWithRating>> GetGuestSessionRatedTvAsync(int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchTvShowWithRating>> GetGuestSessionRatedTvAsync(int page = 0, CancellationToken cancellationToken = default)
         {
             return await GetGuestSessionRatedTvAsync(DefaultLanguage, page, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchTvShowWithRating>> GetGuestSessionRatedTvAsync(string language, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchTvShowWithRating>> GetGuestSessionRatedTvAsync(string language, int page = 0, CancellationToken cancellationToken = default)
         {
             RequireSessionId(SessionType.GuestSession);
 
@@ -53,17 +53,17 @@ namespace TMDbLib.Client
 
             AddSessionId(request, SessionType.GuestSession, ParameterType.UrlSegment);
 
-            RestResponse<SearchContainer<SearchTvShowWithRating>> resp = await request.ExecuteGet<SearchContainer<SearchTvShowWithRating>>(cancellationToken).ConfigureAwait(false);
+            SearchContainer<SearchTvShowWithRating> resp = await request.GetOfT<SearchContainer<SearchTvShowWithRating>>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
 
-        public async Task<SearchContainer<TvEpisodeWithRating>> GetGuestSessionRatedTvEpisodesAsync(int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<TvEpisodeWithRating>> GetGuestSessionRatedTvEpisodesAsync(int page = 0, CancellationToken cancellationToken = default)
         {
             return await GetGuestSessionRatedTvEpisodesAsync(DefaultLanguage, page, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<TvEpisodeWithRating>> GetGuestSessionRatedTvEpisodesAsync(string language, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<TvEpisodeWithRating>> GetGuestSessionRatedTvEpisodesAsync(string language, int page = 0, CancellationToken cancellationToken = default)
         {
             RequireSessionId(SessionType.GuestSession);
 
@@ -77,7 +77,7 @@ namespace TMDbLib.Client
 
             AddSessionId(request, SessionType.GuestSession, ParameterType.UrlSegment);
 
-            RestResponse<SearchContainer<TvEpisodeWithRating>> resp = await request.ExecuteGet<SearchContainer<TvEpisodeWithRating>>(cancellationToken).ConfigureAwait(false);
+            SearchContainer<TvEpisodeWithRating> resp = await request.GetOfT<SearchContainer<TvEpisodeWithRating>>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
diff --git a/TMDbLib/Client/TMDbClientKeywords.cs b/TMDbLib/Client/TMDbClientKeywords.cs
index ed4853a..2082654 100644
--- a/TMDbLib/Client/TMDbClientKeywords.cs
+++ b/TMDbLib/Client/TMDbClientKeywords.cs
@@ -8,22 +8,22 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
-        public async Task<Keyword> GetKeywordAsync(int keywordId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Keyword> GetKeywordAsync(int keywordId, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("keyword/{keywordId}");
             req.AddUrlSegment("keywordId", keywordId.ToString());
 
-            RestResponse<Keyword> resp = await req.ExecuteGet<Keyword>(cancellationToken).ConfigureAwait(false);
+            Keyword resp = await req.GetOfT<Keyword>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
 
-        public async Task<SearchContainerWithId<SearchMovie>> GetKeywordMoviesAsync(int keywordId, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainerWithId<SearchMovie>> GetKeywordMoviesAsync(int keywordId, int page = 0, CancellationToken cancellationToken = default)
         {
             return await GetKeywordMoviesAsync(keywordId, DefaultLanguage, page, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainerWithId<SearchMovie>> GetKeywordMoviesAsync(int keywordId, string language, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainerWithId<SearchMovie>> GetKeywordMoviesAsync(int keywordId, string language, int page = 0, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("keyword/{keywordId}/movies");
             req.AddUrlSegment("keywordId", keywordId.ToString());
@@ -35,7 +35,7 @@ namespace TMDbLib.Client
             if (page >= 1)
                 req.AddParameter("page", page.ToString());
 
-            RestResponse<SearchContainerWithId<SearchMovie>> resp = await req.ExecuteGet<SearchContainerWithId<SearchMovie>>(cancellationToken).ConfigureAwait(false);
+            SearchContainerWithId<SearchMovie> resp = await req.GetOfT<SearchContainerWithId<SearchMovie>>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
diff --git a/TMDbLib/Client/TMDbClientLists.cs b/TMDbLib/Client/TMDbClientLists.cs
index df11198..c965736 100644
--- a/TMDbLib/Client/TMDbClientLists.cs
+++ b/TMDbLib/Client/TMDbClientLists.cs
@@ -10,12 +10,40 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
+        private async Task<bool> GetManipulateMediaListAsyncInternal(string listId, int movieId, string method, CancellationToken cancellationToken = default)
+        {
+            RequireSessionId(SessionType.UserSession);
+
+            if (string.IsNullOrWhiteSpace(listId))
+                throw new ArgumentNullException(nameof(listId));
+
+            // Movie Id is expected by the API and can not be null
+            if (movieId <= 0)
+                throw new ArgumentOutOfRangeException(nameof(movieId));
+
+            RestRequest req = _client.Create("list/{listId}/{method}");
+            req.AddUrlSegment("listId", listId);
+            req.AddUrlSegment("method", method);
+            AddSessionId(req, SessionType.UserSession);
+
+            req.SetBody(new { media_id = movieId });
+
+            RestResponse<PostReply> response = await req.Post<PostReply>(cancellationToken).ConfigureAwait(false);
+
+            // Status code 12 = "The item/record was updated successfully"
+            // Status code 13 = "The item/record was deleted successfully"
+            PostReply item = await response.GetDataObject().ConfigureAwait(false);
+
+            // TODO: Previous code checked for item=null
+            return item.StatusCode == 12 || item.StatusCode == 13;
+        }
+
         /// <summary>
         /// Retrieve a list by it's id
         /// </summary>
         /// <param name="listId">The id of the list you want to retrieve</param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<GenericList> GetListAsync(string listId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<GenericList> GetListAsync(string listId, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrWhiteSpace(listId))
                 throw new ArgumentNullException(nameof(listId));
@@ -23,7 +51,7 @@ namespace TMDbLib.Client
             RestRequest req = _client.Create("list/{listId}");
             req.AddUrlSegment("listId", listId);
 
-            RestResponse<GenericList> resp = await req.ExecuteGet<GenericList>(cancellationToken).ConfigureAwait(false);
+            GenericList resp = await req.GetOfT<GenericList>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
@@ -34,7 +62,7 @@ namespace TMDbLib.Client
         /// <param name="listId">Id of the list to check in</param>
         /// <param name="movieId">Id of the movie to check for in the list</param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<bool> GetListIsMoviePresentAsync(string listId, int movieId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<bool> GetListIsMoviePresentAsync(string listId, int movieId, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrWhiteSpace(listId))
                 throw new ArgumentNullException(nameof(listId));
@@ -46,7 +74,7 @@ namespace TMDbLib.Client
             req.AddUrlSegment("listId", listId);
             req.AddParameter("movie_id", movieId.ToString());
 
-            RestResponse<ListStatus> response = await req.ExecuteGet<ListStatus>(cancellationToken).ConfigureAwait(false);
+            RestResponse<ListStatus> response = await req.Get<ListStatus>(cancellationToken).ConfigureAwait(false);
 
             return (await response.GetDataObject().ConfigureAwait(false)).ItemPresent;
         }
@@ -60,9 +88,9 @@ namespace TMDbLib.Client
         /// <returns>True if the method was able to add the movie to the list, will retrun false in case of an issue or when the movie was already added to the list</returns>
         /// <remarks>Requires a valid user session</remarks>
         /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<bool> ListAddMovieAsync(string listId, int movieId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<bool> ListAddMovieAsync(string listId, int movieId, CancellationToken cancellationToken = default)
         {
-            return await ManipulateMediaListAsync(listId, movieId, "add_item", cancellationToken).ConfigureAwait(false);
+            return await GetManipulateMediaListAsyncInternal(listId, movieId, "add_item", cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -73,7 +101,7 @@ namespace TMDbLib.Client
         /// <returns>True if the method was able to remove the movie from the list, will retrun false in case of an issue or when the movie was not present in the list</returns>
         /// <remarks>Requires a valid user session</remarks>
         /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<bool> ListClearAsync(string listId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<bool> ListClearAsync(string listId, CancellationToken cancellationToken = default)
         {
             RequireSessionId(SessionType.UserSession);
 
@@ -85,7 +113,7 @@ namespace TMDbLib.Client
             request.AddParameter("confirm", "true");
             AddSessionId(request, SessionType.UserSession);
 
-            RestResponse<PostReply> response = await request.ExecutePost<PostReply>(cancellationToken).ConfigureAwait(false);
+            RestResponse<PostReply> response = await request.Post<PostReply>(cancellationToken).ConfigureAwait(false);
 
             // Status code 12 = "The item/record was updated successfully"
             PostReply item = await response.GetDataObject().ConfigureAwait(false);
@@ -103,7 +131,7 @@ namespace TMDbLib.Client
         /// <param name="cancellationToken">A cancellation token</param>
         /// <remarks>Requires a valid user session</remarks>
         /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<string> ListCreateAsync(string name, string description = "", string language = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<string> ListCreateAsync(string name, string description = "", string language = null, CancellationToken cancellationToken = default)
         {
             RequireSessionId(SessionType.UserSession);
 
@@ -128,7 +156,7 @@ namespace TMDbLib.Client
                 req.SetBody(new { name = name, description = description });
             }
 
-            RestResponse<ListCreateReply> response = await req.ExecutePost<ListCreateReply>(cancellationToken).ConfigureAwait(false);
+            RestResponse<ListCreateReply> response = await req.Post<ListCreateReply>(cancellationToken).ConfigureAwait(false);
 
             return (await response.GetDataObject().ConfigureAwait(false)).ListId;
         }
@@ -140,7 +168,7 @@ namespace TMDbLib.Client
         /// <param name="cancellationToken">A cancellation token</param>
         /// <remarks>Requires a valid user session</remarks>
         /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<bool> ListDeleteAsync(string listId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<bool> ListDeleteAsync(string listId, CancellationToken cancellationToken = default)
         {
             RequireSessionId(SessionType.UserSession);
 
@@ -151,7 +179,7 @@ namespace TMDbLib.Client
             req.AddUrlSegment("listId", listId);
             AddSessionId(req, SessionType.UserSession);
 
-            RestResponse<PostReply> response = await req.ExecuteDelete<PostReply>(cancellationToken).ConfigureAwait(false);
+            RestResponse<PostReply> response = await req.Delete<PostReply>(cancellationToken).ConfigureAwait(false);
 
             // Status code 13 = success
             PostReply item = await response.GetDataObject().ConfigureAwait(false);
@@ -169,37 +197,9 @@ namespace TMDbLib.Client
         /// <returns>True if the method was able to remove the movie from the list, will retrun false in case of an issue or when the movie was not present in the list</returns>
         /// <remarks>Requires a valid user session</remarks>
         /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<bool> ListRemoveMovieAsync(string listId, int movieId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<bool> ListRemoveMovieAsync(string listId, int movieId, CancellationToken cancellationToken = default)
         {
-            return await ManipulateMediaListAsync(listId, movieId, "remove_item", cancellationToken).ConfigureAwait(false);
-        }
-
-        private async Task<bool> ManipulateMediaListAsync(string listId, int movieId, string method, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            RequireSessionId(SessionType.UserSession);
-
-            if (string.IsNullOrWhiteSpace(listId))
-                throw new ArgumentNullException(nameof(listId));
-
-            // Movie Id is expected by the API and can not be null
-            if (movieId <= 0)
-                throw new ArgumentOutOfRangeException(nameof(movieId));
-
-            RestRequest req = _client.Create("list/{listId}/{method}");
-            req.AddUrlSegment("listId", listId);
-            req.AddUrlSegment("method", method);
-            AddSessionId(req, SessionType.UserSession);
-
-            req.SetBody(new { media_id = movieId });
-
-            RestResponse<PostReply> response = await req.ExecutePost<PostReply>(cancellationToken).ConfigureAwait(false);
-
-            // Status code 12 = "The item/record was updated successfully"
-            // Status code 13 = "The item/record was deleted successfully"
-            PostReply item = await response.GetDataObject().ConfigureAwait(false);
-
-            // TODO: Previous code checked for item=null
-            return item.StatusCode == 12 || item.StatusCode == 13;
+            return await GetManipulateMediaListAsyncInternal(listId, movieId, "remove_item", cancellationToken).ConfigureAwait(false);
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLib/Client/TMDbClientMovies.cs b/TMDbLib/Client/TMDbClientMovies.cs
index 58a576c..cdbbf88 100644
--- a/TMDbLib/Client/TMDbClientMovies.cs
+++ b/TMDbLib/Client/TMDbClientMovies.cs
@@ -6,7 +6,6 @@ using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using TMDbLib.Objects.Authentication;
-using TMDbLib.Objects.Changes;
 using TMDbLib.Objects.General;
 using TMDbLib.Objects.Movies;
 using TMDbLib.Objects.Reviews;
@@ -19,6 +18,35 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
+        private async Task<T> GetMovieMethodInternal<T>(int movieId, MovieMethods movieMethod, string dateFormat = null,
+            string country = null,
+            string language = null, string includeImageLanguage = null, int page = 0, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default) where T : new()
+        {
+            RestRequest req = _client.Create("movie/{movieId}/{method}");
+            req.AddUrlSegment("movieId", movieId.ToString(CultureInfo.InvariantCulture));
+            req.AddUrlSegment("method", movieMethod.GetDescription());
+
+            if (country != null)
+                req.AddParameter("country", country);
+            language = language ?? DefaultLanguage;
+            if (!string.IsNullOrWhiteSpace(language))
+                req.AddParameter("language", language);
+
+            if (!string.IsNullOrWhiteSpace(includeImageLanguage))
+                req.AddParameter("include_image_language", includeImageLanguage);
+
+            if (page >= 1)
+                req.AddParameter("page", page.ToString());
+            if (startDate.HasValue)
+                req.AddParameter("start_date", startDate.Value.ToString("yyyy-MM-dd"));
+            if (endDate != null)
+                req.AddParameter("end_date", endDate.Value.ToString("yyyy-MM-dd"));
+
+            T response = await req.GetOfT<T>(cancellationToken).ConfigureAwait(false);
+
+            return response;
+        }
+
         /// <summary>
         /// Retrieves all information for a specific movie in relation to the current user account
         /// </summary>
@@ -26,7 +54,7 @@ namespace TMDbLib.Client
         /// <param name="cancellationToken">A cancellation token</param>
         /// <remarks>Requires a valid user session</remarks>
         /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<AccountState> GetMovieAccountStateAsync(int movieId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AccountState> GetMovieAccountStateAsync(int movieId, CancellationToken cancellationToken = default)
         {
             RequireSessionId(SessionType.UserSession);
 
@@ -35,32 +63,32 @@ namespace TMDbLib.Client
             req.AddUrlSegment("method", MovieMethods.AccountStates.GetDescription());
             AddSessionId(req, SessionType.UserSession);
 
-            RestResponse<AccountState> response = await req.ExecuteGet<AccountState>(cancellationToken).ConfigureAwait(false);
+            RestResponse<AccountState> response = await req.Get<AccountState>(cancellationToken).ConfigureAwait(false);
 
             return await response.GetDataObject().ConfigureAwait(false);
         }
 
-        public async Task<AlternativeTitles> GetMovieAlternativeTitlesAsync(int movieId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AlternativeTitles> GetMovieAlternativeTitlesAsync(int movieId, CancellationToken cancellationToken = default)
         {
             return await GetMovieAlternativeTitlesAsync(movieId, DefaultCountry, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<AlternativeTitles> GetMovieAlternativeTitlesAsync(int movieId, string country, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AlternativeTitles> GetMovieAlternativeTitlesAsync(int movieId, string country, CancellationToken cancellationToken = default)
         {
-            return await GetMovieMethod<AlternativeTitles>(movieId, MovieMethods.AlternativeTitles, country: country, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetMovieMethodInternal<AlternativeTitles>(movieId, MovieMethods.AlternativeTitles, country: country, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<Movie> GetMovieAsync(int movieId, MovieMethods extraMethods = MovieMethods.Undefined, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Movie> GetMovieAsync(int movieId, MovieMethods extraMethods = MovieMethods.Undefined, CancellationToken cancellationToken = default)
         {
             return await GetMovieAsync(movieId, DefaultLanguage, null, extraMethods, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<Movie> GetMovieAsync(string imdbId, MovieMethods extraMethods = MovieMethods.Undefined, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Movie> GetMovieAsync(string imdbId, MovieMethods extraMethods = MovieMethods.Undefined, CancellationToken cancellationToken = default)
         {
             return await GetMovieAsync(imdbId, DefaultLanguage, null, extraMethods, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<Movie> GetMovieAsync(int movieId, string language, string includeImageLanguage = null, MovieMethods extraMethods = MovieMethods.Undefined, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Movie> GetMovieAsync(int movieId, string language, string includeImageLanguage = null, MovieMethods extraMethods = MovieMethods.Undefined, CancellationToken cancellationToken = default)
         {
             return await GetMovieAsync(movieId.ToString(CultureInfo.InvariantCulture), language, includeImageLanguage, extraMethods, cancellationToken).ConfigureAwait(false);
         }
@@ -76,7 +104,7 @@ namespace TMDbLib.Client
         /// <returns>The reqed movie or null if it could not be found</returns>
         /// <remarks>Requires a valid user session when specifying the extra method 'AccountStates' flag</remarks>
         /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned, see remarks.</exception>
-        public async Task<Movie> GetMovieAsync(string imdbId, string language, string includeImageLanguage = null, MovieMethods extraMethods = MovieMethods.Undefined, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Movie> GetMovieAsync(string imdbId, string language, string includeImageLanguage = null, MovieMethods extraMethods = MovieMethods.Undefined, CancellationToken cancellationToken = default)
         {
             if (extraMethods.HasFlag(MovieMethods.AccountStates))
                 RequireSessionId(SessionType.UserSession);
@@ -103,7 +131,7 @@ namespace TMDbLib.Client
             if (appends != string.Empty)
                 req.AddParameter("append_to_response", appends);
 
-            RestResponse<Movie> response = await req.ExecuteGet<Movie>(cancellationToken).ConfigureAwait(false);
+            RestResponse<Movie> response = await req.Get<Movie>(cancellationToken).ConfigureAwait(false);
 
             if (!response.IsValid)
                 return null;
@@ -141,15 +169,9 @@ namespace TMDbLib.Client
             return item;
         }
 
-        public async Task<List<Change>> GetMovieChangesAsync(int movieId, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Credits> GetMovieCreditsAsync(int movieId, CancellationToken cancellationToken = default)
         {
-            ChangesContainer changesContainer = await GetMovieMethod<ChangesContainer>(movieId, MovieMethods.Changes, startDate: startDate, endDate: endDate, dateFormat: "yyyy-MM-dd HH:mm:ss UTC", cancellationToken: cancellationToken).ConfigureAwait(false);
-            return changesContainer.Changes;
-        }
-
-        public async Task<Credits> GetMovieCreditsAsync(int movieId, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return await GetMovieMethod<Credits>(movieId, MovieMethods.Credits, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetMovieMethodInternal<Credits>(movieId, MovieMethods.Credits, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -157,30 +179,30 @@ namespace TMDbLib.Client
         /// </summary>
         /// <param name="id">The TMDb id of the target movie.</param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<ExternalIdsMovie> GetMovieExternalIdsAsync(int id, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ExternalIdsMovie> GetMovieExternalIdsAsync(int id, CancellationToken cancellationToken = default)
         {
-            return await GetMovieMethod<ExternalIdsMovie>(id, MovieMethods.ExternalIds, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetMovieMethodInternal<ExternalIdsMovie>(id, MovieMethods.ExternalIds, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<ImagesWithId> GetMovieImagesAsync(int movieId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ImagesWithId> GetMovieImagesAsync(int movieId, CancellationToken cancellationToken = default)
         {
             return await GetMovieImagesAsync(movieId, DefaultLanguage, null, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<ImagesWithId> GetMovieImagesAsync(int movieId, string language, string includeImageLanguage = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ImagesWithId> GetMovieImagesAsync(int movieId, string language, string includeImageLanguage = null, CancellationToken cancellationToken = default)
         {
-            return await GetMovieMethod<ImagesWithId>(movieId, MovieMethods.Images, language: language, includeImageLanguage: includeImageLanguage, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetMovieMethodInternal<ImagesWithId>(movieId, MovieMethods.Images, language: language, includeImageLanguage: includeImageLanguage, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<KeywordsContainer> GetMovieKeywordsAsync(int movieId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<KeywordsContainer> GetMovieKeywordsAsync(int movieId, CancellationToken cancellationToken = default)
         {
-            return await GetMovieMethod<KeywordsContainer>(movieId, MovieMethods.Keywords, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetMovieMethodInternal<KeywordsContainer>(movieId, MovieMethods.Keywords, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<Movie> GetMovieLatestAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Movie> GetMovieLatestAsync(CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("movie/latest");
-            RestResponse<Movie> resp = await req.ExecuteGet<Movie>(cancellationToken).ConfigureAwait(false);
+            RestResponse<Movie> resp = await req.Get<Movie>(cancellationToken).ConfigureAwait(false);
 
             Movie item = await resp.GetDataObject().ConfigureAwait(false);
 
@@ -191,56 +213,27 @@ namespace TMDbLib.Client
             return item;
         }
 
-        public async Task<SearchContainerWithId<ListResult>> GetMovieListsAsync(int movieId, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainerWithId<ListResult>> GetMovieListsAsync(int movieId, int page = 0, CancellationToken cancellationToken = default)
         {
             return await GetMovieListsAsync(movieId, DefaultLanguage, page, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainerWithId<ListResult>> GetMovieListsAsync(int movieId, string language, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainerWithId<ListResult>> GetMovieListsAsync(int movieId, string language, int page = 0, CancellationToken cancellationToken = default)
         {
-            return await GetMovieMethod<SearchContainerWithId<ListResult>>(movieId, MovieMethods.Lists, page: page, language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetMovieMethodInternal<SearchContainerWithId<ListResult>>(movieId, MovieMethods.Lists, page: page, language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchMovie>> GetMovieRecommendationsAsync(int id, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchMovie>> GetMovieRecommendationsAsync(int id, int page = 0, CancellationToken cancellationToken = default)
         {
             return await GetMovieRecommendationsAsync(id, DefaultLanguage, page, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchMovie>> GetMovieRecommendationsAsync(int id, string language, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchMovie>> GetMovieRecommendationsAsync(int id, string language, int page = 0, CancellationToken cancellationToken = default)
         {
-            return await GetMovieMethod<SearchContainer<SearchMovie>>(id, MovieMethods.Recommendations, language: language, page: page, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetMovieMethodInternal<SearchContainer<SearchMovie>>(id, MovieMethods.Recommendations, language: language, page: page, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        private async Task<T> GetMovieMethod<T>(int movieId, MovieMethods movieMethod, string dateFormat = null,
-            string country = null,
-            string language = null, string includeImageLanguage = null, int page = 0, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default(CancellationToken)) where T : new()
-        {
-            RestRequest req = _client.Create("movie/{movieId}/{method}");
-            req.AddUrlSegment("movieId", movieId.ToString(CultureInfo.InvariantCulture));
-            req.AddUrlSegment("method", movieMethod.GetDescription());
-
-            if (country != null)
-                req.AddParameter("country", country);
-            language = language ?? DefaultLanguage;
-            if (!string.IsNullOrWhiteSpace(language))
-                req.AddParameter("language", language);
-
-            if (!string.IsNullOrWhiteSpace(includeImageLanguage))
-                req.AddParameter("include_image_language", includeImageLanguage);
-
-            if (page >= 1)
-                req.AddParameter("page", page.ToString());
-            if (startDate.HasValue)
-                req.AddParameter("start_date", startDate.Value.ToString("yyyy-MM-dd"));
-            if (endDate != null)
-                req.AddParameter("end_date", endDate.Value.ToString("yyyy-MM-dd"));
-
-            RestResponse<T> response = await req.ExecuteGet<T>(cancellationToken).ConfigureAwait(false);
-
-            return response;
-        }
-
-        public async Task<SearchContainerWithDates<SearchMovie>> GetMovieNowPlayingListAsync(string language = null, int page = 0, string region = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainerWithDates<SearchMovie>> GetMovieNowPlayingListAsync(string language = null, int page = 0, string region = null, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("movie/now_playing");
 
@@ -251,12 +244,12 @@ namespace TMDbLib.Client
             if (region != null)
                 req.AddParameter("region", region);
 
-            RestResponse<SearchContainerWithDates<SearchMovie>> resp = await req.ExecuteGet<SearchContainerWithDates<SearchMovie>>(cancellationToken).ConfigureAwait(false);
+            SearchContainerWithDates<SearchMovie> resp = await req.GetOfT<SearchContainerWithDates<SearchMovie>>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
 
-        public async Task<SearchContainer<SearchMovie>> GetMoviePopularListAsync(string language = null, int page = 0, string region = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchMovie>> GetMoviePopularListAsync(string language = null, int page = 0, string region = null, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("movie/popular");
 
@@ -267,42 +260,42 @@ namespace TMDbLib.Client
             if (region != null)
                 req.AddParameter("region", region);
 
-            RestResponse<SearchContainer<SearchMovie>> resp = await req.ExecuteGet<SearchContainer<SearchMovie>>(cancellationToken).ConfigureAwait(false);
+            SearchContainer<SearchMovie> resp = await req.GetOfT<SearchContainer<SearchMovie>>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
 
-        public async Task<ResultContainer<ReleaseDatesContainer>> GetMovieReleaseDatesAsync(int movieId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ResultContainer<ReleaseDatesContainer>> GetMovieReleaseDatesAsync(int movieId, CancellationToken cancellationToken = default)
         {
-            return await GetMovieMethod<ResultContainer<ReleaseDatesContainer>>(movieId, MovieMethods.ReleaseDates, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetMovieMethodInternal<ResultContainer<ReleaseDatesContainer>>(movieId, MovieMethods.ReleaseDates, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<Releases> GetMovieReleasesAsync(int movieId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Releases> GetMovieReleasesAsync(int movieId, CancellationToken cancellationToken = default)
         {
-            return await GetMovieMethod<Releases>(movieId, MovieMethods.Releases, dateFormat: "yyyy-MM-dd", cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetMovieMethodInternal<Releases>(movieId, MovieMethods.Releases, dateFormat: "yyyy-MM-dd", cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainerWithId<ReviewBase>> GetMovieReviewsAsync(int movieId, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainerWithId<ReviewBase>> GetMovieReviewsAsync(int movieId, int page = 0, CancellationToken cancellationToken = default)
         {
             return await GetMovieReviewsAsync(movieId, DefaultLanguage, page, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainerWithId<ReviewBase>> GetMovieReviewsAsync(int movieId, string language, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainerWithId<ReviewBase>> GetMovieReviewsAsync(int movieId, string language, int page = 0, CancellationToken cancellationToken = default)
         {
-            return await GetMovieMethod<SearchContainerWithId<ReviewBase>>(movieId, MovieMethods.Reviews, page: page, language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetMovieMethodInternal<SearchContainerWithId<ReviewBase>>(movieId, MovieMethods.Reviews, page: page, language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchMovie>> GetMovieSimilarAsync(int movieId, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchMovie>> GetMovieSimilarAsync(int movieId, int page = 0, CancellationToken cancellationToken = default)
         {
             return await GetMovieSimilarAsync(movieId, DefaultLanguage, page, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchMovie>> GetMovieSimilarAsync(int movieId, string language, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchMovie>> GetMovieSimilarAsync(int movieId, string language, int page = 0, CancellationToken cancellationToken = default)
         {
-            return await GetMovieMethod<SearchContainer<SearchMovie>>(movieId, MovieMethods.Similar, page: page, language: language, dateFormat: "yyyy-MM-dd", cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetMovieMethodInternal<SearchContainer<SearchMovie>>(movieId, MovieMethods.Similar, page: page, language: language, dateFormat: "yyyy-MM-dd", cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchMovie>> GetMovieTopRatedListAsync(string language = null, int page = 0, string region = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchMovie>> GetMovieTopRatedListAsync(string language = null, int page = 0, string region = null, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("movie/top_rated");
 
@@ -313,17 +306,17 @@ namespace TMDbLib.Client
             if (region != null)
                 req.AddParameter("region", region);
 
-            RestResponse<SearchContainer<SearchMovie>> resp = await req.ExecuteGet<SearchContainer<SearchMovie>>(cancellationToken).ConfigureAwait(false);
+            SearchContainer<SearchMovie> resp = await req.GetOfT<SearchContainer<SearchMovie>>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
 
-        public async Task<TranslationsContainer> GetMovieTranslationsAsync(int movieId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<TranslationsContainer> GetMovieTranslationsAsync(int movieId, CancellationToken cancellationToken = default)
         {
-            return await GetMovieMethod<TranslationsContainer>(movieId, MovieMethods.Translations, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetMovieMethodInternal<TranslationsContainer>(movieId, MovieMethods.Translations, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainerWithDates<SearchMovie>> GetMovieUpcomingListAsync(string language = null, int page = 0, string region = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainerWithDates<SearchMovie>> GetMovieUpcomingListAsync(string language = null, int page = 0, string region = null, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("movie/upcoming");
 
@@ -334,22 +327,22 @@ namespace TMDbLib.Client
             if (region != null)
                 req.AddParameter("region", region);
 
-            RestResponse<SearchContainerWithDates<SearchMovie>> resp = await req.ExecuteGet<SearchContainerWithDates<SearchMovie>>(cancellationToken).ConfigureAwait(false);
+            SearchContainerWithDates<SearchMovie> resp = await req.GetOfT<SearchContainerWithDates<SearchMovie>>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
 
-        public async Task<ResultContainer<Video>> GetMovieVideosAsync(int movieId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ResultContainer<Video>> GetMovieVideosAsync(int movieId, CancellationToken cancellationToken = default)
         {
-            return await GetMovieMethod<ResultContainer<Video>>(movieId, MovieMethods.Videos, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetMovieMethodInternal<ResultContainer<Video>>(movieId, MovieMethods.Videos, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SingleResultContainer<Dictionary<string, WatchProviders>>> GetMovieWatchProvidersAsync(int movieId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SingleResultContainer<Dictionary<string, WatchProviders>>> GetMovieWatchProvidersAsync(int movieId, CancellationToken cancellationToken = default)
         {
-            return await GetMovieMethod<SingleResultContainer<Dictionary<string, WatchProviders>>>(movieId, MovieMethods.WatchProviders, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetMovieMethodInternal<SingleResultContainer<Dictionary<string, WatchProviders>>>(movieId, MovieMethods.WatchProviders, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<bool> MovieRemoveRatingAsync(int movieId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<bool> MovieRemoveRatingAsync(int movieId, CancellationToken cancellationToken = default)
         {
             RequireSessionId(SessionType.GuestSession);
 
@@ -357,7 +350,7 @@ namespace TMDbLib.Client
             req.AddUrlSegment("movieId", movieId.ToString(CultureInfo.InvariantCulture));
             AddSessionId(req);
 
-            RestResponse<PostReply> response = await req.ExecuteDelete<PostReply>(cancellationToken).ConfigureAwait(false);
+            RestResponse<PostReply> response = await req.Delete<PostReply>(cancellationToken).ConfigureAwait(false);
 
             // status code 13 = "The item/record was deleted successfully."
             PostReply item = await response.GetDataObject().ConfigureAwait(false);
@@ -375,7 +368,7 @@ namespace TMDbLib.Client
         /// <returns>True if the the movie's rating was successfully updated, false if not</returns>
         /// <remarks>Requires a valid guest or user session</remarks>
         /// <exception cref="GuestSessionRequiredException">Thrown when the current client object doens't have a guest or user session assigned.</exception>
-        public async Task<bool> MovieSetRatingAsync(int movieId, double rating, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<bool> MovieSetRatingAsync(int movieId, double rating, CancellationToken cancellationToken = default)
         {
             RequireSessionId(SessionType.GuestSession);
 
@@ -385,7 +378,7 @@ namespace TMDbLib.Client
 
             req.SetBody(new { value = rating });
 
-            RestResponse<PostReply> response = await req.ExecutePost<PostReply>(cancellationToken).ConfigureAwait(false);
+            RestResponse<PostReply> response = await req.Post<PostReply>(cancellationToken).ConfigureAwait(false);
 
             // status code 1 = "Success"
             // status code 12 = "The item/record was updated successfully" - Used when an item was previously rated by the user
diff --git a/TMDbLib/Client/TMDbClientNetworks.cs b/TMDbLib/Client/TMDbClientNetworks.cs
index 58d56b3..2902560 100644
--- a/TMDbLib/Client/TMDbClientNetworks.cs
+++ b/TMDbLib/Client/TMDbClientNetworks.cs
@@ -14,12 +14,12 @@ namespace TMDbLib.Client
         /// </summary>
         /// <param name="networkId">The id of the network object to retrieve</param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<Network> GetNetworkAsync(int networkId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Network> GetNetworkAsync(int networkId, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("network/{networkId}");
             req.AddUrlSegment("networkId", networkId.ToString(CultureInfo.InvariantCulture));
 
-            RestResponse<Network> response = await req.ExecuteGet<Network>(cancellationToken).ConfigureAwait(false);
+            Network response = await req.GetOfT<Network>(cancellationToken).ConfigureAwait(false);
 
             return response;
         }
@@ -29,12 +29,12 @@ namespace TMDbLib.Client
         /// </summary>
         /// <param name="networkId">The TMDb id of the network</param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<NetworkLogos> GetNetworkImagesAsync(int networkId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<NetworkLogos> GetNetworkImagesAsync(int networkId, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("network/{networkId}/images");
             req.AddUrlSegment("networkId", networkId.ToString(CultureInfo.InvariantCulture));
 
-            RestResponse<NetworkLogos> response = await req.ExecuteGet<NetworkLogos>(cancellationToken).ConfigureAwait(false);
+            NetworkLogos response = await req.GetOfT<NetworkLogos>(cancellationToken).ConfigureAwait(false);
 
             return response;
         }
@@ -44,12 +44,12 @@ namespace TMDbLib.Client
         /// </summary>
         /// <param name="networkId">The TMDb id of the network</param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<AlternativeNames> GetNetworkAlternativeNamesAsync(int networkId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AlternativeNames> GetNetworkAlternativeNamesAsync(int networkId, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("network/{networkId}/alternative_names");
             req.AddUrlSegment("networkId", networkId.ToString(CultureInfo.InvariantCulture));
 
-            RestResponse<AlternativeNames> response = await req.ExecuteGet<AlternativeNames>(cancellationToken).ConfigureAwait(false);
+            AlternativeNames response = await req.GetOfT<AlternativeNames>(cancellationToken).ConfigureAwait(false);
 
             return response;
         }
diff --git a/TMDbLib/Client/TMDbClientPeople.cs b/TMDbLib/Client/TMDbClientPeople.cs
index 01bc34a..4163d7b 100644
--- a/TMDbLib/Client/TMDbClientPeople.cs
+++ b/TMDbLib/Client/TMDbClientPeople.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using TMDbLib.Objects.Changes;
 using TMDbLib.Objects.General;
 using TMDbLib.Objects.People;
 using TMDbLib.Rest;
@@ -13,110 +11,8 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
-        public async Task<Person> GetLatestPersonAsync(CancellationToken cancellationToken = default(CancellationToken))
-        {
-            RestRequest req = _client.Create("person/latest");
-
-            // TODO: Dateformat?
-            //req.DateFormat = "yyyy-MM-dd";
-
-            RestResponse<Person> resp = await req.ExecuteGet<Person>(cancellationToken).ConfigureAwait(false);
-
-            return resp;
-        }
-
-        public async Task<Person> GetPersonAsync(int personId, PersonMethods extraMethods = PersonMethods.Undefined,
-            CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return await GetPersonAsync(personId, DefaultLanguage, extraMethods, cancellationToken);
-        }
-
-        public async Task<Person> GetPersonAsync(int personId, string language, PersonMethods extraMethods = PersonMethods.Undefined, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            RestRequest req = _client.Create("person/{personId}");
-            req.AddUrlSegment("personId", personId.ToString());
-
-            if (language != null)
-                req.AddParameter("language", language);
-
-            string appends = string.Join(",",
-                                         Enum.GetValues(typeof(PersonMethods))
-                                             .OfType<PersonMethods>()
-                                             .Except(new[] { PersonMethods.Undefined })
-                                             .Where(s => extraMethods.HasFlag(s))
-                                             .Select(s => s.GetDescription()));
-
-            if (appends != string.Empty)
-                req.AddParameter("append_to_response", appends);
-
-            // TODO: Dateformat?
-            //req.DateFormat = "yyyy-MM-dd";
-
-            RestResponse<Person> response = await req.ExecuteGet<Person>(cancellationToken).ConfigureAwait(false);
-
-            if (!response.IsValid)
-                return null;
-
-            Person item = await response.GetDataObject().ConfigureAwait(false);
-
-            // Patch up data, so that the end user won't notice that we share objects between request-types.
-            if (item != null)
-            {
-                if (item.Images != null)
-                    item.Images.Id = item.Id;
-
-                if (item.TvCredits != null)
-                    item.TvCredits.Id = item.Id;
-
-                if (item.MovieCredits != null)
-                    item.MovieCredits.Id = item.Id;
-            }
-
-            return item;
-        }
-
-        public async Task<List<Change>> GetPersonChangesAsync(int personId, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            ChangesContainer changesContainer = await GetPersonMethod<ChangesContainer>(personId, PersonMethods.Changes, startDate: startDate, endDate: endDate, dateFormat: "yyyy-MM-dd HH:mm:ss UTC", cancellationToken: cancellationToken).ConfigureAwait(false);
-            return changesContainer.Changes;
-        }
-
-        public async Task<ExternalIdsPerson> GetPersonExternalIdsAsync(int personId, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return await GetPersonMethod<ExternalIdsPerson>(personId, PersonMethods.ExternalIds, cancellationToken: cancellationToken).ConfigureAwait(false);
-        }
-
-        public async Task<ProfileImages> GetPersonImagesAsync(int personId, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return await GetPersonMethod<ProfileImages>(personId, PersonMethods.Images, cancellationToken: cancellationToken).ConfigureAwait(false);
-        }
-
-        public async Task<SearchContainer<PersonResult>> GetPersonListAsync(PersonListType type, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            RestRequest req;
-            switch (type)
-            {
-                case PersonListType.Popular:
-                    req = _client.Create("person/popular");
-                    break;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(type));
-            }
-
-            if (page >= 1)
-                req.AddParameter("page", page.ToString());
-
-            // TODO: Dateformat?
-            //req.DateFormat = "yyyy-MM-dd";
-
-            RestResponse<SearchContainer<PersonResult>> resp = await req.ExecuteGet<SearchContainer<PersonResult>>(cancellationToken).ConfigureAwait(false);
-
-            return resp;
-        }
-
-        private async Task<T> GetPersonMethod<T>(int personId, PersonMethods personMethod, string dateFormat = null, string country = null, string language = null,
-                                        int page = 0, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default(CancellationToken)) where T : new()
+        private async Task<T> GetPersonMethodInternal<T>(int personId, PersonMethods personMethod, string dateFormat = null, string country = null, string language = null,
+            int page = 0, DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default) where T : new()
         {
             RestRequest req = _client.Create("person/{personId}/{method}");
             req.AddUrlSegment("personId", personId.ToString());
@@ -139,39 +35,135 @@ namespace TMDbLib.Client
             if (endDate != null)
                 req.AddParameter("endDate", endDate.Value.ToString("yyyy-MM-dd"));
 
-            RestResponse<T> resp = await req.ExecuteGet<T>(cancellationToken).ConfigureAwait(false);
+            T resp = await req.GetOfT<T>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
 
-        public async Task<MovieCredits> GetPersonMovieCreditsAsync(int personId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Person> GetLatestPersonAsync(CancellationToken cancellationToken = default)
+        {
+            RestRequest req = _client.Create("person/latest");
+
+            // TODO: Dateformat?
+            //req.DateFormat = "yyyy-MM-dd";
+
+            Person resp = await req.GetOfT<Person>(cancellationToken).ConfigureAwait(false);
+
+            return resp;
+        }
+
+        public async Task<Person> GetPersonAsync(int personId, PersonMethods extraMethods = PersonMethods.Undefined,
+            CancellationToken cancellationToken = default)
+        {
+            return await GetPersonAsync(personId, DefaultLanguage, extraMethods, cancellationToken);
+        }
+
+        public async Task<Person> GetPersonAsync(int personId, string language, PersonMethods extraMethods = PersonMethods.Undefined, CancellationToken cancellationToken = default)
+        {
+            RestRequest req = _client.Create("person/{personId}");
+            req.AddUrlSegment("personId", personId.ToString());
+
+            if (language != null)
+                req.AddParameter("language", language);
+
+            string appends = string.Join(",",
+                                         Enum.GetValues(typeof(PersonMethods))
+                                             .OfType<PersonMethods>()
+                                             .Except(new[] { PersonMethods.Undefined })
+                                             .Where(s => extraMethods.HasFlag(s))
+                                             .Select(s => s.GetDescription()));
+
+            if (appends != string.Empty)
+                req.AddParameter("append_to_response", appends);
+
+            // TODO: Dateformat?
+            //req.DateFormat = "yyyy-MM-dd";
+
+            RestResponse<Person> response = await req.Get<Person>(cancellationToken).ConfigureAwait(false);
+
+            if (!response.IsValid)
+                return null;
+
+            Person item = await response.GetDataObject().ConfigureAwait(false);
+
+            // Patch up data, so that the end user won't notice that we share objects between request-types.
+            if (item != null)
+            {
+                if (item.Images != null)
+                    item.Images.Id = item.Id;
+
+                if (item.TvCredits != null)
+                    item.TvCredits.Id = item.Id;
+
+                if (item.MovieCredits != null)
+                    item.MovieCredits.Id = item.Id;
+            }
+
+            return item;
+        }
+
+        public async Task<ExternalIdsPerson> GetPersonExternalIdsAsync(int personId, CancellationToken cancellationToken = default)
+        {
+            return await GetPersonMethodInternal<ExternalIdsPerson>(personId, PersonMethods.ExternalIds, cancellationToken: cancellationToken).ConfigureAwait(false);
+        }
+
+        public async Task<ProfileImages> GetPersonImagesAsync(int personId, CancellationToken cancellationToken = default)
+        {
+            return await GetPersonMethodInternal<ProfileImages>(personId, PersonMethods.Images, cancellationToken: cancellationToken).ConfigureAwait(false);
+        }
+
+        public async Task<SearchContainer<PersonResult>> GetPersonListAsync(PersonListType type, int page = 0, CancellationToken cancellationToken = default)
+        {
+            RestRequest req;
+            switch (type)
+            {
+                case PersonListType.Popular:
+                    req = _client.Create("person/popular");
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(type));
+            }
+
+            if (page >= 1)
+                req.AddParameter("page", page.ToString());
+
+            // TODO: Dateformat?
+            //req.DateFormat = "yyyy-MM-dd";
+
+            SearchContainer<PersonResult> resp = await req.GetOfT<SearchContainer<PersonResult>>(cancellationToken).ConfigureAwait(false);
+
+            return resp;
+        }
+
+        public async Task<MovieCredits> GetPersonMovieCreditsAsync(int personId, CancellationToken cancellationToken = default)
         {
             return await GetPersonMovieCreditsAsync(personId, DefaultLanguage, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<MovieCredits> GetPersonMovieCreditsAsync(int personId, string language, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<MovieCredits> GetPersonMovieCreditsAsync(int personId, string language, CancellationToken cancellationToken = default)
         {
-            return await GetPersonMethod<MovieCredits>(personId, PersonMethods.MovieCredits, language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetPersonMethodInternal<MovieCredits>(personId, PersonMethods.MovieCredits, language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainerWithId<TaggedImage>> GetPersonTaggedImagesAsync(int personId, int page, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainerWithId<TaggedImage>> GetPersonTaggedImagesAsync(int personId, int page, CancellationToken cancellationToken = default)
         {
             return await GetPersonTaggedImagesAsync(personId, DefaultLanguage, page, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainerWithId<TaggedImage>> GetPersonTaggedImagesAsync(int personId, string language, int page, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainerWithId<TaggedImage>> GetPersonTaggedImagesAsync(int personId, string language, int page, CancellationToken cancellationToken = default)
         {
-            return await GetPersonMethod<SearchContainerWithId<TaggedImage>>(personId, PersonMethods.TaggedImages, language: language, page: page, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetPersonMethodInternal<SearchContainerWithId<TaggedImage>>(personId, PersonMethods.TaggedImages, language: language, page: page, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<TvCredits> GetPersonTvCreditsAsync(int personId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<TvCredits> GetPersonTvCreditsAsync(int personId, CancellationToken cancellationToken = default)
         {
             return await GetPersonTvCreditsAsync(personId, DefaultLanguage, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<TvCredits> GetPersonTvCreditsAsync(int personId, string language, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<TvCredits> GetPersonTvCreditsAsync(int personId, string language, CancellationToken cancellationToken = default)
         {
-            return await GetPersonMethod<TvCredits>(personId, PersonMethods.TvCredits, language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetPersonMethodInternal<TvCredits>(personId, PersonMethods.TvCredits, language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLib/Client/TMDbClientReviews.cs b/TMDbLib/Client/TMDbClientReviews.cs
index 694329d..eadeece 100644
--- a/TMDbLib/Client/TMDbClientReviews.cs
+++ b/TMDbLib/Client/TMDbClientReviews.cs
@@ -7,7 +7,7 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
-        public async Task<Review> GetReviewAsync(string reviewId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Review> GetReviewAsync(string reviewId, CancellationToken cancellationToken = default)
         {
             RestRequest request  = _client.Create("review/{reviewId}");
             request.AddUrlSegment("reviewId", reviewId);
@@ -15,7 +15,7 @@ namespace TMDbLib.Client
             // TODO: Dateformat?
             //request.DateFormat = "yyyy-MM-dd";
 
-            RestResponse<Review> resp = await request.ExecuteGet<Review>(cancellationToken).ConfigureAwait(false);
+            Review resp = await request.GetOfT<Review>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
diff --git a/TMDbLib/Client/TMDbClientSearch.cs b/TMDbLib/Client/TMDbClientSearch.cs
index a5dbbcc..b2dff13 100644
--- a/TMDbLib/Client/TMDbClientSearch.cs
+++ b/TMDbLib/Client/TMDbClientSearch.cs
@@ -9,7 +9,7 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
-        private async Task<T> SearchMethod<T>(string method, string query, int page, string language = null, bool? includeAdult = null, int year = 0, string dateFormat = null, string region = null, int primaryReleaseYear = 0, int firstAirDateYear = 0, CancellationToken cancellationToken = default(CancellationToken)) where T : new()
+        private async Task<T> SearchMethodInternal<T>(string method, string query, int page, string language = null, bool? includeAdult = null, int year = 0, string dateFormat = null, string region = null, int primaryReleaseYear = 0, int firstAirDateYear = 0, CancellationToken cancellationToken = default) where T : new()
         {
             RestRequest req = _client.Create("search/{method}");
             req.AddUrlSegment("method", method);
@@ -38,75 +38,75 @@ namespace TMDbLib.Client
             if (firstAirDateYear >= 1)
                 req.AddParameter("first_air_date_year", firstAirDateYear.ToString());
 
-            RestResponse<T> resp = await req.ExecuteGet<T>(cancellationToken).ConfigureAwait(false);
+            T resp = await req.GetOfT<T>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
 
-        public async Task<SearchContainer<SearchCollection>> SearchCollectionAsync(string query, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchCollection>> SearchCollectionAsync(string query, int page = 0, CancellationToken cancellationToken = default)
         {
             return await SearchCollectionAsync(query, DefaultLanguage, page, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchCollection>> SearchCollectionAsync(string query, string language, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchCollection>> SearchCollectionAsync(string query, string language, int page = 0, CancellationToken cancellationToken = default)
         {
-            return await SearchMethod<SearchContainer<SearchCollection>>("collection", query, page, language, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await SearchMethodInternal<SearchContainer<SearchCollection>>("collection", query, page, language, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchCompany>> SearchCompanyAsync(string query, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchCompany>> SearchCompanyAsync(string query, int page = 0, CancellationToken cancellationToken = default)
         {
-            return await SearchMethod<SearchContainer<SearchCompany>>("company", query, page, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await SearchMethodInternal<SearchContainer<SearchCompany>>("company", query, page, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchKeyword>> SearchKeywordAsync(string query, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchKeyword>> SearchKeywordAsync(string query, int page = 0, CancellationToken cancellationToken = default)
         {
-            return await SearchMethod<SearchContainer<SearchKeyword>>("keyword", query, page, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await SearchMethodInternal<SearchContainer<SearchKeyword>>("keyword", query, page, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
         [Obsolete("20200701 No longer present in public API")]
-        public async Task<SearchContainer<SearchList>> SearchListAsync(string query, int page = 0, bool includeAdult = false, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchList>> SearchListAsync(string query, int page = 0, bool includeAdult = false, CancellationToken cancellationToken = default)
         {
-            return await SearchMethod<SearchContainer<SearchList>>("list", query, page, includeAdult: includeAdult, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await SearchMethodInternal<SearchContainer<SearchList>>("list", query, page, includeAdult: includeAdult, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchMovie>> SearchMovieAsync(string query, int page = 0, bool includeAdult = false, int year = 0, string region = null, int primaryReleaseYear = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchMovie>> SearchMovieAsync(string query, int page = 0, bool includeAdult = false, int year = 0, string region = null, int primaryReleaseYear = 0, CancellationToken cancellationToken = default)
         {
             return await SearchMovieAsync(query, DefaultLanguage, page, includeAdult, year, region, primaryReleaseYear, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchMovie>> SearchMovieAsync(string query, string language, int page = 0, bool includeAdult = false, int year = 0, string region = null, int primaryReleaseYear = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchMovie>> SearchMovieAsync(string query, string language, int page = 0, bool includeAdult = false, int year = 0, string region = null, int primaryReleaseYear = 0, CancellationToken cancellationToken = default)
         {
-            return await SearchMethod<SearchContainer<SearchMovie>>("movie", query, page, language, includeAdult, year, "yyyy-MM-dd", region, primaryReleaseYear, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await SearchMethodInternal<SearchContainer<SearchMovie>>("movie", query, page, language, includeAdult, year, "yyyy-MM-dd", region, primaryReleaseYear, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchBase>> SearchMultiAsync(string query, int page = 0, bool includeAdult = false, int year = 0, string region = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchBase>> SearchMultiAsync(string query, int page = 0, bool includeAdult = false, int year = 0, string region = null, CancellationToken cancellationToken = default)
         {
             return await SearchMultiAsync(query, DefaultLanguage, page, includeAdult, year, region, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchBase>> SearchMultiAsync(string query, string language, int page = 0, bool includeAdult = false, int year = 0, string region = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchBase>> SearchMultiAsync(string query, string language, int page = 0, bool includeAdult = false, int year = 0, string region = null, CancellationToken cancellationToken = default)
         {
-            return await SearchMethod<SearchContainer<SearchBase>>("multi", query, page, language, includeAdult, year, "yyyy-MM-dd", region, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await SearchMethodInternal<SearchContainer<SearchBase>>("multi", query, page, language, includeAdult, year, "yyyy-MM-dd", region, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchPerson>> SearchPersonAsync(string query, int page = 0, bool includeAdult = false, string region = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchPerson>> SearchPersonAsync(string query, int page = 0, bool includeAdult = false, string region = null, CancellationToken cancellationToken = default)
         {
             return await SearchPersonAsync(query, DefaultLanguage, page, includeAdult, region, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchPerson>> SearchPersonAsync(string query, string language, int page = 0, bool includeAdult = false, string region = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchPerson>> SearchPersonAsync(string query, string language, int page = 0, bool includeAdult = false, string region = null, CancellationToken cancellationToken = default)
         {
-            return await SearchMethod<SearchContainer<SearchPerson>>("person", query, page, language, includeAdult, region: region, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await SearchMethodInternal<SearchContainer<SearchPerson>>("person", query, page, language, includeAdult, region: region, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchTv>> SearchTvShowAsync(string query, int page = 0, bool includeAdult = false, int firstAirDateYear = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchTv>> SearchTvShowAsync(string query, int page = 0, bool includeAdult = false, int firstAirDateYear = 0, CancellationToken cancellationToken = default)
         {
             return await SearchTvShowAsync(query, DefaultLanguage, page, includeAdult, firstAirDateYear, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchTv>> SearchTvShowAsync(string query, string language, int page = 0, bool includeAdult = false, int firstAirDateYear = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchTv>> SearchTvShowAsync(string query, string language, int page = 0, bool includeAdult = false, int firstAirDateYear = 0, CancellationToken cancellationToken = default)
         {
-            return await SearchMethod<SearchContainer<SearchTv>>("tv", query, page, language, includeAdult, firstAirDateYear: firstAirDateYear, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await SearchMethodInternal<SearchContainer<SearchTv>>("tv", query, page, language, includeAdult, firstAirDateYear: firstAirDateYear, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLib/Client/TMDbClientTrending.cs b/TMDbLib/Client/TMDbClientTrending.cs
index 24d8ac1..4ec6264 100644
--- a/TMDbLib/Client/TMDbClientTrending.cs
+++ b/TMDbLib/Client/TMDbClientTrending.cs
@@ -9,7 +9,7 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
-        public async Task<SearchContainer<SearchMovie>> GetTrendingMoviesAsync(TimeWindow timeWindow, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchMovie>> GetTrendingMoviesAsync(TimeWindow timeWindow, int page = 0, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("trending/movie/{time_window}");
             req.AddUrlSegment("time_window", timeWindow.ToString());
@@ -17,12 +17,12 @@ namespace TMDbLib.Client
             if (page >= 1)
                 req.AddQueryString("page", page.ToString());
 
-            RestResponse<SearchContainer<SearchMovie>> resp = await req.ExecuteGet<SearchContainer<SearchMovie>>(cancellationToken).ConfigureAwait(false);
+            SearchContainer<SearchMovie> resp = await req.GetOfT<SearchContainer<SearchMovie>>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
 
-        public async Task<SearchContainer<SearchTv>> GetTrendingTvAsync(TimeWindow timeWindow, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchTv>> GetTrendingTvAsync(TimeWindow timeWindow, int page = 0, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("trending/tv/{time_window}");
             req.AddUrlSegment("time_window", timeWindow.ToString());
@@ -30,12 +30,12 @@ namespace TMDbLib.Client
             if (page >= 1)
                 req.AddQueryString("page", page.ToString());
 
-            RestResponse<SearchContainer<SearchTv>> resp = await req.ExecuteGet<SearchContainer<SearchTv>>(cancellationToken).ConfigureAwait(false);
+            SearchContainer<SearchTv> resp = await req.GetOfT<SearchContainer<SearchTv>>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
 
-        public async Task<SearchContainer<SearchPerson>> GetTrendingPeopleAsync(TimeWindow timeWindow, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchPerson>> GetTrendingPeopleAsync(TimeWindow timeWindow, int page = 0, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("trending/person/{time_window}");
             req.AddUrlSegment("time_window", timeWindow.ToString());
@@ -43,7 +43,7 @@ namespace TMDbLib.Client
             if (page >= 1)
                 req.AddQueryString("page", page.ToString());
 
-            RestResponse<SearchContainer<SearchPerson>> resp = await req.ExecuteGet<SearchContainer<SearchPerson>>(cancellationToken).ConfigureAwait(false);
+            SearchContainer<SearchPerson> resp = await req.GetOfT<SearchContainer<SearchPerson>>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
diff --git a/TMDbLib/Client/TMDbClientTvEpisodeGroups.cs b/TMDbLib/Client/TMDbClientTvEpisodeGroups.cs
index b84c51f..9b1b72e 100644
--- a/TMDbLib/Client/TMDbClientTvEpisodeGroups.cs
+++ b/TMDbLib/Client/TMDbClientTvEpisodeGroups.cs
@@ -14,7 +14,7 @@ namespace TMDbLib.Client
         /// <param name="language">If specified the api will attempt to return a localized result. ex: en,it,es </param>
         /// <param name="cancellationToken">A cancellation token</param>
         /// <returns>The requested collection of tv episode groups</returns>
-        public async Task<TvGroupCollection> GetTvEpisodeGroupsAsync(string id, string language = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<TvGroupCollection> GetTvEpisodeGroupsAsync(string id, string language = null, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("tv/episode_group/{id}");
             req.AddUrlSegment("id", id);
@@ -23,7 +23,7 @@ namespace TMDbLib.Client
             if (!string.IsNullOrWhiteSpace(language))
                 req.AddParameter("language", language);
 
-            RestResponse<TvGroupCollection> response = await req.ExecuteGet<TvGroupCollection>(cancellationToken).ConfigureAwait(false);
+            RestResponse<TvGroupCollection> response = await req.Get<TvGroupCollection>(cancellationToken).ConfigureAwait(false);
 
             if (!response.IsValid)
                 return null;
diff --git a/TMDbLib/Client/TMDbClientTvEpisodes.cs b/TMDbLib/Client/TMDbClientTvEpisodes.cs
index 3ecfb24..c5c0e49 100644
--- a/TMDbLib/Client/TMDbClientTvEpisodes.cs
+++ b/TMDbLib/Client/TMDbClientTvEpisodes.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using TMDbLib.Objects.Authentication;
-using TMDbLib.Objects.Changes;
 using TMDbLib.Objects.General;
 using TMDbLib.Objects.TvShows;
 using TMDbLib.Rest;
@@ -14,7 +13,29 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
-        public async Task<TvEpisodeAccountState> GetTvEpisodeAccountStateAsync(int tvShowId, int seasonNumber, int episodeNumber, CancellationToken cancellationToken = default(CancellationToken))
+        private async Task<T> GetTvEpisodeMethodInternal<T>(int tvShowId, int seasonNumber, int episodeNumber, TvEpisodeMethods tvShowMethod, string dateFormat = null, string language = null, CancellationToken cancellationToken = default) where T : new()
+        {
+            RestRequest req = _client.Create("tv/{id}/season/{season_number}/episode/{episode_number}/{method}");
+            req.AddUrlSegment("id", tvShowId.ToString(CultureInfo.InvariantCulture));
+            req.AddUrlSegment("season_number", seasonNumber.ToString(CultureInfo.InvariantCulture));
+            req.AddUrlSegment("episode_number", episodeNumber.ToString(CultureInfo.InvariantCulture));
+
+            req.AddUrlSegment("method", tvShowMethod.GetDescription());
+
+            // TODO: Dateformat?
+            //if (dateFormat != null)
+            //    req.DateFormat = dateFormat;
+
+            language = language ?? DefaultLanguage;
+            if (!string.IsNullOrWhiteSpace(language))
+                req.AddParameter("language", language);
+
+            T resp = await req.GetOfT<T>(cancellationToken).ConfigureAwait(false);
+
+            return resp;
+        }
+
+        public async Task<TvEpisodeAccountState> GetTvEpisodeAccountStateAsync(int tvShowId, int seasonNumber, int episodeNumber, CancellationToken cancellationToken = default)
         {
             RequireSessionId(SessionType.UserSession);
 
@@ -25,7 +46,7 @@ namespace TMDbLib.Client
             req.AddUrlSegment("method", TvEpisodeMethods.AccountStates.GetDescription());
             AddSessionId(req, SessionType.UserSession);
 
-            RestResponse<TvEpisodeAccountState> response = await req.ExecuteGet<TvEpisodeAccountState>(cancellationToken).ConfigureAwait(false);
+            RestResponse<TvEpisodeAccountState> response = await req.Get<TvEpisodeAccountState>(cancellationToken).ConfigureAwait(false);
 
             return await response.GetDataObject().ConfigureAwait(false);
         }
@@ -40,7 +61,7 @@ namespace TMDbLib.Client
         /// <param name="language">If specified the api will attempt to return a localized result. ex: en,it,es </param>
         /// <param name="includeImageLanguage">If specified the api will attempt to return localized image results eg. en,it,es.</param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<TvEpisode> GetTvEpisodeAsync(int tvShowId, int seasonNumber, int episodeNumber, TvEpisodeMethods extraMethods = TvEpisodeMethods.Undefined, string language = null, string includeImageLanguage = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<TvEpisode> GetTvEpisodeAsync(int tvShowId, int seasonNumber, int episodeNumber, TvEpisodeMethods extraMethods = TvEpisodeMethods.Undefined, string language = null, string includeImageLanguage = null, CancellationToken cancellationToken = default)
         {
             if (extraMethods.HasFlag(TvEpisodeMethods.AccountStates))
                 RequireSessionId(SessionType.UserSession);
@@ -71,7 +92,7 @@ namespace TMDbLib.Client
             if (appends != string.Empty)
                 req.AddParameter("append_to_response", appends);
 
-            RestResponse<TvEpisode> response = await req.ExecuteGet<TvEpisode>(cancellationToken).ConfigureAwait(false);
+            RestResponse<TvEpisode> response = await req.Get<TvEpisode>(cancellationToken).ConfigureAwait(false);
 
             if (!response.IsValid)
                 return null;
@@ -98,22 +119,12 @@ namespace TMDbLib.Client
             return item;
         }
 
-        public async Task<ChangesContainer> GetTvEpisodeChangesAsync(int episodeId, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            RestRequest req = _client.Create("tv/episode/{id}/changes");
-            req.AddUrlSegment("id", episodeId.ToString(CultureInfo.InvariantCulture));
-
-            RestResponse<ChangesContainer> response = await req.ExecuteGet<ChangesContainer>(cancellationToken).ConfigureAwait(false);
-
-            return response;
-        }
-
-        public async Task<ResultContainer<TvEpisodeInfo>> GetTvEpisodesScreenedTheatricallyAsync(int tvShowId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ResultContainer<TvEpisodeInfo>> GetTvEpisodesScreenedTheatricallyAsync(int tvShowId, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("tv/{tv_id}/screened_theatrically");
             req.AddUrlSegment("tv_id", tvShowId.ToString(CultureInfo.InvariantCulture));
 
-            return await req.ExecuteGet<ResultContainer<TvEpisodeInfo>>(cancellationToken).ConfigureAwait(false);
+            return await req.GetOfT<ResultContainer<TvEpisodeInfo>>(cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -124,9 +135,9 @@ namespace TMDbLib.Client
         /// <param name="episodeNumber">The episode number of the episode you want to retrieve information for.</param>
         /// <param name="language">If specified the api will attempt to return a localized result. ex: en,it,es </param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<CreditsWithGuestStars> GetTvEpisodeCreditsAsync(int tvShowId, int seasonNumber, int episodeNumber, string language = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<CreditsWithGuestStars> GetTvEpisodeCreditsAsync(int tvShowId, int seasonNumber, int episodeNumber, string language = null, CancellationToken cancellationToken = default)
         {
-            return await GetTvEpisodeMethod<CreditsWithGuestStars>(tvShowId, seasonNumber, episodeNumber, TvEpisodeMethods.Credits, dateFormat: "yyyy-MM-dd", language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvEpisodeMethodInternal<CreditsWithGuestStars>(tvShowId, seasonNumber, episodeNumber, TvEpisodeMethods.Credits, dateFormat: "yyyy-MM-dd", language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -136,9 +147,9 @@ namespace TMDbLib.Client
         /// <param name="seasonNumber">The season number of the season the episode belongs to. Note use 0 for specials.</param>
         /// <param name="episodeNumber">The episode number of the episode you want to retrieve information for.</param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<ExternalIdsTvEpisode> GetTvEpisodeExternalIdsAsync(int tvShowId, int seasonNumber, int episodeNumber, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ExternalIdsTvEpisode> GetTvEpisodeExternalIdsAsync(int tvShowId, int seasonNumber, int episodeNumber, CancellationToken cancellationToken = default)
         {
-            return await GetTvEpisodeMethod<ExternalIdsTvEpisode>(tvShowId, seasonNumber, episodeNumber, TvEpisodeMethods.ExternalIds, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvEpisodeMethodInternal<ExternalIdsTvEpisode>(tvShowId, seasonNumber, episodeNumber, TvEpisodeMethods.ExternalIds, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -152,39 +163,17 @@ namespace TMDbLib.Client
         /// For images this means that the image might contain language specifc text
         /// </param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<StillImages> GetTvEpisodeImagesAsync(int tvShowId, int seasonNumber, int episodeNumber, string language = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<StillImages> GetTvEpisodeImagesAsync(int tvShowId, int seasonNumber, int episodeNumber, string language = null, CancellationToken cancellationToken = default)
         {
-            return await GetTvEpisodeMethod<StillImages>(tvShowId, seasonNumber, episodeNumber, TvEpisodeMethods.Images, language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvEpisodeMethodInternal<StillImages>(tvShowId, seasonNumber, episodeNumber, TvEpisodeMethods.Images, language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        private async Task<T> GetTvEpisodeMethod<T>(int tvShowId, int seasonNumber, int episodeNumber, TvEpisodeMethods tvShowMethod, string dateFormat = null, string language = null, CancellationToken cancellationToken = default(CancellationToken)) where T : new()
+        public async Task<ResultContainer<Video>> GetTvEpisodeVideosAsync(int tvShowId, int seasonNumber, int episodeNumber, CancellationToken cancellationToken = default)
         {
-            RestRequest req = _client.Create("tv/{id}/season/{season_number}/episode/{episode_number}/{method}");
-            req.AddUrlSegment("id", tvShowId.ToString(CultureInfo.InvariantCulture));
-            req.AddUrlSegment("season_number", seasonNumber.ToString(CultureInfo.InvariantCulture));
-            req.AddUrlSegment("episode_number", episodeNumber.ToString(CultureInfo.InvariantCulture));
-
-            req.AddUrlSegment("method", tvShowMethod.GetDescription());
-
-            // TODO: Dateformat?
-            //if (dateFormat != null)
-            //    req.DateFormat = dateFormat;
-
-            language = language ?? DefaultLanguage;
-            if (!string.IsNullOrWhiteSpace(language))
-                req.AddParameter("language", language);
-
-            RestResponse<T> resp = await req.ExecuteGet<T>(cancellationToken).ConfigureAwait(false);
-
-            return resp;
+            return await GetTvEpisodeMethodInternal<ResultContainer<Video>>(tvShowId, seasonNumber, episodeNumber, TvEpisodeMethods.Videos, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<ResultContainer<Video>> GetTvEpisodeVideosAsync(int tvShowId, int seasonNumber, int episodeNumber, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return await GetTvEpisodeMethod<ResultContainer<Video>>(tvShowId, seasonNumber, episodeNumber, TvEpisodeMethods.Videos, cancellationToken: cancellationToken).ConfigureAwait(false);
-        }
-
-        public async Task<bool> TvEpisodeRemoveRatingAsync(int tvShowId, int seasonNumber, int episodeNumber, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<bool> TvEpisodeRemoveRatingAsync(int tvShowId, int seasonNumber, int episodeNumber, CancellationToken cancellationToken = default)
         {
             RequireSessionId(SessionType.GuestSession);
 
@@ -195,7 +184,7 @@ namespace TMDbLib.Client
 
             AddSessionId(req);
 
-            RestResponse<PostReply> response = await req.ExecuteDelete<PostReply>(cancellationToken).ConfigureAwait(false);
+            RestResponse<PostReply> response = await req.Delete<PostReply>(cancellationToken).ConfigureAwait(false);
 
             // status code 13 = "The item/record was deleted successfully."
             PostReply item = await response.GetDataObject().ConfigureAwait(false);
@@ -204,7 +193,7 @@ namespace TMDbLib.Client
             return item.StatusCode == 13;
         }
 
-        public async Task<bool> TvEpisodeSetRatingAsync(int tvShowId, int seasonNumber, int episodeNumber, double rating, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<bool> TvEpisodeSetRatingAsync(int tvShowId, int seasonNumber, int episodeNumber, double rating, CancellationToken cancellationToken = default)
         {
             RequireSessionId(SessionType.GuestSession);
 
@@ -217,7 +206,7 @@ namespace TMDbLib.Client
 
             req.SetBody(new { value = rating });
 
-            RestResponse<PostReply> response = await req.ExecutePost<PostReply>(cancellationToken).ConfigureAwait(false);
+            RestResponse<PostReply> response = await req.Post<PostReply>(cancellationToken).ConfigureAwait(false);
 
             // status code 1 = "Success"
             // status code 12 = "The item/record was updated successfully" - Used when an item was previously rated by the user
diff --git a/TMDbLib/Client/TMDbClientTvSeasons.cs b/TMDbLib/Client/TMDbClientTvSeasons.cs
index 0b6eec3..ef95bc2 100644
--- a/TMDbLib/Client/TMDbClientTvSeasons.cs
+++ b/TMDbLib/Client/TMDbClientTvSeasons.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using TMDbLib.Objects.Authentication;
-using TMDbLib.Objects.Changes;
 using TMDbLib.Objects.General;
 using TMDbLib.Objects.TvShows;
 using TMDbLib.Rest;
@@ -15,7 +14,27 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
-        public async Task<ResultContainer<TvEpisodeAccountStateWithNumber>> GetTvSeasonAccountStateAsync(int tvShowId, int seasonNumber, CancellationToken cancellationToken = default(CancellationToken))
+        private async Task<T> GetTvSeasonMethodInternal<T>(int tvShowId, int seasonNumber, TvSeasonMethods tvShowMethod, string dateFormat = null, string language = null, CancellationToken cancellationToken = default) where T : new()
+        {
+            RestRequest req = _client.Create("tv/{id}/season/{season_number}/{method}");
+            req.AddUrlSegment("id", tvShowId.ToString(CultureInfo.InvariantCulture));
+            req.AddUrlSegment("season_number", seasonNumber.ToString(CultureInfo.InvariantCulture));
+            req.AddUrlSegment("method", tvShowMethod.GetDescription());
+
+            // TODO: Dateformat?
+            //if (dateFormat != null)
+            //    req.DateFormat = dateFormat;
+
+            language = language ?? DefaultLanguage;
+            if (!string.IsNullOrWhiteSpace(language))
+                req.AddParameter("language", language);
+
+            T response = await req.GetOfT<T>(cancellationToken).ConfigureAwait(false);
+
+            return response;
+        }
+
+        public async Task<ResultContainer<TvEpisodeAccountStateWithNumber>> GetTvSeasonAccountStateAsync(int tvShowId, int seasonNumber, CancellationToken cancellationToken = default)
         {
             RequireSessionId(SessionType.UserSession);
 
@@ -25,7 +44,7 @@ namespace TMDbLib.Client
             req.AddUrlSegment("method", TvEpisodeMethods.AccountStates.GetDescription());
             AddSessionId(req, SessionType.UserSession);
 
-            RestResponse<ResultContainer<TvEpisodeAccountStateWithNumber>> response = await req.ExecuteGet<ResultContainer<TvEpisodeAccountStateWithNumber>>(cancellationToken).ConfigureAwait(false);
+            RestResponse<ResultContainer<TvEpisodeAccountStateWithNumber>> response = await req.Get<ResultContainer<TvEpisodeAccountStateWithNumber>>(cancellationToken).ConfigureAwait(false);
 
             return await response.GetDataObject().ConfigureAwait(false);
         }
@@ -40,7 +59,7 @@ namespace TMDbLib.Client
         /// <param name="includeImageLanguage">If specified the api will attempt to return localized image results eg. en,it,es.</param>
         /// <param name="cancellationToken">A cancellation token</param>
         /// <returns>The requested season for the specified tv show</returns>
-        public async Task<TvSeason> GetTvSeasonAsync(int tvShowId, int seasonNumber, TvSeasonMethods extraMethods = TvSeasonMethods.Undefined, string language = null, string includeImageLanguage = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<TvSeason> GetTvSeasonAsync(int tvShowId, int seasonNumber, TvSeasonMethods extraMethods = TvSeasonMethods.Undefined, string language = null, string includeImageLanguage = null, CancellationToken cancellationToken = default)
         {
             if (extraMethods.HasFlag(TvSeasonMethods.AccountStates))
                 RequireSessionId(SessionType.UserSession);
@@ -70,7 +89,7 @@ namespace TMDbLib.Client
             if (appends != string.Empty)
                 req.AddParameter("append_to_response", appends);
 
-            RestResponse<TvSeason> response = await req.ExecuteGet<TvSeason>(cancellationToken).ConfigureAwait(false);
+            RestResponse<TvSeason> response = await req.Get<TvSeason>(cancellationToken).ConfigureAwait(false);
 
             if (!response.IsValid)
                 return null;
@@ -99,16 +118,6 @@ namespace TMDbLib.Client
             return item;
         }
 
-        public async Task<ChangesContainer> GetTvSeasonChangesAsync(int seasonId, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            RestRequest req = _client.Create("tv/season/{id}/changes");
-            req.AddUrlSegment("id", seasonId.ToString(CultureInfo.InvariantCulture));
-
-            RestResponse<ChangesContainer> response = await req.ExecuteGet<ChangesContainer>(cancellationToken).ConfigureAwait(false);
-
-            return response;
-        }
-
         /// <summary>
         /// Returns a credits object for the season of the tv show associated with the provided TMDb id.
         /// </summary>
@@ -116,9 +125,9 @@ namespace TMDbLib.Client
         /// <param name="seasonNumber">The season number of the season you want to retrieve information for. Note use 0 for specials.</param>
         /// <param name="language">If specified the api will attempt to return a localized result. ex: en,it,es </param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<Credits> GetTvSeasonCreditsAsync(int tvShowId, int seasonNumber, string language = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Credits> GetTvSeasonCreditsAsync(int tvShowId, int seasonNumber, string language = null, CancellationToken cancellationToken = default)
         {
-            return await GetTvSeasonMethod<Credits>(tvShowId, seasonNumber, TvSeasonMethods.Credits, dateFormat: "yyyy-MM-dd", language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvSeasonMethodInternal<Credits>(tvShowId, seasonNumber, TvSeasonMethods.Credits, dateFormat: "yyyy-MM-dd", language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -127,9 +136,9 @@ namespace TMDbLib.Client
         /// <param name="tvShowId">The TMDb id of the target tv show.</param>
         /// <param name="seasonNumber">The season number of the season you want to retrieve information for. Note use 0 for specials.</param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<ExternalIdsTvSeason> GetTvSeasonExternalIdsAsync(int tvShowId, int seasonNumber, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ExternalIdsTvSeason> GetTvSeasonExternalIdsAsync(int tvShowId, int seasonNumber, CancellationToken cancellationToken = default)
         {
-            return await GetTvSeasonMethod<ExternalIdsTvSeason>(tvShowId, seasonNumber, TvSeasonMethods.ExternalIds, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvSeasonMethodInternal<ExternalIdsTvSeason>(tvShowId, seasonNumber, TvSeasonMethods.ExternalIds, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -142,34 +151,14 @@ namespace TMDbLib.Client
         /// For images this means that the image might contain language specifc text
         /// </param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<PosterImages> GetTvSeasonImagesAsync(int tvShowId, int seasonNumber, string language = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<PosterImages> GetTvSeasonImagesAsync(int tvShowId, int seasonNumber, string language = null, CancellationToken cancellationToken = default)
         {
-            return await GetTvSeasonMethod<PosterImages>(tvShowId, seasonNumber, TvSeasonMethods.Images, language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvSeasonMethodInternal<PosterImages>(tvShowId, seasonNumber, TvSeasonMethods.Images, language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        private async Task<T> GetTvSeasonMethod<T>(int tvShowId, int seasonNumber, TvSeasonMethods tvShowMethod, string dateFormat = null, string language = null, CancellationToken cancellationToken = default(CancellationToken)) where T : new()
+        public async Task<ResultContainer<Video>> GetTvSeasonVideosAsync(int tvShowId, int seasonNumber, string language = null, CancellationToken cancellationToken = default)
         {
-            RestRequest req = _client.Create("tv/{id}/season/{season_number}/{method}");
-            req.AddUrlSegment("id", tvShowId.ToString(CultureInfo.InvariantCulture));
-            req.AddUrlSegment("season_number", seasonNumber.ToString(CultureInfo.InvariantCulture));
-            req.AddUrlSegment("method", tvShowMethod.GetDescription());
-
-            // TODO: Dateformat?
-            //if (dateFormat != null)
-            //    req.DateFormat = dateFormat;
-
-            language = language ?? DefaultLanguage;
-            if (!string.IsNullOrWhiteSpace(language))
-                req.AddParameter("language", language);
-
-            RestResponse<T> response = await req.ExecuteGet<T>(cancellationToken).ConfigureAwait(false);
-
-            return response;
-        }
-
-        public async Task<ResultContainer<Video>> GetTvSeasonVideosAsync(int tvShowId, int seasonNumber, string language = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return await GetTvSeasonMethod<ResultContainer<Video>>(tvShowId, seasonNumber, TvSeasonMethods.Videos, language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvSeasonMethodInternal<ResultContainer<Video>>(tvShowId, seasonNumber, TvSeasonMethods.Videos, language: language, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLib/Client/TMDbClientTvShows.cs b/TMDbLib/Client/TMDbClientTvShows.cs
index afb8ff3..6675ec6 100644
--- a/TMDbLib/Client/TMDbClientTvShows.cs
+++ b/TMDbLib/Client/TMDbClientTvShows.cs
@@ -18,11 +18,53 @@ namespace TMDbLib.Client
 {
     public partial class TMDbClient
     {
-        public async Task<TvShow> GetLatestTvShowAsync(CancellationToken cancellationToken = default(CancellationToken))
+        private async Task<T> GetTvShowMethodInternal<T>(int id, TvShowMethods tvShowMethod, string dateFormat = null, string language = null, string includeImageLanguage = null, int page = 0, CancellationToken cancellationToken = default) where T : new()
+        {
+            RestRequest req = _client.Create("tv/{id}/{method}");
+            req.AddUrlSegment("id", id.ToString(CultureInfo.InvariantCulture));
+            req.AddUrlSegment("method", tvShowMethod.GetDescription());
+
+            // TODO: Dateformat?
+            //if (dateFormat != null)
+            //    req.DateFormat = dateFormat;
+
+            if (page > 0)
+                req.AddParameter("page", page.ToString());
+
+            language = language ?? DefaultLanguage;
+            if (!string.IsNullOrWhiteSpace(language))
+                req.AddParameter("language", language);
+
+            includeImageLanguage = includeImageLanguage ?? DefaultImageLanguage;
+            if (!string.IsNullOrWhiteSpace(includeImageLanguage))
+                req.AddParameter("include_image_language", includeImageLanguage);
+
+            T resp = await req.GetOfT<T>(cancellationToken).ConfigureAwait(false);
+
+            return resp;
+        }
+
+        private async Task<SearchContainer<SearchTv>> GetTvShowListInternal(int page, string language, string tvShowListType, CancellationToken cancellationToken = default)
+        {
+            RestRequest req = _client.Create("tv/" + tvShowListType);
+
+            language = language ?? DefaultLanguage;
+            if (!string.IsNullOrWhiteSpace(language))
+                req.AddParameter("language", language);
+
+            if (page >= 1)
+                req.AddParameter("page", page.ToString());
+
+            SearchContainer<SearchTv> response = await req.GetOfT<SearchContainer<SearchTv>>(cancellationToken).ConfigureAwait(false);
+
+            return response;
+        }
+
+        public async Task<TvShow> GetLatestTvShowAsync(CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("tv/latest");
 
-            RestResponse<TvShow> resp = await req.ExecuteGet<TvShow>(cancellationToken).ConfigureAwait(false);
+            TvShow resp = await req.GetOfT<TvShow>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
@@ -34,7 +76,7 @@ namespace TMDbLib.Client
         /// <param name="cancellationToken">A cancellation token</param>
         /// <remarks>Requires a valid user session</remarks>
         /// <exception cref="UserSessionRequiredException">Thrown when the current client object doens't have a user session assigned.</exception>
-        public async Task<AccountState> GetTvShowAccountStateAsync(int tvShowId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AccountState> GetTvShowAccountStateAsync(int tvShowId, CancellationToken cancellationToken = default)
         {
             RequireSessionId(SessionType.UserSession);
 
@@ -43,14 +85,14 @@ namespace TMDbLib.Client
             req.AddUrlSegment("method", TvShowMethods.AccountStates.GetDescription());
             AddSessionId(req, SessionType.UserSession);
 
-            RestResponse<AccountState> response = await req.ExecuteGet<AccountState>(cancellationToken).ConfigureAwait(false);
+            RestResponse<AccountState> response = await req.Get<AccountState>(cancellationToken).ConfigureAwait(false);
 
             return await response.GetDataObject().ConfigureAwait(false);
         }
 
-        public async Task<ResultContainer<AlternativeTitle>> GetTvShowAlternativeTitlesAsync(int id, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ResultContainer<AlternativeTitle>> GetTvShowAlternativeTitlesAsync(int id, CancellationToken cancellationToken = default)
         {
-            return await GetTvShowMethod<ResultContainer<AlternativeTitle>>(id, TvShowMethods.AlternativeTitles, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvShowMethodInternal<ResultContainer<AlternativeTitle>>(id, TvShowMethods.AlternativeTitles, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -62,7 +104,7 @@ namespace TMDbLib.Client
         /// <param name="includeImageLanguage">If specified the api will attempt to return localized image results eg. en,it,es.</param>
         /// <param name="cancellationToken">A cancellation token</param>
         /// <returns>The requested Tv Show</returns>
-        public async Task<TvShow> GetTvShowAsync(int id, TvShowMethods extraMethods = TvShowMethods.Undefined, string language = null, string includeImageLanguage = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<TvShow> GetTvShowAsync(int id, TvShowMethods extraMethods = TvShowMethods.Undefined, string language = null, string includeImageLanguage = null, CancellationToken cancellationToken = default)
         {
             if (extraMethods.HasFlag(TvShowMethods.AccountStates))
                 RequireSessionId(SessionType.UserSession);
@@ -90,7 +132,7 @@ namespace TMDbLib.Client
             if (appends != string.Empty)
                 req.AddParameter("append_to_response", appends);
 
-            RestResponse<TvShow> response = await req.ExecuteGet<TvShow>(cancellationToken).ConfigureAwait(false);
+            RestResponse<TvShow> response = await req.Get<TvShow>(cancellationToken).ConfigureAwait(false);
 
             if (!response.IsValid)
                 return null;
@@ -117,14 +159,14 @@ namespace TMDbLib.Client
             return item;
         }
 
-        public async Task<ChangesContainer> GetTvShowChangesAsync(int id, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ChangesContainer> GetTvShowChangesAsync(int id, CancellationToken cancellationToken = default)
         {
-            return await GetTvShowMethod<ChangesContainer>(id, TvShowMethods.Changes, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvShowMethodInternal<ChangesContainer>(id, TvShowMethods.Changes, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<ResultContainer<ContentRating>> GetTvShowContentRatingsAsync(int id, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ResultContainer<ContentRating>> GetTvShowContentRatingsAsync(int id, CancellationToken cancellationToken = default)
         {
-            return await GetTvShowMethod<ResultContainer<ContentRating>>(id, TvShowMethods.ContentRatings, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvShowMethodInternal<ResultContainer<ContentRating>>(id, TvShowMethods.ContentRatings, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -133,9 +175,9 @@ namespace TMDbLib.Client
         /// <param name="id">The TMDb id of the target tv show.</param>
         /// <param name="language">If specified the api will attempt to return a localized result. ex: en,it,es </param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<Credits> GetTvShowCreditsAsync(int id, string language = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Credits> GetTvShowCreditsAsync(int id, string language = null, CancellationToken cancellationToken = default)
         {
-            return await GetTvShowMethod<Credits>(id, TvShowMethods.Credits, "yyyy-MM-dd", language, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvShowMethodInternal<Credits>(id, TvShowMethods.Credits, "yyyy-MM-dd", language, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -143,9 +185,9 @@ namespace TMDbLib.Client
         /// </summary>
         /// <param name="id">The TMDb id of the target tv show.</param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<ExternalIdsTvShow> GetTvShowExternalIdsAsync(int id, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ExternalIdsTvShow> GetTvShowExternalIdsAsync(int id, CancellationToken cancellationToken = default)
         {
-            return await GetTvShowMethod<ExternalIdsTvShow>(id, TvShowMethods.ExternalIds, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvShowMethodInternal<ExternalIdsTvShow>(id, TvShowMethods.ExternalIds, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -157,35 +199,19 @@ namespace TMDbLib.Client
         /// For images this means that the image might contain language specifc text
         /// </param>
         /// <param name="cancellationToken">A cancellation token</param>
-        public async Task<ImagesWithId> GetTvShowImagesAsync(int id, string language = null, string includeImageLanguage = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ImagesWithId> GetTvShowImagesAsync(int id, string language = null, string includeImageLanguage = null, CancellationToken cancellationToken = default)
         {
-            return await GetTvShowMethod<ImagesWithId>(id, TvShowMethods.Images, language: language, includeImageLanguage: includeImageLanguage, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvShowMethodInternal<ImagesWithId>(id, TvShowMethods.Images, language: language, includeImageLanguage: includeImageLanguage, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainerWithId<ReviewBase>> GetTvShowReviewsAsync(int id, string language = null, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainerWithId<ReviewBase>> GetTvShowReviewsAsync(int id, string language = null, int page = 0, CancellationToken cancellationToken = default)
         {
-            return await GetTvShowMethod<SearchContainerWithId<ReviewBase>>(id, TvShowMethods.Reviews, language: language, page: page, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvShowMethodInternal<SearchContainerWithId<ReviewBase>>(id, TvShowMethods.Reviews, language: language, page: page, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<ResultContainer<Keyword>> GetTvShowKeywordsAsync(int id, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ResultContainer<Keyword>> GetTvShowKeywordsAsync(int id, CancellationToken cancellationToken = default)
         {
-            return await GetTvShowMethod<ResultContainer<Keyword>>(id, TvShowMethods.Keywords, cancellationToken: cancellationToken).ConfigureAwait(false);
-        }
-
-        private async Task<SearchContainer<SearchTv>> GetTvShowListAsync(int page, string language, string tvShowListType, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            RestRequest req = _client.Create("tv/" + tvShowListType);
-
-            language = language ?? DefaultLanguage;
-            if (!string.IsNullOrWhiteSpace(language))
-                req.AddParameter("language", language);
-
-            if (page >= 1)
-                req.AddParameter("page", page.ToString());
-
-            RestResponse<SearchContainer<SearchTv>> response = await req.ExecuteGet<SearchContainer<SearchTv>>(cancellationToken).ConfigureAwait(false);
-
-            return response;
+            return await GetTvShowMethodInternal<ResultContainer<Keyword>>(id, TvShowMethods.Keywords, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -196,7 +222,7 @@ namespace TMDbLib.Client
         /// <param name="timezone">Only relevant for list type AiringToday</param>
         /// <param name="cancellationToken">A cancellation token</param>
         /// <returns></returns>
-        public async Task<SearchContainer<SearchTv>> GetTvShowListAsync(TvShowListType list, int page = 0, string timezone = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchTv>> GetTvShowListAsync(TvShowListType list, int page = 0, string timezone = null, CancellationToken cancellationToken = default)
         {
             return await GetTvShowListAsync(list, DefaultLanguage, page, timezone, cancellationToken).ConfigureAwait(false);
         }
@@ -210,7 +236,7 @@ namespace TMDbLib.Client
         /// <param name="timezone">Only relevant for list type AiringToday</param>
         /// <param name="cancellationToken">A cancellation token</param>
         /// <returns></returns>
-        public async Task<SearchContainer<SearchTv>> GetTvShowListAsync(TvShowListType list, string language, int page = 0, string timezone = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchTv>> GetTvShowListAsync(TvShowListType list, string language, int page = 0, string timezone = null, CancellationToken cancellationToken = default)
         {
             RestRequest req = _client.Create("tv/{method}");
             req.AddUrlSegment("method", list.GetDescription());
@@ -225,33 +251,7 @@ namespace TMDbLib.Client
             if (!string.IsNullOrWhiteSpace(language))
                 req.AddParameter("language", language);
 
-            RestResponse<SearchContainer<SearchTv>> resp = await req.ExecuteGet<SearchContainer<SearchTv>>(cancellationToken).ConfigureAwait(false);
-
-            return resp;
-        }
-
-        private async Task<T> GetTvShowMethod<T>(int id, TvShowMethods tvShowMethod, string dateFormat = null, string language = null, string includeImageLanguage = null, int page = 0, CancellationToken cancellationToken = default(CancellationToken)) where T : new()
-        {
-            RestRequest req = _client.Create("tv/{id}/{method}");
-            req.AddUrlSegment("id", id.ToString(CultureInfo.InvariantCulture));
-            req.AddUrlSegment("method", tvShowMethod.GetDescription());
-
-            // TODO: Dateformat?
-            //if (dateFormat != null)
-            //    req.DateFormat = dateFormat;
-
-            if (page > 0)
-                req.AddParameter("page", page.ToString());
-
-            language = language ?? DefaultLanguage;
-            if (!string.IsNullOrWhiteSpace(language))
-                req.AddParameter("language", language);
-
-            includeImageLanguage = includeImageLanguage ?? DefaultImageLanguage;
-            if (!string.IsNullOrWhiteSpace(includeImageLanguage))
-                req.AddParameter("include_image_language", includeImageLanguage);
-
-            RestResponse<T> resp = await req.ExecuteGet<T>(cancellationToken).ConfigureAwait(false);
+            SearchContainer<SearchTv> resp = await req.GetOfT<SearchContainer<SearchTv>>(cancellationToken).ConfigureAwait(false);
 
             return resp;
         }
@@ -263,29 +263,29 @@ namespace TMDbLib.Client
         /// Returns the basic information about a tv show.
         /// For additional data use the main GetTvShowAsync method using the tv show id as parameter.
         /// </returns>
-        public async Task<SearchContainer<SearchTv>> GetTvShowPopularAsync(int page = -1, string language = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchTv>> GetTvShowPopularAsync(int page = -1, string language = null, CancellationToken cancellationToken = default)
         {
-            return await GetTvShowListAsync(page, language, "popular", cancellationToken).ConfigureAwait(false);
+            return await GetTvShowListInternal(page, language, "popular", cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchTv>> GetTvShowSimilarAsync(int id, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchTv>> GetTvShowSimilarAsync(int id, int page = 0, CancellationToken cancellationToken = default)
         {
             return await GetTvShowSimilarAsync(id, DefaultLanguage, page, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchTv>> GetTvShowSimilarAsync(int id, string language, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchTv>> GetTvShowSimilarAsync(int id, string language, int page = 0, CancellationToken cancellationToken = default)
         {
-            return await GetTvShowMethod<SearchContainer<SearchTv>>(id, TvShowMethods.Similar, language: language, page: page, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvShowMethodInternal<SearchContainer<SearchTv>>(id, TvShowMethods.Similar, language: language, page: page, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchTv>> GetTvShowRecommendationsAsync(int id, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchTv>> GetTvShowRecommendationsAsync(int id, int page = 0, CancellationToken cancellationToken = default)
         {
             return await GetTvShowRecommendationsAsync(id, DefaultLanguage, page, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<SearchTv>> GetTvShowRecommendationsAsync(int id, string language, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchTv>> GetTvShowRecommendationsAsync(int id, string language, int page = 0, CancellationToken cancellationToken = default)
         {
-            return await GetTvShowMethod<SearchContainer<SearchTv>>(id, TvShowMethods.Recommendations, language: language, page: page, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvShowMethodInternal<SearchContainer<SearchTv>>(id, TvShowMethods.Recommendations, language: language, page: page, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -295,27 +295,27 @@ namespace TMDbLib.Client
         /// Returns the basic information about a tv show.
         /// For additional data use the main GetTvShowAsync method using the tv show id as parameter
         /// </returns>
-        public async Task<SearchContainer<SearchTv>> GetTvShowTopRatedAsync(int page = -1, string language = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<SearchTv>> GetTvShowTopRatedAsync(int page = -1, string language = null, CancellationToken cancellationToken = default)
         {
-            return await GetTvShowListAsync(page, language, "top_rated", cancellationToken).ConfigureAwait(false);
+            return await GetTvShowListInternal(page, language, "top_rated", cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<TranslationsContainerTv> GetTvShowTranslationsAsync(int id, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<TranslationsContainerTv> GetTvShowTranslationsAsync(int id, CancellationToken cancellationToken = default)
         {
-            return await GetTvShowMethod<TranslationsContainerTv>(id, TvShowMethods.Translations, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvShowMethodInternal<TranslationsContainerTv>(id, TvShowMethods.Translations, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<ResultContainer<Video>> GetTvShowVideosAsync(int id, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ResultContainer<Video>> GetTvShowVideosAsync(int id, CancellationToken cancellationToken = default)
         {
-            return await GetTvShowMethod<ResultContainer<Video>>(id, TvShowMethods.Videos, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvShowMethodInternal<ResultContainer<Video>>(id, TvShowMethods.Videos, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SingleResultContainer<Dictionary<string, WatchProviders>>> GetTvShowWatchProvidersAsync(int id, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SingleResultContainer<Dictionary<string, WatchProviders>>> GetTvShowWatchProvidersAsync(int id, CancellationToken cancellationToken = default)
         {
-            return await GetTvShowMethod<SingleResultContainer<Dictionary<string, WatchProviders>>>(id, TvShowMethods.WatchProviders, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetTvShowMethodInternal<SingleResultContainer<Dictionary<string, WatchProviders>>>(id, TvShowMethods.WatchProviders, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<bool> TvShowRemoveRatingAsync(int tvShowId, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<bool> TvShowRemoveRatingAsync(int tvShowId, CancellationToken cancellationToken = default)
         {
             RequireSessionId(SessionType.GuestSession);
 
@@ -323,7 +323,7 @@ namespace TMDbLib.Client
             req.AddUrlSegment("tvShowId", tvShowId.ToString(CultureInfo.InvariantCulture));
             AddSessionId(req);
 
-            RestResponse<PostReply> response = await req.ExecuteDelete<PostReply>(cancellationToken).ConfigureAwait(false);
+            RestResponse<PostReply> response = await req.Delete<PostReply>(cancellationToken).ConfigureAwait(false);
 
             // status code 13 = "The item/record was deleted successfully."
             PostReply item = await response.GetDataObject().ConfigureAwait(false);
@@ -341,7 +341,7 @@ namespace TMDbLib.Client
         /// <returns>True if the the tv show's rating was successfully updated, false if not</returns>
         /// <remarks>Requires a valid guest or user session</remarks>
         /// <exception cref="GuestSessionRequiredException">Thrown when the current client object doens't have a guest or user session assigned.</exception>
-        public async Task<bool> TvShowSetRatingAsync(int tvShowId, double rating, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<bool> TvShowSetRatingAsync(int tvShowId, double rating, CancellationToken cancellationToken = default)
         {
             RequireSessionId(SessionType.GuestSession);
 
@@ -351,7 +351,7 @@ namespace TMDbLib.Client
 
             req.SetBody(new { value = rating });
 
-            RestResponse<PostReply> response = await req.ExecutePost<PostReply>(cancellationToken).ConfigureAwait(false);
+            RestResponse<PostReply> response = await req.Post<PostReply>(cancellationToken).ConfigureAwait(false);
 
             // status code 1 = "Success"
             // status code 12 = "The item/record was updated successfully" - Used when an item was previously rated by the user
diff --git a/TMDbLib/Objects/Account/AccountMovieSortBy.cs b/TMDbLib/Objects/Account/AccountSortBy.cs
similarity index 100%
rename from TMDbLib/Objects/Account/AccountMovieSortBy.cs
rename to TMDbLib/Objects/Account/AccountSortBy.cs
diff --git a/TMDbLib/Objects/Discover/DiscoverBase.cs b/TMDbLib/Objects/Discover/DiscoverBase.cs
index 535a80f..eebabd8 100644
--- a/TMDbLib/Objects/Discover/DiscoverBase.cs
+++ b/TMDbLib/Objects/Discover/DiscoverBase.cs
@@ -19,12 +19,12 @@ namespace TMDbLib.Objects.Discover
             Parameters = new SimpleNamedValueCollection();
         }
 
-        public async Task<SearchContainer<T>> Query(int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<T>> Query(int page = 0, CancellationToken cancellationToken = default)
         {
             return await Query(_client.DefaultLanguage, page, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<SearchContainer<T>> Query(string language, int page = 0, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<SearchContainer<T>> Query(string language, int page = 0, CancellationToken cancellationToken = default)
         {
             return await _client.DiscoverPerformAsync<T>(_endpoint, language, page, Parameters, cancellationToken).ConfigureAwait(false);
         }
diff --git a/TMDbLib/Objects/Discover/DiscoverMovieSortBy.cs b/TMDbLib/Objects/Discover/DiscoverMovieSortBy.cs
index 84f776b..39cff7a 100644
--- a/TMDbLib/Objects/Discover/DiscoverMovieSortBy.cs
+++ b/TMDbLib/Objects/Discover/DiscoverMovieSortBy.cs
@@ -1,11 +1,9 @@
-using System;
-using TMDbLib.Utilities;
+using TMDbLib.Utilities;
 
 namespace TMDbLib.Objects.Discover
 {
     public enum DiscoverMovieSortBy
     {
-        [Obsolete]
         Undefined,
         [EnumValue("popularity.asc")]
         Popularity,
diff --git a/TMDbLib/Objects/Discover/DiscoverTvShowSortBy.cs b/TMDbLib/Objects/Discover/DiscoverTvShowSortBy.cs
index 3d3afca..c93059c 100644
--- a/TMDbLib/Objects/Discover/DiscoverTvShowSortBy.cs
+++ b/TMDbLib/Objects/Discover/DiscoverTvShowSortBy.cs
@@ -1,11 +1,9 @@
-using System;
-using TMDbLib.Utilities;
+using TMDbLib.Utilities;
 
 namespace TMDbLib.Objects.Discover
 {
     public enum DiscoverTvShowSortBy
     {
-        [Obsolete]
         Undefined,
         [EnumValue("vote_average.asc")]
         VoteAverage,
diff --git a/TMDbLib/Objects/Lists/AccountList.cs b/TMDbLib/Objects/Lists/AccountList.cs
index 962909e..1595c39 100644
--- a/TMDbLib/Objects/Lists/AccountList.cs
+++ b/TMDbLib/Objects/Lists/AccountList.cs
@@ -3,7 +3,7 @@ using TMDbLib.Objects.General;
 
 namespace TMDbLib.Objects.Lists
 {
-    public class AccountList : List
+    public class AccountList : TMDbList<int>
     {
         [JsonProperty("list_type")]
         public MediaType ListType { get; set; }
diff --git a/TMDbLib/Objects/Lists/GenericList.cs b/TMDbLib/Objects/Lists/GenericList.cs
index 8ff6ff5..772ec4d 100644
--- a/TMDbLib/Objects/Lists/GenericList.cs
+++ b/TMDbLib/Objects/Lists/GenericList.cs
@@ -4,7 +4,7 @@ using TMDbLib.Objects.Search;
 
 namespace TMDbLib.Objects.Lists
 {
-    public class GenericList : List
+    public class GenericList : TMDbList<string>
     {
         [JsonProperty("created_by")]
         public string CreatedBy { get; set; }
diff --git a/TMDbLib/Objects/Lists/List.cs b/TMDbLib/Objects/Lists/TMDbList.cs
similarity index 89%
rename from TMDbLib/Objects/Lists/List.cs
rename to TMDbLib/Objects/Lists/TMDbList.cs
index e527416..cf60f96 100644
--- a/TMDbLib/Objects/Lists/List.cs
+++ b/TMDbLib/Objects/Lists/TMDbList.cs
@@ -2,7 +2,7 @@
 
 namespace TMDbLib.Objects.Lists
 {
-    public class List
+    public abstract class TMDbList<TId>
     {
         [JsonProperty("description")]
         public string Description { get; set; }
@@ -11,7 +11,7 @@ namespace TMDbLib.Objects.Lists
         public int FavoriteCount { get; set; }
 
         [JsonProperty("id")]
-        public string Id { get; set; }
+        public TId Id { get; set; }
 
         /// <summary>
         /// A language code, e.g. en
diff --git a/TMDbLib/Objects/Movies/ListResult.cs b/TMDbLib/Objects/Movies/ListResult.cs
index f92b1f0..abce722 100644
--- a/TMDbLib/Objects/Movies/ListResult.cs
+++ b/TMDbLib/Objects/Movies/ListResult.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using TMDbLib.Objects.General;
 
 namespace TMDbLib.Objects.Movies
 {
@@ -18,10 +19,13 @@ namespace TMDbLib.Objects.Movies
         /// </summary>
         [JsonProperty("iso_639_1")]
         public string Iso_639_1 { get; set; }
-
+        
         [JsonProperty("item_Count")]
         public int ItemCount { get; set; }
 
+        [JsonProperty("list_type")]
+        public MediaType ListType { get; set; }
+
         [JsonProperty("name")]
         public string Name { get; set; }
 
diff --git a/TMDbLib/Objects/Search/SearchPerson.cs b/TMDbLib/Objects/Search/SearchPerson.cs
index 57dd325..75bc947 100644
--- a/TMDbLib/Objects/Search/SearchPerson.cs
+++ b/TMDbLib/Objects/Search/SearchPerson.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using TMDbLib.Objects.General;
-using TMDbLib.Objects.People;
 
 namespace TMDbLib.Objects.Search
 {
diff --git a/TMDbLib/Objects/TvShows/TvEpisode.cs b/TMDbLib/Objects/TvShows/TvEpisode.cs
index 9edecf5..c7c637f 100644
--- a/TMDbLib/Objects/TvShows/TvEpisode.cs
+++ b/TMDbLib/Objects/TvShows/TvEpisode.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 using TMDbLib.Objects.General;
 
diff --git a/TMDbLib/Objects/TvShows/TvGroupEpisode.cs b/TMDbLib/Objects/TvShows/TvGroupEpisode.cs
index 0805218..ddbfadf 100644
--- a/TMDbLib/Objects/TvShows/TvGroupEpisode.cs
+++ b/TMDbLib/Objects/TvShows/TvGroupEpisode.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using TMDbLib.Objects.General;
+using Newtonsoft.Json;
 
 namespace TMDbLib.Objects.TvShows
 {
diff --git a/TMDbLib/Objects/TvShows/TvGroupType.cs b/TMDbLib/Objects/TvShows/TvGroupType.cs
index a8da717..6594b72 100644
--- a/TMDbLib/Objects/TvShows/TvGroupType.cs
+++ b/TMDbLib/Objects/TvShows/TvGroupType.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TMDbLib.Objects.TvShows
+namespace TMDbLib.Objects.TvShows
 {
     public enum TvGroupType
     {
diff --git a/TMDbLib/Rest/RestRequest.cs b/TMDbLib/Rest/RestRequest.cs
index 008f8e9..ec3e38c 100644
--- a/TMDbLib/Rest/RestRequest.cs
+++ b/TMDbLib/Rest/RestRequest.cs
@@ -86,42 +86,42 @@ namespace TMDbLib.Rest
             AppendQueryString(sb, value.Key, value.Value);
         }
 
-        public async Task<RestResponse> ExecuteDelete(CancellationToken cancellationToken)
+        public async Task<RestResponse> Delete(CancellationToken cancellationToken)
         {
             HttpResponseMessage resp = await SendInternal(HttpMethod.Delete, cancellationToken).ConfigureAwait(false);
 
             return new RestResponse(resp);
         }
 
-        public async Task<RestResponse<T>> ExecuteDelete<T>(CancellationToken cancellationToken)
+        public async Task<RestResponse<T>> Delete<T>(CancellationToken cancellationToken)
         {
             HttpResponseMessage resp = await SendInternal(HttpMethod.Delete, cancellationToken).ConfigureAwait(false);
 
             return new RestResponse<T>(resp, _client);
         }
 
-        public async Task<RestResponse> ExecuteGet(CancellationToken cancellationToken)
+        public async Task<RestResponse> Get(CancellationToken cancellationToken)
         {
             HttpResponseMessage resp = await SendInternal(HttpMethod.Get, cancellationToken).ConfigureAwait(false);
 
             return new RestResponse(resp);
         }
 
-        public async Task<RestResponse<T>> ExecuteGet<T>(CancellationToken cancellationToken)
+        public async Task<RestResponse<T>> Get<T>(CancellationToken cancellationToken)
         {
             HttpResponseMessage resp = await SendInternal(HttpMethod.Get, cancellationToken).ConfigureAwait(false);
 
             return new RestResponse<T>(resp, _client);
         }
 
-        public async Task<RestResponse> ExecutePost(CancellationToken cancellationToken)
+        public async Task<RestResponse> Post(CancellationToken cancellationToken)
         {
             HttpResponseMessage resp = await SendInternal(HttpMethod.Post, cancellationToken).ConfigureAwait(false);
 
             return new RestResponse(resp);
         }
 
-        public async Task<RestResponse<T>> ExecutePost<T>(CancellationToken cancellationToken)
+        public async Task<RestResponse<T>> Post<T>(CancellationToken cancellationToken)
         {
             HttpResponseMessage resp = await SendInternal(HttpMethod.Post, cancellationToken).ConfigureAwait(false);
 
diff --git a/TMDbLib/Rest/RestRequestExtensions.cs b/TMDbLib/Rest/RestRequestExtensions.cs
new file mode 100644
index 0000000..066d0d6
--- /dev/null
+++ b/TMDbLib/Rest/RestRequestExtensions.cs
@@ -0,0 +1,38 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace TMDbLib.Rest
+{
+    internal static class RestRequestExtensions
+    {
+        public static async Task<T> DeleteOfT<T>(this RestRequest request, CancellationToken cancellationToken)
+        {
+            RestResponse<T> resp = await request.Delete<T>(cancellationToken).ConfigureAwait(false);
+            
+            if (!resp.IsValid)
+                return default;
+
+            return await resp.GetDataObject().ConfigureAwait(false);
+        }
+
+        public static async Task<T> GetOfT<T>(this RestRequest request, CancellationToken cancellationToken)
+        {
+            RestResponse<T> resp = await request.Get<T>(cancellationToken).ConfigureAwait(false);
+
+            if (!resp.IsValid)
+                return default;
+
+            return await resp.GetDataObject().ConfigureAwait(false);
+        }
+
+        public static async Task<T> PostOfT<T>(this RestRequest request, CancellationToken cancellationToken)
+        {
+            RestResponse<T> resp = await request.Post<T>(cancellationToken).ConfigureAwait(false);
+            
+            if (!resp.IsValid)
+                return default;
+
+            return await resp.GetDataObject().ConfigureAwait(false);
+        }
+    }
+}
\ No newline at end of file
diff --git a/TMDbLib/Rest/RestResponse.cs b/TMDbLib/Rest/RestResponse.cs
index 6b555af..35d52dd 100644
--- a/TMDbLib/Rest/RestResponse.cs
+++ b/TMDbLib/Rest/RestResponse.cs
@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -50,20 +49,5 @@ namespace TMDbLib.Rest
             using (JsonTextReader tr = new JsonTextReader(sr))
                 return _client.Serializer.Deserialize<T>(tr);
         }
-
-        public static implicit operator T(RestResponse<T> response)
-        {
-            try
-            {
-                if (response.IsValid)
-                    return response.GetDataObject().Result;
-
-                return default(T);
-            }
-            catch (AggregateException ex)
-            {
-                throw ex.InnerException;
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/TMDbLib/Utilities/Converters/TmdbIntArrayAsObjectConverter.cs b/TMDbLib/Utilities/Converters/TmdbIntArrayAsObjectConverter.cs
index 47620ab..bbd50d2 100644
--- a/TMDbLib/Utilities/Converters/TmdbIntArrayAsObjectConverter.cs
+++ b/TMDbLib/Utilities/Converters/TmdbIntArrayAsObjectConverter.cs
@@ -33,6 +33,9 @@ namespace TMDbLib.Utilities.Converters
                 return new List<int>();
             }
 
+            if (reader.TokenType == JsonToken.Null)
+                return null;
+
             throw new Exception("Unable to convert list of integers");
         }
 
diff --git a/TMDbLib/Utilities/Converters/TmdbPartialDateConverter.cs b/TMDbLib/Utilities/Converters/TmdbPartialDateConverter.cs
index db0101b..494fae7 100644
--- a/TMDbLib/Utilities/Converters/TmdbPartialDateConverter.cs
+++ b/TMDbLib/Utilities/Converters/TmdbPartialDateConverter.cs
@@ -26,7 +26,7 @@ namespace TMDbLib.Utilities.Converters
 
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
-            var date = value as DateTime?;
+            DateTime? date = value as DateTime?;
             writer.WriteValue(date?.ToString(CultureInfo.InvariantCulture));
         }
     }
diff --git a/TMDbLib/Utilities/EnumMemberCache.cs b/TMDbLib/Utilities/EnumMemberCache.cs
index cb320c6..e1cf4e4 100644
--- a/TMDbLib/Utilities/EnumMemberCache.cs
+++ b/TMDbLib/Utilities/EnumMemberCache.cs
@@ -65,7 +65,7 @@ namespace TMDbLib.Utilities
                 }
             }
 
-            return default(T);
+            return default;
         }
 
         public static object GetValue(string input, Type type)
diff --git a/TMDbLibTests/ClientAccountTests.cs b/TMDbLibTests/ClientAccountTests.cs
index a31f92b..b9a326d 100644
--- a/TMDbLibTests/ClientAccountTests.cs
+++ b/TMDbLibTests/ClientAccountTests.cs
@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Xunit;
-using TMDbLib.Objects.Account;
 using TMDbLib.Objects.Authentication;
 using TMDbLib.Objects.General;
 using TMDbLib.Objects.Lists;
@@ -15,375 +15,267 @@ namespace TMDbLibTests
 {
     public class ClientAccountTests : TestBase
     {
-        public ClientAccountTests() : base()
+        public ClientAccountTests()
         {
-            if (string.IsNullOrWhiteSpace(Config.UserSessionId))
+            if (string.IsNullOrWhiteSpace(TestConfig.UserSessionId))
                 throw new ConfigurationErrorsException("To successfully complete the ClientAccountTests you will need to specify a valid 'UserSessionId' in the test config file");
         }
 
         [Fact]
-        public void TestAccountGetDetailsGuestAccount()
+        public async Task TestAccountGetDetailsGuestAccount()
         {
-            Config.Client.SetSessionInformation(Config.GuestTestSessionId, SessionType.GuestSession);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.GuestTestSessionId, SessionType.GuestSession);
 
-            Assert.Throws<UserSessionRequiredException>(() => Config.Client.AccountGetDetailsAsync().Sync());
+            await Assert.ThrowsAsync<UserSessionRequiredException>(() => TMDbClient.AccountGetDetailsAsync());
         }
 
         [Fact]
-        public void TestAccountGetDetailsUserAccount()
+        public async Task TestAccountGetDetailsUserAccount()
         {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            AccountDetails account = Config.Client.AccountGetDetailsAsync().Sync();
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            // Naturally the specified account must have these values populated for the test to pass
-            Assert.NotNull(account);
-            Assert.True(account.Id > 1);
-            Assert.Equal("Test Name", account.Name);
-            Assert.Equal("TMDbTestAccount", account.Username);
-            Assert.Equal("BE", account.Iso_3166_1);
-            Assert.Equal("en", account.Iso_639_1);
-
-            Assert.NotNull(account.Avatar);
-            Assert.NotNull(account.Avatar.Gravatar);
-            Assert.Equal("7cf5357dbc2014cbd616257c358ea0a1", account.Avatar.Gravatar.Hash);
+            await Verify(TMDbClient.ActiveAccount);
         }
 
         [Fact]
-        public void TestAccountAccountGetLists()
+        public async Task TestAccountAccountGetLists()
         {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            TestHelpers.SearchPages(i => Config.Client.AccountGetListsAsync(i).Result);
-            AccountList list = Config.Client.AccountGetListsAsync().Sync().Results[0];
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            Assert.NotNull(list.Id);
-            Assert.NotNull(list.Name);
-            Assert.Null(list.PosterPath);
-            Assert.NotNull(list.Description);
-            Assert.NotNull(list.ListType);
-            Assert.NotNull(list.Iso_639_1);
+            SearchContainer<AccountList> result = await TMDbClient.AccountGetListsAsync();
+
+            Assert.NotEmpty(result.Results);
+
+            AccountList single = result.Results.Single(s => s.Id == 1724);
+
+            await Verify(single);
+        }
+
+        [Fact(Skip = "TMDb has an issue in pagination of AccountGetListsAsync")]
+        public async Task TestAccountAccountGetListsPaged()
+        {
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
+
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.AccountGetListsAsync(i));
         }
 
         [Fact]
-        public void TestAccountGetFavoriteMovies()
+        public async Task TestAccountGetFavoriteMovies()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            TestHelpers.SearchPages(i => Config.Client.AccountGetFavoriteMoviesAsync(i).Result);
-            SearchMovie movie = Config.Client.AccountGetFavoriteMoviesAsync().Sync().Results[0];
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.AccountGetFavoriteMoviesAsync(i));
 
             // Requires that you have marked at least one movie as favorite else this test will fail
-            Assert.True(movie.Id > 0);
-            Assert.NotNull(movie.Title);
-            Assert.NotNull(movie.PosterPath);
-            Assert.NotNull(movie.BackdropPath);
-            Assert.NotNull(movie.OriginalTitle);
-            Assert.NotNull(movie.Overview);
-            Assert.NotNull(movie.OriginalLanguage);
-            Assert.NotNull(movie.ReleaseDate);
-            Assert.True(movie.VoteCount > 0);
-            Assert.True(movie.VoteAverage > 0);
-            Assert.True(movie.Popularity > 0);
+            SearchContainer<SearchMovie> movies = await TMDbClient.AccountGetFavoriteMoviesAsync();
+            SearchMovie movie = movies.Results.Single(s => s.Id == IdHelper.Avatar);
 
-            Assert.NotNull(movie.GenreIds);
-            Assert.True(movie.GenreIds.Any());
+            await Verify(movie, x => x.IgnoreProperty<SearchMovie>(n => n.VoteCount, n => n.Popularity));
         }
 
         [Fact]
-        public void TestAccountGetFavoriteTv()
+        public async Task TestAccountGetFavoriteTv()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            TestHelpers.SearchPages(i => Config.Client.AccountGetFavoriteTvAsync(i).Result);
-            SearchTv tvShow = Config.Client.AccountGetFavoriteTvAsync().Sync().Results[0];
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.AccountGetFavoriteTvAsync(i));
 
-            // Requires that you have marked at least one movie as favorite else this test will fail
-            Assert.True(tvShow.Id > 0);
-            Assert.NotNull(tvShow.Name);
-            Assert.NotNull(tvShow.PosterPath);
-            Assert.NotNull(tvShow.BackdropPath);
-            Assert.NotNull(tvShow.OriginalName);
-            Assert.NotNull(tvShow.Overview);
-            Assert.NotNull(tvShow.OriginalLanguage);
-            Assert.NotNull(tvShow.FirstAirDate);
-            Assert.True(tvShow.VoteCount > 0);
-            Assert.True(tvShow.VoteAverage > 0);
-            Assert.True(tvShow.Popularity > 0);
+            SearchContainer<SearchTv> tvShows = await TMDbClient.AccountGetFavoriteTvAsync();
+            SearchTv tvShow = tvShows.Results.Single(s => s.Id == IdHelper.BreakingBad);
 
-            Assert.NotNull(tvShow.GenreIds);
-            Assert.True(tvShow.GenreIds.Any());
+            await Verify(tvShow);
         }
 
         [Fact]
-        public void TestAccountGetMovieWatchlist()
+        public async Task TestAccountGetMovieWatchlist()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            TestHelpers.SearchPages(i => Config.Client.AccountGetFavoriteMoviesAsync(i).Result);
-            SearchMovie movie = Config.Client.AccountGetFavoriteMoviesAsync().Sync().Results[0];
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.AccountGetMovieWatchlistAsync(i));
 
-            // Requires that you have added at least one movie to your watchlist else this test will fail
-            Assert.True(movie.Id > 0);
-            Assert.NotNull(movie.Title);
-            Assert.NotNull(movie.PosterPath);
-            Assert.NotNull(movie.BackdropPath);
-            Assert.NotNull(movie.OriginalTitle);
-            Assert.NotNull(movie.Overview);
-            Assert.NotNull(movie.OriginalLanguage);
-            Assert.NotNull(movie.ReleaseDate);
-            Assert.True(movie.VoteCount > 0);
-            Assert.True(movie.VoteAverage > 0);
-            Assert.True(movie.Popularity > 0);
+            SearchContainer<SearchMovie> watchlist = await TMDbClient.AccountGetMovieWatchlistAsync();
+            SearchMovie movie = watchlist.Results.Single(s => s.Id == 100042);
 
-            Assert.NotNull(movie.GenreIds);
-            Assert.True(movie.GenreIds.Any());
+            await Verify(movie);
         }
 
         [Fact]
-        public void TestAccountGetTvWatchlist()
+        public async Task TestAccountGetTvWatchlist()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            TestHelpers.SearchPages(i => Config.Client.AccountGetTvWatchlistAsync(i).Result);
-            SearchTv tvShow = Config.Client.AccountGetTvWatchlistAsync().Sync().Results[0];
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.AccountGetTvWatchlistAsync(i));
 
-            // Requires that you have added at least one movie to your watchlist else this test will fail
-            Assert.True(tvShow.Id > 0);
-            Assert.NotNull(tvShow.Name);
-            Assert.NotNull(tvShow.PosterPath);
-            Assert.NotNull(tvShow.BackdropPath);
-            Assert.NotNull(tvShow.OriginalName);
-            Assert.NotNull(tvShow.Overview);
-            Assert.NotNull(tvShow.OriginalLanguage);
-            Assert.NotNull(tvShow.FirstAirDate);
-            Assert.True(tvShow.VoteCount > 0);
-            Assert.True(tvShow.VoteAverage > 0);
-            Assert.True(tvShow.Popularity > 0);
+            SearchContainer<SearchTv> tvShows = await TMDbClient.AccountGetTvWatchlistAsync();
+            SearchTv tvShow = tvShows.Results.Single(s => s.Id == 2691);
 
-            Assert.NotNull(tvShow.GenreIds);
-            Assert.True(tvShow.GenreIds.Any());
+            await Verify(tvShow);
         }
 
         [Fact]
-        public void TestAccountGetRatedMovies()
+        public async Task TestAccountGetRatedMovies()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            TestHelpers.SearchPages(i => Config.Client.AccountGetFavoriteMoviesAsync(i).Result);
-            SearchMovie movie = Config.Client.AccountGetFavoriteMoviesAsync().Sync().Results[0];
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.AccountGetFavoriteMoviesAsync(i));
 
-            // Requires that you have rated at least one movie else this test will fail
-            Assert.True(movie.Id > 0);
-            Assert.NotNull(movie.Title);
-            Assert.NotNull(movie.PosterPath);
-            Assert.NotNull(movie.BackdropPath);
-            Assert.NotNull(movie.OriginalTitle);
-            Assert.NotNull(movie.Overview);
-            Assert.NotNull(movie.OriginalLanguage);
-            Assert.NotNull(movie.ReleaseDate);
-            Assert.True(movie.VoteCount > 0);
-            Assert.True(movie.VoteAverage > 0);
-            Assert.True(movie.Popularity > 0);
+            SearchContainer<SearchMovie> movies = await TMDbClient.AccountGetFavoriteMoviesAsync();
+            SearchMovie movie = movies.Results.Single(s => s.Id == IdHelper.Avatar);
 
-            Assert.NotNull(movie.GenreIds);
-            Assert.True(movie.GenreIds.Any());
+            await Verify(movie);
         }
 
         [Fact]
-        public void TestAccountGetRatedTv()
+        public async Task TestAccountGetRatedTv()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            TestHelpers.SearchPages(i => Config.Client.AccountGetRatedTvShowsAsync(i).Result);
-            AccountSearchTv tvShow = Config.Client.AccountGetRatedTvShowsAsync().Sync().Results[0];
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.AccountGetRatedTvShowsAsync(i));
 
-            // Requires that you have rated at least one movie else this test will fail
-            Assert.True(tvShow.Id > 0);
-            Assert.NotNull(tvShow.Name);
-            Assert.NotNull(tvShow.PosterPath);
-            Assert.NotNull(tvShow.BackdropPath);
-            Assert.NotNull(tvShow.OriginalName);
-            Assert.NotNull(tvShow.Overview);
-            Assert.NotNull(tvShow.OriginalLanguage);
-            Assert.NotNull(tvShow.FirstAirDate);
-            Assert.True(tvShow.VoteCount > 0);
-            Assert.True(tvShow.VoteAverage > 0);
-            Assert.True(tvShow.Popularity > 0);
+            SearchContainer<AccountSearchTv> tvShows = await TMDbClient.AccountGetRatedTvShowsAsync();
+            AccountSearchTv tvShow = tvShows.Results.Single(s => s.Id == IdHelper.BigBangTheory);
 
-            Assert.NotNull(tvShow.GenreIds);
-            Assert.True(tvShow.GenreIds.Any());
+            await Verify(tvShow);
         }
 
         [Fact]
-        public void TestAccountGetRatedTvEpisodes()
+        public async Task TestAccountGetRatedTvEpisodes()
         {
-            IgnoreMissingCSharp("results[array]._id / _id");
-
             // TODO: Error in TMDb: https://www.themoviedb.org/talk/557f1af49251410a2c002480
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            TestHelpers.SearchPages(i => Config.Client.AccountGetRatedTvShowEpisodesAsync(i).Result);
-            AccountSearchTvEpisode tvEpisode = Config.Client.AccountGetRatedTvShowEpisodesAsync().Sync().Results[0];
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            // Requires that you have rated at least one movie else this test will fail
-            Assert.True(tvEpisode.Id > 0);
-            Assert.True(tvEpisode.ShowId > 0);
-            Assert.True(tvEpisode.EpisodeNumber > 0);
-            Assert.True(tvEpisode.SeasonNumber > 0);
-            Assert.NotNull(tvEpisode.Name);
-            Assert.NotNull(tvEpisode.AirDate);
-            Assert.NotNull(tvEpisode.StillPath);
-            Assert.True(tvEpisode.VoteCount > 0);
-            Assert.True(tvEpisode.VoteAverage > 0);
-            Assert.True(tvEpisode.Rating > 0);
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.AccountGetRatedTvShowEpisodesAsync(i));
+
+            SearchContainer<AccountSearchTvEpisode> tvEpisodes = await TMDbClient.AccountGetRatedTvShowEpisodesAsync();
+            AccountSearchTvEpisode tvEpisode = tvEpisodes.Results.Single(s => s.Id == IdHelper.BreakingBadSeason1Episode1Id);
+
+            await Verify(tvEpisode);
         }
 
         [Fact]
-        public void TestAccountChangeTvFavoriteStatus()
+        public async Task TestAccountChangeTvFavoriteStatusAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
-
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
             // Ensure that the test movie is not marked as favorite before we start the test
-            if (DoesFavoriteListContainSpecificTvShow(IdHelper.DoctorWho))
-                Assert.True(Config.Client.AccountChangeFavoriteStatusAsync(MediaType.Tv, IdHelper.DoctorWho, false).Result);
+            if (await DoesFavoriteListContainSpecificTvShow(IdHelper.DoctorWho))
+                Assert.True(await TMDbClient.AccountChangeFavoriteStatusAsync(MediaType.Tv, IdHelper.DoctorWho, false));
 
-            if (DoesFavoriteListContainSpecificTvShow(IdHelper.DoctorWho))
+            if (await DoesFavoriteListContainSpecificTvShow(IdHelper.DoctorWho))
                 throw new Exception($"Test tv show '{IdHelper.DoctorWho}' was already marked as favorite. Unable to perform test correctly");
 
             // Try to mark is as a favorite
-            Assert.True(Config.Client.AccountChangeFavoriteStatusAsync(MediaType.Tv, IdHelper.DoctorWho, true).Result);
+            Assert.True(await TMDbClient.AccountChangeFavoriteStatusAsync(MediaType.Tv, IdHelper.DoctorWho, true));
 
             // Check if it worked
-            Assert.True(DoesFavoriteListContainSpecificTvShow(IdHelper.DoctorWho));
+            Assert.True(await DoesFavoriteListContainSpecificTvShow(IdHelper.DoctorWho));
 
             // Try to un-mark is as a favorite
-            Assert.True(Config.Client.AccountChangeFavoriteStatusAsync(MediaType.Tv, IdHelper.DoctorWho, false).Result);
+            Assert.True(await TMDbClient.AccountChangeFavoriteStatusAsync(MediaType.Tv, IdHelper.DoctorWho, false));
 
             // Check if it worked
-            Assert.False(DoesFavoriteListContainSpecificTvShow(IdHelper.DoctorWho));
+            Assert.False(await DoesFavoriteListContainSpecificTvShow(IdHelper.DoctorWho));
         }
 
         [Fact]
-        public void TestAccountChangeMovieFavoriteStatus()
+        public async Task TestAccountChangeMovieFavoriteStatusAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
-
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
             // Ensure that the test movie is not marked as favorite before we start the test
-            if (DoesFavoriteListContainSpecificMovie(IdHelper.Terminator))
-                Assert.True(Config.Client.AccountChangeFavoriteStatusAsync(MediaType.Movie, IdHelper.Terminator, false).Result);
+            if (await DoesFavoriteListContainSpecificMovie(IdHelper.Terminator))
+                Assert.True(await TMDbClient.AccountChangeFavoriteStatusAsync(MediaType.Movie, IdHelper.Terminator, false));
 
-            if (DoesFavoriteListContainSpecificMovie(IdHelper.Terminator))
+            if (await DoesFavoriteListContainSpecificMovie(IdHelper.Terminator))
                 throw new Exception($"Test movie '{IdHelper.Terminator}' was already marked as favorite. Unable to perform test correctly");
 
             // Try to mark is as a favorite
-            Assert.True(Config.Client.AccountChangeFavoriteStatusAsync(MediaType.Movie, IdHelper.Terminator, true).Result);
+            Assert.True(await TMDbClient.AccountChangeFavoriteStatusAsync(MediaType.Movie, IdHelper.Terminator, true));
 
             // Check if it worked
-            Assert.True(DoesFavoriteListContainSpecificMovie(IdHelper.Terminator));
+            Assert.True(await DoesFavoriteListContainSpecificMovie(IdHelper.Terminator));
 
             // Try to un-mark is as a favorite
-            Assert.True(Config.Client.AccountChangeFavoriteStatusAsync(MediaType.Movie, IdHelper.Terminator, false).Result);
+            Assert.True(await TMDbClient.AccountChangeFavoriteStatusAsync(MediaType.Movie, IdHelper.Terminator, false));
 
             // Check if it worked
-            Assert.False(DoesFavoriteListContainSpecificMovie(IdHelper.Terminator));
+            Assert.False(await DoesFavoriteListContainSpecificMovie(IdHelper.Terminator));
         }
 
         [Fact]
-        public void TestAccountChangeTvWatchlistStatus()
+        public async Task TestAccountChangeTvWatchlistStatusAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
-
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
             // Ensure that the test movie is not marked as favorite before we start the test
-            if (DoesWatchListContainSpecificTvShow(IdHelper.DoctorWho))
-                Assert.True(Config.Client.AccountChangeWatchlistStatusAsync(MediaType.Tv, IdHelper.DoctorWho, false).Result);
+            if (await DoesWatchListContainSpecificTvShow(IdHelper.DoctorWho))
+                Assert.True(await TMDbClient.AccountChangeWatchlistStatusAsync(MediaType.Tv, IdHelper.DoctorWho, false));
 
-            if (DoesWatchListContainSpecificTvShow(IdHelper.DoctorWho))
+            if (await DoesWatchListContainSpecificTvShow(IdHelper.DoctorWho))
                 throw new Exception($"Test tv show '{IdHelper.DoctorWho}' was already on watchlist. Unable to perform test correctly");
 
             // Try to add an item to the watchlist
-            Assert.True(Config.Client.AccountChangeWatchlistStatusAsync(MediaType.Tv, IdHelper.DoctorWho, true).Result);
+            Assert.True(await TMDbClient.AccountChangeWatchlistStatusAsync(MediaType.Tv, IdHelper.DoctorWho, true));
 
             // Check if it worked
-            Assert.True(DoesWatchListContainSpecificTvShow(IdHelper.DoctorWho));
+            Assert.True(await DoesWatchListContainSpecificTvShow(IdHelper.DoctorWho));
 
             // Try to remove item from watchlist
-            Assert.True(Config.Client.AccountChangeWatchlistStatusAsync(MediaType.Tv, IdHelper.DoctorWho, false).Result);
+            Assert.True(await TMDbClient.AccountChangeWatchlistStatusAsync(MediaType.Tv, IdHelper.DoctorWho, false));
 
             // Check if it worked
-            Assert.False(DoesWatchListContainSpecificTvShow(IdHelper.DoctorWho));
+            Assert.False(await DoesWatchListContainSpecificTvShow(IdHelper.DoctorWho));
         }
 
         [Fact]
-        public void TestAccountChangeMovieWatchlistStatus()
+        public async Task TestAccountChangeMovieWatchlistStatusAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
-
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
             // Ensure that the test movie is not marked as favorite before we start the test
-            if (DoesWatchListContainSpecificMovie(IdHelper.Terminator))
-                Assert.True(Config.Client.AccountChangeWatchlistStatusAsync(MediaType.Movie, IdHelper.Terminator, false).Result);
+            if (await DoesWatchListContainSpecificMovie(IdHelper.Terminator))
+                Assert.True(await TMDbClient.AccountChangeWatchlistStatusAsync(MediaType.Movie, IdHelper.Terminator, false));
 
-            if (DoesWatchListContainSpecificMovie(IdHelper.Terminator))
+            if (await DoesWatchListContainSpecificMovie(IdHelper.Terminator))
                 throw new Exception($"Test movie '{IdHelper.Terminator}' was already on watchlist. Unable to perform test correctly");
 
             // Try to add an item to the watchlist
-            Assert.True(Config.Client.AccountChangeWatchlistStatusAsync(MediaType.Movie, IdHelper.Terminator, true).Result);
+            Assert.True(await TMDbClient.AccountChangeWatchlistStatusAsync(MediaType.Movie, IdHelper.Terminator, true));
 
             // Check if it worked
-            Assert.True(DoesWatchListContainSpecificMovie(IdHelper.Terminator));
+            Assert.True(await DoesWatchListContainSpecificMovie(IdHelper.Terminator));
 
             // Try to remove item from watchlist
-            Assert.True(Config.Client.AccountChangeWatchlistStatusAsync(MediaType.Movie, IdHelper.Terminator, false).Result);
+            Assert.True(await TMDbClient.AccountChangeWatchlistStatusAsync(MediaType.Movie, IdHelper.Terminator, false));
 
             // Check if it worked
-            Assert.False(DoesWatchListContainSpecificMovie(IdHelper.Terminator));
+            Assert.False(await DoesWatchListContainSpecificMovie(IdHelper.Terminator));
         }
 
-        private bool DoesFavoriteListContainSpecificTvShow(int tvId)
+        private async Task<bool> DoesFavoriteListContainSpecificTvShow(int tvId)
         {
-            return DoesListContainSpecificMovie(tvId, page => Config.Client.AccountGetFavoriteTvAsync(page).Result.Results.Select(s => s.Id));
+            return await DoesListContainSpecificMovie(tvId, async page => (await TMDbClient.AccountGetFavoriteTvAsync(page)).Results.Select(s => s.Id));
         }
 
-        private bool DoesWatchListContainSpecificTvShow(int tvId)
+        private async Task<bool> DoesWatchListContainSpecificTvShow(int tvId)
         {
-            return DoesListContainSpecificMovie(tvId, page => Config.Client.AccountGetTvWatchlistAsync(page).Result.Results.Select(s => s.Id));
+            return await DoesListContainSpecificMovie(tvId, async page => (await TMDbClient.AccountGetTvWatchlistAsync(page)).Results.Select(s => s.Id));
         }
 
-        private bool DoesFavoriteListContainSpecificMovie(int movieId)
+        private async Task<bool> DoesFavoriteListContainSpecificMovie(int movieId)
         {
-            return DoesListContainSpecificMovie(movieId, page => Config.Client.AccountGetFavoriteMoviesAsync(page).Result.Results.Select(s => s.Id));
+            return await DoesListContainSpecificMovie(movieId, async page => (await TMDbClient.AccountGetFavoriteMoviesAsync(page)).Results.Select(s => s.Id));
         }
 
-        private bool DoesWatchListContainSpecificMovie(int movieId)
+        private async Task<bool> DoesWatchListContainSpecificMovie(int movieId)
         {
-            return DoesListContainSpecificMovie(movieId, page => Config.Client.AccountGetMovieWatchlistAsync(page).Result.Results.Select(s => s.Id));
+            return await DoesListContainSpecificMovie(movieId, async page => (await TMDbClient.AccountGetMovieWatchlistAsync(page)).Results.Select(s => s.Id));
         }
 
-        private bool DoesListContainSpecificMovie(int movieId, Func<int, IEnumerable<int>> listGetter)
+        private async Task<bool> DoesListContainSpecificMovie(int movieId, Func<int, Task<IEnumerable<int>>> listGetter)
         {
             int page = 1;
-            List<int> originalList = listGetter(1).ToList();
+            List<int> originalList = (await listGetter(page)).ToList();
             while (originalList != null && originalList.Any())
             {
                 // Check if the current result page contains the relevant movie
@@ -391,7 +283,7 @@ namespace TMDbLibTests
                     return true;
 
                 // See if there is an other page we could try, if not the test passes
-                originalList = originalList.Any() ? listGetter(++page).ToList() : null;
+                originalList = originalList.Any() ? (await listGetter(++page)).ToList() : null;
             }
             return false;
         }
diff --git a/TMDbLibTests/ClientAuthenticationTests.cs b/TMDbLibTests/ClientAuthenticationTests.cs
index da203e8..279ec4f 100644
--- a/TMDbLibTests/ClientAuthenticationTests.cs
+++ b/TMDbLibTests/ClientAuthenticationTests.cs
@@ -1,8 +1,8 @@
 using System;
+using System.Threading.Tasks;
 using TMDbLibTests.Exceptions;
 using Xunit;
 using TMDbLib.Objects.Authentication;
-using TMDbLibTests.Helpers;
 using TMDbLibTests.JsonHelpers;
 
 namespace TMDbLibTests
@@ -14,19 +14,18 @@ namespace TMDbLibTests
     {
         public ClientAuthenticationTests()
         {
-            if (string.IsNullOrWhiteSpace(Config.Username) || string.IsNullOrWhiteSpace(Config.Password))
+            if (string.IsNullOrWhiteSpace(TestConfig.Username) || string.IsNullOrWhiteSpace(TestConfig.Password))
                 throw new ConfigurationErrorsException("You need to provide a username and password or some tests won't be able to execute.");
         }
 
         [Fact]
-        public void TestAuthenticationRequestNewToken()
+        public async Task TestAuthenticationRequestNewToken()
         {
-            Token token = Config.Client.AuthenticationRequestAutenticationTokenAsync().Sync();
+            Token token = await TMDbClient.AuthenticationRequestAutenticationTokenAsync();
 
             Assert.NotNull(token);
             Assert.True(token.Success);
             Assert.NotNull(token.AuthenticationCallback);
-            Assert.NotNull(token.ExpiresAt);
             Assert.NotNull(token.RequestToken);
         }
 
@@ -49,39 +48,39 @@ namespace TMDbLibTests
         //}
 
         [Fact]
-        public void TestAuthenticationUserAuthenticatedSessionInvalidToken()
+        public async Task TestAuthenticationUserAuthenticatedSessionInvalidTokenAsync()
         {
             const string requestToken = "bla";
 
-            Assert.Throws<UnauthorizedAccessException>(() => Config.Client.AuthenticationGetUserSessionAsync(requestToken).Sync());
+            await Assert.ThrowsAsync<UnauthorizedAccessException>(() => TMDbClient.AuthenticationGetUserSessionAsync(requestToken));
         }
 
         /// <remarks>
         /// Requires a valid test user to be assigned
         /// </remarks>
         [Fact]
-        public void TestAuthenticationGetUserSessionApiUserValidationSuccess()
+        public async Task TestAuthenticationGetUserSessionApiUserValidationSuccessAsync()
         {
-            Token token = Config.Client.AuthenticationRequestAutenticationTokenAsync().Sync();
+            Token token = await TMDbClient.AuthenticationRequestAutenticationTokenAsync();
 
-            Config.Client.AuthenticationValidateUserTokenAsync(token.RequestToken, Config.Username, Config.Password).Sync();
+            await TMDbClient.AuthenticationValidateUserTokenAsync(token.RequestToken, TestConfig.Username, TestConfig.Password);
         }
 
         [Fact]
-        public void TestAuthenticationGetUserSessionApiUserValidationInvalidLogin()
+        public async Task TestAuthenticationGetUserSessionApiUserValidationInvalidLoginAsync()
         {
-            Token token = Config.Client.AuthenticationRequestAutenticationTokenAsync().Sync();
+            Token token = await TMDbClient.AuthenticationRequestAutenticationTokenAsync();
 
-            Assert.Throws<UnauthorizedAccessException>(() => Config.Client.AuthenticationValidateUserTokenAsync(token.RequestToken, "bla", "bla").Sync());
+            await Assert.ThrowsAsync<UnauthorizedAccessException>(() => TMDbClient.AuthenticationValidateUserTokenAsync(token.RequestToken, "bla", "bla"));
         }
 
         /// <remarks>
         /// Requires a valid test user to be assigned
         /// </remarks>
         [Fact]
-        public void AuthenticationGetUserSessionWithLoginSuccess()
+        public async Task AuthenticationGetUserSessionWithLoginSuccess()
         {
-            UserSession session = Config.Client.AuthenticationGetUserSessionAsync(Config.Username, Config.Password).Result;
+            UserSession session = await TMDbClient.AuthenticationGetUserSessionAsync(TestConfig.Username, TestConfig.Password);
 
             Assert.NotNull(session);
             Assert.True(session.Success);
@@ -89,21 +88,20 @@ namespace TMDbLibTests
         }
 
         [Fact]
-        public void TestAuthenticationUserAuthenticatedSessionOldToken()
+        public async Task TestAuthenticationUserAuthenticatedSessionOldTokenAsync()
         {
             const string requestToken = "5f3a62c0d7977319e3d14adf1a2064c0c0938bcf";
 
-            Assert.Throws<UnauthorizedAccessException>(() => Config.Client.AuthenticationGetUserSessionAsync(requestToken).Sync());
+            await Assert.ThrowsAsync<UnauthorizedAccessException>(() => TMDbClient.AuthenticationGetUserSessionAsync(requestToken));
         }
 
         [Fact]
-        public void TestAuthenticationCreateGuestSession()
+        public async Task TestAuthenticationCreateGuestSessionAsync()
         {
-            GuestSession guestSession = Config.Client.AuthenticationCreateGuestSessionAsync().Sync();
+            GuestSession guestSession = await TMDbClient.AuthenticationCreateGuestSessionAsync();
 
             Assert.NotNull(guestSession);
             Assert.True(guestSession.Success);
-            Assert.NotNull(guestSession.ExpiresAt);
             Assert.NotNull(guestSession.GuestSessionId);
         }
     }
diff --git a/TMDbLibTests/ClientCertificationsTests.cs b/TMDbLibTests/ClientCertificationsTests.cs
index ffccfc2..36e2360 100644
--- a/TMDbLibTests/ClientCertificationsTests.cs
+++ b/TMDbLibTests/ClientCertificationsTests.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Xunit;
 using TMDbLib.Objects.Certifications;
-using TMDbLibTests.Helpers;
 using TMDbLibTests.JsonHelpers;
 
 namespace TMDbLibTests
@@ -10,43 +10,31 @@ namespace TMDbLibTests
     public class ClientCertificationsTests : TestBase
     {
         [Fact]
-        public void TestCertificationsListMovie()
+        public async Task TestCertificationsListMovieAsync()
         {
-            CertificationsContainer result = Config.Client.GetMovieCertificationsAsync().Sync();
-            Assert.NotNull(result);
-            Assert.NotNull(result.Certifications);
-            Assert.True(result.Certifications.Count > 1);
+            CertificationsContainer result = await TMDbClient.GetMovieCertificationsAsync();
+            Assert.NotEmpty(result.Certifications);
 
             List<CertificationItem> certAu = result.Certifications["AU"];
-            Assert.NotNull(certAu);
-            Assert.True(certAu.Count > 2);
+            Assert.NotEmpty(certAu);
 
             CertificationItem ratingE = certAu.Single(s => s.Certification == "E");
 
-            Assert.NotNull(ratingE);
-            Assert.Equal("E", ratingE.Certification);
-            Assert.Equal("Exempt from classification. Films that are exempt from classification must not contain contentious material (i.e. material that would ordinarily be rated M or higher).", ratingE.Meaning);
-            Assert.Equal(1, ratingE.Order);
+            await Verify(ratingE);
         }
 
         [Fact]
-        public void TestCertificationsListTv()
+        public async Task TestCertificationsListTvAsync()
         {
-            CertificationsContainer result = Config.Client.GetTvCertificationsAsync().Sync();
-            Assert.NotNull(result);
-            Assert.NotNull(result.Certifications);
-            Assert.True(result.Certifications.Count > 1);
+            CertificationsContainer result = await TMDbClient.GetTvCertificationsAsync();
+            Assert.NotEmpty(result.Certifications);
 
             List<CertificationItem> certUs = result.Certifications["US"];
-            Assert.NotNull(certUs);
-            Assert.True(certUs.Count > 2);
+            Assert.NotEmpty(certUs);
 
             CertificationItem ratingNr = certUs.SingleOrDefault(s => s.Certification == "NR");
-
-            Assert.NotNull(ratingNr);
-            Assert.Equal("NR", ratingNr.Certification);
-            Assert.Equal("No rating information.", ratingNr.Meaning);
-            Assert.Equal(0, ratingNr.Order);
+            
+            await Verify(ratingNr);
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/ClientChangesTests.cs b/TMDbLibTests/ClientChangesTests.cs
index e5e2d36..5c2bd7a 100644
--- a/TMDbLibTests/ClientChangesTests.cs
+++ b/TMDbLibTests/ClientChangesTests.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Linq;
-using Xunit;
+using System.Threading.Tasks;
 using TMDbLib.Objects.Changes;
 using TMDbLib.Objects.General;
-using TMDbLibTests.Helpers;
+using Xunit;
 using TMDbLibTests.JsonHelpers;
 
 namespace TMDbLibTests
@@ -11,130 +11,42 @@ namespace TMDbLibTests
     public class ClientChangesTests : TestBase
     {
         [Fact]
-        public void TestChangesMovies()
+        public async Task TestChangesMoviesAsync()
         {
-            // Basic check
-            SearchContainer<ChangesListItem> changesPage1 = Config.Client.GetChangesMoviesAsync().Sync();
+            SearchContainer<ChangesListItem> page1 = await TMDbClient.GetMoviesChangesAsync(1);
+            SearchContainer<ChangesListItem> oldChanges = await TMDbClient.GetMoviesChangesAsync(endDate: DateTime.UtcNow.AddMonths(-1));
 
-            Assert.NotNull(changesPage1);
-            Assert.True(changesPage1.Results.Count > 0);
-            Assert.True(changesPage1.TotalResults > changesPage1.Results.Count);
-            Assert.Equal(1, changesPage1.Page);
+            Assert.NotEmpty(page1.Results);
+            Assert.NotEmpty(oldChanges.Results);
 
-            // Page 2
-            SearchContainer<ChangesListItem> changesPage2 = Config.Client.GetChangesMoviesAsync(2).Result;
-
-            Assert.NotNull(changesPage2);
-            Assert.Equal(2, changesPage2.Page);
-
-            // Check date range (max)
-            DateTime higher = DateTime.UtcNow.AddDays(-7);
-            SearchContainer<ChangesListItem> changesMaxDate = Config.Client.GetChangesMoviesAsync(endDate: higher).Result;
-
-            Assert.NotNull(changesMaxDate);
-            Assert.Equal(1, changesMaxDate.Page);
-            Assert.NotEqual(changesPage1.TotalResults, changesMaxDate.TotalResults);
-
-            // Check date range (lower)
-            DateTime lower = DateTime.UtcNow.AddDays(-6);       // Use 6 days to avoid clashes with the 'higher'
-            SearchContainer<ChangesListItem> changesLowDate = Config.Client.GetChangesMoviesAsync(startDate: lower).Result;
-
-            Assert.NotNull(changesLowDate);
-            Assert.Equal(1, changesLowDate.Page);
-            Assert.NotEqual(changesPage1.TotalResults, changesLowDate.TotalResults);
+            // At least one item must be newer in page1
+            Assert.Contains(page1.Results, x => oldChanges.Results.All(s => s.Id != x.Id));
         }
 
         [Fact]
-        public void TestChangesPeople()
+        public async Task TestChangesPeopleAsync()
         {
-            // Basic check
-            SearchContainer<ChangesListItem> changesPage1 = Config.Client.GetChangesPeopleAsync().Sync();
+            SearchContainer<ChangesListItem> page1 = await TMDbClient.GetPeopleChangesAsync(1);
+            SearchContainer<ChangesListItem> oldChanges = await TMDbClient.GetPeopleChangesAsync(endDate: DateTime.UtcNow.AddMonths(-1));
 
-            Assert.NotNull(changesPage1);
-            Assert.True(changesPage1.Results.Count > 0);
-            Assert.True(changesPage1.TotalResults > changesPage1.Results.Count);
-            Assert.Equal(1, changesPage1.Page);
+            Assert.NotEmpty(page1.Results);
+            Assert.NotEmpty(oldChanges.Results);
 
-            // Page 2
-            SearchContainer<ChangesListItem> changesPage2 = Config.Client.GetChangesPeopleAsync(2).Result;
-
-            Assert.NotNull(changesPage2);
-            Assert.Equal(2, changesPage2.Page);
-
-            // Check date range (max)
-            DateTime higher = DateTime.UtcNow.AddDays(-7);
-            SearchContainer<ChangesListItem> changesMaxDate = Config.Client.GetChangesPeopleAsync(endDate: higher).Result;
-
-            Assert.NotNull(changesMaxDate);
-            Assert.Equal(1, changesMaxDate.Page);
-            Assert.NotEqual(changesPage1.TotalResults, changesMaxDate.TotalResults);
-
-            // Check date range (lower)
-            DateTime lower = DateTime.UtcNow.AddDays(-6);       // Use 6 days to avoid clashes with the 'higher'
-            SearchContainer<ChangesListItem> changesLowDate = Config.Client.GetChangesPeopleAsync(startDate: lower).Result;
-
-            Assert.NotNull(changesLowDate);
-            Assert.Equal(1, changesLowDate.Page);
-            Assert.NotEqual(changesPage1.TotalResults, changesLowDate.TotalResults);
-
-            // None of the id's in changesLowDate should exist in changesMaxDate, and vice versa
-            Assert.True(changesLowDate.Results.All(lowItem => changesMaxDate.Results.All(maxItem => maxItem.Id != lowItem.Id)));
-            Assert.True(changesMaxDate.Results.All(maxItem => changesLowDate.Results.All(lowItem => maxItem.Id != lowItem.Id)));
+            // At least one item must be newer in page1
+            Assert.Contains(page1.Results, x => oldChanges.Results.All(s => s.Id != x.Id));
         }
 
-
         [Fact]
-        public void TestChangesTvShows()
+        public async Task TestChangesTvShowsAsync()
         {
-            // Basic check
-            SearchContainer<ChangesListItem> changesPage1 = Config.Client.GetChangesTvAsync().Sync();
+            SearchContainer<ChangesListItem> page1 = await TMDbClient.GetTvChangesAsync(1);
+            SearchContainer<ChangesListItem> oldChanges = await TMDbClient.GetTvChangesAsync(endDate: DateTime.UtcNow.AddMonths(-1));
 
-            Assert.NotNull(changesPage1);
-            Assert.NotNull(changesPage1.Results);
-            Assert.True(changesPage1.Results.Count > 0);
-            Assert.True(changesPage1.TotalResults >= changesPage1.Results.Count);
-            Assert.Equal(1, changesPage1.Page);
+            Assert.NotEmpty(page1.Results);
+            Assert.NotEmpty(oldChanges.Results);
 
-            if (changesPage1.TotalPages > 1)
-            {
-                Assert.True(changesPage1.TotalResults > changesPage1.Results.Count);
-                // Page 2
-                SearchContainer<ChangesListItem> changesPage2 = Config.Client.GetChangesTvAsync(2).Result;
-
-                Assert.NotNull(changesPage2);
-                Assert.Equal(2, changesPage2.Page);
-            }
-
-            // Check date range (max)
-            DateTime higher = DateTime.UtcNow.AddDays(-8);
-            SearchContainer<ChangesListItem> changesMaxDate = Config.Client.GetChangesTvAsync(endDate: higher).Result;
-
-            Assert.NotNull(changesMaxDate);
-            Assert.Equal(1, changesMaxDate.Page);
-            Assert.NotEqual(changesPage1.TotalResults, changesMaxDate.TotalResults);
-
-            // Check date range (lower)
-            DateTime lower = DateTime.UtcNow.AddDays(-6);       // Use 6 days to avoid clashes with the 'higher'
-            SearchContainer<ChangesListItem> changesLowDate = Config.Client.GetChangesTvAsync(startDate: lower).Result;
-
-            Assert.NotNull(changesLowDate);
-            Assert.Equal(1, changesLowDate.Page);
-            Assert.NotEqual(changesPage1.TotalResults, changesLowDate.TotalResults);
-
-            // None of the id's in changesLowDate should exist in changesMaxDate, and vice versa
-            foreach (ChangesListItem changeItem in changesLowDate.Results)
-            {
-                bool existsInOtherList = changesMaxDate.Results.Any(x => x.Id == changeItem.Id);
-
-                Assert.False(existsInOtherList, "Item id " + changeItem.Id + " is duplicated");
-            }
-
-            foreach (ChangesListItem changeItem in changesMaxDate.Results)
-            {
-                bool existsInOtherList = changesLowDate.Results.Any(x => x.Id == changeItem.Id);
-
-                Assert.False(existsInOtherList, "Item id " + changeItem.Id + " is duplicated");
-            }
+            // At least one item must be newer in page1
+            Assert.Contains(page1.Results, x => oldChanges.Results.All(s => s.Id != x.Id));
         }
     }
 }
diff --git a/TMDbLibTests/ClientCollectionTests.cs b/TMDbLibTests/ClientCollectionTests.cs
index 7107c19..6f61812 100644
--- a/TMDbLibTests/ClientCollectionTests.cs
+++ b/TMDbLibTests/ClientCollectionTests.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Threading.Tasks;
 using Xunit;
 using TMDbLib.Objects.Collections;
 using TMDbLib.Objects.General;
@@ -11,94 +11,60 @@ namespace TMDbLibTests
 {
     public class ClientCollectionTests : TestBase
     {
-        private static Dictionary<CollectionMethods, Func<Collection, object>> _methods;
+        private static readonly Dictionary<CollectionMethods, Func<Collection, object>> Methods;
 
-        public ClientCollectionTests()
+        static ClientCollectionTests()
         {
-            _methods = new Dictionary<CollectionMethods, Func<Collection, object>>
+            Methods = new Dictionary<CollectionMethods, Func<Collection, object>>
             {
                 [CollectionMethods.Images] = collection => collection.Images
             };
         }
 
         [Fact]
-        public void TestCollectionsExtrasNone()
+        public async Task TestCollectionsExtrasNone()
         {
-            // We will intentionally ignore errors reg. missing JSON as we do not request it
-            IgnoreMissingJson(" / images", "parts[array] / media_type");
-
-            Collection collection = Config.Client.GetCollectionAsync(IdHelper.JamesBondCollection).Result;
-
-            Assert.NotNull(collection);
-            Assert.Equal("James Bond Collection", collection.Name);
-            Assert.NotNull(collection.Parts);
-            Assert.True(collection.Parts.Count > 0);
+            Collection collection = await TMDbClient.GetCollectionAsync(IdHelper.BackToTheFutureCollection);
 
             // Test all extras, ensure none of them exist
-            foreach (Func<Collection, object> selector in _methods.Values)
-            {
+            foreach (Func<Collection, object> selector in Methods.Values)
                 Assert.Null(selector(collection));
-            }
         }
 
         [Fact]
-        public void TestCollectionMissing()
+        public async Task TestCollectionMissing()
         {
-            Collection collection = Config.Client.GetCollectionAsync(IdHelper.MissingID).Result;
+            Collection collection = await TMDbClient.GetCollectionAsync(IdHelper.MissingID);
 
             Assert.Null(collection);
         }
 
         [Fact]
-        public void TestCollectionsParts()
+        public async Task TestCollectionsParts()
         {
-            // We will intentionally ignore errors reg. missing JSON as we do not request it
-            IgnoreMissingJson(" / images", "parts[array] / media_type");
+            Collection collection = await TMDbClient.GetCollectionAsync(IdHelper.BackToTheFutureCollection);
 
-            Collection collection = Config.Client.GetCollectionAsync(IdHelper.JamesBondCollection).Result;
-
-            Assert.NotNull(collection);
-            Assert.Equal("James Bond Collection", collection.Name);
-
-            Assert.NotNull(collection.Parts);
-            Assert.True(collection.Parts.Count > 0);
-
-            Assert.Contains(collection.Parts, movie => movie.Title == "Live and Let Die");
-            Assert.Contains(collection.Parts, movie => movie.Title == "Dr. No");
+            await Verify(collection);
         }
 
         [Fact]
-        public void TestCollectionsExtrasExclusive()
+        public async Task TestCollectionsExtrasExclusive()
         {
-            // Ignore missing json
-            IgnoreMissingJson("parts[array] / media_type");
-
-            TestMethodsHelper.TestGetExclusive(_methods, (id, extras) => Config.Client.GetCollectionAsync(id, extras).Result, IdHelper.JamesBondCollection);
+            await TestMethodsHelper.TestGetExclusive(Methods, extras => TMDbClient.GetCollectionAsync(IdHelper.BackToTheFutureCollection, extras));
         }
 
         [Fact]
-        public void TestCollectionsExtrasAll()
+        public async Task TestCollectionsExtrasAll()
         {
-            // Ignore missing json
-            IgnoreMissingJson("parts[array] / media_type");
-
-            CollectionMethods combinedEnum = _methods.Keys.Aggregate((methods, movieMethods) => methods | movieMethods);
-            Collection item = Config.Client.GetCollectionAsync(IdHelper.JamesBondCollection, combinedEnum).Result;
-
-            TestMethodsHelper.TestAllNotNull(_methods, item);
+            await TestMethodsHelper.TestGetAll(Methods, combined => TMDbClient.GetCollectionAsync(IdHelper.BackToTheFutureCollection, combined), async collection => await Verify(collection));
         }
 
         [Fact]
-        public void TestCollectionsImages()
+        public async Task TestCollectionsImagesAsync()
         {
-            // Get config
-            Config.Client.GetConfigAsync().Sync();
+            ImagesWithId images = await TMDbClient.GetCollectionImagesAsync(IdHelper.BackToTheFutureCollection);
 
-            // Test image url generator
-            ImagesWithId images = Config.Client.GetCollectionImagesAsync(IdHelper.JamesBondCollection).Result;
-
-            Assert.Equal(IdHelper.JamesBondCollection, images.Id);
-            TestImagesHelpers.TestImages(Config, images);
+            TestImagesHelpers.TestImagePaths(images);
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/ClientCompanyTests.cs b/TMDbLibTests/ClientCompanyTests.cs
index 0a4b0e9..71a8d2c 100644
--- a/TMDbLibTests/ClientCompanyTests.cs
+++ b/TMDbLibTests/ClientCompanyTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Xunit;
 using TMDbLib.Objects.Companies;
 using TMDbLib.Objects.General;
@@ -12,83 +13,65 @@ namespace TMDbLibTests
 {
     public class ClientCompanyTests : TestBase
     {
-        private static Dictionary<CompanyMethods, Func<Company, object>> _methods;
+        private static readonly Dictionary<CompanyMethods, Func<Company, object>> Methods;
 
-        public ClientCompanyTests()
+        static ClientCompanyTests()
         {
-            _methods = new Dictionary<CompanyMethods, Func<Company, object>>
+            Methods = new Dictionary<CompanyMethods, Func<Company, object>>
             {
                 [CompanyMethods.Movies] = company => company.Movies
             };
         }
 
         [Fact]
-        public void TestCompaniesExtrasNone()
+        public async Task TestCompaniesExtrasNoneAsync()
         {
-            // We will intentionally ignore errors reg. missing JSON as we do not request it
-            IgnoreMissingJson(" / movies");
-
-            Company company = Config.Client.GetCompanyAsync(IdHelper.TwentiethCenturyFox).Result;
-
-            Assert.NotNull(company);
-
-            // TODO: Test all properties
-            Assert.Equal("20th Century Fox", company.Name);
+            Company company = await TMDbClient.GetCompanyAsync(IdHelper.TwentiethCenturyFox);
 
             // Test all extras, ensure none of them exist
-            foreach (Func<Company, object> selector in _methods.Values)
+            foreach (Func<Company, object> selector in Methods.Values)
             {
                 Assert.Null(selector(company));
             }
         }
 
         [Fact]
-        public void TestCompaniesExtrasExclusive()
+        public async Task TestCompaniesExtrasExclusive()
         {
-            // Ignore missing json
-            IgnoreMissingJson("movies.results[array] / media_type");
-
-            TestMethodsHelper.TestGetExclusive(_methods, (id, extras) => Config.Client.GetCompanyAsync(id, extras).Result, IdHelper.TwentiethCenturyFox);
+            await TestMethodsHelper.TestGetExclusive(Methods, extras => TMDbClient.GetCompanyAsync(IdHelper.TwentiethCenturyFox, extras));
         }
 
         [Fact]
-        public void TestCompaniesExtrasAll()
+        public async Task TestCompaniesExtrasAllAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("movies.results[array] / media_type");
+            await TestMethodsHelper.TestGetAll(Methods, combined => TMDbClient.GetCompanyAsync(IdHelper.TwentiethCenturyFox, combined), async company =>
+            {
+                // Reduce testdata
+                company.Movies.Results = company.Movies.Results.OrderBy(s => s.Id).Take(1).ToList();
 
-            CompanyMethods combinedEnum = _methods.Keys.Aggregate((methods, movieMethods) => methods | movieMethods);
-            Company item = Config.Client.GetCompanyAsync(IdHelper.TwentiethCenturyFox, combinedEnum).Result;
-
-            TestMethodsHelper.TestAllNotNull(_methods, item);
+                await Verify(company, settings => settings.IgnoreProperty(nameof(company.Movies.TotalPages), nameof(company.Movies.TotalResults)));
+            });
         }
 
         [Fact]
-        public void TestCompanyMissing()
+        public async Task TestCompanyMissingAsync()
         {
-            Company company = Config.Client.GetCompanyAsync(IdHelper.MissingID).Result;
+            Company company = await TMDbClient.GetCompanyAsync(IdHelper.MissingID);
 
             Assert.Null(company);
         }
 
         [Fact]
-        public void TestCompaniesGetters()
+        public async Task TestCompaniesMoviesAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
-
             //GetCompanyMoviesAsync(int id, string language, int page = -1)
-            SearchContainerWithId<SearchMovie> resp = Config.Client.GetCompanyMoviesAsync(IdHelper.TwentiethCenturyFox).Result;
-            SearchContainerWithId<SearchMovie> respPage2 = Config.Client.GetCompanyMoviesAsync(IdHelper.TwentiethCenturyFox, 2).Result;
-            SearchContainerWithId<SearchMovie> respItalian = Config.Client.GetCompanyMoviesAsync(IdHelper.TwentiethCenturyFox, "it").Result;
+            SearchContainerWithId<SearchMovie> resp = await TMDbClient.GetCompanyMoviesAsync(IdHelper.TwentiethCenturyFox);
+            SearchContainerWithId<SearchMovie> respPage2 = await TMDbClient.GetCompanyMoviesAsync(IdHelper.TwentiethCenturyFox, 2);
+            SearchContainerWithId<SearchMovie> respItalian = await TMDbClient.GetCompanyMoviesAsync(IdHelper.TwentiethCenturyFox, "it");
 
-            Assert.NotNull(resp);
-            Assert.NotNull(respPage2);
-            Assert.NotNull(respItalian);
-
-            Assert.True(resp.Results.Count > 0);
-            Assert.True(respPage2.Results.Count > 0);
-            Assert.True(respItalian.Results.Count > 0);
+            Assert.NotEmpty(resp.Results);
+            Assert.NotEmpty(respPage2.Results);
+            Assert.NotEmpty(respItalian.Results);
 
             bool allTitlesIdentical = true;
             for (int index = 0; index < resp.Results.Count; index++)
@@ -103,44 +86,22 @@ namespace TMDbLibTests
         }
 
         [Fact]
-        public void TestCompaniesImages()
+        public async Task TestCompaniesImagesAsync()
         {
-            IgnoreMissingJson(" / movies");
-
             // Get config
-            Config.Client.GetConfigAsync().Sync();
+            await TMDbClient.GetConfigAsync();
 
             // Test image url generator
-            Company company = Config.Client.GetCompanyAsync(IdHelper.TwentiethCenturyFox).Result;
+            Company company = await TMDbClient.GetCompanyAsync(IdHelper.TwentiethCenturyFox);
 
-            Uri url = Config.Client.GetImageUrl("original", company.LogoPath);
-            Uri urlSecure = Config.Client.GetImageUrl("original", company.LogoPath, true);
+            Uri url = TMDbClient.GetImageUrl("original", company.LogoPath);
+            Uri urlSecure = TMDbClient.GetImageUrl("original", company.LogoPath, true);
 
-            Assert.True(TestHelpers.InternetUriExists(url));
-            Assert.True(TestHelpers.InternetUriExists(urlSecure));
-        }
-
-        [Fact]
-        public void TestCompaniesFull()
-        {
-            IgnoreMissingJson(" / movies");
-
-            Company company = Config.Client.GetCompanyAsync(IdHelper.ColumbiaPictures).Result;
-
-            Assert.NotNull(company);
-
-            Assert.Equal(IdHelper.ColumbiaPictures, company.Id);
-            Assert.Equal("Columbia Pictures Industries, Inc. (CPII) is an American film production and distribution company. Columbia Pictures now forms part of the Columbia TriStar Motion Picture Group, owned by Sony Pictures Entertainment, a subsidiary of the Japanese conglomerate Sony. It is one of the leading film companies in the world, a member of the so-called Big Six. It was one of the so-called Little Three among the eight major film studios of Hollywood's Golden Age.", company.Description);
-            Assert.Equal("Culver City, California", company.Headquarters);
-            Assert.Equal("http://www.sonypictures.com/", company.Homepage);
-            Assert.Equal("US", company.OriginCountry);
-            Assert.Equal("/mjUSfXXUhMiLAA1Zq1TfStNSoLR.png", company.LogoPath);
-            Assert.Equal("Columbia Pictures", company.Name);
-
-            Assert.NotNull(company.ParentCompany);
-            Assert.Equal(5752, company.ParentCompany.Id);
-            Assert.Equal("/sFg00KK0vVq3oqvkCxRQWApYB83.png", company.ParentCompany.LogoPath);
-            Assert.Equal("Sony Pictures Entertainment", company.ParentCompany.Name);
+            await Verify(new
+            {
+                url,
+                urlSecure
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/ClientConfigurationTests.cs b/TMDbLibTests/ClientConfigurationTests.cs
index a7bc8c4..f231efb 100644
--- a/TMDbLibTests/ClientConfigurationTests.cs
+++ b/TMDbLibTests/ClientConfigurationTests.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using TMDbLib.Objects.Configuration;
 using Xunit;
 using TMDbLib.Objects.Timezones;
-using TMDbLibTests.Helpers;
 using TMDbLibTests.JsonHelpers;
 using TMDbLib.Objects.Countries;
 using TMDbLib.Objects.General;
@@ -14,72 +14,63 @@ namespace TMDbLibTests
     public class ClientConfigurationTests : TestBase
     {
         [Fact]
-        public void TestConfiguration()
+        public async Task TestConfigurationAsync()
         {
-            APIConfiguration result = Config.Client.GetAPIConfiguration().Sync();
+            APIConfiguration result = await TMDbClient.GetAPIConfiguration();
 
-            Assert.NotNull(result);
-
-            Assert.Contains(result.Images.BackdropSizes, c => c == "original");
+            await Verify(result);
         }
 
         [Fact]
-        public void TestPrimaryTranslations()
+        public async Task TestPrimaryTranslationsAsync()
         {
-            List<string> result = Config.Client.GetPrimaryTranslationsAsync().Sync();
+            List<string> result = await TMDbClient.GetPrimaryTranslationsAsync();
 
-            Assert.NotNull(result);
-
-            Assert.Contains(result, c => c == "da-DK");
+            Assert.Contains("da-DK", result);
         }
 
         [Fact]
-        public void TestCountryList()
+        public async Task TestCountryListAsync()
         {
-            List<Country> result = Config.Client.GetCountriesAsync().Sync();
+            List<Country> result = await TMDbClient.GetCountriesAsync();
 
-            Assert.NotNull(result);
-            Assert.True(result.Count > 200);
+            Assert.NotEmpty(result);
+            Country single = result.Single(s => s.EnglishName == "Denmark");
 
-            Assert.Contains(result, c => c.EnglishName == "Denmark" && c.Iso_3166_1 == "DK");
+            await Verify(single);
         }
 
         [Fact]
-        public void TestLanguageList()
+        public async Task TestLanguageListAsync()
         {
-            List<Language> result = Config.Client.GetLanguagesAsync().Sync();
+            List<Language> result = await TMDbClient.GetLanguagesAsync();
 
-            Assert.NotNull(result);
-            Assert.True(result.Count > 180);
+            Assert.NotEmpty(result);
+            Language single = result.Single(s => s.Name == "Dansk");
 
-            Assert.Contains(result, l => l.Name == "Dansk" && l.EnglishName == "Danish" && l.Iso_639_1 == "da");
+            await Verify(single);
         }
 
         [Fact]
-        public void TestTimezonesList()
+        public async Task TestTimezonesListAsync()
         {
-            Timezones result = Config.Client.GetTimezonesAsync().Sync();
+            Timezones result = await TMDbClient.GetTimezonesAsync();
 
-            Assert.NotNull(result);
-            Assert.True(result.List.Count > 200);
+            Assert.NotEmpty(result.List);
+            List<string> single = result.List["DK"];
 
-            List<string> item = result.List["DK"];
-            Assert.NotNull(item);
-            Assert.Equal(1, item.Count);
-            Assert.Equal("Europe/Copenhagen", item[0]);
+            await Verify(single);
         }
 
         [Fact]
-        public void TestJobList()
+        public async Task TestJobListAsync()
         {
-            List<Job> jobs = Config.Client.GetJobsAsync().Sync();
+            List<Job> jobs = await TMDbClient.GetJobsAsync();
 
-            Assert.NotNull(jobs);
-            Assert.True(jobs.Count > 0);
+            Assert.NotEmpty(jobs);
+            Job single = jobs.Single(s => s.Department == "Writing");
 
-            Assert.True(jobs.All(job => !string.IsNullOrEmpty(job.Department)));
-            Assert.True(jobs.All(job => job.Jobs != null));
-            Assert.True(jobs.All(job => job.Jobs.Count > 0));
+            await Verify(single);
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/ClientCreditTests.cs b/TMDbLibTests/ClientCreditTests.cs
index dcad970..dd4dede 100644
--- a/TMDbLibTests/ClientCreditTests.cs
+++ b/TMDbLibTests/ClientCreditTests.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Linq;
+using System.Threading.Tasks;
 using Xunit;
 using TMDbLib.Objects.Credit;
-using TMDbLib.Objects.General;
 using TMDbLibTests.Helpers;
 using TMDbLibTests.JsonHelpers;
 
@@ -11,71 +9,33 @@ namespace TMDbLibTests
     public class ClientCreditTests : TestBase
     {
         [Fact]
-        public void TestGetCreditTv()
+        public async Task TestGetCreditTv()
         {
-            Credit result = Config.Client.GetCreditsAsync(IdHelper.BruceWillisMiamiVice).Result;
+            Credit result = await TMDbClient.GetCreditsAsync(IdHelper.BruceWillisMiamiVice);
 
-            Assert.NotNull(result);
-            Assert.Equal(CreditType.Cast, result.CreditType);
-            Assert.Equal("Actors", result.Department);
-            Assert.Equal("Actor", result.Job);
-            Assert.Equal(MediaType.Tv, result.MediaType);
-            Assert.Equal(IdHelper.BruceWillisMiamiVice, result.Id);
+            // Episode must exist
+            Assert.Contains(result.Media.Episodes, s => s.Name == "No Exit");
 
-            Assert.NotNull(result.Person);
-            Assert.Equal("Bruce Willis", result.Person.Name);
-            Assert.Equal(62, result.Person.Id);
-
-            Assert.NotNull(result.Media);
-            Assert.Equal(1908, result.Media.Id);
-            Assert.Equal("Miami Vice", result.Media.Name);
-            Assert.Equal("Miami Vice", result.Media.OriginalName);
-            Assert.Equal("", result.Media.Character);
+            await Verify(result);
         }
 
         [Fact]
-        public void TestMissingCredit()
+        public async Task TestMissingCredit()
         {
-            Credit result = Config.Client.GetCreditsAsync(IdHelper.MissingID.ToString()).Result;
+            Credit result = await TMDbClient.GetCreditsAsync(IdHelper.MissingID.ToString());
 
             Assert.Null(result);
         }
 
         [Fact]
-        public void TestGetCreditEpisode()
+        public async Task TestGetCreditSeasons()
         {
-            Credit result = Config.Client.GetCreditsAsync(IdHelper.BruceWillisMiamiVice).Result;
+            Credit result = await TMDbClient.GetCreditsAsync(IdHelper.HughLaurieHouse);
 
-            Assert.NotNull(result);
-            Assert.NotNull(result.Media);
-            Assert.NotNull(result.Media.Episodes);
+            // Season must exist
+            Assert.Contains(result.Media.Seasons, s => s.SeasonNumber == 1);
 
-            CreditEpisode item = result.Media.Episodes.SingleOrDefault(s => s.Name == "No Exit");
-            Assert.NotNull(item);
-
-            Assert.Equal(new DateTime(1984, 11, 9), item.AirDate);
-            Assert.Equal(8, item.EpisodeNumber);
-            Assert.Equal("No Exit", item.Name);
-            Assert.Equal("Crockett attempts to help an old flame free herself from a racketeer, then is framed for taking bribes. Martin Castillo becomes the squad's new Lieutenant.", item.Overview);
-            Assert.Equal(1, item.SeasonNumber);
-            Assert.True(TestImagesHelpers.TestImagePath(item.StillPath), "item.StillPath was not a valid image path, was: " + item.StillPath);
-        }
-
-        [Fact]
-        public void TestGetCreditSeasons()
-        {
-            Credit result = Config.Client.GetCreditsAsync(IdHelper.HughLaurieHouse).Result;
-
-            Assert.NotNull(result);
-            Assert.NotNull(result.Media);
-            Assert.NotNull(result.Media.Seasons);
-
-            CreditSeason item = result.Media.Seasons.SingleOrDefault(s => s.SeasonNumber == 1);
-            Assert.NotNull(item);
-
-            Assert.Equal(new DateTime(2004, 11, 16), item.AirDate);
-            Assert.True(TestImagesHelpers.TestImagePath(item.PosterPath), "item.PosterPath was not a valid image path, was: " + item.PosterPath);
-            Assert.Equal(1, item.SeasonNumber);
+            await Verify(result);
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/ClientDiscoverTests.cs b/TMDbLibTests/ClientDiscoverTests.cs
index d9bf131..b01c212 100644
--- a/TMDbLibTests/ClientDiscoverTests.cs
+++ b/TMDbLibTests/ClientDiscoverTests.cs
@@ -1,112 +1,83 @@
 using Xunit;
 using TMDbLib.Objects.Discover;
 using TMDbLib.Objects.General;
-using System.Linq;
 using TMDbLib.Objects.Search;
 using TMDbLibTests.Helpers;
 using TMDbLibTests.JsonHelpers;
 using System;
-using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace TMDbLibTests
 {
     public class ClientDiscoverTests : TestBase
     {
         [Fact]
-        public void TestDiscoverTvShowsNoParams()
+        public async Task TestDiscoverTvShowsNoParamsAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
-
-            TestHelpers.SearchPages(i => Config.Client.DiscoverTvShowsAsync().Query(i).Result);
-
-            SearchContainer<SearchTv> result = Config.Client.DiscoverTvShowsAsync().Query().Result;
-
-            Assert.NotNull(result);
-            Assert.Equal(1, result.Page);
-            Assert.NotNull(result.Results);
-            Assert.True(result.Results.Any());
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.DiscoverTvShowsAsync().Query(i));
         }
 
         [Fact]
-        public void TestDiscoverTvShows()
+        public async Task TestDiscoverMoviesNoParamsAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.DiscoverMoviesAsync().Query(i));
+        }
 
-            DiscoverTv query = Config.Client.DiscoverTvShowsAsync()
+        [Fact]
+        public async Task TestDiscoverTvShowsAsync()
+        {
+            DiscoverTv query = TMDbClient.DiscoverTvShowsAsync()
                     .WhereVoteCountIsAtLeast(100)
                     .WhereVoteAverageIsAtLeast(2);
 
-            TestHelpers.SearchPages(i => query.Query(i).Result);
+            await TestHelpers.SearchPagesAsync(i => query.Query(i));
         }
 
         [Fact]
-        public void TestDiscoverMoviesNoParams()
+        public async Task TestDiscoverMoviesAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
-
-            TestHelpers.SearchPages(i => Config.Client.DiscoverMoviesAsync().Query(i).Result);
-
-            SearchContainer<SearchMovie> result = Config.Client.DiscoverMoviesAsync().Query().Result;
-
-            Assert.NotNull(result);
-            Assert.Equal(1, result.Page);
-            Assert.NotNull(result.Results);
-            Assert.True(result.Results.Any());
-        }
-
-        [Fact]
-        public void TestDiscoverMovies()
-        {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
-
-            DiscoverMovie query = Config.Client.DiscoverMoviesAsync()
+            DiscoverMovie query = TMDbClient.DiscoverMoviesAsync()
                     .WhereVoteCountIsAtLeast(1000)
                     .WhereVoteAverageIsAtLeast(2);
 
-            TestHelpers.SearchPages(i => query.Query(i).Result);
+            await TestHelpers.SearchPagesAsync(i => query.Query(i));
         }
 
         [Fact]
-        public void TestDiscoverMoviesRegion()
+        public async Task TestDiscoverMoviesRegionAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            DiscoverMovie query = TMDbClient.DiscoverMoviesAsync()
+                .WhereReleaseDateIsInRegion("BR")
+                .WherePrimaryReleaseDateIsAfter(new DateTime(2017, 01, 01));
 
-            DiscoverMovie query = Config.Client.DiscoverMoviesAsync().WhereReleaseDateIsInRegion("BR").WherePrimaryReleaseDateIsAfter(new DateTime(2017, 01, 01));
-
-            TestHelpers.SearchPages(i => query.Query(i).Result);
+            await TestHelpers.SearchPagesAsync(i => query.Query(i));
         }
 
         [Fact]
-        public void TestDiscoverMoviesLanguage()
+        public async Task TestDiscoverMoviesLanguageAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            SearchContainer<SearchMovie> query = await TMDbClient.DiscoverMoviesAsync()
+                .WhereOriginalLanguageIs("en-US")
+                .WherePrimaryReleaseDateIsAfter(new DateTime(2017, 01, 01))
+                .Query();
 
-            DiscoverMovie query = Config.Client.DiscoverMoviesAsync().WhereLanguageIs("da-DK").WherePrimaryReleaseDateIsAfter(new DateTime(2017, 01, 01));
+            SearchContainer<SearchMovie> queryDanish = await TMDbClient.DiscoverMoviesAsync()
+                .WhereLanguageIs("da-DK")
+                .WhereOriginalLanguageIs("en-US")
+                .WherePrimaryReleaseDateIsAfter(new DateTime(2017, 01, 01))
+                .Query();
 
-            Assert.Equal("Skønheden og Udyret", query.Query(0).Result.Results[11].Title);
+            // Should be the same identities, but different titles
+            Assert.Equal(query.TotalResults, queryDanish.TotalResults);
 
-            TestHelpers.SearchPages(i => query.Query(i).Result);
-        }
+            for (int i = 0; i < query.Results.Count; i++)
+            {
+                SearchMovie a = query.Results[i];
+                SearchMovie b = queryDanish.Results[i];
 
-        [Theory]
-        [InlineData("ko")]
-        [InlineData("zh")]
-        public void TestDiscoverMoviesOriginalLanguage(string language)
-        {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
-
-            DiscoverMovie query = Config.Client.DiscoverMoviesAsync().WhereOriginalLanguageIs(language);
-            List<SearchMovie> results = query.Query(0).Result.Results;
-
-            Assert.NotEmpty(results);
-            Assert.All(results, item => Assert.Contains(language, item.OriginalLanguage));
+                Assert.Equal(a.Id, b.Id);
+                Assert.NotEqual(a.Title, b.Title);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/ClientFindTests.cs b/TMDbLibTests/ClientFindTests.cs
index 37836a1..0953230 100644
--- a/TMDbLibTests/ClientFindTests.cs
+++ b/TMDbLibTests/ClientFindTests.cs
@@ -9,65 +9,51 @@ namespace TMDbLibTests
     public class ClientFindTests : TestBase
     {
         [Fact]
-        public void TestFindImdbMovie()
+        public async Task TestFindImdbMovie()
         {
-            // Ignore missing json
-            IgnoreMissingJson("movie_results[array] / media_type", "movie_results[array] / popularity");
+            FindContainer result = await TMDbClient.FindAsync(FindExternalSource.Imdb, IdHelper.ImdbTerminatorId);
 
-            Task<FindContainer> result = Config.Client.FindAsync(FindExternalSource.Imdb, IdHelper.ImdbTerminatorId);
-            Assert.Equal(1, result.Result.MovieResults.Count);
-            Assert.Equal(IdHelper.TmdbTerminatorId, result.Result.MovieResults[0].Id);
+            await Verify(result);
         }
 
         [Fact]
-        public void TestFindImdbPerson()
+        public async Task TestFindImdbPerson()
         {
-            // Ignore missing json
-            IgnoreMissingJson("person_results[array] / media_type", " / popularity", "person_results[array] / popularity");
-
-            Task<FindContainer> result = Config.Client.FindAsync(FindExternalSource.Imdb, IdHelper.ImdbBruceWillis);
-            Assert.Equal(1, result.Result.PersonResults.Count);
-            Assert.Equal(IdHelper.BruceWillis, result.Result.PersonResults[0].Id);
+            FindContainer result = await TMDbClient.FindAsync(FindExternalSource.Imdb, IdHelper.ImdbBruceWillis);
+            
+            await Verify(result);
         }
 
         [Fact]
-        public void TestFindImdbTvShowEpisode()
+        public async Task TestFindImdbTvShowEpisode()
         {
-            Task<FindContainer> result = Config.Client.FindAsync(FindExternalSource.Imdb, IdHelper.ImdbBreakingBadSeason1Episode1Id);
-            Assert.Equal(1, result.Result.TvEpisode.Count);
-            Assert.Equal(IdHelper.BreakingBadSeason1Episode1Id, result.Result.TvEpisode[0].Id);
+            FindContainer result = await TMDbClient.FindAsync(FindExternalSource.Imdb, IdHelper.ImdbBreakingBadSeason1Episode1Id);
+            
+            await Verify(result);
         }
 
         [Fact]
-        public void TestFindImdbTvShowSeason()
+        public async Task TestFindImdbTvShowSeasonAsync()
         {
-            Task<FindContainer> result = Config.Client.FindAsync(FindExternalSource.TvDb, IdHelper.TvdbBreakingBadSeason1Id);
-            Assert.Equal(1, result.Result.TvEpisode.Count);
-
-            Assert.Equal(1, result.Result.TvSeason.Count);
-            Assert.Equal(IdHelper.BreakingBadSeason1Id, result.Result.TvSeason[0].Id);
+            FindContainer result =  await TMDbClient.FindAsync(FindExternalSource.TvDb, IdHelper.TvdbBreakingBadSeason1Id);
+           
+            await Verify(result);
         }
 
         [Fact]
-        public void TestFindTvdbTvShow()
+        public async Task TestFindTvdbTvShowAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("tv_results[array] / media_type", "tv_results[array] / popularity");
-
-            Task<FindContainer> result = Config.Client.FindAsync(FindExternalSource.TvDb, IdHelper.TvdbBreakingBadId);
-            Assert.Equal(1, result.Result.TvResults.Count);
-            Assert.Equal(IdHelper.TmdbBreakingBadId, result.Result.TvResults[0].Id);
+            FindContainer result = await  TMDbClient.FindAsync(FindExternalSource.TvDb, IdHelper.TvdbBreakingBadId);
+           
+            await Verify(result);
         }
 
         [Fact]
-        public void TestFindImdbTvShow()
+        public async Task TestFindImdbTvShowAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("tv_results[array] / media_type", "tv_results[array] / popularity");
-
-            Task<FindContainer> result = Config.Client.FindAsync(FindExternalSource.Imdb, IdHelper.ImdbBreakingBadId);
-            Assert.Equal(1, result.Result.TvResults.Count);
-            Assert.Equal(IdHelper.TmdbBreakingBadId, result.Result.TvResults[0].Id);
+            FindContainer result =  await TMDbClient.FindAsync(FindExternalSource.Imdb, IdHelper.ImdbBreakingBadId);
+           
+            await Verify(result);
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/ClientGenreTests.cs b/TMDbLibTests/ClientGenreTests.cs
index ff6db11..dd47396 100644
--- a/TMDbLibTests/ClientGenreTests.cs
+++ b/TMDbLibTests/ClientGenreTests.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Xunit;
 using TMDbLib.Objects.General;
 using TMDbLib.Objects.Search;
@@ -11,75 +12,57 @@ namespace TMDbLibTests
     public class ClientGenreTests : TestBase
     {
         [Fact]
-        public void TestGenreTvList()
+        public async Task TestGenreTvListAsync()
         {
             // Default language
-            List<Genre> genres = Config.Client.GetTvGenresAsync().Sync();
-
-            Assert.NotNull(genres);
-            Assert.True(genres.Count > 0);
+            List<Genre> genres = await TMDbClient.GetTvGenresAsync();
 
             // Another language
-            List<Genre> genresDanish = Config.Client.GetTvGenresAsync("da").Result;
+            List<Genre> genresDanish = await TMDbClient.GetTvGenresAsync("da");
 
-            Assert.NotNull(genresDanish);
-            Assert.True(genresDanish.Count > 0);
-
-            Assert.Equal(genres.Count, genresDanish.Count);
+            await Verify(new
+            {
+                genres,
+                genresDanish
+            });
 
             // At least one should be different
-            Assert.True(genres.Any(genre => genresDanish.First(danishGenre => danishGenre.Id == genre.Id).Name != genre.Name));
+            Genre actionEn = genres.Single(s => s.Id == IdHelper.ActionAdventureTvGenre);
+            Genre actionDa = genresDanish.Single(s => s.Id == IdHelper.ActionAdventureTvGenre);
+
+            Assert.NotEqual(actionEn.Name, actionDa.Name);
         }
 
         [Fact]
-        public void TestGenreMovieList()
+        public async Task TestGenreMovieListAsync()
         {
             // Default language
-            List<Genre> genres = Config.Client.GetMovieGenresAsync().Sync();
-
-            Assert.NotNull(genres);
-            Assert.True(genres.Count > 0);
+            List<Genre> genres = await TMDbClient.GetMovieGenresAsync();
 
             // Another language
-            List<Genre> genresDanish = Config.Client.GetMovieGenresAsync("da").Result;
+            List<Genre> genresDanish = await TMDbClient.GetMovieGenresAsync("da");
 
-            Assert.NotNull(genresDanish);
-            Assert.True(genresDanish.Count > 0);
-
-            Assert.Equal(genres.Count, genresDanish.Count);
+            await Verify(new
+            {
+                genres,
+                genresDanish
+            });
 
             // At least one should be different
-            Assert.True(genres.Any(genre => genresDanish.First(danishGenre => danishGenre.Id == genre.Id).Name != genre.Name));
+            Genre actionEn = genres.Single(s => s.Id == IdHelper.AdventureMovieGenre);
+            Genre actionDa = genresDanish.Single(s => s.Id == IdHelper.AdventureMovieGenre);
+
+            Assert.NotEqual(actionEn.Name, actionDa.Name);
         }
 
         [Fact]
-        public void TestGenreMovies()
+        public async Task TestGenreMoviesAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            SearchContainerWithId<SearchMovie> movies = await TMDbClient.GetGenreMoviesAsync(IdHelper.AdventureMovieGenre);
 
-            // Get first genre
-            Genre genre = Config.Client.GetMovieGenresAsync().Sync().First();
-
-            // Get movies
-            SearchContainerWithId<SearchMovie> movies = Config.Client.GetGenreMoviesAsync(genre.Id).Result;
-            SearchContainerWithId<SearchMovie> moviesPage2 = Config.Client.GetGenreMoviesAsync(genre.Id, "it", 2, includeAllMovies: false).Result;
-            SearchContainerWithId<SearchMovie> moviesAll = Config.Client.GetGenreMoviesAsync(genre.Id, includeAllMovies: true).Result;
-
-            Assert.Equal(1, movies.Page);
-            Assert.Equal(2, moviesPage2.Page);
-            Assert.Equal(1, moviesAll.Page);
-
-            Assert.True(movies.Results.Count > 0);
-            Assert.True(moviesPage2.Results.Count > 0);
-            Assert.True(moviesAll.Results.Count > 0);
-
-            Assert.True(movies.Results.All(s => s != null));
-            Assert.True(moviesPage2.Results.All(s => s != null));
-            Assert.True(moviesAll.Results.All(s => s != null));
-
-            Assert.Equal(movies.TotalResults, moviesPage2.TotalResults);     // Should be the same, despite the use of 'includeAllMovies' and Italian
-            Assert.True(moviesAll.TotalResults >= movies.TotalResults);
+            Assert.NotEmpty(movies.Results);
+            Assert.Equal(IdHelper.AdventureMovieGenre, movies.Id);
+            Assert.All(movies.Results, x => Assert.Contains(IdHelper.AdventureMovieGenre, x.GenreIds));
         }
     }
 }
diff --git a/TMDbLibTests/ClientGuestSessionTests.cs b/TMDbLibTests/ClientGuestSessionTests.cs
index 68721ce..d96c2c1 100644
--- a/TMDbLibTests/ClientGuestSessionTests.cs
+++ b/TMDbLibTests/ClientGuestSessionTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using System.Threading;
+using System.Threading.Tasks;
 using Xunit;
 using TMDbLib.Objects.Authentication;
 using TMDbLib.Objects.General;
@@ -14,191 +12,69 @@ namespace TMDbLibTests
     public class ClientGuestSessionTests : TestBase
     {
         [Fact]
-        public void TestTvEpisodeSetRatingGuestSession()
+        public async Task TestTvEpisodeSetRatingGuestSessionAsync()
         {
-            Config.Client.SetSessionInformation(Config.GuestTestSessionId, SessionType.GuestSession);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.GuestTestSessionId, SessionType.GuestSession);
 
-            // Try changing the rating
-            Assert.True(Config.Client.TvEpisodeSetRatingAsync(IdHelper.BreakingBad, 1, 1, 7.5).Result);
+            await TestMethodsHelper.SetValidateRemoveTest(async () =>
+            {
+                Assert.True(await TMDbClient.TvEpisodeSetRatingAsync(IdHelper.BreakingBad, 1, 1, 7.5));
+            }, async () =>
+            {
+                Assert.True(await TMDbClient.TvEpisodeRemoveRatingAsync(IdHelper.BreakingBad, 1, 1));
+            }, async shouldBeSet =>
+            {
+                SearchContainer<TvEpisodeWithRating> ratings = await TMDbClient.GetGuestSessionRatedTvEpisodesAsync();
 
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            SearchContainer<TvEpisodeWithRating> ratings = Config.Client.GetGuestSessionRatedTvEpisodesAsync().Sync();
-
-            Assert.False(true, "This test has been failing for some time - TMDb has been made aware, but have not responded");
-
-            //double tmpRating = ratings.Results.Single(s => s.ShowId == IdHelper.BreakingBad && s.SeasonNumber == 1 && s.EpisodeNumber == 1).Rating;
-            //Assert.True(ratings.Results.Any(s => s.ShowId == IdHelper.BreakingBad && s.SeasonNumber == 1 && s.EpisodeNumber == 1));
-            //Assert.True(Math.Abs(7.5 - tmpRating) < float.Epsilon);
-
-            //// Try changing it back to the previous rating
-            //Assert.True(Config.Client.TvEpisodeSetRatingAsync(IdHelper.BreakingBad, 1, 1, 8).Result);
-
-            //// Allow TMDb to cache our changes
-            //Thread.Sleep(2000);
-
-            //ratings = Config.Client.GetGuestSessionRatedTvEpisodesAsync().Sync();
-
-            //tmpRating = ratings.Results.Single(s => s.ShowId == IdHelper.BreakingBad && s.SeasonNumber == 1 && s.EpisodeNumber == 1).Rating;
-            //Assert.True(ratings.Results.Any(s => s.ShowId == IdHelper.BreakingBad && s.SeasonNumber == 1 && s.EpisodeNumber == 1));
-            //Assert.True(Math.Abs(8 - tmpRating) < float.Epsilon);
-
-            //// Try removing the rating
-            //Assert.True(Config.Client.TvEpisodeRemoveRatingAsync(IdHelper.BreakingBad, 1, 1).Result);
-
-            //// Allow TMDb to cache our changes
-            //Thread.Sleep(2000);
-
-            //ratings = Config.Client.GetGuestSessionRatedTvEpisodesAsync().Sync();
-
-            //Assert.False(ratings.Results.Any(s => s.ShowId == IdHelper.BreakingBad && s.SeasonNumber == 1 && s.EpisodeNumber == 1));
+                if (shouldBeSet)
+                    Assert.Contains(ratings.Results, x => x.ShowId == IdHelper.BreakingBad && x.SeasonNumber == 1 && x.EpisodeNumber == 1);
+                else
+                    Assert.DoesNotContain(ratings.Results, x => x.ShowId == IdHelper.BreakingBad && x.SeasonNumber == 1 && x.EpisodeNumber == 1);
+            });
         }
 
         [Fact]
-        public void TestTvSetRatingGuestSession()
+        public async Task TestTvSetRatingGuestSessionAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            await TMDbClient.SetSessionInformationAsync(TestConfig.GuestTestSessionId, SessionType.GuestSession);
 
-            Config.Client.SetSessionInformation(Config.GuestTestSessionId, SessionType.GuestSession);
+            await TestMethodsHelper.SetValidateRemoveTest(async () =>
+            {
+                Assert.True(await TMDbClient.TvShowSetRatingAsync(IdHelper.House, 7.5));
+            }, async () =>
+            {
+                Assert.True(await TMDbClient.TvShowRemoveRatingAsync(IdHelper.House));
+            }, async shouldBeSet =>
+            {
+                SearchContainer<SearchTvShowWithRating> ratings = await TMDbClient.GetGuestSessionRatedTvAsync();
 
-            // Try changing the rating
-            Assert.True(Config.Client.TvShowSetRatingAsync(IdHelper.House, 7.5).Result);
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            SearchContainer<SearchTvShowWithRating> ratings = Config.Client.GetGuestSessionRatedTvAsync().Sync();
-
-            double tmpRating = ratings.Results.Single(s => s.Id == IdHelper.House).Rating;
-            Assert.True(ratings.Results.Any(s => s.Id == IdHelper.House));
-            Assert.True(Math.Abs(7.5 - tmpRating) < float.Epsilon);
-
-            // Try changing it back to the previous rating
-            Assert.True(Config.Client.TvShowSetRatingAsync(IdHelper.House, 8).Result);
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            ratings = Config.Client.GetGuestSessionRatedTvAsync().Sync();
-
-            tmpRating = ratings.Results.Single(s => s.Id == IdHelper.House).Rating;
-            Assert.True(ratings.Results.Any(s => s.Id == IdHelper.House));
-            Assert.True(Math.Abs(8 - tmpRating) < float.Epsilon);
-
-            // Try removing the rating
-            Assert.True(Config.Client.TvShowRemoveRatingAsync(IdHelper.House).Result);
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            ratings = Config.Client.GetGuestSessionRatedTvAsync().Sync();
-
-            Assert.False(ratings.Results.Any(s => s.Id == IdHelper.House));
+                if (shouldBeSet)
+                    Assert.Contains(ratings.Results, x => x.Id == IdHelper.House);
+                else
+                    Assert.DoesNotContain(ratings.Results, x => x.Id == IdHelper.House);
+            });
         }
 
         [Fact]
-        public void TestMoviesSetRatingGuestSession()
+        public async Task TestMoviesSetRatingGuestSessionAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            await TMDbClient.SetSessionInformationAsync(TestConfig.GuestTestSessionId, SessionType.GuestSession);
+            
+            await TestMethodsHelper.SetValidateRemoveTest(async () =>
+            {
+                Assert.True(await TMDbClient.MovieSetRatingAsync(IdHelper.Terminator, 7.5));
+            }, async () =>
+            {
+                Assert.True(await TMDbClient.MovieRemoveRatingAsync(IdHelper.Terminator));
+            }, async shouldBeSet =>
+            {
+                SearchContainer<SearchMovieWithRating> ratings = await TMDbClient.GetGuestSessionRatedMoviesAsync();
 
-            Config.Client.SetSessionInformation(Config.GuestTestSessionId, SessionType.GuestSession);
-
-            // Try changing the rating
-            Assert.True(Config.Client.MovieSetRatingAsync(IdHelper.Terminator, 7.5).Result);
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            SearchContainer<SearchMovieWithRating> ratings = Config.Client.GetGuestSessionRatedMoviesAsync().Sync();
-
-            double tmpRating = ratings.Results.Single(s => s.Id == IdHelper.Terminator).Rating;
-            Assert.True(ratings.Results.Any(s => s.Id == IdHelper.Terminator));
-            Assert.True(Math.Abs(7.5 - tmpRating) < float.Epsilon);
-
-            // Try changing it back to the previous rating
-            Assert.True(Config.Client.MovieSetRatingAsync(IdHelper.Terminator, 8).Result);
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            ratings = Config.Client.GetGuestSessionRatedMoviesAsync().Sync();
-
-            tmpRating = ratings.Results.Single(s => s.Id == IdHelper.Terminator).Rating;
-            Assert.True(ratings.Results.Any(s => s.Id == IdHelper.Terminator));
-            Assert.True(Math.Abs(8 - tmpRating) < float.Epsilon);
-
-            // Try removing the rating
-            Assert.True(Config.Client.MovieRemoveRatingAsync(IdHelper.Terminator).Result);
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            ratings = Config.Client.GetGuestSessionRatedMoviesAsync().Sync();
-
-            Assert.False(ratings.Results.Any(s => s.Id == IdHelper.Terminator));
-        }
-
-        [Fact]
-        public void TestGuestSessionGetRatedTvEpisodes()
-        {
-            Config.Client.SetSessionInformation(Config.GuestTestSessionId, SessionType.GuestSession);
-
-            // Ensure we have a rating
-            Assert.True(Config.Client.TvEpisodeSetRatingAsync(IdHelper.BigBangTheory, 1, 1, 7.5).Result);
-
-            // Test paging
-            TestHelpers.SearchPages(i => Config.Client.GetGuestSessionRatedTvEpisodesAsync(i).Result);
-
-            // Fetch ratings
-            SearchContainer<TvEpisodeWithRating> result = Config.Client.GetGuestSessionRatedTvEpisodesAsync().Sync();
-
-            Assert.NotNull(result);
-            Assert.NotNull(result.Results);
-        }
-
-        [Fact]
-        public void TestGuestSessionGetRatedTv()
-        {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
-
-            Config.Client.SetSessionInformation(Config.GuestTestSessionId, SessionType.GuestSession);
-
-            // Ensure we have a rating
-            Assert.True(Config.Client.TvShowSetRatingAsync(IdHelper.BigBangTheory, 7.5).Result);
-
-            // Test paging
-            TestHelpers.SearchPages(i => Config.Client.GetGuestSessionRatedTvAsync(i).Result);
-
-            // Fetch ratings
-            SearchContainer<SearchTvShowWithRating> result = Config.Client.GetGuestSessionRatedTvAsync().Sync();
-
-            Assert.NotNull(result);
-            Assert.NotNull(result.Results);
-        }
-
-        [Fact]
-        public void TestGuestSessionGetRatedMovies()
-        {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
-
-            Config.Client.SetSessionInformation(Config.GuestTestSessionId, SessionType.GuestSession);
-
-            // Ensure we have a rating
-            Assert.True(Config.Client.MovieSetRatingAsync(IdHelper.Terminator, 7.5).Result);
-
-            // Test paging
-            TestHelpers.SearchPages(i => Config.Client.GetGuestSessionRatedMoviesAsync(i).Result);
-
-            // Fetch ratings
-            SearchContainer<SearchMovieWithRating> result = Config.Client.GetGuestSessionRatedMoviesAsync().Sync();
-
-            Assert.NotNull(result);
-            Assert.NotNull(result.Results);
+                if (shouldBeSet)
+                    Assert.Contains(ratings.Results, x => x.Id == IdHelper.Terminator);
+                else
+                    Assert.DoesNotContain(ratings.Results, x => x.Id == IdHelper.Terminator);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/ClientKeywordTests.cs b/TMDbLibTests/ClientKeywordTests.cs
index a2cb1d6..de8f8c5 100644
--- a/TMDbLibTests/ClientKeywordTests.cs
+++ b/TMDbLibTests/ClientKeywordTests.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Threading.Tasks;
 using Xunit;
 using TMDbLib.Objects.General;
 using TMDbLib.Objects.Movies;
@@ -11,86 +12,48 @@ namespace TMDbLibTests
     public class ClientKeywordTests : TestBase
     {
         [Fact]
-        public void TestKeywordGet()
+        public async Task TestGetMovieKeywordsAsync()
         {
-            KeywordsContainer keywords = Config.Client.GetMovieKeywordsAsync(IdHelper.AGoodDayToDieHard).Result;
+            KeywordsContainer keywords = await TMDbClient.GetMovieKeywordsAsync(IdHelper.AGoodDayToDieHard);
 
-            Assert.NotNull(keywords);
-            Assert.NotNull(keywords.Keywords);
-            Assert.True(keywords.Keywords.Count > 0);
-
-            // Try to get all keywords
-            foreach (Keyword testKeyword in keywords.Keywords)
-            {
-                Keyword getKeyword = Config.Client.GetKeywordAsync(testKeyword.Id).Result;
-
-                Assert.NotNull(getKeyword);
-
-                Assert.Equal(testKeyword.Id, getKeyword.Id);
-                Assert.Equal(testKeyword.Name, getKeyword.Name);
-            }
+            await Verify(keywords);
         }
 
         [Fact]
-        public void TestKeywordsMissing()
+        public async Task TestGetTvShowKeywordsAsync()
         {
-            KeywordsContainer keywords = Config.Client.GetMovieKeywordsAsync(IdHelper.MissingID).Result;
+            ResultContainer<Keyword> keywords = await TMDbClient.GetTvShowKeywordsAsync(IdHelper.BigBangTheory);
+
+            await Verify(keywords);
+        }
+
+        [Fact]
+        public async Task TestKeywordGetSingle()
+        {
+            Keyword keyword = await TMDbClient.GetKeywordAsync(IdHelper.AgentKeyword);
+
+            await Verify(keyword);
+        }
+
+        [Fact]
+        public async Task TestKeywordsMissing()
+        {
+            KeywordsContainer keywords = await TMDbClient.GetMovieKeywordsAsync(IdHelper.MissingID);
 
             Assert.Null(keywords);
         }
 
         [Fact]
-        public void TestKeywordMovies()
+        public async Task TestKeywordMovies()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            SearchContainerWithId<SearchMovie> movies = await TMDbClient.GetKeywordMoviesAsync(IdHelper.AgentKeyword);
 
-            KeywordsContainer keywords = Config.Client.GetMovieKeywordsAsync(IdHelper.AGoodDayToDieHard).Result;
+            Assert.Equal(IdHelper.AgentKeyword, movies.Id);
+            Assert.NotEmpty(movies.Results);
 
-            Assert.NotNull(keywords);
-            Assert.NotNull(keywords.Keywords);
-            Assert.True(keywords.Keywords.Count > 0);
+            KeywordsContainer movie = await TMDbClient.GetMovieKeywordsAsync(movies.Results.First().Id);
 
-            // Get first keyword
-            Keyword testKeyword = keywords.Keywords.First();
-
-            // Get movies
-            SearchContainerWithId<SearchMovie> movies = Config.Client.GetKeywordMoviesAsync(testKeyword.Id).Result;
-            SearchContainerWithId<SearchMovie> moviesItalian = Config.Client.GetKeywordMoviesAsync(testKeyword.Id, "it").Result;
-            SearchContainerWithId<SearchMovie> moviesPage2 = Config.Client.GetKeywordMoviesAsync(testKeyword.Id, 2).Result;
-
-            Assert.NotNull(movies);
-            Assert.NotNull(moviesItalian);
-            Assert.NotNull(moviesPage2);
-
-            Assert.Equal(testKeyword.Id, movies.Id);
-            Assert.Equal(testKeyword.Id, moviesItalian.Id);
-            Assert.Equal(testKeyword.Id, moviesPage2.Id);
-
-            Assert.True(movies.Results.Count > 0);
-            Assert.True(moviesItalian.Results.Count > 0);
-
-            if (movies.TotalResults > movies.Results.Count)
-                Assert.True(moviesPage2.Results.Count > 0);
-            else
-                Assert.Equal(0, moviesPage2.Results.Count);
-
-            Assert.Equal(1, movies.Page);
-            Assert.Equal(1, moviesItalian.Page);
-            Assert.Equal(2, moviesPage2.Page);
-
-            // All titles on page 1 must be the same
-            bool allTitlesIdentical = true;
-            for (int index = 0; index < movies.Results.Count; index++)
-            {
-                Assert.Equal(movies.Results[index].Id, moviesItalian.Results[index].Id);
-
-                // At least one title must differ in title
-                if (movies.Results[index].Title != moviesItalian.Results[index].Title)
-                    allTitlesIdentical = false;
-            }
-
-            Assert.False(allTitlesIdentical);
+            Assert.Contains(movie.Keywords, x => IdHelper.AgentKeyword == x.Id);
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/ClientListsTests.cs b/TMDbLibTests/ClientListsTests.cs
index 5d02a8c..7633605 100644
--- a/TMDbLibTests/ClientListsTests.cs
+++ b/TMDbLibTests/ClientListsTests.cs
@@ -1,154 +1,119 @@
 using System;
 using System.Linq;
+using System.Threading.Tasks;
+using TMDbLib.Client;
 using Xunit;
 using TMDbLib.Objects.Authentication;
 using TMDbLib.Objects.General;
 using TMDbLib.Objects.Lists;
 using TMDbLib.Objects.Movies;
-using TMDbLib.Objects.Search;
 using TMDbLibTests.Helpers;
 using TMDbLibTests.JsonHelpers;
 
 namespace TMDbLibTests
 {
+    [Collection(nameof(ListFixturesCollection))]
     public class ClientListsTests : TestBase
     {
         private const string TestListId = "528349d419c2954bd21ca0a8";
+        private const string EphemeralListPrefix = "TestListTMDbLib-";
 
         [Fact]
-        public void TestList()
+        public async Task TestGetListAsync()
         {
             // Get list
-            GenericList list = Config.Client.GetListAsync(TestListId).Result;
+            GenericList list = await TMDbClient.GetListAsync(TestListId);
 
-            Assert.NotNull(list);
-            Assert.Equal(TestListId, list.Id);
-            Assert.Equal(list.ItemCount, list.Items.Count);
-
-            foreach (SearchMovie movieResult in list.Items)
-            {
-                Assert.NotNull(movieResult);
-
-                // Ensure all movies point to this list
-                int page = 1;
-                SearchContainer<ListResult> movieLists = Config.Client.GetMovieListsAsync(movieResult.Id).Result;
-                while (movieLists != null)
-                {
-                    // Check if the current result page contains the relevant list
-                    if (movieLists.Results.Any(s => s.Id == TestListId))
-                    {
-                        movieLists = null;
-                        continue;
-                    }
-
-                    // See if there is an other page we could try, if not the test fails
-                    if (movieLists.Page < movieLists.TotalPages)
-                        movieLists = Config.Client.GetMovieListsAsync(movieResult.Id, ++page).Result;
-                    else
-                        throw new Exception($"Movie '{movieResult.Title}' was not linked to the test list");
-                }
-            }
+            await Verify(list);
         }
 
         [Fact]
-        public void TestListMissing()
+        public async Task TestListAsync()
         {
-            GenericList list = Config.Client.GetListAsync(IdHelper.MissingID.ToString()).Result;
+            SearchContainer<ListResult> movieLists = await TMDbClient.GetMovieListsAsync(IdHelper.Avatar);
+
+            Assert.NotEmpty(movieLists.Results);
+            Assert.All(movieLists.Results, x => Assert.Equal(MediaType.Movie, x.ListType));
+        }
+
+        [Fact]
+        public async Task TestListMissingAsync()
+        {
+            GenericList list = await TMDbClient.GetListAsync(IdHelper.MissingID.ToString());
 
             Assert.Null(list);
         }
 
         [Fact]
-        public void TestListIsMoviePresentFailure()
+        public async Task TestListCreateAddClearAndDeleteAsync()
         {
-            Assert.False(Config.Client.GetListIsMoviePresentAsync(TestListId, IdHelper.Terminator).Result);
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
+            string listName = EphemeralListPrefix + DateTime.UtcNow.ToString("O");
 
-            // Clear list
-            Assert.True(Config.Client.ListClearAsync(TestListId).Result);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            // Verify Avatar is not present
-            Assert.False(Config.Client.GetListIsMoviePresentAsync(TestListId, IdHelper.Avatar).Result);
+            string listId = await TMDbClient.ListCreateAsync(listName);
 
-            // Add Avatar
-            Assert.True(Config.Client.ListAddMovieAsync(TestListId, IdHelper.Avatar).Result);
+            Assert.False(string.IsNullOrWhiteSpace(listId));
 
-            // Verify Avatar is present
-            Assert.True(Config.Client.GetListIsMoviePresentAsync(TestListId, IdHelper.Avatar).Result);
-        }
+            GenericList newlyAddedList = await TMDbClient.GetListAsync(listId);
 
-        [Fact]
-        public void TestListCreateAndDelete()
-        {
-            const string listName = "Test List 123";
+            await Verify(newlyAddedList, settings => settings.IgnoreProperty<GenericList>(x => x.Id, x => x.Name));
 
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            string newListId = Config.Client.ListCreateAsync(listName).Result;
+            // Add a movie
+            await TMDbClient.ListAddMovieAsync(listId, IdHelper.Avatar);
+            await TMDbClient.ListAddMovieAsync(listId, IdHelper.AGoodDayToDieHard);
 
-            Assert.False(string.IsNullOrWhiteSpace(newListId));
+            Assert.True(await TMDbClient.GetListIsMoviePresentAsync(listId, IdHelper.Avatar));
 
-            GenericList newlyAddedList = Config.Client.GetListAsync(newListId).Result;
-            Assert.NotNull(newlyAddedList);
-            Assert.Equal(listName, newlyAddedList.Name);
-            Assert.Equal("", newlyAddedList.Description); // "" is the default value
-            Assert.Equal("en", newlyAddedList.Iso_639_1); // en is the default value
-            Assert.Equal(0, newlyAddedList.ItemCount);
-            Assert.Equal(0, newlyAddedList.Items.Count);
-            Assert.False(string.IsNullOrWhiteSpace(newlyAddedList.CreatedBy));
+            // Remove a movie
+            await TMDbClient.ListRemoveMovieAsync(listId, IdHelper.Avatar);
 
-            Assert.True(Config.Client.ListDeleteAsync(newListId).Result);
-        }
-
-        [Fact]
-        public void TestListDeleteFailure()
-        {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-
-            // Try removing a list with an incorrect id
-            Assert.False(Config.Client.ListDeleteAsync("bla").Result);
-        }
-
-        [Fact]
-        public void TestListAddAndRemoveMovie()
-        {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-
-            // Add a new movie to the list
-            Assert.True(Config.Client.ListAddMovieAsync(TestListId, IdHelper.EvanAlmighty).Result);
-
-            // Try again, this time it should fail since the list already contains this movie
-            Assert.False(Config.Client.ListAddMovieAsync(TestListId, IdHelper.EvanAlmighty).Result);
-
-            // Get list and check if the item was added
-            GenericList listAfterAdd = Config.Client.GetListAsync(TestListId).Result;
-            Assert.True(listAfterAdd.Items.Any(m => m.Id == IdHelper.EvanAlmighty));
-
-            // Remove the previously added movie from the list
-            Assert.True(Config.Client.ListRemoveMovieAsync(TestListId, IdHelper.EvanAlmighty).Result);
-
-            // Get list and check if the item was removed
-            GenericList listAfterRemove = Config.Client.GetListAsync(TestListId).Result;
-            Assert.False(listAfterRemove.Items.Any(m => m.Id == IdHelper.EvanAlmighty));
-        }
-
-        [Fact]
-        public void TestListClear()
-        {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-
-            // Add a new movie to the list
-            Assert.True(Config.Client.ListAddMovieAsync(TestListId, IdHelper.MadMaxFuryRoad).Result);
-
-            // Get list and check if the item was added
-            GenericList listAfterAdd = Config.Client.GetListAsync(TestListId).Result;
-            Assert.True(listAfterAdd.Items.Any(m => m.Id == IdHelper.MadMaxFuryRoad));
+            Assert.False(await TMDbClient.GetListIsMoviePresentAsync(listId, IdHelper.Avatar));
 
             // Clear the list
-            Assert.True(Config.Client.ListClearAsync(TestListId).Result);
+            await TMDbClient.ListClearAsync(listId);
 
-            // Get list and check that all items were removed
-            GenericList listAfterRemove = Config.Client.GetListAsync(TestListId).Result;
-            Assert.False(listAfterRemove.Items.Any());
+            Assert.False(await TMDbClient.GetListIsMoviePresentAsync(listId, IdHelper.AGoodDayToDieHard));
+
+            // Delete the list
+            Assert.True(await TMDbClient.ListDeleteAsync(listId));
+        }
+
+        [Fact]
+        public async Task TestListDeleteFailureAsync()
+        {
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
+
+            // Try removing a list with an incorrect id
+            Assert.False(await TMDbClient.ListDeleteAsync("invalid_id"));
+        }
+
+        private class ListCleanupFixture : IDisposable
+        {
+            public void Dispose()
+            {
+                TestConfig config = new TestConfig();
+                TMDbClient client = config.Client;
+
+                client.SetSessionInformationAsync(config.UserSessionId, SessionType.UserSession).GetAwaiter().GetResult();
+
+                // Yes, this is only the first page, but that's fine.
+                // Eventually we'll delete all remaining lists
+                SearchContainer<AccountList> lists = client.AccountGetListsAsync().GetAwaiter().GetResult();
+
+                foreach (AccountList list in lists.Results.Where(s => s.Name.StartsWith(EphemeralListPrefix)))
+                {
+                    client.ListDeleteAsync(list.Id.ToString()).GetAwaiter().GetResult();
+                }
+            }
+        }
+
+        [CollectionDefinition(nameof(ListFixturesCollection))]
+        public class ListFixturesCollection : ICollectionFixture<ListCleanupFixture>
+        {
+            // This class has no code, and is never created. Its purpose is simply
+            // to be the place to apply [CollectionDefinition] and all the
+            // ICollectionFixture<> interfaces.
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/ClientMovieTests.cs b/TMDbLibTests/ClientMovieTests.cs
index a6f7cc1..3df81d6 100644
--- a/TMDbLibTests/ClientMovieTests.cs
+++ b/TMDbLibTests/ClientMovieTests.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
-using System.Threading;
+using System.Threading.Tasks;
 using Xunit;
 using TMDbLib.Objects.Authentication;
 using TMDbLib.Objects.Changes;
@@ -19,11 +18,11 @@ namespace TMDbLibTests
 {
     public class ClientMovieTests : TestBase
     {
-        private static Dictionary<MovieMethods, Func<Movie, object>> _methods;
+        private static readonly Dictionary<MovieMethods, Func<Movie, object>> Methods;
 
-        public ClientMovieTests()
+        static ClientMovieTests()
         {
-            _methods = new Dictionary<MovieMethods, Func<Movie, object>>
+            Methods = new Dictionary<MovieMethods, Func<Movie, object>>
             {
                 [MovieMethods.AlternativeTitles] = movie => movie.AlternativeTitles,
                 [MovieMethods.Credits] = movie => movie.Credits,
@@ -45,300 +44,187 @@ namespace TMDbLibTests
         }
 
         [Fact]
-        public void TestMoviesExtrasNone()
+        public async void TestMoviesExtrasNone()
         {
-            // We will intentionally ignore errors reg. missing JSON as we do not request it
-            IgnoreMissingJson(" / account_states", " / alternative_titles", " / changes", " / credits", " / images", " / keywords", " / lists", " / release_dates", " / releases", " / reviews", " / similar", " / translations", " / videos", " / recommendations", " / external_ids");
+            Movie movie = await TMDbClient.GetMovieAsync(IdHelper.AGoodDayToDieHard);
 
-            Movie movie = Config.Client.GetMovieAsync(IdHelper.AGoodDayToDieHard).Result;
-
-            Assert.NotNull(movie);
-
-            // TODO: Test all properties
-            Assert.Equal("A Good Day to Die Hard", movie.Title);
+            await Verify(movie);
 
             // Test all extras, ensure none of them exist
-            foreach (Func<Movie, object> selector in _methods.Values)
+            foreach (Func<Movie, object> selector in Methods.Values)
             {
                 Assert.Null(selector(movie));
             }
         }
 
         [Fact]
-        public void TestMoviesExtrasExclusive()
+        public async void TestMoviesExtrasExclusive()
         {
-            // Ignore missing json
-            IgnoreMissingJson("similar.results[array] / media_type");
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            // We ignore the 'notes' field, as TMDb sometimes leaves it out
-            IgnoreMissingJson("release_dates.results[array].release_dates[array] / note");
-            IgnoreMissingJson(" / id");
-
-            // We will intentionally ignore errors reg. missing JSON as we do not request it
-            IgnoreMissingJson(" / account_states", " / alternative_titles", " / changes", " / credits", " / images", " / keywords", " / lists", " / release_dates", " / releases", " / reviews", " / similar", " / translations", " / videos", "alternative_titles / id", "credits / id", "keywords / id", "release_dates / id", "releases / id", "translations / id", "videos / id", " / recommendations");
-
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            TestMethodsHelper.TestGetExclusive(_methods, (id, extras) => Config.Client.GetMovieAsync(id, extras).Result, IdHelper.AGoodDayToDieHard);
+            await TestMethodsHelper.TestGetExclusive(Methods, extras => TMDbClient.GetMovieAsync(IdHelper.AGoodDayToDieHard, extras));
         }
 
         [Fact]
-        public void TestMoviesImdbExtrasAll()
+        public async Task TestMoviesImdbExtrasAllAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson(" / id", " / videos", "alternative_titles / id", "credits / id", "keywords / id", "release_dates / id", "releases / id", "reviews.results[array] / media_type", "translations / id", "similar.results[array] / media_type", " / recommendations");
-
-            Dictionary<MovieMethods, Func<Movie, object>> tmpMethods = new Dictionary<MovieMethods, Func<Movie, object>>(_methods);
+            Dictionary<MovieMethods, Func<Movie, object>> tmpMethods = new Dictionary<MovieMethods, Func<Movie, object>>(Methods);
             tmpMethods.Remove(MovieMethods.Videos);
 
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
             // Account states will only show up if we've done something
-            Config.Client.MovieSetRatingAsync(IdHelper.TheDarkKnightRises, 5).Sync();
+            await TMDbClient.MovieSetRatingAsync(IdHelper.TheDarkKnightRises, 5);
 
-            MovieMethods combinedEnum = tmpMethods.Keys.Aggregate((methods, movieMethods) => methods | movieMethods);
-            Movie item = Config.Client.GetMovieAsync(IdHelper.TheDarkKnightRisesImdb, combinedEnum).Result;
-
-            TestMethodsHelper.TestAllNotNull(tmpMethods, item);
+            await TestMethodsHelper.TestGetAll(tmpMethods, combined => TMDbClient.GetMovieAsync(IdHelper.TheDarkKnightRisesImdb, combined), movie => Verify(movie));
         }
 
         [Fact]
-        public void TestMoviesExtrasAll()
+        public async void TestMoviesLanguage()
         {
-            // We ignore the 'notes' field, as TMDb sometimes leaves it out
-            IgnoreMissingJson("release_dates.results[array].release_dates[array] / note");
-
-            IgnoreMissingJson("similar.results[array] / media_type");
-            IgnoreMissingJson(" / id", "alternative_titles / id", "credits / id", "keywords / id", "release_dates / id", "releases / id", "translations / id", "videos / id", " / recommendations");
-
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            MovieMethods combinedEnum = _methods.Keys.Aggregate((methods, movieMethods) => methods | movieMethods);
-            Movie item = Config.Client.GetMovieAsync(IdHelper.AGoodDayToDieHard, combinedEnum).Result;
-
-            TestMethodsHelper.TestAllNotNull(_methods, item);
-        }
-
-        [Fact]
-        public void TestMoviesLanguage()
-        {
-            IgnoreMissingJson(" / account_states", " / alternative_titles", " / changes", " / credits", " / images", " / keywords", " / lists", " / release_dates", " / releases", " / reviews", " / similar", " / translations", " / videos", " / recommendations");
-
-            Movie movie = Config.Client.GetMovieAsync(IdHelper.AGoodDayToDieHard).Result;
-            Movie movieItalian = Config.Client.GetMovieAsync(IdHelper.AGoodDayToDieHard, "it").Result;
+            Movie movie = await TMDbClient.GetMovieAsync(IdHelper.AGoodDayToDieHard);
+            Movie movieItalian = await TMDbClient.GetMovieAsync(IdHelper.AGoodDayToDieHard, "it");
 
             Assert.NotNull(movie);
             Assert.NotNull(movieItalian);
 
             Assert.Equal("A Good Day to Die Hard", movie.Title);
             Assert.NotEqual(movie.Title, movieItalian.Title);
+        }
 
-            // Test all extras, ensure none of them exist
-            foreach (Func<Movie, object> selector in _methods.Values)
+        [Fact]
+        public async void TestMoviesGetMovieAlternativeTitles()
+        {
+            AlternativeTitles respUs = await TMDbClient.GetMovieAlternativeTitlesAsync(IdHelper.AGoodDayToDieHard, "US");
+            AlternativeTitles respFrench = await TMDbClient.GetMovieAlternativeTitlesAsync(IdHelper.AGoodDayToDieHard, "FR");
+
+            TMDbClient.DefaultCountry = "CA";
+
+            AlternativeTitles respCaDefault = await TMDbClient.GetMovieAlternativeTitlesAsync(IdHelper.AGoodDayToDieHard);
+
+            await Verify(new
             {
-                Assert.Null(selector(movie));
-                Assert.Null(selector(movieItalian));
-            }
+                respUs,
+                respFrench,
+                respCaDefault
+            });
         }
 
         [Fact]
-        public void TestMoviesGetMovieAlternativeTitles()
+        public async void TestMoviesGetMovieReleaseDates()
         {
-            AlternativeTitles respUs = Config.Client.GetMovieAlternativeTitlesAsync(IdHelper.AGoodDayToDieHard, "US").Result;
-            Assert.NotNull(respUs);
+            ResultContainer<ReleaseDatesContainer> resp = await TMDbClient.GetMovieReleaseDatesAsync(IdHelper.AGoodDayToDieHard);
 
-            AlternativeTitles respFrench = Config.Client.GetMovieAlternativeTitlesAsync(IdHelper.AGoodDayToDieHard, "FR").Result;
-            Assert.NotNull(respFrench);
-
-            Assert.False(respUs.Titles.Any(s => s.Title == "Duro de matar 5"));
-            Assert.True(respFrench.Titles.Any(s => s.Title == "Die Hard 5 - Belle Journée Pour mourir"));
-
-            Assert.True(respUs.Titles.All(s => s.Iso_3166_1 == "US"));
-            Assert.True(respFrench.Titles.All(s => s.Iso_3166_1 == "FR"));
+            await Verify(resp);
         }
 
         [Fact]
-        public void TestMoviesGetMovieReleaseDates()
+        public async void TestMoviesGetMovieCasts()
         {
-            // We ignore the 'notes' field, as TMDb sometimes leaves it out
-            IgnoreMissingJson("results[array].release_dates[array] / note");
-
-            ResultContainer<ReleaseDatesContainer> resp = Config.Client.GetMovieReleaseDatesAsync(IdHelper.AGoodDayToDieHard).Result;
+            Credits resp = await TMDbClient.GetMovieCreditsAsync(IdHelper.AGoodDayToDieHard);
             Assert.NotNull(resp);
 
-            ReleaseDatesContainer releasesUs = resp.Results.SingleOrDefault(s => s.Iso_3166_1 == "US");
-            Assert.NotNull(releasesUs);
-            Assert.Equal(1, releasesUs.ReleaseDates.Count);
+            Cast cast = resp.Cast.Single(s => s.CreditId == "52fe4751c3a36847f812f049");
+            Crew crew = resp.Crew.Single(s => s.CreditId == "5336b04a9251417db4000c80");
 
-            ReleaseDateItem singleRelease = releasesUs.ReleaseDates.First();
+            await Verify(new
+            {
+                cast,
+                crew
+            });
 
-            Assert.Equal("R", singleRelease.Certification);
-            Assert.Equal(string.Empty, singleRelease.Iso_639_1);
-            Assert.Equal(string.Empty, singleRelease.Note);
-            Assert.Equal(DateTime.Parse("2013-02-14T00:00:00.000Z").ToUniversalTime(), singleRelease.ReleaseDate);
-            Assert.Equal(ReleaseDateType.Theatrical, singleRelease.Type);
+            TestImagesHelpers.TestImagePaths(resp.Cast.Select(s => s.ProfilePath).Where(s => s != null));
+            TestImagesHelpers.TestImagePaths(resp.Crew.Select(s => s.ProfilePath).Where(s => s != null));
         }
 
         [Fact]
-        public void TestMoviesGetMovieAlternativeTitlesCountry()
+        public async void TestMoviesGetExternalIds()
         {
-            AlternativeTitles respUs = Config.Client.GetMovieAlternativeTitlesAsync(IdHelper.AGoodDayToDieHard, "US").Result;
-            Assert.NotNull(respUs);
+            ExternalIdsMovie externalIds = await TMDbClient.GetMovieExternalIdsAsync(IdHelper.BladeRunner2049);
 
-            Config.Client.DefaultCountry = "US";
-
-            AlternativeTitles respUs2 = Config.Client.GetMovieAlternativeTitlesAsync(IdHelper.AGoodDayToDieHard).Result;
-            Assert.NotNull(respUs2);
-
-            Assert.Equal(respUs.Titles.Count, respUs2.Titles.Count);
+            await Verify(externalIds);
         }
 
         [Fact]
-        public void TestMoviesGetMovieCasts()
+        public async void TestMoviesGetMovieImages()
         {
-            Credits resp = Config.Client.GetMovieCreditsAsync(IdHelper.AGoodDayToDieHard).Result;
-            Assert.NotNull(resp);
+            ImagesWithId resp = await TMDbClient.GetMovieImagesAsync(IdHelper.AGoodDayToDieHard);
 
-            Cast cast = resp.Cast.SingleOrDefault(s => s.Name == "Bruce Willis");
-            Assert.NotNull(cast);
+            TestImagesHelpers.TestImagePaths(resp);
 
-            Assert.Equal(1, cast.CastId);
-            Assert.Equal("John McClane", cast.Character);
-            Assert.NotEmpty(cast.CreditId);
-            Assert.Equal(62, cast.Id);
-            Assert.Equal("Bruce Willis", cast.Name);
-            Assert.Equal(0, cast.Order);
-            Assert.True(cast.Popularity > 0);
-            Assert.Equal("Bruce Willis", cast.OriginalName);
-            Assert.Equal("Acting", cast.KnownForDepartment);
-            Assert.True(TestImagesHelpers.TestImagePath(cast.ProfilePath), "cast.ProfilePath was not a valid image path, was: " + cast.ProfilePath);
+            ImageData backdrop = resp.Backdrops.Single(s => s.FilePath == "/js3J4SBiRfLvmRzaHoTA2tpKROw.jpg");
+            ImageData poster = resp.Posters.Single(s => s.FilePath == "/c4G6lW5hAWmwveThfLSqs52yHB1.jpg");
 
-            Crew crew = resp.Crew.SingleOrDefault(s => s.Name == "Marco Beltrami");
-            Assert.NotNull(crew);
-
-            Assert.NotEmpty(crew.CreditId);
-            Assert.Equal("Sound", crew.Department);
-            Assert.Equal(7229, crew.Id);
-            Assert.Equal("Original Music Composer", crew.Job);
-            Assert.Equal("Marco Beltrami", crew.Name);
-            Assert.True(TestImagesHelpers.TestImagePath(crew.ProfilePath), "crew.ProfilePath was not a valid image path, was: " + crew.ProfilePath);
+            await Verify(new
+            {
+                backdrop,
+                poster
+            });
         }
 
         [Fact]
-        public void TestMoviesGetExternalIds()
+        public async void TestMoviesGetMovieImagesWithImageLanguage()
         {
-            ExternalIdsMovie externalIds = Config.Client.GetMovieExternalIdsAsync(IdHelper.BladeRunner2049).Result;
+            ImagesWithId images = await TMDbClient.GetMovieImagesAsync(IdHelper.AGoodDayToDieHard, "en-US", "en");
 
-            Assert.NotNull(externalIds);
-            Assert.Equal(335984, externalIds.Id);
-            Assert.Equal("tt1856101", externalIds.ImdbId);
-            Assert.Equal("BladeRunner2049", externalIds.FacebookId);
-            Assert.Equal("bladerunner", externalIds.TwitterId);
-            Assert.Equal("bladerunnermovie", externalIds.InstagramId);
+            TestImagesHelpers.TestImagePaths(images);
+
+            ImageData backdrop = images.Backdrops.Single(s => s.FilePath == "/js3J4SBiRfLvmRzaHoTA2tpKROw.jpg");
+            ImageData poster = images.Posters.Single(s => s.FilePath == "/9Zq88w35f1PpM22TIbf2amtjHD6.jpg");
+
+            await Verify(new
+            {
+                backdrop,
+                poster
+            });
         }
 
         [Fact]
-        public void TestMoviesGetMovieImages()
+        public async void TestMoviesGetMovieWithImageLanguage()
         {
-            ImagesWithId resp = Config.Client.GetMovieImagesAsync(IdHelper.AGoodDayToDieHard).Result;
-            Assert.NotNull(resp);
+            Movie resp = await TMDbClient.GetMovieAsync(IdHelper.Avatar, "de-DE", "de", MovieMethods.Images);
+            Images images = resp.Images;
 
-            ImageData backdrop = resp.Backdrops.SingleOrDefault(s => s.FilePath == "/17zArExB7ztm6fjUXZwQWgGMC9f.jpg");
-            Assert.NotNull(backdrop);
+            TestImagesHelpers.TestImagePaths(images);
 
-            Assert.True(Math.Abs(1.77777777777778 - backdrop.AspectRatio) < double.Epsilon);
-            Assert.True(TestImagesHelpers.TestImagePath(backdrop.FilePath), "backdrop.FilePath was not a valid image path, was: " + backdrop.FilePath);
-            Assert.Equal(1080, backdrop.Height);
-            Assert.Equal("xx", backdrop.Iso_639_1);
-            Assert.True(backdrop.VoteAverage > 0);
-            Assert.True(backdrop.VoteCount > 0);
-            Assert.Equal(1920, backdrop.Width);
+            ImageData backdrop = images.Backdrops.Single(s => s.FilePath == "/4U9fN2jsQ94GQfDGeLEe8UaReRO.jpg");
+            ImageData poster = images.Posters.Single(s => s.FilePath == "/8VV4YUwOGxgolFZTo2SgNwsfznR.jpg");
 
-            ImageData poster = resp.Posters.SingleOrDefault(s => s.FilePath == "/c2SQMd00CCGTiDxGXVqA2J9lmzF.jpg");
-            Assert.NotNull(poster);
-
-            Assert.True(Math.Abs(0.666666666666667 - poster.AspectRatio) < double.Epsilon);
-            Assert.True(TestImagesHelpers.TestImagePath(poster.FilePath), "poster.FilePath was not a valid image path, was: " + poster.FilePath);
-            Assert.Equal(1500, poster.Height);
-            Assert.Equal("en", poster.Iso_639_1);
-            Assert.True(poster.VoteAverage > 0);
-            Assert.True(poster.VoteCount > 0);
-            Assert.Equal(1000, poster.Width);
+            await Verify(new
+            {
+                backdrop,
+                poster
+            });
         }
 
         [Fact]
-        public void TestMoviesGetMovieImagesWithImageLanguage()
+        public async void TestMoviesGetMovieKeywords()
         {
-            ImagesWithId resp = Config.Client.GetMovieImagesAsync(IdHelper.AGoodDayToDieHard, language: "en-US", includeImageLanguage: "en").Result;
+            KeywordsContainer resp = await TMDbClient.GetMovieKeywordsAsync(IdHelper.AGoodDayToDieHard);
 
-            Assert.True(resp.Backdrops.Count > 0);
-            Assert.True(resp.Posters.Count > 0);
+            await Verify(resp);
         }
 
         [Fact]
-        public void TestMoviesGetMovieWithImageLanguage()
+        public async void TestMoviesGetMovieReleases()
         {
-            IgnoreMissingJson(" / account_states", " / alternative_titles", " / changes", " / credits", " / keywords", " / lists", " / release_dates", " / releases", " / reviews", " / similar", " / translations", " / videos", " / recommendations", " / external_ids");
+            Releases resp = await TMDbClient.GetMovieReleasesAsync(IdHelper.AGoodDayToDieHard);
 
-            Movie resp = Config.Client.GetMovieAsync(IdHelper.Avatar, language: "en-US", includeImageLanguage: "en", extraMethods: MovieMethods.Images).Result;
-
-            Assert.True(resp.Images.Backdrops.Count > 0);
-            Assert.True(resp.Images.Backdrops.All(b => b.Iso_639_1.Equals("en", StringComparison.OrdinalIgnoreCase)));
-            Assert.True(resp.Images.Posters.Count > 0);
-            Assert.True(resp.Images.Posters.All(p => p.Iso_639_1.Equals("en", StringComparison.OrdinalIgnoreCase)));
+            await Verify(resp);
         }
 
         [Fact]
-        public void TestMoviesGetMovieKeywords()
+        public async void TestMoviesGetMovieVideos()
         {
-            KeywordsContainer resp = Config.Client.GetMovieKeywordsAsync(IdHelper.AGoodDayToDieHard).Result;
-            Assert.NotNull(resp);
+            ResultContainer<Video> resp = await TMDbClient.GetMovieVideosAsync(IdHelper.AGoodDayToDieHard);
 
-            Keyword keyword = resp.Keywords.SingleOrDefault(s => s.Id == 186447);
-            Assert.NotNull(keyword);
-
-            Assert.Equal(186447, keyword.Id);
-            Assert.Equal("rogue", keyword.Name);
+            await Verify(resp);
         }
 
         [Fact]
-        public void TestMoviesGetMovieReleases()
+        public async Task TestMoviesGetMovieWatchProviders()
         {
-            Releases resp = Config.Client.GetMovieReleasesAsync(IdHelper.AGoodDayToDieHard).Result;
-            Assert.NotNull(resp);
-
-            Country country = resp.Countries.SingleOrDefault(s => s.Iso_3166_1 == "US");
-            Assert.NotNull(country);
-
-            Assert.Equal("R", country.Certification);
-            Assert.Equal("US", country.Iso_3166_1);
-            Assert.Equal(false, country.Primary);
-            Assert.Equal(new DateTime(2013, 2, 14), country.ReleaseDate);
-        }
-
-        [Fact]
-        public void TestMoviesGetMovieVideos()
-        {
-            ResultContainer<Video> resp = Config.Client.GetMovieVideosAsync(IdHelper.AGoodDayToDieHard).Result;
-
-            Assert.NotNull(resp);
-            Assert.NotNull(resp.Results);
-
-            Video video = resp.Results[0];
-            Assert.NotNull(video);
-
-            Assert.Equal("533ec6a7c3a368544800556f", video.Id);
-            Assert.Equal("en", video.Iso_639_1);
-            Assert.Equal("US", video.Iso_3166_1);
-            Assert.Equal("7EgVRvG2mM0", video.Key);
-            Assert.Equal("A Good Day To Die Hard Official Trailer", video.Name);
-            Assert.Equal("YouTube", video.Site);
-            Assert.Equal(720, video.Size);
-            Assert.Equal("Trailer", video.Type);
-        }
-
-        [Fact]
-        public void TestMoviesGetMovieWatchProviders()
-        {
-            SingleResultContainer<Dictionary<string, WatchProviders>> resp = Config.Client.GetMovieWatchProvidersAsync(IdHelper.AGoodDayToDieHard).Result;
+            SingleResultContainer<Dictionary<string, WatchProviders>> resp = await TMDbClient.GetMovieWatchProvidersAsync(IdHelper.AGoodDayToDieHard);
 
             Assert.NotNull(resp);
 
@@ -349,533 +235,209 @@ namespace TMDbLibTests
         }
 
         [Fact]
-        public void TestMoviesGetMovieTranslations()
+        public async void TestMoviesGetMovieTranslations()
         {
-            TranslationsContainer resp = Config.Client.GetMovieTranslationsAsync(IdHelper.AGoodDayToDieHard).Result;
-            Assert.NotNull(resp);
+            TranslationsContainer resp = await TMDbClient.GetMovieTranslationsAsync(IdHelper.AGoodDayToDieHard);
 
-            Translation translation = resp.Translations.SingleOrDefault(s => s.EnglishName == "German");
-            Assert.NotNull(translation);
-
-            Assert.Equal("German", translation.EnglishName);
-            Assert.Equal("DE", translation.Iso_3166_1);
-            Assert.Equal("de", translation.Iso_639_1);
-            Assert.Equal("Deutsch", translation.Name);
+            await Verify(resp);
         }
 
         [Fact]
-        public void TestMoviesGetMovieSimilarMovies()
+        public async void TestMoviesGetMovieSimilarMovies()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            SearchContainer<SearchMovie> resp = await TMDbClient.GetMovieSimilarAsync(IdHelper.AGoodDayToDieHard);
+            SearchContainer<SearchMovie> respGerman = await TMDbClient.GetMovieSimilarAsync(IdHelper.AGoodDayToDieHard, "de");
 
-            SearchContainer<SearchMovie> resp = Config.Client.GetMovieSimilarAsync(IdHelper.AGoodDayToDieHard).Result;
-            Assert.NotNull(resp);
+            SearchMovie single = resp.Results.Single(s => s.Id == 708);
+            SearchMovie singleGerman = respGerman.Results.Single(s => s.Id == 708);
 
-            SearchContainer<SearchMovie> respGerman = Config.Client.GetMovieSimilarAsync(IdHelper.AGoodDayToDieHard, language: "de").Result;
-            Assert.NotNull(respGerman);
-
-            Assert.Equal(resp.Results.Count, respGerman.Results.Count);
-
-            int differentTitles = 0;
-            for (int i = 0; i < resp.Results.Count; i++)
+            await Verify(new
             {
-                Assert.Equal(resp.Results[i].Id, respGerman.Results[i].Id);
-
-                // At least one title should be different, as German is a big language and they dub all their titles.
-                differentTitles++;
-            }
-
-            Assert.True(differentTitles > 0);
+                single,
+                singleGerman
+            });
         }
 
         [Fact]
-        public void TestMoviesGetMovieRecommendationsMovies()
+        public async void TestMoviesGetMovieRecommendationsMovies()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type", "results[array] / popularity");
+            SearchContainer<SearchMovie> resp = await TMDbClient.GetMovieRecommendationsAsync(IdHelper.AGoodDayToDieHard);
+            SearchContainer<SearchMovie> respGerman = await TMDbClient.GetMovieRecommendationsAsync(IdHelper.AGoodDayToDieHard, "de");
 
-            SearchContainer<SearchMovie> resp = Config.Client.GetMovieRecommendationsAsync(IdHelper.AGoodDayToDieHard).Result;
-            Assert.NotNull(resp);
+            SearchMovie single = resp.Results.Single(s => s.Id == 1571);
+            SearchMovie singleGerman = respGerman.Results.Single(s => s.Id == 1571);
 
-            SearchContainer<SearchMovie> respGerman = Config.Client.GetMovieRecommendationsAsync(IdHelper.AGoodDayToDieHard, language: "de").Result;
-            Assert.NotNull(respGerman);
-
-            Assert.Equal(resp.Results.Count, respGerman.Results.Count);
-
-            int differentTitles = 0;
-            for (int i = 0; i < resp.Results.Count; i++)
+            await Verify(new
             {
-                Assert.Equal(resp.Results[i].Id, respGerman.Results[i].Id);
-
-                // At least one title should be different, as German is a big language and they dub all their titles.
-                differentTitles++;
-            }
-
-            Assert.True(differentTitles > 0);
+                single,
+                singleGerman
+            });
         }
 
         [Fact]
-        public void TestMoviesGetMovieReviews()
+        public async void TestMoviesGetMovieReviews()
         {
-            SearchContainerWithId<ReviewBase> resp = Config.Client.GetMovieReviewsAsync(IdHelper.TheDarkKnightRises).Result;
-            Assert.NotNull(resp);
+            SearchContainerWithId<ReviewBase> resp = await TMDbClient.GetMovieReviewsAsync(IdHelper.AGoodDayToDieHard);
 
-            Assert.NotEqual(0, resp.Results.Count);
-            Assert.NotNull(resp.Results[0].Content);
+            ReviewBase single = resp.Results.Single(s => s.Id == "5ae9d7ae0e0a26394e008aeb");
+
+            await Verify(single);
         }
 
         [Fact]
-        public void TestMoviesGetMovieLists()
+        public async void TestMoviesGetMovieLists()
         {
-            SearchContainerWithId<ListResult> resp = Config.Client.GetMovieListsAsync(IdHelper.AGoodDayToDieHard).Result;
-            Assert.NotNull(resp);
+            await TestHelpers.SearchPagesAsync<SearchContainerWithId<ListResult>, ListResult>(page => TMDbClient.GetMovieListsAsync(IdHelper.AGoodDayToDieHard, page));
+
+            SearchContainerWithId<ListResult> resp = await TMDbClient.GetMovieListsAsync(IdHelper.AGoodDayToDieHard);
+
             Assert.Equal(IdHelper.AGoodDayToDieHard, resp.Id);
-
-            SearchContainerWithId<ListResult> respPage2 = Config.Client.GetMovieListsAsync(IdHelper.AGoodDayToDieHard, 2).Result;
-            Assert.NotNull(respPage2);
-
-            Assert.Equal(1, resp.Page);
-            Assert.Equal(2, respPage2.Page);
-            Assert.Equal(resp.TotalResults, resp.TotalResults);
+            Assert.NotEmpty(resp.Results);
         }
 
         [Fact]
-        public void TestMoviesGetMovieChanges()
+        public async Task TestMoviesGetMovieChangesAsync()
         {
-            // Not all ChangeItem's have an iso_639_1
-            IgnoreMissingJson(" / iso_639_1");
+            IList<Change> changes = await TMDbClient.GetMovieChangesAsync(IdHelper.Avatar, startDate: DateTime.UtcNow.AddYears(-1));
 
-            IgnoreMissingJson(" / account_states", " / alternative_titles", " / changes", " / credits", " / images", " / keywords", " / lists", " / release_dates", " / releases", " / reviews", " / similar", " / translations", " / videos", " / recommendations");
+            Assert.NotEmpty(changes);
+        }
 
-            //GetMovieChangesAsync(int id, DateTime? startDate = null, DateTime? endDate = null)
-            // FindAsync latest changed title
-            Movie lastestMovie = Config.Client.GetMovieLatestAsync().Sync();
-            int latestChanged = lastestMovie.Id;
+        [Fact]
+        public async void TestMoviesMissing()
+        {
+            Movie movie = await TMDbClient.GetMovieAsync(IdHelper.MissingID);
+            Assert.Null(movie);
+        }
 
-            // Fetch changelog
-            DateTime lower = DateTime.UtcNow.AddDays(-13);
-            DateTime higher = DateTime.UtcNow.AddDays(1);
-            List<Change> respRange = Config.Client.GetMovieChangesAsync(latestChanged, lower, higher).Result;
+        [Fact]
+        public async void TestMoviesPopularList()
+        {
+            await TestHelpers.SearchPagesAsync(page => TMDbClient.GetMoviePopularListAsync(page: page));
 
-            Assert.NotNull(respRange);
-            Assert.True(respRange.Count > 0);
+            SearchContainer<SearchMovie> list = await TMDbClient.GetMoviePopularListAsync("de");
+            Assert.NotEmpty(list.Results);
+        }
 
-            // As TMDb works in days, we need to adjust our values also
-            lower = lower.AddDays(-1);
-            higher = higher.AddDays(1);
+        [Fact]
+        public async void TestMoviesTopRatedList()
+        {
+            await TestHelpers.SearchPagesAsync(page => TMDbClient.GetMovieTopRatedListAsync(page: page));
 
-            foreach (Change change in respRange)
-                foreach (ChangeItemBase changeItem in change.Items)
+            SearchContainer<SearchMovie> list = await TMDbClient.GetMovieTopRatedListAsync("de");
+            Assert.NotEmpty(list.Results);
+        }
+
+        [Fact]
+        public async void TestMoviesNowPlayingList()
+        {
+            await TestHelpers.SearchPagesAsync<SearchContainerWithDates<SearchMovie>, SearchMovie>(page => TMDbClient.GetMovieNowPlayingListAsync(page: page));
+
+            SearchContainer<SearchMovie> list = await TMDbClient.GetMovieNowPlayingListAsync("de");
+            Assert.NotEmpty(list.Results);
+        }
+
+        [Fact]
+        public async void TestMoviesUpcomingList()
+        {
+            await TestHelpers.SearchPagesAsync<SearchContainerWithDates<SearchMovie>, SearchMovie>(page => TMDbClient.GetMovieUpcomingListAsync(page: page));
+
+            SearchContainer<SearchMovie> list = await TMDbClient.GetMovieUpcomingListAsync("de");
+            Assert.NotEmpty(list.Results);
+        }
+
+        [Fact]
+        public async Task TestMoviesAccountStateFavoriteSetAsync()
+        {
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
+
+            await TestMethodsHelper.SetValidateRemoveTest(
+                () => TMDbClient.AccountChangeFavoriteStatusAsync(MediaType.Movie, IdHelper.MadMaxFuryRoad, true),
+                () => TMDbClient.AccountChangeFavoriteStatusAsync(MediaType.Movie, IdHelper.MadMaxFuryRoad, false),
+                async shouldBeSet =>
                 {
-                    DateTime date = changeItem.Time;
-                    Assert.True(lower <= date);
-                    Assert.True(date <= higher);
-                }
+                    AccountState accountState = await TMDbClient.GetMovieAccountStateAsync(IdHelper.MadMaxFuryRoad);
+
+                    Assert.Equal(shouldBeSet, accountState.Favorite);
+                });
         }
 
         [Fact]
-        public void TestMoviesMissing()
+        public async Task TestMoviesAccountStateWatchlistSetAsync()
         {
-            Movie movie1 = Config.Client.GetMovieAsync(IdHelper.MissingID).Result;
-            Assert.Null(movie1);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            Movie movie2 = Config.Client.GetMovieAsync(IdHelper.MissingMovie).Result;
-            Assert.Null(movie2);
+            await TestMethodsHelper.SetValidateRemoveTest(
+                () => TMDbClient.AccountChangeWatchlistStatusAsync(MediaType.Movie, IdHelper.MadMaxFuryRoad, true),
+                () => TMDbClient.AccountChangeWatchlistStatusAsync(MediaType.Movie, IdHelper.MadMaxFuryRoad, false),
+                async shouldBeSet =>
+                {
+                    AccountState accountState = await TMDbClient.GetMovieAccountStateAsync(IdHelper.MadMaxFuryRoad);
+
+                    Assert.Equal(shouldBeSet, accountState.Watchlist);
+                });
         }
 
         [Fact]
-        public void TestMoviesImages()
+        public async Task TestMoviesAccountStateRatingSetAsync()
         {
-            // Get config
-            Config.Client.GetConfigAsync().Sync();
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            // Test image url generator
-            ImagesWithId images = Config.Client.GetMovieImagesAsync(IdHelper.AGoodDayToDieHard).Result;
+            await TestMethodsHelper.SetValidateRemoveTest(
+                () => TMDbClient.MovieSetRatingAsync(IdHelper.MadMaxFuryRoad, 7.5),
+                () => TMDbClient.MovieRemoveRatingAsync(IdHelper.MadMaxFuryRoad),
+                async shouldBeSet =>
+                {
+                    AccountState accountState = await TMDbClient.GetMovieAccountStateAsync(IdHelper.MadMaxFuryRoad);
 
-            Assert.Equal(IdHelper.AGoodDayToDieHard, images.Id);
-            TestImagesHelpers.TestImages(Config, images);
+                    Assert.Equal(shouldBeSet, accountState.Rating.HasValue);
+                });
         }
 
         [Fact]
-        public void TestMoviesPopularList()
+        public async Task TestMoviesSetRatingBadRating()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            SearchContainer<SearchMovie> list = Config.Client.GetMoviePopularListAsync().Result;
+            Assert.False(await TMDbClient.MovieSetRatingAsync(IdHelper.Avatar, 7.1));
 
-            Assert.NotNull(list);
-            Assert.True(list.Results.Count > 0);
-            Assert.Equal(1, list.Page);
+            Assert.True(await TMDbClient.MovieSetRatingAsync(IdHelper.Avatar, 8.0));
 
-            SearchContainer<SearchMovie> listPage2 = Config.Client.GetMoviePopularListAsync(page: 2).Result;
+            Assert.False(await TMDbClient.MovieSetRatingAsync(IdHelper.Avatar, 10.5));
 
-            Assert.NotNull(listPage2);
-            Assert.True(listPage2.Results.Count > 0);
-            Assert.Equal(2, listPage2.Page);
+            Assert.True(await TMDbClient.MovieSetRatingAsync(IdHelper.Avatar, 1.5));
 
-            SearchContainer<SearchMovie> listDe = Config.Client.GetMoviePopularListAsync("de").Result;
+            Assert.False(await TMDbClient.MovieSetRatingAsync(IdHelper.Avatar, 0));
 
-            Assert.NotNull(listDe);
-            Assert.True(listDe.Results.Count > 0);
-            Assert.Equal(1, listDe.Page);
-
-            // At least one title should differ
-            Assert.True(list.Results.Any(s => listDe.Results.Any(x => x.Title != s.Title)));
-
-            SearchContainer<SearchMovie> listRegion = Config.Client.GetMoviePopularListAsync(region: "de").Result;
-
-            Assert.NotNull(listRegion);
-            Assert.True(listRegion.Results.Count > 0);
-            Assert.Equal(1, listRegion.Page);
-
-            // At least one title should differ
-            Assert.True(listDe.Results.Any(s => listRegion.Results.Any(x => x.Title != s.Title)));
+            Assert.False(await TMDbClient.MovieRemoveRatingAsync(IdHelper.Avatar));
         }
 
         [Fact]
-        public void TestMoviesTopRatedList()
+        public async void TestMoviesGetHtmlEncodedText()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
-
-            SearchContainer<SearchMovie> list = Config.Client.GetMovieTopRatedListAsync().Result;
-
-            Assert.NotNull(list);
-            Assert.True(list.Results.Count > 0);
-            Assert.Equal(1, list.Page);
-
-            SearchContainer<SearchMovie> listPage2 = Config.Client.GetMovieTopRatedListAsync(page: 2).Result;
-
-            Assert.NotNull(listPage2);
-            Assert.True(listPage2.Results.Count > 0);
-            Assert.Equal(2, listPage2.Page);
-
-            SearchContainer<SearchMovie> listDe = Config.Client.GetMovieTopRatedListAsync("de").Result;
-
-            Assert.NotNull(listDe);
-            Assert.True(listDe.Results.Count > 0);
-            Assert.Equal(1, listDe.Page);
-
-            // At least one title should differ
-            Assert.True(list.Results.Any(s => listDe.Results.Any(x => x.Title != s.Title)));
-
-            SearchContainer<SearchMovie> listRegion = Config.Client.GetMovieTopRatedListAsync(region: "de").Result;
-
-            Assert.NotNull(listRegion);
-            Assert.True(listRegion.Results.Count > 0);
-            Assert.Equal(1, listRegion.Page);
-
-            // At least one title should differ
-            Assert.True(listDe.Results.Any(s => listRegion.Results.Any(x => x.Title != s.Title)));
-        }
-
-        [Fact]
-        public void TestMoviesNowPlayingList()
-        {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
-
-            SearchContainerWithDates<SearchMovie> list = Config.Client.GetMovieNowPlayingListAsync().Result;
-
-            Assert.NotNull(list);
-            Assert.True(list.Results.Count > 0);
-            Assert.Equal(1, list.Page);
-
-            SearchContainerWithDates<SearchMovie> listPage2 = Config.Client.GetMovieNowPlayingListAsync(page: 2).Result;
-
-            Assert.NotNull(listPage2);
-            Assert.True(listPage2.Results.Count > 0);
-            Assert.Equal(2, listPage2.Page);
-
-            SearchContainerWithDates<SearchMovie> listDe = Config.Client.GetMovieNowPlayingListAsync("de").Result;
-
-            Assert.NotNull(listDe);
-            Assert.True(listDe.Results.Count > 0);
-            Assert.Equal(1, listDe.Page);
-
-            // At least one title should differ
-            Assert.True(list.Results.Any(s => listDe.Results.Any(x => x.Title != s.Title)));
-
-            SearchContainerWithDates<SearchMovie> listRegion = Config.Client.GetMovieNowPlayingListAsync(region: "de").Result;
-
-            Assert.NotNull(listRegion);
-            Assert.True(listRegion.Results.Count > 0);
-            Assert.Equal(1, listRegion.Page);
-
-            // At least one title should differ
-            Assert.True(listDe.Results.Any(s => listRegion.Results.Any(x => x.Title != s.Title)));
-        }
-
-        [Fact]
-        public void TestMoviesUpcomingList()
-        {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
-
-            SearchContainerWithDates<SearchMovie> list = Config.Client.GetMovieUpcomingListAsync().Result;
-
-            Assert.NotNull(list);
-            Assert.True(list.Results.Count > 0);
-            Assert.Equal(1, list.Page);
-
-            SearchContainerWithDates<SearchMovie> listPage2 = Config.Client.GetMovieUpcomingListAsync(page: 2).Result;
-
-            Assert.NotNull(listPage2);
-            Assert.True(listPage2.Results.Count > 0);
-            Assert.Equal(2, listPage2.Page);
-
-            SearchContainerWithDates<SearchMovie> listDe = Config.Client.GetMovieUpcomingListAsync(language: "de").Result;
-
-            Assert.NotNull(listDe);
-            Assert.True(listDe.Results.Count > 0);
-            Assert.Equal(1, listDe.Page);
-
-            // At least one title should differ
-            Assert.True(list.Results.Any(s => listDe.Results.Any(x => x.Title != s.Title)));
-
-            SearchContainerWithDates<SearchMovie> listDeRegion = Config.Client.GetMovieUpcomingListAsync(region: "de").Result;
-
-            Assert.NotNull(listDeRegion);
-            Assert.True(listDeRegion.Results.Count > 0);
-            Assert.Equal(1, listDeRegion.Page);
-
-            // At least one title should differ
-            Assert.True(listDe.Results.Any(s => listDeRegion.Results.Any(x => x.Title != s.Title)));
-        }
-
-        [Fact]
-        public void TestMoviesAccountStateFavoriteSet()
-        {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            AccountState accountState = Config.Client.GetMovieAccountStateAsync(IdHelper.MadMaxFuryRoad).Result;
-
-            // Remove the favourite
-            if (accountState.Favorite)
-                Config.Client.AccountChangeFavoriteStatusAsync(MediaType.Movie, IdHelper.MadMaxFuryRoad, false).Sync();
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            // Test that the movie is NOT favourited
-            accountState = Config.Client.GetMovieAccountStateAsync(IdHelper.MadMaxFuryRoad).Result;
-
-            Assert.Equal(IdHelper.MadMaxFuryRoad, accountState.Id);
-            Assert.False(accountState.Favorite);
-
-            // Favourite the movie
-            Config.Client.AccountChangeFavoriteStatusAsync(MediaType.Movie, IdHelper.MadMaxFuryRoad, true).Sync();
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            // Test that the movie IS favourited
-            accountState = Config.Client.GetMovieAccountStateAsync(IdHelper.MadMaxFuryRoad).Result;
-            Assert.Equal(IdHelper.MadMaxFuryRoad, accountState.Id);
-            Assert.True(accountState.Favorite);
-        }
-
-        [Fact]
-        public void TestMoviesAccountStateWatchlistSet()
-        {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            AccountState accountState = Config.Client.GetMovieAccountStateAsync(IdHelper.MadMaxFuryRoad).Result;
-
-            // Remove the watchlist
-            if (accountState.Watchlist)
-                Config.Client.AccountChangeWatchlistStatusAsync(MediaType.Movie, IdHelper.MadMaxFuryRoad, false).Sync();
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            // Test that the movie is NOT watchlisted
-            accountState = Config.Client.GetMovieAccountStateAsync(IdHelper.MadMaxFuryRoad).Result;
-
-            Assert.Equal(IdHelper.MadMaxFuryRoad, accountState.Id);
-            Assert.False(accountState.Watchlist);
-
-            // Watchlist the movie
-            Config.Client.AccountChangeWatchlistStatusAsync(MediaType.Movie, IdHelper.MadMaxFuryRoad, true).Sync();
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            // Test that the movie IS watchlisted
-            accountState = Config.Client.GetMovieAccountStateAsync(IdHelper.MadMaxFuryRoad).Result;
-            Assert.Equal(IdHelper.MadMaxFuryRoad, accountState.Id);
-            Assert.True(accountState.Watchlist);
-        }
-
-        [Fact]
-        public void TestMoviesAccountStateRatingSet()
-        {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            AccountState accountState = Config.Client.GetMovieAccountStateAsync(IdHelper.MadMaxFuryRoad).Result;
-
-            // Remove the rating
-            if (accountState.Rating.HasValue)
-            {
-                Assert.True(Config.Client.MovieRemoveRatingAsync(IdHelper.MadMaxFuryRoad).Result);
-
-                // Allow TMDb to cache our changes
-                Thread.Sleep(2000);
-            }
-
-            // Test that the movie is NOT rated
-            accountState = Config.Client.GetMovieAccountStateAsync(IdHelper.MadMaxFuryRoad).Result;
-
-            Assert.Equal(IdHelper.MadMaxFuryRoad, accountState.Id);
-            Assert.False(accountState.Rating.HasValue);
-
-            // Rate the movie
-            Config.Client.MovieSetRatingAsync(IdHelper.MadMaxFuryRoad, 5).Sync();
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            // Test that the movie IS rated
-            accountState = Config.Client.GetMovieAccountStateAsync(IdHelper.MadMaxFuryRoad).Result;
-            Assert.Equal(IdHelper.MadMaxFuryRoad, accountState.Id);
-            Assert.True(accountState.Rating.HasValue);
-
-            // Remove the rating
-            Assert.True(Config.Client.MovieRemoveRatingAsync(IdHelper.MadMaxFuryRoad).Result);
-        }
-
-        [Fact]
-        public void TestMoviesSetRatingBadRating()
-        {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            Assert.False(Config.Client.MovieSetRatingAsync(IdHelper.Avatar, 7.1).Result);
-        }
-
-        [Fact]
-        public void TestMoviesSetRatingRatingOutOfBounds()
-        {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            Assert.False(Config.Client.MovieSetRatingAsync(IdHelper.Avatar, 10.5).Result);
-        }
-
-        [Fact]
-        public void TestMoviesSetRatingRatingLowerBoundsTest()
-        {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            Assert.False(Config.Client.MovieSetRatingAsync(IdHelper.Avatar, 0).Result);
-        }
-
-        [Fact]
-        public void TestMoviesSetRatingUserSession()
-        {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-
-            // Ensure that the test movie has a different rating than our test rating
-            var rating = Config.Client.GetMovieAccountStateAsync(IdHelper.Avatar).Result.Rating;
-            Assert.NotNull(rating);
-
-            double originalRating = rating.Value;
-            double newRating = Math.Abs(originalRating - 7.5) < double.Epsilon ? 2.5 : 7.5;
-
-            // Try changing the rating
-            Assert.True(Config.Client.MovieSetRatingAsync(IdHelper.Avatar, newRating).Result);
-
-            // Allow TMDb to not cache our data
-            Thread.Sleep(2000);
-
-            // Check if it worked
-            Assert.Equal(newRating, Config.Client.GetMovieAccountStateAsync(IdHelper.Avatar).Result.Rating);
-
-            // Try changing it back to the previous rating
-            Assert.True(Config.Client.MovieSetRatingAsync(IdHelper.Avatar, originalRating).Result);
-
-            // Allow TMDb to not cache our data
-            Thread.Sleep(2000);
-
-            // Check if it worked
-            Assert.Equal(originalRating, Config.Client.GetMovieAccountStateAsync(IdHelper.Avatar).Result.Rating);
-        }
-
-        [Fact]
-        public void TestMoviesGetHtmlEncodedText()
-        {
-            IgnoreMissingJson(" / account_states", " / alternative_titles", " / changes", " / credits", " / images", " / keywords", " / lists", " / release_dates", " / releases", " / reviews", " / similar", " / translations", " / videos", " / recommendations", " / external_ids");
-
-            Movie item = Config.Client.GetMovieAsync(IdHelper.Furious7, "de").Result;
+            Movie item = await TMDbClient.GetMovieAsync(IdHelper.Furious7, "de");
 
             Assert.NotNull(item);
 
-            Assert.False(item.Overview.Contains("&amp;"));
+            Assert.DoesNotContain("&amp;", item.Overview);
         }
 
         [Fact]
-        public void TestMoviesGet()
+        public async Task TestMoviesExtrasAccountStateAsync()
         {
-            IgnoreMissingJson(" / account_states", " / alternative_titles", " / changes", " / credits", " / images", " / keywords", " / lists", " / release_dates", " / releases", " / reviews", " / similar", " / translations", " / videos", " / recommendations", " / external_ids");
-
-            Movie item = Config.Client.GetMovieAsync(IdHelper.AGoodDayToDieHard).Result;
-
-            Assert.NotNull(item);
-            Assert.Equal(IdHelper.AGoodDayToDieHard, item.Id);
-            Assert.Equal(IdHelper.AGoodDayToDieHardImdb, item.ImdbId);
-
-            // Check all properties
-            Assert.Equal("A Good Day to Die Hard", item.Title);
-            Assert.Equal("A Good Day to Die Hard", item.OriginalTitle);
-            Assert.Equal("en", item.OriginalLanguage);
-
-            Assert.Equal("Released", item.Status);
-            Assert.Equal("Yippee Ki-Yay Mother Russia", item.Tagline);
-            Assert.Equal("Iconoclastic, take-no-prisoners cop John McClane, finds himself for the first time on foreign soil after traveling to Moscow to help his wayward son Jack - unaware that Jack is really a highly-trained CIA operative out to stop a nuclear weapons heist. With the Russian underworld in pursuit, and battling a countdown to war, the two McClanes discover that their opposing methods make them unstoppable heroes.", item.Overview);
-            Assert.Equal("http://www.diehardmovie.com/", item.Homepage);
-
-            Assert.True(TestImagesHelpers.TestImagePath(item.BackdropPath), "item.BackdropPath was not a valid image path, was: " + item.BackdropPath);
-            Assert.True(TestImagesHelpers.TestImagePath(item.PosterPath), "item.PosterPath was not a valid image path, was: " + item.PosterPath);
-
-            Assert.Equal(false, item.Adult);
-            Assert.Equal(false, item.Video);
-
-            Assert.NotNull(item.BelongsToCollection);
-            Assert.Equal(1570, item.BelongsToCollection.Id);
-            Assert.Equal("Die Hard Collection", item.BelongsToCollection.Name);
-            Assert.True(TestImagesHelpers.TestImagePath(item.BelongsToCollection.BackdropPath), "item.BelongsToCollection.BackdropPath was not a valid image path, was: " + item.BelongsToCollection.BackdropPath);
-            Assert.True(TestImagesHelpers.TestImagePath(item.BelongsToCollection.PosterPath), "item.BelongsToCollection.PosterPath was not a valid image path, was: " + item.BelongsToCollection.PosterPath);
-
-            //Assert.Equal(1, item.BelongsToCollection.Count);
-            //Assert.Equal(1570, item.BelongsToCollection[0].Id);
-            //Assert.Equal("Die Hard Collection", item.BelongsToCollection[0].Name);
-            //Assert.True(TestImagesHelpers.TestImagePath(item.BelongsToCollection[0].BackdropPath), "item.BelongsToCollection[0].BackdropPath was not a valid image path, was: " + item.BelongsToCollection[0].BackdropPath);
-            //Assert.True(TestImagesHelpers.TestImagePath(item.BelongsToCollection[0].PosterPath), "item.BelongsToCollection[0].PosterPath was not a valid image path, was: " + item.BelongsToCollection[0].PosterPath);
-
-            Assert.Equal(2, item.Genres.Count);
-            Assert.Equal(28, item.Genres[0].Id);
-            Assert.Equal("Action", item.Genres[0].Name);
-            Assert.Equal(53, item.Genres[1].Id);
-            Assert.Equal("Thriller", item.Genres[1].Name);
-
-            Assert.True(item.ReleaseDate > new DateTime(2013, 01, 01));
-            Assert.Equal(304654182, item.Revenue);
-            Assert.Equal(92000000, item.Budget);
-            Assert.Equal(98, item.Runtime);
-        }
-
-        [Fact]
-        public void TestMoviesExtrasAccountState()
-        {
-            // Ignore certain properties
-            IgnoreMissingJson(" / id", " / alternative_titles", " / changes", " / credits", " / images", " / keywords", " / lists", " / release_dates", " / releases", " / reviews", " / similar", " / translations", " / videos", " / recommendations", " / external_ids");
-
             // Test the custom parsing code for Account State rating
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            Movie movie = Config.Client.GetMovieAsync(IdHelper.TheDarkKnightRises, MovieMethods.AccountStates).Result;
-            if (movie.AccountStates == null || !movie.AccountStates.Rating.HasValue)
+            Movie movie = await TMDbClient.GetMovieAsync(IdHelper.TheDarkKnightRises, MovieMethods.AccountStates);
+
+            if (movie.AccountStates?.Rating == null)
             {
-                Config.Client.MovieSetRatingAsync(IdHelper.TheDarkKnightRises, 5).Sync();
+                await TMDbClient.MovieSetRatingAsync(IdHelper.TheDarkKnightRises, 5);
 
                 // Allow TMDb to update cache
-                Thread.Sleep(2000);
+                await Task.Delay(2000);
 
-                movie = Config.Client.GetMovieAsync(IdHelper.TheDarkKnightRises, MovieMethods.AccountStates).Result;
+                movie = await TMDbClient.GetMovieAsync(IdHelper.TheDarkKnightRises, MovieMethods.AccountStates);
             }
 
             Assert.NotNull(movie.AccountStates);
diff --git a/TMDbLibTests/ClientNetworkTests.cs b/TMDbLibTests/ClientNetworkTests.cs
index 5c64b4d..b0b30d0 100644
--- a/TMDbLibTests/ClientNetworkTests.cs
+++ b/TMDbLibTests/ClientNetworkTests.cs
@@ -1,4 +1,5 @@
-using TMDbLib.Objects.General;
+using System.Threading.Tasks;
+using TMDbLib.Objects.General;
 using Xunit;
 using TMDbLib.Objects.TvShows;
 using TMDbLibTests.Helpers;
@@ -9,44 +10,33 @@ namespace TMDbLibTests
     public class ClientNetworkTests : TestBase
     {
         [Fact]
-        public void TestNetworkGetById()
+        public async Task TestNetworkGetByIdAsync()
         {
-            Network network = Config.Client.GetNetworkAsync(IdHelper.Netflix).Result;
+            Network network =  await TMDbClient.GetNetworkAsync(IdHelper.Netflix);
 
-            Assert.NotNull(network);
-            Assert.Equal("Netflix", network.Name);
-            Assert.Equal(IdHelper.Netflix, network.Id);
-            Assert.Equal("http://www.netflix.com", network.Homepage);
-            Assert.Equal("Los Gatos, California, United States", network.Headquarters);
+            await Verify(network);
         }
 
         [Fact]
-        public void TestNetworkImages()
+        public async Task TestNetworkImagesAsync()
         {
-            IgnoreMissingCSharp("logos[array].file_type / file_type", "logos[array].id / id");
-            IgnoreMissingJson("logos[array] / iso_639_1");
-            NetworkLogos logos = Config.Client.GetNetworkImagesAsync(IdHelper.Netflix).Result;
-
-            Assert.NotNull(logos);
-            Assert.Equal(IdHelper.Netflix, logos.Id);
-            Assert.Equal("/wwemzKWzjKYJFfCeiB57q3r4Bcm.png", logos.Logos[0].FilePath);
+            NetworkLogos logos = await  TMDbClient.GetNetworkImagesAsync(IdHelper.Netflix);
+            
+            await Verify(logos);
         }
 
         [Fact]
-        public void TestNetworkAlternativeNames()
+        public async Task TestNetworkAlternativeNamesAsync()
         {
-            AlternativeNames names = Config.Client.GetNetworkAlternativeNamesAsync(IdHelper.AMC).Result;
-
-            Assert.NotNull(names);
-            Assert.Equal(IdHelper.AMC, names.Id);
-            Assert.Equal("American Movie Classics", names.Results[0].Name);
-            Assert.Equal("1984–2002", names.Results[0].Type);
+            AlternativeNames names = await  TMDbClient.GetNetworkAlternativeNamesAsync(IdHelper.AMC);
+            
+            await Verify(names);
         }
 
         [Fact]
-        public void TestNetworkMissing()
+        public async Task TestNetworkMissingAsync()
         {
-            Network network = Config.Client.GetNetworkAsync(IdHelper.MissingID).Result;
+            Network network =  await TMDbClient.GetNetworkAsync(IdHelper.MissingID);
 
             Assert.Null(network);
         }
diff --git a/TMDbLibTests/ClientPersonTests.cs b/TMDbLibTests/ClientPersonTests.cs
index 5a1cef7..fab45fe 100644
--- a/TMDbLibTests/ClientPersonTests.cs
+++ b/TMDbLibTests/ClientPersonTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Xunit;
 using TMDbLib.Objects.Changes;
 using TMDbLib.Objects.People;
@@ -13,11 +14,11 @@ namespace TMDbLibTests
 {
     public class ClientPersonTests : TestBase
     {
-        private static Dictionary<PersonMethods, Func<Person, object>> _methods;
+        private static readonly Dictionary<PersonMethods, Func<Person, object>> Methods;
 
-        public ClientPersonTests()
+        static ClientPersonTests()
         {
-            _methods = new Dictionary<PersonMethods, Func<Person, object>>
+            Methods = new Dictionary<PersonMethods, Func<Person, object>>
             {
                 [PersonMethods.MovieCredits] = person => person.MovieCredits,
                 [PersonMethods.TvCredits] = person => person.TvCredits,
@@ -29,377 +30,142 @@ namespace TMDbLibTests
         }
 
         [Fact]
-        public void TestPersonsExtrasNone()
+        public async Task TestPersonsExtrasNoneAsync()
         {
-            // We will intentionally ignore errors reg. missing JSON as we do not request it
-            IgnoreMissingJson(" / changes", " / external_ids", " / images", " / movie_credits", " / tagged_images", " / tv_credits");
-
-            Person person = Config.Client.GetPersonAsync(IdHelper.BruceWillis).Result;
-
-            Assert.NotNull(person);
-
-            Assert.Equal("Bruce Willis", person.Name);
+            Person person = await TMDbClient.GetPersonAsync(IdHelper.BruceWillis);
 
             // Test all extras, ensure none of them exist
-            foreach (Func<Person, object> selector in _methods.Values)
-            {
+            foreach (Func<Person, object> selector in Methods.Values)
                 Assert.Null(selector(person));
-            }
+
+            await Verify(person);
         }
 
         [Fact]
-        public void TestPersonsExtrasExclusive()
+        public async Task TestPersonsExtrasExclusive()
         {
-            // We will intentionally ignore errors reg. missing JSON as we do not request it
-            IgnoreMissingJson(" / changes", " / external_ids", " / images", " / movie_credits", " / tagged_images", " / tv_credits", "external_ids / id", "images / id", "movie_credits / id", "tv_credits / id");
-
-            TestMethodsHelper.TestGetExclusive(_methods, (id, extras) => Config.Client.GetPersonAsync(id, extras).Result, IdHelper.BruceWillis);
+            await TestMethodsHelper.TestGetExclusive(Methods, extras => TMDbClient.GetPersonAsync(IdHelper.BruceWillis, extras));
         }
 
         [Fact]
-        public void TestPersonsExtrasAll()
+        public async Task TestPersonsExtrasAllAsync()
         {
-            IgnoreMissingJson("external_ids / id", "images / id", "movie_credits / id", "tv_credits / id");
-
-            PersonMethods combinedEnum = _methods.Keys.Aggregate((methods, movieMethods) => methods | movieMethods);
-            Person item = Config.Client.GetPersonAsync(IdHelper.BruceWillis, combinedEnum).Result;
-
-            TestMethodsHelper.TestAllNotNull(_methods, item);
+            await TestMethodsHelper.TestGetAll(Methods, combined => TMDbClient.GetPersonAsync(IdHelper.FrankSinatra, combined), async person => await Verify(person));
         }
 
         [Fact]
-        public void TestPersonsGetWithPartialDate()
+        public async Task TestPersonMissingAsync()
         {
-            IgnoreMissingJson(" / changes", " / external_ids", " / images", " / movie_credits", " / tagged_images", " / tv_credits");
-
-            Person item = Config.Client.GetPersonAsync(IdHelper.PersonPartialDate).Result;
-
-            Assert.NotNull(item);
-            Assert.Null(item.Birthday);
-            Assert.Null(item.Deathday);
-        }
-
-        [Fact]
-        public void TestPersonMissing()
-        {
-            Person person = Config.Client.GetPersonAsync(IdHelper.MissingID).Result;
+            Person person = await TMDbClient.GetPersonAsync(IdHelper.MissingID);
 
             Assert.Null(person);
         }
 
         [Fact]
-        public void TestPersonsGet()
+        public async Task TestPersonsGetPersonTvCreditsAsync()
         {
-            IgnoreMissingJson(" / changes", " / external_ids", " / images", " / movie_credits", " / tagged_images", " / tv_credits");
-
-            Person item = Config.Client.GetPersonAsync(IdHelper.BruceWillis).Result;
+            TvCredits item = await TMDbClient.GetPersonTvCreditsAsync(IdHelper.BruceWillis);
 
             Assert.NotNull(item);
-            Assert.Equal(false, item.Adult);
-            Assert.NotNull(item.Biography);
-            Assert.Equal(PersonGender.Male, item.Gender);
-            Assert.Equal(new DateTime(1955, 3, 19), item.Birthday);
-            Assert.False(item.Deathday.HasValue);
-            Assert.Equal("http://www.b-willis.com/", item.Homepage);
-            Assert.Equal(62, item.Id);
-            Assert.Equal("nm0000246", item.ImdbId);
-            Assert.Equal("Bruce Willis", item.Name);
-            Assert.Equal("Idar-Oberstein, Germany", item.PlaceOfBirth);
-            Assert.True(item.Popularity > 0);
-            Assert.True(TestImagesHelpers.TestImagePath(item.ProfilePath), "item.ProfilePath was not a valid image path, was: " + item.ProfilePath);
+            Assert.NotEmpty(item.Cast);
+            Assert.NotEmpty(item.Crew);
 
-            Assert.NotNull(item.AlsoKnownAs);
-            Assert.Equal(2, item.AlsoKnownAs.Count);
-            Assert.True(item.AlsoKnownAs.Contains("Брюс Уиллис"));
-            Assert.True(item.AlsoKnownAs.Contains("브루스 윌리스"));
-        }
+            TvRole cast = item.Cast.Single(s => s.CreditId == "52571e7f19c2957114107d48");
+            TvJob crew = item.Crew.Single(s => s.CreditId == "525826eb760ee36aaa81b23b");
 
-        [Fact]
-        public void TestPersonsGetPersonTvCredits()
-        {
-            TvCredits item = Config.Client.GetPersonTvCreditsAsync(IdHelper.BruceWillis).Result;
-
-            Assert.NotNull(item);
-            Assert.NotNull(item.Cast);
-            Assert.NotNull(item.Crew);
-
-            Assert.Equal(IdHelper.BruceWillis, item.Id);
-
-            TvRole cast = item.Cast.SingleOrDefault(s => s.Character == "David Addison Jr.");
-            Assert.NotNull(cast);
-            Assert.Equal("David Addison Jr.", cast.Character);
-            Assert.Equal("52571e7f19c2957114107d48", cast.CreditId);
-            Assert.Equal(71, cast.EpisodeCount);
-            Assert.Equal(new DateTime(1985, 3, 3), cast.FirstAirDate);
-            Assert.Equal(1998, cast.Id);
-            Assert.Equal("Moonlighting", cast.Name);
-            Assert.Equal("Moonlighting", cast.OriginalName);
-            Assert.True(TestImagesHelpers.TestImagePath(cast.PosterPath), "cast.PosterPath was not a valid image path, was: " + cast.PosterPath);
-
-            TvJob job = item.Crew.SingleOrDefault(s => s.CreditId == "525826eb760ee36aaa81b23b");
-            Assert.NotNull(job);
-            Assert.Equal("525826eb760ee36aaa81b23b", job.CreditId);
-            Assert.Equal("Production", job.Department);
-            Assert.Equal(37, job.EpisodeCount);
-            Assert.Equal(new DateTime(1996, 9, 23), job.FirstAirDate);
-            Assert.Equal(13297, job.Id);
-            Assert.Equal("Producer", job.Job);
-            Assert.Equal("Bruno the Kid", job.Name);
-            Assert.Equal("Bruno the Kid", job.OriginalName);
-            Assert.True(TestImagesHelpers.TestImagePath(job.PosterPath), "job.PosterPath was not a valid image path, was: " + job.PosterPath);
-        }
-
-        [Fact]
-        public void TestPersonsGetPersonMovieCredits()
-        {
-            MovieCredits item = Config.Client.GetPersonMovieCreditsAsync(IdHelper.BruceWillis).Result;
-
-            Assert.NotNull(item);
-            Assert.NotNull(item.Cast);
-            Assert.NotNull(item.Crew);
-
-            Assert.Equal(IdHelper.BruceWillis, item.Id);
-
-            MovieRole cast = item.Cast.SingleOrDefault(s => s.CreditId == "52fe4329c3a36847f803f193");
-            Assert.NotNull(cast);
-            Assert.Equal(false, cast.Adult);
-            Assert.Equal("Lieutenant Muldoon", cast.Character);
-            Assert.Equal("52fe4329c3a36847f803f193", cast.CreditId);
-            Assert.Equal(1992, cast.Id);
-            Assert.Equal("Planet Terror", cast.OriginalTitle);
-            Assert.True(TestImagesHelpers.TestImagePath(cast.PosterPath), "cast.PosterPath was not a valid image path, was: " + cast.PosterPath);
-            Assert.Equal(new DateTime(2007, 4, 6), cast.ReleaseDate);
-            Assert.Equal("Planet Terror", cast.Title);
-
-            MovieJob job = item.Crew.SingleOrDefault(s => s.CreditId == "52fe432ec3a36847f8040603");
-            Assert.NotNull(job);
-            Assert.Equal(false, job.Adult);
-            Assert.Equal("52fe432ec3a36847f8040603", job.CreditId);
-            Assert.Equal("Production", job.Department);
-            Assert.Equal(2026, job.Id);
-            Assert.Equal("Producer", job.Job);
-            Assert.Equal(new DateTime(2005, 3, 9), job.ReleaseDate);
-            Assert.True(TestImagesHelpers.TestImagePath(job.PosterPath), "job.PosterPath was not a valid image path, was: " + job.PosterPath);
-            Assert.Equal("Hostage", job.Title);
-            Assert.Equal("Hostage", job.OriginalTitle);
-        }
-
-        [Fact]
-        public void TestPersonsGetPersonExternalIds()
-        {
-            ExternalIdsPerson item = Config.Client.GetPersonExternalIdsAsync(IdHelper.BruceWillis).Result;
-
-            Assert.NotNull(item);
-            Assert.Equal(IdHelper.BruceWillis, item.Id);
-            Assert.Equal("nm0000246", item.ImdbId);
-            Assert.Equal("/m/0h7pj", item.FreebaseMid);
-            Assert.Equal("/en/bruce_willis", item.FreebaseId);
-            Assert.Equal("10183", item.TvrageId);
-            Assert.Null(item.FacebookId);
-
-            item = Config.Client.GetPersonExternalIdsAsync(IdHelper.JoshACagan).Result;
-
-            Assert.NotNull(item);
-            Assert.Equal(IdHelper.JoshACagan, item.Id);
-            Assert.Null(item.FacebookId);
-            Assert.Equal("joshacagan", item.TwitterId);
-            Assert.Equal("joshacagan", item.InstagramId);
-        }
-
-        [Fact]
-        public void TestPersonsGetPersonCredits()
-        {
-            //GetPersonCredits(int id, string language)
-            MovieCredits resp = Config.Client.GetPersonMovieCreditsAsync(IdHelper.BruceWillis).Result;
-            Assert.NotNull(resp);
-
-            MovieCredits respItalian = Config.Client.GetPersonMovieCreditsAsync(IdHelper.BruceWillis, "it").Result;
-            Assert.NotNull(respItalian);
-
-            Assert.Equal(resp.Cast.Count, respItalian.Cast.Count);
-            Assert.Equal(resp.Crew.Count, respItalian.Crew.Count);
-            Assert.Equal(resp.Id, respItalian.Id);
-
-            // There must be at least one movie with a different title
-            bool allTitlesIdentical = true;
-            for (int index = 0; index < resp.Cast.Count; index++)
+            await Verify(new
             {
-                Assert.Equal(resp.Cast[index].Id, respItalian.Cast[index].Id);
-                Assert.Equal(resp.Cast[index].OriginalTitle, respItalian.Cast[index].OriginalTitle);
+                cast,
+                crew
+            });
+        }
 
-                if (resp.Cast[index].Title != respItalian.Cast[index].Title)
-                    allTitlesIdentical = false;
-            }
+        [Fact]
+        public async Task TestGetPersonMovieCreditsAsync()
+        {
+            MovieCredits item = await TMDbClient.GetPersonMovieCreditsAsync(IdHelper.BruceWillis);
 
-            for (int index = 0; index < resp.Crew.Count; index++)
+            Assert.NotNull(item);
+            Assert.NotEmpty(item.Cast);
+            Assert.NotEmpty(item.Crew);
+
+            MovieRole cast = item.Cast.Single(s => s.CreditId == "52fe4329c3a36847f803f193");
+            MovieJob crew = item.Crew.Single(s => s.CreditId == "52fe432ec3a36847f8040603");
+
+            await Verify(new
             {
-                Assert.Equal(resp.Crew[index].Id, respItalian.Crew[index].Id);
-                Assert.Equal(resp.Crew[index].OriginalTitle, respItalian.Crew[index].OriginalTitle);
-
-                if (resp.Crew[index].Title != respItalian.Crew[index].Title)
-                    allTitlesIdentical = false;
-            }
-
-            Assert.False(allTitlesIdentical);
+                cast,
+                crew
+            });
         }
 
         [Fact]
-        public void TestPersonsGetPersonChanges()
+        public async Task TestGetPersonExternalIdsAsync()
         {
-            // Not all ChangeItem's have an iso_639_1
-            IgnoreMissingJson(" / iso_639_1", " / value");
+            ExternalIdsPerson item = await TMDbClient.GetPersonExternalIdsAsync(IdHelper.BruceWillis);
 
-            // FindAsync latest changed person
-            SearchContainer<ChangesListItem> latestChanges = Config.Client.GetChangesPeopleAsync().Sync();
-            int latestChanged = latestChanges.Results.Last().Id;
-
-            // Fetch changelog
-            DateTime lower = DateTime.UtcNow.AddDays(-14);
-            DateTime higher = DateTime.UtcNow;
-            List<Change> respRange = Config.Client.GetPersonChangesAsync(latestChanged, lower, higher).Result;
-
-            Assert.NotNull(respRange);
-            Assert.True(respRange.Count > 0);
-
-            // As TMDb works in days, we need to adjust our values also
-            lower = lower.AddDays(-1);
-            higher = higher.AddDays(1);
-
-            foreach (Change change in respRange)
-                foreach (ChangeItemBase changeItem in change.Items)
-                {
-                    DateTime date = changeItem.Time;
-                    Assert.True(lower <= date);
-                    Assert.True(date <= higher);
-                }
+            await Verify(item);
         }
 
         [Fact]
-        public void TestPersonsImages()
+        public async Task TestGetChangesPeopleAsync()
         {
-            // Get config
-            Config.Client.GetConfigAsync().Sync();
+            SearchContainer<ChangesListItem> latestChanges = await TMDbClient.GetPeopleChangesAsync();
 
-            // Get images
-            ProfileImages images = Config.Client.GetPersonImagesAsync(IdHelper.BruceWillis).Result;
-
-            Assert.NotNull(images);
-            Assert.NotNull(images.Profiles);
-            Assert.Equal(IdHelper.BruceWillis, images.Id);
-
-            // Test image url generator
-            TestImagesHelpers.TestImages(Config, images);
-
-            ImageData image = images.Profiles.SingleOrDefault(s => s.FilePath == "/kI1OluWhLJk3pnR19VjOfABpnTY.jpg");
-
-            Assert.NotNull(image);
-            Assert.True(Math.Abs(0.666666666666667 - image.AspectRatio) < double.Epsilon);
-            Assert.True(TestImagesHelpers.TestImagePath(image.FilePath), "image.FilePath was not a valid image path, was: " + image.FilePath);
-            Assert.Equal(1500, image.Height);
-            Assert.Null(image.Iso_639_1);
-            Assert.Equal(1000, image.Width);
-            Assert.True(image.VoteAverage > 0);
-            Assert.True(image.VoteCount > 0);
+            Assert.NotEmpty(latestChanges.Results);
         }
 
         [Fact]
-        public void TestPersonsTaggedImages()
+        public async Task TestGetPersonImagesAsync()
         {
-            // Get config
-            Config.Client.GetConfigAsync().Sync();
+            ProfileImages images = await TMDbClient.GetPersonImagesAsync(IdHelper.BruceWillis);
 
-            // Get images
-            TestHelpers.SearchPages(i => Config.Client.GetPersonTaggedImagesAsync(IdHelper.BruceWillis, i).Result);
+            ImageData image = images.Profiles.Single(s => s.FilePath == "/cPP5y15p6iU83MxQ3tEcbr5hqNR.jpg");
+            await Verify(image);
 
-            SearchContainer<TaggedImage> images = Config.Client.GetPersonTaggedImagesAsync(IdHelper.BruceWillis, 1).Result;
+            TestImagesHelpers.TestImagePaths(images.Profiles);
+        }
 
-            Assert.NotNull(images);
-            Assert.NotNull(images.Results);
+        [Fact]
+        public async Task TestPersonsTaggedImagesAsync()
+        {
+            SearchContainer<TaggedImage> images = await TMDbClient.GetPersonTaggedImagesAsync(IdHelper.BruceWillis, 1);
 
-            TaggedImage image = images.Results.SingleOrDefault(s => s.FilePath == "/my81Hjt7NpZhaMX9bHi4wVhFy0v.jpg");
+            Assert.NotEmpty(images.Results);
 
-            Assert.NotNull(image);
-            Assert.True(Math.Abs(1.77777777777778 - image.AspectRatio) < double.Epsilon);
-            Assert.True(TestImagesHelpers.TestImagePath(image.FilePath), "image.FilePath was not a valid image path, was: " + image.FilePath);
-            Assert.Equal(1080, image.Height);
-            Assert.Equal("4ea5d0792c058837cb000431", image.Id);
-            Assert.Null(image.Iso_639_1);
-            Assert.True(image.VoteAverage > 0);
-            Assert.True(image.VoteCount > 0);
-            Assert.Equal(1920, image.Width);
-            Assert.Equal("backdrop", image.ImageType);
-            Assert.Equal(MediaType.Movie, image.MediaType);
+            TestImagesHelpers.TestImagePaths(images.Results);
+
+            TaggedImage image = images.Results.Single(s => s.FilePath == "/svIDTNUoajS8dLEo7EosxvyAsgJ.jpg");
 
-            Assert.NotNull(image.Media);
             Assert.IsType<SearchMovie>(image.Media);
-
-            SearchMovie mediaBase = (SearchMovie)image.Media;
-            Assert.Equal(false, mediaBase.Adult);
-            Assert.True(TestImagesHelpers.TestImagePath(mediaBase.BackdropPath), "image.Media.BackdropPath was not a valid image path, was: " + mediaBase.BackdropPath);
-            Assert.Equal(187, mediaBase.Id);
-            Assert.Equal("en", mediaBase.OriginalLanguage);
-            Assert.Equal("Sin City", mediaBase.OriginalTitle);
-            Assert.Equal("Welcome to Sin City. This town beckons to the tough, the corrupt, the brokenhearted. Some call it dark… Hard-boiled. Then there are those who call it home — Crooked cops, sexy dames, desperate vigilantes. Some are seeking revenge, others lust after redemption, and then there are those hoping for a little of both. A universe of unlikely and reluctant heroes still trying to do the right thing in a city that refuses to care.", mediaBase.Overview);
-            Assert.Equal(new DateTime(2005, 3, 31), mediaBase.ReleaseDate);
-            Assert.True(TestImagesHelpers.TestImagePath(mediaBase.PosterPath), "image.Media.PosterPath was not a valid image path, was: " + mediaBase.PosterPath);
-            Assert.True(mediaBase.Popularity > 0);
-            Assert.Equal("Sin City", mediaBase.Title);
-            Assert.Equal(false, mediaBase.Video);
-            Assert.True(mediaBase.VoteAverage > 0);
-            Assert.True(mediaBase.VoteCount > 0);
-
-            Assert.NotNull(mediaBase.GenreIds);
-            Assert.Equal(3, mediaBase.GenreIds.Count);
-            Assert.True(mediaBase.GenreIds.Contains(28));
-            Assert.True(mediaBase.GenreIds.Contains(53));
-            Assert.True(mediaBase.GenreIds.Contains(80));
+            await Verify(image);
         }
 
         [Fact]
-        public void TestPersonsList()
+        public async Task TestPersonsListAsync()
         {
             foreach (PersonListType type in Enum.GetValues(typeof(PersonListType)).OfType<PersonListType>())
             {
-                SearchContainer<PersonResult> list = Config.Client.GetPersonListAsync(type).Result;
+                SearchContainer<PersonResult> list = await TMDbClient.GetPersonListAsync(type);
 
-                Assert.NotNull(list);
-                Assert.True(list.Results.Count > 0);
-                Assert.Equal(1, list.Page);
-
-                SearchContainer<PersonResult> listPage2 = Config.Client.GetPersonListAsync(type, 2).Result;
-
-                Assert.NotNull(listPage2);
-                Assert.True(listPage2.Results.Count > 0);
-                Assert.Equal(2, listPage2.Page);
-
-                SearchContainer<PersonResult> list2 = Config.Client.GetPersonListAsync(type).Result;
-
-                Assert.NotNull(list2);
-                Assert.True(list2.Results.Count > 0);
-                Assert.Equal(1, list2.Page);
-
-                // At least one person should differ
-                Assert.True(list.Results.Any(s => list2.Results.Any(x => x.Name != s.Name)));
+                Assert.NotEmpty(list.Results);
             }
         }
 
         [Fact]
-        public void TestGetLatestPerson()
+        public async Task TestGetLatestPersonAsync()
         {
-            IgnoreMissingJson(" / changes", " / external_ids", " / images", " / movie_credits", " / tagged_images", " / tv_credits");
+            Person item = await TMDbClient.GetLatestPersonAsync();
 
-            Person item = Config.Client.GetLatestPersonAsync().Sync();
             Assert.NotNull(item);
         }
 
         [Fact]
-        public void TestGetTranslatedPerson()
+        public async Task TestGetTranslatedPersonAsync()
         {
-            IgnoreMissingCSharp("known_for_department / known_for_department");
-            IgnoreMissingJson(" / changes", " / external_ids", " / images", " / movie_credits", " / tagged_images", " / tv_credits");
-            Person person = Config.Client.GetPersonAsync(1019, "da").Result;
-            Assert.NotNull(person);
-            Assert.Equal("Mads Dittmann Mikkelsen, der er søn af fuldmægtig Henning Mikkelsen og hustru sygehjælper Bente Christiansen, voksede op på Nørrebro i København. I 11 år var han gymnast og gymnastikinstruktør i Gymnastikforeningen Gefion. Efter studentereksamen tilmeldte han sig et dansekursus for arbejdsløse. Det blev siden til otte års professionelt engagement i danseensemblet Mikado og han var to gange på Martha Grahams sommerskole i New York. Senere blev han også vikar for Vicky Leander på Daghøjskolen for dansk, drama og musik. Han blev skuespilleruddannet fra Århus Teaterskole i 1996 og debuterede som førsteelsker i \"Kunst\" på Århus Teater. Mads Mikkelsen har bl.a. stået på scenen i \"Paradis\" (1997), \"Længe siden\" (1999) og \"Fiaskospiralen\" (1999) på Dr. Dante’s Aveny samt \"Romeo og Julie\" (1998) på Østre Gasværk. Han filmdebuterede allerede i 1995 med en af hovedrollerne i novellefilmen \"Blomsterfangen\" I 1996 fik han sit store kunstneriske filmgennembrud som den kronragede slyngel Tonny i den banebrydende og meget rå film \"Pusher\". Han havde den ene af hovedrollerne i den danske film \"Vildspor\", rollen som Lenny i \"Bleeder\" og huskes som den våbengale Arne i Anders Thomas Jensens første spillefilm \"Blinkende Lygter\" (2000), der blev det helt store biografhit. I 2001 fik han også fænomenal succes i Hella Joofs biograffilm \"En kort, en lang\", hvor han spillede bøssen Jacob over for Troels Lyby. Siden 2005 har han haft international succes i film som \"King Arthur\" og især som storskurken Le Chiffre i James Bond- filmen \"Casino Royale\" fra 2006. I DR\'s politiserie \"Rejseholdet\" fik han sit folkelige gennembrud som politimanden Allan Fischer. Han er bror til skuespilleren Lars Mikkelsen. Mads Mikkelsen blev den 2. december 2000 gift med danserinde og koreograf Hanne Jacobsen (13-01-1961) og sammen har de to børn.", person.Biography);
+            Person person = await TMDbClient.GetPersonAsync(IdHelper.BruceWillis, "da");
+
+            await Verify(person);
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/ClientReviewTests.cs b/TMDbLibTests/ClientReviewTests.cs
index 5f9ff52..0911350 100644
--- a/TMDbLibTests/ClientReviewTests.cs
+++ b/TMDbLibTests/ClientReviewTests.cs
@@ -1,6 +1,6 @@
-using Xunit;
+using System.Threading.Tasks;
+using Xunit;
 using TMDbLib.Objects.Reviews;
-using TMDbLib.Objects.General;
 using TMDbLibTests.Helpers;
 using TMDbLibTests.JsonHelpers;
 
@@ -9,25 +9,17 @@ namespace TMDbLibTests
     public class ClientReviewTests : TestBase
     {
         [Fact]
-        public void TestReviewFullDetails()
+        public async Task TestReviewFullDetails()
         {
-            Review review = Config.Client.GetReviewAsync(IdHelper.TheDarkKnightRisesReviewId).Result;
+            Review review = await TMDbClient.GetReviewAsync(IdHelper.TheDarkKnightRisesReviewId);
 
-            Assert.NotNull(review);
-
-            Assert.Equal(IdHelper.TheDarkKnightRisesReviewId, review.Id);
-            Assert.Equal(49026, review.MediaId);
-            Assert.Equal("The Dark Knight Rises", review.MediaTitle);
-            Assert.Equal("Travis Bell", review.Author);
-            Assert.Equal("en", review.Iso_639_1);
-            Assert.Equal("https://www.themoviedb.org/review/5010553819c2952d1b000451", review.Url);
-            Assert.Equal(MediaType.Movie, review.MediaType);
+            await Verify(review);
         }
 
         [Fact]
-        public void TestReviewMissing()
+        public async Task TestReviewMissing()
         {
-            Review review = Config.Client.GetReviewAsync(IdHelper.MissingID.ToString()).Result;
+            Review review = await TMDbClient.GetReviewAsync(IdHelper.MissingID.ToString());
 
             Assert.Null(review);
         }
diff --git a/TMDbLibTests/ClientSearchTests.cs b/TMDbLibTests/ClientSearchTests.cs
index 4a374bf..719ea8a 100644
--- a/TMDbLibTests/ClientSearchTests.cs
+++ b/TMDbLibTests/ClientSearchTests.cs
@@ -1,8 +1,8 @@
-using System;
-using Xunit;
+using Xunit;
 using TMDbLib.Objects.General;
 using TMDbLib.Objects.Search;
 using System.Linq;
+using System.Threading.Tasks;
 using TMDbLibTests.Helpers;
 using TMDbLibTests.JsonHelpers;
 
@@ -11,194 +11,94 @@ namespace TMDbLibTests
     public class ClientSearchTests : TestBase
     {
         [Fact]
-        public void TestSearchMovie()
+        public async Task TestSearchMovieAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
-
-            TestHelpers.SearchPages(i => Config.Client.SearchMovieAsync("007", i).Result);
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.SearchMovieAsync("007", i));
 
             // Search pr. Year
             // 1962: First James Bond movie, "Dr. No"
-            SearchContainer<SearchMovie> result = Config.Client.SearchMovieAsync("007", year: 1962).Result;
+            SearchContainer<SearchMovie> result = await TMDbClient.SearchMovieAsync("007", year: 1962);
+            SearchMovie item = result.Results.Single(s => s.Id == 646);
 
-            Assert.True(result.Results.Any());
-            SearchMovie item = result.Results.SingleOrDefault(s => s.Id == 646);
+            await Verify(item);
 
-            Assert.NotNull(item);
-            Assert.Equal(646, item.Id);
-            Assert.Equal(false, item.Adult);
-            Assert.True(TestImagesHelpers.TestImagePath(item.BackdropPath), "item.BackdropPath was not a valid image path, was: " + item.BackdropPath);
-            Assert.Equal("en", item.OriginalLanguage);
-            Assert.Equal("Dr. No", item.OriginalTitle);
-            Assert.Equal("In the film that launched the James Bond saga, Agent 007 battles mysterious Dr. No, a scientific genius bent on destroying the U.S. space program. As the countdown to disaster begins, Bond must go to Jamaica, where he encounters beautiful Honey Ryder, to confront a megalomaniacal villain in his massive island headquarters.", item.Overview);
-            Assert.Equal(false, item.Video);
-            Assert.True(TestImagesHelpers.TestImagePath(item.PosterPath), "item.PosterPath was not a valid image path, was: " + item.PosterPath);
-            Assert.Equal(new DateTime(1962, 10, 4), item.ReleaseDate);
-            Assert.Equal("Dr. No", item.Title);
-            Assert.True(item.Popularity > 0);
-            Assert.True(item.VoteAverage > 0);
-            Assert.True(item.VoteCount > 0);
-
-            Assert.NotNull(item.GenreIds);
-            Assert.True(item.GenreIds.Contains(12));
-            Assert.True(item.GenreIds.Contains(28));
-            Assert.True(item.GenreIds.Contains(53));
+            TestImagesHelpers.TestImagePaths(new[] { item.BackdropPath, item.PosterPath });
         }
 
         [Fact]
-        public void TestSearchCollection()
+        public async Task TestSearchCollectionAsync()
         {
-            TestHelpers.SearchPages(i => Config.Client.SearchCollectionAsync("007", i).Result);
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.SearchCollectionAsync("007", i));
 
-            SearchContainer<SearchCollection> result = Config.Client.SearchCollectionAsync("James Bond").Result;
+            SearchContainer<SearchCollection> result = await TMDbClient.SearchCollectionAsync("James Bond");
+            SearchCollection item = result.Results.Single(s => s.Id == 645);
 
-            Assert.True(result.Results.Any());
-            SearchCollection item = result.Results.SingleOrDefault(s => s.Id == 645);
+            await Verify(item);
 
-            Assert.NotNull(item);
-            Assert.Equal(645, item.Id);
-            Assert.Equal("James Bond Collection", item.Name);
-            Assert.True(TestImagesHelpers.TestImagePath(item.BackdropPath), "item.BackdropPath was not a valid image path, was: " + item.BackdropPath);
-            Assert.True(TestImagesHelpers.TestImagePath(item.PosterPath), "item.PosterPath was not a valid image path, was: " + item.PosterPath);
+            TestImagesHelpers.TestImagePaths(new[] { item.BackdropPath, item.PosterPath });
         }
 
         [Fact]
-        public void TestSearchPerson()
+        public async Task TestSearchPersonAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.SearchPersonAsync("Willis", i));
 
-            TestHelpers.SearchPages(i => Config.Client.SearchPersonAsync("Willis", i).Result);
+            SearchContainer<SearchPerson> result = await TMDbClient.SearchPersonAsync("Willis");
+            SearchPerson item = result.Results.Single(s => s.Id == 62);
 
-            SearchContainer<SearchPerson> result = Config.Client.SearchPersonAsync("Willis").Result;
+            await Verify(item);
 
-            Assert.True(result.Results.Any());
-            SearchPerson item = result.Results.SingleOrDefault(s => s.Id == 62);
-
-            Assert.NotNull(item);
-            Assert.Equal(62, item.Id);
-            Assert.Equal("Bruce Willis", item.Name);
-            Assert.True(TestImagesHelpers.TestImagePath(item.ProfilePath), "item.ProfilePath was not a valid image path, was: " + item.ProfilePath);
-            Assert.Equal(false, item.Adult);
-            Assert.True(item.Popularity > 0);
-
-            Assert.NotNull(item.KnownFor);
-            Assert.True(item.KnownFor.Any(s => s.Id == 680));
+            TestImagesHelpers.TestImagePaths(new[] { item.ProfilePath });
         }
 
         [Fact]
-        public void TestSearchList()
+        public async Task TestSearchCompanyAsync()
         {
-            TestHelpers.SearchPages(i => Config.Client.SearchListAsync("to watch", i).Result);
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.SearchCompanyAsync("20th", i));
 
-            SearchContainer<SearchList> result = Config.Client.SearchListAsync("to watch").Result;
+            SearchContainer<SearchCompany> result = await TMDbClient.SearchCompanyAsync("20th");
+            SearchCompany item = result.Results.Single(s => s.Id == 25);
 
-            Assert.True(result.Results.Any());
-            SearchList item = result.Results.SingleOrDefault(s => s.Id == "54a5c0ceaed56c28c300013a");
+            await Verify(item);
 
-            Assert.NotNull(item);
-            Assert.Equal("to watch", item.Description);
-            Assert.Equal("54a5c0ceaed56c28c300013a", item.Id);
-            Assert.Equal("en", item.Iso_639_1);
-            Assert.Equal("movie", item.ListType);
-            Assert.Equal("Movies", item.Name);
-            Assert.True(TestImagesHelpers.TestImagePath(item.PosterPath), "item.PosterPath was not a valid image path, was: " + item.PosterPath);
-            Assert.True(item.FavoriteCount > 0);
-            Assert.True(item.ItemCount > 0);
+            TestImagesHelpers.TestImagePaths(new[] { item.LogoPath });
         }
 
         [Fact]
-        public void TestSearchCompany()
+        public async Task TestSearchKeywordAsync()
         {
-            TestHelpers.SearchPages(i => Config.Client.SearchCompanyAsync("20th", i).Result);
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.SearchKeywordAsync("plot", i));
 
-            SearchContainer<SearchCompany> result = Config.Client.SearchCompanyAsync("20th").Result;
+            SearchContainer<SearchKeyword> result = await TMDbClient.SearchKeywordAsync("plot");
+            SearchKeyword item = result.Results.Single(s => s.Id == 11121);
 
-            Assert.True(result.Results.Any());
-            SearchCompany item = result.Results.SingleOrDefault(s => s.Id == 25);
-
-            Assert.NotNull(item);
-            Assert.Equal(25, item.Id);
-            Assert.True(TestImagesHelpers.TestImagePath(item.LogoPath), "item.LogoPath was not a valid image path, was: " + item.LogoPath);
-            Assert.Equal("20th Century Fox", item.Name);
+            await Verify(item);
         }
 
         [Fact]
-        public void TestSearchKeyword()
+        public async Task TestSearchTvShowAsync()
         {
-            TestHelpers.SearchPages(i => Config.Client.SearchKeywordAsync("plot", i).Result);
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.SearchTvShowAsync("Breaking Bad", i));
 
-            SearchContainer<SearchKeyword> result = Config.Client.SearchKeywordAsync("plot").Result;
+            SearchContainer<SearchTv> result = await TMDbClient.SearchTvShowAsync("Breaking Bad");
+            SearchTv item = result.Results.Single(s => s.Id == 1396);
 
-            Assert.True(result.Results.Any());
-            SearchKeyword item = result.Results.SingleOrDefault(s => s.Id == 11121);
-
-            Assert.NotNull(item);
-            Assert.Equal(11121, item.Id);
-            Assert.Equal("plot", item.Name);
+            await Verify(item);
+            
+            TestImagesHelpers.TestImagePaths(new[] { item.BackdropPath, item.PosterPath });
         }
 
         [Fact]
-        public void TestSearchTvShow()
+        public async Task TestSearchMultiAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.SearchMultiAsync("Arrow", i));
 
-            TestHelpers.SearchPages(i => Config.Client.SearchTvShowAsync("Breaking Bad", i).Result);
+            SearchContainer<SearchBase> result = await TMDbClient.SearchMultiAsync("Arrow");
+            SearchTv item = result.Results.OfType<SearchTv>().Single(s => s.Id == 1412);
 
-            SearchContainer<SearchTv> result = Config.Client.SearchTvShowAsync("Breaking Bad").Result;
-
-            Assert.True(result.Results.Any());
-            SearchTv item = result.Results.SingleOrDefault(s => s.Id == 1396);
-
-            Assert.NotNull(item);
-            Assert.Equal(1396, item.Id);
-            Assert.True(TestImagesHelpers.TestImagePath(item.BackdropPath), "item.BackdropPath was not a valid image path, was: " + item.BackdropPath);
-            Assert.Equal(new DateTime(2008, 1, 19), item.FirstAirDate);
-            Assert.Equal("Breaking Bad", item.Name);
-            Assert.Equal("Breaking Bad", item.OriginalName);
-            Assert.Equal("en", item.OriginalLanguage);
-            Assert.True(TestImagesHelpers.TestImagePath(item.PosterPath), "item.PosterPath was not a valid image path, was: " + item.PosterPath);
-            Assert.Equal("Breaking Bad is an American crime drama television series created and produced by Vince Gilligan. Set and produced in Albuquerque, New Mexico, Breaking Bad is the story of Walter White, a struggling high school chemistry teacher who is diagnosed with inoperable lung cancer at the beginning of the series. He turns to a life of crime, producing and selling methamphetamine, in order to secure his family's financial future before he dies, teaming with his former student, Jesse Pinkman. Heavily serialized, the series is known for positioning its characters in seemingly inextricable corners and has been labeled a contemporary western by its creator.", item.Overview);
-            Assert.True(item.Popularity > 0);
-            Assert.True(item.VoteAverage > 0);
-            Assert.True(item.VoteCount > 0);
-
-            Assert.NotNull(item.GenreIds);
-            Assert.Equal(1, item.GenreIds.Count);
-            Assert.Equal(18, item.GenreIds[0]);
-
-            Assert.NotNull(item.OriginCountry);
-            Assert.Equal(1, item.OriginCountry.Count);
-            Assert.Equal("US", item.OriginCountry[0]);
-        }
-
-        [Fact]
-        public void TestSearchMulti()
-        {
-            TestHelpers.SearchPages(i => Config.Client.SearchMultiAsync("Arrow", i).Result);
-
-            SearchContainer<SearchBase> result = Config.Client.SearchMultiAsync("Arrow").Result;
-
-            Assert.True(result.Results.Any());
-            SearchTv item = result.Results.OfType<SearchTv>().SingleOrDefault(s => s.Id == 1412);
-
-            Assert.NotNull(item);
-            Assert.Equal(1412, item.Id);
-            Assert.True(TestImagesHelpers.TestImagePath(item.BackdropPath), "item.BackdropPath was not a valid image path, was: " + item.BackdropPath);
-            Assert.Equal(new DateTime(2012, 10, 10), item.FirstAirDate);
-            Assert.Equal(MediaType.Tv, item.MediaType);
-            Assert.Equal("Arrow", item.Name);
-            Assert.Equal("Arrow", item.OriginalName);
-            Assert.True(TestImagesHelpers.TestImagePath(item.PosterPath), "item.PosterPath was not a valid image path, was: " + item.PosterPath);
-            Assert.True(item.Popularity > 0);
-            Assert.True(item.VoteAverage > 0);
-            Assert.True(item.VoteCount > 0);
-
-            Assert.NotNull(item.OriginCountry);
-            Assert.Equal(1, item.OriginCountry.Count);
-            Assert.True(item.OriginCountry.Contains("US"));
+            await Verify(item);
+            
+            TestImagesHelpers.TestImagePaths(new[] { item.BackdropPath, item.PosterPath });
         }
     }
 }
diff --git a/TMDbLibTests/ClientTests.cs b/TMDbLibTests/ClientTests.cs
index e8e70a5..f60e64b 100644
--- a/TMDbLibTests/ClientTests.cs
+++ b/TMDbLibTests/ClientTests.cs
@@ -13,31 +13,31 @@ namespace TMDbLibTests
     public class ClientTests : TestBase
     {
         [Fact]
-        public void GetConfigTest()
+        public async Task GetConfigTest()
         {
-            Assert.False(Config.Client.HasConfig);
-            Config.Client.GetConfigAsync().Sync();
-            Assert.True(Config.Client.HasConfig);
+            Assert.False(TMDbClient.HasConfig);
+            await TMDbClient.GetConfigAsync();
+            Assert.True(TMDbClient.HasConfig);
 
-            Assert.NotNull(Config.Client.Config);
+            await Verify(TMDbClient.Config);
         }
 
         [Fact]
-        public void GetConfigSslTest()
+        public async Task GetConfigSslTest()
         {
             TestConfig config = new TestConfig(true);
 
             Assert.False(config.Client.HasConfig);
-            config.Client.GetConfigAsync().Sync();
+            await config.Client.GetConfigAsync();
             Assert.True(config.Client.HasConfig);
 
-            Assert.NotNull(config.Client.Config);
+            await Verify(config.Client.Config);
         }
 
         [Fact]
         public void GetConfigFailTest()
         {
-            Assert.Throws<InvalidOperationException>(() => Config.Client.Config);
+            Assert.Throws<InvalidOperationException>(() => TMDbClient.Config);
         }
 
         [Fact]
@@ -49,53 +49,65 @@ namespace TMDbLibTests
             config.Images = new ConfigImageTypes();
             config.Images.BaseUrl = " ..";
 
-            Assert.False(Config.Client.HasConfig);
-            Config.Client.SetConfig(config);
-            Assert.True(Config.Client.HasConfig);
+            Assert.False(TMDbClient.HasConfig);
+            TMDbClient.SetConfig(config);
+            Assert.True(TMDbClient.HasConfig);
 
-            Assert.Same(config, Config.Client.Config);
+            Assert.Same(config, TMDbClient.Config);
         }
 
         [Fact]
-        public void ClientConstructorUrlTest()
+        public async Task ClientConstructorUrlTest()
         {
             TMDbClient clientA = new TMDbClient(TestConfig.APIKey, false, "http://api.themoviedb.org") { MaxRetryCount = 2 };
-            clientA.GetConfigAsync().Sync();
+            await clientA.GetConfigAsync();
 
             TMDbClient clientB = new TMDbClient(TestConfig.APIKey, true, "http://api.themoviedb.org") { MaxRetryCount = 2 };
-            clientB.GetConfigAsync().Sync();
+            await clientB.GetConfigAsync();
 
             TMDbClient clientC = new TMDbClient(TestConfig.APIKey, false, "https://api.themoviedb.org") { MaxRetryCount = 2 };
-            clientC.GetConfigAsync().Sync();
+            await clientC.GetConfigAsync();
 
             TMDbClient clientD = new TMDbClient(TestConfig.APIKey, true, "https://api.themoviedb.org") { MaxRetryCount = 2 };
-            clientD.GetConfigAsync().Sync();
+            await clientD.GetConfigAsync();
         }
 
         [Fact]
         public void ClientSetBadMaxRetryValue()
         {
-            TMDbClient client = new TMDbClient(TestConfig.APIKey);
-
-            Assert.Throws<ArgumentOutOfRangeException>(() => client.MaxRetryCount = -1);
+            Assert.Throws<ArgumentOutOfRangeException>(() => TMDbClient.MaxRetryCount = -1);
         }
 
         [Fact]
-        public void ClientRateLimitTest()
+        public async Task ClientTestUrlGenerator()
         {
-            const int id = IdHelper.AGoodDayToDieHard;
+            await TMDbClient.GetConfigAsync();
 
-            TMDbClient client = new TMDbClient(TestConfig.APIKey);
+            Uri uri = TMDbClient.GetImageUrl("w92", "/2B7RySy2WMVJKKEFN2XA3IFb8w0.jpg");
+            Uri uriSsl = TMDbClient.GetImageUrl("w92", "/2B7RySy2WMVJKKEFN2XA3IFb8w0.jpg", true);
+
+            await Verify(new
+            {
+                uri,
+                uriSsl
+            });
+        }
+
+        [Fact(Skip = "Disabled till we can consistently reproduce a rate limit")]
+        public async Task ClientRateLimitTest()
+        {
+            TMDbClient client = TMDbClient;
             client.MaxRetryCount = 0;
 
-            Assert.Throws<RequestLimitExceededException>(() =>
+            await Assert.ThrowsAsync<RequestLimitExceededException>(async () =>
             {
                 try
                 {
-                    Parallel.For(0, 100, i =>
-                    {
-                        client.GetMovieAsync(id).Sync();
-                    });
+                    List<Task> tasks = new List<Task>(100);
+                    for (int i = 0; i < 100; i++)
+                        tasks.Add(client.GetMovieAsync(IdHelper.AGoodDayToDieHard));
+
+                    await Task.WhenAll(tasks);
                 }
                 catch (AggregateException ex)
                 {
diff --git a/TMDbLibTests/ClientTrendingTests.cs b/TMDbLibTests/ClientTrendingTests.cs
index f4aa4be..b22a19e 100644
--- a/TMDbLibTests/ClientTrendingTests.cs
+++ b/TMDbLibTests/ClientTrendingTests.cs
@@ -1,6 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Threading.Tasks;
+using TMDbLib.Objects.General;
+using TMDbLib.Objects.Search;
 using TMDbLib.Objects.Trending;
 using TMDbLibTests.JsonHelpers;
 using Xunit;
@@ -10,31 +10,24 @@ namespace TMDbLibTests
     public class ClientTrendingTests : TestBase
     {
         [Fact]
-        public void TestTrendingMovies()
+        public async Task TestTrendingMoviesAsync()
         {
-            IgnoreMissingJson("results[array] / media_type");
-
-            var movies = Config.Client.GetTrendingMoviesAsync(TimeWindow.Week).Result;
-            Assert.True(movies.Results.Count > 0);
+            SearchContainer<SearchMovie> movies = await TMDbClient.GetTrendingMoviesAsync(TimeWindow.Week);
+            Assert.NotEmpty(movies.Results);
         }
 
         [Fact]
-        public void TestTrendingTv()
+        public async Task TestTrendingTvAsync()
         {
-            IgnoreMissingJson("results[array] / media_type");
-
-            var tv = Config.Client.GetTrendingTvAsync(TimeWindow.Week).Result;
-            Assert.True(tv.Results.Count > 0);
+            SearchContainer<SearchTv> tv = await TMDbClient.GetTrendingTvAsync(TimeWindow.Week);
+            Assert.NotEmpty(tv.Results);
         }
 
         [Fact]
-        public void TestTrendingPeople()
+        public async Task TestTrendingPeopleAsync()
         {
-            IgnoreMissingCSharp("results[array].gender / gender", "results[array].known_for_department / known_for_department");
-            IgnoreMissingJson(" / popularity", "results[array] / media_type");
-
-            var people = Config.Client.GetTrendingPeopleAsync(TimeWindow.Week).Result;
-            Assert.True(people.Results.Count > 0);
+            SearchContainer<SearchPerson> people = await TMDbClient.GetTrendingPeopleAsync(TimeWindow.Week);
+            Assert.NotEmpty(people.Results);
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/ClientTvEpisodeGroupTests.cs b/TMDbLibTests/ClientTvEpisodeGroupTests.cs
index c3e6b73..a23e18f 100644
--- a/TMDbLibTests/ClientTvEpisodeGroupTests.cs
+++ b/TMDbLibTests/ClientTvEpisodeGroupTests.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Threading.Tasks;
 using TMDbLib.Objects.TvShows;
 using TMDbLibTests.JsonHelpers;
 using Xunit;
@@ -8,20 +8,11 @@ namespace TMDbLibTests
     public class ClientTvEpisodeGroupTests : TestBase
     {
         [Fact]
-        public void TestTvEpisodeGroups()
+        public async Task TestTvEpisodeGroups()
         {
-            var group = Config.Client.GetTvEpisodeGroupsAsync("5acf93e60e0a26346d0000ce");
+            TvGroupCollection group = await TMDbClient.GetTvEpisodeGroupsAsync("5acf93e60e0a26346d0000ce");
 
-            Assert.Equal("5acf93e60e0a26346d0000ce", group.Result.Id);
-            Assert.Equal("Netflix Collections", group.Result.Name);
-            Assert.Equal("Netflix", group.Result.Network.Name);
-            Assert.Equal("Comedians in Cars organized in Netflix's collections.", group.Result.Description);
-            Assert.Equal(71, group.Result.EpisodeCount);
-            Assert.Equal(5, group.Result.GroupCount);
-            Assert.Equal(TvGroupType.Digital, group.Result.Type);
-
-            Assert.Equal("5acf93efc3a368739a0000a9", group.Result.Groups.First().Id);
-            Assert.Equal(1078262, group.Result.Groups.First().Episodes.First().Id);
+            await Verify(group);
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/ClientTvEpisodeTests.cs b/TMDbLibTests/ClientTvEpisodeTests.cs
index 6419d4b..76bcb94 100644
--- a/TMDbLibTests/ClientTvEpisodeTests.cs
+++ b/TMDbLibTests/ClientTvEpisodeTests.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
+using System.Threading.Tasks;
 using Xunit;
 using TMDbLib.Objects.Authentication;
 using TMDbLib.Objects.Changes;
@@ -15,11 +15,11 @@ namespace TMDbLibTests
 {
     public class ClientTvEpisodeTests : TestBase
     {
-        private static Dictionary<TvEpisodeMethods, Func<TvEpisode, object>> _methods;
+        private static readonly Dictionary<TvEpisodeMethods, Func<TvEpisode, object>> Methods;
 
-        public ClientTvEpisodeTests()
+        static ClientTvEpisodeTests()
         {
-            _methods = new Dictionary<TvEpisodeMethods, Func<TvEpisode, object>>
+            Methods = new Dictionary<TvEpisodeMethods, Func<TvEpisode, object>>
             {
                 [TvEpisodeMethods.Credits] = tvEpisode => tvEpisode.Credits,
                 [TvEpisodeMethods.Images] = tvEpisode => tvEpisode.Images,
@@ -30,258 +30,181 @@ namespace TMDbLibTests
         }
 
         [Fact]
-        public void TestTvEpisodeExtrasNone()
+        public async Task TestTvEpisodeExtrasNoneAsync()
         {
-            // We will intentionally ignore errors reg. missing JSON as we do not request it
-            IgnoreMissingJson(" / account_states", " / credits", " / external_ids", " / images", " / videos");
+            TvEpisode tvEpisode = await TMDbClient.GetTvEpisodeAsync(IdHelper.BreakingBad, 1, 1);
 
-            TvEpisode tvEpisode = Config.Client.GetTvEpisodeAsync(IdHelper.BreakingBad, 1, 1).Result;
-
-            TestBreakingBadSeasonOneEpisodeOneBaseProperties(tvEpisode);
+            await Verify(tvEpisode);
 
             // Test all extras, ensure none of them are populated
-            foreach (Func<TvEpisode, object> selector in _methods.Values)
+            foreach (Func<TvEpisode, object> selector in Methods.Values)
             {
                 Assert.Null(selector(tvEpisode));
             }
         }
 
         [Fact]
-        public void TestTvEpisodeExtrasAccountState()
+        public async Task TestTvEpisodeExtrasAccountState()
         {
-            // We will intentionally ignore errors reg. missing JSON as we do not request it
-            IgnoreMissingJson(" / credits", " / external_ids", " / images", " / videos");
-
             // Test the custom parsing code for Account State rating
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            TvEpisode episode = Config.Client.GetTvEpisodeAsync(IdHelper.BigBangTheory, 1, 1, TvEpisodeMethods.AccountStates).Result;
+            TvEpisode episode = await TMDbClient.GetTvEpisodeAsync(IdHelper.BigBangTheory, 1, 1, TvEpisodeMethods.AccountStates);
             if (episode.AccountStates == null || !episode.AccountStates.Rating.HasValue)
             {
-                Config.Client.TvEpisodeSetRatingAsync(IdHelper.BigBangTheory, 1, 1, 5).Sync();
+                await TMDbClient.TvEpisodeSetRatingAsync(IdHelper.BigBangTheory, 1, 1, 5);
 
                 // Allow TMDb to update cache
-                Thread.Sleep(2000);
+                await Task.Delay(2000);
 
-                episode = Config.Client.GetTvEpisodeAsync(IdHelper.BigBangTheory, 1, 1, TvEpisodeMethods.AccountStates).Result;
+                episode = await TMDbClient.GetTvEpisodeAsync(IdHelper.BigBangTheory, 1, 1, TvEpisodeMethods.AccountStates);
             }
 
-            Assert.NotNull(episode.AccountStates);
-            Assert.True(episode.AccountStates.Rating.HasValue);
-            Assert.True(Math.Abs(episode.AccountStates.Rating.Value - 5) < double.Epsilon);
+            await Verify(episode);
         }
 
         [Fact]
-        public void TestTvEpisodeExtrasAll()
+        public async Task TestTvEpisodeExtrasAll()
         {
-            IgnoreMissingJson("credits / id", "external_ids / id", "images / id", "videos / id");
-
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
             // Account states will only show up if we've done something
-            Config.Client.TvEpisodeSetRatingAsync(IdHelper.BreakingBad, 1, 1, 5).Sync();
+            await TMDbClient.TvEpisodeSetRatingAsync(IdHelper.FullerHouse, 1, 1, 5);
 
-            TvEpisodeMethods combinedEnum = _methods.Keys.Aggregate((methods, tvEpisodeMethods) => methods | tvEpisodeMethods);
-            TvEpisode tvEpisode = Config.Client.GetTvEpisodeAsync(IdHelper.BreakingBad, 1, 1, combinedEnum).Result;
-
-            TestBreakingBadSeasonOneEpisodeOneBaseProperties(tvEpisode);
-
-            Assert.NotNull(tvEpisode.Images);
-            Assert.NotNull(tvEpisode.Images.Stills);
-            Assert.True(tvEpisode.Images.Stills.Count > 0);
-
-            TestMethodsHelper.TestAllNotNull(_methods, tvEpisode);
+            await TestMethodsHelper.TestGetAll(Methods, combined => TMDbClient.GetTvEpisodeAsync(IdHelper.FullerHouse, 1, 1, combined), async tvEpisode =>
+                {
+                    await Verify(tvEpisode);
+                });
         }
 
         [Fact]
-        public void TestTvEpisodeExtrasExclusive()
+        public async Task TestTvEpisodeExtrasExclusiveAsync()
         {
-            IgnoreMissingJson(" / account_states", " / credits", " / external_ids", " / images", " / videos", "credits / id", "external_ids / id", "images / id", "videos / id");
-
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            TestMethodsHelper.TestGetExclusive(_methods, (id, extras) => Config.Client.GetTvEpisodeAsync(id, 1, 1, extras).Result, IdHelper.BreakingBad);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
+            await TestMethodsHelper.TestGetExclusive(Methods, extras => TMDbClient.GetTvEpisodeAsync(IdHelper.BreakingBad, 1, 1, extras));
         }
 
         [Fact]
-        public void TestTvEpisodeSeparateExtrasCredits()
+        public async Task TestTvEpisodeSeparateExtrasCreditsAsync()
         {
-            CreditsWithGuestStars credits = Config.Client.GetTvEpisodeCreditsAsync(IdHelper.BreakingBad, 1, 1).Result;
+            CreditsWithGuestStars credits = await TMDbClient.GetTvEpisodeCreditsAsync(IdHelper.BreakingBad, 1, 1);
             Assert.NotNull(credits);
 
             Cast guestStarItem = credits.GuestStars.FirstOrDefault(s => s.Id == 92495);
-            Assert.Equal(92495, guestStarItem.Id);
-            Assert.Equal("Emilio Koyama", guestStarItem.Character);
-            Assert.Equal("52542273760ee3132800068e", guestStarItem.CreditId);
-            Assert.Equal("John Koyama", guestStarItem.Name);
-            Assert.NotNull(guestStarItem.ProfilePath);
-            Assert.Equal(1, guestStarItem.Order);
-
             Cast castItem = credits.Cast.FirstOrDefault(s => s.Id == 17419);
-            Assert.Equal(17419, castItem.Id);
-            Assert.Equal("Walter White", castItem.Character);
-            Assert.Equal("52542282760ee313280017f9", castItem.CreditId);
-            Assert.Equal("Bryan Cranston", castItem.Name);
-            Assert.NotNull(castItem.ProfilePath);
-            Assert.Equal(0, castItem.Order);
-
             Crew crewItem = credits.Crew.FirstOrDefault(s => s.Id == 1280071);
-            Assert.NotNull(crewItem);
-            Assert.Equal(1280071, crewItem.Id);
-            Assert.Equal("Editing", crewItem.Department);
-            Assert.Equal("Lynne Willingham", crewItem.Name);
-            Assert.Equal("Editor", crewItem.Job);
-            Assert.Null(crewItem.ProfilePath);
+
+            await Verify(new
+            {
+                guestStarItem,
+                castItem,
+                crewItem
+            });
         }
 
         [Fact]
-        public void TestTvEpisodeSeparateExtrasExternalIds()
+        public async Task TestTvEpisodeSeparateExtrasExternalIdsAsync()
         {
-            ExternalIdsTvEpisode externalIds = Config.Client.GetTvEpisodeExternalIdsAsync(IdHelper.BreakingBad, 1, 1).Result;
+            ExternalIdsTvEpisode externalIds = await TMDbClient.GetTvEpisodeExternalIdsAsync(IdHelper.BreakingBad, 1, 1);
 
-            Assert.NotNull(externalIds);
-            Assert.True(string.IsNullOrEmpty(externalIds.FreebaseId));
-            Assert.Equal(62085, externalIds.Id);
-            Assert.Equal("/m/03mb620", externalIds.FreebaseMid);
-            Assert.Equal("tt0959621", externalIds.ImdbId);
-            Assert.Equal("637041", externalIds.TvrageId);
-            Assert.Equal("349232", externalIds.TvdbId);
+            await Verify(externalIds);
         }
 
         [Fact]
-        public void TestTvEpisodeSeparateExtrasImages()
+        public async Task TestTvEpisodeSeparateExtrasImagesAsync()
         {
-            StillImages images = Config.Client.GetTvEpisodeImagesAsync(IdHelper.BreakingBad, 1, 1).Result;
-            Assert.NotNull(images);
-            Assert.NotNull(images.Stills);
+            StillImages images = await TMDbClient.GetTvEpisodeImagesAsync(IdHelper.BreakingBad, 1, 1);
+
+            await Verify(images);
         }
 
         [Fact]
-        public void TestTvEpisodeSeparateExtrasVideos()
+        public async Task TestTvEpisodeSeparateExtrasVideosAsync()
         {
-            ResultContainer<Video> images = Config.Client.GetTvEpisodeVideosAsync(IdHelper.BreakingBad, 1, 1).Result;
-            Assert.NotNull(images);
-            Assert.NotNull(images.Results);
+            ResultContainer<Video> images = await TMDbClient.GetTvEpisodeVideosAsync(IdHelper.BreakingBad, 1, 1);
+            
+            await Verify(images);
         }
 
         [Fact]
-        public void TestTvEpisodeAccountStateRatingSet()
+        public async Task TestTvEpisodeAccountStateRatingSetAsync()
         {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            TvEpisodeAccountState accountState = Config.Client.GetTvEpisodeAccountStateAsync(IdHelper.BreakingBad, 1, 1).Result;
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
+            TvEpisodeAccountState accountState = await TMDbClient.GetTvEpisodeAccountStateAsync(IdHelper.BreakingBad, 1, 1);
 
             // Remove the rating
             if (accountState.Rating.HasValue)
             {
-                Assert.True(Config.Client.TvEpisodeRemoveRatingAsync(IdHelper.BreakingBad, 1, 1).Result);
+                Assert.True(await TMDbClient.TvEpisodeRemoveRatingAsync(IdHelper.BreakingBad, 1, 1));
 
                 // Allow TMDb to cache our changes
-                Thread.Sleep(2000);
+                await Task.Delay(2000);
             }
 
             // Test that the episode is NOT rated
-            accountState = Config.Client.GetTvEpisodeAccountStateAsync(IdHelper.BreakingBad, 1, 1).Result;
+            accountState = await TMDbClient.GetTvEpisodeAccountStateAsync(IdHelper.BreakingBad, 1, 1);
 
             Assert.Equal(IdHelper.BreakingBadSeason1Episode1Id, accountState.Id);
             Assert.False(accountState.Rating.HasValue);
 
             // Rate the episode
-            Assert.True(Config.Client.TvEpisodeSetRatingAsync(IdHelper.BreakingBad, 1, 1, 5).Result);
+            Assert.True(await TMDbClient.TvEpisodeSetRatingAsync(IdHelper.BreakingBad, 1, 1, 5));
 
             // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
+            await Task.Delay(2000);
 
             // Test that the episode IS rated
-            accountState = Config.Client.GetTvEpisodeAccountStateAsync(IdHelper.BreakingBad, 1, 1).Result;
+            accountState = await TMDbClient.GetTvEpisodeAccountStateAsync(IdHelper.BreakingBad, 1, 1);
             Assert.Equal(IdHelper.BreakingBadSeason1Episode1Id, accountState.Id);
             Assert.True(accountState.Rating.HasValue);
 
             // Remove the rating
-            Assert.True(Config.Client.TvEpisodeRemoveRatingAsync(IdHelper.BreakingBad, 1, 1).Result);
+            Assert.True(await TMDbClient.TvEpisodeRemoveRatingAsync(IdHelper.BreakingBad, 1, 1));
         }
 
         [Fact]
-        public void TestTvEpisodeRateBad()
+        public async Task TestTvEpisodeRateBadAsync()
         {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            Assert.False(Config.Client.TvEpisodeSetRatingAsync(IdHelper.BreakingBad, 1, 1, -1).Result);
-            Assert.False(Config.Client.TvEpisodeSetRatingAsync(IdHelper.BreakingBad, 1, 1, 0).Result);
-            Assert.False(Config.Client.TvEpisodeSetRatingAsync(IdHelper.BreakingBad, 1, 1, 10.5).Result);
+            Assert.False(await TMDbClient.TvEpisodeSetRatingAsync(IdHelper.BreakingBad, 1, 1, -1));
+            Assert.False(await TMDbClient.TvEpisodeSetRatingAsync(IdHelper.BreakingBad, 1, 1, 0));
+            Assert.False(await TMDbClient.TvEpisodeSetRatingAsync(IdHelper.BreakingBad, 1, 1, 10.5));
         }
 
         [Fact]
-        public void TestTvEpisodeGetChanges()
+        public async Task TestTvEpisodeGetChangesAsync()
         {
-            ChangesContainer changes = Config.Client.GetTvEpisodeChangesAsync(IdHelper.BreakingBadSeason1Episode1Id).Result;
+            IList<Change> changes = await TMDbClient.GetTvEpisodeChangesAsync(IdHelper.BreakingBadSeason1Episode1Id);
+            
+            Assert.NotEmpty(changes);
 
-            Assert.NotNull(changes);
-            Assert.NotNull(changes.Changes);
-        }
-
-        private void TestBreakingBadSeasonOneEpisodeOneBaseProperties(TvEpisode tvEpisode)
-        {
-            Assert.Equal(62085, tvEpisode.Id);
-            Assert.True(tvEpisode.AirDate.HasValue);
-            Assert.Equal(new DateTime(2008, 1, 19), tvEpisode.AirDate.Value.Date);
-            Assert.Equal(1, tvEpisode.EpisodeNumber);
-            Assert.Equal("Pilot", tvEpisode.Name);
-            Assert.NotNull(tvEpisode.Overview);
-            Assert.Null(tvEpisode.ProductionCode);
-            Assert.Equal(1, tvEpisode.SeasonNumber);
-            Assert.NotNull(tvEpisode.StillPath);
-
-            Assert.NotNull(tvEpisode.Crew);
-            Crew crew = tvEpisode.Crew.SingleOrDefault(s => s.CreditId == "52542275760ee313280006ce");
-            Assert.NotNull(crew);
-
-            Assert.Equal(66633, crew.Id);
-            Assert.Equal("52542275760ee313280006ce", crew.CreditId);
-            Assert.Equal("Vince Gilligan", crew.Name);
-            Assert.Equal("Writing", crew.Department);
-            Assert.Equal("Writer", crew.Job);
-            Assert.True(TestImagesHelpers.TestImagePath(crew.ProfilePath), "crew.ProfilePath was not a valid image path, was: " + crew.ProfilePath);
-
-            Assert.NotNull(tvEpisode.GuestStars);
-            Cast star = tvEpisode.GuestStars.SingleOrDefault(s => s.CreditId == "52542273760ee3132800068e");
-            Assert.NotNull(star);
-
-            Assert.Equal(92495, star.Id);
-            Assert.Equal("John Koyama", star.Name);
-            Assert.Equal("52542273760ee3132800068e", star.CreditId);
-            Assert.Equal("Emilio Koyama", star.Character);
-            Assert.Equal(1, star.Order);
-            Assert.True(TestImagesHelpers.TestImagePath(star.ProfilePath), "star.ProfilePath was not a valid image path, was: " + star.ProfilePath);
+            await Verify(changes);
         }
 
         [Fact]
-        public void TestTvEpisodeMissing()
+        public async Task TestTvEpisodeMissingAsync()
         {
-            TvEpisode tvEpisode = Config.Client.GetTvEpisodeAsync(IdHelper.MissingID, 1, 1).Result;
+            TvEpisode tvEpisode = await TMDbClient.GetTvEpisodeAsync(IdHelper.MissingID, 1, 1);
 
             Assert.Null(tvEpisode);
         }
 
         [Fact]
-        public void TestTvEpisodesScreenedTheatrically()
+        public async Task TestTvEpisodesScreenedTheatricallyAsync()
         {
-            ResultContainer<TvEpisodeInfo> results = Config.Client.GetTvEpisodesScreenedTheatricallyAsync(IdHelper.GameOfThrones).Result;
+            ResultContainer<TvEpisodeInfo> results = await TMDbClient.GetTvEpisodesScreenedTheatricallyAsync(IdHelper.GameOfThrones);
+            TvEpisodeInfo single = results.Results.Single(s => s.Id == IdHelper.GameOfThronesSeason4Episode10);
 
-            Assert.Equal(IdHelper.GameOfThrones, results.Id);
-
-            TvEpisodeInfo single = results.Results.FirstOrDefault(s => s.Id == 63103);
-            Assert.NotNull(single);
-            Assert.Equal(4, single.SeasonNumber);
-            Assert.Equal(10, single.EpisodeNumber);
+            await Verify(single);
         }
-        
+
         [Fact]
-        public void TestTvEpisodeGetTvEpisodeWithImageLanguage()
+        public async Task TestTvEpisodeGetTvEpisodeWithImageLanguageAsync()
         {
-            IgnoreMissingJson(" / account_states", " / alternative_titles", " / changes", " / credits", " / content_ratings", " / genre_ids", "images / id", " / keywords", " / lists", " / release_dates", " / releases", " / reviews", " / show_id", " / similar", " / translations", " / videos", " / recommendations", " / external_ids");
+            TvEpisode resp = await TMDbClient.GetTvEpisodeAsync(IdHelper.BreakingBad, 1, 1, language: "en-US", includeImageLanguage: "en", extraMethods: TvEpisodeMethods.Images);
 
-            TvEpisode resp = Config.Client.GetTvEpisodeAsync(IdHelper.BreakingBad, 1, 1, language: "en-US", includeImageLanguage: "en", extraMethods: TvEpisodeMethods.Images).Result;
-
-            Assert.True(resp.Images.Stills.Count > 0);
+            await Verify(resp.Images);
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/ClientTvSeasonTests.cs b/TMDbLibTests/ClientTvSeasonTests.cs
index 1b87a14..fe22a1b 100644
--- a/TMDbLibTests/ClientTvSeasonTests.cs
+++ b/TMDbLibTests/ClientTvSeasonTests.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
+using System.Threading.Tasks;
 using Xunit;
 using TMDbLib.Objects.Authentication;
 using TMDbLib.Objects.Changes;
@@ -15,11 +15,11 @@ namespace TMDbLibTests
 {
     public class ClientTvSeasonTests : TestBase
     {
-        private static Dictionary<TvSeasonMethods, Func<TvSeason, object>> _methods;
+        private static readonly Dictionary<TvSeasonMethods, Func<TvSeason, object>> Methods;
 
-        public ClientTvSeasonTests()
+        static ClientTvSeasonTests()
         {
-            _methods = new Dictionary<TvSeasonMethods, Func<TvSeason, object>>
+            Methods = new Dictionary<TvSeasonMethods, Func<TvSeason, object>>
             {
                 [TvSeasonMethods.Credits] = tvSeason => tvSeason.Credits,
                 [TvSeasonMethods.Images] = tvSeason => tvSeason.Images,
@@ -31,46 +31,32 @@ namespace TMDbLibTests
         }
 
         [Fact]
-        public void TestTvSeasonExtrasNone()
+        public async Task TestTvSeasonExtrasNoneAsync()
         {
-            // TMDb is sending an extra property
-            IgnoreMissingCSharp("_id / _id");
+            TvSeason tvSeason = await TMDbClient.GetTvSeasonAsync(IdHelper.BreakingBad, 1);
 
-            // We will intentionally ignore errors reg. missing JSON as we do not request it
-            IgnoreMissingJson(" / images", " / account_states", " / credits", " / external_ids", " / images", " / videos");
-
-            TvSeason tvSeason = Config.Client.GetTvSeasonAsync(IdHelper.BreakingBad, 1).Result;
-
-            TestBreakingBadBaseProperties(tvSeason);
+            await Verify(tvSeason);
 
             // Test all extras, ensure none of them are populated
-            foreach (Func<TvSeason, object> selector in _methods.Values)
-            {
+            foreach (Func<TvSeason, object> selector in Methods.Values)
                 Assert.Null(selector(tvSeason));
-            }
         }
 
         [Fact]
-        public void TestTvSeasonExtrasAccountState()
+        public async Task TestTvSeasonExtrasAccountState()
         {
-            // TMDb is sending an extra property
-            IgnoreMissingCSharp("_id / _id");
-
-            // We will intentionally ignore errors reg. missing JSON as we do not request it
-            IgnoreMissingJson(" / credits", " / external_ids", " / images", " / videos", "account_states / id");
-
             // Test the custom parsing code for Account State rating
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            TvSeason season = Config.Client.GetTvSeasonAsync(IdHelper.BigBangTheory, 1, TvSeasonMethods.AccountStates).Result;
+            TvSeason season = await TMDbClient.GetTvSeasonAsync(IdHelper.BigBangTheory, 1, TvSeasonMethods.AccountStates);
             if (season.AccountStates == null || season.AccountStates.Results.All(s => s.EpisodeNumber != 1))
             {
-                Config.Client.TvEpisodeSetRatingAsync(IdHelper.BigBangTheory, 1, 1, 5).Sync();
+                await TMDbClient.TvEpisodeSetRatingAsync(IdHelper.BigBangTheory, 1, 1, 5);
 
                 // Allow TMDb to update cache
-                Thread.Sleep(2000);
+                await Task.Delay(2000);
 
-                season = Config.Client.GetTvSeasonAsync(IdHelper.BigBangTheory, 1, TvSeasonMethods.AccountStates).Result;
+                season = await TMDbClient.GetTvSeasonAsync(IdHelper.BigBangTheory, 1, TvSeasonMethods.AccountStates);
             }
 
             Assert.NotNull(season.AccountStates);
@@ -79,179 +65,103 @@ namespace TMDbLibTests
         }
 
         [Fact]
-        public void TestTvSeasonExtrasAll()
+        public async Task TestTvSeasonExtrasAllAsync()
         {
-            // TMDb is sending an extra property
-            IgnoreMissingCSharp("_id / _id");
-
-            IgnoreMissingJson("images / id", "account_states / id", "credits / id", "external_ids / id", "videos / id");
-
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
             // Account states will only show up if we've done something
-            Config.Client.TvEpisodeSetRatingAsync(IdHelper.BreakingBad, 1, 1, 5).Sync();
+            await TMDbClient.TvEpisodeSetRatingAsync(IdHelper.FullerHouse, 1, 1, 5);
 
-            TvSeasonMethods combinedEnum = _methods.Keys.Aggregate((methods, tvSeasonMethods) => methods | tvSeasonMethods);
-            TvSeason tvSeason = Config.Client.GetTvSeasonAsync(IdHelper.BreakingBad, 1, combinedEnum).Result;
-
-            TestBreakingBadBaseProperties(tvSeason);
-
-            TestMethodsHelper.TestAllNotNull(_methods, tvSeason);
+            await TestMethodsHelper.TestGetAll(Methods, combined => TMDbClient.GetTvSeasonAsync(IdHelper.FullerHouse, 1, combined), season => Verify(season));
         }
 
         [Fact]
-        public void TestTvSeasonExtrasExclusive()
+        public async Task TestTvSeasonExtrasExclusiveAsync()
         {
-            // TMDb is sending an extra property
-            IgnoreMissingCSharp("_id / _id");
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            // We will intentionally ignore errors reg. missing JSON as we do not request it
-            IgnoreMissingJson(" / images", " / account_states", " / external_ids", " / images", " / videos", " / credits", "images / id", "external_ids / id", "videos / id", "credits / id", "account_states / id");
-
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            TestMethodsHelper.TestGetExclusive(_methods, (id, extras) => Config.Client.GetTvSeasonAsync(id, 1, extras).Result, IdHelper.BreakingBad);
+            await TestMethodsHelper.TestGetExclusive(Methods, extras => TMDbClient.GetTvSeasonAsync(IdHelper.BreakingBad, 1, extras));
         }
 
         [Fact]
-        public void TestTvSeasonSeparateExtrasCredits()
+        public async Task TestTvSeasonSeparateExtrasCreditsAsync()
         {
-            Credits credits = Config.Client.GetTvSeasonCreditsAsync(IdHelper.BreakingBad, 1).Result;
-            Assert.NotNull(credits);
-            Assert.NotNull(credits.Cast);
-            Assert.Equal("Walter White", credits.Cast[0].Character);
-            Assert.Equal("52542282760ee313280017f9", credits.Cast[0].CreditId);
-            Assert.Equal(17419, credits.Cast[0].Id);
-            Assert.Equal("Bryan Cranston", credits.Cast[0].Name);
-            Assert.NotNull(credits.Cast[0].ProfilePath);
-            Assert.Equal(0, credits.Cast[0].Order);
-            Assert.True(credits.Cast[0].Popularity > 0);
-            Assert.Equal("Acting", credits.Cast[0].KnownForDepartment);
-            Assert.Equal("Bryan Cranston", credits.Cast[0].OriginalName);
+            Credits credits = await TMDbClient.GetTvSeasonCreditsAsync(IdHelper.BreakingBad, 1);
 
-            Crew crewPersonId = credits.Crew.FirstOrDefault(s => s.Id == 1223202);
-            Assert.NotNull(crewPersonId);
-
-            Assert.Equal(1223202, crewPersonId.Id);
-            Assert.Equal("Production", crewPersonId.Department);
-            Assert.Equal("Diane Mercer", crewPersonId.Name);
-            Assert.Equal("Producer", crewPersonId.Job);
-            Assert.Null(crewPersonId.ProfilePath);
+            await Verify(credits);
         }
 
         [Fact]
-        public void TestTvSeasonSeparateExtrasExternalIds()
+        public async Task TestTvSeasonSeparateExtrasExternalIdsAsync()
         {
-            ExternalIdsTvSeason externalIds = Config.Client.GetTvSeasonExternalIdsAsync(IdHelper.BreakingBad, 1).Result;
+            ExternalIdsTvSeason externalIds = await TMDbClient.GetTvSeasonExternalIdsAsync(IdHelper.BreakingBad, 1);
 
-            Assert.NotNull(externalIds);
-            Assert.Equal(3572, externalIds.Id);
-            Assert.Equal("/en/breaking_bad_season_1", externalIds.FreebaseId);
-            Assert.Equal("/m/05yy27m", externalIds.FreebaseMid);
-            Assert.Null(externalIds.TvrageId);
-            Assert.Equal("30272", externalIds.TvdbId);
+            await Verify(externalIds);
         }
 
         [Fact]
-        public void TestTvSeasonSeparateExtrasImages()
+        public async Task TestTvSeasonSeparateExtrasImagesAsync()
         {
-            PosterImages images = Config.Client.GetTvSeasonImagesAsync(IdHelper.BreakingBad, 1).Result;
-            Assert.NotNull(images);
-            Assert.NotNull(images.Posters);
+            PosterImages images = await TMDbClient.GetTvSeasonImagesAsync(IdHelper.BreakingBad, 1);
+
+            Assert.NotEmpty(images.Posters);
+            TestImagesHelpers.TestImagePaths(images.Posters);
         }
 
         [Fact]
-        public void TestTvSeasonSeparateExtrasVideos()
+        public async Task TestTvSeasonSeparateExtrasVideosAsync()
         {
-            ResultContainer<Video> videos = Config.Client.GetTvSeasonVideosAsync(IdHelper.BreakingBad, 1).Result;
-            Assert.NotNull(videos);
-            Assert.NotNull(videos.Results);
+            ResultContainer<Video> videos = await TMDbClient.GetTvSeasonVideosAsync(IdHelper.GameOfThrones, 1);
+            Video single = videos.Results.Single(s => s.Id == "5c9b7e95c3a36841a341b9c6");
+
+            await Verify(single);
         }
 
         [Fact]
-        public void TestTvSeasonAccountStateRatingSet()
+        public async Task TestTvSeasonAccountStateRatingSetAsync()
         {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            // Rate episode 1, 2 and 3 of BreakingBad
-            Assert.True(Config.Client.TvEpisodeSetRatingAsync(IdHelper.BreakingBad, 1, 1, 5).Result);
-            Assert.True(Config.Client.TvEpisodeSetRatingAsync(IdHelper.BreakingBad, 1, 2, 7).Result);
-            Assert.True(Config.Client.TvEpisodeSetRatingAsync(IdHelper.BreakingBad, 1, 3, 3).Result);
+            await TestMethodsHelper.SetValidateRemoveTest(
+                () => TMDbClient.TvEpisodeSetRatingAsync(IdHelper.BreakingBad, 1, 3, 5),
+                () => TMDbClient.TvEpisodeRemoveRatingAsync(IdHelper.BreakingBad, 1, 3),
+                async shouldBeSet =>
+                {
+                    ResultContainer<TvEpisodeAccountStateWithNumber> state = await TMDbClient.GetTvSeasonAccountStateAsync(IdHelper.BreakingBad, 1);
 
-            // Wait for TMDb to un-cache our value
-            Thread.Sleep(2000);
-
-            // Fetch out the seasons state
-            ResultContainer<TvEpisodeAccountStateWithNumber> state = Config.Client.GetTvSeasonAccountStateAsync(IdHelper.BreakingBad, 1).Result;
-            Assert.NotNull(state);
-
-            Assert.True(Math.Abs(5 - (state.Results.Single(s => s.EpisodeNumber == 1).Rating ?? 0)) < double.Epsilon);
-            Assert.True(Math.Abs(7 - (state.Results.Single(s => s.EpisodeNumber == 2).Rating ?? 0)) < double.Epsilon);
-            Assert.True(Math.Abs(3 - (state.Results.Single(s => s.EpisodeNumber == 3).Rating ?? 0)) < double.Epsilon);
-
-            // Test deleting Ratings
-            Assert.True(Config.Client.TvEpisodeRemoveRatingAsync(IdHelper.BreakingBad, 1, 1).Result);
-            Assert.True(Config.Client.TvEpisodeRemoveRatingAsync(IdHelper.BreakingBad, 1, 2).Result);
-            Assert.True(Config.Client.TvEpisodeRemoveRatingAsync(IdHelper.BreakingBad, 1, 3).Result);
-
-            // Wait for TMDb to un-cache our value
-            Thread.Sleep(2000);
-
-            state = Config.Client.GetTvSeasonAccountStateAsync(IdHelper.BreakingBad, 1).Result;
-            Assert.NotNull(state);
-
-            Assert.Null(state.Results.Single(s => s.EpisodeNumber == 1).Rating);
-            Assert.Null(state.Results.Single(s => s.EpisodeNumber == 2).Rating);
-            Assert.Null(state.Results.Single(s => s.EpisodeNumber == 3).Rating);
+                    if (shouldBeSet)
+                        Assert.Contains(state.Results, x => x.EpisodeNumber == 3 && x.Rating.HasValue);
+                    else
+                        Assert.Contains(state.Results, x => x.EpisodeNumber == 3 && !x.Rating.HasValue);
+                });
         }
 
         [Fact]
-        public void TestTvSeasonGetChanges()
+        public async Task TestTvSeasonGetChangesAsync()
         {
-            ChangesContainer changes = Config.Client.GetTvSeasonChangesAsync(IdHelper.BreakingBadSeason1Id).Result;
-            Assert.NotNull(changes);
-            Assert.NotNull(changes.Changes);
-        }
+            TvShow latestTvShow = await TMDbClient.GetLatestTvShowAsync();
+            int latestSeasonId = latestTvShow.Seasons.Max(s => s.Id);
+            IList<Change> changes = await TMDbClient.GetTvSeasonChangesAsync(latestSeasonId);
 
-        private void TestBreakingBadBaseProperties(TvSeason tvSeason)
-        {
-            Assert.NotNull(tvSeason);
-            Assert.NotNull(tvSeason.Id);
-            Assert.Equal(1, tvSeason.SeasonNumber);
-            Assert.Equal("Season 1", tvSeason.Name);
-            Assert.NotNull(tvSeason.AirDate);
-            Assert.NotNull(tvSeason.Overview);
-            Assert.NotNull(tvSeason.PosterPath);
-
-            Assert.NotNull(tvSeason.Episodes);
-            Assert.Equal(7, tvSeason.Episodes.Count);
-            Assert.NotNull(tvSeason.Episodes[0].Id);
-            Assert.Equal(1, tvSeason.Episodes[0].EpisodeNumber);
-            Assert.Equal("Pilot", tvSeason.Episodes[0].Name);
-            Assert.NotNull(tvSeason.Episodes[0].Overview);
-            Assert.Null(tvSeason.Episodes[0].ProductionCode);
-            Assert.Equal(1, tvSeason.Episodes[0].SeasonNumber);
-            Assert.NotNull(tvSeason.Episodes[0].StillPath);
+            Assert.NotEmpty(changes);
         }
 
         [Fact]
-        public void TestTvSeasonMissing()
+        public async Task TestTvSeasonMissingAsync()
         {
-            TvSeason tvSeason = Config.Client.GetTvSeasonAsync(IdHelper.MissingID, 1).Result;
+            TvSeason tvSeason = await TMDbClient.GetTvSeasonAsync(IdHelper.MissingID, 1);
 
             Assert.Null(tvSeason);
         }
-        
+
         [Fact]
-        public void TestTvSeasonGetTvSeasonWithImageLanguage()
+        public async Task TestTvSeasonGetTvSeasonWithImageLanguageAsync()
         {
-            // TMDb is sending an extra property
-            IgnoreMissingCSharp("_id / _id", "episodes[array].show_id / show_id");
-            IgnoreMissingJson(" / account_states", " / alternative_titles", " / changes", " / credits", " / content_ratings", " / genre_ids", "images / id", " / keywords", " / lists", " / release_dates", " / releases", " / reviews", " / similar", " / translations", " / videos", " / recommendations", " / external_ids");
+            TvSeason resp = await TMDbClient.GetTvSeasonAsync(IdHelper.BreakingBad, 1, language: "en-US", includeImageLanguage: "en", extraMethods: TvSeasonMethods.Images);
 
-            TvSeason resp = Config.Client.GetTvSeasonAsync(IdHelper.BreakingBad, 1, language: "en-US", includeImageLanguage: "en", extraMethods: TvSeasonMethods.Images).Result;
+            ImageData poster = resp.Images.Posters.Single(s => s.FilePath == "/uFh3OrBvkwKSU3N5y0XnXOhqBJz.jpg");
 
-            Assert.True(resp.Images.Posters.Count > 0);
-            Assert.True(resp.Images.Posters.All(p => p.Iso_639_1.Equals("en", StringComparison.OrdinalIgnoreCase)));
+            await Verify(poster);
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/ClientTvShowTests.cs b/TMDbLibTests/ClientTvShowTests.cs
index 04ffb77..4c1452e 100644
--- a/TMDbLibTests/ClientTvShowTests.cs
+++ b/TMDbLibTests/ClientTvShowTests.cs
@@ -1,26 +1,26 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
+using System.Threading.Tasks;
 using Xunit;
 using TMDbLib.Objects.Authentication;
 using TMDbLib.Objects.General;
+using TMDbLib.Objects.Reviews;
 using TMDbLib.Objects.Search;
 using TMDbLib.Objects.TvShows;
 using TMDbLibTests.Helpers;
 using TMDbLibTests.JsonHelpers;
-using Cast = TMDbLib.Objects.TvShows.Cast;
 using Credits = TMDbLib.Objects.TvShows.Credits;
 
 namespace TMDbLibTests
 {
     public class ClientTvShowTests : TestBase
     {
-        private static Dictionary<TvShowMethods, Func<TvShow, object>> _methods;
+        private static readonly Dictionary<TvShowMethods, Func<TvShow, object>> Methods;
 
-        public ClientTvShowTests()
+        static ClientTvShowTests()
         {
-            _methods = new Dictionary<TvShowMethods, Func<TvShow, object>>
+            Methods = new Dictionary<TvShowMethods, Func<TvShow, object>>
             {
                 [TvShowMethods.Credits] = tvShow => tvShow.Credits,
                 [TvShowMethods.Images] = tvShow => tvShow.Images,
@@ -37,175 +37,105 @@ namespace TMDbLibTests
         }
 
         [Fact]
-        public void TestTvShowExtrasNone()
+        public async Task TestTvShowExtrasNoneAsync()
         {
-            // We will intentionally ignore errors reg. missing JSON as we do not request it
-            IgnoreMissingJson(" / known_for", " / account_states", " / alternative_titles", " / changes", " / content_ratings", " / credits", " / external_ids", " / images", " / keywords", " / similar", " / translations", " / videos", " / genre_ids", " / recommendations");
+            TvShow tvShow = await TMDbClient.GetTvShowAsync(IdHelper.BreakingBad);
 
-            TvShow tvShow = Config.Client.GetTvShowAsync(IdHelper.BreakingBad).Result;
-
-            TestBreakingBadBaseProperties(tvShow);
+            await Verify(tvShow);
 
             // Test all extras, ensure none of them are populated
-            foreach (Func<TvShow, object> selector in _methods.Values)
+            foreach (Func<TvShow, object> selector in Methods.Values)
                 Assert.Null(selector(tvShow));
         }
 
         [Fact]
-        public void TestTvShowExtrasAll()
+        public async Task TestTvShowExtrasAllAsync()
         {
-            IgnoreMissingJson(" / id");
-            IgnoreMissingJson(" / genre_ids", " / known_for", " / similar", " / translations", " / videos", "alternative_titles / id", "content_ratings / id", "credits / id", "external_ids / id", "keywords / id", " / recommendations");
-
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
             // Account states will only show up if we've done something
-            Config.Client.TvShowSetRatingAsync(IdHelper.BreakingBad, 5).Sync();
+            await TMDbClient.TvShowSetRatingAsync(IdHelper.KeepingUpAppearances, 5);
 
-            TvShowMethods combinedEnum = _methods.Keys.Aggregate((methods, tvShowMethods) => methods | tvShowMethods);
-            TvShow tvShow = Config.Client.GetTvShowAsync(IdHelper.BreakingBad, combinedEnum).Result;
-
-            TestBreakingBadBaseProperties(tvShow);
-
-            TestMethodsHelper.TestAllNotNull(_methods, tvShow);
+            await TestMethodsHelper.TestGetAll(Methods, combined => TMDbClient.GetTvShowAsync(IdHelper.KeepingUpAppearances, combined), show => Verify(show));
         }
 
         [Fact]
-        public void TestTvShowSeparateExtrasCredits()
+        public async Task TestTvShowSeparateExtrasCreditsAsync()
         {
-            Credits credits = Config.Client.GetTvShowCreditsAsync(IdHelper.BreakingBad).Result;
+            Credits credits = await TMDbClient.GetTvShowCreditsAsync(IdHelper.BreakingBad);
 
-            Assert.NotNull(credits);
-            Assert.NotNull(credits.Cast);
-            Assert.Equal(IdHelper.BreakingBad, credits.Id);
-
-            Cast castPerson = credits.Cast[0];
-            Assert.Equal("Walter White", castPerson.Character);
-            Assert.Equal("52542282760ee313280017f9", castPerson.CreditId);
-            Assert.Equal(17419, castPerson.Id);
-            Assert.Equal("Bryan Cranston", castPerson.Name);
-            Assert.NotNull(castPerson.ProfilePath);
-            Assert.Equal(0, castPerson.Order);
-            Assert.True(castPerson.Popularity > 0);
-            Assert.Equal("Acting", castPerson.KnownForDepartment);
-            Assert.Equal("Bryan Cranston", castPerson.OriginalName);
-
-            Assert.NotNull(credits.Crew);
-
-            Crew crewPerson = credits.Crew.FirstOrDefault(s => s.Id == 66633);
-            Assert.NotNull(crewPerson);
-
-            Assert.Equal(66633, crewPerson.Id);
-            Assert.Equal("52542287760ee31328001af1", crewPerson.CreditId);
-            Assert.Equal("Production", crewPerson.Department);
-            Assert.Equal("Vince Gilligan", crewPerson.Name);
-            Assert.Equal("Executive Producer", crewPerson.Job);
-            Assert.NotNull(crewPerson.ProfilePath);
+            await Verify(credits);
         }
 
         [Fact]
-        public void TestTvShowSeparateExtrasExternalIds()
+        public async Task TestTvShowSeparateExtrasExternalIdsAsync()
         {
-            ExternalIdsTvShow externalIds = Config.Client.GetTvShowExternalIdsAsync(IdHelper.GameOfThrones).Result;
+            ExternalIdsTvShow externalIds = await TMDbClient.GetTvShowExternalIdsAsync(IdHelper.GameOfThrones);
 
-            Assert.NotNull(externalIds);
-            Assert.Equal(1399, externalIds.Id);
-            Assert.Equal("/en/game_of_thrones", externalIds.FreebaseId);
-            Assert.Equal("/m/0524b41", externalIds.FreebaseMid);
-            Assert.Equal("tt0944947", externalIds.ImdbId);
-            Assert.Equal("24493", externalIds.TvrageId);
-            Assert.Equal("121361", externalIds.TvdbId);
-            Assert.Equal("GameOfThrones", externalIds.FacebookId);
-            Assert.Equal("GameOfThrones", externalIds.TwitterId);
-            Assert.Equal("gameofthrones", externalIds.InstagramId);
+            await Verify(externalIds);
         }
 
         [Fact]
-        public void TestTvShowSeparateExtrasContentRatings()
+        public async Task TestTvShowSeparateExtrasContentRatingsAsync()
         {
-            ResultContainer<ContentRating> contentRatings = Config.Client.GetTvShowContentRatingsAsync(IdHelper.BreakingBad).Result;
-            Assert.NotNull(contentRatings);
-            Assert.Equal(IdHelper.BreakingBad, contentRatings.Id);
+            ResultContainer<ContentRating> contentRatings = await TMDbClient.GetTvShowContentRatingsAsync(IdHelper.BreakingBad);
 
-            ContentRating contentRating = contentRatings.Results.FirstOrDefault(r => r.Iso_3166_1.Equals("US"));
-            Assert.NotNull(contentRating);
-            Assert.Equal("TV-MA", contentRating.Rating);
+            await Verify(contentRatings);
         }
 
         [Fact]
-        public void TestTvShowSeparateExtrasAlternativeTitles()
+        public async Task TestTvShowSeparateExtrasAlternativeTitlesAsync()
         {
-            ResultContainer<AlternativeTitle> alternativeTitles = Config.Client.GetTvShowAlternativeTitlesAsync(IdHelper.BreakingBad).Result;
-            Assert.NotNull(alternativeTitles);
-            Assert.Equal(IdHelper.BreakingBad, alternativeTitles.Id);
+            ResultContainer<AlternativeTitle> alternativeTitles = await TMDbClient.GetTvShowAlternativeTitlesAsync(IdHelper.BreakingBad);
 
-            AlternativeTitle alternativeTitle = alternativeTitles.Results.FirstOrDefault(r => r.Iso_3166_1.Equals("IT"));
-            Assert.NotNull(alternativeTitle);
-            Assert.Equal("Breaking Bad - Reazioni collaterali", alternativeTitle.Title);
+            await Verify(alternativeTitles);
         }
 
         [Fact]
-        public void TestTvShowSeparateExtrasKeywords()
+        public async Task TestTvShowSeparateExtrasKeywordsAsync()
         {
-            ResultContainer<Keyword> keywords = Config.Client.GetTvShowKeywordsAsync(IdHelper.BreakingBad).Result;
-            Assert.NotNull(keywords);
-            Assert.Equal(IdHelper.BreakingBad, keywords.Id);
+            ResultContainer<Keyword> keywords = await TMDbClient.GetTvShowKeywordsAsync(IdHelper.BreakingBad);
 
-            Keyword keyword = keywords.Results.FirstOrDefault(r => r.Id == 41525);
-            Assert.NotNull(keyword);
-            Assert.Equal("high school teacher", keyword.Name);
+            Keyword single = keywords.Results.Single(s => s.Id == 15484);
+
+            await Verify(single);
         }
 
         [Fact]
-        public void TestTvShowSeparateExtrasTranslations()
+        public async Task TestTvShowSeparateExtrasTranslationsAsync()
         {
-            TranslationsContainerTv translations = Config.Client.GetTvShowTranslationsAsync(IdHelper.BreakingBad).Result;
-            Assert.NotNull(translations);
-            Assert.Equal(IdHelper.BreakingBad, translations.Id);
+            TranslationsContainerTv translations = await TMDbClient.GetTvShowTranslationsAsync(IdHelper.BreakingBad);
 
-            Translation translation = translations.Translations.FirstOrDefault(r => r.Iso_639_1 == "hr");
-            Assert.NotNull(translation);
-            Assert.Equal("Croatian", translation.EnglishName);
-            Assert.Equal("hr", translation.Iso_639_1);
-            Assert.Equal("Hrvatski", translation.Name);
+            Translation single = translations.Translations.Single(s => s.Iso_3166_1 == "DK");
+
+            await Verify(single);
         }
 
         [Fact]
-        public void TestTvShowSeparateExtrasVideos()
+        public async Task TestTvShowSeparateExtrasVideosAsync()
         {
-            ResultContainer<Video> videos = Config.Client.GetTvShowVideosAsync(IdHelper.BreakingBad).Result;
-            Assert.NotNull(videos);
-            Assert.Equal(IdHelper.BreakingBad, videos.Id);
+            ResultContainer<Video> videos = await TMDbClient.GetTvShowVideosAsync(IdHelper.BreakingBad);
 
-            Video video = videos.Results.FirstOrDefault(r => r.Id == "5759db2fc3a3683e7c003df7");
-            Assert.NotNull(video);
+            Video single = videos.Results.Single(s => s.Id == "5759db2fc3a3683e7c003df7");
 
-            Assert.Equal("5759db2fc3a3683e7c003df7", video.Id);
-            Assert.Equal("en", video.Iso_639_1);
-            Assert.Equal("XZ8daibM3AE", video.Key);
-            Assert.Equal("Trailer", video.Name);
-            Assert.Equal("YouTube", video.Site);
-            Assert.Equal(720, video.Size);
-            Assert.Equal("Trailer", video.Type);
+            await Verify(single);
         }
 
         [Fact]
-        public void TestTvShowSeparateExtrasAccountState()
+        public async Task TestTvShowSeparateExtrasAccountStateAsync()
         {
-            IgnoreMissingJson(" / id", " / alternative_titles", " / changes", " / content_ratings", " / credits", " / external_ids", " / genre_ids", " / images", " / keywords", " / known_for", " / similar", " / translations", " / videos", " / recommendations");
-
             // Test the custom parsing code for Account State rating
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            TvShow show = Config.Client.GetTvShowAsync(IdHelper.BigBangTheory, TvShowMethods.AccountStates).Result;
+            TvShow show = await TMDbClient.GetTvShowAsync(IdHelper.BigBangTheory, TvShowMethods.AccountStates);
             if (show.AccountStates == null || !show.AccountStates.Rating.HasValue)
             {
-                Config.Client.TvShowSetRatingAsync(IdHelper.BigBangTheory, 5).Sync();
+                await TMDbClient.TvShowSetRatingAsync(IdHelper.BigBangTheory, 5);
 
                 // Allow TMDb to update cache
-                Thread.Sleep(2000);
+                await Task.Delay(2000);
 
-                show = Config.Client.GetTvShowAsync(IdHelper.BigBangTheory, TvShowMethods.AccountStates).Result;
+                show = await TMDbClient.GetTvShowAsync(IdHelper.BigBangTheory, TvShowMethods.AccountStates);
             }
 
             Assert.NotNull(show.AccountStates);
@@ -214,110 +144,64 @@ namespace TMDbLibTests
         }
 
         [Fact]
-        public void TestTvShowSeparateExtrasImages()
+        public async Task TestTvShowSeparateExtrasImagesAsync()
         {
-            ImagesWithId images = Config.Client.GetTvShowImagesAsync(IdHelper.BreakingBad).Result;
-            Assert.NotNull(images);
-            Assert.NotNull(images.Backdrops);
-            Assert.NotNull(images.Posters);
+            ImagesWithId images = await TMDbClient.GetTvShowImagesAsync(IdHelper.BreakingBad);
+
+            TestImagesHelpers.TestImagePaths(images);
+
+            ImageData backdrop = images.Backdrops.Single(s => s.FilePath == "/tsRy63Mu5cu8etL1X7ZLyf7UP1M.jpg");
+            ImageData poster = images.Posters.Single(s => s.FilePath == "/ggFHVNu6YYI5L9pCfOacjizRGt.jpg");
+
+            await Verify(new
+            {
+                backdrop,
+                poster
+            });
         }
 
         [Fact]
-        public void TestTvShowGetImagesWithImageLanguage()
+        public async Task TestTvShowGetImagesWithImageLanguageAsync()
         {
-            ImagesWithId resp = Config.Client.GetTvShowImagesAsync(IdHelper.BreakingBad, language: "en-US", includeImageLanguage: "en").Result;
+            ImagesWithId images = await TMDbClient.GetTvShowImagesAsync(IdHelper.BreakingBad, "en-US", "en");
 
-            Assert.True(resp.Backdrops.Count > 0);
-            Assert.True(resp.Posters.Count > 0);
+            TestImagesHelpers.TestImagePaths(images);
+
+            ImageData backdrop = images.Backdrops.Single(s => s.FilePath == "/otCnAN1edreRudT5E2OHk8beiDu.jpg");
+            ImageData poster = images.Posters.Single(s => s.FilePath == "/ggFHVNu6YYI5L9pCfOacjizRGt.jpg");
+
+            await Verify(new
+            {
+                backdrop,
+                poster
+            });
         }
 
         [Fact]
-        public void TestTvShowGetTvShowWithImageLanguage()
+        public async Task TestTvShowGetTvShowWithImageLanguageAsync()
         {
-            IgnoreMissingJson(" / account_states", " / alternative_titles", " / changes", " / credits", " / content_ratings", " / genre_ids", " / keywords", " / lists", " / release_dates", " / releases", " / reviews", " / similar", " / translations", " / videos", " / recommendations", " / external_ids");
+            TvShow resp = await TMDbClient.GetTvShowAsync(IdHelper.BreakingBad, includeImageLanguage: "pt", extraMethods: TvShowMethods.Images);
 
-            TvShow resp = Config.Client.GetTvShowAsync(IdHelper.BreakingBad, language: "en-US", includeImageLanguage: "en", extraMethods: TvShowMethods.Images).Result;
+            TestImagesHelpers.TestImagePaths(resp.Images);
 
-            Assert.True(resp.Images.Backdrops.Count > 0);
-            Assert.True(resp.Images.Backdrops.All(b => b.Iso_639_1.Equals("en", StringComparison.OrdinalIgnoreCase)));
-            Assert.True(resp.Images.Posters.Count > 0);
-            Assert.True(resp.Images.Posters.All(p => p.Iso_639_1.Equals("en", StringComparison.OrdinalIgnoreCase)));
-        }
+            ImageData backdrop = null;
+            ImageData poster = resp.Images.Posters.Single(s => s.FilePath == "/30erzlzIOtOK3k3T3BAl1GiVMP1.jpg");
 
-        private void TestBreakingBadBaseProperties(TvShow tvShow)
-        {
-            Assert.NotNull(tvShow);
-            Assert.Equal("Breaking Bad", tvShow.Name);
-            Assert.Equal("Breaking Bad", tvShow.OriginalName);
-            Assert.NotNull(tvShow.Overview);
-            Assert.NotNull(tvShow.Homepage);
-            Assert.Equal(new DateTime(2008, 01, 19), tvShow.FirstAirDate);
-            Assert.Equal(new DateTime(2013, 9, 29), tvShow.LastAirDate);
-            Assert.Equal(false, tvShow.InProduction);
-            Assert.Equal("Ended", tvShow.Status);
-            Assert.Equal("Scripted", tvShow.Type);
-            Assert.Equal("en", tvShow.OriginalLanguage);
-
-            Assert.NotNull(tvShow.ProductionCompanies);
-            Assert.Equal(3, tvShow.ProductionCompanies.Count);
-            Assert.Equal(2605, tvShow.ProductionCompanies[0].Id);
-            Assert.Equal("Gran Via Productions", tvShow.ProductionCompanies[0].Name);
-
-            Assert.NotNull(tvShow.CreatedBy);
-            Assert.Equal(1, tvShow.CreatedBy.Count);
-            Assert.Equal(66633, tvShow.CreatedBy[0].Id);
-            Assert.Equal("Vince Gilligan", tvShow.CreatedBy[0].Name);
-
-            Assert.NotNull(tvShow.EpisodeRunTime);
-            Assert.Equal(2, tvShow.EpisodeRunTime.Count);
-
-            Assert.NotNull(tvShow.Genres);
-            Assert.Equal(18, tvShow.Genres[0].Id);
-            Assert.Equal("Drama", tvShow.Genres[0].Name);
-
-            Assert.NotNull(tvShow.Languages);
-            Assert.Equal("en", tvShow.Languages[0]);
-
-            Assert.Null(tvShow.NextEpisodeToAir);
-
-            Assert.NotNull(tvShow.LastEpisodeToAir);
-            Assert.Equal(62161, tvShow.LastEpisodeToAir.Id);
-
-            Assert.NotNull(tvShow.Networks);
-            Assert.Equal(1, tvShow.Networks.Count);
-            Assert.Equal(174, tvShow.Networks[0].Id);
-            Assert.Equal("AMC", tvShow.Networks[0].Name);
-
-            Assert.NotNull(tvShow.OriginCountry);
-            Assert.Equal(1, tvShow.OriginCountry.Count);
-            Assert.Equal("US", tvShow.OriginCountry[0]);
-
-            Assert.NotNull(tvShow.Seasons);
-            Assert.Equal(6, tvShow.Seasons.Count);
-            Assert.Equal(0, tvShow.Seasons[0].SeasonNumber);
-            Assert.Equal(1, tvShow.Seasons[1].SeasonNumber);
-
-            Assert.Equal(62, tvShow.NumberOfEpisodes);
-            Assert.Equal(5, tvShow.NumberOfSeasons);
-
-            Assert.NotNull(tvShow.PosterPath);
-            Assert.NotNull(tvShow.BackdropPath);
-
-            Assert.NotEqual(0, tvShow.Popularity);
-            Assert.NotEqual(0, tvShow.VoteAverage);
-            Assert.NotEqual(0, tvShow.VoteAverage);
+            await Verify(new
+            {
+                backdrop,
+                poster
+            });
         }
 
         [Fact]
-        public void TestTvShowPopular()
+        public async Task TestTvShowPopular()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.GetTvShowPopularAsync(i));
 
-            TestHelpers.SearchPages(i => Config.Client.GetTvShowPopularAsync(i).Result);
+            SearchContainer<SearchTv> result = await TMDbClient.GetTvShowPopularAsync();
 
-            SearchContainer<SearchTv> result = Config.Client.GetTvShowPopularAsync().Sync();
-            Assert.NotNull(result.Results[0].Id);
+            Assert.NotEmpty(result.Results);
             Assert.NotNull(result.Results[0].Name);
             Assert.NotNull(result.Results[0].OriginalName);
             Assert.NotNull(result.Results[0].FirstAirDate);
@@ -326,37 +210,26 @@ namespace TMDbLibTests
         }
 
         [Fact]
-        public void TestTvShowSeasonCount()
+        public async Task TestTvShowSeasonCountAsync()
         {
-            IgnoreMissingJson(" / account_states", " / alternative_titles", " / changes", " / content_ratings", " / credits", " / external_ids", " / genre_ids", " / images", " / keywords", " / known_for", " / similar", " / translations", " / videos", " / recommendations");
+            // TODO: Is this test obsolete?
+            TvShow tvShow = await TMDbClient.GetTvShowAsync(1668);
 
-            TvShow tvShow = Config.Client.GetTvShowAsync(1668).Result;
-            Assert.Equal(tvShow.Seasons[1].EpisodeCount, 24);
+            await Verify(tvShow);
         }
 
         [Fact]
-        public void TestTvShowVideos()
+        public async Task TestTvShowVideosAsync()
         {
-            IgnoreMissingJson(" / account_states", " / alternative_titles", " / changes", " / content_ratings", " / credits", " / external_ids", " / genre_ids", " / images", " / keywords", " / known_for", " / similar", " / translations", "videos / id", " / recommendations");
+            TvShow tvShow = await TMDbClient.GetTvShowAsync(1668, TvShowMethods.Videos);
 
-            TvShow tvShow = Config.Client.GetTvShowAsync(1668, TvShowMethods.Videos).Result;
-            Assert.NotNull(tvShow.Videos);
-            Assert.NotNull(tvShow.Videos.Results);
-            Assert.NotNull(tvShow.Videos.Results[0]);
-
-            Assert.Equal("552e1b53c3a3686c4e00207b", tvShow.Videos.Results[0].Id);
-            Assert.Equal("en", tvShow.Videos.Results[0].Iso_639_1);
-            Assert.Equal("lGTOru7pwL8", tvShow.Videos.Results[0].Key);
-            Assert.Equal("Friends - Opening", tvShow.Videos.Results[0].Name);
-            Assert.Equal("YouTube", tvShow.Videos.Results[0].Site);
-            Assert.Equal(360, tvShow.Videos.Results[0].Size);
-            Assert.Equal("Opening Credits", tvShow.Videos.Results[0].Type);
+            await Verify(tvShow);
         }
 
         [Fact]
-        public void TestTvShowGetMovieWatchProviders()
+        public async Task TestTvShowGetMovieWatchProviders()
         {
-            SingleResultContainer<Dictionary<string, WatchProviders>> resp = Config.Client.GetTvShowWatchProvidersAsync(IdHelper.GameOfThrones).Result;
+            SingleResultContainer<Dictionary<string, WatchProviders>> resp = await TMDbClient.GetTvShowWatchProvidersAsync(IdHelper.GameOfThrones);
 
             Assert.NotNull(resp);
 
@@ -367,303 +240,186 @@ namespace TMDbLibTests
         }
 
         [Fact]
-        public void TestTvShowTranslations()
+        public async Task TestTvShowTranslationsAsync()
         {
-            TranslationsContainerTv translations = Config.Client.GetTvShowTranslationsAsync(1668).Result;
+            TranslationsContainerTv translations = await TMDbClient.GetTvShowTranslationsAsync(IdHelper.BreakingBad);
 
-            Assert.Equal(1668, translations.Id);
-            Translation translation = translations.Translations.SingleOrDefault(s => s.Iso_639_1 == "hr");
-            Assert.NotNull(translation);
-
-            Assert.Equal("Croatian", translation.EnglishName);
-            Assert.Equal("hr", translation.Iso_639_1);
-            Assert.Equal("Hrvatski", translation.Name);
+            await Verify(translations);
         }
 
         [Fact]
-        public void TestTvShowSimilars()
+        public async Task TestTvShowSimilarsAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            SearchContainer<SearchTv> tvShows = await TMDbClient.GetTvShowSimilarAsync(IdHelper.BreakingBad);
 
-            SearchContainer<SearchTv> tvShow = Config.Client.GetTvShowSimilarAsync(1668).Result;
+            Assert.NotEmpty(tvShows.Results);
 
-            Assert.NotNull(tvShow);
-            Assert.NotNull(tvShow.Results);
+            SearchTv tvShow = tvShows.Results.Single(s => s.Id == 63351);
 
-            SearchTv item = tvShow.Results.SingleOrDefault(s => s.Id == 1100);
-            Assert.NotNull(item);
-
-            Assert.True(TestImagesHelpers.TestImagePath(item.BackdropPath),
-                "item.BackdropPath was not a valid image path, was: " + item.BackdropPath);
-            Assert.Equal(1100, item.Id);
-            Assert.Equal("How I Met Your Mother", item.OriginalName);
-            Assert.Equal(new DateTime(2005, 09, 19), item.FirstAirDate);
-            Assert.True(TestImagesHelpers.TestImagePath(item.PosterPath),
-                "item.PosterPath was not a valid image path, was: " + item.PosterPath);
-            Assert.True(item.Popularity > 0);
-            Assert.Equal("How I Met Your Mother", item.Name);
-            Assert.True(item.VoteAverage > 0);
-            Assert.True(item.VoteCount > 0);
-
-            Assert.NotNull(item.OriginCountry);
-            Assert.Equal(1, item.OriginCountry.Count);
-            Assert.True(item.OriginCountry.Contains("US"));
+            await Verify(tvShow);
         }
 
         [Fact]
-        public void TestTvShowRecommendations()
+        public async Task TestTvShowRecommendationsAsync()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type", "results[array] / popularity");
+            SearchContainer<SearchTv> tvShows = await TMDbClient.GetTvShowRecommendationsAsync(IdHelper.BreakingBad);
 
-            SearchContainer<SearchTv> tvShow = Config.Client.GetTvShowRecommendationsAsync(1668).Result;
+            Assert.NotEmpty(tvShows.Results);
 
-            Assert.NotNull(tvShow);
-            Assert.NotNull(tvShow.Results);
+            SearchTv tvShow = tvShows.Results.Single(s => s.Id == 63351);
 
-            SearchTv item = tvShow.Results.SingleOrDefault(s => s.Id == 1100);
-            Assert.NotNull(item);
-
-            Assert.True(TestImagesHelpers.TestImagePath(item.BackdropPath), "item.BackdropPath was not a valid image path, was: " + item.BackdropPath);
-            Assert.Equal(1100, item.Id);
-            Assert.Equal("How I Met Your Mother", item.OriginalName);
-            Assert.Equal(new DateTime(2005, 09, 19), item.FirstAirDate);
-            Assert.True(TestImagesHelpers.TestImagePath(item.PosterPath), "item.PosterPath was not a valid image path, was: " + item.PosterPath);
-            Assert.Equal("How I Met Your Mother", item.Name);
-            Assert.True(item.VoteAverage > 0);
-            Assert.True(item.VoteCount > 0);
-
-            Assert.NotNull(item.OriginCountry);
-            Assert.Equal(1, item.OriginCountry.Count);
-            Assert.True(item.OriginCountry.Contains("US"));
+            await Verify(tvShow);
         }
 
         [Fact]
-        public void TestTvShowTopRated()
+        public async Task TestTvShowTopRated()
         {
-            // Ignore missing json
-            IgnoreMissingJson("results[array] / media_type");
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.GetTvShowTopRatedAsync(i));
 
-            // This test might fail with inconsistent information from the pages due to a caching problem in the API.
-            // Comment from the Developer of the API
-            // That would be caused from different pages getting cached at different times.
-            // Since top rated only pulls TV shows with 2 or more votes right now this will be something that happens until we have a lot more ratings.
-            // It's the single biggest missing data right now and there's no way around it until we get more people using the TV data.
-            // And as we get more ratings I increase that limit so we get more accurate results.
-            TestHelpers.SearchPages(i => Config.Client.GetTvShowTopRatedAsync(i).Result);
-
-            SearchContainer<SearchTv> result = Config.Client.GetTvShowTopRatedAsync().Sync();
-            Assert.NotNull(result.Results[0].Id);
+            SearchContainer<SearchTv> result = await TMDbClient.GetTvShowTopRatedAsync();
             Assert.NotNull(result.Results[0].Name);
             Assert.NotNull(result.Results[0].OriginalName);
             Assert.NotNull(result.Results[0].FirstAirDate);
-            Assert.NotNull(result.Results[0].PosterPath);
-            Assert.NotNull(result.Results[0].BackdropPath);
+            Assert.NotNull(result.Results[0].PosterPath ?? result.Results[0].BackdropPath);
         }
 
         [Fact]
-        public void TestTvShowLatest()
+        public async Task TestTvShowLatest()
         {
-            IgnoreMissingJson(" / account_states", " / alternative_titles", " / changes", " / content_ratings", " / credits", " / external_ids", " / genre_ids", " / images", " / keywords", " / similar", " / translations", " / videos", " / recommendations");
-
-            TvShow tvShow = Config.Client.GetLatestTvShowAsync().Sync();
+            TvShow tvShow = await TMDbClient.GetLatestTvShowAsync();
 
             Assert.NotNull(tvShow);
         }
 
         [Fact]
-        public void TestTvShowReviews()
+        public async Task TestTvShowReviews()
         {
-            TestHelpers.SearchPages(i => Config.Client.GetTvShowReviewsAsync(IdHelper.BreakingBad, page: i).Result);
+            await TestHelpers.SearchPagesAsync<SearchContainerWithId<ReviewBase>, ReviewBase>(i => TMDbClient.GetTvShowReviewsAsync(IdHelper.BreakingBad, page: i));
+
+            SearchContainerWithId<ReviewBase> reviews = await TMDbClient.GetTvShowReviewsAsync(IdHelper.BreakingBad);
+
+            ReviewBase single = reviews.Results.Single(s => s.Id == "5accdbe6c3a3687e2702d058");
+
+            await Verify(single);
         }
 
         [Fact]
-        public void TestTvShowLists()
+        public async Task TestTvShowLists()
         {
-            IgnoreMissingJson(" / account_states", " / alternative_titles", " / changes", " / content_ratings", " / created_by", " / credits", " / external_ids", " / genres", " / images", " / in_production", " / keywords", " / languages", " / networks", " / production_companies", " / seasons", " / similar", " / translations", " / videos", "results[array] / media_type", " / recommendations");
-
             foreach (TvShowListType type in Enum.GetValues(typeof(TvShowListType)).OfType<TvShowListType>())
             {
-                TestHelpers.SearchPages(i => Config.Client.GetTvShowListAsync(type, i).Result);
+                await TestHelpers.SearchPagesAsync(i => TMDbClient.GetTvShowListAsync(type, i));
             }
         }
 
         [Fact]
-        public void TestTvShowAccountStateFavoriteSet()
+        public async Task TestTvShowAccountStateFavoriteSet()
         {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            AccountState accountState = Config.Client.GetTvShowAccountStateAsync(IdHelper.BreakingBad).Result;
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
 
-            // Remove the favourite
-            if (accountState.Favorite)
-                Config.Client.AccountChangeFavoriteStatusAsync(MediaType.Tv, IdHelper.BreakingBad, false).Sync();
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            // Test that the movie is NOT favourited
-            accountState = Config.Client.GetTvShowAccountStateAsync(IdHelper.BreakingBad).Result;
-
-            Assert.Equal(IdHelper.BreakingBad, accountState.Id);
-            Assert.False(accountState.Favorite);
-
-            // Favourite the movie
-            Config.Client.AccountChangeFavoriteStatusAsync(MediaType.Tv, IdHelper.BreakingBad, true).Sync();
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            // Test that the movie IS favourited
-            accountState = Config.Client.GetTvShowAccountStateAsync(IdHelper.BreakingBad).Result;
-            Assert.Equal(IdHelper.BreakingBad, accountState.Id);
-            Assert.True(accountState.Favorite);
-        }
-
-        [Fact]
-        public void TestTvShowAccountStateWatchlistSet()
-        {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            AccountState accountState = Config.Client.GetTvShowAccountStateAsync(IdHelper.BreakingBad).Result;
-
-            // Remove the watchlist
-            if (accountState.Watchlist)
-                Config.Client.AccountChangeWatchlistStatusAsync(MediaType.Tv, IdHelper.BreakingBad, false).Sync();
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            // Test that the movie is NOT watchlisted
-            accountState = Config.Client.GetTvShowAccountStateAsync(IdHelper.BreakingBad).Result;
-
-            Assert.Equal(IdHelper.BreakingBad, accountState.Id);
-            Assert.False(accountState.Watchlist);
-
-            // Watchlist the movie
-            Config.Client.AccountChangeWatchlistStatusAsync(MediaType.Tv, IdHelper.BreakingBad, true).Sync();
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            // Test that the movie IS watchlisted
-            accountState = Config.Client.GetTvShowAccountStateAsync(IdHelper.BreakingBad).Result;
-            Assert.Equal(IdHelper.BreakingBad, accountState.Id);
-            Assert.True(accountState.Watchlist);
-        }
-
-        [Fact]
-        public void TestTvShowAccountStateRatingSet()
-        {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            AccountState accountState = Config.Client.GetTvShowAccountStateAsync(IdHelper.BreakingBad).Result;
-
-            // Remove the rating
-            if (accountState.Rating.HasValue)
+            await TestMethodsHelper.SetValidateRemoveTest(async () =>
             {
-                Assert.True(Config.Client.TvShowRemoveRatingAsync(IdHelper.BreakingBad).Result);
-
-                // Allow TMDb to cache our changes
-                Thread.Sleep(2000);
-            }
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            // Test that the movie is NOT rated
-            accountState = Config.Client.GetTvShowAccountStateAsync(IdHelper.BreakingBad).Result;
-
-            Assert.Equal(IdHelper.BreakingBad, accountState.Id);
-            Assert.False(accountState.Rating.HasValue);
-
-            // Rate the movie
-            Config.Client.TvShowSetRatingAsync(IdHelper.BreakingBad, 5).Sync();
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            // Test that the movie IS rated
-            accountState = Config.Client.GetTvShowAccountStateAsync(IdHelper.BreakingBad).Result;
-            Assert.Equal(IdHelper.BreakingBad, accountState.Id);
-            Assert.True(accountState.Rating.HasValue);
-
-            // Remove the rating
-            Assert.True(Config.Client.TvShowRemoveRatingAsync(IdHelper.BreakingBad).Result);
-        }
-
-        [Fact]
-        public void TestTvShowSetRatingBadRating()
-        {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            Assert.False(Config.Client.TvShowSetRatingAsync(IdHelper.BreakingBad, 7.1).Result);
-        }
-
-        [Fact]
-        public void TestTvShowSetRatingRatingOutOfBounds()
-        {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            Assert.False(Config.Client.TvShowSetRatingAsync(IdHelper.BreakingBad, 10.5).Result);
-        }
-
-        [Fact]
-        public void TestTvShowSetRatingRatingLowerBoundsTest()
-        {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            Assert.False(Config.Client.TvShowSetRatingAsync(IdHelper.BreakingBad, 0).Result);
-        }
-
-        [Fact]
-        public void TestTvShowSetRatingUserSession()
-        {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            AccountState accountState = Config.Client.GetTvShowAccountStateAsync(IdHelper.BreakingBad).Result;
-
-            // Remove the rating
-            if (accountState.Rating.HasValue)
+                // Favourite the movie
+                await TMDbClient.AccountChangeFavoriteStatusAsync(MediaType.Tv, IdHelper.BreakingBad, true);
+            }, async () =>
             {
-                Assert.True(Config.Client.TvShowRemoveRatingAsync(IdHelper.BreakingBad).Result);
+                // Un-favorite the movie
+                await TMDbClient.AccountChangeFavoriteStatusAsync(MediaType.Tv, IdHelper.BreakingBad, false);
+            }, async shouldBe =>
+            {
+                AccountState accountState = await TMDbClient.GetTvShowAccountStateAsync(IdHelper.BreakingBad);
 
-                // Allow TMDb to cache our changes
-                Thread.Sleep(2000);
-            }
-
-            // Test that the episode is NOT rated
-            accountState = Config.Client.GetTvShowAccountStateAsync(IdHelper.BreakingBad).Result;
-
-            Assert.Equal(IdHelper.BreakingBad, accountState.Id);
-            Assert.False(accountState.Rating.HasValue);
-
-            // Rate the episode
-            Config.Client.TvShowSetRatingAsync(IdHelper.BreakingBad, 5).Sync();
-
-            // Allow TMDb to cache our changes
-            Thread.Sleep(2000);
-
-            // Test that the episode IS rated
-            accountState = Config.Client.GetTvShowAccountStateAsync(IdHelper.BreakingBad).Result;
-            Assert.Equal(IdHelper.BreakingBad, accountState.Id);
-            Assert.True(accountState.Rating.HasValue);
-
-            // Remove the rating
-            Assert.True(Config.Client.TvShowRemoveRatingAsync(IdHelper.BreakingBad).Result);
+                Assert.Equal(IdHelper.BreakingBad, accountState.Id);
+                Assert.Equal(shouldBe, accountState.Favorite);
+            });
         }
 
         [Fact]
-        public void TestTvShowSetRatingGuestSession()
+        public async Task TestTvShowAccountStateWatchlistSet()
+        {
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
+
+            await TestMethodsHelper.SetValidateRemoveTest(async () =>
+            {
+                // Add to watchlist
+                await TMDbClient.AccountChangeWatchlistStatusAsync(MediaType.Tv, IdHelper.BreakingBad, true);
+            }, async () =>
+            {
+                // Remove from watchlist
+                await TMDbClient.AccountChangeWatchlistStatusAsync(MediaType.Tv, IdHelper.BreakingBad, false);
+            }, async shouldBe =>
+            {
+                AccountState accountState = await TMDbClient.GetTvShowAccountStateAsync(IdHelper.BreakingBad);
+
+                Assert.Equal(IdHelper.BreakingBad, accountState.Id);
+                Assert.Equal(shouldBe, accountState.Watchlist);
+            });
+        }
+
+        [Fact]
+        public async Task TestTvShowAccountStateRatingSet()
+        {
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
+
+            await TestMethodsHelper.SetValidateRemoveTest(async () =>
+            {
+                // Rate
+                await TMDbClient.TvShowSetRatingAsync(IdHelper.BreakingBad, 5);
+            }, async () =>
+            {
+                // Un-rate
+                Assert.True(await TMDbClient.TvShowRemoveRatingAsync(IdHelper.BreakingBad));
+            }, async shouldBe =>
+            {
+                AccountState accountState = await TMDbClient.GetTvShowAccountStateAsync(IdHelper.BreakingBad);
+
+                Assert.Equal(IdHelper.BreakingBad, accountState.Id);
+
+                if (shouldBe)
+                {
+                    Assert.NotNull(accountState.Rating);
+                    Assert.Equal(5, accountState.Rating.Value);
+                }
+                else
+                    Assert.Null(accountState.Rating);
+            });
+        }
+
+        [Fact]
+        public async Task TestTvShowSetRating()
+        {
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
+
+            Assert.False(await TMDbClient.TvShowSetRatingAsync(IdHelper.BreakingBad, 10.5));
+
+            Assert.True(await TMDbClient.TvShowSetRatingAsync(IdHelper.BreakingBad, 7.0));
+
+            Assert.False(await TMDbClient.TvShowSetRatingAsync(IdHelper.BreakingBad, 7.1));
+
+            Assert.True(await TMDbClient.TvShowSetRatingAsync(IdHelper.BreakingBad, 7.5));
+
+            Assert.False(await TMDbClient.TvShowSetRatingAsync(IdHelper.BreakingBad, 0));
+        }
+
+        [Fact]
+        public async Task TestTvShowSetRatingGuestSession()
         {
             // There is no way to validate the change besides the success return of the api call since the guest session doesn't have access to anything else
-            Config.Client.SetSessionInformation(Config.GuestTestSessionId, SessionType.GuestSession);
+            await TMDbClient.SetSessionInformationAsync(TestConfig.GuestTestSessionId, SessionType.GuestSession);
 
             // Try changing the rating
-            Assert.True(Config.Client.TvShowSetRatingAsync(IdHelper.BreakingBad, 7.5).Result);
+            Assert.True(await TMDbClient.TvShowSetRatingAsync(IdHelper.BreakingBad, 7.5));
+
+            Assert.False(await TMDbClient.TvShowSetRatingAsync(IdHelper.BreakingBad, 7.1));
 
             // Try changing it back to the previous rating
-            Assert.True(Config.Client.TvShowSetRatingAsync(IdHelper.BreakingBad, 8).Result);
+            Assert.True(await TMDbClient.TvShowSetRatingAsync(IdHelper.BreakingBad, 8));
         }
 
         [Fact]
-        public void TestTvShowMissing()
+        public async Task TestTvShowMissingAsync()
         {
-            TvShow tvShow = Config.Client.GetTvShowAsync(IdHelper.MissingID).Result;
+            TvShow tvShow = await TMDbClient.GetTvShowAsync(IdHelper.MissingID);
 
             Assert.Null(tvShow);
         }
diff --git a/TMDbLibTests/Exceptions/Class.cs b/TMDbLibTests/Exceptions/ConfigurationErrorsException.cs
similarity index 100%
rename from TMDbLibTests/Exceptions/Class.cs
rename to TMDbLibTests/Exceptions/ConfigurationErrorsException.cs
diff --git a/TMDbLibTests/Helpers/AsyncHelper.cs b/TMDbLibTests/Helpers/AsyncHelper.cs
deleted file mode 100644
index d0f71e8..0000000
--- a/TMDbLibTests/Helpers/AsyncHelper.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Threading.Tasks;
-
-namespace TMDbLibTests.Helpers
-{
-    public static class AsyncHelper
-    {
-        public static void Sync(this Task task)
-        {
-            task.GetAwaiter().GetResult();
-        }
-
-        public static T Sync<T>(this Task<T> task)
-        {
-            return task.GetAwaiter().GetResult();
-        }
-    }
-}
\ No newline at end of file
diff --git a/TMDbLibTests/Helpers/IdHelper.cs b/TMDbLibTests/Helpers/IdHelper.cs
index 733f0e1..09eae3e 100644
--- a/TMDbLibTests/Helpers/IdHelper.cs
+++ b/TMDbLibTests/Helpers/IdHelper.cs
@@ -20,14 +20,18 @@
 
         // TV
         public const int GameOfThrones = 1399;
+        public const int GameOfThronesSeason8 = 107971;
+        public const int GameOfThronesSeason4Episode10 = 63103;
         public const int BreakingBad = 1396;
         public const int BreakingBadSeason1Id = 3572;
         public const int BreakingBadSeason1Episode1Id = 62085;
         public const int BigBangTheory = 1418;
         public const int BigBangTheorySeason1Episode1Id = 64766;
         public const int BigBangTheorySeason1Episode2Id = 64777;
+        public const int KeepingUpAppearances = 34;
         public const int DoctorWho = 121;
         public const int House = 1408;
+        public const int FullerHouse = 63623;
 
         public const int TmdbBreakingBadId = 1396;
         public const string TvdbBreakingBadId = "81189";
@@ -39,7 +43,7 @@
         public const string FreebaseMidBreakingBadId = "m/03d34x8";
 
         // Persons
-        public const int PersonPartialDate = 833;
+        public const int FrankSinatra = 4347;
         public const int BruceWillis = 62;
         public const int HughLaurie = 41419;
         public const string ImdbBruceWillis = "nm0000246";
@@ -47,6 +51,7 @@
 
         // Collections
         public const int JamesBondCollection = 645;
+        public const int BackToTheFutureCollection = 264;
 
         // Networks
         public const int TwentiethCenturyFox = 25;
@@ -58,6 +63,13 @@
         public const string BruceWillisMiamiVice = "525719bb760ee3776a1835d3";
         public const string HughLaurieHouse = "5256ccf519c2956ff607ca00";
 
+        // Genres
+        public const int ActionAdventureTvGenre = 10759;
+        public const int AdventureMovieGenre = 12;
+
+        // Keywords
+        public const int AgentKeyword = 33705;
+
         // Invalid IDs
         public const int MissingMovie = 230;
         public const int MissingID = 999999999;
diff --git a/TMDbLibTests/Helpers/PropertyHelpers.cs b/TMDbLibTests/Helpers/PropertyHelpers.cs
new file mode 100644
index 0000000..06394e5
--- /dev/null
+++ b/TMDbLibTests/Helpers/PropertyHelpers.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace TMDbLibTests.Helpers
+{
+    internal static class PropertyHelpers
+    {
+        public static PropertyInfo GetPropertyInfo<TSource, TProperty>(Expression<Func<TSource, TProperty>> propertyLambda)
+        {
+            Type type = typeof(TSource);
+
+            MemberExpression member;
+            if (propertyLambda.Body is MemberExpression asMember)
+                member = asMember;
+            else if (propertyLambda.Body is UnaryExpression asUnary && asUnary.Operand is MemberExpression asMember2)
+                member = asMember2;
+            else
+                throw new ArgumentException($"Expression '{propertyLambda}' refers to a method, not a property.");
+
+            PropertyInfo propInfo = member.Member as PropertyInfo;
+            if (propInfo == null)
+                throw new ArgumentException($"Expression '{propertyLambda}' refers to a field, not a property.");
+
+            if (type != propInfo.ReflectedType &&
+                !type.IsSubclassOf(propInfo.ReflectedType))
+                throw new ArgumentException($"Expression '{propertyLambda}' refers to a property that is not from type {type}.");
+
+            return propInfo;
+        }
+    }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Helpers/TestHelpers.cs b/TMDbLibTests/Helpers/TestHelpers.cs
index 1e560f3..d9aee77 100644
--- a/TMDbLibTests/Helpers/TestHelpers.cs
+++ b/TMDbLibTests/Helpers/TestHelpers.cs
@@ -1,6 +1,5 @@
 using System;
-using System.Diagnostics;
-using System.Net;
+using System.Threading.Tasks;
 using TMDbLib.Objects.General;
 using Xunit;
 
@@ -8,56 +7,32 @@ namespace TMDbLibTests.Helpers
 {
     public static class TestHelpers
     {
-        public static bool InternetUriExists(Uri uri)
+        public static Task SearchPagesAsync<T>(Func<int, Task<SearchContainer<T>>> getter)
         {
-            HttpWebRequest req = (HttpWebRequest)WebRequest.Create(uri);
-            req.Method = "HEAD";
-
-            try
-            {
-                using (req.GetResponseAsync().Sync())
-                {
-                    // It exists
-                    return true;
-                }
-            }
-            catch (WebException ex)
-            {
-                HttpWebResponse response = (HttpWebResponse)ex.Response;
-                if (response == null)
-                    Debug.WriteLine(ex.Status + ": " + uri);
-                else
-                    Debug.WriteLine(response.StatusCode + ": " + uri);
-                return false;
-            }
+            return SearchPagesAsync<SearchContainer<T>, T>(getter);
         }
 
-        public static void SearchPages<T>(Func<int, SearchContainer<T>> getter)
+        public static async Task SearchPagesAsync<TContainer, T>(Func<int, Task<TContainer>> getter) where TContainer : SearchContainer<T>
         {
             // Check page 1
-            SearchContainer<T> results = getter(1);
-
-            Assert.NotNull(results);
-            Assert.NotNull(results.Results);
+            TContainer results = await getter(1);
+            
             Assert.Equal(1, results.Page);
+            Assert.NotEmpty(results.Results);
             Assert.True(results.Results.Count > 0);
             Assert.True(results.TotalResults > 0);
             Assert.True(results.TotalPages > 0);
 
             // Check page 2
-            SearchContainer<T> results2 = getter(2);
-
-            Assert.NotNull(results2);
-            Assert.NotNull(results2.Results);
+            TContainer results2 = await getter(2);
+            
             Assert.Equal(2, results2.Page);
-            // The page counts often don't match due to caching on the api
-            //Assert.AreEqual(results.TotalResults, results2.TotalResults);
-            //Assert.AreEqual(results.TotalPages, results2.TotalPages);
 
+            // If page 1 has all results, page 2 must be empty - else not.
             if (results.Results.Count == results.TotalResults)
-                Assert.Equal(0, results2.Results.Count);
+                Assert.Empty(results2.Results);
             else
-                Assert.NotEqual(0, results2.Results.Count);
+                Assert.NotEmpty(results2.Results);
         }
     }
 }
diff --git a/TMDbLibTests/Helpers/TestImagesHelpers.cs b/TMDbLibTests/Helpers/TestImagesHelpers.cs
index 6616224..f880f42 100644
--- a/TMDbLibTests/Helpers/TestImagesHelpers.cs
+++ b/TMDbLibTests/Helpers/TestImagesHelpers.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Collections.Generic;
-using TMDbLib.Objects.General;
-using System.Linq;
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
+using TMDbLib.Objects.General;
 using TMDbLib.Objects.People;
 using Xunit;
 
@@ -12,43 +10,25 @@ namespace TMDbLibTests.Helpers
     {
         private static readonly Regex ImagePathRegex = new Regex(@"^/[a-zA-Z0-9]{26,}\.(?:jpg|png)$", RegexOptions.Compiled);
 
-        public static void TestImages(TestConfig config, ProfileImages images)
+        public static void TestImagePaths(Images images)
         {
-            Assert.True(images.Profiles.Count > 0);
-
-            string profileSize = config.Client.Config.Images.ProfileSizes.First();
-
-            TestImagesInternal(config, images.Profiles.Select(s => s.FilePath), profileSize);
+            TestImagePaths(images.Backdrops);
+            TestImagePaths(images.Posters);
         }
 
-        public static void TestImages(TestConfig config, Images images)
+        public static void TestImagePaths(IEnumerable<string> imagePaths)
         {
-            Assert.True(images.Backdrops.Count > 0);
-            Assert.True(images.Posters.Count > 0);
-
-            string backdropSize = config.Client.Config.Images.BackdropSizes.First();
-            string posterSize = config.Client.Config.Images.PosterSizes.First();
-
-            TestImagesInternal(config, images.Backdrops.Select(s => s.FilePath), backdropSize);
-
-            TestImagesInternal(config, images.Posters.Select(s => s.FilePath), posterSize);
+            Assert.All(imagePaths, path => Assert.True(ImagePathRegex.IsMatch(path), "path was not a valid image path, was: " + path));
         }
 
-        private static void TestImagesInternal(TestConfig config, IEnumerable<string> images, string posterSize)
+        public static void TestImagePaths<T>(IEnumerable<T> images) where T : ImageData
         {
-            foreach (string imageData in images)
-            {
-                Uri url = config.Client.GetImageUrl(posterSize, imageData);
-                Uri urlSecure = config.Client.GetImageUrl(posterSize, imageData, true);
-
-                Assert.True(TestHelpers.InternetUriExists(url));
-                Assert.True(TestHelpers.InternetUriExists(urlSecure));
-            }
+            Assert.All(images, x => Assert.True(ImagePathRegex.IsMatch(x.FilePath), "image.FilePath was not a valid image path, was: " + x.FilePath));
         }
 
-        public static bool TestImagePath(string path)
+        public static void TestImagePaths(IEnumerable<TaggedImage> images)
         {
-            return ImagePathRegex.IsMatch(path);
+            Assert.All(images, x => Assert.True(ImagePathRegex.IsMatch(x.FilePath), "image.FilePath was not a valid image path, was: " + x.FilePath));
         }
     }
 }
diff --git a/TMDbLibTests/Helpers/TestMethodsHelper.cs b/TMDbLibTests/Helpers/TestMethodsHelper.cs
index ba175dd..ac385e9 100644
--- a/TMDbLibTests/Helpers/TestMethodsHelper.cs
+++ b/TMDbLibTests/Helpers/TestMethodsHelper.cs
@@ -1,41 +1,74 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace TMDbLibTests.Helpers
 {
     public static class TestMethodsHelper
     {
-        public static void TestGetExclusive<T, TId, TResult>(Dictionary<T, Func<TResult, object>> methodSelectors, Func<TId, T, TResult> getterMethod, TId id) where T : struct
+        /// <summary>
+        /// Tests that a client method will get a specific part of the TMDb api, but not any other methods
+        /// </summary>
+        public static async Task TestGetExclusive<TEnum, TResult>(Dictionary<TEnum, Func<TResult, object>> methodSelectors, Func<TEnum, Task<TResult>> getterMethod) where TEnum : Enum
         {
-            Assert.True(typeof(T).GetTypeInfo().IsEnum);
-
             // Test each method
-            foreach (T method in methodSelectors.Keys)
+            foreach (TEnum method in methodSelectors.Keys)
             {
                 // Fetch data
-                TResult item = getterMethod(id, method);
+                TResult item = await getterMethod(method);
 
                 // Ensure we have the piece we're looking for
                 Assert.NotNull(methodSelectors[method](item));
 
                 // .. And none of the others
-                foreach (T nonExpectedMethod in methodSelectors.Keys.Except(new[] { method }))
-                    Assert.Null(methodSelectors[nonExpectedMethod](item));
+                foreach (TEnum otherMethod in methodSelectors.Keys.Except(new[] { method }))
+                    Assert.Null(methodSelectors[otherMethod](item));
             }
         }
 
-        public static void TestAllNotNull<T, TResult>(Dictionary<T, Func<TResult, object>> methodSelectors, TResult item) where T : struct
+        /// <summary>
+        /// Tests that a client method will get all parts of the TMDb api, when requested
+        /// </summary>
+        public static async Task TestGetAll<TEnum, TResult>(Dictionary<TEnum, Func<TResult, object>> methodSelectors, Func<TEnum, Task<TResult>> getterMethod, Func<TResult, Task> extraAction = null) where TEnum : Enum
         {
-            Assert.True(typeof(T).GetTypeInfo().IsEnum);
+            int combinedEnumInt = 0;
+            foreach (TEnum key in methodSelectors.Keys)
+                combinedEnumInt |= Convert.ToInt32(key);
+
+            TEnum combinedEnum = (TEnum)Enum.ToObject(typeof(TEnum), combinedEnumInt);
+
+            TResult item = await getterMethod(combinedEnum);
 
             // Ensure we have all the pieces
-            foreach (T method in methodSelectors.Keys)
-            {
+            foreach (TEnum method in methodSelectors.Keys)
                 Assert.NotNull(methodSelectors[method](item));
-            }
+
+            // Execute any additional tests
+            if (extraAction != null)
+                await extraAction(item);
+        }
+
+        public static async Task SetValidateRemoveTest(Func<Task> set, Func<Task> remove, Func<bool, Task> validate)
+        {
+            // Act
+            await set();
+
+            // Allow TMDb to cache our changes
+            await Task.Delay(2000);
+            
+            // Validate
+            await validate(true);
+            
+            // Act
+            await remove();
+
+            // Allow TMDb to cache our changes
+            await Task.Delay(2000);
+
+            // Validate
+            await validate(false);
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/Helpers/VerifyExtensions.cs b/TMDbLibTests/Helpers/VerifyExtensions.cs
new file mode 100644
index 0000000..ab0f33c
--- /dev/null
+++ b/TMDbLibTests/Helpers/VerifyExtensions.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using Newtonsoft.Json;
+using VerifyTests;
+
+namespace TMDbLibTests.Helpers
+{
+    internal static class VerifyExtensions
+    {
+        private static string GetPropertyName<T>(Expression<Func<T, object>> expression)
+        {
+            PropertyInfo prop = PropertyHelpers.GetPropertyInfo(expression);
+
+            JsonPropertyAttribute jsonPropAttribute = prop.GetCustomAttribute<JsonPropertyAttribute>();
+            return jsonPropAttribute?.PropertyName ?? prop.Name;
+        }
+
+        public static VerifySettings IgnoreProperty(this VerifySettings settings, params string[] properties)
+        {
+            foreach (string propName in properties)
+            {
+                string searchString = $" {propName}: ";
+                settings.ScrubLines(x => x.Contains(searchString));
+            }
+
+            return settings;
+        }
+
+        public static VerifySettings IgnoreProperty<T>(this VerifySettings settings, params Expression<Func<T, object>>[] properties)
+        {
+            string[] propNames = properties.Select(GetPropertyName).ToArray();
+
+            return settings.IgnoreProperty(propNames);
+        }
+
+        private static Regex _propRegex = new Regex(@"^(?<pre>[\s]*)(?<name>[\S]+): (?<value>.*?)(?<post>,|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+        public static VerifySettings SimplifyProperty(this VerifySettings settings, params string[] properties)
+        {
+            foreach (string propName in properties)
+            {
+                settings.ScrubLinesWithReplace(original =>
+                {
+                    Match match = _propRegex.Match(original);
+                    if (!match.Success)
+                        return original;
+
+                    if (match.Groups["name"].Value != propName)
+                        return original;
+
+                    string newValue = match.Groups["value"].Value;
+                    if (newValue.Length > 0)
+                        newValue = "<non-empty>";
+
+                    return match.Groups["pre"].Value + match.Groups["name"].Value + ": " + newValue +
+                           match.Groups["post"].Value;
+                });
+            }
+
+            return settings;
+        }
+
+        public static VerifySettings SimplifyProperty<T>(this VerifySettings settings, params Expression<Func<T, object>>[] properties)
+        {
+            string[] propNames = properties.Select(GetPropertyName).ToArray();
+
+            return settings.SimplifyProperty(propNames);
+        }
+    }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/JsonHelpers/FailingContractResolver.cs b/TMDbLibTests/JsonHelpers/FailingContractResolver.cs
deleted file mode 100644
index 8a32858..0000000
--- a/TMDbLibTests/JsonHelpers/FailingContractResolver.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Reflection;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-
-namespace TMDbLibTests.JsonHelpers
-{
-    public class FailingContractResolver : DefaultContractResolver
-    {
-        protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
-        {
-            JsonProperty res = base.CreateProperty(member, memberSerialization);
-
-            if (!res.Ignored)
-                // If we haven't explicitly stated that a field is not needed, we require it for compliance
-                res.Required = Required.AllowNull;
-
-            return res;
-        }
-    }
-}
\ No newline at end of file
diff --git a/TMDbLibTests/JsonHelpers/TestBase.cs b/TMDbLibTests/JsonHelpers/TestBase.cs
index 4dd9e26..d87a383 100644
--- a/TMDbLibTests/JsonHelpers/TestBase.cs
+++ b/TMDbLibTests/JsonHelpers/TestBase.cs
@@ -1,146 +1,174 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
+using System.Net;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
+using TMDbLib.Client;
+using TMDbLib.Objects.General;
+using TMDbLib.Objects.Search;
+using TMDbLibTests.Helpers;
+using VerifyTests;
+using VerifyXunit;
 
 namespace TMDbLibTests.JsonHelpers
 {
-    public class TestBase : IDisposable
+    [UsesVerify]
+    public abstract class TestBase
     {
-        private static readonly Regex NormalizeRegex = new Regex(@"\[[\d]+\]", RegexOptions.Compiled);
-        private readonly List<ErrorEventArgs> _errors = new List<ErrorEventArgs>();
+        private VerifySettings VerifySettings { get; }
 
-        protected readonly TestConfig Config;
+        protected readonly TestConfig TestConfig;
 
-        private readonly List<string> _ignoreMissingCSharp;
+        protected TMDbClient TMDbClient => TestConfig.Client;
 
-        private readonly List<string> _ignoreMissingJson;
-
-        /// <summary>
-        /// Ignores errors about missing JSON properties (Where C# properties are not set)
-        /// </summary>
-        protected void IgnoreMissingJson(params string[] keys)
+        protected TestBase()
         {
-            _ignoreMissingJson.AddRange(keys);
-        }
+            VerifySettings = new VerifySettings();
+            //VerifySettings.UseExtension("json");
+            VerifySettings.AutoVerify();
 
-        /// <summary>
-        /// Ignores errors about missing C# properties (Where new or unknown JSON properties are present)
-        /// </summary>
-        protected void IgnoreMissingCSharp(params string[] keys)
-        {
-            _ignoreMissingCSharp.AddRange(keys);
-        }
+            VerifySettings.UseDirectory("..\\Verification");
 
-        public TestBase()
-        {
-            _ignoreMissingJson = new List<string>();
-            _ignoreMissingCSharp = new List<string>();
+            // Ignore and simplify many dynamic properties
+            VerifySettings.IgnoreProperty<SearchMovie>(x => x.VoteCount, x => x.Popularity, x => x.VoteAverage);
+            VerifySettings.SimplifyProperty<SearchMovie>(x => x.BackdropPath, x => x.PosterPath);
+            VerifySettings.SimplifyProperty<SearchPerson>(x => x.ProfilePath);
+            VerifySettings.SimplifyProperty<SearchTvEpisode>(x => x.StillPath);
+            VerifySettings.SimplifyProperty<ImageData>(x => x.FilePath);
+            VerifySettings.SimplifyProperty<SearchCompany>(x => x.LogoPath);
+
+            VerifySettings.AddExtraSettings(serializerSettings =>
+            {
+                serializerSettings.ContractResolver = new DataSortingContractResolver(serializerSettings.ContractResolver);
+            });
 
             JsonSerializerSettings sett = new JsonSerializerSettings();
 
-            sett.MissingMemberHandling = MissingMemberHandling.Error;
-            sett.ContractResolver = new FailingContractResolver();
-            sett.Error = Error;
+            WebProxy proxy = null;
+            //WebProxy proxy = new WebProxy("http://127.0.0.1:8888");
 
-            Config = new TestConfig(serializer: JsonSerializer.Create(sett));
+            TestConfig = new TestConfig(serializer: JsonSerializer.Create(sett), proxy: proxy);
         }
 
-        private void Error(object sender, ErrorEventArgs errorEventArgs)
+        protected Task Verify<T>(T obj, Action<VerifySettings> configure = null)
         {
-            _errors.Add(errorEventArgs);
-            errorEventArgs.ErrorContext.Handled = true;
-        }
+            VerifySettings settings = VerifySettings;
 
-        public void Dispose()
-        {
-            if (_errors.Any())
+            if (configure != null)
             {
-                // Sort the errors
-                // Also deduplicate them, as there is no point in blasting us with multiple instances of the "same" error
-                Dictionary<string, ErrorEventArgs> missingFieldInCSharp = new Dictionary<string, ErrorEventArgs>();
-                Dictionary<string, ErrorEventArgs> missingPropertyInJson = new Dictionary<string, ErrorEventArgs>();
-                Dictionary<string, ErrorEventArgs> other = new Dictionary<string, ErrorEventArgs>();
+                settings = new VerifySettings(VerifySettings);
+                configure(settings);
+            }
 
-                foreach (ErrorEventArgs error in _errors)
+            return Verifier.Verify(obj, settings);
+        }
+
+        class DataSortingContractResolver : IContractResolver
+        {
+            private readonly IContractResolver _innerResolver;
+
+            public DataSortingContractResolver(IContractResolver innerResolver)
+            {
+                _innerResolver = innerResolver;
+            }
+
+            public JsonContract ResolveContract(Type type)
+            {
+                JsonContract contract = _innerResolver.ResolveContract(type);
+
+                // Add a callback that is invoked on each serialization of an object
+                // We do this to be able to sort lists
+                contract.OnSerializingCallbacks.Add(SerializingCallback);
+
+                return contract;
+            }
+
+            private static string[] _sortFieldsInOrder = { "CreditId", "Id", "Iso_3166_1", "EpisodeNumber", "SeasonNumber" };
+
+            private void SerializingCallback(object obj, StreamingContext context)
+            {
+                if (!(obj is IEnumerable) || obj is IDictionary)
+                    return;
+
+                Type objType = obj.GetType();
+                if (obj is IList objAsList)
                 {
-                    string key = error.ErrorContext.Path + " / " + error.ErrorContext.Member;
-                    string errorMessage = error.ErrorContext.Error.Message;
+                    Debug.Assert(objType.IsGenericType);
 
-                    key = NormalizeRegex.Replace(key, "[array]");
+                    Type innerType = objType.GetGenericArguments().First();
 
-                    if (errorMessage.StartsWith("Could not find member"))
-                    {
-                        // Field in JSON is missing in C#
-                        if (!_ignoreMissingCSharp.Contains(key) && !missingFieldInCSharp.ContainsKey(key))
-                            missingFieldInCSharp.Add(key, error);
-                    }
-                    else if (errorMessage.StartsWith("Required property"))
-                    {
-                        // Field in C# is missing in JSON
-                        if (!_ignoreMissingJson.Contains(key) && !missingPropertyInJson.ContainsKey(key))
-                            missingPropertyInJson.Add(key, error);
-                    }
+                    // Determine which comparer to use
+                    IComparer comparer = null;
+                    if (innerType.IsValueType)
+                        comparer = Comparer.Default;
                     else
                     {
-                        if (!other.ContainsKey(key))
-                            other.Add(key, error);
+                        foreach (string fieldName in _sortFieldsInOrder)
+                        {
+                            PropertyInfo prop = innerType.GetProperty(fieldName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.GetProperty);
+                            if (prop == null)
+                                continue;
+
+                            comparer = new CompareObjectOnProperty(prop);
+                            break;
+                        }
+                    }
+
+                    if (comparer != null)
+                    {
+                        // Is sorted?
+                        bool isSorted = IsSorted(objAsList, comparer);
+
+                        if (!isSorted)
+                        {
+                            // Sort the list using our comparer
+                            List<object> sortList = objAsList.Cast<object>().ToList();
+                            sortList.Sort((x, y) => comparer.Compare(x, y));
+
+                            // Transfer values
+                            for (int i = 0; i < objAsList.Count; i++)
+                                objAsList[i] = sortList[i];
+                        }
                     }
                 }
+            }
 
-                // Combine all errors into a nice text
-                StringBuilder sb = new StringBuilder();
-
-                if (missingFieldInCSharp.Any())
+            private static bool IsSorted(IList list, IComparer comparer)
+            {
+                for (var i = 1; i < list.Count; i++)
                 {
-                    sb.AppendLine("Fields missing in C# (Present in JSON)");
-                    foreach (KeyValuePair<string, ErrorEventArgs> pair in missingFieldInCSharp)
-                        sb.AppendLine($"[{pair.Value.CurrentObject.GetType().Name}] {pair.Key}: {pair.Value.ErrorContext.Error.Message}");
+                    var a = list[i - 1];
+                    var b = list[i];
 
-                    sb.AppendLine();
+                    if (comparer.Compare(a, b) > 0)
+                        return false;
                 }
 
-                if (missingPropertyInJson.Any())
-                {
-                    sb.AppendLine("Fields missing in JSON (Present in C#)");
-                    foreach (KeyValuePair<string, ErrorEventArgs> pair in missingPropertyInJson)
-                        sb.AppendLine($"[{pair.Value.CurrentObject.GetType().Name}] {pair.Key}: {pair.Value.ErrorContext.Error.Message}");
+                return true;
+            }
 
-                    sb.AppendLine();
+            class CompareObjectOnProperty : IComparer
+            {
+                private readonly PropertyInfo _property;
+
+                public CompareObjectOnProperty(PropertyInfo property)
+                {
+                    _property = property;
                 }
 
-                if (other.Any())
+                public int Compare(object x, object y)
                 {
-                    sb.AppendLine("Other errors");
-                    foreach (KeyValuePair<string, ErrorEventArgs> pair in other)
-                        sb.AppendLine($"[{pair.Value.CurrentObject.GetType().Name}] {pair.Key}: {pair.Value.ErrorContext.Error.Message}");
+                    object? valX = _property.GetValue(x);
+                    object? valY = _property.GetValue(y);
 
-                    sb.AppendLine();
+                    return Comparer.Default.Compare(valX, valY);
                 }
-
-                if (missingFieldInCSharp.Any())
-                {
-                    // Helper line of properties that can be ignored
-                    sb.AppendLine("Ignore JSON props missing from C#:");
-                    sb.AppendLine(nameof(IgnoreMissingCSharp) + "(" + string.Join(", ", missingFieldInCSharp.OrderBy(s => s.Key).Select(s => $"\"{s.Key}\"")) + ");");
-
-                    sb.AppendLine();
-                }
-
-                if (missingPropertyInJson.Any())
-                {
-                    // Helper line of properties that can be ignored
-                    sb.AppendLine("Ignore C# props missing from JSON:");
-                    sb.AppendLine(nameof(IgnoreMissingJson) + "(" + string.Join(", ", missingPropertyInJson.OrderBy(s => s.Key).Select(s => $"\"{s.Key}\"")) + ");");
-
-                    sb.AppendLine();
-                }
-
-                if (missingFieldInCSharp.Any() || missingPropertyInJson.Any() || other.Any())
-                    throw new Exception(sb.ToString());
             }
         }
     }
diff --git a/TMDbLibTests/TMDbLibTests.csproj b/TMDbLibTests/TMDbLibTests.csproj
index f547593..d496e19 100644
--- a/TMDbLibTests/TMDbLibTests.csproj
+++ b/TMDbLibTests/TMDbLibTests.csproj
@@ -6,14 +6,19 @@
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="JsonHelpers\*.verified.txt" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\TMDbLib\TMDbLib.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="All" />
+    <PackageReference Include="Verify.Xunit" Version="11.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TMDbLibTests/TestConfig.cs b/TMDbLibTests/TestConfig.cs
index e491750..456e961 100644
--- a/TMDbLibTests/TestConfig.cs
+++ b/TMDbLibTests/TestConfig.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using System.Net;
+using Newtonsoft.Json;
 using TMDbLibTests.Exceptions;
 using TMDbLib.Client;
 
@@ -13,18 +14,18 @@ namespace TMDbLibTests
         public readonly string UserSessionId = "c413282cdadad9af972c06d9b13096a8b13ab1c1";
         public readonly string GuestTestSessionId = "d425468da2781d6799ba14c05f7327e7";
 
-        public TMDbClient Client { get; set; }
+        public TMDbClient Client { get; }
 
         public string Username = "TMDbTestAccount";
 
         public string Password = "TJX6vP7bPC%!ZrJwAqtCU5FshHEKAwzr6YvR3%CU9s7BrjqUWmjC8AMuXju*eTEu524zsxDQK5ySY6EmjAC3e54B%WvkS9FNPE3K";
 
-        public TestConfig(bool useSsl = false, JsonSerializer serializer = null)
+        public TestConfig(bool useSsl = false, JsonSerializer serializer = null, IWebProxy proxy = null)
         {
             if (APIKey.Length == 0)
                 throw new ConfigurationErrorsException("You need to configure the API Key before running any tests. Look at the TestConfig class.");
 
-            Client = new TMDbClient(APIKey, useSsl, serializer: serializer)
+            Client = new TMDbClient(APIKey, useSsl, serializer: serializer, proxy: proxy)
             {
                 MaxRetryCount = 1
             };
diff --git a/TMDbLibTests/UtilityTests/AccountStateConverterTest.cs b/TMDbLibTests/UtilityTests/AccountStateConverterTest.cs
index d56b217..3ef1b39 100644
--- a/TMDbLibTests/UtilityTests/AccountStateConverterTest.cs
+++ b/TMDbLibTests/UtilityTests/AccountStateConverterTest.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using TMDbLib.Objects.Authentication;
 using TMDbLib.Objects.General;
@@ -20,13 +21,15 @@ namespace TMDbLibTests.UtilityTests
             JsonSerializerSettings settings = new JsonSerializerSettings();
             settings.Converters.Add(new AccountStateConverter());
 
-            AccountState original = new AccountState();
-            original.Rating = 5;
+            var original = new
+            {
+                rated = new { value = 5 }
+            };
 
             string json = JsonConvert.SerializeObject(original, settings);
             AccountState result = JsonConvert.DeserializeObject<AccountState>(json, settings);
 
-            Assert.Equal(original.Rating, result.Rating);
+            Assert.Equal(5, result.Rating);
         }
 
         [Fact]
@@ -37,54 +40,48 @@ namespace TMDbLibTests.UtilityTests
             JsonSerializerSettings settings = new JsonSerializerSettings();
             settings.Converters.Add(new AccountStateConverter());
 
-            AccountState original = new AccountState();
-            original.Rating = null;
-
+            var original = new { rated = false };
             string json = JsonConvert.SerializeObject(original, settings);
             AccountState result = JsonConvert.DeserializeObject<AccountState>(json, settings);
 
-            Assert.Equal(original.Rating, result.Rating);
+            Assert.Null(result.Rating);
         }
 
         /// <summary>
         /// Tests the AccountStateConverter on the AccountState type
         /// </summary>
         [Fact]
-        public void TestAccountStateConverterAccountState()
+        public async Task TestAccountStateConverterAccountState()
         {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            AccountState accountState = Config.Client.GetMovieAccountStateAsync(IdHelper.Avatar).Sync();
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
+            AccountState accountState = await TMDbClient.GetMovieAccountStateAsync(IdHelper.Avatar);
 
-            Assert.Equal(IdHelper.Avatar, accountState.Id);
-            Assert.True(accountState.Favorite);
-            Assert.False(accountState.Watchlist);
-            Assert.Equal(2.5d, accountState.Rating);
+            await Verify(accountState);
         }
 
         /// <summary>
         /// Tests the AccountStateConverter on the TvEpisodeAccountState type
         /// </summary>
         [Fact]
-        public void TestAccountStateConverterTvEpisodeAccountState()
+        public async Task TestAccountStateConverterTvEpisodeAccountState()
         {
-            Config.Client.SetSessionInformation(Config.UserSessionId, SessionType.UserSession);
-            ResultContainer<TvEpisodeAccountStateWithNumber> season = Config.Client.GetTvSeasonAccountStateAsync(IdHelper.BigBangTheory, 1).Sync();
+            await TMDbClient.SetSessionInformationAsync(TestConfig.UserSessionId, SessionType.UserSession);
+            ResultContainer<TvEpisodeAccountStateWithNumber> season = await TMDbClient.GetTvSeasonAccountStateAsync(IdHelper.BigBangTheory, 1);
 
             // Episode 1 has a rating
-            TvEpisodeAccountStateWithNumber episode = season.Results.FirstOrDefault(s => s.EpisodeNumber == 1);
-            Assert.NotNull(episode);
+            TvEpisodeAccountStateWithNumber episodeA = season.Results.Single(s => s.EpisodeNumber == 1);
 
-            Assert.Equal(IdHelper.BigBangTheorySeason1Episode1Id, episode.Id);
-            Assert.Equal(1, episode.EpisodeNumber);
-            Assert.Equal(5d, episode.Rating);
+            Assert.NotNull(episodeA.Rating);
 
             // Episode 2 has no rating
-            episode = season.Results.FirstOrDefault(s => s.EpisodeNumber == 2);
-            Assert.NotNull(episode);
+            TvEpisodeAccountStateWithNumber episodeB = season.Results.Single(s => s.EpisodeNumber == 2);
+            Assert.Null(episodeB.Rating);
 
-            Assert.Equal(IdHelper.BigBangTheorySeason1Episode2Id, episode.Id);
-            Assert.Equal(2, episode.EpisodeNumber);
-            Assert.Null(episode.Rating);
+            await Verify(new
+            {
+                episodeA,
+                episodeB
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/UtilityTests/ChangeItemConverterTest.cs b/TMDbLibTests/UtilityTests/ChangeItemConverterTest.cs
index 2b3cf11..c2cf2c1 100644
--- a/TMDbLibTests/UtilityTests/ChangeItemConverterTest.cs
+++ b/TMDbLibTests/UtilityTests/ChangeItemConverterTest.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using TMDbLib.Objects.Changes;
 using TMDbLib.Objects.Movies;
 using TMDbLib.Utilities.Converters;
-using TMDbLibTests.Helpers;
 using TMDbLibTests.JsonHelpers;
 using Xunit;
 
@@ -13,7 +13,7 @@ namespace TMDbLibTests.UtilityTests
     public class ChangeItemConverterTest : TestBase
     {
         [Fact]
-        public void ChangeItemConverter_ChangeItemAdded()
+        public async Task ChangeItemConverter_ChangeItemAdded()
         {
             JsonSerializerSettings settings = new JsonSerializerSettings();
             settings.Converters.Add(new ChangeItemConverter());
@@ -25,13 +25,11 @@ namespace TMDbLibTests.UtilityTests
             string json = JsonConvert.SerializeObject(original, settings);
             ChangeItemAdded result = JsonConvert.DeserializeObject<ChangeItemBase>(json, settings) as ChangeItemAdded;
 
-            Assert.NotNull(result);
-            Assert.Equal(original.Iso_639_1, result.Iso_639_1);
-            Assert.Equal(original.Value, result.Value);
+            await Verify(result);
         }
 
         [Fact]
-        public void ChangeItemConverter_ChangeItemCreated()
+        public async Task ChangeItemConverter_ChangeItemCreated()
         {
             JsonSerializerSettings settings = new JsonSerializerSettings();
             settings.Converters.Add(new ChangeItemConverter());
@@ -41,13 +39,12 @@ namespace TMDbLibTests.UtilityTests
 
             string json = JsonConvert.SerializeObject(original, settings);
             ChangeItemCreated result = JsonConvert.DeserializeObject<ChangeItemBase>(json, settings) as ChangeItemCreated;
-
-            Assert.NotNull(result);
-            Assert.Equal(original.Iso_639_1, result.Iso_639_1);
+            
+            await Verify(result);
         }
 
         [Fact]
-        public void ChangeItemConverter_ChangeItemDeleted()
+        public async Task ChangeItemConverter_ChangeItemDeleted()
         {
             JsonSerializerSettings settings = new JsonSerializerSettings();
             settings.Converters.Add(new ChangeItemConverter());
@@ -58,14 +55,12 @@ namespace TMDbLibTests.UtilityTests
 
             string json = JsonConvert.SerializeObject(original, settings);
             ChangeItemDeleted result = JsonConvert.DeserializeObject<ChangeItemBase>(json, settings) as ChangeItemDeleted;
-
-            Assert.NotNull(result);
-            Assert.Equal(original.Iso_639_1, result.Iso_639_1);
-            Assert.Equal(original.OriginalValue, result.OriginalValue);
+            
+            await Verify(result);
         }
 
         [Fact]
-        public void ChangeItemConverter_ChangeItemUpdated()
+        public async Task ChangeItemConverter_ChangeItemUpdated()
         {
             JsonSerializerSettings settings = new JsonSerializerSettings();
             settings.Converters.Add(new ChangeItemConverter());
@@ -77,27 +72,19 @@ namespace TMDbLibTests.UtilityTests
 
             string json = JsonConvert.SerializeObject(original, settings);
             ChangeItemUpdated result = JsonConvert.DeserializeObject<ChangeItemBase>(json, settings) as ChangeItemUpdated;
-
-            Assert.NotNull(result);
-            Assert.Equal(original.Iso_639_1, result.Iso_639_1);
-            Assert.Equal(original.OriginalValue, result.OriginalValue);
-            Assert.Equal(original.Value, result.Value);
+            
+            await Verify(result);
         }
 
         /// <summary>
         /// Tests the ChangeItemConverter
         /// </summary>
         [Fact]
-        public void TestChangeItemConverter()
+        public async Task TestChangeItemConverter()
         {
-            // Not all ChangeItem's have an iso_639_1 or an original_value
-            IgnoreMissingJson(" / iso_639_1", " / original_value");
+            Movie latestMovie = await TMDbClient.GetMovieLatestAsync();
+            IList<Change> changes = await TMDbClient.GetMovieChangesAsync(latestMovie.Id);
 
-            // Ignore missing movie properties
-            IgnoreMissingJson(" / account_states", " / alternative_titles", " / changes", " / credits", " / images", " / keywords", " / lists", " / release_dates", " / releases", " / reviews", " / similar", " / translations", " / videos", " / external_ids", " / recommendations");
-
-            Movie latestMovie = Config.Client.GetMovieLatestAsync().Sync();
-            List<Change> changes = Config.Client.GetMovieChangesAsync(latestMovie.Id).Sync();
             List<ChangeItemBase> changeItems = changes.SelectMany(s => s.Items).ToList();
 
             ChangeAction[] actions = { ChangeAction.Added, ChangeAction.Created, ChangeAction.Updated };
diff --git a/TMDbLibTests/UtilityTests/CustomDatetimeFormatConverterTest.cs b/TMDbLibTests/UtilityTests/CustomDatetimeFormatConverterTest.cs
index 5b53c1c..f0223ed 100644
--- a/TMDbLibTests/UtilityTests/CustomDatetimeFormatConverterTest.cs
+++ b/TMDbLibTests/UtilityTests/CustomDatetimeFormatConverterTest.cs
@@ -1,8 +1,8 @@
 using System;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using TMDbLib.Objects.Authentication;
 using TMDbLib.Utilities.Converters;
-using TMDbLibTests.Helpers;
 using TMDbLibTests.JsonHelpers;
 using Xunit;
 
@@ -30,9 +30,9 @@ namespace TMDbLibTests.UtilityTests
         /// Tests the CustomDatetimeFormatConverter
         /// </summary>
         [Fact]
-        public void TestCustomDatetimeFormatConverter()
+        public async Task TestCustomDatetimeFormatConverter()
         {
-            Token token = Config.Client.AuthenticationRequestAutenticationTokenAsync().Sync();
+            Token token = await TMDbClient.AuthenticationRequestAutenticationTokenAsync();
 
             DateTime low = DateTime.UtcNow.AddHours(-2);
             DateTime high = DateTime.UtcNow.AddHours(2);
diff --git a/TMDbLibTests/UtilityTests/EnumStringValueConverterTest.cs b/TMDbLibTests/UtilityTests/EnumStringValueConverterTest.cs
index 82a72cf..cce0e6c 100644
--- a/TMDbLibTests/UtilityTests/EnumStringValueConverterTest.cs
+++ b/TMDbLibTests/UtilityTests/EnumStringValueConverterTest.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
 using Newtonsoft.Json;
 using TMDbLib.Objects.Changes;
 using TMDbLib.Objects.General;
@@ -15,11 +13,11 @@ namespace TMDbLibTests.UtilityTests
     {
         public static IEnumerable<object[]> GetEnumMembers(Type type)
         {
-            IEnumerable<FieldInfo> members = type.GetTypeInfo().DeclaredFields.Where(s => s.IsStatic);
+            Array values = Enum.GetValues(type);
 
-            foreach (FieldInfo member in members)
+            foreach (Enum value in values)
             {
-                yield return new[] { member.GetValue(null) };
+                yield return new object[] { value };
             }
         }
 
diff --git a/TMDbLibTests/UtilityTests/KnownForConverterTest.cs b/TMDbLibTests/UtilityTests/KnownForConverterTest.cs
index 8e9e2f0..5e06cf1 100644
--- a/TMDbLibTests/UtilityTests/KnownForConverterTest.cs
+++ b/TMDbLibTests/UtilityTests/KnownForConverterTest.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using TMDbLib.Objects.General;
 using TMDbLib.Objects.Search;
 using TMDbLib.Utilities.Converters;
-using TMDbLibTests.Helpers;
 using TMDbLibTests.JsonHelpers;
 using Xunit;
 
@@ -13,7 +13,7 @@ namespace TMDbLibTests.UtilityTests
     public class KnownForConverterTest : TestBase
     {
         [Fact]
-        public void KnownForConverter_Movie()
+        public async Task KnownForConverter_Movie()
         {
             JsonSerializerSettings settings = new JsonSerializerSettings();
             settings.Converters.Add(new KnownForConverter());
@@ -22,10 +22,9 @@ namespace TMDbLibTests.UtilityTests
             original.OriginalTitle = "Hello world";
 
             string json = JsonConvert.SerializeObject(original, settings);
-            KnownForMovie result = JsonConvert.DeserializeObject<KnownForBase>(json, settings) as KnownForMovie;
+            KnownForMovie result = (KnownForMovie)JsonConvert.DeserializeObject<KnownForBase>(json, settings);
 
             Assert.NotNull(result);
-            Assert.Equal(original.MediaType, result.MediaType);
             Assert.Equal(original.Title, result.Title);
         }
 
@@ -39,10 +38,9 @@ namespace TMDbLibTests.UtilityTests
             original.OriginalName = "Hello world";
 
             string json = JsonConvert.SerializeObject(original, settings);
-            KnownForTv result = JsonConvert.DeserializeObject<KnownForBase>(json, settings) as KnownForTv;
+            KnownForTv result = (KnownForTv)JsonConvert.DeserializeObject<KnownForBase>(json, settings);
 
             Assert.NotNull(result);
-            Assert.Equal(original.MediaType, result.MediaType);
             Assert.Equal(original.OriginalName, result.OriginalName);
         }
 
@@ -50,15 +48,11 @@ namespace TMDbLibTests.UtilityTests
         /// Tests the KnownForConverter
         /// </summary>
         [Fact]
-        public void TestJsonKnownForConverter()
+        public async Task TestJsonKnownForConverter()
         {
-            // Ignore missing fields
-            IgnoreMissingJson("results[array] / media_type");
+            SearchContainer<SearchPerson> result = await TMDbClient.SearchPersonAsync("Willis");
 
-            SearchContainer<SearchPerson> result = Config.Client.SearchPersonAsync("Willis").Sync();
-
-            Assert.NotNull(result);
-            Assert.NotNull(result.Results);
+            Assert.NotNull(result?.Results);
 
             List<KnownForBase> knownForList = result.Results.SelectMany(s => s.KnownFor).ToList();
             Assert.True(knownForList.Any());
diff --git a/TMDbLibTests/UtilityTests/SearchBaseConverterTest.cs b/TMDbLibTests/UtilityTests/SearchBaseConverterTest.cs
index 3829c35..d84ff2e 100644
--- a/TMDbLibTests/UtilityTests/SearchBaseConverterTest.cs
+++ b/TMDbLibTests/UtilityTests/SearchBaseConverterTest.cs
@@ -1,3 +1,4 @@
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using TMDbLib.Objects.General;
 using TMDbLib.Objects.Search;
@@ -20,10 +21,9 @@ namespace TMDbLibTests.UtilityTests
             original.OriginalTitle = "Hello world";
 
             string json = JsonConvert.SerializeObject(original, settings);
-            SearchMovie result = JsonConvert.DeserializeObject<SearchBase>(json, settings) as SearchMovie;
+            SearchMovie result = (SearchMovie)JsonConvert.DeserializeObject<SearchBase>(json, settings);
 
             Assert.NotNull(result);
-            Assert.Equal(original.MediaType, result.MediaType);
             Assert.Equal(original.OriginalTitle, result.OriginalTitle);
         }
 
@@ -37,7 +37,7 @@ namespace TMDbLibTests.UtilityTests
             original.OriginalName = "Hello world";
 
             string json = JsonConvert.SerializeObject(original, settings);
-            SearchTv result = JsonConvert.DeserializeObject<SearchBase>(json, settings) as SearchTv;
+            SearchTv result = (SearchTv)JsonConvert.DeserializeObject<SearchBase>(json, settings);
 
             Assert.NotNull(result);
             Assert.Equal(original.MediaType, result.MediaType);
@@ -54,7 +54,7 @@ namespace TMDbLibTests.UtilityTests
             original.Name = "Hello world";
 
             string json = JsonConvert.SerializeObject(original, settings);
-            SearchPerson result = JsonConvert.DeserializeObject<SearchBase>(json, settings) as SearchPerson;
+            SearchPerson result = (SearchPerson)JsonConvert.DeserializeObject<SearchBase>(json, settings);
 
             Assert.NotNull(result);
             Assert.Equal(original.MediaType, result.MediaType);
@@ -65,10 +65,10 @@ namespace TMDbLibTests.UtilityTests
         /// Tests the SearchBaseConverter
         /// </summary>
         [Fact]
-        public void TestSearchBaseConverter()
+        public async Task TestSearchBaseConverter()
         {
-            TestHelpers.SearchPages(i => Config.Client.SearchMultiAsync("Jobs", i).Sync());
-            SearchContainer<SearchBase> result = Config.Client.SearchMultiAsync("Jobs").Sync();
+            await TestHelpers.SearchPagesAsync(i => TMDbClient.SearchMultiAsync("Jobs", i));
+            SearchContainer<SearchBase> result = await TMDbClient.SearchMultiAsync("Jobs");
 
             Assert.NotNull(result);
             Assert.NotNull(result.Results);
diff --git a/TMDbLibTests/UtilityTests/TaggedImageConverterTest.cs b/TMDbLibTests/UtilityTests/TaggedImageConverterTest.cs
index 802c018..abfdc81 100644
--- a/TMDbLibTests/UtilityTests/TaggedImageConverterTest.cs
+++ b/TMDbLibTests/UtilityTests/TaggedImageConverterTest.cs
@@ -1,3 +1,4 @@
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using TMDbLib.Objects.General;
 using TMDbLib.Objects.People;
@@ -19,9 +20,11 @@ namespace TMDbLibTests.UtilityTests
 
             SearchMovie originalMedia = new SearchMovie { OriginalTitle = "Hello world" };
 
-            TaggedImage original = new TaggedImage();
-            original.MediaType = MediaType.Movie;
-            original.Media = originalMedia;
+            TaggedImage original = new TaggedImage
+            {
+                MediaType = originalMedia.MediaType,
+                Media = originalMedia
+            };
 
             string json = JsonConvert.SerializeObject(original, settings);
             TaggedImage result = JsonConvert.DeserializeObject<TaggedImage>(json, settings);
@@ -65,21 +68,25 @@ namespace TMDbLibTests.UtilityTests
         /// Tests the TaggedImageConverter
         /// </summary>
         [Fact]
-        public void TestJsonTaggedImageConverter()
+        public async Task TestJsonTaggedImageConverter()
         {
-            // Ignore fields not set
-            IgnoreMissingCSharp("_id / _id", "adult / adult", "backdrop_path / backdrop_path", "first_air_date / first_air_date", "genre_ids / genre_ids", "name / name", "origin_country / origin_country", "original_language / original_language", "original_name / original_name", "original_title / original_title", "overview / overview", "poster_path / poster_path", "release_date / release_date", "title / title", "video / video", "vote_average / vote_average", "vote_count / vote_count");
-            IgnoreMissingJson(" / media_type");
-
             // Get images
-            SearchContainerWithId<TaggedImage> result = Config.Client.GetPersonTaggedImagesAsync(IdHelper.HughLaurie, 1).Sync();
+            SearchContainerWithId<TaggedImage> result = await TMDbClient.GetPersonTaggedImagesAsync(IdHelper.HughLaurie, 1);
 
             Assert.NotNull(result);
             Assert.NotNull(result.Results);
             Assert.Equal(IdHelper.HughLaurie, result.Id);
 
-            Assert.Contains(result.Results, item => item.MediaType == MediaType.Tv && item.Media is SearchTv);
-            Assert.Contains(result.Results, item => item.MediaType == MediaType.Movie && item.Media is SearchMovie);
+            Assert.All(result.Results, item =>
+            {
+                if (item.MediaType == MediaType.Tv)
+                    Assert.IsType<SearchTv>(item.Media);
+            });
+            Assert.All(result.Results, item =>
+            {
+                if (item.MediaType == MediaType.Movie)
+                    Assert.IsType<SearchMovie>(item.Media);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/TMDbLibTests/UtilityTests/UtilsTest.cs b/TMDbLibTests/UtilityTests/UtilsTest.cs
index d9fd768..ae090e2 100644
--- a/TMDbLibTests/UtilityTests/UtilsTest.cs
+++ b/TMDbLibTests/UtilityTests/UtilsTest.cs
@@ -11,16 +11,16 @@ namespace TMDbLibTests.UtilityTests
         [Fact]
         public void EnumDescriptionNonEnumTest()
         {
-            EnumTestStruct strct = new EnumTestStruct();
+            EnumTestStruct @struct = new EnumTestStruct();
 
-            Assert.Throws<ArgumentException>(() => strct.GetDescription());
+            Assert.Throws<ArgumentException>(() => @struct.GetDescription());
         }
 
         [Fact]
         public void EnumDescriptionNonDescriptionTest()
         {
-            EnumTestEnum enm = EnumTestEnum.A;
-            string s = enm.GetDescription();
+            EnumTestEnum @enum = EnumTestEnum.A;
+            string s = @enum.GetDescription();
 
             Assert.Equal("A", s);
         }
@@ -28,8 +28,8 @@ namespace TMDbLibTests.UtilityTests
         [Fact]
         public void EnumDescriptionTest()
         {
-            EnumTestEnum enm = EnumTestEnum.B;
-            string s = enm.GetDescription();
+            EnumTestEnum @enum = EnumTestEnum.B;
+            string s = @enum.GetDescription();
 
             Assert.Equal("B-Description", s);
         }
diff --git a/TMDbLibTests/Verification/AccountStateConverterTest.TestAccountStateConverterAccountState.verified.txt b/TMDbLibTests/Verification/AccountStateConverterTest.TestAccountStateConverterAccountState.verified.txt
new file mode 100644
index 0000000..4a32f30
--- /dev/null
+++ b/TMDbLibTests/Verification/AccountStateConverterTest.TestAccountStateConverterAccountState.verified.txt
@@ -0,0 +1,4 @@
+{
+  favorite: true,
+  id: 19995
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/AccountStateConverterTest.TestAccountStateConverterTvEpisodeAccountState.verified.txt b/TMDbLibTests/Verification/AccountStateConverterTest.TestAccountStateConverterTvEpisodeAccountState.verified.txt
new file mode 100644
index 0000000..b92925c
--- /dev/null
+++ b/TMDbLibTests/Verification/AccountStateConverterTest.TestAccountStateConverterTvEpisodeAccountState.verified.txt
@@ -0,0 +1,11 @@
+{
+  episodeA: {
+    episode_number: 1,
+    id: 64766,
+    rating: 5.0
+  },
+  episodeB: {
+    episode_number: 2,
+    id: 64777
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ChangeItemConverterTest.ChangeItemConverter_ChangeItemAdded.verified.txt b/TMDbLibTests/Verification/ChangeItemConverterTest.ChangeItemConverter_ChangeItemAdded.verified.txt
new file mode 100644
index 0000000..6b96735
--- /dev/null
+++ b/TMDbLibTests/Verification/ChangeItemConverterTest.ChangeItemConverter_ChangeItemAdded.verified.txt
@@ -0,0 +1,5 @@
+{
+  value: Hello world,
+  action: added,
+  iso_639_1: en
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ChangeItemConverterTest.ChangeItemConverter_ChangeItemCreated.verified.txt b/TMDbLibTests/Verification/ChangeItemConverterTest.ChangeItemConverter_ChangeItemCreated.verified.txt
new file mode 100644
index 0000000..50a0b1c
--- /dev/null
+++ b/TMDbLibTests/Verification/ChangeItemConverterTest.ChangeItemConverter_ChangeItemCreated.verified.txt
@@ -0,0 +1,4 @@
+{
+  action: created,
+  iso_639_1: en
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ChangeItemConverterTest.ChangeItemConverter_ChangeItemDeleted.verified.txt b/TMDbLibTests/Verification/ChangeItemConverterTest.ChangeItemConverter_ChangeItemDeleted.verified.txt
new file mode 100644
index 0000000..e1a2c48
--- /dev/null
+++ b/TMDbLibTests/Verification/ChangeItemConverterTest.ChangeItemConverter_ChangeItemDeleted.verified.txt
@@ -0,0 +1,5 @@
+{
+  original_value: Hello world,
+  action: deleted,
+  iso_639_1: en
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ChangeItemConverterTest.ChangeItemConverter_ChangeItemUpdated.verified.txt b/TMDbLibTests/Verification/ChangeItemConverterTest.ChangeItemConverter_ChangeItemUpdated.verified.txt
new file mode 100644
index 0000000..bf2e8d8
--- /dev/null
+++ b/TMDbLibTests/Verification/ChangeItemConverterTest.ChangeItemConverter_ChangeItemUpdated.verified.txt
@@ -0,0 +1,6 @@
+{
+  original_value: Hello world,
+  value: Hello world 1234,
+  action: updated,
+  iso_639_1: en
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientAccountTests.TestAccountAccountGetLists.verified.txt b/TMDbLibTests/Verification/ClientAccountTests.TestAccountAccountGetLists.verified.txt
new file mode 100644
index 0000000..b78402a
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientAccountTests.TestAccountAccountGetLists.verified.txt
@@ -0,0 +1,8 @@
+{
+  list_type: movie,
+  description: This is a test list,
+  id: 1724,
+  iso_639_1: en,
+  item_count: 1,
+  name: Test list
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetDetailsUserAccount.verified.txt b/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetDetailsUserAccount.verified.txt
new file mode 100644
index 0000000..4a9d52e
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetDetailsUserAccount.verified.txt
@@ -0,0 +1,12 @@
+{
+  avatar: {
+    gravatar: {
+      hash: Guid_1
+    }
+  },
+  id: 6089455,
+  iso_3166_1: BE,
+  iso_639_1: en,
+  name: Test Name,
+  username: TMDbTestAccount
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetFavoriteMovies.verified.txt b/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetFavoriteMovies.verified.txt
new file mode 100644
index 0000000..ebc8c52
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetFavoriteMovies.verified.txt
@@ -0,0 +1,17 @@
+{
+  original_title: Avatar,
+  release_date: DateTime_1,
+  title: Avatar,
+  backdrop_path: <non-empty>,
+  genre_ids: [
+    12,
+    14,
+    28,
+    878
+  ],
+  original_language: en,
+  overview: In the 22nd century, a paraplegic Marine is dispatched to the moon Pandora on a unique mission, but becomes torn between following orders and protecting an alien civilization.,
+  poster_path: <non-empty>,
+  id: 19995,
+  media_type: movie,
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetMovieWatchlist.verified.txt b/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetMovieWatchlist.verified.txt
new file mode 100644
index 0000000..2a279d7
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetMovieWatchlist.verified.txt
@@ -0,0 +1,14 @@
+{
+  original_title: Dumb and Dumber To,
+  release_date: DateTime_1,
+  title: Dumb and Dumber To,
+  backdrop_path: <non-empty>,
+  genre_ids: [
+    35
+  ],
+  original_language: en,
+  overview: 20 years since their first adventure, Lloyd and Harry go on a road trip to find Harry's newly discovered daughter, who was given up for adoption.,
+  poster_path: <non-empty>,
+  id: 100042,
+  media_type: movie,
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetRatedMovies.verified.txt b/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetRatedMovies.verified.txt
new file mode 100644
index 0000000..ebc8c52
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetRatedMovies.verified.txt
@@ -0,0 +1,17 @@
+{
+  original_title: Avatar,
+  release_date: DateTime_1,
+  title: Avatar,
+  backdrop_path: <non-empty>,
+  genre_ids: [
+    12,
+    14,
+    28,
+    878
+  ],
+  original_language: en,
+  overview: In the 22nd century, a paraplegic Marine is dispatched to the moon Pandora on a unique mission, but becomes torn between following orders and protecting an alien civilization.,
+  poster_path: <non-empty>,
+  id: 19995,
+  media_type: movie,
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetRatedTv.verified.txt b/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetRatedTv.verified.txt
new file mode 100644
index 0000000..94fdaf9
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetRatedTv.verified.txt
@@ -0,0 +1,18 @@
+{
+  rating: 5.0,
+  first_air_date: DateTime_1,
+  name: The Big Bang Theory,
+  original_name: The Big Bang Theory,
+  origin_country: [
+    US
+  ],
+  backdrop_path: <non-empty>,
+  genre_ids: [
+    35
+  ],
+  original_language: en,
+  overview: The sitcom is centered on five characters living in Pasadena, California: roommates Leonard Hofstadter and Sheldon Cooper; Penny, a waitress and aspiring actress who lives across the hall; and Leonard and Sheldon's equally geeky and socially awkward friends and co-workers, mechanical engineer Howard Wolowitz and astrophysicist Raj Koothrappali. The geekiness and intellect of the four guys is contrasted for comic effect with Penny's social skills and common sense.,
+  poster_path: <non-empty>,
+  id: 1418,
+  media_type: tv,
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetTvWatchlist.verified.txt b/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetTvWatchlist.verified.txt
new file mode 100644
index 0000000..19c827b
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientAccountTests.TestAccountGetTvWatchlist.verified.txt
@@ -0,0 +1,17 @@
+{
+  first_air_date: DateTime_1,
+  name: Two and a Half Men,
+  original_name: Two and a Half Men,
+  origin_country: [
+    US
+  ],
+  backdrop_path: <non-empty>,
+  genre_ids: [
+    35
+  ],
+  original_language: en,
+  overview: A hedonistic jingle writer's free-wheeling life comes to an abrupt halt when his brother and 10-year-old nephew move into his beach-front house.,
+  poster_path: <non-empty>,
+  id: 2691,
+  media_type: tv,
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientCertificationsTests.TestCertificationsListMovieAsync.verified.txt b/TMDbLibTests/Verification/ClientCertificationsTests.TestCertificationsListMovieAsync.verified.txt
new file mode 100644
index 0000000..89b18c8
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientCertificationsTests.TestCertificationsListMovieAsync.verified.txt
@@ -0,0 +1,5 @@
+{
+  Certification: E,
+  Meaning: Exempt from classification. Films that are exempt from classification must not contain contentious material (i.e. material that would ordinarily be rated M or higher).,
+  Order: 1
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientCertificationsTests.TestCertificationsListTvAsync.verified.txt b/TMDbLibTests/Verification/ClientCertificationsTests.TestCertificationsListTvAsync.verified.txt
new file mode 100644
index 0000000..98f7114
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientCertificationsTests.TestCertificationsListTvAsync.verified.txt
@@ -0,0 +1,4 @@
+{
+  Certification: NR,
+  Meaning: No rating information.
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientCollectionTests.TestCollectionsExtrasAll.verified.txt b/TMDbLibTests/Verification/ClientCollectionTests.TestCollectionsExtrasAll.verified.txt
new file mode 100644
index 0000000..47c1092
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientCollectionTests.TestCollectionsExtrasAll.verified.txt
@@ -0,0 +1,663 @@
+{
+  backdrop_path: <non-empty>,
+  id: 264,
+  images: {
+    backdrops: [
+      {
+        aspect_ratio: 1.777777777777778,
+        file_path: <non-empty>,
+        height: 1080,
+        width: 1920
+      },
+      {
+        aspect_ratio: 1.777777777777778,
+        file_path: <non-empty>,
+        height: 1080,
+        width: 1920
+      },
+      {
+        aspect_ratio: 1.777777777777778,
+        file_path: <non-empty>,
+        height: 1080,
+        width: 1920
+      },
+      {
+        aspect_ratio: 1.777777777777778,
+        file_path: <non-empty>,
+        height: 1080,
+        iso_639_1: en,
+        width: 1920
+      },
+      {
+        aspect_ratio: 1.778645833333333,
+        file_path: <non-empty>,
+        height: 768,
+        iso_639_1: en,
+        width: 1366
+      },
+      {
+        aspect_ratio: 1.777777777777778,
+        file_path: <non-empty>,
+        height: 720,
+        iso_639_1: en,
+        width: 1280
+      },
+      {
+        aspect_ratio: 1.777777777777778,
+        file_path: <non-empty>,
+        height: 1080,
+        iso_639_1: en,
+        width: 1920
+      },
+      {
+        aspect_ratio: 1.777777777777778,
+        file_path: <non-empty>,
+        height: 1080,
+        width: 1920
+      },
+      {
+        aspect_ratio: 1.778645833333333,
+        file_path: <non-empty>,
+        height: 768,
+        iso_639_1: en,
+        width: 1366
+      },
+      {
+        aspect_ratio: 1.777777777777778,
+        file_path: <non-empty>,
+        height: 1080,
+        iso_639_1: de,
+        width: 1920
+      },
+      {
+        aspect_ratio: 1.777777777777778,
+        file_path: <non-empty>,
+        height: 1080,
+        iso_639_1: ru,
+        width: 1920
+      }
+    ],
+    posters: [
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: fr,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6661991584852734,
+        file_path: <non-empty>,
+        height: 1426,
+        iso_639_1: ru,
+        width: 950
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: de,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: it,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.7242120343839542,
+        file_path: <non-empty>,
+        height: 1396,
+        iso_639_1: hu,
+        width: 1011
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 750,
+        iso_639_1: sv,
+        width: 500
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: it,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: it,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 3000,
+        iso_639_1: de,
+        width: 2000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1800,
+        iso_639_1: en,
+        width: 1200
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: it,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 2100,
+        iso_639_1: de,
+        width: 1400
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: de,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 3000,
+        iso_639_1: ru,
+        width: 2000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: es,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.703771849126035,
+        file_path: <non-empty>,
+        height: 1087,
+        iso_639_1: it,
+        width: 765
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.7012622720897616,
+        file_path: <non-empty>,
+        height: 1426,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 750,
+        iso_639_1: fr,
+        width: 500
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.667,
+        file_path: <non-empty>,
+        height: 2000,
+        iso_639_1: en,
+        width: 1334
+      },
+      {
+        aspect_ratio: 0.7013333333333334,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: de,
+        width: 1052
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: de,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: fr,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6976744186046512,
+        file_path: <non-empty>,
+        height: 860,
+        iso_639_1: es,
+        width: 600
+      },
+      {
+        aspect_ratio: 0.7090909090909091,
+        file_path: <non-empty>,
+        height: 1100,
+        iso_639_1: en,
+        width: 780
+      },
+      {
+        aspect_ratio: 0.7459165154264973,
+        file_path: <non-empty>,
+        height: 1102,
+        iso_639_1: fr,
+        width: 822
+      },
+      {
+        aspect_ratio: 0.6871794871794872,
+        file_path: <non-empty>,
+        height: 975,
+        iso_639_1: en,
+        width: 670
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 3000,
+        iso_639_1: en,
+        width: 2000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: fr,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: fr,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: fr,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.700770847932726,
+        file_path: <non-empty>,
+        height: 2854,
+        iso_639_1: de,
+        width: 2000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 900,
+        iso_639_1: sv,
+        width: 600
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: de,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: de,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: de,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: ru,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: ru,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: ru,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: sk,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: de,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: sk,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: hu,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 3000,
+        iso_639_1: it,
+        width: 2000
+      },
+      {
+        aspect_ratio: 0.7012622720897616,
+        file_path: <non-empty>,
+        height: 1426,
+        iso_639_1: it,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.7012622720897616,
+        file_path: <non-empty>,
+        height: 1426,
+        iso_639_1: it,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.7269372693726938,
+        file_path: <non-empty>,
+        height: 813,
+        iso_639_1: uk,
+        width: 591
+      },
+      {
+        aspect_ratio: 0.6931407942238267,
+        file_path: <non-empty>,
+        height: 2216,
+        iso_639_1: de,
+        width: 1536
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: pt,
+        width: 1000
+      }
+    ]
+  },
+  name: Back to the Future Collection,
+  overview: An American science fiction–comedy film series that follows the adventures of a high school student, Marty McFly and an eccentric scientist, Dr Emmett L. Brown as they use a DeLorean time machine to time travel to different periods in the history of Hill Valley, California.,
+  parts: [
+    {
+      original_title: Back to the Future,
+      release_date: DateTime_1,
+      title: Back to the Future,
+      backdrop_path: <non-empty>,
+      genre_ids: [
+        12,
+        35,
+        878,
+        10751
+      ],
+      original_language: en,
+      overview: Eighties teenager Marty McFly is accidentally sent back in time to 1955, inadvertently disrupting his parents' first meeting and attracting his mother's romantic interest. Marty must repair the damage to history by rekindling his parents' romance and - with the help of his eccentric inventor friend Doc Brown - return to 1985.,
+      poster_path: <non-empty>,
+      id: 105,
+      media_type: movie,
+    },
+    {
+      original_title: Back to the Future Part II,
+      release_date: DateTime_2,
+      title: Back to the Future Part II,
+      backdrop_path: <non-empty>,
+      genre_ids: [
+        12,
+        35,
+        878,
+        10751
+      ],
+      original_language: en,
+      overview: Marty and Doc are at it again in this wacky sequel to the 1985 blockbuster as the time-traveling duo head to 2015 to nip some McFly family woes in the bud. But things go awry thanks to bully Biff Tannen and a pesky sports almanac. In a last-ditch attempt to set things straight, Marty finds himself bound for 1955 and face to face with his teenage parents -- again.,
+      poster_path: <non-empty>,
+      id: 165,
+      media_type: movie,
+    },
+    {
+      original_title: Back to the Future Part III,
+      release_date: DateTime_3,
+      title: Back to the Future Part III,
+      backdrop_path: <non-empty>,
+      genre_ids: [
+        12,
+        35,
+        878
+      ],
+      original_language: en,
+      overview: The final installment of the Back to the Future trilogy finds Marty digging the trusty DeLorean out of a mineshaft and looking for Doc in the Wild West of 1885. But when their time machine breaks down, the travelers are stranded in a land of spurs. More problems arise when Doc falls for pretty schoolteacher Clara Clayton, and Marty tangles with Buford Tannen.,
+      poster_path: <non-empty>,
+      id: 196,
+      media_type: movie,
+    }
+  ],
+  poster_path: <non-empty>
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientCollectionTests.TestCollectionsParts.verified.txt b/TMDbLibTests/Verification/ClientCollectionTests.TestCollectionsParts.verified.txt
new file mode 100644
index 0000000..9bcf11a
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientCollectionTests.TestCollectionsParts.verified.txt
@@ -0,0 +1,59 @@
+{
+  backdrop_path: <non-empty>,
+  id: 264,
+  name: Back to the Future Collection,
+  overview: An American science fiction–comedy film series that follows the adventures of a high school student, Marty McFly and an eccentric scientist, Dr Emmett L. Brown as they use a DeLorean time machine to time travel to different periods in the history of Hill Valley, California.,
+  parts: [
+    {
+      original_title: Back to the Future,
+      release_date: DateTime_1,
+      title: Back to the Future,
+      backdrop_path: <non-empty>,
+      genre_ids: [
+        12,
+        35,
+        878,
+        10751
+      ],
+      original_language: en,
+      overview: Eighties teenager Marty McFly is accidentally sent back in time to 1955, inadvertently disrupting his parents' first meeting and attracting his mother's romantic interest. Marty must repair the damage to history by rekindling his parents' romance and - with the help of his eccentric inventor friend Doc Brown - return to 1985.,
+      poster_path: <non-empty>,
+      id: 105,
+      media_type: movie,
+    },
+    {
+      original_title: Back to the Future Part II,
+      release_date: DateTime_2,
+      title: Back to the Future Part II,
+      backdrop_path: <non-empty>,
+      genre_ids: [
+        12,
+        35,
+        878,
+        10751
+      ],
+      original_language: en,
+      overview: Marty and Doc are at it again in this wacky sequel to the 1985 blockbuster as the time-traveling duo head to 2015 to nip some McFly family woes in the bud. But things go awry thanks to bully Biff Tannen and a pesky sports almanac. In a last-ditch attempt to set things straight, Marty finds himself bound for 1955 and face to face with his teenage parents -- again.,
+      poster_path: <non-empty>,
+      id: 165,
+      media_type: movie,
+    },
+    {
+      original_title: Back to the Future Part III,
+      release_date: DateTime_3,
+      title: Back to the Future Part III,
+      backdrop_path: <non-empty>,
+      genre_ids: [
+        12,
+        35,
+        878
+      ],
+      original_language: en,
+      overview: The final installment of the Back to the Future trilogy finds Marty digging the trusty DeLorean out of a mineshaft and looking for Doc in the Wild West of 1885. But when their time machine breaks down, the travelers are stranded in a land of spurs. More problems arise when Doc falls for pretty schoolteacher Clara Clayton, and Marty tangles with Buford Tannen.,
+      poster_path: <non-empty>,
+      id: 196,
+      media_type: movie,
+    }
+  ],
+  poster_path: <non-empty>
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientCompanyTests.TestCompaniesExtrasAllAsync.verified.txt b/TMDbLibTests/Verification/ClientCompanyTests.TestCompaniesExtrasAllAsync.verified.txt
new file mode 100644
index 0000000..4cfeff9
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientCompanyTests.TestCompaniesExtrasAllAsync.verified.txt
@@ -0,0 +1,33 @@
+{
+  description: ,
+  headquarters: Century City, California, USA,
+  homepage: http://www.foxmovies.com/,
+  id: 25,
+  logo_path: <non-empty>,
+  movies: {
+    page: 1,
+    results: [
+      {
+        original_title: Ice Age,
+        release_date: DateTime_1,
+        title: Ice Age,
+        backdrop_path: <non-empty>,
+        genre_ids: [
+          12,
+          16,
+          35,
+          10751
+        ],
+        original_language: en,
+        overview: With the impending ice age almost upon them, a mismatched trio of prehistoric critters – Manny the woolly mammoth, Diego the saber-toothed tiger and Sid the giant sloth – find an orphaned infant and decide to return it to its human parents. Along the way, the unlikely allies become friends but, when enemies attack, their quest takes on far nobler aims.,
+        poster_path: <non-empty>,
+        id: 425,
+        media_type: movie,
+      }
+    ],
+    total_pages: 80,
+    total_results: 1599
+  },
+  name: 20th Century Fox,
+  origin_country: US
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientCompanyTests.TestCompaniesImagesAsync.verified.txt b/TMDbLibTests/Verification/ClientCompanyTests.TestCompaniesImagesAsync.verified.txt
new file mode 100644
index 0000000..2da649c
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientCompanyTests.TestCompaniesImagesAsync.verified.txt
@@ -0,0 +1,4 @@
+{
+  url: http://image.tmdb.org/t/p/original/qZCc1lty5FzX30aOCVRBLzaVmcp.png,
+  urlSecure: https://image.tmdb.org/t/p/original/qZCc1lty5FzX30aOCVRBLzaVmcp.png
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientConfigurationTests.TestConfigurationAsync.verified.txt b/TMDbLibTests/Verification/ClientConfigurationTests.TestConfigurationAsync.verified.txt
new file mode 100644
index 0000000..2d45bb5
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientConfigurationTests.TestConfigurationAsync.verified.txt
@@ -0,0 +1,97 @@
+{
+  images: {
+    base_url: http://image.tmdb.org/t/p/,
+    secure_base_url: https://image.tmdb.org/t/p/,
+    backdrop_sizes: [
+      w300,
+      w780,
+      w1280,
+      original
+    ],
+    logo_sizes: [
+      w45,
+      w92,
+      w154,
+      w185,
+      w300,
+      w500,
+      original
+    ],
+    poster_sizes: [
+      w92,
+      w154,
+      w185,
+      w342,
+      w500,
+      w780,
+      original
+    ],
+    profile_sizes: [
+      w45,
+      w185,
+      h632,
+      original
+    ],
+    still_sizes: [
+      w92,
+      w185,
+      w300,
+      original
+    ]
+  },
+  change_keys: [
+    adult,
+    air_date,
+    also_known_as,
+    alternative_titles,
+    biography,
+    birthday,
+    budget,
+    cast,
+    certifications,
+    character_names,
+    created_by,
+    crew,
+    deathday,
+    episode,
+    episode_number,
+    episode_run_time,
+    freebase_id,
+    freebase_mid,
+    general,
+    genres,
+    guest_stars,
+    homepage,
+    images,
+    imdb_id,
+    languages,
+    name,
+    network,
+    origin_country,
+    original_name,
+    original_title,
+    overview,
+    parts,
+    place_of_birth,
+    plot_keywords,
+    production_code,
+    production_companies,
+    production_countries,
+    releases,
+    revenue,
+    runtime,
+    season,
+    season_number,
+    season_regular,
+    spoken_languages,
+    status,
+    tagline,
+    title,
+    translations,
+    tvdb_id,
+    tvrage_id,
+    type,
+    video,
+    videos
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientConfigurationTests.TestCountryListAsync.verified.txt b/TMDbLibTests/Verification/ClientConfigurationTests.TestCountryListAsync.verified.txt
new file mode 100644
index 0000000..4a5d01c
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientConfigurationTests.TestCountryListAsync.verified.txt
@@ -0,0 +1,4 @@
+{
+  iso_3166_1: DK,
+  english_name: Denmark
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientConfigurationTests.TestJobListAsync.verified.txt b/TMDbLibTests/Verification/ClientConfigurationTests.TestJobListAsync.verified.txt
new file mode 100644
index 0000000..c9a46a4
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientConfigurationTests.TestJobListAsync.verified.txt
@@ -0,0 +1,50 @@
+{
+  department: Writing,
+  jobs: [
+    Dialogue,
+    Theatre Play,
+    Screenplay,
+    Idea,
+    Executive Story Editor,
+    Writers' Production,
+    Adaptation,
+    Scenario Writer,
+    Comic Book,
+    Author,
+    Other,
+    Script Editor,
+    Story Manager,
+    Story Supervisor,
+    Writer,
+    Lyricist,
+    Original Film Writer,
+    Storyboard,
+    Musical,
+    Series Composition,
+    Staff Writer,
+    Novel,
+    Story Artist,
+    Book,
+    Opera,
+    Creative Producer,
+    Characters,
+    Original Story,
+    Screenstory,
+    Teleplay,
+    Co-Writer,
+    Short Story,
+    Script Consultant,
+    Writers' Assistant,
+    Story,
+    Story Editor,
+    Original Series Creator,
+    Junior Story Editor,
+    Senior Story Editor,
+    Story Consultant,
+    Head of Story,
+    Original Concept,
+    Graphic Novel,
+    Story Coordinator,
+    Story Developer
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientConfigurationTests.TestLanguageListAsync.verified.txt b/TMDbLibTests/Verification/ClientConfigurationTests.TestLanguageListAsync.verified.txt
new file mode 100644
index 0000000..12fbb17
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientConfigurationTests.TestLanguageListAsync.verified.txt
@@ -0,0 +1,5 @@
+{
+  iso_639_1: da,
+  english_name: Danish,
+  name: Dansk
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientConfigurationTests.TestTimezonesListAsync.verified.txt b/TMDbLibTests/Verification/ClientConfigurationTests.TestTimezonesListAsync.verified.txt
new file mode 100644
index 0000000..2eb342f
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientConfigurationTests.TestTimezonesListAsync.verified.txt
@@ -0,0 +1,3 @@
+[
+  Europe/Copenhagen
+]
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientCreditTests.TestGetCreditSeasons.verified.txt b/TMDbLibTests/Verification/ClientCreditTests.TestGetCreditSeasons.verified.txt
new file mode 100644
index 0000000..fccfda4
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientCreditTests.TestGetCreditSeasons.verified.txt
@@ -0,0 +1,62 @@
+{
+  credit_type: Cast,
+  department: Acting,
+  id: 5256ccf519c2956ff607ca00,
+  job: Actor,
+  media: {
+    character: Gregory House,
+    id: 1408,
+    name: House,
+    original_name: House,
+    seasons: [
+      {
+        poster_path: <non-empty>
+      },
+      {
+        air_date: DateTime_1,
+        poster_path: <non-empty>,
+        season_number: 1
+      },
+      {
+        air_date: DateTime_2,
+        poster_path: <non-empty>,
+        season_number: 2
+      },
+      {
+        air_date: DateTime_3,
+        poster_path: <non-empty>,
+        season_number: 3
+      },
+      {
+        air_date: DateTime_4,
+        poster_path: <non-empty>,
+        season_number: 4
+      },
+      {
+        air_date: DateTime_5,
+        poster_path: <non-empty>,
+        season_number: 5
+      },
+      {
+        air_date: DateTime_6,
+        poster_path: <non-empty>,
+        season_number: 6
+      },
+      {
+        air_date: DateTime_7,
+        poster_path: <non-empty>,
+        season_number: 7
+      },
+      {
+        air_date: DateTime_8,
+        poster_path: <non-empty>,
+        season_number: 8
+      }
+    ]
+  },
+  media_type: tv,
+  person: {
+    id: 41419,
+    name: Hugh Laurie
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientCreditTests.TestGetCreditTv.verified.txt b/TMDbLibTests/Verification/ClientCreditTests.TestGetCreditTv.verified.txt
new file mode 100644
index 0000000..f14f6d6
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientCreditTests.TestGetCreditTv.verified.txt
@@ -0,0 +1,34 @@
+{
+  credit_type: Cast,
+  department: Acting,
+  id: 525719bb760ee3776a1835d3,
+  job: Actor,
+  media: {
+    character: Tony Amato,
+    episodes: [
+      {
+        air_date: DateTime_1,
+        episode_number: 7,
+        name: No Exit,
+        overview: Crockett and Tubbs reluctantly help government agents in their pursuit of a dangerous arms dealer.,
+        season_number: 1,
+        still_path: <non-empty>
+      }
+    ],
+    id: 1908,
+    name: Miami Vice,
+    original_name: Miami Vice,
+    seasons: [
+      {
+        air_date: DateTime_2,
+        poster_path: <non-empty>,
+        season_number: 1
+      }
+    ]
+  },
+  media_type: tv,
+  person: {
+    id: 62,
+    name: Bruce Willis
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientFindTests.TestFindImdbMovie.verified.txt b/TMDbLibTests/Verification/ClientFindTests.TestFindImdbMovie.verified.txt
new file mode 100644
index 0000000..89814b6
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientFindTests.TestFindImdbMovie.verified.txt
@@ -0,0 +1,20 @@
+{
+  movie_results: [
+    {
+      original_title: The Terminator,
+      release_date: DateTime_1,
+      title: The Terminator,
+      backdrop_path: <non-empty>,
+      genre_ids: [
+        28,
+        53,
+        878
+      ],
+      original_language: en,
+      overview: In the post-apocalyptic future, reigning tyrannical supercomputers teleport a cyborg assassin known as the "Terminator" back to 1984 to kill Sarah Connor, whose unborn son is destined to lead insurgents against 21st century mechanical hegemony. Meanwhile, the human-resistance movement dispatches a lone warrior to safeguard Sarah. Can he stop the virtually indestructible killing machine?,
+      poster_path: <non-empty>,
+      id: 218,
+      media_type: movie,
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientFindTests.TestFindImdbPerson.verified.txt b/TMDbLibTests/Verification/ClientFindTests.TestFindImdbPerson.verified.txt
new file mode 100644
index 0000000..2a19bc3
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientFindTests.TestFindImdbPerson.verified.txt
@@ -0,0 +1,60 @@
+{
+  person_results: [
+    {
+      gender: Male,
+      known_for_department: Acting,
+      known_for: [
+        {
+          original_title: Pulp Fiction,
+          release_date: DateTime_1,
+          title: Pulp Fiction,
+          backdrop_path: <non-empty>,
+          genre_ids: [
+            53,
+            80
+          ],
+          id: 680,
+          media_type: movie,
+          original_language: en,
+          overview: A burger-loving hit man, his philosophical partner, a drug-addled gangster's moll and a washed-up boxer converge in this sprawling, comedic crime caper. Their adventures unfurl in three stories that ingeniously trip back and forth in time.,
+          poster_path: <non-empty>,
+        },
+        {
+          original_title: The Sixth Sense,
+          release_date: DateTime_2,
+          title: The Sixth Sense,
+          backdrop_path: <non-empty>,
+          genre_ids: [
+            18,
+            53,
+            9648
+          ],
+          id: 745,
+          media_type: movie,
+          original_language: en,
+          overview: An eight year old boy named Cole Sear, who believes he can see dead people, aids the help of a child psychologist named Malcolm Crowe.,
+          poster_path: <non-empty>,
+        },
+        {
+          original_title: Split,
+          release_date: DateTime_3,
+          title: Split,
+          backdrop_path: <non-empty>,
+          genre_ids: [
+            27,
+            53
+          ],
+          id: 381288,
+          media_type: movie,
+          original_language: en,
+          overview: Though Kevin has evidenced 23 personalities to his trusted psychiatrist, Dr. Fletcher, there remains one still submerged who is set to materialize and dominate all the others. Compelled to abduct three teenage girls led by the willful, observant Casey, Kevin reaches a war for survival among all of those contained within him — as well as everyone around him — as the walls between his compartments shatter apart.,
+          poster_path: <non-empty>,
+        }
+      ],
+      name: Bruce Willis,
+      profile_path: <non-empty>,
+      id: 62,
+      media_type: person,
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientFindTests.TestFindImdbTvShowAsync.verified.txt b/TMDbLibTests/Verification/ClientFindTests.TestFindImdbTvShowAsync.verified.txt
new file mode 100644
index 0000000..0e22cee
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientFindTests.TestFindImdbTvShowAsync.verified.txt
@@ -0,0 +1,21 @@
+{
+  tv_results: [
+    {
+      first_air_date: DateTime_1,
+      name: Breaking Bad,
+      original_name: Breaking Bad,
+      origin_country: [
+        US
+      ],
+      backdrop_path: <non-empty>,
+      genre_ids: [
+        18
+      ],
+      original_language: en,
+      overview: When Walter White, a New Mexico chemistry teacher, is diagnosed with Stage III cancer and given a prognosis of only two years left to live. He becomes filled with a sense of fearlessness and an unrelenting desire to secure his family's financial future at any cost as he enters the dangerous world of drugs and crime.,
+      poster_path: <non-empty>,
+      id: 1396,
+      media_type: tv,
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientFindTests.TestFindImdbTvShowEpisode.verified.txt b/TMDbLibTests/Verification/ClientFindTests.TestFindImdbTvShowEpisode.verified.txt
new file mode 100644
index 0000000..5b50d7c
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientFindTests.TestFindImdbTvShowEpisode.verified.txt
@@ -0,0 +1,15 @@
+{
+  tv_episode_results: [
+    {
+      air_date: DateTime_1,
+      episode_number: 1,
+      id: 62085,
+      name: Pilot,
+      overview: When an unassuming high school chemistry teacher discovers he has a rare form of lung cancer, he decides to team up with a former student and create a top of the line crystal meth in a used RV, to provide for his family once he is gone.,
+      production_code: ,
+      season_number: 1,
+      show_id: 1396,
+      still_path: <non-empty>,
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientFindTests.TestFindImdbTvShowSeasonAsync.verified.txt b/TMDbLibTests/Verification/ClientFindTests.TestFindImdbTvShowSeasonAsync.verified.txt
new file mode 100644
index 0000000..fc62715
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientFindTests.TestFindImdbTvShowSeasonAsync.verified.txt
@@ -0,0 +1,26 @@
+{
+  tv_episode_results: [
+    {
+      air_date: DateTime_1,
+      episode_number: 1,
+      id: 202650,
+      name: The Bishop Warms Up,
+      overview: ,
+      production_code: ,
+      season_number: 5,
+      show_id: 2635
+    }
+  ],
+  tv_season_results: [
+    {
+      air_date: DateTime_2,
+      episode_count: 7,
+      id: 3572,
+      name: Season 1,
+      overview: High school chemistry teacher Walter White's life is suddenly transformed by a dire medical diagnosis. Street-savvy former student Jesse Pinkman "teaches" Walter a new trade.,
+      poster_path: <non-empty>,
+      season_number: 1,
+      show_id: 1396
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientFindTests.TestFindTvdbTvShowAsync.verified.txt b/TMDbLibTests/Verification/ClientFindTests.TestFindTvdbTvShowAsync.verified.txt
new file mode 100644
index 0000000..0e22cee
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientFindTests.TestFindTvdbTvShowAsync.verified.txt
@@ -0,0 +1,21 @@
+{
+  tv_results: [
+    {
+      first_air_date: DateTime_1,
+      name: Breaking Bad,
+      original_name: Breaking Bad,
+      origin_country: [
+        US
+      ],
+      backdrop_path: <non-empty>,
+      genre_ids: [
+        18
+      ],
+      original_language: en,
+      overview: When Walter White, a New Mexico chemistry teacher, is diagnosed with Stage III cancer and given a prognosis of only two years left to live. He becomes filled with a sense of fearlessness and an unrelenting desire to secure his family's financial future at any cost as he enters the dangerous world of drugs and crime.,
+      poster_path: <non-empty>,
+      id: 1396,
+      media_type: tv,
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientGenreTests.TestGenreMovieListAsync.verified.txt b/TMDbLibTests/Verification/ClientGenreTests.TestGenreMovieListAsync.verified.txt
new file mode 100644
index 0000000..0f1fd6d
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientGenreTests.TestGenreMovieListAsync.verified.txt
@@ -0,0 +1,158 @@
+{
+  genres: [
+    {
+      id: 12,
+      name: Adventure
+    },
+    {
+      id: 14,
+      name: Fantasy
+    },
+    {
+      id: 16,
+      name: Animation
+    },
+    {
+      id: 18,
+      name: Drama
+    },
+    {
+      id: 27,
+      name: Horror
+    },
+    {
+      id: 28,
+      name: Action
+    },
+    {
+      id: 35,
+      name: Comedy
+    },
+    {
+      id: 36,
+      name: History
+    },
+    {
+      id: 37,
+      name: Western
+    },
+    {
+      id: 53,
+      name: Thriller
+    },
+    {
+      id: 80,
+      name: Crime
+    },
+    {
+      id: 99,
+      name: Documentary
+    },
+    {
+      id: 878,
+      name: Science Fiction
+    },
+    {
+      id: 9648,
+      name: Mystery
+    },
+    {
+      id: 10402,
+      name: Music
+    },
+    {
+      id: 10749,
+      name: Romance
+    },
+    {
+      id: 10751,
+      name: Family
+    },
+    {
+      id: 10752,
+      name: War
+    },
+    {
+      id: 10770,
+      name: TV Movie
+    }
+  ],
+  genresDanish: [
+    {
+      id: 12,
+      name: Eventyr
+    },
+    {
+      id: 14,
+      name: Fantasy
+    },
+    {
+      id: 16,
+      name: Animation
+    },
+    {
+      id: 18,
+      name: Drama
+    },
+    {
+      id: 27,
+      name: Gyser
+    },
+    {
+      id: 28,
+      name: Action
+    },
+    {
+      id: 35,
+      name: Komedie
+    },
+    {
+      id: 36,
+      name: Historie 
+    },
+    {
+      id: 37,
+      name: Western
+    },
+    {
+      id: 53,
+      name: Thriller
+    },
+    {
+      id: 80,
+      name: Kriminalitet
+    },
+    {
+      id: 99,
+      name: Documentary
+    },
+    {
+      id: 878,
+      name: Sci-fi
+    },
+    {
+      id: 9648,
+      name: Mysterium
+    },
+    {
+      id: 10402,
+      name: Musik
+    },
+    {
+      id: 10749,
+      name: Romantik
+    },
+    {
+      id: 10751,
+      name: Familie
+    },
+    {
+      id: 10752,
+      name: Krig
+    },
+    {
+      id: 10770,
+      name: TV film
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientGenreTests.TestGenreTvListAsync.verified.txt b/TMDbLibTests/Verification/ClientGenreTests.TestGenreTvListAsync.verified.txt
new file mode 100644
index 0000000..b0f4fee
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientGenreTests.TestGenreTvListAsync.verified.txt
@@ -0,0 +1,134 @@
+{
+  genres: [
+    {
+      id: 16,
+      name: Animation
+    },
+    {
+      id: 18,
+      name: Drama
+    },
+    {
+      id: 35,
+      name: Comedy
+    },
+    {
+      id: 37,
+      name: Western
+    },
+    {
+      id: 80,
+      name: Crime
+    },
+    {
+      id: 99,
+      name: Documentary
+    },
+    {
+      id: 9648,
+      name: Mystery
+    },
+    {
+      id: 10751,
+      name: Family
+    },
+    {
+      id: 10759,
+      name: Action & Adventure
+    },
+    {
+      id: 10762,
+      name: Kids
+    },
+    {
+      id: 10763,
+      name: News
+    },
+    {
+      id: 10764,
+      name: Reality
+    },
+    {
+      id: 10765,
+      name: Sci-Fi & Fantasy
+    },
+    {
+      id: 10766,
+      name: Soap
+    },
+    {
+      id: 10767,
+      name: Talk
+    },
+    {
+      id: 10768,
+      name: War & Politics
+    }
+  ],
+  genresDanish: [
+    {
+      id: 16,
+      name: Animation
+    },
+    {
+      id: 18,
+      name: Drama
+    },
+    {
+      id: 35,
+      name: Komedie
+    },
+    {
+      id: 37,
+      name: Western
+    },
+    {
+      id: 80,
+      name: Kriminalitet
+    },
+    {
+      id: 99,
+      name: Documentary
+    },
+    {
+      id: 9648,
+      name: Mysterium
+    },
+    {
+      id: 10751,
+      name: Familie
+    },
+    {
+      id: 10759,
+      name: Action og eventyr
+    },
+    {
+      id: 10762,
+      name: Børn
+    },
+    {
+      id: 10763,
+      name: Nyhed
+    },
+    {
+      id: 10764,
+      name: Virkelighed 
+    },
+    {
+      id: 10765,
+      name: Sci-fi og Fantasy
+    },
+    {
+      id: 10766,
+      name: Sæbe
+    },
+    {
+      id: 10767,
+      name: Snakke
+    },
+    {
+      id: 10768,
+      name: Krig & Politik
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientKeywordTests.TestGetMovieKeywordsAsync.verified.txt b/TMDbLibTests/Verification/ClientKeywordTests.TestGetMovieKeywordsAsync.verified.txt
new file mode 100644
index 0000000..d59485f
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientKeywordTests.TestGetMovieKeywordsAsync.verified.txt
@@ -0,0 +1,37 @@
+{
+  id: 47964,
+  keywords: [
+    {
+      id: 258,
+      name: bomb
+    },
+    {
+      id: 591,
+      name: cia
+    },
+    {
+      id: 2139,
+      name: russia
+    },
+    {
+      id: 10685,
+      name: escape
+    },
+    {
+      id: 18074,
+      name: courthouse
+    },
+    {
+      id: 33705,
+      name: agent
+    },
+    {
+      id: 186447,
+      name: rogue
+    },
+    {
+      id: 186450,
+      name: moscow, russia
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientKeywordTests.TestGetTvShowKeywordsAsync.verified.txt b/TMDbLibTests/Verification/ClientKeywordTests.TestGetTvShowKeywordsAsync.verified.txt
new file mode 100644
index 0000000..59ab4d8
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientKeywordTests.TestGetTvShowKeywordsAsync.verified.txt
@@ -0,0 +1,29 @@
+{
+  id: 1418,
+  results: [
+    {
+      id: 5800,
+      name: geek
+    },
+    {
+      id: 5801,
+      name: nerd
+    },
+    {
+      id: 9713,
+      name: friends
+    },
+    {
+      id: 14760,
+      name: scientist
+    },
+    {
+      id: 156810,
+      name: science
+    },
+    {
+      id: 193171,
+      name: sitcom
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientKeywordTests.TestKeywordGetSingle.verified.txt b/TMDbLibTests/Verification/ClientKeywordTests.TestKeywordGetSingle.verified.txt
new file mode 100644
index 0000000..ec484e8
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientKeywordTests.TestKeywordGetSingle.verified.txt
@@ -0,0 +1,4 @@
+{
+  id: 33705,
+  name: agent
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientListsTests.TestGetListAsync.verified.txt b/TMDbLibTests/Verification/ClientListsTests.TestGetListAsync.verified.txt
new file mode 100644
index 0000000..d2f3eed
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientListsTests.TestGetListAsync.verified.txt
@@ -0,0 +1,26 @@
+{
+  created_by: TMDbTestAccount,
+  items: [
+    {
+      original_title: Evan Almighty,
+      release_date: DateTime_1,
+      title: Evan Almighty,
+      backdrop_path: <non-empty>,
+      genre_ids: [
+        14,
+        35,
+        10751
+      ],
+      original_language: en,
+      overview: Junior congressman Evan Baxter, whose wish is to "change the world" is heard by none other than God. When God appears with the perplexing request to build an ark, Evan is sure he is losing it.,
+      poster_path: <non-empty>,
+      id: 2698,
+      media_type: movie,
+    }
+  ],
+  description: This is a test list,
+  id: 528349d419c2954bd21ca0a8,
+  iso_639_1: en,
+  item_count: 1,
+  name: Test list
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientListsTests.TestListCreateAddClearAndDeleteAsync.verified.txt b/TMDbLibTests/Verification/ClientListsTests.TestListCreateAddClearAndDeleteAsync.verified.txt
new file mode 100644
index 0000000..ac3cd4a
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientListsTests.TestListCreateAddClearAndDeleteAsync.verified.txt
@@ -0,0 +1,5 @@
+{
+  created_by: TMDbTestAccount,
+  description: ,
+  iso_639_1: en,
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientMovieTests.TestMoviesExtrasNone.verified.txt b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesExtrasNone.verified.txt
new file mode 100644
index 0000000..8246e4c
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesExtrasNone.verified.txt
@@ -0,0 +1,101 @@
+{
+  backdrop_path: <non-empty>,
+  belongs_to_collection: {
+    backdrop_path: <non-empty>,
+    id: 1570,
+    name: Die Hard Collection,
+    poster_path: <non-empty>
+  },
+  budget: 92000000,
+  genres: [
+    {
+      id: 28,
+      name: Action
+    },
+    {
+      id: 53,
+      name: Thriller
+    }
+  ],
+  homepage: http://www.diehardmovie.com/,
+  id: 47964,
+  imdb_id: tt1606378,
+  original_language: en,
+  original_title: A Good Day to Die Hard,
+  overview: Iconoclastic, take-no-prisoners cop John McClane, finds himself for the first time on foreign soil after traveling to Moscow to help his wayward son Jack - unaware that Jack is really a highly-trained CIA operative out to stop a nuclear weapons heist. With the Russian underworld in pursuit, and battling a countdown to war, the two McClanes discover that their opposing methods make them unstoppable heroes.,
+  poster_path: <non-empty>,
+  production_companies: [
+    {
+      id: 25,
+      name: 20th Century Fox,
+      logo_path: <non-empty>,
+      origin_country: US
+    },
+    {
+      id: 290,
+      name: Ingenious Media,
+      logo_path: <non-empty>,
+      origin_country: GB
+    },
+    {
+      id: 444,
+      name: Dune Entertainment,
+      logo_path: <non-empty>,
+      origin_country: US
+    },
+    {
+      id: 2735,
+      name: Mid Atlantic Films,
+      origin_country: HU
+    },
+    {
+      id: 10893,
+      name: Big Screen Productions,
+      origin_country: 
+    },
+    {
+      id: 12292,
+      name: Temple Hill Entertainment,
+      logo_path: <non-empty>,
+      origin_country: US
+    },
+    {
+      id: 22213,
+      name: TSG Entertainment,
+      logo_path: <non-empty>,
+      origin_country: US
+    },
+    {
+      id: 34396,
+      name: Giant Pictures,
+      origin_country: 
+    },
+    {
+      id: 34397,
+      name: Origo Film Group,
+      origin_country: 
+    }
+  ],
+  production_countries: [
+    {
+      Iso_3166_1: US,
+      Name: United States of America
+    }
+  ],
+  release_date: DateTime_1,
+  revenue: 304654182,
+  runtime: 98,
+  spoken_languages: [
+    {
+      Iso_639_1: en,
+      Name: English
+    },
+    {
+      Iso_639_1: ru,
+      Name: Pусский
+    }
+  ],
+  status: Released,
+  tagline: Yippee Ki-Yay Mother Russia,
+  title: A Good Day to Die Hard,
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetExternalIds.verified.txt b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetExternalIds.verified.txt
new file mode 100644
index 0000000..52c9008
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetExternalIds.verified.txt
@@ -0,0 +1,7 @@
+{
+  id: 335984,
+  imdb_id: tt1856101,
+  facebook_id: BladeRunner2049,
+  twitter_id: bladerunner,
+  instagram_id: bladerunnermovie
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieAlternativeTitles.verified.txt b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieAlternativeTitles.verified.txt
new file mode 100644
index 0000000..ac6ad4d
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieAlternativeTitles.verified.txt
@@ -0,0 +1,62 @@
+{
+  respUs: {
+    id: 47964,
+    titles: [
+      {
+        iso_3166_1: US,
+        title: Die Hard 5: A Good Day to Die Hard,
+        type: faux title
+      },
+      {
+        iso_3166_1: US,
+        title: Die Hard 5,
+        type: informal title
+      },
+      {
+        iso_3166_1: US,
+        title: Duro de matar 5,
+        type: 
+      },
+      {
+        iso_3166_1: US,
+        title: Good Day to Die Hard, A,
+        type: 
+      },
+      {
+        iso_3166_1: US,
+        title: Die Hard 5 - A Good Day to Die Hard (2013),
+        type: Alphabetical
+      },
+      {
+        iso_3166_1: US,
+        title: Die Hard 5 - A Good Day to Die Hard,
+        type: 
+      }
+    ]
+  },
+  respFrench: {
+    id: 47964,
+    titles: [
+      {
+        iso_3166_1: FR,
+        title: Die Hard 5 - Belle Journée Pour mourir,
+        type: faux title
+      },
+      {
+        iso_3166_1: FR,
+        title: Die hard 5,
+        type: 
+      }
+    ]
+  },
+  respCaDefault: {
+    id: 47964,
+    titles: [
+      {
+        iso_3166_1: CA,
+        title: Une Belle journée pour crever,
+        type: 
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieCasts.verified.txt b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieCasts.verified.txt
new file mode 100644
index 0000000..b2d13c4
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieCasts.verified.txt
@@ -0,0 +1,23 @@
+{
+  cast: {
+    cast_id: 1,
+    character: John McClane,
+    credit_id: 52fe4751c3a36847f812f049,
+    id: 62,
+    name: Bruce Willis,
+    profile_path: <non-empty>,
+    gender: Male,
+    known_for_department: Acting,
+    original_name: Bruce Willis,
+  },
+  crew: {
+    credit_id: 5336b04a9251417db4000c80,
+    department: Production,
+    id: 3965,
+    job: Casting,
+    name: Deborah Aquila,
+    gender: Female,
+    known_for_department: Production,
+    original_name: Deborah Aquila,
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieImages.verified.txt b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieImages.verified.txt
new file mode 100644
index 0000000..58740cc
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieImages.verified.txt
@@ -0,0 +1,16 @@
+{
+  backdrop: {
+    aspect_ratio: 1.777777777777778,
+    file_path: <non-empty>,
+    height: 720,
+    iso_639_1: en,
+    width: 1280
+  },
+  poster: {
+    aspect_ratio: 0.6666666666666666,
+    file_path: <non-empty>,
+    height: 2100,
+    iso_639_1: it,
+    width: 1400
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieImagesWithImageLanguage.verified.txt b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieImagesWithImageLanguage.verified.txt
new file mode 100644
index 0000000..7865330
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieImagesWithImageLanguage.verified.txt
@@ -0,0 +1,16 @@
+{
+  backdrop: {
+    aspect_ratio: 1.777777777777778,
+    file_path: <non-empty>,
+    height: 720,
+    iso_639_1: en,
+    width: 1280
+  },
+  poster: {
+    aspect_ratio: 0.6666666666666666,
+    file_path: <non-empty>,
+    height: 2100,
+    iso_639_1: en,
+    width: 1400
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieKeywords.verified.txt b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieKeywords.verified.txt
new file mode 100644
index 0000000..d59485f
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieKeywords.verified.txt
@@ -0,0 +1,37 @@
+{
+  id: 47964,
+  keywords: [
+    {
+      id: 258,
+      name: bomb
+    },
+    {
+      id: 591,
+      name: cia
+    },
+    {
+      id: 2139,
+      name: russia
+    },
+    {
+      id: 10685,
+      name: escape
+    },
+    {
+      id: 18074,
+      name: courthouse
+    },
+    {
+      id: 33705,
+      name: agent
+    },
+    {
+      id: 186447,
+      name: rogue
+    },
+    {
+      id: 186450,
+      name: moscow, russia
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieRecommendationsMovies.verified.txt b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieRecommendationsMovies.verified.txt
new file mode 100644
index 0000000..781b1a3
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieRecommendationsMovies.verified.txt
@@ -0,0 +1,32 @@
+{
+  single: {
+    original_title: Live Free or Die Hard,
+    release_date: DateTime_1,
+    title: Live Free or Die Hard,
+    backdrop_path: <non-empty>,
+    genre_ids: [
+      28,
+      53
+    ],
+    original_language: en,
+    overview: John McClane is back and badder than ever, and this time he's working for Homeland Security. He calls on the services of a young hacker in his bid to stop a ring of Internet terrorists intent on taking control of America's computer infrastructure.,
+    poster_path: <non-empty>,
+    id: 1571,
+    media_type: movie,
+  },
+  singleGerman: {
+    original_title: Live Free or Die Hard,
+    release_date: DateTime_1,
+    title: Stirb langsam 4.0,
+    backdrop_path: <non-empty>,
+    genre_ids: [
+      28,
+      53
+    ],
+    original_language: en,
+    overview: Die gesamte USA wird von einem bisher unvorstellbaren Akt des Terrorismus bedroht, der sich innovativster Techniken bedient und mittels Computerkraft das Land ins Chaos zu stürzen vermag. Die IT-Infrastruktur des Landes wird komplett außer Kraft gesetzt, Kommunikation und Bankwesen liegen lahm und die überraschten Behörden wissen zunächst nichts entgegen zu setzen. Nur ein Mann kann den Terror aufhalten: Der New Yorker Polizist John McClane hält nichts von modernem Schnickschnack und macht sich auf seine eigene Art auf die Jagd nach dem Drahtzieher des spektakulären Coups. Unterstützt wird er dabei von dem jungen Greg, den McClane eigentlich nur von New Jersey nach Washington bringen sollte. Doch mal wieder ist der alte Haudegen zur falschen Zeit am falschen Ort…,
+    poster_path: <non-empty>,
+    id: 1571,
+    media_type: movie,
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieReleaseDates.verified.txt b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieReleaseDates.verified.txt
new file mode 100644
index 0000000..7538ad4
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieReleaseDates.verified.txt
@@ -0,0 +1,825 @@
+{
+  id: 47964,
+  results: [
+    {
+      iso_3166_1: AR,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: AU,
+      release_dates: [
+        {
+          certification: M,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-03-20T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: AZ,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: BA,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: BE,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-13T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: BG,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-15T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: BO,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: BR,
+      release_dates: [
+        {
+          certification: 12,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-22T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: BY,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: CA,
+      release_dates: [
+        {
+          certification: 14A,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: CL,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: CN,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-03-13T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: CO,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-15T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: CR,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: CZ,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-03-14T00:00:00Z,
+          type: Theatrical
+        },
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-06-19T00:00:00Z,
+          type: Physical
+        }
+      ]
+    },
+    {
+      iso_3166_1: DE,
+      release_dates: [
+        {
+          certification: 16,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        },
+        {
+          certification: 16,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-06-28T00:00:00Z,
+          type: Physical
+        }
+      ]
+    },
+    {
+      iso_3166_1: DK,
+      release_dates: [
+        {
+          certification: 11,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: DO,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-28T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: EC,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-15T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: EE,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: ES,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-15T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: FI,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-15T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: FR,
+      release_dates: [
+        {
+          certification: 10,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-20T00:00:00Z,
+          type: Theatrical
+        },
+        {
+          certification: ,
+          note: Disney+,
+          release_date: 2021-02-23T00:00:00Z,
+          type: Digital
+        },
+        {
+          certification: ,
+          note: DVD & Blu-Ray,
+          release_date: 2013-06-26T00:00:00Z,
+          type: Physical
+        }
+      ]
+    },
+    {
+      iso_3166_1: GB,
+      release_dates: [
+        {
+          certification: 12A,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: GR,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: GT,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-15T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: HK,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-07T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: HN,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: HR,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: HU,
+      release_dates: [
+        {
+          certification: 16,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-13T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: IE,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: IN,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-22T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: IS,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-15T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: IT,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: JP,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: KR,
+      release_dates: [
+        {
+          certification: 15세 이상 관람가,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-06T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: KW,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: KZ,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: LT,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-15T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: LV,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-15T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: MK,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: MX,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: NI,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: NL,
+      release_dates: [
+        {
+          certification: 16,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        },
+        {
+          certification: 16,
+          iso_639_1: ,
+          note: DVD, Blu ray,
+          release_date: 2013-06-19T00:00:00Z,
+          type: Physical
+        },
+        {
+          certification: 16,
+          iso_639_1: ,
+          note: Veronica,
+          release_date: 2017-08-30T00:00:00Z,
+          type: TV
+        }
+      ]
+    },
+    {
+      iso_3166_1: NO,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: NZ,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: PA,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: PE,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: PH,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-13T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: PL,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: PR,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: PT,
+      release_dates: [
+        {
+          certification: M/12,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: RO,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-15T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: RU,
+      release_dates: [
+        {
+          certification: 18+,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: SE,
+      release_dates: [
+        {
+          certification: 15,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: SG,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-07T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: SI,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: SK,
+      release_dates: [
+        {
+          certification: 12,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-03-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: SV,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: TH,
+      release_dates: [
+        {
+          certification: น13+,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-13T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: TW,
+      release_dates: [
+        {
+          certification: 輔12,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-08T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: UA,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: US,
+      release_dates: [
+        {
+          certification: R,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-14T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: UY,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-16T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    },
+    {
+      iso_3166_1: VE,
+      release_dates: [
+        {
+          certification: ,
+          iso_639_1: ,
+          note: ,
+          release_date: 2013-02-12T00:00:00Z,
+          type: Theatrical
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieReleases.verified.txt b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieReleases.verified.txt
new file mode 100644
index 0000000..03b2eb5
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieReleases.verified.txt
@@ -0,0 +1,360 @@
+{
+  countries: [
+    {
+      certification: ,
+      iso_3166_1: AR,
+      release_date: DateTime_1
+    },
+    {
+      certification: M,
+      iso_3166_1: AU,
+      release_date: DateTime_2
+    },
+    {
+      certification: ,
+      iso_3166_1: AZ,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: BA,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: BE,
+      release_date: DateTime_3
+    },
+    {
+      certification: ,
+      iso_3166_1: BG,
+      release_date: DateTime_4
+    },
+    {
+      certification: ,
+      iso_3166_1: BO,
+      release_date: DateTime_1
+    },
+    {
+      certification: 12,
+      iso_3166_1: BR,
+      release_date: DateTime_5
+    },
+    {
+      certification: ,
+      iso_3166_1: BY,
+      release_date: DateTime_1
+    },
+    {
+      certification: 14A,
+      iso_3166_1: CA,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: CL,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: CN,
+      release_date: DateTime_6
+    },
+    {
+      certification: ,
+      iso_3166_1: CO,
+      release_date: DateTime_4
+    },
+    {
+      certification: ,
+      iso_3166_1: CR,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: CZ,
+      release_date: DateTime_7
+    },
+    {
+      certification: ,
+      iso_3166_1: CZ,
+      release_date: DateTime_8
+    },
+    {
+      certification: 16,
+      iso_3166_1: DE,
+      release_date: DateTime_9
+    },
+    {
+      certification: 16,
+      iso_3166_1: DE,
+      release_date: DateTime_1
+    },
+    {
+      certification: 11,
+      iso_3166_1: DK,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: DO,
+      release_date: DateTime_10
+    },
+    {
+      certification: ,
+      iso_3166_1: EC,
+      release_date: DateTime_4
+    },
+    {
+      certification: ,
+      iso_3166_1: EE,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: ES,
+      release_date: DateTime_4
+    },
+    {
+      certification: ,
+      iso_3166_1: FI,
+      release_date: DateTime_4
+    },
+    {
+      certification: ,
+      iso_3166_1: FR,
+      release_date: DateTime_11
+    },
+    {
+      certification: 10,
+      iso_3166_1: FR,
+      release_date: DateTime_12
+    },
+    {
+      certification: ,
+      iso_3166_1: FR,
+      release_date: DateTime_13
+    },
+    {
+      certification: 12A,
+      iso_3166_1: GB,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: GR,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: GT,
+      release_date: DateTime_4
+    },
+    {
+      certification: ,
+      iso_3166_1: HK,
+      release_date: DateTime_14
+    },
+    {
+      certification: ,
+      iso_3166_1: HN,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: HR,
+      release_date: DateTime_1
+    },
+    {
+      certification: 16,
+      iso_3166_1: HU,
+      release_date: DateTime_3
+    },
+    {
+      certification: ,
+      iso_3166_1: IE,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: IN,
+      release_date: DateTime_5
+    },
+    {
+      certification: ,
+      iso_3166_1: IS,
+      release_date: DateTime_4
+    },
+    {
+      certification: ,
+      iso_3166_1: IT,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: JP,
+      release_date: DateTime_1
+    },
+    {
+      certification: 15세 이상 관람가,
+      iso_3166_1: KR,
+      release_date: DateTime_15
+    },
+    {
+      certification: ,
+      iso_3166_1: KW,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: KZ,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: LT,
+      release_date: DateTime_4
+    },
+    {
+      certification: ,
+      iso_3166_1: LV,
+      release_date: DateTime_4
+    },
+    {
+      certification: ,
+      iso_3166_1: MK,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: MX,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: NI,
+      release_date: DateTime_1
+    },
+    {
+      certification: 16,
+      iso_3166_1: NL,
+      release_date: DateTime_8
+    },
+    {
+      certification: 16,
+      iso_3166_1: NL,
+      release_date: DateTime_16
+    },
+    {
+      certification: 16,
+      iso_3166_1: NL,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: NO,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: NZ,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: PA,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: PE,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: PH,
+      release_date: DateTime_3
+    },
+    {
+      certification: ,
+      iso_3166_1: PL,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: PR,
+      release_date: DateTime_1
+    },
+    {
+      certification: M/12,
+      iso_3166_1: PT,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: RO,
+      release_date: DateTime_4
+    },
+    {
+      certification: 18+,
+      iso_3166_1: RU,
+      release_date: DateTime_1
+    },
+    {
+      certification: 15,
+      iso_3166_1: SE,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: SG,
+      release_date: DateTime_14
+    },
+    {
+      certification: ,
+      iso_3166_1: SI,
+      release_date: DateTime_1
+    },
+    {
+      certification: 12,
+      iso_3166_1: SK,
+      release_date: DateTime_7
+    },
+    {
+      certification: ,
+      iso_3166_1: SV,
+      release_date: DateTime_1
+    },
+    {
+      certification: น13+,
+      iso_3166_1: TH,
+      release_date: DateTime_3
+    },
+    {
+      certification: 輔12,
+      iso_3166_1: TW,
+      release_date: DateTime_17
+    },
+    {
+      certification: ,
+      iso_3166_1: UA,
+      release_date: DateTime_1
+    },
+    {
+      certification: R,
+      iso_3166_1: US,
+      release_date: DateTime_1
+    },
+    {
+      certification: ,
+      iso_3166_1: UY,
+      release_date: DateTime_18
+    },
+    {
+      certification: ,
+      iso_3166_1: VE,
+      release_date: DateTime_19
+    }
+  ],
+  id: 47964
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieReviews.verified.txt b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieReviews.verified.txt
new file mode 100644
index 0000000..80f1e71
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieReviews.verified.txt
@@ -0,0 +1,13 @@
+{
+  author: Per Gunnar Jonsson,
+  content: 
+My god what a disappointment! The original movie had a script worth watching and some good action and special effects. This one, well this was a typical Hollywood script written by someone who either was incredibly stupid or just too arrogant to care. It is a script that I would expect from a SyFy channel production.
+
+There was absolutely nothing that made sense in this script. The actual plot about Chernobyl that was ludicrous to say the least. I’m sure the special effects guys had a great day doing the car chase at the beginning but it was just exaggerated and silly to watch. Obviously there are no cops or anything in Moscow since they could drive around smashing cars forever without anyone seeming to care. They walk into Chernobyl and sprays some magic fluid onto the highly radioactive place and voilà, the radioactivity is gone and they can take off their protective suits. What a load of bull! They steal a car and drive to Chernobyl (which is around 1000 kilometres away and the roads in Russia are NOT western highway standard) and they still manage to get there in time to catch the bad guys who are in choppers. Not to mention the fact that they actually get near the place without being stopped. I can go on with this but it is only more and more depressing.
+
+Oh, my favourite (sarcasm), Switzerland have obviously invaded France since Grenoble is now in Switzerland. Funny that I, who lives a couple of hours drive from Grenoble, have not heard about this. That is just so typical dumbass American script writer who have never set foot outside of Hollywood. Maybe it was supposed to be funny but I honestly do not think so and in any case, it was not funny.
+
+The only reason this movie gets a 4 out of 10 star rating is because the special effects are indeed impressive if you can push yourself to look past the ludicrousness of them and it is Bruce Willis after all. It is a shame that they obviously handed the franchise over to some idiot(s) that obviously where utterly incompetent at what they were doing.,
+  id: 5ae9d7ae0e0a26394e008aeb,
+  url: https://www.themoviedb.org/review/5ae9d7ae0e0a26394e008aeb
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieSimilarMovies.verified.txt b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieSimilarMovies.verified.txt
new file mode 100644
index 0000000..bdb99df
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieSimilarMovies.verified.txt
@@ -0,0 +1,34 @@
+{
+  single: {
+    original_title: The Living Daylights,
+    release_date: DateTime_1,
+    title: The Living Daylights,
+    backdrop_path: <non-empty>,
+    genre_ids: [
+      12,
+      28,
+      53
+    ],
+    original_language: en,
+    overview: James Bond helps a Russian General escape into the west. He soon finds out that the KGB wants to kill him for helping the General. A little while later the General is kidnapped from the Secret Service leading 007 to be suspicious.,
+    poster_path: <non-empty>,
+    id: 708,
+    media_type: movie,
+  },
+  singleGerman: {
+    original_title: The Living Daylights,
+    release_date: DateTime_1,
+    title: James Bond 007 - Der Hauch des Todes,
+    backdrop_path: <non-empty>,
+    genre_ids: [
+      12,
+      28,
+      53
+    ],
+    original_language: en,
+    overview: James Bond verhilft einem russischen General zur Flucht in den Westen. Von ihm erfährt er, dass der KGB in einer groß angelegten Aktion alle feindlichen Agenten töten will. Wenig später wird der General vor den Augen des Secret Service entführt. 007 schöpft einen Verdacht.,
+    poster_path: <non-empty>,
+    id: 708,
+    media_type: movie,
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieTranslations.verified.txt b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieTranslations.verified.txt
new file mode 100644
index 0000000..3dd2d61
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieTranslations.verified.txt
@@ -0,0 +1,245 @@
+{
+  id: 47964,
+  translations: [
+    {
+      english_name: Bulgarian,
+      iso_639_1: bg,
+      iso_3166_1: BG,
+      name: български език
+    },
+    {
+      english_name: Portuguese,
+      iso_639_1: pt,
+      iso_3166_1: BR,
+      name: Português
+    },
+    {
+      english_name: French,
+      iso_639_1: fr,
+      iso_3166_1: CA,
+      name: Français
+    },
+    {
+      english_name: Mandarin,
+      iso_639_1: zh,
+      iso_3166_1: CN,
+      name: 普通话
+    },
+    {
+      english_name: Czech,
+      iso_639_1: cs,
+      iso_3166_1: CZ,
+      name: Český
+    },
+    {
+      english_name: German,
+      iso_639_1: de,
+      iso_3166_1: DE,
+      name: Deutsch
+    },
+    {
+      english_name: Danish,
+      iso_639_1: da,
+      iso_3166_1: DK,
+      name: Dansk
+    },
+    {
+      english_name: Spanish,
+      iso_639_1: es,
+      iso_3166_1: ES,
+      name: Español
+    },
+    {
+      english_name: Finnish,
+      iso_639_1: fi,
+      iso_3166_1: FI,
+      name: suomi
+    },
+    {
+      english_name: French,
+      iso_639_1: fr,
+      iso_3166_1: FR,
+      name: Français
+    },
+    {
+      english_name: Georgian,
+      iso_639_1: ka,
+      iso_3166_1: GE,
+      name: ქართული
+    },
+    {
+      english_name: Greek,
+      iso_639_1: el,
+      iso_3166_1: GR,
+      name: ελληνικά
+    },
+    {
+      english_name: Mandarin,
+      iso_639_1: zh,
+      iso_3166_1: HK,
+      name: 普通话
+    },
+    {
+      english_name: Croatian,
+      iso_639_1: hr,
+      iso_3166_1: HR,
+      name: Hrvatski
+    },
+    {
+      english_name: Hungarian,
+      iso_639_1: hu,
+      iso_3166_1: HU,
+      name: Magyar
+    },
+    {
+      english_name: Indonesian,
+      iso_639_1: id,
+      iso_3166_1: ID,
+      name: Bahasa indonesia
+    },
+    {
+      english_name: Hebrew,
+      iso_639_1: he,
+      iso_3166_1: IL,
+      name: עִבְרִית
+    },
+    {
+      english_name: Persian,
+      iso_639_1: fa,
+      iso_3166_1: IR,
+      name: فارسی
+    },
+    {
+      english_name: Italian,
+      iso_639_1: it,
+      iso_3166_1: IT,
+      name: Italiano
+    },
+    {
+      english_name: Japanese,
+      iso_639_1: ja,
+      iso_3166_1: JP,
+      name: 日本語
+    },
+    {
+      english_name: Korean,
+      iso_639_1: ko,
+      iso_3166_1: KR,
+      name: 한국어/조선말
+    },
+    {
+      english_name: Lithuanian,
+      iso_639_1: lt,
+      iso_3166_1: LT,
+      name: Lietuvių
+    },
+    {
+      english_name: Latvian,
+      iso_639_1: lv,
+      iso_3166_1: LV,
+      name: Latviešu
+    },
+    {
+      english_name: Spanish,
+      iso_639_1: es,
+      iso_3166_1: MX,
+      name: Español
+    },
+    {
+      english_name: Dutch,
+      iso_639_1: nl,
+      iso_3166_1: NL,
+      name: Nederlands
+    },
+    {
+      english_name: Norwegian,
+      iso_639_1: no,
+      iso_3166_1: NO,
+      name: Norsk
+    },
+    {
+      english_name: Polish,
+      iso_639_1: pl,
+      iso_3166_1: PL,
+      name: Polski
+    },
+    {
+      english_name: Portuguese,
+      iso_639_1: pt,
+      iso_3166_1: PT,
+      name: Português
+    },
+    {
+      english_name: Romanian,
+      iso_639_1: ro,
+      iso_3166_1: RO,
+      name: Română
+    },
+    {
+      english_name: Serbian,
+      iso_639_1: sr,
+      iso_3166_1: RS,
+      name: Srpski
+    },
+    {
+      english_name: Russian,
+      iso_639_1: ru,
+      iso_3166_1: RU,
+      name: Pусский
+    },
+    {
+      english_name: Arabic,
+      iso_639_1: ar,
+      iso_3166_1: SA,
+      name: العربية
+    },
+    {
+      english_name: Swedish,
+      iso_639_1: sv,
+      iso_3166_1: SE,
+      name: svenska
+    },
+    {
+      english_name: Slovak,
+      iso_639_1: sk,
+      iso_3166_1: SK,
+      name: Slovenčina
+    },
+    {
+      english_name: Thai,
+      iso_639_1: th,
+      iso_3166_1: TH,
+      name: ภาษาไทย
+    },
+    {
+      english_name: Turkish,
+      iso_639_1: tr,
+      iso_3166_1: TR,
+      name: Türkçe
+    },
+    {
+      english_name: Mandarin,
+      iso_639_1: zh,
+      iso_3166_1: TW,
+      name: 普通话
+    },
+    {
+      english_name: Ukrainian,
+      iso_639_1: uk,
+      iso_3166_1: UA,
+      name: Український
+    },
+    {
+      english_name: English,
+      iso_639_1: en,
+      iso_3166_1: US,
+      name: English
+    },
+    {
+      english_name: Vietnamese,
+      iso_639_1: vi,
+      iso_3166_1: VN,
+      name: Tiếng Việt
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieVideos.verified.txt b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieVideos.verified.txt
new file mode 100644
index 0000000..103c4d6
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieVideos.verified.txt
@@ -0,0 +1,15 @@
+{
+  id: 47964,
+  results: [
+    {
+      id: 5b6feadbc3a368189d1603a8,
+      iso_3166_1: US,
+      iso_639_1: en,
+      key: eLu3z4Ikwes,
+      name: Good Day to Die Hard, A - Trailer,
+      site: YouTube,
+      size: 1080,
+      type: Trailer
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieWithImageLanguage.verified.txt b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieWithImageLanguage.verified.txt
new file mode 100644
index 0000000..4e78873
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientMovieTests.TestMoviesGetMovieWithImageLanguage.verified.txt
@@ -0,0 +1,16 @@
+{
+  backdrop: {
+    aspect_ratio: 1.777777777777778,
+    file_path: <non-empty>,
+    height: 1080,
+    iso_639_1: de,
+    width: 1920
+  },
+  poster: {
+    aspect_ratio: 0.6666666666666666,
+    file_path: <non-empty>,
+    height: 1500,
+    iso_639_1: de,
+    width: 1000
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientNetworkTests.TestNetworkAlternativeNamesAsync.verified.txt b/TMDbLibTests/Verification/ClientNetworkTests.TestNetworkAlternativeNamesAsync.verified.txt
new file mode 100644
index 0000000..16befe0
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientNetworkTests.TestNetworkAlternativeNamesAsync.verified.txt
@@ -0,0 +1,9 @@
+{
+  id: 174,
+  results: [
+    {
+      name: American Movie Classics,
+      type: 1984–2002
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientNetworkTests.TestNetworkGetByIdAsync.verified.txt b/TMDbLibTests/Verification/ClientNetworkTests.TestNetworkGetByIdAsync.verified.txt
new file mode 100644
index 0000000..1bfac86
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientNetworkTests.TestNetworkGetByIdAsync.verified.txt
@@ -0,0 +1,7 @@
+{
+  headquarters: Los Gatos, California,
+  homepage: http://www.netflix.com,
+  id: 213,
+  name: Netflix,
+  origin_country: 
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientNetworkTests.TestNetworkImagesAsync.verified.txt b/TMDbLibTests/Verification/ClientNetworkTests.TestNetworkImagesAsync.verified.txt
new file mode 100644
index 0000000..4fa2290
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientNetworkTests.TestNetworkImagesAsync.verified.txt
@@ -0,0 +1,11 @@
+{
+  id: 213,
+  logos: [
+    {
+      aspect_ratio: 3.73134328358209,
+      file_path: <non-empty>,
+      height: 268,
+      width: 1000
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientPersonTests.TestGetPersonExternalIdsAsync.verified.txt b/TMDbLibTests/Verification/ClientPersonTests.TestGetPersonExternalIdsAsync.verified.txt
new file mode 100644
index 0000000..c984664
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientPersonTests.TestGetPersonExternalIdsAsync.verified.txt
@@ -0,0 +1,8 @@
+{
+  facebook_id: ActorBruceWillis,
+  imdb_id: nm0000246,
+  freebase_id: /en/bruce_willis,
+  freebase_mid: /m/0h7pj,
+  id: 62,
+  tvrage_id: 10183
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientPersonTests.TestGetPersonImagesAsync.verified.txt b/TMDbLibTests/Verification/ClientPersonTests.TestGetPersonImagesAsync.verified.txt
new file mode 100644
index 0000000..a1a52fd
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientPersonTests.TestGetPersonImagesAsync.verified.txt
@@ -0,0 +1,6 @@
+{
+  aspect_ratio: 0.6666666666666666,
+  file_path: <non-empty>,
+  height: 1500,
+  width: 1000
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientPersonTests.TestGetPersonMovieCreditsAsync.verified.txt b/TMDbLibTests/Verification/ClientPersonTests.TestGetPersonMovieCreditsAsync.verified.txt
new file mode 100644
index 0000000..37c09c8
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientPersonTests.TestGetPersonMovieCreditsAsync.verified.txt
@@ -0,0 +1,21 @@
+{
+  cast: {
+    character: Lieutenant Muldoon,
+    credit_id: 52fe4329c3a36847f803f193,
+    id: 1992,
+    original_title: Planet Terror,
+    poster_path: <non-empty>,
+    release_date: DateTime_1,
+    title: Planet Terror
+  },
+  crew: {
+    credit_id: 52fe432ec3a36847f8040603,
+    department: Production,
+    id: 2026,
+    job: Producer,
+    original_title: Hostage,
+    poster_path: <non-empty>,
+    release_date: DateTime_2,
+    title: Hostage
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientPersonTests.TestGetTranslatedPersonAsync.verified.txt b/TMDbLibTests/Verification/ClientPersonTests.TestGetTranslatedPersonAsync.verified.txt
new file mode 100644
index 0000000..b5c7f53
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientPersonTests.TestGetTranslatedPersonAsync.verified.txt
@@ -0,0 +1,23 @@
+{
+  also_known_as: [
+    Брюс Уиллис,
+    ブルース・ウィリス,
+    بروس ويليس,
+    브루스 윌리스,
+    บรูซ วิลลิส,
+    ברוס וויליס,
+    Walter Bruce Willis,
+    Bruno,
+    Γουόλτερ Μπρους Γουίλις,
+    Μπρους Γουίλις,
+    布鲁斯·威利斯
+  ],
+  biography: ,
+  birthday: 03/19/1955 00:00:00,
+  gender: Male,
+  id: 62,
+  imdb_id: nm0000246,
+  name: Bruce Willis,
+  place_of_birth: Idar-Oberstein, Germany,
+  profile_path: <non-empty>
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientPersonTests.TestPersonsExtrasAllAsync.verified.txt b/TMDbLibTests/Verification/ClientPersonTests.TestPersonsExtrasAllAsync.verified.txt
new file mode 100644
index 0000000..ec3f776
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientPersonTests.TestPersonsExtrasAllAsync.verified.txt
@@ -0,0 +1,1574 @@
+{
+  also_known_as: [
+    Фрэнк Синатра,
+    Френк Сінатра
+  ],
+  biography: 
+Francis Albert "Frank" Sinatra ( December 12, 1915 – May 14, 1998) was an American singer and actor. Beginning his musical career in the swing era with Harry James and Tommy Dorsey, Sinatra became a successful solo artist in the early to mid-1940s, being the idol of the "bobby soxers".
+
+His professional career had stalled by the 1950s, but it was reborn in 1954 after he won the Academy Award for Best Supporting Actor (for his performance in From Here to Eternity). He signed with Capitol Records and released several critically lauded albums (such as In the Wee Small Hours, Songs for Swingin' Lovers, Come Fly with Me, Only the Lonely and Nice 'n' Easy). Sinatra left Capitol to found his own record label, Reprise Records (finding success with albums such as Ring-A-Ding-Ding, Sinatra at the Sands and Francis Albert Sinatra & Antonio Carlos Jobim), toured internationally, was a founding member of the Rat Pack and fraternized with celebrities and statesmen, including John F. Kennedy.
+
+Sinatra turned 50 in 1965, recorded the retrospective September of My Years, starred in the Emmy-winning television special Frank Sinatra: A Man and His Music, and scored hits with "Strangers in the Night" and "My Way". With sales of his music dwindling and after appearing in several poorly received films, Sinatra retired for the first time in 1971. Two years later, however, he came out of retirement and in 1973 recorded several albums, scoring a Top 40 hit with "(Theme From) New York, New York" in 1980. Using his Las Vegas shows as a home base, he toured both within the United States and internationally, until a short time before his death in 1998.
+
+Sinatra also forged a successful career as a film actor, winning the Academy Award for Best Supporting Actor for his performance in From Here to Eternity, a nomination for Best Actor for The Man with the Golden Arm, and critical acclaim for his performance in The Manchurian Candidate. He also starred in such musicals as High Society, Pal Joey, Guys and Dolls and On the Town. Sinatra was honored at the Kennedy Center Honors in 1983 and was awarded the Presidential Medal of Freedom by Ronald Reagan in 1985 and the Congressional Gold Medal in 1997. Sinatra was also the recipient of eleven Grammy Awards, including the Grammy Trustees Award, Grammy Legend Award and the Grammy Lifetime Achievement Award.
+
+Description above from the Wikipedia article Frank Sinatra, licensed under CC-BY-SA, full list of contributors on Wikipedia.,
+  birthday: 12/12/1915 00:00:00,
+  changes: {},
+  deathday: 05/14/1998 00:00:00,
+  external_ids: {
+    imdb_id: nm0000069,
+    freebase_id: /en/frank_sinatra,
+    freebase_mid: /m/02_fj,
+    tvrage_id: 47349
+  },
+  gender: Male,
+  id: 4347,
+  images: {
+    id: 4347,
+    profiles: [
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1350,
+        width: 900
+      },
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6668457818377217,
+        file_path: <non-empty>,
+        height: 1861,
+        width: 1241
+      }
+    ]
+  },
+  imdb_id: nm0000069,
+  movie_credits: {
+    cast: [
+      {
+        character: Danny Ocean,
+        credit_id: 52fe4234c3a36847f800bf47,
+        id: 299,
+        original_title: Ocean's Eleven,
+        poster_path: <non-empty>,
+        release_date: DateTime_1,
+        title: Ocean's Eleven
+      },
+      {
+        character: Frankie Machine,
+        credit_id: 52fe424fc3a36847f8014359,
+        id: 541,
+        original_title: The Man with the Golden Arm,
+        poster_path: <non-empty>,
+        release_date: DateTime_2,
+        title: The Man with the Golden Arm
+      },
+      {
+        character: Singer,
+        credit_id: 52fe4283c3a36847f8024a33,
+        id: 856,
+        original_title: Who Framed Roger Rabbit,
+        poster_path: <non-empty>,
+        release_date: DateTime_3,
+        title: Who Framed Roger Rabbit
+      },
+      {
+        character: Capt./Maj. Bennett Marco,
+        credit_id: 52fe4296c3a36847f802a3c3,
+        id: 982,
+        original_title: The Manchurian Candidate,
+        poster_path: <non-empty>,
+        release_date: DateTime_4,
+        title: The Manchurian Candidate
+      },
+      {
+        character: Saloon Pianist,
+        credit_id: 52fe4373c3a36847f8055077,
+        id: 2897,
+        original_title: Around the World in Eighty Days,
+        poster_path: <non-empty>,
+        release_date: DateTime_5,
+        title: Around the World in Eighty Days
+      },
+      {
+        character: Capt. Tom Reynolds,
+        credit_id: 52fe43dcc3a36847f807493b,
+        id: 4820,
+        original_title: Never So Few,
+        poster_path: <non-empty>,
+        release_date: DateTime_6,
+        title: Never So Few
+      },
+      {
+        character: Nathan Detroit,
+        credit_id: 52fe43ddc3a36847f8074c4b,
+        id: 4825,
+        original_title: Guys and Dolls,
+        poster_path: <non-empty>,
+        release_date: DateTime_7,
+        title: Guys and Dolls
+      },
+      {
+        character: Colonel Joseph L. Ryan,
+        credit_id: 52fe442bc3a368484e013931,
+        id: 21876,
+        original_title: Von Ryan's Express,
+        poster_path: <non-empty>,
+        release_date: DateTime_8,
+        title: Von Ryan's Express
+      },
+      {
+        character: Macaulay 'Mike' Connor,
+        credit_id: 52fe443d9251416c7502db03,
+        id: 11424,
+        original_title: High Society,
+        poster_path: <non-empty>,
+        release_date: DateTime_9,
+        title: High Society
+      },
+      {
+        character: Pvt. Angelo Maggio,
+        credit_id: 52fe443d9251416c7502dbdd,
+        id: 11426,
+        original_title: From Here to Eternity,
+        poster_path: <non-empty>,
+        release_date: DateTime_10,
+        title: From Here to Eternity
+      },
+      {
+        character: Singer (uncredited),
+        credit_id: 52fe4451c3a368484e01c669,
+        id: 22829,
+        original_title: Paris When It Sizzles,
+        poster_path: <non-empty>,
+        release_date: DateTime_11,
+        title: Paris When It Sizzles
+      },
+      {
+        character: Miguel,
+        credit_id: 52fe445ec3a368484e01ef95,
+        id: 23102,
+        original_title: The Pride and the Passion,
+        poster_path: <non-empty>,
+        release_date: DateTime_12,
+        title: The Pride and the Passion
+      },
+      {
+        character: Gypsy,
+        credit_id: 52fe44659251416c750334a1,
+        id: 11605,
+        original_title: The List of Adrian Messenger,
+        poster_path: <non-empty>,
+        release_date: DateTime_13,
+        title: The List of Adrian Messenger
+      },
+      {
+        character: Chip,
+        credit_id: 52fe44839251416c9101363b,
+        id: 31516,
+        original_title: On the Town,
+        poster_path: <non-empty>,
+        release_date: DateTime_14,
+        title: On the Town
+      },
+      {
+        character: The 'Twig' on Plutomium (uncredited),
+        credit_id: 52fe44a09251416c91017527,
+        id: 31804,
+        original_title: The Road to Hong Kong,
+        poster_path: <non-empty>,
+        release_date: DateTime_15,
+        title: The Road to Hong Kong
+      },
+      {
+        character: Himself,
+        credit_id: 52fe44a89251416c7503c65f,
+        id: 11950,
+        original_title: Cannonball Run II,
+        poster_path: <non-empty>,
+        release_date: DateTime_16,
+        title: Cannonball Run II
+      },
+      {
+        character: Harry,
+        credit_id: 52fe44a89251416c910184ab,
+        id: 31916,
+        original_title: The Devil at 4 O'Clock,
+        poster_path: <non-empty>,
+        release_date: DateTime_17,
+        title: The Devil at 4 O'Clock
+      },
+      {
+        character: Tony Rome,
+        credit_id: 52fe44f4c3a368484e040463,
+        id: 26204,
+        original_title: Tony Rome,
+        poster_path: <non-empty>,
+        release_date: DateTime_18,
+        title: Tony Rome
+      },
+      {
+        character: Tony Manetta,
+        credit_id: 52fe45339251416c9102ab3b,
+        id: 33725,
+        original_title: A Hole in the Head,
+        poster_path: <non-empty>,
+        release_date: DateTime_19,
+        title: A Hole in the Head
+      },
+      {
+        character: François Durnais,
+        credit_id: 52fe45339251416c9102ab81,
+        id: 33726,
+        original_title: Can-Can,
+        poster_path: <non-empty>,
+        release_date: DateTime_20,
+        title: Can-Can
+      },
+      {
+        character: Alan Baker,
+        credit_id: 52fe45339251416c9102ac39,
+        id: 33729,
+        original_title: Come Blow Your Horn,
+        poster_path: <non-empty>,
+        release_date: DateTime_21,
+        title: Come Blow Your Horn
+      },
+      {
+        character: Joey Evans,
+        credit_id: 52fe45349251416c9102ad37,
+        id: 33734,
+        original_title: Pal Joey,
+        poster_path: <non-empty>,
+        release_date: DateTime_22,
+        title: Pal Joey
+      },
+      {
+        character: Dennis Ryan,
+        credit_id: 52fe45349251416c9102ae7f,
+        id: 33738,
+        original_title: Take Me Out to the Ball Game,
+        poster_path: <non-empty>,
+        release_date: DateTime_23,
+        title: Take Me Out to the Ball Game
+      },
+      {
+        character: Edward X. Delaney,
+        credit_id: 52fe45a5c3a368484e066e17,
+        id: 28614,
+        original_title: The First Deadly Sin,
+        poster_path: <non-empty>,
+        release_date: DateTime_24,
+        title: The First Deadly Sin
+      },
+      {
+        character: Tony Rome,
+        credit_id: 52fe460ec3a36847f80e9d73,
+        id: 42630,
+        original_title: Lady in Cement,
+        poster_path: <non-empty>,
+        release_date: DateTime_25,
+        title: Lady in Cement
+      },
+      {
+        character: Det. Sgt. Joe Leland,
+        credit_id: 52fe460ec3a36847f80ea067,
+        id: 42636,
+        original_title: The Detective,
+        poster_path: <non-empty>,
+        release_date: DateTime_26,
+        title: The Detective
+      },
+      {
+        character: Mark Brittain,
+        credit_id: 52fe4614c3a36847f80eb9b3,
+        id: 42716,
+        original_title: Assault on a Queen,
+        poster_path: <non-empty>,
+        release_date: DateTime_27,
+        title: Assault on a Queen
+      },
+      {
+        character: Johnny Concho / Johnny Collins,
+        credit_id: 52fe462ac3a368484e082573,
+        id: 60548,
+        original_title: Johnny Concho,
+        poster_path: <non-empty>,
+        release_date: DateTime_28,
+        title: Johnny Concho
+      },
+      {
+        character: Charlie Y. Reader,
+        credit_id: 52fe463ec3a36847f80f425b,
+        id: 43326,
+        original_title: The Tender Trap,
+        poster_path: <non-empty>,
+        release_date: DateTime_29,
+        title: The Tender Trap
+      },
+      {
+        character: Barney Sloan,
+        credit_id: 52fe4640c3a36847f80f4789,
+        id: 43340,
+        original_title: Young at Heart,
+        poster_path: <non-empty>,
+        release_date: DateTime_30,
+        title: Young at Heart
+      },
+      {
+        character: Chief Pharmacist Mate,
+        credit_id: 52fe4645c3a36847f80f5c1f,
+        id: 43407,
+        original_title: None But the Brave,
+        poster_path: <non-empty>,
+        release_date: DateTime_31,
+        title: None But the Brave
+      },
+      {
+        character: Father Paul,
+        credit_id: 52fe4649c3a36847f80f6829,
+        id: 43456,
+        original_title: The Miracle of the Bells,
+        poster_path: <non-empty>,
+        release_date: DateTime_32,
+        title: The Miracle of the Bells
+      },
+      {
+        character: Glenn Russell,
+        credit_id: 52fe464cc3a36847f80f751b,
+        id: 43503,
+        original_title: Step Lively,
+        poster_path: <non-empty>,
+        release_date: DateTime_33,
+        title: Step Lively
+      },
+      {
+        character: Frank,
+        credit_id: 52fe464dc3a36847f80f78ad,
+        id: 43511,
+        original_title: Higher and Higher,
+        poster_path: <non-empty>,
+        release_date: DateTime_34,
+        title: Higher and Higher
+      },
+      {
+        character: Frankie (archive footage),
+        credit_id: 52fe46a79251416c7507f143,
+        id: 16130,
+        original_title: La Classe américaine,
+        poster_path: <non-empty>,
+        release_date: DateTime_35,
+        title: La Classe américaine
+      },
+      {
+        character: Dave Hirsh,
+        credit_id: 52fe46d69251416c910616db,
+        id: 38724,
+        original_title: Some Came Running,
+        poster_path: <non-empty>,
+        release_date: DateTime_36,
+        title: Some Came Running
+      },
+      {
+        character: Zack Thomas,
+        credit_id: 52fe47409251416c75092ddb,
+        id: 17691,
+        original_title: 4 for Texas,
+        poster_path: <non-empty>,
+        release_date: DateTime_37,
+        title: 4 for Texas
+      },
+      {
+        character: Robbo,
+        credit_id: 52fe47419251416c75092ea7,
+        id: 17696,
+        original_title: Robin and the 7 Hoods,
+        poster_path: <non-empty>,
+        release_date: DateTime_38,
+        title: Robin and the 7 Hoods
+      },
+      {
+        character: Clarence Doolittle,
+        credit_id: 52fe474f9251416c75094cdd,
+        id: 17889,
+        original_title: Anchors Aweigh,
+        poster_path: <non-empty>,
+        release_date: DateTime_39,
+        title: Anchors Aweigh
+      },
+      {
+        character: Dingus Billy Magee,
+        credit_id: 52fe4765c3a36847f8133473,
+        id: 48408,
+        original_title: Dirty Dingus Magee,
+        poster_path: <non-empty>,
+        release_date: DateTime_40,
+        title: Dirty Dingus Magee
+      },
+      {
+        character: John Baron,
+        credit_id: 52fe47789251416c7509a82d,
+        id: 18398,
+        original_title: Suddenly,
+        poster_path: <non-empty>,
+        release_date: DateTime_41,
+        title: Suddenly
+      },
+      {
+        character: Mike Merry,
+        credit_id: 52fe47829251416c7509c0a5,
+        id: 18512,
+        original_title: Sergeants 3,
+        poster_path: <non-empty>,
+        release_date: DateTime_42,
+        title: Sergeants 3
+      },
+      {
+        character: Frank Sinatra,
+        credit_id: 52fe47929251416c7509e465,
+        id: 18700,
+        original_title: Till the Clouds Roll By,
+        poster_path: <non-empty>,
+        release_date: DateTime_43,
+        title: Till the Clouds Roll By
+      },
+      {
+        character: Danny Webson Miller,
+        credit_id: 52fe47dd9251416c750a8059,
+        id: 19525,
+        original_title: It Happened in Brooklyn,
+        poster_path: <non-empty>,
+        release_date: DateTime_44,
+        title: It Happened in Brooklyn
+      },
+      {
+        character: Himself,
+        credit_id: 52fe48509251416c91087f03,
+        id: 82420,
+        original_title: Frank Sinatra: A Reflection,
+        release_date: DateTime_45,
+        title: Frank Sinatra: A Reflection
+      },
+      {
+        character: Frank Sinatra,
+        credit_id: 52fe48749251416c9108d16b,
+        id: 82792,
+        original_title: Pepe,
+        poster_path: <non-empty>,
+        release_date: DateTime_46,
+        title: Pepe
+      },
+      {
+        character: Johnny Dalton,
+        credit_id: 52fe48f39251416c9109daf3,
+        id: 84397,
+        original_title: Double Dynamite,
+        poster_path: <non-empty>,
+        release_date: DateTime_47,
+        title: Double Dynamite
+      },
+      {
+        character: Alfred Boone,
+        credit_id: 52fe4927c3a368484e11cf4d,
+        id: 76117,
+        original_title: Not as a Stranger,
+        poster_path: <non-empty>,
+        release_date: DateTime_48,
+        title: Not as a Stranger
+      },
+      {
+        character: Lieutenant Sam Loggins,
+        credit_id: 52fe4993c3a368484e132739,
+        id: 78229,
+        original_title: Kings Go Forth,
+        poster_path: <non-empty>,
+        release_date: DateTime_49,
+        title: Kings Go Forth
+      },
+      {
+        character: Frank Sinatra,
+        credit_id: 52fe49e2c3a36847f81aba95,
+        id: 100834,
+        original_title: Reveille with Beverly,
+        poster_path: <non-empty>,
+        release_date: DateTime_50,
+        title: Reveille with Beverly
+      },
+      {
+        character: Self,
+        credit_id: 52fe49e79251416c910bc9ef,
+        id: 88044,
+        original_title: Sinatra at Carnegie Hall,
+        release_date: DateTime_51,
+        title: Sinatra at Carnegie Hall
+      },
+      {
+        character: Himself,
+        credit_id: 52fe49f79251416c910bec2f,
+        id: 88502,
+        original_title: The Ultimate Event,
+        poster_path: <non-empty>,
+        release_date: DateTime_52,
+        title: The Ultimate Event
+      },
+      {
+        character: Dan Edwards,
+        credit_id: 52fe4a1e9251416c750de63d,
+        id: 98648,
+        original_title: Marriage on the Rocks,
+        poster_path: <non-empty>,
+        release_date: DateTime_53,
+        title: Marriage on the Rocks
+      },
+      {
+        character: Ricardo,
+        credit_id: 52fe4b5bc3a368484e1852e9,
+        id: 130425,
+        original_title: The Kissing Bandit,
+        poster_path: <non-empty>,
+        release_date: DateTime_54,
+        title: The Kissing Bandit
+      },
+      {
+        character: Sam Laker,
+        credit_id: 52fe4b6d9251416c751025d1,
+        id: 145965,
+        original_title: The Naked Runner,
+        poster_path: <non-empty>,
+        release_date: DateTime_55,
+        title: The Naked Runner
+      },
+      {
+        character: Frank Hovannes,
+        credit_id: 52fe4b70c3a36847f8203c3f,
+        id: 115537,
+        original_title: Contract on Cherry Street,
+        release_date: DateTime_56,
+        title: Contract on Cherry Street
+      },
+      {
+        character: Joe E. Lewis,
+        credit_id: 52fe4bbcc3a368484e19729b,
+        id: 133792,
+        original_title: The Joker Is Wild,
+        poster_path: <non-empty>,
+        release_date: DateTime_57,
+        title: The Joker Is Wild
+      },
+      {
+        character: Himself,
+        credit_id: 52fe4bbe9251416c7510ca85,
+        id: 148075,
+        original_title: The House I Live In,
+        poster_path: <non-empty>,
+        release_date: DateTime_58,
+        title: The House I Live In
+      },
+      {
+        character: Danny Wilson,
+        credit_id: 52fe4c65c3a36847f822c125,
+        id: 163332,
+        original_title: Meet Danny Wilson,
+        release_date: DateTime_59,
+        title: Meet Danny Wilson
+      },
+      {
+        character: Himself,
+        credit_id: 52fe4c6ac3a368484e1b742b,
+        id: 139714,
+        original_title: Frank Sinatra: Concert for the Americas,
+        poster_path: <non-empty>,
+        release_date: DateTime_60,
+        title: Frank Sinatra: Concert for the Americas
+      },
+      {
+        character: Himself,
+        credit_id: 52fe4cd79251416c751273ef,
+        id: 185125,
+        original_title: Road to Victory,
+        poster_path: <non-empty>,
+        release_date: DateTime_61,
+        title: Road to Victory
+      },
+      {
+        character: Himself (archive footage),
+        credit_id: 52fe4d4c9251416c751367ed,
+        id: 188991,
+        original_title: Hollywood Out-takes and Rare Footage,
+        poster_path: <non-empty>,
+        release_date: DateTime_62,
+        title: Hollywood Out-takes and Rare Footage
+      },
+      {
+        character: Band singer,
+        credit_id: 52fe4d5cc3a36847f825ca49,
+        id: 175288,
+        original_title: Las Vegas Nights,
+        release_date: DateTime_63,
+        title: Las Vegas Nights
+      },
+      {
+        character: Himself,
+        credit_id: 52fe4e649251416c75154e71,
+        id: 225633,
+        original_title: The Ocean's 11 Story,
+        release_date: DateTime_64,
+        title: The Ocean's 11 Story
+      },
+      {
+        character: Himself,
+        credit_id: 52fe4f48c3a36847f82ca863,
+        id: 249641,
+        original_title: Live and Swingin': The Ultimate Rat Pack Collection,
+        poster_path: <non-empty>,
+        release_date: DateTime_65,
+        title: Live and Swingin': The Ultimate Rat Pack Collection
+      },
+      {
+        character: Self,
+        credit_id: 531031899251410fe6000942,
+        id: 257402,
+        original_title: The Shining Future,
+        poster_path: <non-empty>,
+        release_date: DateTime_66,
+        title: The Shining Future
+      },
+      {
+        character: ,
+        credit_id: 532d9928c3a3685fc3001eda,
+        id: 260518,
+        original_title: Céline Dion: All the Way... A Decade of Song and Video,
+        poster_path: <non-empty>,
+        release_date: DateTime_67,
+        title: All the Way... A Decade of Song and Video
+      },
+      {
+        character: Singer in Tommy Dorsey Orchestra,
+        credit_id: 53493e1a0e0a266b3f0015d6,
+        id: 43782,
+        original_title: Ship Ahoy,
+        poster_path: <non-empty>,
+        release_date: DateTime_68,
+        title: Ship Ahoy
+      },
+      {
+        character: Vocal,
+        credit_id: 534d7a4fc3a368679b0002d5,
+        id: 264824,
+        original_title: Frank Sinatra - Primetime,
+        poster_path: <non-empty>,
+        release_date: DateTime_69,
+        title: Frank Sinatra - Primetime
+      },
+      {
+        character: Himself,
+        credit_id: 536d052bc3a3683bf9002cec,
+        id: 268930,
+        original_title: Frank Sinatra: The Voice of a Century,
+        poster_path: <non-empty>,
+        release_date: DateTime_70,
+        title: Frank Sinatra: The Voice of a Century
+      },
+      {
+        character: Himself (archive footage),
+        credit_id: 53e6aef70e0a2628c700289c,
+        id: 286034,
+        original_title: The Definitive Elvis: The Television Years,
+        release_date: DateTime_71,
+        title: The Definitive Elvis: The Television Years
+      },
+      {
+        character: er selbst,
+        credit_id: 5402620ec3a3684372003baf,
+        id: 289588,
+        original_title: Glück und Liebe in Monaco,
+        release_date: DateTime_72,
+        title: Happiness and Love in Monaco
+      },
+      {
+        character: Vince Talmadge,
+        credit_id: 5414f0410e0a26199b00301a,
+        id: 8737,
+        original_title: Cast a Giant Shadow,
+        poster_path: <non-empty>,
+        release_date: DateTime_73,
+        title: Cast a Giant Shadow
+      },
+      {
+        character: Himself,
+        credit_id: 541da6b0c3a36801cf008a85,
+        id: 293954,
+        original_title: The Best Of Louis Armstrong: Satchmo At His Best,
+        release_date: DateTime_74,
+        title: The Best Of Louis Armstrong: Satchmo At His Best
+      },
+      {
+        character: Self,
+        credit_id: 546bc8a99251412f580008d3,
+        id: 304201,
+        original_title: I due Kennedy,
+        poster_path: <non-empty>,
+        release_date: DateTime_75,
+        title: The Two Kennedys
+      },
+      {
+        character: ,
+        credit_id: 5478773392514104d8004d52,
+        id: 271280,
+        original_title: Frank Sinatra: The Main Event,
+        poster_path: <non-empty>,
+        release_date: DateTime_76,
+        title: Frank Sinatra: The Main Event
+      },
+      {
+        character: Himself - Host / Narrator,
+        credit_id: 551a98179251415c3a0016cd,
+        id: 33740,
+        original_title: That's Entertainment!,
+        poster_path: <non-empty>,
+        release_date: DateTime_77,
+        title: That's Entertainment!
+      },
+      {
+        character: ,
+        credit_id: 55682e639251417bc40014b7,
+        id: 103091,
+        original_title: All-Star Party for Frank Sinatra,
+        release_date: DateTime_78,
+        title: All-Star Party for Frank Sinatra
+      },
+      {
+        character: Himself,
+        credit_id: 55d09634c3a3681bee007589,
+        id: 271580,
+        original_title: Frank Sinatra: A Man and His Music,
+        poster_path: <non-empty>,
+        release_date: DateTime_79,
+        title: Frank Sinatra: A Man and His Music Part I
+      },
+      {
+        character: Himself,
+        credit_id: 55d09df992514142b4004be9,
+        id: 354790,
+        original_title: Frank Sinatra: A Man and His Music Part II,
+        poster_path: <non-empty>,
+        release_date: DateTime_80,
+        title: Frank Sinatra: A Man and His Music Part II
+      },
+      {
+        character: ,
+        credit_id: 55d09f02925141319f007d20,
+        id: 275349,
+        original_title: Frank Sinatra: A Man and His Music + Ella + Jobim,
+        poster_path: <non-empty>,
+        release_date: DateTime_81,
+        title: Frank Sinatra: A Man and His Music + Ella + Jobim
+      },
+      {
+        character: ,
+        credit_id: 55d0a31f92514142b4004c75,
+        id: 275350,
+        original_title: Frank Sinatra: The Man and His Music,
+        poster_path: <non-empty>,
+        release_date: DateTime_82,
+        title: Frank Sinatra: The Man and His Music
+      },
+      {
+        character: ,
+        credit_id: 55d0bf3392514142b400500a,
+        id: 271279,
+        original_title: Frank Sinatra: Ol' Blue Eyes Is Back,
+        poster_path: <non-empty>,
+        release_date: DateTime_83,
+        title: Frank Sinatra: Ol' Blue Eyes Is Back
+      },
+      {
+        character: ,
+        credit_id: 55d106ff925141319800865f,
+        id: 271278,
+        original_title: Frank Sinatra: In Concert at Royal Festival Hall,
+        poster_path: <non-empty>,
+        release_date: DateTime_84,
+        title: Frank Sinatra: In Concert at Royal Festival Hall
+      },
+      {
+        character: ,
+        credit_id: 55d10ba2c3a3686e3500012e,
+        id: 103094,
+        original_title: Frank Sinatra in Japan: Live at the Budokan Hall, Tokyo,
+        poster_path: <non-empty>,
+        release_date: DateTime_85,
+        title: Frank Sinatra in Japan: Live at the Budokan Hall, Tokyo
+      },
+      {
+        character: ,
+        credit_id: 562ff217c3a3681b5200e0b9,
+        id: 253089,
+        original_title: Christmas from Hollywood,
+        release_date: DateTime_86,
+        title: Christmas from Hollywood
+      },
+      {
+        character: ,
+        credit_id: 5684ab0a92514131df017327,
+        id: 375119,
+        original_title: Sinatra,
+        poster_path: <non-empty>,
+        release_date: DateTime_87,
+        title: Sinatra
+      },
+      {
+        character: ,
+        credit_id: 568ae898c3a368227b020ebf,
+        id: 375953,
+        original_title: Sinatra Sings,
+        poster_path: <non-empty>,
+        release_date: DateTime_88,
+        title: Sinatra Sings
+      },
+      {
+        character: ,
+        credit_id: 56c6c814c3a3680d570050d3,
+        id: 383601,
+        original_title: Francis Albert Sinatra Does His Thing,
+        poster_path: <non-empty>,
+        release_date: DateTime_89,
+        title: Francis Albert Sinatra Does His Thing
+      },
+      {
+        character: ,
+        credit_id: 56c7f7c09251411738001680,
+        id: 383778,
+        original_title: Sinatra and Friends,
+        poster_path: <non-empty>,
+        release_date: DateTime_90,
+        title: Sinatra and Friends
+      },
+      {
+        character: Himself,
+        credit_id: 56c7fa57c3a3684097001c19,
+        id: 383780,
+        original_title: Vintage Sinatra,
+        release_date: DateTime_91,
+        title: Vintage Sinatra
+      },
+      {
+        character: Himself,
+        credit_id: 56c802dcc3a3684087001a9f,
+        id: 383782,
+        original_title: Frank Sinatra: TV Performances,
+        release_date: DateTime_92,
+        title: Frank Sinatra: TV Performances
+      },
+      {
+        character: Man at Slot Machine (uncredited),
+        credit_id: 576293f1c3a3680d01000cc7,
+        id: 131504,
+        original_title: Meet Me in Las Vegas,
+        poster_path: <non-empty>,
+        release_date: DateTime_93,
+        title: Meet Me in Las Vegas
+      },
+      {
+        character: Archive Footage,
+        credit_id: 582e0ad9925141095d00c42b,
+        id: 399794,
+        original_title: Jay Sebring....Cutting to the Truth,
+        poster_path: <non-empty>,
+        release_date: DateTime_94,
+        title: Jay Sebring....Cutting to the Truth
+      },
+      {
+        character: Himself (archive footage),
+        credit_id: 5840d01ac3a36865b30013dd,
+        id: 185699,
+        original_title: Gene Kelly: Anatomy of a Dancer,
+        release_date: DateTime_95,
+        title: Gene Kelly: Anatomy of a Dancer
+      },
+      {
+        character: (archive footage),
+        credit_id: 587a9d72c3a36849ff006e46,
+        id: 77448,
+        original_title: That's Entertainment! III,
+        poster_path: <non-empty>,
+        release_date: DateTime_96,
+        title: That's Entertainment! III
+      },
+      {
+        character: Himself,
+        credit_id: 58b225ab9251415b1d015b2c,
+        id: 248153,
+        original_title: A Tale of Two Sisters - Lorna Luft and Liza Minnelli,
+        release_date: DateTime_97,
+        title: A Tale of Two Sisters - Lorna Luft and Liza Minnelli
+      },
+      {
+        character: Himself,
+        credit_id: 58bb7fb8925141126a01116a,
+        id: 343835,
+        original_title: Sammy Davis, Jr. 60th Anniversary Celebration,
+        release_date: DateTime_98,
+        title: Sammy Davis, Jr. 60th Anniversary Celebration
+      },
+      {
+        character: Himself,
+        credit_id: 58cdda3cc3a36850f30130a7,
+        id: 447719,
+        original_title: Frank Sinatra Memorial,
+        poster_path: <non-empty>,
+        release_date: DateTime_99,
+        title: Frank Sinatra Memorial
+      },
+      {
+        character: (archive footage),
+        credit_id: 593833a4c3a368541f0002e0,
+        id: 460890,
+        original_title: Hollywood Musicals of the 40's,
+        poster_path: <non-empty>,
+        release_date: DateTime_100,
+        title: Hollywood Musicals of the 40's
+      },
+      {
+        character: Self,
+        credit_id: 5954fc58c3a36809c6050375,
+        id: 463887,
+        original_title: Frank Sinatra: Live at Caesar's Palace,
+        poster_path: <non-empty>,
+        release_date: DateTime_101,
+        title: Frank Sinatra: Live at Caesar's Palace
+      },
+      {
+        character: Himself,
+        credit_id: 597a23b192514107c801990a,
+        id: 468263,
+        original_title: Frank Sinatra: The Retirement Concert,
+        poster_path: <non-empty>,
+        release_date: DateTime_102,
+        title: Frank Sinatra: The Retirement Concert
+      },
+      {
+        character: Self (archive footage),
+        credit_id: 5995c197c3a3683fa500104a,
+        id: 324051,
+        original_title: Nat King Cole: Afraid of the Dark,
+        poster_path: <non-empty>,
+        release_date: DateTime_103,
+        title: Nat King Cole: Afraid of the Dark
+      },
+      {
+        character: Himself,
+        credit_id: 59b6dad592514125290013c8,
+        id: 250737,
+        original_title: AFI Life Achievement Award: A Tribute to Orson Welles,
+        release_date: DateTime_104,
+        title: AFI Life Achievement Award: A Tribute to Orson Welles
+      },
+      {
+        character: Himself,
+        credit_id: 5a1d7a390e0a264cc1065d65,
+        id: 489681,
+        original_title: Movin' with Nancy,
+        poster_path: <non-empty>,
+        release_date: DateTime_105,
+        title: Movin' with Nancy
+      },
+      {
+        character: Himself (archive footage),
+        credit_id: 5a5a6fc2c3a36867e40124b3,
+        id: 238478,
+        original_title: Six by Sondheim,
+        poster_path: <non-empty>,
+        release_date: DateTime_106,
+        title: Six by Sondheim
+      },
+      {
+        character: Himself (archive footage),
+        credit_id: 5a8c701c925141759309360c,
+        id: 459488,
+        original_title: To Be Frank: Sinatra at 100,
+        poster_path: <non-empty>,
+        release_date: DateTime_107,
+        title: To Be Frank: Sinatra at 100
+      },
+      {
+        character: Himself,
+        credit_id: 5ab5db82925141395e003db2,
+        id: 186702,
+        original_title: Show-Business at War,
+        poster_path: <non-empty>,
+        release_date: DateTime_108,
+        title: Show-Business at War
+      },
+      {
+        character: Himself,
+        credit_id: 5ab5df3c0e0a261fee0041a1,
+        id: 137132,
+        original_title: Judy Garland: By Myself,
+        poster_path: <non-empty>,
+        release_date: DateTime_109,
+        title: Judy Garland: By Myself
+      },
+      {
+        character: ,
+        credit_id: 5af9e38b0e0a263b820020c5,
+        id: 524235,
+        original_title: The All-Star Bond Rally,
+        poster_path: <non-empty>,
+        release_date: DateTime_110,
+        title: The All-Star Bond Rally
+      },
+      {
+        character: (archive footage),
+        credit_id: 5b01190692514109bc006ac5,
+        id: 74719,
+        original_title: That's Entertainment, Part II,
+        poster_path: <non-empty>,
+        release_date: DateTime_111,
+        title: That's Entertainment, Part II
+      },
+      {
+        character: ,
+        credit_id: 5b1635d10e0a262dd9014258,
+        id: 277129,
+        original_title: The Spencer Tracy Legacy: A Tribute by Katharine Hepburn,
+        poster_path: <non-empty>,
+        release_date: DateTime_112,
+        title: The Spencer Tracy Legacy: A Tribute by Katharine Hepburn
+      },
+      {
+        character: ,
+        credit_id: 5b1d9f950e0a264faa003b93,
+        id: 350370,
+        original_title: Hollywood My Home Town,
+        poster_path: <non-empty>,
+        release_date: DateTime_113,
+        title: Hollywood My Home Town
+      },
+      {
+        character: Himself,
+        credit_id: 5b220a199251416f9e00e9bc,
+        id: 82621,
+        original_title: Sinatra: The Classic Duets,
+        release_date: DateTime_114,
+        title: Sinatra: The Classic Duets
+      },
+      {
+        character: Himself,
+        credit_id: 5b26cb400e0a261063003079,
+        id: 311555,
+        original_title: Frank Sinatra Show: Welcome Home Elvis,
+        poster_path: <non-empty>,
+        release_date: DateTime_115,
+        title: Frank Sinatra Show: Welcome Home Elvis
+      },
+      {
+        character: Himself,
+        credit_id: 5b47be570e0a267ac600e16e,
+        id: 535449,
+        original_title: The Frank Sinatra Timex Show: An Afternoon with Frank Sinatra,
+        poster_path: <non-empty>,
+        release_date: DateTime_116,
+        title: The Frank Sinatra Timex Show: An Afternoon with Frank Sinatra
+      },
+      {
+        character: ,
+        credit_id: 5b93784f92514143350042d9,
+        id: 283174,
+        original_title: The Costume Designer,
+        poster_path: <non-empty>,
+        release_date: DateTime_117,
+        title: The Costume Designer
+      },
+      {
+        character: ,
+        credit_id: 5c671471c3a368349fd9f59b,
+        id: 582400,
+        original_title: The Ratpack,
+        poster_path: <non-empty>,
+        release_date: DateTime_118,
+        title: The Ratpack
+      },
+      {
+        character: himself,
+        credit_id: 5c6e74b4c3a3683bf0e36cc8,
+        id: 70138,
+        original_title: The Rat Pack - The Greatest Hits,
+        poster_path: <non-empty>,
+        title: The Rat Pack - The Greatest Hits
+      },
+      {
+        character: ,
+        credit_id: 5d0de9529251413945bc481b,
+        id: 610579,
+        original_title: Frank Sinatra: One More for the Road,
+        poster_path: <non-empty>,
+        release_date: DateTime_119,
+        title: Frank Sinatra: One More for the Road
+      },
+      {
+        character: Himself (archive footage),
+        credit_id: 5d4494920fb398001596887e,
+        id: 620219,
+        original_title: The Music of Kander and Ebb: Razzle Dazzle,
+        poster_path: <non-empty>,
+        release_date: DateTime_120,
+        title: The Music of Kander and Ebb: Razzle Dazzle
+      },
+      {
+        character: Himself (archive footage),
+        credit_id: 5d5b6f075690b5397aff7850,
+        id: 29047,
+        original_title: The Kid Stays in the Picture,
+        poster_path: <non-empty>,
+        release_date: DateTime_121,
+        title: The Kid Stays in the Picture
+      },
+      {
+        character: ,
+        credit_id: 5d64925e813cb6026ef8e041,
+        id: 190168,
+        original_title: Preminger: Anatomy of a Filmmaker,
+        release_date: DateTime_122,
+        title: Preminger: Anatomy of a Filmmaker
+      },
+      {
+        character: (archive footage),
+        credit_id: 5d64983fad50f00440443405,
+        id: 602397,
+        original_title: Hollywood : la vie rêvée de Lana Turner,
+        poster_path: <non-empty>,
+        release_date: DateTime_123,
+        title: Hollywood : la vie rêvée de Lana Turner
+      },
+      {
+        character: ,
+        credit_id: 5d65a68858361b00132145cb,
+        id: 253639,
+        original_title: And the Oscar Goes To...,
+        poster_path: <non-empty>,
+        release_date: DateTime_124,
+        title: And the Oscar Goes To...
+      },
+      {
+        character: ,
+        credit_id: 5d8e6c2c221ba60021b5cebf,
+        id: 353414,
+        original_title: Bing Crosby: Rediscovered,
+        poster_path: <non-empty>,
+        release_date: DateTime_125,
+        title: Bing Crosby: Rediscovered
+      },
+      {
+        character: Himself (archive footage),
+        credit_id: 5e1f6db166751d0015c029ba,
+        id: 599950,
+        original_title: Sid & Judy,
+        poster_path: <non-empty>,
+        release_date: DateTime_126,
+        title: Sid & Judy
+      },
+      {
+        character: Harry Dane,
+        credit_id: 5e371bfb6beaea0013913a48,
+        id: 416406,
+        original_title: Anything Goes,
+        poster_path: <non-empty>,
+        release_date: DateTime_127,
+        title: Anything Goes
+      },
+      {
+        character: Himself,
+        credit_id: 5e5c0613357c00001329e439,
+        id: 440189,
+        original_title: Frank Sinatra: Around the World,
+        poster_path: <non-empty>,
+        release_date: DateTime_128,
+        title: Frank Sinatra: Around the World
+      },
+      {
+        character: (archive footage),
+        credit_id: 5eb0830bedeb43001fc9331b,
+        id: 655092,
+        original_title: Frank Sinatra. Die Stimme Amerikas,
+        release_date: DateTime_129,
+        title: Frank Sinatra – The Voice of America
+      },
+      {
+        character: Himself,
+        credit_id: 5eee1fb7bd990c00370285dc,
+        id: 321960,
+        original_title: The Judy Garland Show,
+        poster_path: <non-empty>,
+        release_date: DateTime_130,
+        title: The Judy Garland Show
+      },
+      {
+        character: Stage Manager,
+        credit_id: 5f09eea41f98d100371f29b7,
+        id: 723654,
+        original_title: Our Town,
+        poster_path: <non-empty>,
+        release_date: DateTime_131,
+        title: Our Town
+      },
+      {
+        character: ,
+        credit_id: 5f22f11b5b12400037298aa0,
+        id: 728890,
+        original_title: Frank Sinatra: Relive the magic,
+        poster_path: <non-empty>,
+        release_date: DateTime_132,
+        title: Frank Sinatra: Relive the magic
+      },
+      {
+        character: Himself,
+        credit_id: 5f29c7361bf2660038499522,
+        id: 730095,
+        original_title: Frank Sinatra: Live from Caesars Palace,
+        poster_path: <non-empty>,
+        release_date: DateTime_133,
+        title: Frank Sinatra: Live from Caesars Palace
+      },
+      {
+        character: ,
+        credit_id: 5f29cbd5d8cc4a00361bcf60,
+        id: 730097,
+        original_title: Frank Sinatra: Live from Caesars Palace,
+        poster_path: <non-empty>,
+        release_date: DateTime_134,
+        title: Frank Sinatra: Live from Caesars Palace
+      },
+      {
+        character: ,
+        credit_id: 5f29cea9d8cc4a00371af6e1,
+        id: 730099,
+        original_title: Frank Sinatra: The First 40 Years,
+        poster_path: <non-empty>,
+        release_date: DateTime_135,
+        title: Frank Sinatra: The First 40 Years
+      },
+      {
+        character: Self,
+        credit_id: 5f29ee252d8ef30036ded723,
+        id: 730120,
+        original_title: Frank Sinatra Spectacular,
+        poster_path: <non-empty>,
+        release_date: DateTime_136,
+        title: Frank Sinatra Spectacular
+      },
+      {
+        character: ,
+        credit_id: 5f29f578869e75003561e665,
+        id: 730122,
+        original_title: The Frank Sinatra Timex Show,
+        poster_path: <non-empty>,
+        release_date: DateTime_137,
+        title: The Frank Sinatra Timex Show
+      },
+      {
+        character: ,
+        credit_id: 5f314f3dfcadb40035e4d5c4,
+        id: 731691,
+        original_title: The Frank Sinatra Timex Show - To the Ladies,
+        poster_path: <non-empty>,
+        title: The Frank Sinatra Timex Show - To the Ladies
+      },
+      {
+        character: ,
+        credit_id: 5f348ced111da10034641c2d,
+        id: 732462,
+        original_title: Frank Sinatra - The Royal Festival Hall,
+        poster_path: <non-empty>,
+        title: Frank Sinatra - The Royal Festival Hall
+      },
+      {
+        character: Himself,
+        credit_id: 5f710b00d55e4d00367a5199,
+        id: 56168,
+        original_title: The Oscar,
+        poster_path: <non-empty>,
+        release_date: DateTime_138,
+        title: The Oscar
+      },
+      {
+        character: Self (archive footage),
+        credit_id: 5fceed2f95c0af0040a9b403,
+        id: 769938,
+        original_title: Charles Bronson, le génie du mâle,
+        poster_path: <non-empty>,
+        release_date: DateTime_139,
+        title: Charles Bronson: The Spirit of Masculinity
+      },
+      {
+        character: Himself,
+        credit_id: 5ff68079efea7a00406a41a6,
+        id: 783653,
+        original_title: AFI Life Achievement Award: A Tribute to James Cagney,
+        release_date: DateTime_140,
+        title: AFI Life Achievement Award: A Tribute to James Cagney
+      },
+      {
+        character: Self,
+        credit_id: 6002c367be4b36003f53b9e7,
+        id: 786582,
+        original_title: John F. Kennedy Galakonzert 1961,
+        release_date: DateTime_141,
+        title: John F. Kennedy Galakonzert 1961
+      },
+      {
+        character: Self,
+        credit_id: 60414c71c525c40042a8fb51,
+        id: 802607,
+        original_title: The Edsel Show,
+        poster_path: <non-empty>,
+        release_date: DateTime_142,
+        title: The Edsel Show
+      },
+      {
+        character: Self - Entertainer (archive footage),
+        credit_id: 605a0b25b39e35003dd9a514,
+        id: 792832,
+        original_title: American Expose: Who Murdered JFK?,
+        poster_path: <non-empty>,
+        release_date: DateTime_143,
+        title: American Expose: Who Murdered JFK?
+      },
+      {
+        character: Self - Actor (archive footage),
+        credit_id: 605b30c747c9fb003e78af17,
+        id: 690972,
+        original_title: Grace face à son destin,
+        poster_path: <non-empty>,
+        release_date: DateTime_144,
+        title: Grace Kelly: Destiny of a Princess
+      },
+      {
+        character: Self,
+        credit_id: 605b78c5dd47e10028feb1a4,
+        id: 508744,
+        original_title: James Bond: The First 21 Years,
+        poster_path: <non-empty>,
+        release_date: DateTime_145,
+        title: James Bond: The First 21 Years
+      }
+    ],
+    crew: [
+      {
+        credit_id: 52fe45339251416c9102ab07,
+        department: Production,
+        id: 33725,
+        job: Executive Producer,
+        original_title: A Hole in the Head,
+        poster_path: <non-empty>,
+        release_date: DateTime_19,
+        title: A Hole in the Head
+      },
+      {
+        credit_id: 52fe4645c3a36847f80f5bef,
+        department: Directing,
+        id: 43407,
+        job: Director,
+        original_title: None But the Brave,
+        poster_path: <non-empty>,
+        release_date: DateTime_31,
+        title: None But the Brave
+      },
+      {
+        credit_id: 52fe47419251416c75092ec9,
+        department: Production,
+        id: 17696,
+        job: Producer,
+        original_title: Robin and the 7 Hoods,
+        poster_path: <non-empty>,
+        release_date: DateTime_38,
+        title: Robin and the 7 Hoods
+      },
+      {
+        credit_id: 55c5d752c3a3682f17001686,
+        department: Production,
+        id: 60548,
+        job: Producer,
+        original_title: Johnny Concho,
+        poster_path: <non-empty>,
+        release_date: DateTime_28,
+        title: Johnny Concho
+      },
+      {
+        credit_id: 5f29c7563e09f30035219545,
+        department: Directing,
+        id: 730095,
+        job: Director,
+        original_title: Frank Sinatra: Live from Caesars Palace,
+        poster_path: <non-empty>,
+        release_date: DateTime_133,
+        title: Frank Sinatra: Live from Caesars Palace
+      },
+      {
+        credit_id: 5f29cd1c9f37b000352d471f,
+        department: Directing,
+        id: 730097,
+        job: Director,
+        original_title: Frank Sinatra: Live from Caesars Palace,
+        poster_path: <non-empty>,
+        release_date: DateTime_134,
+        title: Frank Sinatra: Live from Caesars Palace
+      },
+      {
+        credit_id: 5f7164fed38b580037e3df0e,
+        department: Production,
+        id: 18512,
+        job: Producer,
+        original_title: Sergeants 3,
+        poster_path: <non-empty>,
+        release_date: DateTime_42,
+        title: Sergeants 3
+      },
+      {
+        credit_id: 6002c317223e20003eb61b5a,
+        department: Production,
+        id: 786582,
+        job: Producer,
+        original_title: John F. Kennedy Galakonzert 1961,
+        release_date: DateTime_141,
+        title: John F. Kennedy Galakonzert 1961
+      }
+    ],
+    id: 4347
+  },
+  name: Frank Sinatra,
+  place_of_birth: Hoboken, New Jersey, USA,
+  profile_path: <non-empty>,
+  tagged_images: {
+    page: 1
+  },
+  tv_credits: {
+    cast: [
+      {
+        character: Retired Police Sergeant Michael Doheny,
+        credit_id: 5253923919c29579402a02c8,
+        episode_count: 1,
+        first_air_date: DateTime_146,
+        id: 734,
+        name: Magnum, P.I.,
+        original_name: Magnum, P.I.,
+        poster_path: <non-empty>
+      },
+      {
+        character: ,
+        credit_id: 525413bc19c295794035f52a,
+        episode_count: 5,
+        first_air_date: DateTime_147,
+        id: 1048,
+        name: The Colgate Comedy Hour,
+        original_name: The Colgate Comedy Hour,
+        poster_path: <non-empty>
+      },
+      {
+        character: ,
+        credit_id: 52577fd9760ee36aaa5d8b42,
+        episode_count: 2,
+        first_air_date: DateTime_148,
+        id: 5307,
+        name: The Ed Sullivan Show,
+        original_name: The Ed Sullivan Show,
+        poster_path: <non-empty>
+      },
+      {
+        character: Himself,
+        credit_id: 52582197760ee36aaa7baa2f,
+        episode_count: 40,
+        first_air_date: DateTime_149,
+        id: 12576,
+        name: The Frank Sinatra Show,
+        original_name: The Frank Sinatra Show
+      },
+      {
+        character: ,
+        credit_id: 52582a67760ee36aaa862f54,
+        episode_count: 3,
+        first_air_date: DateTime_150,
+        id: 13765,
+        name: The Dinah Shore Chevy Show,
+        original_name: The Dinah Shore Chevy Show,
+        poster_path: <non-empty>
+      },
+      {
+        character: ,
+        credit_id: 52586df2760ee346611ebe4b,
+        episode_count: 1,
+        first_air_date: DateTime_151,
+        id: 22225,
+        name: The Jimmy Durante Show,
+        original_name: The Jimmy Durante Show
+      },
+      {
+        character: ,
+        credit_id: 52586fe3760ee3466121353d,
+        episode_count: 1,
+        first_air_date: DateTime_152,
+        id: 22690,
+        name: The Kennedy Center Honors,
+        original_name: The Kennedy Center Honors,
+        poster_path: <non-empty>
+      },
+      {
+        character: ,
+        credit_id: 525882ba760ee346613dc3a5,
+        episode_count: 7,
+        first_air_date: DateTime_153,
+        id: 27023,
+        name: The Oscars,
+        original_name: The Oscars,
+        poster_path: <non-empty>
+      },
+      {
+        character: ,
+        credit_id: 52588ea4760ee346614e7b89,
+        episode_count: 1,
+        first_air_date: DateTime_154,
+        id: 28464,
+        name: The Emmy Awards,
+        original_name: The Emmy Awards,
+        poster_path: <non-empty>
+      },
+      {
+        character: Himself (archive footage),
+        credit_id: 5a95c2da9251415639008943,
+        episode_count: 2,
+        first_air_date: DateTime_155,
+        id: 76690,
+        name: Sinatra: All or Nothing at All,
+        original_name: Sinatra: All or Nothing at All,
+        poster_path: <non-empty>
+      },
+      {
+        character: ,
+        credit_id: 5b47ef8dc3a3686e67011681,
+        episode_count: 1,
+        first_air_date: DateTime_156,
+        id: 27320,
+        name: V.I.P. Schaukel,
+        original_name: V.I.P. Schaukel
+      }
+    ],
+    crew: [
+      {
+        credit_id: 56780f2cc3a368167a0099fe,
+        department: Directing,
+        episode_count: 1,
+        first_air_date: DateTime_149,
+        id: 12576,
+        job: Director,
+        name: The Frank Sinatra Show,
+        original_name: The Frank Sinatra Show
+      }
+    ],
+    id: 4347
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientPersonTests.TestPersonsExtrasNoneAsync.verified.txt b/TMDbLibTests/Verification/ClientPersonTests.TestPersonsExtrasNoneAsync.verified.txt
new file mode 100644
index 0000000..71bcc4a
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientPersonTests.TestPersonsExtrasNoneAsync.verified.txt
@@ -0,0 +1,23 @@
+{
+  also_known_as: [
+    Брюс Уиллис,
+    ブルース・ウィリス,
+    بروس ويليس,
+    브루스 윌리스,
+    บรูซ วิลลิส,
+    ברוס וויליס,
+    Walter Bruce Willis,
+    Bruno,
+    Γουόλτερ Μπρους Γουίλις,
+    Μπρους Γουίλις,
+    布鲁斯·威利斯
+  ],
+  biography: An American actor and producer. His career began in television in the 1980s and has continued both in television and film since, including comedic, dramatic, and action roles. He is well known for the role of John McClane in the Die Hard series. Willis was born in Idar-Oberstein, West Germany, the son of a Kassel-born German, Marlene, who worked in a bank, and David Willis, an American soldier. Willis is the eldest of four children. At the premiere for the film Stakeout, Willis met actress Demi Moore. They married on November 21, 1987 and had three daughters before the couple divorced on October 18, 2000. Since the divorce he has dated models Maria Bravo Rosado and Emily Sandberg; he was engaged to Brooke Burns until they broke up in 2004 after ten months together. He married Emma Heming on March 21, 2009.,
+  birthday: 03/19/1955 00:00:00,
+  gender: Male,
+  id: 62,
+  imdb_id: nm0000246,
+  name: Bruce Willis,
+  place_of_birth: Idar-Oberstein, Germany,
+  profile_path: <non-empty>
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientPersonTests.TestPersonsGetPersonTvCreditsAsync.verified.txt b/TMDbLibTests/Verification/ClientPersonTests.TestPersonsGetPersonTvCreditsAsync.verified.txt
new file mode 100644
index 0000000..42a1848
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientPersonTests.TestPersonsGetPersonTvCreditsAsync.verified.txt
@@ -0,0 +1,23 @@
+{
+  cast: {
+    character: David Addison,
+    credit_id: 52571e7f19c2957114107d48,
+    episode_count: 66,
+    first_air_date: DateTime_1,
+    id: 1998,
+    name: Moonlighting,
+    original_name: Moonlighting,
+    poster_path: <non-empty>
+  },
+  crew: {
+    credit_id: 525826eb760ee36aaa81b23b,
+    department: Production,
+    episode_count: 37,
+    first_air_date: DateTime_2,
+    id: 13297,
+    job: Producer,
+    name: Bruno the Kid,
+    original_name: Bruno the Kid,
+    poster_path: <non-empty>
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientPersonTests.TestPersonsTaggedImagesAsync.verified.txt b/TMDbLibTests/Verification/ClientPersonTests.TestPersonsTaggedImagesAsync.verified.txt
new file mode 100644
index 0000000..6b6ad8f
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientPersonTests.TestPersonsTaggedImagesAsync.verified.txt
@@ -0,0 +1,26 @@
+{
+  aspect_ratio: 0.6666666666666666,
+  file_path: <non-empty>,
+  height: 3000,
+  id: 5c437b94c3a36819fd22fda1,
+  image_type: poster,
+  iso_639_1: en,
+  media: {
+    original_title: Glass,
+    release_date: DateTime_1,
+    title: Glass,
+    backdrop_path: <non-empty>,
+    genre_ids: [
+      18,
+      53,
+      878
+    ],
+    original_language: en,
+    overview: In a series of escalating encounters, former security guard David Dunn uses his supernatural abilities to track Kevin Wendell Crumb, a disturbed man who has twenty-four personalities. Meanwhile, the shadowy presence of Elijah Price emerges as an orchestrator who holds secrets critical to both men.,
+    poster_path: <non-empty>,
+    id: 450465,
+    media_type: movie,
+  },
+  media_type: movie,
+  width: 2000
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientReviewTests.TestReviewFullDetails.verified.txt b/TMDbLibTests/Verification/ClientReviewTests.TestReviewFullDetails.verified.txt
new file mode 100644
index 0000000..9a35bef
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientReviewTests.TestReviewFullDetails.verified.txt
@@ -0,0 +1,17 @@
+{
+  iso_639_1: en,
+  media_id: 49026,
+  media_title: The Dark Knight Rises,
+  media_type: movie,
+  author: Travis Bell,
+  content: 
+I felt like this was a tremendous end to Nolan's Batman trilogy. The Dark Knight Rises may very well have been the weakest of all 3 films but when you're talking about a scale of this magnitude, it still makes this one of the best movies I've seen in the past few years.
+
+I expected a little more _Batman_ than we got (especially with a runtime of 2:45) but while the story around the fall of Bruce Wayne and Gotham City was good I didn't find it amazing. This might be in fact, one of my only criticisms—it was a long movie but still, maybe too short for the story I felt was really being told. I feel confident in saying this big of a story could have been split into two movies.
+
+The acting, editing, pacing, soundtrack and overall theme were the same 'as-close-to-perfect' as ever with any of Christopher Nolan's other films. Man does this guy know how to make a movie!
+
+You don't have to be a Batman fan to enjoy these movies and I hope any of you who feel this way re-consider. These 3 movies are without a doubt in my mind, the finest display of comic mythology ever told on the big screen. They are damn near perfect.,
+  id: 5010553819c2952d1b000451,
+  url: https://www.themoviedb.org/review/5010553819c2952d1b000451
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientSearchTests.TestSearchCollectionAsync.verified.txt b/TMDbLibTests/Verification/ClientSearchTests.TestSearchCollectionAsync.verified.txt
new file mode 100644
index 0000000..488e7eb
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientSearchTests.TestSearchCollectionAsync.verified.txt
@@ -0,0 +1,6 @@
+{
+  backdrop_path: <non-empty>,
+  id: 645,
+  name: James Bond Collection,
+  poster_path: <non-empty>
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientSearchTests.TestSearchCompanyAsync.verified.txt b/TMDbLibTests/Verification/ClientSearchTests.TestSearchCompanyAsync.verified.txt
new file mode 100644
index 0000000..b1eed5f
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientSearchTests.TestSearchCompanyAsync.verified.txt
@@ -0,0 +1,5 @@
+{
+  id: 25,
+  logo_path: <non-empty>,
+  name: 20th Century Fox
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientSearchTests.TestSearchKeywordAsync.verified.txt b/TMDbLibTests/Verification/ClientSearchTests.TestSearchKeywordAsync.verified.txt
new file mode 100644
index 0000000..254261f
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientSearchTests.TestSearchKeywordAsync.verified.txt
@@ -0,0 +1,4 @@
+{
+  id: 11121,
+  name: plot
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientSearchTests.TestSearchMovieAsync.verified.txt b/TMDbLibTests/Verification/ClientSearchTests.TestSearchMovieAsync.verified.txt
new file mode 100644
index 0000000..c78e330
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientSearchTests.TestSearchMovieAsync.verified.txt
@@ -0,0 +1,16 @@
+{
+  original_title: Dr. No,
+  release_date: DateTime_1,
+  title: Dr. No,
+  backdrop_path: <non-empty>,
+  genre_ids: [
+    12,
+    28,
+    53
+  ],
+  original_language: en,
+  overview: In the film that launched the James Bond saga, Agent 007 battles mysterious Dr. No, a scientific genius bent on destroying the U.S. space program. As the countdown to disaster begins, Bond must go to Jamaica, where he encounters beautiful Honey Ryder, to confront a megalomaniacal villain in his massive island headquarters.,
+  poster_path: <non-empty>,
+  id: 646,
+  media_type: movie,
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientSearchTests.TestSearchMultiAsync.verified.txt b/TMDbLibTests/Verification/ClientSearchTests.TestSearchMultiAsync.verified.txt
new file mode 100644
index 0000000..5be245a
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientSearchTests.TestSearchMultiAsync.verified.txt
@@ -0,0 +1,20 @@
+{
+  first_air_date: DateTime_1,
+  name: Arrow,
+  original_name: Arrow,
+  origin_country: [
+    US
+  ],
+  backdrop_path: <non-empty>,
+  genre_ids: [
+    18,
+    80,
+    9648,
+    10759
+  ],
+  original_language: en,
+  overview: Spoiled billionaire playboy Oliver Queen is missing and presumed dead when his yacht is lost at sea. He returns five years later a changed man, determined to clean up the city as a hooded vigilante armed with a bow.,
+  poster_path: <non-empty>,
+  id: 1412,
+  media_type: tv,
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientSearchTests.TestSearchPersonAsync.verified.txt b/TMDbLibTests/Verification/ClientSearchTests.TestSearchPersonAsync.verified.txt
new file mode 100644
index 0000000..01d9f65
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientSearchTests.TestSearchPersonAsync.verified.txt
@@ -0,0 +1,54 @@
+{
+  known_for: [
+    {
+      original_title: Pulp Fiction,
+      release_date: DateTime_1,
+      title: Pulp Fiction,
+      backdrop_path: <non-empty>,
+      genre_ids: [
+        53,
+        80
+      ],
+      id: 680,
+      media_type: movie,
+      original_language: en,
+      overview: A burger-loving hit man, his philosophical partner, a drug-addled gangster's moll and a washed-up boxer converge in this sprawling, comedic crime caper. Their adventures unfurl in three stories that ingeniously trip back and forth in time.,
+      poster_path: <non-empty>,
+    },
+    {
+      original_title: The Sixth Sense,
+      release_date: DateTime_2,
+      title: The Sixth Sense,
+      backdrop_path: <non-empty>,
+      genre_ids: [
+        18,
+        53,
+        9648
+      ],
+      id: 745,
+      media_type: movie,
+      original_language: en,
+      overview: An eight year old boy named Cole Sear, who believes he can see dead people, aids the help of a child psychologist named Malcolm Crowe.,
+      poster_path: <non-empty>,
+    },
+    {
+      original_title: Split,
+      release_date: DateTime_3,
+      title: Split,
+      backdrop_path: <non-empty>,
+      genre_ids: [
+        27,
+        53
+      ],
+      id: 381288,
+      media_type: movie,
+      original_language: en,
+      overview: Though Kevin has evidenced 23 personalities to his trusted psychiatrist, Dr. Fletcher, there remains one still submerged who is set to materialize and dominate all the others. Compelled to abduct three teenage girls led by the willful, observant Casey, Kevin reaches a war for survival among all of those contained within him — as well as everyone around him — as the walls between his compartments shatter apart.,
+      poster_path: <non-empty>,
+    }
+  ],
+  name: Bruce Willis,
+  profile_path: <non-empty>,
+  id: 62,
+  media_type: person,
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientSearchTests.TestSearchTvShowAsync.verified.txt b/TMDbLibTests/Verification/ClientSearchTests.TestSearchTvShowAsync.verified.txt
new file mode 100644
index 0000000..91fcbe6
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientSearchTests.TestSearchTvShowAsync.verified.txt
@@ -0,0 +1,17 @@
+{
+  first_air_date: DateTime_1,
+  name: Breaking Bad,
+  original_name: Breaking Bad,
+  origin_country: [
+    US
+  ],
+  backdrop_path: <non-empty>,
+  genre_ids: [
+    18
+  ],
+  original_language: en,
+  overview: When Walter White, a New Mexico chemistry teacher, is diagnosed with Stage III cancer and given a prognosis of only two years left to live. He becomes filled with a sense of fearlessness and an unrelenting desire to secure his family's financial future at any cost as he enters the dangerous world of drugs and crime.,
+  poster_path: <non-empty>,
+  id: 1396,
+  media_type: tv,
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTests.ClientTestUrlGenerator.verified.txt b/TMDbLibTests/Verification/ClientTests.ClientTestUrlGenerator.verified.txt
new file mode 100644
index 0000000..cf1e2b3
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTests.ClientTestUrlGenerator.verified.txt
@@ -0,0 +1,4 @@
+{
+  uri: http://image.tmdb.org/t/p/w92/2B7RySy2WMVJKKEFN2XA3IFb8w0.jpg,
+  uriSsl: https://image.tmdb.org/t/p/w92/2B7RySy2WMVJKKEFN2XA3IFb8w0.jpg
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTests.GetConfigSslTest.verified.txt b/TMDbLibTests/Verification/ClientTests.GetConfigSslTest.verified.txt
new file mode 100644
index 0000000..0c2e46a
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTests.GetConfigSslTest.verified.txt
@@ -0,0 +1,97 @@
+{
+  change_keys: [
+    adult,
+    air_date,
+    also_known_as,
+    alternative_titles,
+    biography,
+    birthday,
+    budget,
+    cast,
+    certifications,
+    character_names,
+    created_by,
+    crew,
+    deathday,
+    episode,
+    episode_number,
+    episode_run_time,
+    freebase_id,
+    freebase_mid,
+    general,
+    genres,
+    guest_stars,
+    homepage,
+    images,
+    imdb_id,
+    languages,
+    name,
+    network,
+    origin_country,
+    original_name,
+    original_title,
+    overview,
+    parts,
+    place_of_birth,
+    plot_keywords,
+    production_code,
+    production_companies,
+    production_countries,
+    releases,
+    revenue,
+    runtime,
+    season,
+    season_number,
+    season_regular,
+    spoken_languages,
+    status,
+    tagline,
+    title,
+    translations,
+    tvdb_id,
+    tvrage_id,
+    type,
+    video,
+    videos
+  ],
+  images: {
+    backdrop_sizes: [
+      w300,
+      w780,
+      w1280,
+      original
+    ],
+    base_url: http://image.tmdb.org/t/p/,
+    logo_sizes: [
+      w45,
+      w92,
+      w154,
+      w185,
+      w300,
+      w500,
+      original
+    ],
+    poster_sizes: [
+      w92,
+      w154,
+      w185,
+      w342,
+      w500,
+      w780,
+      original
+    ],
+    profile_sizes: [
+      w45,
+      w185,
+      h632,
+      original
+    ],
+    secure_base_url: https://image.tmdb.org/t/p/,
+    still_sizes: [
+      w92,
+      w185,
+      w300,
+      original
+    ]
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTests.GetConfigTest.verified.txt b/TMDbLibTests/Verification/ClientTests.GetConfigTest.verified.txt
new file mode 100644
index 0000000..0c2e46a
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTests.GetConfigTest.verified.txt
@@ -0,0 +1,97 @@
+{
+  change_keys: [
+    adult,
+    air_date,
+    also_known_as,
+    alternative_titles,
+    biography,
+    birthday,
+    budget,
+    cast,
+    certifications,
+    character_names,
+    created_by,
+    crew,
+    deathday,
+    episode,
+    episode_number,
+    episode_run_time,
+    freebase_id,
+    freebase_mid,
+    general,
+    genres,
+    guest_stars,
+    homepage,
+    images,
+    imdb_id,
+    languages,
+    name,
+    network,
+    origin_country,
+    original_name,
+    original_title,
+    overview,
+    parts,
+    place_of_birth,
+    plot_keywords,
+    production_code,
+    production_companies,
+    production_countries,
+    releases,
+    revenue,
+    runtime,
+    season,
+    season_number,
+    season_regular,
+    spoken_languages,
+    status,
+    tagline,
+    title,
+    translations,
+    tvdb_id,
+    tvrage_id,
+    type,
+    video,
+    videos
+  ],
+  images: {
+    backdrop_sizes: [
+      w300,
+      w780,
+      w1280,
+      original
+    ],
+    base_url: http://image.tmdb.org/t/p/,
+    logo_sizes: [
+      w45,
+      w92,
+      w154,
+      w185,
+      w300,
+      w500,
+      original
+    ],
+    poster_sizes: [
+      w92,
+      w154,
+      w185,
+      w342,
+      w500,
+      w780,
+      original
+    ],
+    profile_sizes: [
+      w45,
+      w185,
+      h632,
+      original
+    ],
+    secure_base_url: https://image.tmdb.org/t/p/,
+    still_sizes: [
+      w92,
+      w185,
+      w300,
+      original
+    ]
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvEpisodeGroupTests.TestTvEpisodeGroups.verified.txt b/TMDbLibTests/Verification/ClientTvEpisodeGroupTests.TestTvEpisodeGroups.verified.txt
new file mode 100644
index 0000000..dc12282
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvEpisodeGroupTests.TestTvEpisodeGroups.verified.txt
@@ -0,0 +1,902 @@
+{
+  id: 5acf93e60e0a26346d0000ce,
+  name: Netflix Collections,
+  type: Digital,
+  description: Comedians in Cars organized in Netflix's collections.,
+  network: {
+    logo_path: <non-empty>,
+    id: 213,
+    name: Netflix,
+    origin_country: 
+  },
+  episode_count: 71,
+  group_count: 5,
+  groups: [
+    {
+      id: 5acf93efc3a368739a0000a9,
+      name: First Cup,
+      order: 1,
+      episodes: [
+        {
+          order: 13,
+          air_date: DateTime_1,
+          name: Ricky Gervais: Mad Man in a Death Machine,
+          overview: Jerry Seinfeld and his special guest, Ricky Gervais (The Office), drive a 1967 Austin-Healey 3000 to City Island Diner in City Island, NY for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 995764,
+          season_number: 1,
+          episode_number: 2
+        },
+        {
+          order: 3,
+          air_date: DateTime_2,
+          name: Alec Baldwin: Just a Lazy Shiftless Bastard,
+          overview: Jerry Seinfeld and his special guest, Alec Baldwin (30 Rock) drive a 1970 Mercedes Benz 280 SL to Fairway Market Café in New York City, NY for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 995766,
+          season_number: 1,
+          episode_number: 4
+        },
+        {
+          order: 18,
+          air_date: DateTime_3,
+          name: Joel Hodgson: A Taste of Hell From on High,
+          overview: Jerry Seinfeld and his special guest, Joel Hodgson (Jimmy Kimmel Live!), drive a 1963 Volkswagon Karmann Ghia to Skylark Diner in Edison, NJ for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 995767,
+          season_number: 1,
+          episode_number: 5
+        },
+        {
+          order: 16,
+          air_date: DateTime_4,
+          name: Michael Richards: It's Bubbly Time, Jerry,
+          overview: Jerry Seinfeld and his special guest, Michael Richards drive a 1962 Volkswagen Bus to The Malibu Kitchen in Malibu, CA for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 995772,
+          season_number: 1,
+          episode_number: 10
+        },
+        {
+          order: 14,
+          air_date: DateTime_5,
+          name: Seth Meyers: Really?!,
+          overview: Jerry Seinfeld and his special guest, Seth Meyers (Saturday Night Live), drive a 1973 Porsche 911 Carrera RS to the Roebling Tea Room in Brooklyn, NY for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1014438,
+          season_number: 2,
+          episode_number: 5
+        },
+        {
+          order: 9,
+          air_date: DateTime_6,
+          name: Chris Rock: Kids Need Bullying,
+          overview: Jerry Seinfeld and his special guest, Chris Rock (Everybody Hates Chris), drive a 1967 Lamborghini Miura P400S to Allendale Eats in Allendale, NJ for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1014439,
+          season_number: 2,
+          episode_number: 6
+        },
+        {
+          order: 11,
+          air_date: DateTime_7,
+          name: Tina Fey: Feces Are My Purview,
+          overview: Jerry Seinfeld (Seinfeld) and his special guest, Tina Fey (30 Rock), drive a 1967 Volvo 1800S to Floridita Restaurant for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1014616,
+          season_number: 3,
+          episode_number: 5
+        },
+        {
+          order: 5,
+          air_date: DateTime_8,
+          name: Sarah Jessica Parker: A Little Hyper-Aware,
+          overview: Jerry Seinfeld and his special guest, Sarah Jessica Parker, sip a Starbucks while driving a 1976 Ford Country Station Wagon to Long Island’s Colony Diner ... for another cup of coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1014688,
+          season_number: 4,
+          episode_number: 1
+        },
+        {
+          order: 12,
+          air_date: DateTime_9,
+          name: Aziz Ansari: It's Like Pushing a Building Off a Cliff,
+          overview: Jerry takes the wheel of Aziz Ansari’s “flying brick,” a 2012 Prevost X3-45 VIP tour bus, and tries avoids trees and curbs before pulling into a truck stop diner for a quick meal and a cup o’ joe.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1014691,
+          season_number: 4,
+          episode_number: 4
+        },
+        {
+          order: 19,
+          air_date: DateTime_10,
+          name: Ali Wentworth: I'm Going to Take a Percocet and Let That One Go,
+          overview: Jerry and his special guest, Ali Wentworth go out for a spin in a low grill 1970 Mercedes 280SE Cabriolet to wasply grab some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1031230,
+          season_number: 5,
+          episode_number: 6
+        },
+        {
+          order: 1,
+          air_date: DateTime_11,
+          name: Jimmy Fallon: The Unsinkable Legend: Part 1,
+          overview: Jerry and his special guest Jimmy Fallon cruise over to Jerry's actual car in a 1956 Chevy Corvette convertible to hop aboard yet another vehicle to enjoy some comedic sailing out at sea.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1033379,
+          season_number: 5,
+          episode_number: 7
+        },
+        {
+          order: 2,
+          air_date: DateTime_11,
+          name: Jimmy Fallon: The Unsinkable Legend: Part 2,
+          overview: Jerry and his special guest Jimmy Fallon finish up their day on the water and head back to the mainland for John's Famous Pancake House and a cup of coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1033380,
+          season_number: 5,
+          episode_number: 8
+        },
+        {
+          air_date: DateTime_12,
+          name: Jim Carrey: We Love Breathing What You're Burning, Baby,
+          overview: Jerry’s full of testosterone as he steps into a ‘76 Lamborghini Countach with Jim Carrey, who’s between a three-week cleanse and a five-day silent retreat. After coffee, it’s off to Carrey’s studio to study a portrait of a gorilla with a machine gun. Wow.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1078262,
+          season_number: 6,
+          episode_number: 3
+        },
+        {
+          order: 6,
+          air_date: DateTime_13,
+          name: Trevor Noah:That's the Whole Point of Apartheid, Jerry,
+          overview: Jerry takes incoming Daily Show host Trevor Noah on a tour down under the Brooklyn Bridge, where they riff on football (aka, soccer), apartheid’s stupidity, and Noah’s insane daily routine.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1079543,
+          season_number: 6,
+          episode_number: 5
+        },
+        {
+          order: 4,
+          air_date: DateTime_14,
+          name: Stephen Colbert: Cut Up And Bloody But Looking Good,
+          overview: Jerry rides shotgun with Stephen Colbert in a 1964 Morgan Plus 4, a British import that says you just don’t care what people think. He’s a late-night madman, according to Jerry, who’s impressed with Colbert’s beard and the manly way he pretends to smoke a pipe.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1079544,
+          season_number: 6,
+          episode_number: 6
+        },
+        {
+          order: 17,
+          air_date: DateTime_15,
+          name: J.B. Smoove: Everybody Respects a Bloody Nose,
+          overview: Jerry is kaffeeklatsching in L.A. this week with funnyman J.B. Smoove. They’re headed for brew at 10 Speed Coffee in a 1964 Studebaker Avanti.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1202756,
+          season_number: 8,
+          episode_number: 4
+        },
+        {
+          order: 8,
+          air_date: DateTime_16,
+          name: John Oliver: What Kind of Human Animal Would Do This?,
+          overview: In the Season 8 finale, Jerry and John Oliver (The Daily Show, Last Week Tonight) go for a coffee and comedy run in a 1959 Triumph TR3.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1205714,
+          season_number: 8,
+          episode_number: 6
+        },
+        {
+          order: 7,
+          air_date: DateTime_17,
+          name: Kristen Wiig: The Volvo-ness,
+          overview: Jerry is ready to partay this week with comic goddess Kristen Wiig in the Season 9 premiere. The pair are taking a 1964 Volvo 122S Amazon to LA's iconic House of Pies.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1251609,
+          season_number: 9,
+          episode_number: 1
+        },
+        {
+          order: 15,
+          air_date: DateTime_18,
+          name: Norm MacDonald: A Rusty Car in the Rain,
+          overview: Jerry is taking funnyman Norm MacDonald for a coffee run in a 1958 Porsche Speedster. Destination: Jackson Hole Diner in Queens.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1252238,
+          season_number: 9,
+          episode_number: 2
+        },
+        {
+          order: 10,
+          air_date: DateTime_19,
+          name:  Christoph Waltz: Champagne, Cigars, And Pancake Batter,
+          overview: Academy Award® winner and Austrian national treasure Christoph Waltz has never tasted an IHOP pancake. Enter Jerry Seinfeld and a 1957 BMW 507 Series II Roadster to right this grievous wrong.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1258371,
+          season_number: 9,
+          episode_number: 5
+        }
+      ],
+      locked: true
+    },
+    {
+      id: 5acf93f69251413b390000dd,
+      name: Light & Sweet,
+      order: 2,
+      episodes: [
+        {
+          order: 4,
+          air_date: DateTime_20,
+          name: Carl Reiner & Mel Brooks: I Want Sandwiches, I Want Chicken,
+          overview: Jerry Seinfeld and his special guests, Carl Reiner (The Dick Van Dyke Show) & Mel Brooks (Blazing Saddles) drive a 1960 Rolls Royce Silver Cloud II & 1970 Porsche 911S to Norm's Diner in Los Angeles, CA for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 995771,
+          season_number: 1,
+          episode_number: 9
+        },
+        {
+          order: 8,
+          air_date: DateTime_21,
+          name: David Letterman: I Like Kettlecorn,
+          overview: Jerry Seinfeld and his special guest, David Letterman (Late Show with David Letterman), drive a 1995 Volvo 960 to Green Granary in New Milford, CT for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1014435,
+          season_number: 2,
+          episode_number: 2
+        },
+        {
+          order: 6,
+          air_date: DateTime_22,
+          name: Don Rickles: You'll Never Play the Copa,
+          overview: Jerry Seinfeld and his special guest, Don Rickles (The Tonight Show starring Johnny Carson), drive a 1958 Cadillac Eldorado to Factor's Famous Deli in Los Angeles, CA for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1014437,
+          season_number: 2,
+          episode_number: 4
+        },
+        {
+          order: 3,
+          air_date: DateTime_23,
+          name: Howard Stern: The Last Days of Howard Stern,
+          overview: Jerry Seinfeld (Seinfeld) and his special guest, Howard Stern (The Howard Stern Show), drive "The Judge" a 1969 Pontiac GTO to The Bel Aire Diner for some coffee in the season finale.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1014618,
+          season_number: 3,
+          episode_number: 7
+        },
+        {
+          order: 1,
+          air_date: DateTime_24,
+          name: Kevin Hart: You Look Amazing in the Wind,
+          overview: Jerry Seinfeld and his special guest Kevin Hart stylishly cruise around town in a 1959 Porsche RSK Spyder for their "weird male date." Plus special extra feature: "Dick Corcoran",
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1021931,
+          season_number: 5,
+          episode_number: 1
+        },
+        {
+          order: 5,
+          air_date: DateTime_25,
+          name: Julia Louis-Dreyfus: I'll Go If I Don't Have To Talk,
+          overview: Jerry and the “James Bond of comedy” Julia Louis-Dreyfus reminisce as they share a cappuccino after cruising the Pacific Palisades in a 1964 Aston Martin DB5.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1071741,
+          season_number: 6,
+          episode_number: 1
+        },
+        {
+          air_date: DateTime_26,
+          name: President Barack Obama: Just Tell Him You’re the President,
+          overview: For the premiere episode of Season 7, Jerry takes President Barack Obama for a spin in a 1963 Corvette Stingray Split Window Coupe but finds it hard to spirit the leader of the free world off the White House grounds.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1149915,
+          season_number: 7,
+          episode_number: 1
+        },
+        {
+          order: 2,
+          air_date: DateTime_27,
+          name: Will Ferrell: Mr. Ferrell, For the Last Time, We're Going to Ask You to Put the Cigar Out,
+          overview: Will Ferrell says the secret to his comedy is that he looks like a banker but acts like a nut, which is why Jerry picks him up in a “happy, silly” 1970 Plymouth Road Runner SuperBird for a mid-day break.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1161675,
+          season_number: 7,
+          episode_number: 6
+        },
+        {
+          order: 7,
+          air_date: DateTime_28,
+          name: Judd Apatow: Escape from Syosset,
+          overview:  Jerry grabs coffee with writer-director Judd Apatow at the 101 Coffee Shop in Los Angeles. The car: a 1968 Firebird 400 convertible.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1201243,
+          season_number: 8,
+          episode_number: 3
+        }
+      ],
+      locked: true
+    },
+    {
+      id: 5acf93fdc3a36873920000b9,
+      name: Just Made a Fresh Pot,
+      order: 3,
+      episodes: [
+        {
+          order: 12,
+          air_date: DateTime_29,
+          name: Brian Regan: A Monkey and a Lava Lamp,
+          overview: Jerry Seinfeld and his special guest, Brian Regan (Late Show with David Letterman) drive a 1970 Dodge Challenger to Rae's Diner in Santa Monica, CA for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 995765,
+          season_number: 1,
+          episode_number: 3
+        },
+        {
+          order: 15,
+          air_date: DateTime_30,
+          name: Ted L. Nancy: You Don't Want to Offend a Cannibal,
+          overview: Jerry Seinfeld and his special guest, Barry Marder (Bee Movie) drive a 1966 Porsche 356 SC Cabriolet to Bendix Diner in Hasbrouck Heights, NJ for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 995769,
+          season_number: 1,
+          episode_number: 7
+        },
+        {
+          order: 4,
+          air_date: DateTime_31,
+          name: Patton Oswalt: How Would You Kill Superman?,
+          overview: Jerry Seinfeld and his special guest, Patton Oswalt, drive a 1981 DeLorean DMC-12 to The Handsome Coffee Roasters for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1014613,
+          season_number: 3,
+          episode_number: 2
+        },
+        {
+          order: 5,
+          air_date: DateTime_32,
+          name: Jay Leno: Comedy is a Concealed Weapon,
+          overview: Jerry Seinfeld and his special guest, Jay Leno, drive a 1949 Porsche 356/2 to Jones Coffee for Jay's first cup of coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1014614,
+          season_number: 3,
+          episode_number: 3
+        },
+        {
+          order: 14,
+          air_date: DateTime_33,
+          name: Todd Barry: So You're Mellow and Tense?,
+          overview: Jerry Seinfeld (Seinfeld) and his special guest Todd Barry (Wanderlust) drive a 1966 MGB Roadster to Coney Island for a hot dog.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1014615,
+          season_number: 3,
+          episode_number: 4
+        },
+        {
+          order: 13,
+          air_date: DateTime_34,
+          name: Robert Klein: Opera Pimp,
+          overview: Jerry Seinfeld and his hero, Robert Klein, cruise around Westchester County, NY, in a ‘67 Jaguar Mark II to look for lunch and a hot brew and somehow wind up at Sing Sing prison.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1014690,
+          season_number: 4,
+          episode_number: 3
+        },
+        {
+          order: 3,
+          air_date: DateTime_35,
+          name: Jon Stewart: The Sound of Virginity,
+          overview: When Jerry Seinfeld can no longer take driving a 1978 AMC Gremlin, guest Jon Stewart’s first car, he ditches it for its much bigger brother, a 1968 AMX, before they head over to the Tick Tock Diner in Clifton, NJ.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1014692,
+          season_number: 4,
+          episode_number: 5
+        },
+        {
+          air_date: DateTime_36,
+          name: Amy Schumer: I'm Wondering What It's Like to Date Me,
+          overview: Jerry Seinfeld and his special guest Amy Schumer check out “cute bongs” as they walk to a local diner for some coffee after their 1971 Ferrari Daytona breaks down.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1021932,
+          season_number: 5,
+          episode_number: 2
+        },
+        {
+          order: 7,
+          air_date: DateTime_37,
+          name: Fred Armisen: I Wasn't Told About This... With Special Feature: I’m Dying, Jerry,
+          overview: Jerry Seinfeld and his special guest Fred Armisen cruise over to Portland's Coava in a 1965 Saab 96 Monte Carlo 850 for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1021935,
+          season_number: 5,
+          episode_number: 5
+        },
+        {
+          order: 1,
+          air_date: DateTime_38,
+          name: Steve Harvey: Always Do the Banana Joke First,
+          overview: Jerry and Steve Harvey prowl Chicago in a ‘57 Chevy Bel Air convertible, enjoy some fine cigars and muse about offensive jokes and the futility of comedy class.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1074965,
+          season_number: 6,
+          episode_number: 2
+        },
+        {
+          order: 2,
+          air_date: DateTime_39,
+          name: Steve Martin: If You See This on a Toilet Seat, Don't Sit Down,
+          overview: Jerry goes up to the country with Steve Martin in a beautiful but delicate 1954 Siata 8v and come back to the city in something else altogether. In between they converse about confidence, quitting and the best opening lines.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1154678,
+          season_number: 7,
+          episode_number: 2
+        },
+        {
+          order: 8,
+          air_date: DateTime_40,
+          name: Garry Shandling: It's Great That Garry Shandling Is Still Alive,
+          overview: Garry Shandling rides shotgun in a 1979 Porsche 930 as he and Jerry goof on Matthew McConaughey and the Dalai Lama during a trip to Seinfeld’s old New York street set.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1159103,
+          season_number: 7,
+          episode_number: 4
+        },
+        {
+          order: 6,
+          air_date: DateTime_41,
+          name: Jim Gaffigan: Stick Around for the Pope,
+          overview: In the Season 8 premiere, Jerry roughs it with Jim Gaffigan in a 1977 Volkswagen Camper Bus, eats pastrami at the 2nd Avenue Deli.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1199997,
+          season_number: 8,
+          episode_number: 1
+        },
+        {
+          order: 10,
+          air_date: DateTime_42,
+          name: Margaret Cho: You Can Go Cho Again,
+          overview: Jerry and pal Margaret Cho grab coffee at LA's Highland Cafe in a 1967 Mazda Cosmo Sport. Next thing we know, he's opening for her at The Stress Factory in New Jersey.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1200025,
+          season_number: 8,
+          episode_number: 2
+        },
+        {
+          order: 11,
+          air_date: DateTime_43,
+          name: Lorne Michaels: Everybody Likes to See the Monkeys,
+          overview: Jerry convinces comedy genius Lorne Michaels to open up about the show that made him famous. The car: a 1955 Mercedes 300SL Gullwing.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1204415,
+          season_number: 8,
+          episode_number: 5
+        },
+        {
+          order: 9,
+          air_date: DateTime_44,
+          name: Cedric the Entertainer: Dictators, Comics, and Preachers,
+          overview: Jerry is rolling out a 1958 Bentley S1 Continental for Cedric the Entertainer for a trip to The Butcher’s Daughter in NYC.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1255631,
+          season_number: 9,
+          episode_number: 3
+        }
+      ],
+      locked: true
+    },
+    {
+      id: 5acf94049251413b420000dc,
+      name: Late Night Espresso,
+      order: 4,
+      episodes: [
+        {
+          order: 5,
+          air_date: DateTime_45,
+          name: Larry David: Larry Eats a Pancake,
+          overview: Jerry Seinfeld and his special guest, Larry David (Curb Your Enthusiasm), drive a 1952 Volkswagon Beetle to John O'Groats in Los Angeles, CA for some coffee,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 995713,
+          season_number: 1,
+          episode_number: 1
+        },
+        {
+          order: 9,
+          air_date: DateTime_46,
+          name: Bob Einstein: Unusable on the Internet,
+          overview: Jerry Seinfeld and his special guest, Bob Einstein (Super Dave), drive a 1970 Mercedes-Benz 300SEL 6.3 to Jerry's Deli in Studio City, CA and Nate 'n Al's in Beverly Hills, CA for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 995768,
+          season_number: 1,
+          episode_number: 6
+        },
+        {
+          order: 8,
+          air_date: DateTime_47,
+          name: Colin Quinn & Mario Joyner: I Hear Downton Abbey is Pretty Good…,
+          overview: Jerry Seinfeld and his special guests, Colin Quinn (Grown Ups) & Mario Joyner (Everybody Hates Chris) drive a 1976 Triumph TR6 to Fort Defiance Café in Brooklyn, NY for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 995770,
+          season_number: 1,
+          episode_number: 8
+        },
+        {
+          order: 1,
+          air_date: DateTime_48,
+          name: Sarah Silverman: I’m Going To Change Your Life Forever,
+          overview: Jerry Seinfeld takes Sarah Silverman for a ride in a 1969 Jaguar E-Type Series 2 before stopping by Millie's Cafe in the Silver Lake section of Los Angeles for some food and coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1014410,
+          season_number: 2,
+          episode_number: 1
+        },
+        {
+          order: 3,
+          air_date: DateTime_49,
+          name: Gad Elmaleh: No Lipsticks for Nuns,
+          overview: Jerry Seinfeld and his special guest, Gad Elmaleh (Midnight in Paris), drive a 1950 Citroen 2CV to Pommes Frites & French Roast New York City, NY for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1014436,
+          season_number: 2,
+          episode_number: 3
+        },
+        {
+          order: 10,
+          air_date: DateTime_50,
+          name: Louis C.K.: Comedy, Sex and The Blue Numbers,
+          overview: Jerry Seinfeld and his special guest, Louis C.K., drive a 1959 Fiat Jolly to Louie's boat for some coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1014612,
+          season_number: 3,
+          episode_number: 1
+        },
+        {
+          order: 12,
+          air_date: DateTime_51,
+          name: George Wallace: Two Polish Airline Pilots,
+          overview: Comedians Jerry Seinfeld and George Wallace reminisce about their over-35-year friendship while cruising the Las Vegas strip in a 1965 Buick Riviera before stopping at the famous Peppermill Restaurant.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1014689,
+          season_number: 4,
+          episode_number: 2
+        },
+        {
+          order: 2,
+          air_date: DateTime_52,
+          name: Bill Burr: Smoking Past the Band,
+          overview: Jerry Seinfeld and his special guest Bill Burr cruise around L.A. in a 1970 Ford Mustang like a couple of bosses out on the town in the middle of the day.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1021933,
+          season_number: 5,
+          episode_number: 3
+        },
+        {
+          order: 4,
+          air_date: DateTime_53,
+          name: Miranda Sings: Happy Thanksgiving Miranda,
+          overview: Jerry Seinfeld and his special guest Miranda Sings cruise around town in a 1960 Austin Healey Sprite in search of coffee, complaining and apologizing along the way.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1021934,
+          season_number: 5,
+          episode_number: 4
+        },
+        {
+          air_date: DateTime_54,
+          name: Bill Maher: The Comedy Team of Smug and Arrogant,
+          overview: Jerry chooses a 1979 VW Bug police car for good buddy Bill Maher because, as he says, Maher seems to have authority but actually has none. Case in point: when Maher talks politics, Jerry asks, “Boxers or briefs?”,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1078263,
+          season_number: 6,
+          episode_number: 4
+        },
+        {
+          order: 11,
+          air_date: DateTime_55,
+          name: Kathleen Madigan  &  Chuck Martin: Stroked Out on a Hot Machine,
+          overview: Jerry takes Kathleen Madigan and her buddy Chuck Martin out for a spin in Los Angeles as they ponder the pejorative meaning of the word “tool” and wonder why dads get no sports shout-outs.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1156766,
+          season_number: 7,
+          episode_number: 3
+        },
+        {
+          order: 6,
+          air_date: DateTime_56,
+          name: Sebastian Maniscalco: I Don't Think That's Bestiality,
+          overview: In a perfect combination of guy, car and moment, Sebastian Maniscalco cruises the streets of L.A. with Jerry in a ‘69 Camaro Z/28 and talks about growing up in a Sicilian family, his grooming habits and having a mean resting face.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1159104,
+          season_number: 7,
+          episode_number: 5
+        },
+        {
+          order: 7,
+          air_date: DateTime_57,
+          name: Lewis Black: At What Point Am I Out From Under?,
+          overview: Jerry can’t take angry comedian Lewis Black anywhere. Watch Lewis rant with his mouth full at Junior's Cheesecake, and road-rage all over New York in a 1967 Cadillac Eldorado.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1258368,
+          season_number: 9,
+          episode_number: 4
+        },
+        {
+          order: 13,
+          air_date: DateTime_58,
+          name: Bob Einstein: It's Not So Funny When It's Your Mother,
+          overview: In the season finale, Jerry’s buying pal Bob Einstein (aka Super Dave Osborne) coffee at Hollywood’s Urth Caffe and sandwiches at Bay Cities Deli &amp; Bakery. If his guest is funny enough, Jerry might throw in a 2016 Acura NSX.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1258372,
+          season_number: 9,
+          episode_number: 6
+        }
+      ],
+      locked: true
+    },
+    {
+      id: 5b5265aac3a3680b6800330c,
+      name: Collection 5,
+      order: 5,
+      episodes: [
+        {
+          air_date: DateTime_59,
+          name: Zach Galifianakis: From The Third Reich To You,
+          overview: Zach Galifianakis joins Jerry for bike shopping and doughnuts in a Volkswagen Thing before turning the tables and making Jerry sit between two ferns.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1516800,
+          season_number: 10,
+          episode_number: 1
+        },
+        {
+          order: 1,
+          air_date: DateTime_59,
+          name: Dave Chappelle: Nobody Says, “I Wish I Had a Camera",
+          overview: In Washington, D.C., Jerry and Dave Chappelle take a ride in a 1973 Citroën Maserati SM and pay a visit to Dave's old high school.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1516801,
+          season_number: 10,
+          episode_number: 2
+        },
+        {
+          order: 2,
+          air_date: DateTime_59,
+          name: Ellen DeGeneres: You Said It Wasn’t Funny,
+          overview: Jerry picks up Ellen DeGeneres in a 1977 Toyota FJ40 Land Cruiser. They discuss her start in comedy, then Ellen teaches Jerry a lesson about car keys.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1516802,
+          season_number: 10,
+          episode_number: 3
+        },
+        {
+          order: 3,
+          air_date: DateTime_59,
+          name: Tracy Morgan: Lasagna With Six Different Cheeses,
+          overview: In a 1984 Ferrari 288 GTO, Jerry and Tracy Morgan do some grocery shopping, talk about raisins and hit a diner in Ridgewood, New Jersey.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1516803,
+          season_number: 10,
+          episode_number: 4
+        },
+        {
+          order: 4,
+          air_date: DateTime_59,
+          name: Brian Regan: Are There Left Handed Spoons?,
+          overview: Jerry picks up Brian Regan in Brian's favorite car, a Cadillac XLR convertible, and they get coffee and visit a golf shop (to Jerry's chagrin).,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1516804,
+          season_number: 10,
+          episode_number: 5
+        },
+        {
+          order: 5,
+          air_date: DateTime_59,
+          name: Dana Carvey: Na.. Ga.. Do.. It,
+          overview: Dana Carvey and Jerry roll in a Meyers Manx dune buggy to the Beverly Hills Hotel for coffee, then Dana plays guitar for Jerry at a music store.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1516805,
+          season_number: 10,
+          episode_number: 6
+        },
+        {
+          order: 6,
+          air_date: DateTime_59,
+          name: Hasan Minhaj: Nobody Cries At A Joke,
+          overview: Jerry picks up basketball enthusiast Hasan Minhaj in a 1992 Ferrari 512 TR and tries to explain why baseball's better over coffee and pancakes.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1516806,
+          season_number: 10,
+          episode_number: 7
+        },
+        {
+          order: 7,
+          air_date: DateTime_59,
+          name: Neal Brennan: Red Bottom Shoes Equals Fantastic Babies,
+          overview: Jerry takes Neal Brennan to Hermosa Beach in a 1965 Porsche 356C Coupe to discuss comic philosophies and why they didn't watch each other's shows.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1516807,
+          season_number: 10,
+          episode_number: 8
+        },
+        {
+          order: 8,
+          air_date: DateTime_59,
+          name: John Mulaney: A Hooker in the Rain,
+          overview: In a 1969 Alfa Romeo Giulia Super, Jerry and John Mulaney do some rug shopping for John's apartment and head to Staten Island for pizza and coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1516808,
+          season_number: 10,
+          episode_number: 9
+        },
+        {
+          order: 9,
+          air_date: DateTime_59,
+          name: Kate McKinnon: A Brain in a Jar,
+          overview: Kate McKinnon joins Jerry for a jaunt around Manhattan in a 1962 Fiat 600 Multipla, and they dive into topics like the Coriolis effect over coffee.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1516809,
+          season_number: 10,
+          episode_number: 10
+        },
+        {
+          order: 10,
+          air_date: DateTime_59,
+          name: Alec Baldwin: Gyrating, Naked Twister,
+          overview: Jerry picks up Alec Baldwin in a 1974 BMW 3.0 CS coupe, and they drive to their shared hometown of Massapequa, New York, to swap old stories.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1516810,
+          season_number: 10,
+          episode_number: 11
+        },
+        {
+          order: 11,
+          air_date: DateTime_59,
+          name: Jerry Lewis: Heere’s Jerry!,
+          overview: Jerry travels to Las Vegas in a 1966 Jaguar E-Type to spend time with his hero, Jerry Lewis, in what would be Lewis's final on-screen appearance.,
+          production_code: ,
+          show_id: 59717,
+          still_path: <non-empty>,
+          id: 1516811,
+          season_number: 10,
+          episode_number: 12
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeExtrasAccountState.verified.txt b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeExtrasAccountState.verified.txt
new file mode 100644
index 0000000..f2fa2cd
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeExtrasAccountState.verified.txt
@@ -0,0 +1,332 @@
+{
+  account_states: {
+    rating: 5.0
+  },
+  crew: [
+    {
+      credit_id: 5256cfbc19c2956ff60a0483,
+      department: Writing,
+      id: 160172,
+      job: Writer,
+      name: Chuck Lorre,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: Chuck Lorre,
+    },
+    {
+      credit_id: 5256cfbd19c2956ff60a04f0,
+      department: Writing,
+      id: 163528,
+      job: Writer,
+      name: Bill Prady,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: Bill Prady,
+    },
+    {
+      credit_id: 5256cfee19c2956ff60a280c,
+      department: Directing,
+      id: 157437,
+      job: Director,
+      name: James Burrows,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Directing,
+      original_name: James Burrows,
+    },
+    {
+      credit_id: 5256d01319c2956ff60a4082,
+      department: Production,
+      id: 160172,
+      job: Executive Producer,
+      name: Chuck Lorre,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: Chuck Lorre,
+    },
+    {
+      credit_id: 558811b2c3a368385300662c,
+      department: Production,
+      id: 1480256,
+      job: Co-Producer,
+      name: Mary T. Quigley,
+      known_for_department: Production,
+      original_name: Mary T. Quigley,
+    },
+    {
+      credit_id: 558819ffc3a36836ea006145,
+      department: Production,
+      id: 1480289,
+      job: Co-Producer,
+      name: Joe Bella,
+      known_for_department: Production,
+      original_name: Joe Bella,
+    },
+    {
+      credit_id: 55881a1492514179f6003f6e,
+      department: Production,
+      id: 1232374,
+      job: Producer,
+      name: Michael Collier,
+      known_for_department: Production,
+      original_name: Michael Collier,
+    },
+    {
+      credit_id: 55881a269251411efc000f6e,
+      department: Production,
+      id: 1480291,
+      job: Associate Producer,
+      name: Toti Levine,
+      known_for_department: Production,
+      original_name: Toti Levine,
+    },
+    {
+      credit_id: 55881ab9c3a3683365006669,
+      department: Editing,
+      id: 1224140,
+      job: Editor,
+      name: Peter Chakos,
+      gender: Male,
+      known_for_department: Production,
+      original_name: Peter Chakos,
+    },
+    {
+      credit_id: 55881aee9251415aa9000c86,
+      department: Production,
+      id: 1480293,
+      job: Casting,
+      name: Ken Miller,
+      known_for_department: Production,
+      original_name: Ken Miller,
+    },
+    {
+      credit_id: 55881b3a9251411dec006e88,
+      department: Production,
+      id: 1480294,
+      job: Casting,
+      name: Nikki Valko,
+      gender: Female,
+      known_for_department: Production,
+      original_name: Nikki Valko,
+    },
+    {
+      credit_id: 55881c15c3a368273b007766,
+      department: Art,
+      id: 1480300,
+      job: Set Decoration,
+      name: Ann Shea,
+      known_for_department: Art,
+      original_name: Ann Shea,
+    },
+    {
+      credit_id: 55881c709251411efc000fc6,
+      department: Costume & Make-Up,
+      id: 1480305,
+      job: Makeup Artist,
+      name: Peggy Nichols,
+      known_for_department: Costume & Make-Up,
+      original_name: Peggy Nichols,
+    },
+    {
+      credit_id: 55881d379251416818001c2b,
+      department: Costume & Make-Up,
+      id: 1480308,
+      job: Hairstylist,
+      name: Janice Zoladz,
+      known_for_department: Costume & Make-Up,
+      original_name: Janice Zoladz,
+    },
+    {
+      credit_id: 5802b0199251413ecc0004b6,
+      department: Sound,
+      id: 1480315,
+      job: Production Sound Mixer,
+      name: Bruce Peters,
+      known_for_department: Sound,
+      original_name: Bruce Peters,
+    },
+    {
+      credit_id: 5b9fe01a0e0a2633bb00127e,
+      department: Directing,
+      id: 1320838,
+      job: First Assistant Director,
+      name: Anthony Joseph Rich,
+      gender: Male,
+      known_for_department: Directing,
+      original_name: Anthony Joseph Rich,
+    },
+    {
+      credit_id: 5ba004ac92514177b2005c0c,
+      department: Production,
+      id: 2129931,
+      job: Unit Production Manager,
+      name: Carol Anne Miller,
+      gender: Female,
+      known_for_department: Production,
+      original_name: Carol Anne Miller,
+    },
+    {
+      credit_id: 5ba0072cc3a3680444006f21,
+      department: Directing,
+      id: 2020833,
+      job: First Assistant Director,
+      name: Mark K. Samuels,
+      known_for_department: Directing,
+      original_name: Mark K. Samuels,
+    },
+    {
+      credit_id: 5ba0085d92514177d5005e27,
+      department: Directing,
+      id: 2129936,
+      job: Second Assistant Director,
+      name: Joseph Stafford,
+      known_for_department: Directing,
+      original_name: Joseph Stafford,
+    },
+    {
+      credit_id: 5ba0dc3dc3a368710801d20c,
+      department: Production,
+      id: 1217292,
+      job: Consulting Producer,
+      name: Stephen Engel,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: Stephen Engel,
+    },
+    {
+      credit_id: 5ba130a9c3a3687118028861,
+      department: Crew,
+      id: 1483755,
+      job: Scientific Consultant,
+      name: David Saltzberg,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: David Saltzberg,
+    },
+    {
+      credit_id: 5bb5c4a10e0a26338e009f52,
+      department: Directing,
+      id: 2141156,
+      job: Script Supervisor,
+      name: Marilyn Bagley,
+      known_for_department: Directing,
+      original_name: Marilyn Bagley,
+    },
+    {
+      credit_id: 5bb5cfc3c3a368152900b6bd,
+      department: Production,
+      id: 1290147,
+      job: Casting Associate,
+      name: Peter Pappas,
+      known_for_department: Production,
+      original_name: Peter Pappas,
+    },
+    {
+      credit_id: 5bb7446f9251410dc402174d,
+      department: Art,
+      id: 2142282,
+      job: Property Master,
+      name: Lee Lee Baird,
+      gender: Male,
+      known_for_department: Art,
+      original_name: Lee Lee Baird,
+    },
+    {
+      credit_id: 5bbf077dc3a3682b3600e23a,
+      department: Sound,
+      id: 2147428,
+      job: Sound Re-Recording Mixer,
+      name: Kathy Oldham,
+      known_for_department: Sound,
+      original_name: Kathy Oldham,
+    },
+    {
+      credit_id: 5bc04c6c0e0a266e59011603,
+      department: Production,
+      id: 2148172,
+      job: Production Coordinator,
+      name: Kathy Nawabi,
+      known_for_department: Production,
+      original_name: Kathy Nawabi,
+    },
+    {
+      credit_id: 600d7e23006eee003e8206b6,
+      department: Camera,
+      id: 2950065,
+      job: Director of Photography,
+      name: Stephen V. Silver,
+      known_for_department: Camera,
+      original_name: Stephen V. Silver,
+    },
+    {
+      credit_id: 600d7e427776f00041104551,
+      department: Production,
+      id: 1480296,
+      job: Production Designer,
+      name: John Shaffner,
+      known_for_department: Art,
+      original_name: John Shaffner,
+    },
+    {
+      credit_id: 600d7f1c4d0e8d003c74f286,
+      department: Sound,
+      id: 154607,
+      job: Music,
+      name: Barenaked Ladies,
+      known_for_department: Acting,
+      original_name: Barenaked Ladies,
+    },
+    {
+      credit_id: 600d7f43d70594003c223f85,
+      department: Costume & Make-Up,
+      id: 1480256,
+      job: Costume Designer,
+      name: Mary T. Quigley,
+      known_for_department: Production,
+      original_name: Mary T. Quigley,
+    },
+    {
+      credit_id: 600d7fa9006eee003e82087e,
+      department: Directing,
+      id: 2950076,
+      job: Script Supervisor,
+      name: Marilyn A. Bagley,
+      known_for_department: Directing,
+      original_name: Marilyn A. Bagley,
+    }
+  ],
+  guest_stars: [
+    {
+      character: Kurt,
+      credit_id: 5256cfc919c2956ff60a0c8f,
+      id: 1118085,
+      name: Brian Patrick Wade,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Brian Patrick Wade,
+    },
+    {
+      character: Althea,
+      credit_id: 587403eec3a3681756012234,
+      id: 157085,
+      name: Vernee Watson-Johnson,
+      order: 163,
+      profile_path: <non-empty>,
+      gender: Female,
+      known_for_department: Acting,
+      original_name: Vernee Watson-Johnson,
+    }
+  ],
+  air_date: DateTime_1,
+  name: Pilot,
+  overview: Brilliant physicist roommates Leonard and Sheldon meet their new neighbor Penny, who begins showing them that as much as they know about science, they know little about actual living.,
+  production_code: 276023,
+  still_path: <non-empty>,
+  id: 64766,
+  season_number: 1,
+  episode_number: 1
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeExtrasAll.verified.txt b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeExtrasAll.verified.txt
new file mode 100644
index 0000000..7aaf767
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeExtrasAll.verified.txt
@@ -0,0 +1,401 @@
+{
+  account_states: {
+    rating: 5.0
+  },
+  credits: {
+    guest_stars: [
+      {
+        character: Jesse Katsopolis,
+        credit_id: 56d2c7cd92514102db0005ea,
+        id: 32600,
+        name: John Stamos,
+        order: 81,
+        profile_path: <non-empty>,
+        gender: Male,
+        known_for_department: Acting,
+        original_name: John Stamos,
+      },
+      {
+        character: Danny Tanner,
+        credit_id: 56d2c7fbc3a3681e3c010177,
+        id: 72450,
+        name: Bob Saget,
+        order: 90,
+        profile_path: <non-empty>,
+        gender: Male,
+        known_for_department: Acting,
+        original_name: Bob Saget,
+      },
+      {
+        character: Joey Gladstone,
+        credit_id: 56d2c8149251413e5f00ee2c,
+        id: 1218736,
+        name: Dave Coulier,
+        order: 82,
+        profile_path: <non-empty>,
+        gender: Male,
+        known_for_department: Acting,
+        original_name: Dave Coulier,
+      },
+      {
+        character: Becky Katsopolis,
+        credit_id: 56d2c834925141799e00c208,
+        id: 92509,
+        name: Lori Loughlin,
+        order: 91,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Lori Loughlin,
+      },
+      {
+        character: Steve Hale,
+        credit_id: 56d2c84dc3a3681e3600e5c1,
+        id: 15827,
+        name: Scott Weinger,
+        order: 82,
+        profile_path: <non-empty>,
+        gender: Male,
+        known_for_department: Acting,
+        original_name: Scott Weinger,
+      },
+      {
+        character: Nicky Katsopolis,
+        credit_id: 56d2c864c3a3681e440102d6,
+        id: 1234709,
+        name: Blake Tuomy-Wilhoit,
+        order: 6,
+        known_for_department: Acting,
+        original_name: Blake Tuomy-Wilhoit,
+      },
+      {
+        character: Alex Katsopolis,
+        credit_id: 56d2c878c3a3681e4a00e2ff,
+        id: 1236340,
+        name: Dylan Tuomy-Wilhoit,
+        order: 7,
+        known_for_department: Sound,
+        original_name: Dylan Tuomy-Wilhoit,
+      },
+      {
+        character: Fernando,
+        credit_id: 56d2c8a192514102db000608,
+        id: 58970,
+        name: Juan Pablo Di Pace,
+        order: 82,
+        profile_path: <non-empty>,
+        gender: Male,
+        known_for_department: Acting,
+        original_name: Juan Pablo Di Pace,
+      },
+      {
+        character: Teri Tanner,
+        credit_id: 56d2c8b69251413e5f00ee44,
+        id: 121769,
+        name: Eva LaRue,
+        order: 9,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Eva LaRue,
+      },
+      {
+        character: Tommy Fuller Jr.,
+        credit_id: 56d2c8fdc3a3681e5700ea19,
+        id: 1583968,
+        name: Dashiell Messitt,
+        order: 69,
+        known_for_department: Acting,
+        original_name: Dashiell Messitt,
+      },
+      {
+        character: Tommy Fuller Jr.,
+        credit_id: 56d2c9179251412c960062bd,
+        id: 1583969,
+        name: Fox Messitt,
+        order: 65,
+        known_for_department: Acting,
+        original_name: Fox Messitt,
+      }
+    ],
+    cast: [
+      {
+        character: DJ Tanner-Fuller,
+        credit_id: 55cda9e0c3a36815800012d4,
+        id: 31363,
+        name: Candace Cameron Bure,
+        order: 1,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Candace Cameron Bure,
+      },
+      {
+        character: Stephanie Tanner,
+        credit_id: 55cda9f0925141319000167f,
+        id: 1234708,
+        name: Jodie Sweetin,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Jodie Sweetin,
+      },
+      {
+        character: Kimmy Gibbler,
+        credit_id: 55cf7cfa9251413196005076,
+        id: 1212537,
+        name: Andrea Barber,
+        order: 2,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Andrea Barber,
+      },
+      {
+        character: Max Fuller,
+        credit_id: 55cf7d4ec3a3681bf500560f,
+        id: 1497222,
+        name: Elias Harger,
+        order: 3,
+        profile_path: <non-empty>,
+        gender: Male,
+        known_for_department: Acting,
+        original_name: Elias Harger,
+      },
+      {
+        character: Jackson Fuller,
+        credit_id: 56d2c730c3a3681e3600e598,
+        id: 1471109,
+        name: Michael Campion,
+        order: 6,
+        profile_path: <non-empty>,
+        gender: Male,
+        known_for_department: Acting,
+        original_name: Michael Campion,
+      },
+      {
+        character: Ramona Gibbler,
+        credit_id: 56d2c77f9251413e6a00f38e,
+        id: 1583967,
+        name: Soni Bringas,
+        order: 4,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Soni Bringas,
+      },
+      {
+        character: Phyllis Gladstone,
+        credit_id: 59ea0021c3a3687fc60129fd,
+        id: 1675772,
+        name: Ruby Rose Turner,
+        order: 500,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Ruby Rose Turner,
+      },
+      {
+        character: Joan Gladstone,
+        credit_id: 59ea0329c3a3687f32012e7b,
+        id: 1728254,
+        name: Kingston Foster,
+        order: 500,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Kingston Foster,
+      }
+    ],
+    crew: [
+      {
+        credit_id: 5851b49cc3a3682fb801ed4b,
+        department: Directing,
+        id: 1212114,
+        job: Director,
+        name: Mark Cendrowski,
+        gender: Male,
+        known_for_department: Directing,
+        original_name: Mark Cendrowski,
+      },
+      {
+        credit_id: 5851b4adc3a36831500190d4,
+        department: Writing,
+        id: 60621,
+        job: Writer,
+        name: Jeff Franklin,
+        profile_path: <non-empty>,
+        gender: Male,
+        known_for_department: Writing,
+        original_name: Jeff Franklin,
+      }
+    ],
+    id: 1151470
+  },
+  crew: [
+    {
+      credit_id: 5851b49cc3a3682fb801ed4b,
+      department: Directing,
+      id: 1212114,
+      job: Director,
+      name: Mark Cendrowski,
+      gender: Male,
+      known_for_department: Directing,
+      original_name: Mark Cendrowski,
+    },
+    {
+      credit_id: 5851b4adc3a36831500190d4,
+      department: Writing,
+      id: 60621,
+      job: Writer,
+      name: Jeff Franklin,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: Jeff Franklin,
+    }
+  ],
+  external_ids: {
+    imdb_id: tt4625398,
+    tvdb_id: 5350769,
+    id: 1151470,
+    tvrage_id: 1065844568
+  },
+  guest_stars: [
+    {
+      character: Jesse Katsopolis,
+      credit_id: 56d2c7cd92514102db0005ea,
+      id: 32600,
+      name: John Stamos,
+      order: 81,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: John Stamos,
+    },
+    {
+      character: Danny Tanner,
+      credit_id: 56d2c7fbc3a3681e3c010177,
+      id: 72450,
+      name: Bob Saget,
+      order: 90,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Bob Saget,
+    },
+    {
+      character: Joey Gladstone,
+      credit_id: 56d2c8149251413e5f00ee2c,
+      id: 1218736,
+      name: Dave Coulier,
+      order: 82,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Dave Coulier,
+    },
+    {
+      character: Becky Katsopolis,
+      credit_id: 56d2c834925141799e00c208,
+      id: 92509,
+      name: Lori Loughlin,
+      order: 91,
+      profile_path: <non-empty>,
+      gender: Female,
+      known_for_department: Acting,
+      original_name: Lori Loughlin,
+    },
+    {
+      character: Steve Hale,
+      credit_id: 56d2c84dc3a3681e3600e5c1,
+      id: 15827,
+      name: Scott Weinger,
+      order: 82,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Scott Weinger,
+    },
+    {
+      character: Nicky Katsopolis,
+      credit_id: 56d2c864c3a3681e440102d6,
+      id: 1234709,
+      name: Blake Tuomy-Wilhoit,
+      order: 6,
+      known_for_department: Acting,
+      original_name: Blake Tuomy-Wilhoit,
+    },
+    {
+      character: Alex Katsopolis,
+      credit_id: 56d2c878c3a3681e4a00e2ff,
+      id: 1236340,
+      name: Dylan Tuomy-Wilhoit,
+      order: 7,
+      known_for_department: Sound,
+      original_name: Dylan Tuomy-Wilhoit,
+    },
+    {
+      character: Fernando,
+      credit_id: 56d2c8a192514102db000608,
+      id: 58970,
+      name: Juan Pablo Di Pace,
+      order: 82,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Juan Pablo Di Pace,
+    },
+    {
+      character: Teri Tanner,
+      credit_id: 56d2c8b69251413e5f00ee44,
+      id: 121769,
+      name: Eva LaRue,
+      order: 9,
+      profile_path: <non-empty>,
+      gender: Female,
+      known_for_department: Acting,
+      original_name: Eva LaRue,
+    },
+    {
+      character: Tommy Fuller Jr.,
+      credit_id: 56d2c8fdc3a3681e5700ea19,
+      id: 1583968,
+      name: Dashiell Messitt,
+      order: 69,
+      known_for_department: Acting,
+      original_name: Dashiell Messitt,
+    },
+    {
+      character: Tommy Fuller Jr.,
+      credit_id: 56d2c9179251412c960062bd,
+      id: 1583969,
+      name: Fox Messitt,
+      order: 65,
+      known_for_department: Acting,
+      original_name: Fox Messitt,
+    }
+  ],
+  images: {
+    id: 1151470,
+    stills: [
+      {
+        aspect_ratio: 1.777777777777778,
+        file_path: <non-empty>,
+        height: 1080,
+        width: 1920
+      }
+    ]
+  },
+  videos: {
+    id: 1151470
+  },
+  air_date: DateTime_1,
+  name: Our Very First Show, Again,
+  overview: The entire Tanner clan comes together for a final reunion before the family home is sold, but parting turns out to be tougher than expected,
+  production_code: ,
+  still_path: <non-empty>,
+  id: 1151470,
+  season_number: 1,
+  episode_number: 1
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeExtrasNoneAsync.verified.txt b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeExtrasNoneAsync.verified.txt
new file mode 100644
index 0000000..f377272
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeExtrasNoneAsync.verified.txt
@@ -0,0 +1,141 @@
+{
+  crew: [
+    {
+      credit_id: 52542275760ee313280006ce,
+      department: Writing,
+      id: 66633,
+      job: Writer,
+      name: Vince Gilligan,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: Vince Gilligan,
+    },
+    {
+      credit_id: 52542275760ee313280006e8,
+      department: Directing,
+      id: 66633,
+      job: Director,
+      name: Vince Gilligan,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: Vince Gilligan,
+    },
+    {
+      credit_id: 52b7029219c29533d00dd2c1,
+      department: Camera,
+      id: 2483,
+      job: Director of Photography,
+      name: John Toll,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Camera,
+      original_name: John Toll,
+    },
+    {
+      credit_id: 52b702ea19c2955402183a66,
+      department: Editing,
+      id: 1280071,
+      job: Editor,
+      name: Lynne Willingham,
+      known_for_department: Editing,
+      original_name: Lynne Willingham,
+    }
+  ],
+  guest_stars: [
+    {
+      character: Carmen Molina,
+      credit_id: 52542273760ee31328000676,
+      id: 115688,
+      name: Carmen Serano,
+      order: 176,
+      profile_path: <non-empty>,
+      gender: Female,
+      known_for_department: Acting,
+      original_name: Carmen Serano,
+    },
+    {
+      character: Emilio Koyama,
+      credit_id: 52542273760ee3132800068e,
+      id: 92495,
+      name: John Koyama,
+      order: 1,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: John Koyama,
+    },
+    {
+      character: Jock,
+      credit_id: 52542275760ee313280006b4,
+      id: 1216132,
+      name: Aaron Hill,
+      order: 3,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Aaron Hill,
+    },
+    {
+      character: Steven Gomez,
+      credit_id: 5271b489760ee35b3e0881a7,
+      id: 61535,
+      name: Steven Michael Quezada,
+      order: 191,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Steven Michael Quezada,
+    },
+    {
+      character: Krazy-8,
+      credit_id: 52725845760ee3046b09426e,
+      id: 1046460,
+      name: Max Arciniega,
+      order: 38,
+      profile_path: <non-empty>,
+      known_for_department: Acting,
+      original_name: Max Arciniega,
+    },
+    {
+      character: Bogdan Wolynetz,
+      credit_id: 5272587a760ee3045009ddec,
+      id: 1223197,
+      name: Marius Stan,
+      order: 112,
+      profile_path: <non-empty>,
+      known_for_department: Acting,
+      original_name: Marius Stan,
+    },
+    {
+      character: Dr. Belknap,
+      credit_id: 52725cb1760ee3044d0b9984,
+      id: 161591,
+      name: Gregory Chase,
+      order: 33,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Gregory Chase,
+    },
+    {
+      character: Chad's Girlfriend,
+      credit_id: 56846abbc3a36836280008d4,
+      id: 1223192,
+      name: Roberta Marquez Seret,
+      order: 180,
+      gender: Female,
+      known_for_department: Art,
+      original_name: Roberta Marquez Seret,
+    }
+  ],
+  air_date: DateTime_1,
+  name: Pilot,
+  overview: When an unassuming high school chemistry teacher discovers he has a rare form of lung cancer, he decides to team up with a former student and create a top of the line crystal meth in a used RV, to provide for his family once he is gone.,
+  production_code: ,
+  still_path: <non-empty>,
+  id: 62085,
+  season_number: 1,
+  episode_number: 1
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeGetTvEpisodeWithImageLanguageAsync.verified.txt b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeGetTvEpisodeWithImageLanguageAsync.verified.txt
new file mode 100644
index 0000000..8b7d706
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeGetTvEpisodeWithImageLanguageAsync.verified.txt
@@ -0,0 +1,41 @@
+{
+  id: 62085,
+  stills: [
+    {
+      aspect_ratio: 1.777777777777778,
+      file_path: <non-empty>,
+      height: 1080,
+      width: 1920
+    },
+    {
+      aspect_ratio: 1.777777777777778,
+      file_path: <non-empty>,
+      height: 1080,
+      width: 1920
+    },
+    {
+      aspect_ratio: 1.777777777777778,
+      file_path: <non-empty>,
+      height: 1080,
+      width: 1920
+    },
+    {
+      aspect_ratio: 1.777777777777778,
+      file_path: <non-empty>,
+      height: 1080,
+      width: 1920
+    },
+    {
+      aspect_ratio: 1.777777777777778,
+      file_path: <non-empty>,
+      height: 1080,
+      width: 1920
+    },
+    {
+      aspect_ratio: 1.476014760147601,
+      file_path: <non-empty>,
+      height: 271,
+      width: 400
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeSeparateExtrasCreditsAsync.verified.txt b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeSeparateExtrasCreditsAsync.verified.txt
new file mode 100644
index 0000000..0426b0d
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeSeparateExtrasCreditsAsync.verified.txt
@@ -0,0 +1,32 @@
+{
+  guestStarItem: {
+    character: Emilio Koyama,
+    credit_id: 52542273760ee3132800068e,
+    id: 92495,
+    name: John Koyama,
+    order: 1,
+    profile_path: <non-empty>,
+    gender: Male,
+    known_for_department: Acting,
+    original_name: John Koyama,
+  },
+  castItem: {
+    character: Walter White,
+    credit_id: 52542282760ee313280017f9,
+    id: 17419,
+    name: Bryan Cranston,
+    profile_path: <non-empty>,
+    gender: Male,
+    known_for_department: Acting,
+    original_name: Bryan Cranston,
+  },
+  crewItem: {
+    credit_id: 52b702ea19c2955402183a66,
+    department: Editing,
+    id: 1280071,
+    job: Editor,
+    name: Lynne Willingham,
+    known_for_department: Editing,
+    original_name: Lynne Willingham,
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeSeparateExtrasExternalIdsAsync.verified.txt b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeSeparateExtrasExternalIdsAsync.verified.txt
new file mode 100644
index 0000000..e8f3d70
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeSeparateExtrasExternalIdsAsync.verified.txt
@@ -0,0 +1,7 @@
+{
+  imdb_id: tt0959621,
+  tvdb_id: 349232,
+  freebase_mid: /m/03mb620,
+  id: 62085,
+  tvrage_id: 637041
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeSeparateExtrasImagesAsync.verified.txt b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeSeparateExtrasImagesAsync.verified.txt
new file mode 100644
index 0000000..8b7d706
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeSeparateExtrasImagesAsync.verified.txt
@@ -0,0 +1,41 @@
+{
+  id: 62085,
+  stills: [
+    {
+      aspect_ratio: 1.777777777777778,
+      file_path: <non-empty>,
+      height: 1080,
+      width: 1920
+    },
+    {
+      aspect_ratio: 1.777777777777778,
+      file_path: <non-empty>,
+      height: 1080,
+      width: 1920
+    },
+    {
+      aspect_ratio: 1.777777777777778,
+      file_path: <non-empty>,
+      height: 1080,
+      width: 1920
+    },
+    {
+      aspect_ratio: 1.777777777777778,
+      file_path: <non-empty>,
+      height: 1080,
+      width: 1920
+    },
+    {
+      aspect_ratio: 1.777777777777778,
+      file_path: <non-empty>,
+      height: 1080,
+      width: 1920
+    },
+    {
+      aspect_ratio: 1.476014760147601,
+      file_path: <non-empty>,
+      height: 271,
+      width: 400
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeSeparateExtrasVideosAsync.verified.txt b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeSeparateExtrasVideosAsync.verified.txt
new file mode 100644
index 0000000..3d192c6
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodeSeparateExtrasVideosAsync.verified.txt
@@ -0,0 +1,3 @@
+{
+  id: 62085
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodesScreenedTheatricallyAsync.verified.txt b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodesScreenedTheatricallyAsync.verified.txt
new file mode 100644
index 0000000..5bcf29f
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvEpisodeTests.TestTvEpisodesScreenedTheatricallyAsync.verified.txt
@@ -0,0 +1,5 @@
+{
+  id: 63103,
+  season_number: 4,
+  episode_number: 10
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvSeasonTests.TestTvSeasonExtrasAllAsync.verified.txt b/TMDbLibTests/Verification/ClientTvSeasonTests.TestTvSeasonExtrasAllAsync.verified.txt
new file mode 100644
index 0000000..116d2f7
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvSeasonTests.TestTvSeasonExtrasAllAsync.verified.txt
@@ -0,0 +1,1412 @@
+{
+  account_states: {
+    id: 69559,
+    results: [
+      {
+        episode_number: 1,
+        id: 1151470,
+        rating: 5.0
+      },
+      {
+        episode_number: 2,
+        id: 1151471
+      },
+      {
+        episode_number: 3,
+        id: 1151472
+      },
+      {
+        episode_number: 4,
+        id: 1151473
+      },
+      {
+        episode_number: 5,
+        id: 1151474
+      },
+      {
+        episode_number: 6,
+        id: 1151475
+      },
+      {
+        episode_number: 7,
+        id: 1151476
+      },
+      {
+        episode_number: 8,
+        id: 1151477
+      },
+      {
+        episode_number: 9,
+        id: 1151478
+      },
+      {
+        episode_number: 10,
+        id: 1151479
+      },
+      {
+        episode_number: 11,
+        id: 1151480
+      },
+      {
+        episode_number: 12,
+        id: 1151481
+      },
+      {
+        episode_number: 13,
+        id: 1151482
+      }
+    ]
+  },
+  air_date: DateTime_1,
+  credits: {
+    cast: [
+      {
+        character: DJ Tanner-Fuller,
+        credit_id: 55cda9e0c3a36815800012d4,
+        id: 31363,
+        name: Candace Cameron Bure,
+        order: 1,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Candace Cameron Bure,
+      },
+      {
+        character: Stephanie Tanner,
+        credit_id: 55cda9f0925141319000167f,
+        id: 1234708,
+        name: Jodie Sweetin,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Jodie Sweetin,
+      },
+      {
+        character: Kimmy Gibbler,
+        credit_id: 55cf7cfa9251413196005076,
+        id: 1212537,
+        name: Andrea Barber,
+        order: 2,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Andrea Barber,
+      },
+      {
+        character: Max Fuller,
+        credit_id: 55cf7d4ec3a3681bf500560f,
+        id: 1497222,
+        name: Elias Harger,
+        order: 3,
+        profile_path: <non-empty>,
+        gender: Male,
+        known_for_department: Acting,
+        original_name: Elias Harger,
+      },
+      {
+        character: Jackson Fuller,
+        credit_id: 56d2c730c3a3681e3600e598,
+        id: 1471109,
+        name: Michael Campion,
+        order: 6,
+        profile_path: <non-empty>,
+        gender: Male,
+        known_for_department: Acting,
+        original_name: Michael Campion,
+      },
+      {
+        character: Ramona Gibbler,
+        credit_id: 56d2c77f9251413e6a00f38e,
+        id: 1583967,
+        name: Soni Bringas,
+        order: 4,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Soni Bringas,
+      },
+      {
+        character: Phyllis Gladstone,
+        credit_id: 59ea0021c3a3687fc60129fd,
+        id: 1675772,
+        name: Ruby Rose Turner,
+        order: 500,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Ruby Rose Turner,
+      },
+      {
+        character: Joan Gladstone,
+        credit_id: 59ea0329c3a3687f32012e7b,
+        id: 1728254,
+        name: Kingston Foster,
+        order: 500,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Kingston Foster,
+      }
+    ],
+    id: 69559
+  },
+  episodes: [
+    {
+      air_date: DateTime_1,
+      crew: [
+        {
+          credit_id: 5851b49cc3a3682fb801ed4b,
+          department: Directing,
+          id: 1212114,
+          job: Director,
+          name: Mark Cendrowski,
+          gender: Male,
+          known_for_department: Directing,
+          original_name: Mark Cendrowski,
+        },
+        {
+          credit_id: 5851b4adc3a36831500190d4,
+          department: Writing,
+          id: 60621,
+          job: Writer,
+          name: Jeff Franklin,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Writing,
+          original_name: Jeff Franklin,
+        }
+      ],
+      episode_number: 1,
+      guest_stars: [
+        {
+          character: Jesse Katsopolis,
+          credit_id: 56d2c7cd92514102db0005ea,
+          id: 32600,
+          name: John Stamos,
+          order: 81,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: John Stamos,
+        },
+        {
+          character: Danny Tanner,
+          credit_id: 56d2c7fbc3a3681e3c010177,
+          id: 72450,
+          name: Bob Saget,
+          order: 90,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Bob Saget,
+        },
+        {
+          character: Joey Gladstone,
+          credit_id: 56d2c8149251413e5f00ee2c,
+          id: 1218736,
+          name: Dave Coulier,
+          order: 82,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Dave Coulier,
+        },
+        {
+          character: Becky Katsopolis,
+          credit_id: 56d2c834925141799e00c208,
+          id: 92509,
+          name: Lori Loughlin,
+          order: 91,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Lori Loughlin,
+        },
+        {
+          character: Steve Hale,
+          credit_id: 56d2c84dc3a3681e3600e5c1,
+          id: 15827,
+          name: Scott Weinger,
+          order: 82,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Scott Weinger,
+        },
+        {
+          character: Nicky Katsopolis,
+          credit_id: 56d2c864c3a3681e440102d6,
+          id: 1234709,
+          name: Blake Tuomy-Wilhoit,
+          order: 6,
+          known_for_department: Acting,
+          original_name: Blake Tuomy-Wilhoit,
+        },
+        {
+          character: Alex Katsopolis,
+          credit_id: 56d2c878c3a3681e4a00e2ff,
+          id: 1236340,
+          name: Dylan Tuomy-Wilhoit,
+          order: 7,
+          known_for_department: Sound,
+          original_name: Dylan Tuomy-Wilhoit,
+        },
+        {
+          character: Fernando,
+          credit_id: 56d2c8a192514102db000608,
+          id: 58970,
+          name: Juan Pablo Di Pace,
+          order: 82,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Juan Pablo Di Pace,
+        },
+        {
+          character: Teri Tanner,
+          credit_id: 56d2c8b69251413e5f00ee44,
+          id: 121769,
+          name: Eva LaRue,
+          order: 9,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Eva LaRue,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c8fdc3a3681e5700ea19,
+          id: 1583968,
+          name: Dashiell Messitt,
+          order: 69,
+          known_for_department: Acting,
+          original_name: Dashiell Messitt,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c9179251412c960062bd,
+          id: 1583969,
+          name: Fox Messitt,
+          order: 65,
+          known_for_department: Acting,
+          original_name: Fox Messitt,
+        }
+      ],
+      id: 1151470,
+      name: Our Very First Show, Again,
+      overview: The entire Tanner clan comes together for a final reunion before the family home is sold, but parting turns out to be tougher than expected,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_1,
+      episode_number: 2,
+      guest_stars: [
+        {
+          character: Jesse Katsopolis,
+          credit_id: 56d2c7cd92514102db0005ea,
+          id: 32600,
+          name: John Stamos,
+          order: 81,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: John Stamos,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c8fdc3a3681e5700ea19,
+          id: 1583968,
+          name: Dashiell Messitt,
+          order: 69,
+          known_for_department: Acting,
+          original_name: Dashiell Messitt,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c9179251412c960062bd,
+          id: 1583969,
+          name: Fox Messitt,
+          order: 65,
+          known_for_department: Acting,
+          original_name: Fox Messitt,
+        }
+      ],
+      id: 1151471,
+      name: Moving Day,
+      overview: When the big day comes for Stephanie and Kimmy to join the Fuller house, Jackson feels outnumbered and takes drastic action,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_1,
+      episode_number: 3,
+      guest_stars: [
+        {
+          character: Joey Gladstone,
+          credit_id: 56d2c8149251413e5f00ee2c,
+          id: 1218736,
+          name: Dave Coulier,
+          order: 82,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Dave Coulier,
+        },
+        {
+          character: Fernando,
+          credit_id: 56d2c8a192514102db000608,
+          id: 58970,
+          name: Juan Pablo Di Pace,
+          order: 82,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Juan Pablo Di Pace,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c8fdc3a3681e5700ea19,
+          id: 1583968,
+          name: Dashiell Messitt,
+          order: 69,
+          known_for_department: Acting,
+          original_name: Dashiell Messitt,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c9179251412c960062bd,
+          id: 1583969,
+          name: Fox Messitt,
+          order: 65,
+          known_for_department: Acting,
+          original_name: Fox Messitt,
+        },
+        {
+          character: Macy Gray,
+          credit_id: 56d2ca21c3a3681e5700ea3d,
+          id: 60560,
+          name: Macy Gray,
+          order: 12,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Macy Gray,
+        },
+        {
+          character: Maks,
+          credit_id: 56d2ca3b9251413e6a00f3e7,
+          id: 1456289,
+          name: Maksim Chmerkovskiy,
+          order: 13,
+          profile_path: <non-empty>,
+          known_for_department: Acting,
+          original_name: Maksim Chmerkovskiy,
+        },
+        {
+          character: Val,
+          credit_id: 56d2ca5092514102db000653,
+          id: 1583970,
+          name: Val Chmerkovskiy,
+          order: 14,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Val Chmerkovskiy,
+        },
+        {
+          character: Mandy,
+          credit_id: 56d2ca7e9251417994000da6,
+          id: 970084,
+          name: Tyne Stecklein,
+          order: 15,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Tyne Stecklein,
+        },
+        {
+          character: Pet Clinic Woman,
+          credit_id: 56d2cab6c3a3681e3900e626,
+          id: 1525753,
+          name: Lex Montgomery,
+          order: 16,
+          known_for_department: Acting,
+          original_name: Lex Montgomery,
+        }
+      ],
+      id: 1151472,
+      name: Funner House,
+      overview: When Stephanie, Kimmy and DJ have a girls' night out and leave Joey in charge of the kids, things get wild out on the town and at home.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_1,
+      episode_number: 4,
+      guest_stars: [
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c8fdc3a3681e5700ea19,
+          id: 1583968,
+          name: Dashiell Messitt,
+          order: 69,
+          known_for_department: Acting,
+          original_name: Dashiell Messitt,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c9179251412c960062bd,
+          id: 1583969,
+          name: Fox Messitt,
+          order: 65,
+          known_for_department: Acting,
+          original_name: Fox Messitt,
+        },
+        {
+          character: Dr. Matt Harmon,
+          credit_id: 56d2cb159251412c9600630f,
+          id: 222906,
+          name: John Brotherton,
+          order: 89,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: John Brotherton,
+        },
+        {
+          character: Lola,
+          credit_id: 56d2cb2892514157b5001279,
+          id: 1583971,
+          name: Ashley Liao,
+          order: 64,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Ashley Liao,
+        },
+        {
+          character: Mr. Gerald,
+          credit_id: 56d2cb3bc3a3681e5000d900,
+          id: 537,
+          name: Stephen Tobolowsky,
+          order: 19,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Stephen Tobolowsky,
+        },
+        {
+          character: Darren,
+          credit_id: 56d2cb4d925141799e00c26a,
+          id: 26975,
+          name: Steve Talley,
+          order: 20,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Steve Talley,
+        },
+        {
+          character: Dr. Fred Harmon,
+          credit_id: 56d2cb68c3a3681e5700ea7b,
+          id: 41465,
+          name: Robin Thomas,
+          order: 21,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Robin Thomas,
+        },
+        {
+          character: Janet,
+          credit_id: 56d2cb7fc3a3681e3900e648,
+          id: 1292489,
+          name: Kimberley Drummond,
+          order: 70,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Kimberley Drummond,
+        },
+        {
+          character: GoPro,
+          credit_id: 56d2cb949251413e6a00f436,
+          id: 1583972,
+          name: Jacquez Swanigan,
+          order: 23,
+          known_for_department: Acting,
+          original_name: Jacquez Swanigan,
+        },
+        {
+          character: Dog Owner,
+          credit_id: 56d2cbc1c3a3681e4a00e366,
+          id: 1583973,
+          name: Phillip Garcia,
+          order: 24,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Phillip Garcia,
+        },
+        {
+          character: Barista,
+          credit_id: 56d2cc0dc3a3681e4401036b,
+          id: 1583975,
+          name: Anthony Hill,
+          order: 25,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Anthony Hill,
+        }
+      ],
+      id: 1151473,
+      name: The Not-So-Great Escape,
+      overview: Jackson tries to help Ramona at school but that lands them both in trouble and leads to a disagreement between DJ and Kimmy over parenting styles.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_1,
+      episode_number: 5,
+      guest_stars: [
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c8fdc3a3681e5700ea19,
+          id: 1583968,
+          name: Dashiell Messitt,
+          order: 69,
+          known_for_department: Acting,
+          original_name: Dashiell Messitt,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c9179251412c960062bd,
+          id: 1583969,
+          name: Fox Messitt,
+          order: 65,
+          known_for_department: Acting,
+          original_name: Fox Messitt,
+        },
+        {
+          character: Shannon,
+          credit_id: 56d2cc69c3a3681e3600e651,
+          id: 212985,
+          name: Sasha Jackson,
+          order: 26,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Sasha Jackson,
+        },
+        {
+          character: Tyler,
+          credit_id: 56d2cc8092514157b50012a7,
+          id: 93031,
+          name: Ryan McPartlin,
+          order: 27,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Ryan McPartlin,
+        },
+        {
+          character: Hank,
+          credit_id: 56d2cc92925141340200a914,
+          id: 1583977,
+          name: Chris Rubeiz,
+          order: 28,
+          known_for_department: Acting,
+          original_name: Chris Rubeiz,
+        },
+        {
+          character: DJ Unbreakable,
+          credit_id: 56d2cca8c3a3681e3600e65d,
+          id: 1583979,
+          name: Rajiv Dhall,
+          order: 29,
+          known_for_department: Acting,
+          original_name: Rajiv Dhall,
+        },
+        {
+          character: Raver,
+          credit_id: 56d2ccc3c3a3681e3e010622,
+          id: 1569771,
+          name: Jenna Osterlund,
+          order: 30,
+          known_for_department: Acting,
+          original_name: Jenna Osterlund,
+        }
+      ],
+      id: 1151474,
+      name: Mad Max,
+      overview: When an old friend whisks her away for a concert and after-hours fun, Stephanie realizes how much her nephews mean to her. Kimmy finds DJ a date.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_1,
+      episode_number: 6,
+      guest_stars: [
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c8fdc3a3681e5700ea19,
+          id: 1583968,
+          name: Dashiell Messitt,
+          order: 69,
+          known_for_department: Acting,
+          original_name: Dashiell Messitt,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c9179251412c960062bd,
+          id: 1583969,
+          name: Fox Messitt,
+          order: 65,
+          known_for_department: Acting,
+          original_name: Fox Messitt,
+        },
+        {
+          character: Dr. Matt Harmon,
+          credit_id: 56d2cb159251412c9600630f,
+          id: 222906,
+          name: John Brotherton,
+          order: 89,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: John Brotherton,
+        },
+        {
+          character: Lola,
+          credit_id: 56d2cb2892514157b5001279,
+          id: 1583971,
+          name: Ashley Liao,
+          order: 64,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Ashley Liao,
+        },
+        {
+          character: Bobby Popko,
+          credit_id: 56d2cd87c3a3681e5700eace,
+          id: 1567591,
+          name: Isaak Presley,
+          order: 82,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Isaak Presley,
+        },
+        {
+          character: King Jaguarito,
+          credit_id: 56d2cdb6c3a3681e3e010657,
+          id: 1583992,
+          name: John Overgaauw,
+          order: 33,
+          known_for_department: Acting,
+          original_name: John Overgaauw,
+        },
+        {
+          character: Wrestling Arena Patron,
+          credit_id: 56d2cdd8925141340200a942,
+          id: 1583993,
+          name: Mary-Kate Fitzpatrick,
+          order: 34,
+          known_for_department: Acting,
+          original_name: Mary-Kate Fitzpatrick,
+        },
+        {
+          character: Wrestling Arena Patron,
+          credit_id: 56d2cdddc3a3681e3600e690,
+          id: 1583994,
+          name: Mary-Kate Fitzpatrick,
+          order: 35,
+          known_for_department: Acting,
+          original_name: Mary-Kate Fitzpatrick,
+        },
+        {
+          character: Chicken Costumed Patron,
+          credit_id: 56d2ce28c3a3681e5000d962,
+          id: 1555649,
+          name: Punnavith Koy,
+          order: 36,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Punnavith Koy,
+        },
+        {
+          character: Wrestling Announcer,
+          credit_id: 5789468ec3a36835fa003981,
+          id: 162811,
+          name: Jeff Bryan Davis,
+          order: 46,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Jeff Bryan Davis,
+        }
+      ],
+      id: 1151475,
+      name: The Legend of El Explosivo,
+      overview: DJ punishes Jackson, causing him to muss his favorite Mexican wrestling league, Lucha Kaboom. But only leads to more action for the fans.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_1,
+      episode_number: 7,
+      guest_stars: [
+        {
+          character: Steve Hale,
+          credit_id: 56d2c84dc3a3681e3600e5c1,
+          id: 15827,
+          name: Scott Weinger,
+          order: 82,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Scott Weinger,
+        },
+        {
+          character: Fernando,
+          credit_id: 56d2c8a192514102db000608,
+          id: 58970,
+          name: Juan Pablo Di Pace,
+          order: 82,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Juan Pablo Di Pace,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c8fdc3a3681e5700ea19,
+          id: 1583968,
+          name: Dashiell Messitt,
+          order: 69,
+          known_for_department: Acting,
+          original_name: Dashiell Messitt,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c9179251412c960062bd,
+          id: 1583969,
+          name: Fox Messitt,
+          order: 65,
+          known_for_department: Acting,
+          original_name: Fox Messitt,
+        },
+        {
+          character: Dr. Matt Harmon,
+          credit_id: 56d2cb159251412c9600630f,
+          id: 222906,
+          name: John Brotherton,
+          order: 89,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: John Brotherton,
+        },
+        {
+          character: Lola,
+          credit_id: 56d2cb2892514157b5001279,
+          id: 1583971,
+          name: Ashley Liao,
+          order: 64,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Ashley Liao,
+        }
+      ],
+      id: 1151476,
+      name: Ramona's Not-So-Epic Party,
+      overview: Steve tries setting up DJ's handsome coworker with Kimmy, and Ramona's much-anticipated 13th birthday party doesn't turn out as planned for anybody.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_1,
+      episode_number: 8,
+      guest_stars: [
+        {
+          character: Danny Tanner,
+          credit_id: 56d2c7fbc3a3681e3c010177,
+          id: 72450,
+          name: Bob Saget,
+          order: 90,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Bob Saget,
+        },
+        {
+          character: Fernando,
+          credit_id: 56d2c8a192514102db000608,
+          id: 58970,
+          name: Juan Pablo Di Pace,
+          order: 82,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Juan Pablo Di Pace,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c8fdc3a3681e5700ea19,
+          id: 1583968,
+          name: Dashiell Messitt,
+          order: 69,
+          known_for_department: Acting,
+          original_name: Dashiell Messitt,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c9179251412c960062bd,
+          id: 1583969,
+          name: Fox Messitt,
+          order: 65,
+          known_for_department: Acting,
+          original_name: Fox Messitt,
+        },
+        {
+          character: Dr. Matt Harmon,
+          credit_id: 56d2cb159251412c9600630f,
+          id: 222906,
+          name: John Brotherton,
+          order: 89,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: John Brotherton,
+        },
+        {
+          character: Chief Mulrooney,
+          credit_id: 56d2cf57925141340200a97a,
+          id: 17837,
+          name: Patrick Gallagher,
+          order: 37,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Patrick Gallagher,
+        },
+        {
+          character: Kyle,
+          credit_id: 56d2cf6992514157b5001317,
+          id: 1517537,
+          name: Bechir Sylvain,
+          order: 38,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Bechir Sylvain,
+        },
+        {
+          character: Taylor,
+          credit_id: 56d2cf7e92514157b5001322,
+          id: 1583996,
+          name: Lucas Jaye,
+          order: 39,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Lucas Jaye,
+        }
+      ],
+      id: 1151477,
+      name: Secrets, Lies and Firetrucks,
+      overview: When Max learns to lie, he also learns that lies can backfire. Meanwhile, the ladies of the house fall in love with secrets.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_1,
+      episode_number: 9,
+      guest_stars: [
+        {
+          character: Jesse Katsopolis,
+          credit_id: 56d2c7cd92514102db0005ea,
+          id: 32600,
+          name: John Stamos,
+          order: 81,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: John Stamos,
+        },
+        {
+          character: Becky Katsopolis,
+          credit_id: 56d2c834925141799e00c208,
+          id: 92509,
+          name: Lori Loughlin,
+          order: 91,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Lori Loughlin,
+        },
+        {
+          character: Steve Hale,
+          credit_id: 56d2c84dc3a3681e3600e5c1,
+          id: 15827,
+          name: Scott Weinger,
+          order: 82,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Scott Weinger,
+        },
+        {
+          character: Fernando,
+          credit_id: 56d2c8a192514102db000608,
+          id: 58970,
+          name: Juan Pablo Di Pace,
+          order: 82,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Juan Pablo Di Pace,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c9179251412c960062bd,
+          id: 1583969,
+          name: Fox Messitt,
+          order: 65,
+          known_for_department: Acting,
+          original_name: Fox Messitt,
+        },
+        {
+          character: Dr. Matt Harmon,
+          credit_id: 56d2cb159251412c9600630f,
+          id: 222906,
+          name: John Brotherton,
+          order: 89,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: John Brotherton,
+        },
+        {
+          character: Lola,
+          credit_id: 56d2cb2892514157b5001279,
+          id: 1583971,
+          name: Ashley Liao,
+          order: 64,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Ashley Liao,
+        },
+        {
+          character: Harry Takayama,
+          credit_id: 56d2d0529251413e6a00f520,
+          id: 179048,
+          name: Michael Sun Lee,
+          order: 40,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Michael Sun Lee,
+        }
+      ],
+      id: 1151478,
+      name: War of the Roses,
+      overview: After 1,000 roses show up without a card, DJ, Kimmy and Stephanie must figure out which one of them has a secret admirer.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_1,
+      episode_number: 10,
+      guest_stars: [
+        {
+          character: Steve Hale,
+          credit_id: 56d2c84dc3a3681e3600e5c1,
+          id: 15827,
+          name: Scott Weinger,
+          order: 82,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Scott Weinger,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c8fdc3a3681e5700ea19,
+          id: 1583968,
+          name: Dashiell Messitt,
+          order: 69,
+          known_for_department: Acting,
+          original_name: Dashiell Messitt,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c9179251412c960062bd,
+          id: 1583969,
+          name: Fox Messitt,
+          order: 65,
+          known_for_department: Acting,
+          original_name: Fox Messitt,
+        },
+        {
+          character: Dr. Matt Harmon,
+          credit_id: 56d2cb159251412c9600630f,
+          id: 222906,
+          name: John Brotherton,
+          order: 89,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: John Brotherton,
+        },
+        {
+          character: Lola,
+          credit_id: 56d2cb2892514157b5001279,
+          id: 1583971,
+          name: Ashley Liao,
+          order: 64,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Ashley Liao,
+        },
+        {
+          character: Hunter Pence,
+          credit_id: 56d2d103c3a3681e5000d9eb,
+          id: 1583997,
+          name: Hunter Pence,
+          order: 41,
+          known_for_department: Acting,
+          original_name: Hunter Pence,
+        },
+        {
+          character: Fan,
+          credit_id: 56d2d11692514102db000752,
+          id: 159907,
+          name: Brad Grunberg,
+          order: 42,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Brad Grunberg,
+        },
+        {
+          character: Vendor,
+          credit_id: 56d2d12892514102db000759,
+          id: 1583999,
+          name: Derek Viveiros,
+          order: 43,
+          profile_path: <non-empty>,
+          known_for_department: Acting,
+          original_name: Derek Viveiros,
+        },
+        {
+          character: Baseball Fan,
+          credit_id: 56d2d137925141799e00c36c,
+          id: 1584000,
+          name: Benito M. Selim,
+          order: 44,
+          known_for_department: Acting,
+          original_name: Benito M. Selim,
+        },
+        {
+          character: Baseball Fan,
+          credit_id: 56d2d154c3a3681e3c0102cd,
+          id: 208382,
+          name: Jeff Redlick,
+          order: 45,
+          known_for_department: Acting,
+          original_name: Jeff Redlick,
+        },
+        {
+          character: San Francisco Giants Security Officer,
+          credit_id: 56d2d166c3a3681e4401045c,
+          id: 928577,
+          name: Steven Wiig,
+          order: 46,
+          profile_path: <non-empty>,
+          known_for_department: Acting,
+          original_name: Steven Wiig,
+        }
+      ],
+      id: 1151479,
+      name: A Giant Leap,
+      overview: Things get out of hand when Stephanie's new boyfriend, Hunter Pence of the San Fransisco Giants, invites everybody to one of his baseball games.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_1,
+      episode_number: 11,
+      guest_stars: [
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c8fdc3a3681e5700ea19,
+          id: 1583968,
+          name: Dashiell Messitt,
+          order: 69,
+          known_for_department: Acting,
+          original_name: Dashiell Messitt,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c9179251412c960062bd,
+          id: 1583969,
+          name: Fox Messitt,
+          order: 65,
+          known_for_department: Acting,
+          original_name: Fox Messitt,
+        },
+        {
+          character: Dr. Matt Harmon,
+          credit_id: 56d2cb159251412c9600630f,
+          id: 222906,
+          name: John Brotherton,
+          order: 89,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: John Brotherton,
+        },
+        {
+          character: Dr. Fred Harmon,
+          credit_id: 56d2cb68c3a3681e5700ea7b,
+          id: 41465,
+          name: Robin Thomas,
+          order: 21,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Robin Thomas,
+        }
+      ],
+      id: 1151480,
+      name: Partnership in the Night,
+      overview: Stephanie and Kimmy form a strange partnership. DJ's boss retires, and Max has Jackson and Ramona right where he wants them.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_1,
+      episode_number: 12,
+      guest_stars: [
+        {
+          character: Steve Hale,
+          credit_id: 56d2c84dc3a3681e3600e5c1,
+          id: 15827,
+          name: Scott Weinger,
+          order: 82,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Scott Weinger,
+        },
+        {
+          character: Fernando,
+          credit_id: 56d2c8a192514102db000608,
+          id: 58970,
+          name: Juan Pablo Di Pace,
+          order: 82,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Juan Pablo Di Pace,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c8fdc3a3681e5700ea19,
+          id: 1583968,
+          name: Dashiell Messitt,
+          order: 69,
+          known_for_department: Acting,
+          original_name: Dashiell Messitt,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c9179251412c960062bd,
+          id: 1583969,
+          name: Fox Messitt,
+          order: 65,
+          known_for_department: Acting,
+          original_name: Fox Messitt,
+        }
+      ],
+      id: 1151481,
+      name: Save the Dates,
+      overview: DJ has a date with her past that catches get off guard, and Kimmy's date with Fernando is nothing but surprises.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_1,
+      episode_number: 13,
+      guest_stars: [
+        {
+          character: Jesse Katsopolis,
+          credit_id: 56d2c7cd92514102db0005ea,
+          id: 32600,
+          name: John Stamos,
+          order: 81,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: John Stamos,
+        },
+        {
+          character: Joey Gladstone,
+          credit_id: 56d2c8149251413e5f00ee2c,
+          id: 1218736,
+          name: Dave Coulier,
+          order: 82,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Dave Coulier,
+        },
+        {
+          character: Becky Katsopolis,
+          credit_id: 56d2c834925141799e00c208,
+          id: 92509,
+          name: Lori Loughlin,
+          order: 91,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Lori Loughlin,
+        },
+        {
+          character: Steve Hale,
+          credit_id: 56d2c84dc3a3681e3600e5c1,
+          id: 15827,
+          name: Scott Weinger,
+          order: 82,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Scott Weinger,
+        },
+        {
+          character: Fernando,
+          credit_id: 56d2c8a192514102db000608,
+          id: 58970,
+          name: Juan Pablo Di Pace,
+          order: 82,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Juan Pablo Di Pace,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c8fdc3a3681e5700ea19,
+          id: 1583968,
+          name: Dashiell Messitt,
+          order: 69,
+          known_for_department: Acting,
+          original_name: Dashiell Messitt,
+        },
+        {
+          character: Tommy Fuller Jr.,
+          credit_id: 56d2c9179251412c960062bd,
+          id: 1583969,
+          name: Fox Messitt,
+          order: 65,
+          known_for_department: Acting,
+          original_name: Fox Messitt,
+        },
+        {
+          character: Dr. Matt Harmon,
+          credit_id: 56d2cb159251412c9600630f,
+          id: 222906,
+          name: John Brotherton,
+          order: 89,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: John Brotherton,
+        },
+        {
+          character: Lola,
+          credit_id: 56d2cb2892514157b5001279,
+          id: 1583971,
+          name: Ashley Liao,
+          order: 64,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Ashley Liao,
+        }
+      ],
+      id: 1151482,
+      name: Love is in the Air,
+      overview: When Jesse and Becky return to renew their vows, a bachelorette party leads to trouble for DJ, who is forced to make a decision.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    }
+  ],
+  external_ids: {
+    id: 69559
+  },
+  id: 69559,
+  images: {
+    id: 69559,
+    posters: [
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 2100,
+        iso_639_1: en,
+        width: 1400
+      },
+      {
+        aspect_ratio: 0.68,
+        file_path: <non-empty>,
+        height: 1000,
+        width: 680
+      },
+      {
+        aspect_ratio: 0.6802721088435374,
+        file_path: <non-empty>,
+        height: 882,
+        iso_639_1: he,
+        width: 600
+      }
+    ]
+  },
+  name: Season 1,
+  overview: ,
+  poster_path: <non-empty>,
+  season_number: 1,
+  videos: {
+    id: 69559,
+    results: [
+      {
+        id: 5debfc93daf57c0013ea6d67,
+        iso_3166_1: US,
+        iso_639_1: en,
+        key: _n3MhMY7EgQ,
+        name: FULLER HOUSE Official Season 1 TRAILER (2016) Netflix,
+        site: YouTube,
+        size: 1080,
+        type: Trailer
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvSeasonTests.TestTvSeasonExtrasNoneAsync.verified.txt b/TMDbLibTests/Verification/ClientTvSeasonTests.TestTvSeasonExtrasNoneAsync.verified.txt
new file mode 100644
index 0000000..503c2ab
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvSeasonTests.TestTvSeasonExtrasNoneAsync.verified.txt
@@ -0,0 +1,883 @@
+{
+  air_date: DateTime_1,
+  episodes: [
+    {
+      air_date: DateTime_1,
+      crew: [
+        {
+          credit_id: 52542275760ee313280006ce,
+          department: Writing,
+          id: 66633,
+          job: Writer,
+          name: Vince Gilligan,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Writing,
+          original_name: Vince Gilligan,
+        },
+        {
+          credit_id: 52542275760ee313280006e8,
+          department: Directing,
+          id: 66633,
+          job: Director,
+          name: Vince Gilligan,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Writing,
+          original_name: Vince Gilligan,
+        },
+        {
+          credit_id: 52b7029219c29533d00dd2c1,
+          department: Camera,
+          id: 2483,
+          job: Director of Photography,
+          name: John Toll,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Camera,
+          original_name: John Toll,
+        },
+        {
+          credit_id: 52b702ea19c2955402183a66,
+          department: Editing,
+          id: 1280071,
+          job: Editor,
+          name: Lynne Willingham,
+          known_for_department: Editing,
+          original_name: Lynne Willingham,
+        }
+      ],
+      episode_number: 1,
+      guest_stars: [
+        {
+          character: Carmen Molina,
+          credit_id: 52542273760ee31328000676,
+          id: 115688,
+          name: Carmen Serano,
+          order: 176,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Carmen Serano,
+        },
+        {
+          character: Emilio Koyama,
+          credit_id: 52542273760ee3132800068e,
+          id: 92495,
+          name: John Koyama,
+          order: 1,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: John Koyama,
+        },
+        {
+          character: Jock,
+          credit_id: 52542275760ee313280006b4,
+          id: 1216132,
+          name: Aaron Hill,
+          order: 3,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Aaron Hill,
+        },
+        {
+          character: Steven Gomez,
+          credit_id: 5271b489760ee35b3e0881a7,
+          id: 61535,
+          name: Steven Michael Quezada,
+          order: 191,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Steven Michael Quezada,
+        },
+        {
+          character: Krazy-8,
+          credit_id: 52725845760ee3046b09426e,
+          id: 1046460,
+          name: Max Arciniega,
+          order: 38,
+          profile_path: <non-empty>,
+          known_for_department: Acting,
+          original_name: Max Arciniega,
+        },
+        {
+          character: Bogdan Wolynetz,
+          credit_id: 5272587a760ee3045009ddec,
+          id: 1223197,
+          name: Marius Stan,
+          order: 112,
+          profile_path: <non-empty>,
+          known_for_department: Acting,
+          original_name: Marius Stan,
+        },
+        {
+          character: Dr. Belknap,
+          credit_id: 52725cb1760ee3044d0b9984,
+          id: 161591,
+          name: Gregory Chase,
+          order: 33,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Gregory Chase,
+        },
+        {
+          character: Chad's Girlfriend,
+          credit_id: 56846abbc3a36836280008d4,
+          id: 1223192,
+          name: Roberta Marquez Seret,
+          order: 180,
+          gender: Female,
+          known_for_department: Art,
+          original_name: Roberta Marquez Seret,
+        }
+      ],
+      id: 62085,
+      name: Pilot,
+      overview: When an unassuming high school chemistry teacher discovers he has a rare form of lung cancer, he decides to team up with a former student and create a top of the line crystal meth in a used RV, to provide for his family once he is gone.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_2,
+      crew: [
+        {
+          credit_id: 52542275760ee313280006ce,
+          department: Writing,
+          id: 66633,
+          job: Writer,
+          name: Vince Gilligan,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Writing,
+          original_name: Vince Gilligan,
+        },
+        {
+          credit_id: 52542275760ee31328000725,
+          department: Directing,
+          id: 111338,
+          job: Director,
+          name: Adam Bernstein,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Directing,
+          original_name: Adam Bernstein,
+        },
+        {
+          credit_id: 52b702ea19c2955402183a66,
+          department: Editing,
+          id: 1280071,
+          job: Editor,
+          name: Lynne Willingham,
+          known_for_department: Editing,
+          original_name: Lynne Willingham,
+        },
+        {
+          credit_id: 52b7049c19c2953b63015013,
+          department: Camera,
+          id: 17948,
+          job: Director of Photography,
+          name: Reynaldo Villalobos,
+          gender: Male,
+          known_for_department: Camera,
+          original_name: Reynaldo Villalobos,
+        }
+      ],
+      episode_number: 2,
+      guest_stars: [
+        {
+          character: Emilio Koyama,
+          credit_id: 52542273760ee3132800068e,
+          id: 92495,
+          name: John Koyama,
+          order: 1,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: John Koyama,
+        },
+        {
+          character: Krazy-8,
+          credit_id: 52725845760ee3046b09426e,
+          id: 1046460,
+          name: Max Arciniega,
+          order: 38,
+          profile_path: <non-empty>,
+          known_for_department: Acting,
+          original_name: Max Arciniega,
+        }
+      ],
+      id: 62086,
+      name: Cat's in the Bag...,
+      overview: Walt and Jesse attempt to tie up loose ends. The desperate situation gets more complicated with the flip of a coin. Walt's wife, Skyler, becomes suspicious of Walt's strange behavior.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_3,
+      crew: [
+        {
+          credit_id: 52542275760ee313280006ce,
+          department: Writing,
+          id: 66633,
+          job: Writer,
+          name: Vince Gilligan,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Writing,
+          original_name: Vince Gilligan,
+        },
+        {
+          credit_id: 52542275760ee31328000725,
+          department: Directing,
+          id: 111338,
+          job: Director,
+          name: Adam Bernstein,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Directing,
+          original_name: Adam Bernstein,
+        },
+        {
+          credit_id: 52b7049c19c2953b63015013,
+          department: Camera,
+          id: 17948,
+          job: Director of Photography,
+          name: Reynaldo Villalobos,
+          gender: Male,
+          known_for_department: Camera,
+          original_name: Reynaldo Villalobos,
+        },
+        {
+          credit_id: 52b7051619c29533d00e8c79,
+          department: Editing,
+          id: 1280074,
+          job: Editor,
+          name: Kelley Dixon,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Editing,
+          original_name: Kelley Dixon,
+        }
+      ],
+      episode_number: 3,
+      guest_stars: [
+        {
+          character: Carmen Molina,
+          credit_id: 52542273760ee31328000676,
+          id: 115688,
+          name: Carmen Serano,
+          order: 176,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Carmen Serano,
+        },
+        {
+          character: Gretchen Schwartz,
+          credit_id: 52542275760ee31328000768,
+          id: 14984,
+          name: Jessica Hecht,
+          order: 182,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Jessica Hecht,
+        },
+        {
+          character: Steven Gomez,
+          credit_id: 5271b489760ee35b3e0881a7,
+          id: 61535,
+          name: Steven Michael Quezada,
+          order: 191,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Steven Michael Quezada,
+        },
+        {
+          character: Krazy-8,
+          credit_id: 52725845760ee3046b09426e,
+          id: 1046460,
+          name: Max Arciniega,
+          order: 38,
+          profile_path: <non-empty>,
+          known_for_department: Acting,
+          original_name: Max Arciniega,
+        }
+      ],
+      id: 62087,
+      name: ...And the Bag's in the River,
+      overview: Walter fights with Jesse over his drug use, causing him to leave Walter alone with their captive, Krazy-8. Meanwhile, Hank has a scared straight moment with Walter Jr. after his aunt discovers he has been smoking pot. Also, Skylar is upset when Walter stays away from home.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_4,
+      crew: [
+        {
+          credit_id: 52542275760ee313280006ce,
+          department: Writing,
+          id: 66633,
+          job: Writer,
+          name: Vince Gilligan,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Writing,
+          original_name: Vince Gilligan,
+        },
+        {
+          credit_id: 52542278760ee31328000a9b,
+          department: Directing,
+          id: 205639,
+          job: Director,
+          name: Jim McKay,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Directing,
+          original_name: Jim McKay,
+        },
+        {
+          credit_id: 52b702ea19c2955402183a66,
+          department: Editing,
+          id: 1280071,
+          job: Editor,
+          name: Lynne Willingham,
+          known_for_department: Editing,
+          original_name: Lynne Willingham,
+        },
+        {
+          credit_id: 52b7049c19c2953b63015013,
+          department: Camera,
+          id: 17948,
+          job: Director of Photography,
+          name: Reynaldo Villalobos,
+          gender: Male,
+          known_for_department: Camera,
+          original_name: Reynaldo Villalobos,
+        }
+      ],
+      episode_number: 4,
+      guest_stars: [
+        {
+          character: Mrs. Pinkman,
+          credit_id: 52542277760ee31328000a61,
+          id: 41249,
+          name: Tess Harper,
+          order: 188,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Tess Harper,
+        },
+        {
+          character: Steven Gomez,
+          credit_id: 5271b489760ee35b3e0881a7,
+          id: 61535,
+          name: Steven Michael Quezada,
+          order: 191,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Steven Michael Quezada,
+        },
+        {
+          character: Dr. Delcavoli,
+          credit_id: 5271b65b760ee35b0c090f74,
+          id: 79211,
+          name: David House,
+          order: 71,
+          profile_path: <non-empty>,
+          known_for_department: Acting,
+          original_name: David House,
+        },
+        {
+          character: Ken Wins,
+          credit_id: 52743e4d760ee35a69055194,
+          id: 1215836,
+          name: Kyle Bornheimer,
+          order: 37,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Kyle Bornheimer,
+        },
+        {
+          character: Skinny Pete,
+          credit_id: 52744007760ee356f6076365,
+          id: 82945,
+          name: Charles Baker,
+          order: 182,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Charles Baker,
+        },
+        {
+          character: Mr. Pinkman,
+          credit_id: 527440ce760ee3570906ada3,
+          id: 95195,
+          name: Michael Bofshever,
+          order: 75,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Michael Bofshever,
+        },
+        {
+          character: Jake Pinkman,
+          credit_id: 527442eb760ee3572b078715,
+          id: 220118,
+          name: Benjamin Petry,
+          order: 40,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Benjamin Petry,
+        }
+      ],
+      id: 62088,
+      name: Cancer Man,
+      overview: Walter finally tells his family that he has been stricken with cancer. Meanwhile, the DEA believes Albuquerque has a new, big time player to worry about. Meanwhile, a worthy recipient is the target of a depressed Walter's anger, and Jesse makes a surprise visit to his parents home.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_5,
+      crew: [
+        {
+          credit_id: 52542278760ee31328000aea,
+          department: Writing,
+          id: 1218856,
+          job: Writer,
+          name: Patty Lin,
+          gender: Female,
+          known_for_department: Writing,
+          original_name: Patty Lin,
+        },
+        {
+          credit_id: 52b7049c19c2953b63015013,
+          department: Camera,
+          id: 17948,
+          job: Director of Photography,
+          name: Reynaldo Villalobos,
+          gender: Male,
+          known_for_department: Camera,
+          original_name: Reynaldo Villalobos,
+        },
+        {
+          credit_id: 52b7051619c29533d00e8c79,
+          department: Editing,
+          id: 1280074,
+          job: Editor,
+          name: Kelley Dixon,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Editing,
+          original_name: Kelley Dixon,
+        },
+        {
+          credit_id: 5603c49292514122c00042fc,
+          department: Directing,
+          id: 1215145,
+          job: Director,
+          name: Tricia Brock,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Directing,
+          original_name: Tricia Brock,
+        }
+      ],
+      episode_number: 5,
+      guest_stars: [
+        {
+          character: Gretchen Schwartz,
+          credit_id: 52542275760ee31328000768,
+          id: 14984,
+          name: Jessica Hecht,
+          order: 182,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Jessica Hecht,
+        },
+        {
+          character: Elliott Schwartz,
+          credit_id: 527444c1760ee3572208fbc2,
+          id: 23429,
+          name: Adam Godley,
+          order: 182,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Adam Godley,
+        },
+        {
+          character: Badger,
+          credit_id: 52744535760ee3572209100e,
+          id: 191202,
+          name: Matt Jones,
+          order: 182,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Matt Jones,
+        },
+        {
+          character: Manager,
+          credit_id: 527445a9760ee356ff077e53,
+          id: 202830,
+          name: William Sterchi,
+          order: 43,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: William Sterchi,
+        },
+        {
+          character: Farley,
+          credit_id: 527445f5760ee357130849b9,
+          id: 59303,
+          name: Marc Mouchet,
+          order: 44,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Marc Mouchet,
+        },
+        {
+          character: Off Duty Cop,
+          credit_id: 54e89b13c3a36836e0001dc9,
+          id: 209680,
+          name: Frederic Doss,
+          order: 180,
+          known_for_department: Acting,
+          original_name: Frederic Doss,
+        }
+      ],
+      id: 62089,
+      name: Gray Matter,
+      overview: Walter and Skyler attend a former colleague's party. Jesse tries to free himself from the drugs, while Skyler organizes an intervention.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_6,
+      crew: [
+        {
+          credit_id: 52542279760ee31328000b45,
+          department: Writing,
+          id: 1223193,
+          job: Writer,
+          name: George Mastras,
+          gender: Male,
+          known_for_department: Writing,
+          original_name: George Mastras,
+        },
+        {
+          credit_id: 52542279760ee31328000b61,
+          department: Directing,
+          id: 18320,
+          job: Director,
+          name: Bronwen Hughes,
+          gender: Female,
+          known_for_department: Directing,
+          original_name: Bronwen Hughes,
+        },
+        {
+          credit_id: 52b7049c19c2953b63015013,
+          department: Camera,
+          id: 17948,
+          job: Director of Photography,
+          name: Reynaldo Villalobos,
+          gender: Male,
+          known_for_department: Camera,
+          original_name: Reynaldo Villalobos,
+        },
+        {
+          credit_id: 52b705e619c2955a1f0c895b,
+          department: Editing,
+          id: 1123195,
+          job: Editor,
+          name: Skip MacDonald,
+          known_for_department: Editing,
+          original_name: Skip MacDonald,
+        }
+      ],
+      episode_number: 6,
+      guest_stars: [
+        {
+          character: Carmen Molina,
+          credit_id: 52542273760ee31328000676,
+          id: 115688,
+          name: Carmen Serano,
+          order: 176,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Carmen Serano,
+        },
+        {
+          character: Tuco Salamanca,
+          credit_id: 5254227b760ee31328000cd6,
+          id: 58650,
+          name: Raymond Cruz,
+          order: 190,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Raymond Cruz,
+        },
+        {
+          character: Steven Gomez,
+          credit_id: 5271b489760ee35b3e0881a7,
+          id: 61535,
+          name: Steven Michael Quezada,
+          order: 191,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Steven Michael Quezada,
+        },
+        {
+          character: Skinny Pete,
+          credit_id: 52744007760ee356f6076365,
+          id: 82945,
+          name: Charles Baker,
+          order: 182,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Charles Baker,
+        },
+        {
+          character: Hugo Archuleta,
+          credit_id: 52744776760ee356ea0892f3,
+          id: 210056,
+          name: Pierre Barrera,
+          order: 44,
+          profile_path: <non-empty>,
+          known_for_department: Acting,
+          original_name: Pierre Barrera,
+        },
+        {
+          character: No-Doze,
+          credit_id: 527447b3760ee3571308a638,
+          id: 1260529,
+          name: Jesus Jr.,
+          order: 52,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Jesus Jr.,
+        },
+        {
+          character: Gonzo,
+          credit_id: 527447ca760ee356ea08e165,
+          id: 53255,
+          name: Cesar Garcia,
+          order: 52,
+          known_for_department: Acting,
+          original_name: Cesar Garcia,
+        },
+        {
+          character: Mrs. Pope,
+          credit_id: 527447f4760ee37c3e00f81f,
+          id: 187505,
+          name: Vivian Nesbitt,
+          order: 47,
+          profile_path: <non-empty>,
+          known_for_department: Acting,
+          original_name: Vivian Nesbitt,
+        },
+        {
+          character: Office Manager,
+          credit_id: 52744834760ee37c3e010cc7,
+          id: 210057,
+          name: Judith Rane,
+          order: 61,
+          profile_path: <non-empty>,
+          known_for_department: Acting,
+          original_name: Judith Rane,
+        },
+        {
+          character: Student,
+          credit_id: 52744908760ee35a690730ed,
+          id: 1089016,
+          name: Seri DeYoung,
+          order: 49,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Seri DeYoung,
+        },
+        {
+          character: Lookout,
+          credit_id: 52744a4a760ee35a69077c8c,
+          id: 1221121,
+          name: Dennis Keiffer,
+          order: 50,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Dennis Keiffer,
+        }
+      ],
+      id: 62090,
+      name: Crazy Handful of Nothin',
+      overview: The side effects of chemo begin to plague Walt. Meanwhile, the DEA rounds up suspected dealers.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    },
+    {
+      air_date: DateTime_7,
+      crew: [
+        {
+          credit_id: 5254227b760ee31328000d0c,
+          department: Directing,
+          id: 15858,
+          job: Director,
+          name: Tim Hunter,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Directing,
+          original_name: Tim Hunter,
+        },
+        {
+          credit_id: 52542286760ee31328001ab9,
+          department: Writing,
+          id: 24951,
+          job: Writer,
+          name: Peter Gould,
+          gender: Male,
+          known_for_department: Writing,
+          original_name: Peter Gould,
+        },
+        {
+          credit_id: 52b702ea19c2955402183a66,
+          department: Editing,
+          id: 1280071,
+          job: Editor,
+          name: Lynne Willingham,
+          known_for_department: Editing,
+          original_name: Lynne Willingham,
+        },
+        {
+          credit_id: 52b7049c19c2953b63015013,
+          department: Camera,
+          id: 17948,
+          job: Director of Photography,
+          name: Reynaldo Villalobos,
+          gender: Male,
+          known_for_department: Camera,
+          original_name: Reynaldo Villalobos,
+        }
+      ],
+      episode_number: 7,
+      guest_stars: [
+        {
+          character: Carmen Molina,
+          credit_id: 52542273760ee31328000676,
+          id: 115688,
+          name: Carmen Serano,
+          order: 176,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Carmen Serano,
+        },
+        {
+          character: Tuco Salamanca,
+          credit_id: 5254227b760ee31328000cd6,
+          id: 58650,
+          name: Raymond Cruz,
+          order: 190,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Raymond Cruz,
+        },
+        {
+          character: Dr. Delcavoli,
+          credit_id: 5271b65b760ee35b0c090f74,
+          id: 79211,
+          name: David House,
+          order: 71,
+          profile_path: <non-empty>,
+          known_for_department: Acting,
+          original_name: David House,
+        },
+        {
+          character: No-Doze,
+          credit_id: 527447b3760ee3571308a638,
+          id: 1260529,
+          name: Jesus Jr.,
+          order: 52,
+          profile_path: <non-empty>,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Jesus Jr.,
+        },
+        {
+          character: Gonzo,
+          credit_id: 527447ca760ee356ea08e165,
+          id: 53255,
+          name: Cesar Garcia,
+          order: 52,
+          known_for_department: Acting,
+          original_name: Cesar Garcia,
+        },
+        {
+          character: Realtor,
+          credit_id: 52744bd7760ee356ff08c286,
+          id: 967071,
+          name: Beth Bailey,
+          order: 50,
+          profile_path: <non-empty>,
+          gender: Female,
+          known_for_department: Acting,
+          original_name: Beth Bailey,
+        },
+        {
+          character: Police Officer,
+          credit_id: 52744c32760ee37c3e01cba4,
+          id: 58651,
+          name: Geoffrey Rivas,
+          order: 51,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Geoffrey Rivas,
+        },
+        {
+          character: Jewelry Store Owner,
+          credit_id: 52744cd0760ee357130a126e,
+          id: 210154,
+          name: Mike Miller,
+          order: 52,
+          gender: Male,
+          known_for_department: Acting,
+          original_name: Mike Miller,
+        }
+      ],
+      id: 62091,
+      name: A No-Rough-Stuff-Type Deal,
+      overview: Walter accepts his new identity as a drug dealer after a PTA meeting. Elsewhere, Jesse decides to put his aunt's house on the market and Skyler is the recipient of a baby shower.,
+      production_code: ,
+      season_number: 1,
+      still_path: <non-empty>,
+    }
+  ],
+  id: 3572,
+  name: Season 1,
+  overview: High school chemistry teacher Walter White's life is suddenly transformed by a dire medical diagnosis. Street-savvy former student Jesse Pinkman "teaches" Walter a new trade.,
+  poster_path: <non-empty>,
+  season_number: 1
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvSeasonTests.TestTvSeasonSeparateExtrasCreditsAsync.verified.txt b/TMDbLibTests/Verification/ClientTvSeasonTests.TestTvSeasonSeparateExtrasCreditsAsync.verified.txt
new file mode 100644
index 0000000..084d71b
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvSeasonTests.TestTvSeasonSeparateExtrasCreditsAsync.verified.txt
@@ -0,0 +1,253 @@
+{
+  cast: [
+    {
+      character: Walter White,
+      credit_id: 52542282760ee313280017f9,
+      id: 17419,
+      name: Bryan Cranston,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Bryan Cranston,
+    },
+    {
+      character: Skyler White,
+      credit_id: 52542282760ee3132800181b,
+      id: 134531,
+      name: Anna Gunn,
+      order: 2,
+      profile_path: <non-empty>,
+      gender: Female,
+      known_for_department: Acting,
+      original_name: Anna Gunn,
+    },
+    {
+      character: Jesse Pinkman,
+      credit_id: 52542282760ee31328001845,
+      id: 84497,
+      name: Aaron Paul,
+      order: 1,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Aaron Paul,
+    },
+    {
+      character: Hank Schrader,
+      credit_id: 52542283760ee3132800187b,
+      id: 14329,
+      name: Dean Norris,
+      order: 3,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Dean Norris,
+    },
+    {
+      character: Marie Schrader,
+      credit_id: 52542283760ee31328001891,
+      id: 1217934,
+      name: Betsy Brandt,
+      order: 7,
+      profile_path: <non-empty>,
+      gender: Female,
+      known_for_department: Acting,
+      original_name: Betsy Brandt,
+    },
+    {
+      character: Walter White Jr.,
+      credit_id: 52542284760ee313280018a9,
+      id: 209674,
+      name: RJ Mitte,
+      order: 8,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: RJ Mitte,
+    }
+  ],
+  crew: [
+    {
+      credit_id: 52542287760ee31328001af1,
+      department: Production,
+      id: 66633,
+      job: Executive Producer,
+      name: Vince Gilligan,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: Vince Gilligan,
+    },
+    {
+      credit_id: 52542287760ee31328001b07,
+      department: Production,
+      id: 1218856,
+      job: Producer,
+      name: Patty Lin,
+      gender: Female,
+      known_for_department: Writing,
+      original_name: Patty Lin,
+    },
+    {
+      credit_id: 52542287760ee31328001b27,
+      department: Production,
+      id: 29924,
+      job: Producer,
+      name: John Shiban,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: John Shiban,
+    },
+    {
+      credit_id: 52542287760ee31328001b69,
+      department: Production,
+      id: 5162,
+      job: Executive Producer,
+      name: Mark Johnson,
+      gender: Male,
+      known_for_department: Production,
+      original_name: Mark Johnson,
+    },
+    {
+      credit_id: 52542288760ee31328001b83,
+      department: Production,
+      id: 29779,
+      job: Executive Producer,
+      name: Michelle MacLaren,
+      gender: Female,
+      known_for_department: Directing,
+      original_name: Michelle MacLaren,
+    },
+    {
+      credit_id: 52542289760ee31328001b9d,
+      department: Production,
+      id: 1223199,
+      job: Producer,
+      name: Melissa Bernstein,
+      gender: Female,
+      known_for_department: Production,
+      original_name: Melissa Bernstein,
+    },
+    {
+      credit_id: 52542289760ee31328001bb3,
+      department: Production,
+      id: 1223194,
+      job: Producer,
+      name: Sam Catlin,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: Sam Catlin,
+    },
+    {
+      credit_id: 52542289760ee31328001bd1,
+      department: Production,
+      id: 24951,
+      job: Producer,
+      name: Peter Gould,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: Peter Gould,
+    },
+    {
+      credit_id: 52542289760ee31328001be9,
+      department: Production,
+      id: 1223193,
+      job: Producer,
+      name: George Mastras,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: George Mastras,
+    },
+    {
+      credit_id: 52542289760ee31328001c03,
+      department: Production,
+      id: 103009,
+      job: Producer,
+      name: Thomas Schnauz,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: Thomas Schnauz,
+    },
+    {
+      credit_id: 5254228a760ee31328001c1d,
+      department: Production,
+      id: 1223200,
+      job: Producer,
+      name: Stewart Lyons,
+      known_for_department: Production,
+      original_name: Stewart Lyons,
+    },
+    {
+      credit_id: 5254228c760ee31328001c37,
+      department: Production,
+      id: 1223201,
+      job: Producer,
+      name: Karen Moore,
+      known_for_department: Production,
+      original_name: Karen Moore,
+    },
+    {
+      credit_id: 5254228c760ee31328001c6d,
+      department: Production,
+      id: 1223198,
+      job: Producer,
+      name: Moira Walley-Beckett,
+      profile_path: <non-empty>,
+      gender: Female,
+      known_for_department: Writing,
+      original_name: Moira Walley-Beckett,
+    },
+    {
+      credit_id: 5254228d760ee31328001cc7,
+      department: Production,
+      id: 17419,
+      job: Producer,
+      name: Bryan Cranston,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Bryan Cranston,
+    },
+    {
+      credit_id: 5254228e760ee31328001ce1,
+      department: Production,
+      id: 1223202,
+      job: Producer,
+      name: Diane Mercer,
+      gender: Female,
+      known_for_department: Production,
+      original_name: Diane Mercer,
+    },
+    {
+      credit_id: 52b7008819c29559eb03dd72,
+      department: Sound,
+      id: 1280070,
+      job: Original Music Composer,
+      name: Dave Porter,
+      gender: Male,
+      known_for_department: Sound,
+      original_name: Dave Porter,
+    },
+    {
+      credit_id: 52b7020b19c295223b0a46e8,
+      department: Art,
+      id: 21640,
+      job: Production Design,
+      name: Robb Wilson King,
+      gender: Male,
+      known_for_department: Art,
+      original_name: Robb Wilson King,
+    },
+    {
+      credit_id: 52b7034f19c2955402184de6,
+      department: Costume & Make-Up,
+      id: 35583,
+      job: Costume Design,
+      name: Kathleen Detoro,
+      known_for_department: Costume & Make-Up,
+      original_name: Kathleen Detoro,
+    }
+  ],
+  id: 3572
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvSeasonTests.TestTvSeasonSeparateExtrasExternalIdsAsync.verified.txt b/TMDbLibTests/Verification/ClientTvSeasonTests.TestTvSeasonSeparateExtrasExternalIdsAsync.verified.txt
new file mode 100644
index 0000000..91c46b5
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvSeasonTests.TestTvSeasonSeparateExtrasExternalIdsAsync.verified.txt
@@ -0,0 +1,6 @@
+{
+  tvdb_id: 30272,
+  freebase_id: /en/breaking_bad_season_1,
+  freebase_mid: /m/05yy27m,
+  id: 3572
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvSeasonTests.TestTvSeasonSeparateExtrasVideosAsync.verified.txt b/TMDbLibTests/Verification/ClientTvSeasonTests.TestTvSeasonSeparateExtrasVideosAsync.verified.txt
new file mode 100644
index 0000000..071d0db
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvSeasonTests.TestTvSeasonSeparateExtrasVideosAsync.verified.txt
@@ -0,0 +1,10 @@
+{
+  id: 5c9b7e95c3a36841a341b9c6,
+  iso_3166_1: US,
+  iso_639_1: en,
+  key: BpJYNVhGf1s,
+  name: Game Of Thrones "The Game Begins" Preview (HBO),
+  site: YouTube,
+  size: 1080,
+  type: Trailer
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowExtrasAllAsync.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowExtrasAllAsync.verified.txt
new file mode 100644
index 0000000..9dd9779
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowExtrasAllAsync.verified.txt
@@ -0,0 +1,1023 @@
+{
+  account_states: {
+    id: 34,
+    rating: 5.0
+  },
+  alternative_titles: {
+    results: [
+      {
+        iso_3166_1: AU,
+        title: Roy Clarke's Keeping Up Appearances,
+        type: AKA
+      },
+      {
+        iso_3166_1: BE,
+        title: Schone schijn,
+        type: AKA
+      },
+      {
+        iso_3166_1: BG,
+        title: Какво ще кажат хората?!,
+        type: AKA
+      },
+      {
+        iso_3166_1: DE,
+        title: Mehr Schein als Sein,
+        type: AKA
+      },
+      {
+        iso_3166_1: DK,
+        title: Fint skal det være,
+        type: AKA
+      },
+      {
+        iso_3166_1: FI,
+        title: Pokka pitää,
+        type: 
+      },
+      {
+        iso_3166_1: HR,
+        title: Milostiva prije svega,
+        type: AKA
+      },
+      {
+        iso_3166_1: HU,
+        title: A külsőre adni kell,
+        type: AKA
+      },
+      {
+        iso_3166_1: NL,
+        title: Schone schijn,
+        type: 
+      },
+      {
+        iso_3166_1: NO,
+        title: Høy på pæra,
+        type: 
+      },
+      {
+        iso_3166_1: PL,
+        title: Co ludzie powiedza?,
+        type: 
+      },
+      {
+        iso_3166_1: PT,
+        title: Cuidado com as Aparências,
+        type: 
+      },
+      {
+        iso_3166_1: RS,
+        title: Napast,
+        type: 
+      },
+      {
+        iso_3166_1: RU,
+        title: Соблюдая приличия,
+        type: 
+      },
+      {
+        iso_3166_1: SE,
+        title: Skenet bedrar,
+        type: 
+      }
+    ]
+  },
+  backdrop_path: <non-empty>,
+  changes: {},
+  content_ratings: {
+    results: [
+      {
+        Iso_3166_1: US,
+        Rating: TV-PG
+      }
+    ]
+  },
+  created_by: [
+    {
+      id: 1212149,
+      credit_id: 5253317819c29579400156f0,
+      name: Roy Clarke,
+      gender: Male,
+      profile_path: <non-empty>
+    }
+  ],
+  credits: {
+    cast: [
+      {
+        character: Hyacinth Bucket,
+        credit_id: 5253316f19c29579400154c8,
+        id: 190391,
+        name: Patricia Routledge,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Patricia Routledge,
+      },
+      {
+        character: Elizabeth 'Liz' Warden,
+        credit_id: 5253317019c29579400154f8,
+        id: 1212171,
+        name: Josephine Tewson,
+        order: 4,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Josephine Tewson,
+      },
+      {
+        character: Rose,
+        credit_id: 5253317119c2957940015528,
+        id: 1212172,
+        name: Mary Millar,
+        order: 6,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Mary Millar,
+      },
+      {
+        character: Onslow,
+        credit_id: 5253317119c2957940015558,
+        id: 86107,
+        name: Geoffrey Hughes,
+        order: 3,
+        profile_path: <non-empty>,
+        gender: Male,
+        known_for_department: Acting,
+        original_name: Geoffrey Hughes,
+      },
+      {
+        character: Richard Bucket,
+        credit_id: 5253317119c295794001558c,
+        id: 33108,
+        name: Clive Swift,
+        order: 1,
+        profile_path: <non-empty>,
+        gender: Male,
+        known_for_department: Acting,
+        original_name: Clive Swift,
+      },
+      {
+        character: Daisy,
+        credit_id: 5253317119c29579400155cc,
+        id: 45455,
+        name: Judy Cornwell,
+        order: 2,
+        profile_path: <non-empty>,
+        gender: Female,
+        known_for_department: Acting,
+        original_name: Judy Cornwell,
+      },
+      {
+        character: Emmet,
+        credit_id: 5253317319c295794001562c,
+        id: 1212174,
+        name: David Griffin,
+        order: 5,
+        profile_path: <non-empty>,
+        gender: Male,
+        known_for_department: Acting,
+        original_name: David Griffin,
+      }
+    ],
+    crew: [
+      {
+        credit_id: 5253317819c29579400156fa,
+        department: Production,
+        id: 1212143,
+        job: Producer,
+        name: Harold Snoad,
+        profile_path: <non-empty>,
+        gender: Male,
+        known_for_department: Directing,
+        original_name: Harold Snoad,
+      }
+    ]
+  },
+  episode_run_time: [
+    30
+  ],
+  external_ids: {
+    imdb_id: tt0098837,
+    tvdb_id: 78079,
+    freebase_id: /en/keeping_up_appearances,
+    freebase_mid: /m/017g86,
+    id: 34,
+    tvrage_id: 64
+  },
+  first_air_date: DateTime_1,
+  genres: [
+    {
+      id: 35,
+      name: Comedy
+    }
+  ],
+  homepage: ,
+  id: 34,
+  images: {
+    backdrops: [
+      {
+        aspect_ratio: 1.777777777777778,
+        file_path: <non-empty>,
+        height: 1080,
+        width: 1920
+      },
+      {
+        aspect_ratio: 1.777777777777778,
+        file_path: <non-empty>,
+        height: 1080,
+        iso_639_1: en,
+        width: 1920
+      }
+    ],
+    posters: [
+      {
+        aspect_ratio: 0.6666666666666666,
+        file_path: <non-empty>,
+        height: 1500,
+        iso_639_1: en,
+        width: 1000
+      },
+      {
+        aspect_ratio: 0.6893580353295993,
+        file_path: <non-empty>,
+        height: 2321,
+        iso_639_1: pl,
+        width: 1600
+      },
+      {
+        aspect_ratio: 0.75,
+        file_path: <non-empty>,
+        height: 1440,
+        iso_639_1: en,
+        width: 1080
+      }
+    ]
+  },
+  keywords: {
+    results: [
+      {
+        id: 3577,
+        name: snob
+      },
+      {
+        id: 167948,
+        name: slob
+      },
+      {
+        id: 193171,
+        name: sitcom
+      },
+      {
+        id: 230521,
+        name: bouquet
+      }
+    ]
+  },
+  languages: [
+    en
+  ],
+  last_air_date: DateTime_2,
+  last_episode_to_air: {
+    air_date: DateTime_2,
+    name: The Hostess,
+    overview: Hyacinth has put an advert in the local newspaper  to teach people social etiquette, however an excited Hyacinth does not quite get what she expected.,
+    production_code: ,
+    still_path: <non-empty>,
+    id: 666,
+    season_number: 5,
+    episode_number: 10
+  },
+  name: Keeping Up Appearances,
+  networks: [
+    {
+      logo_path: <non-empty>,
+      id: 4,
+      name: BBC One,
+      origin_country: GB
+    }
+  ],
+  number_of_episodes: 40,
+  number_of_seasons: 5,
+  original_language: en,
+  original_name: Keeping Up Appearances,
+  origin_country: [
+    GB
+  ],
+  overview: 
+Keeping Up Appearances is a British sitcom created and written by Roy Clarke for the BBC. Centred on the life of eccentric, social-climbing snob Hyacinth Bucket, the sitcom follows her obsessive and determined attempts to impress in middle class society and portray herself as more affluent than she truly is.
+
+The show stars Patricia Routledge, who received two BAFTA nominations for her performance as Hyacinth. Broadcast between 1990 and 1995 on BBC One, the sitcom spawned five series and 44 episodes—4 of which are Christmas specials. Keeping Up Appearances was a great success in the UK and also captivated a large audience in the US, Canada, and Australia, but production ceased in 1995 when Routledge wanted to move on to other projects. Since its original release, all five series—including Christmas specials—are available on DVD. In 2004, the sitcom was ranked 12th in the countdown of Britain's Best Sitcom. It is regularly repeated worldwide.,
+  poster_path: <non-empty>,
+  production_companies: [
+    {
+      id: 3324,
+      name: BBC,
+      logo_path: <non-empty>,
+      origin_country: GB
+    }
+  ],
+  recommendations: {
+    id: 34,
+    results: [
+      {
+        backdrop_path: <non-empty>,
+        first_air_date: DateTime_3,
+        genre_ids: [
+          35
+        ],
+        id: 88,
+        name: As Time Goes By,
+        networks: [
+          {
+            id: 4,
+            name: BBC One,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: As Time Goes By,
+        origin_country: [
+          GB
+        ],
+        overview: Two lovers are reunited after decades apart following a mutual misunderstanding.,
+        poster_path: <non-empty>,
+      },
+      {
+        first_air_date: DateTime_4,
+        genre_ids: [
+          35
+        ],
+        id: 125,
+        name: To the Manor Born,
+        networks: [
+          {
+            id: 4,
+            name: BBC One,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: To the Manor Born,
+        origin_country: [
+          GB
+        ],
+        overview: Sitcom about the love-hate relationship between upper-class Audrey fforbes Hamilton and Richard DeVere, the nouveau rich businessman who buys her manor house when she can longer afford to keep it,
+        poster_path: <non-empty>,
+      },
+      {
+        backdrop_path: <non-empty>,
+        first_air_date: DateTime_5,
+        genre_ids: [
+          35
+        ],
+        id: 168,
+        name: Are You Being Served?,
+        networks: [
+          {
+            id: 4,
+            name: BBC One,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: Are You Being Served?,
+        origin_country: [
+          GB
+        ],
+        overview: Classic comedy set in fading department store Grace Brothers.,
+        poster_path: <non-empty>,
+      },
+      {
+        first_air_date: DateTime_6,
+        genre_ids: [
+          35
+        ],
+        id: 420,
+        name: Whatever Happened to the Likely Lads?,
+        networks: [
+          {
+            id: 4,
+            name: BBC One,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: Whatever Happened to the Likely Lads?,
+        origin_country: [
+          GB
+        ],
+        overview: 
+Whatever Happened to the Likely Lads? is a British sitcom which was broadcast between 9 January 1973 and 9 April 1974 on BBC1. It was the colour sequel to the mid-1960s hit The Likely Lads. It was created and written, as was its predecessor, by Dick Clement and Ian La Frenais. There were 26 television episodes over two series; and a subsequent 45-minute Christmas special was aired on 24 December 1974.
+
+The cast were reunited in 1975 for a BBC radio adaptation of series 1, transmitted on Radio 4 from July to October that year. In 1976, a feature film spin-off was made. Around the time of its release, however, Rodney Bewes and James Bolam fell out over a misunderstanding involving the press and have not spoken since. This long-suspected situation was finally confirmed by Bewes while promoting his autobiography in 2005. Unlike Bewes, Bolam is consistently reluctant to talk about the show, and has vetoed any attempt to revive his character.,
+        poster_path: <non-empty>,
+      },
+      {
+        backdrop_path: <non-empty>,
+        first_air_date: DateTime_7,
+        genre_ids: [
+          35
+        ],
+        id: 905,
+        name: French & Saunders,
+        networks: [
+          {
+            id: 4,
+            name: BBC One,
+            origin_country: GB
+          },
+          {
+            id: 332,
+            name: BBC Two,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: French & Saunders,
+        origin_country: [
+          GB
+        ],
+        overview: French and Saunders is a British sketch comedy television series written by and starring comic duo Dawn French and Jennifer Saunders. It is also the name by which the performers are known on the occasions when they appear elsewhere as a double act.,
+        poster_path: <non-empty>,
+      },
+      {
+        backdrop_path: <non-empty>,
+        first_air_date: DateTime_8,
+        genre_ids: [
+          35
+        ],
+        id: 1813,
+        name: Father Ted,
+        networks: [
+          {
+            id: 26,
+            name: Channel 4,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: Father Ted,
+        origin_country: [
+          GB
+        ],
+        overview: A crazy comedy about three rather strange parish priests exiled to Craggy Island, a remote island off the Irish west coast.,
+        poster_path: <non-empty>,
+      },
+      {
+        first_air_date: DateTime_9,
+        genre_ids: [
+          35
+        ],
+        id: 2040,
+        name: Spitting Image,
+        networks: [
+          {
+            id: 9,
+            name: ITV,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: Spitting Image,
+        origin_country: [
+          GB
+        ],
+        overview: 
+Spitting Image is an award winning British satirical puppet show, created by Peter Fluck, Roger Law and Martin Lambie-Nairn. The series was produced by Spitting Image Productions for Central Independent Television over 18 series which aired on the ITV from 1984 to 1996. The series was nominated and won numerous awards during its run including 10 BAFTA Awards, including one for editing in 1989, and even won two Emmy Awards in 1985 and 1986 in the Popular Arts Category.
+
+The series featured puppet caricatures of celebrities famous during the 1980s and 1990s, including British Prime Minister Margaret Thatcher and fellow Tory politicians, American president Ronald Reagan, and the British Royal Family. The Series was the first to caricature the Queen mother.
+
+The series was axed in 1996, after viewing figures declined. ITV had plans for a new series in 2006, but these were scrapped after a dispute over Ant & Dec puppets used to host the reviews "Best Ever Spitting Image", which were created against Roger Law's wishes.,
+        poster_path: <non-empty>,
+      },
+      {
+        backdrop_path: <non-empty>,
+        first_air_date: DateTime_10,
+        genre_ids: [
+          35
+        ],
+        id: 2180,
+        name: Open All Hours,
+        networks: [
+          {
+            id: 4,
+            name: BBC One,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: Open All Hours,
+        origin_country: [
+          GB
+        ],
+        overview: 
+Open All Hours is a BBC sitcom written by Roy Clarke and starring Ronnie Barker as a miserly shop keeper and David Jason as his put-upon nephew who works as his errand boy. It ran for 26 episodes in four series, which premiered in 1976, 1981, 1982 and 1985 respectively. The programme developed from a television pilot broadcast in Barker's comedy anthology series, Seven of One.
+
+Open All Hours ranked eighth in the 2004 Britain's Best Sitcom poll.,
+        poster_path: <non-empty>,
+      },
+      {
+        backdrop_path: <non-empty>,
+        first_air_date: DateTime_11,
+        genre_ids: [
+          35,
+          10768
+        ],
+        id: 2211,
+        name: 'Allo 'Allo!,
+        networks: [
+          {
+            id: 4,
+            name: BBC One,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: 'Allo 'Allo!,
+        origin_country: [
+          GB
+        ],
+        overview: The misadventures of hapless cafe owner René Artois and his escapades with the Resistance in occupied France.,
+        poster_path: <non-empty>,
+      },
+      {
+        backdrop_path: <non-empty>,
+        first_air_date: DateTime_12,
+        genre_ids: [
+          35
+        ],
+        id: 2292,
+        name: Porridge,
+        networks: [
+          {
+            id: 4,
+            name: BBC One,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: Porridge,
+        origin_country: [
+          GB
+        ],
+        overview: 
+Porridge is a British situation comedy broadcast on BBC1 from 1974 to 1977, running for three series, two Christmas specials and a feature film also titled Porridge. Written by Dick Clement and Ian La Frenais, it stars Ronnie Barker and Richard Beckinsale as two inmates at the fictional HMP Slade in Cumberland. "Doing porridge" is British slang for serving a prison sentence, porridge once being the traditional breakfast in UK prisons.
+
+The series was followed by a 1978 sequel, Going Straight, which established that Fletcher would not be going back to prison again. Porridge was voted number seven in a 2004 BBC poll of the 100 greatest British sitcoms.,
+        poster_path: <non-empty>,
+      },
+      {
+        backdrop_path: <non-empty>,
+        first_air_date: DateTime_13,
+        genre_ids: [
+          35,
+          80
+        ],
+        id: 2301,
+        name: The Thin Blue Line,
+        networks: [
+          {
+            id: 4,
+            name: BBC One,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: The Thin Blue Line,
+        origin_country: [
+          GB
+        ],
+        overview: The Thin Blue Line is a British sitcom starring Rowan Atkinson set in a police station that ran for two series on the BBC from 1995 to 1996. It was written by Ben Elton.,
+        poster_path: <non-empty>,
+      },
+      {
+        backdrop_path: <non-empty>,
+        first_air_date: DateTime_14,
+        genre_ids: [
+          35
+        ],
+        id: 2419,
+        name: George and Mildred,
+        networks: [
+          {
+            id: 9,
+            name: ITV,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: George and Mildred,
+        origin_country: [
+          GB
+        ],
+        overview: 
+George and Mildred is a British sitcom produced by Thames Television that aired from 1976 to 1979. It was a spin-off from Man About the House and starred Brian Murphy and Yootha Joyce as an ill-matched married couple, George and Mildred Roper. The premise of the series had George and Mildred leaving their flat as depicted in Man About the House and moving to a modern, upmarket housing estate. Their arrival horrifies their snobbish neighbour Jeffrey Fourmile, an estate agent who despairs that the Ropers' presence will devalue his home.
+
+It was written by Brian Cooke and Johnnie Mortimer. Like many sitcoms of the day, George and Mildred was also turned into a film, which was dedicated to actress Yootha Joyce who died suddenly in 1980, just as the cast had been looking forward to recording a sixth series.,
+        poster_path: <non-empty>,
+      },
+      {
+        backdrop_path: <non-empty>,
+        first_air_date: DateTime_15,
+        genre_ids: [
+          35
+        ],
+        id: 2767,
+        name: The Vicar of Dibley,
+        networks: [
+          {
+            id: 4,
+            name: BBC One,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: The Vicar of Dibley,
+        origin_country: [
+          GB
+        ],
+        overview: Reverend Granger is assigned as the Vicar of the rural parish of Dibley, but she is not quite what the villagers expected.,
+        poster_path: <non-empty>,
+      },
+      {
+        backdrop_path: <non-empty>,
+        first_air_date: DateTime_16,
+        genre_ids: [
+          37,
+          10759
+        ],
+        id: 3275,
+        name: Alias Smith and Jones,
+        networks: [
+          {
+            id: 2,
+            name: ABC,
+            origin_country: US
+          }
+        ],
+        original_language: en,
+        original_name: Alias Smith and Jones,
+        origin_country: [
+          US
+        ],
+        overview: Alias Smith and Jones is an American Western series that originally aired on ABC from 1971 to 1973. It stars Pete Duel as Hannibal Heyes and Ben Murphy as Jedediah "Kid" Curry, a pair of cousin outlaws trying to reform. The governor offers them a conditional amnesty, as he wants to keep the pact under wraps for political reasons. The condition is that they will still be wanted— until the governor can claim they have reformed and warrant clemency.,
+        poster_path: <non-empty>,
+      },
+      {
+        backdrop_path: <non-empty>,
+        first_air_date: DateTime_17,
+        genre_ids: [
+          35
+        ],
+        id: 3333,
+        name: Steptoe and Son,
+        networks: [
+          {
+            id: 4,
+            name: BBC One,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: Steptoe and Son,
+        origin_country: [
+          GB
+        ],
+        overview: Steptoe and Son is a British sitcom written by Ray Galton and Alan Simpson about a father and son played by Wilfred Brambell and Harry H. Corbett who deal in selling used items. They live on Oil Drum Lane, a fictional street in Shepherd's Bush, London. Four series were broadcast by the BBC from 1962 to 1965, followed by a second run from 1970 to 1974. Its theme tune, "Old Ned", was composed by Ron Grainer. The series was voted 15th in a 2004 BBC poll to find Britain's Best Sitcom. It was remade in the US as Sanford and Son, in Sweden as Albert & Herbert and in the Netherlands as Stiefbeen en zoon. In 1972 a movie adaptation of the series, Steptoe and Son, was released in cinemas, with a second Steptoe and Son Ride Again in 1973.,
+        poster_path: <non-empty>,
+      },
+      {
+        backdrop_path: <non-empty>,
+        first_air_date: DateTime_18,
+        genre_ids: [
+          35
+        ],
+        id: 4483,
+        name: The Young Ones,
+        networks: [
+          {
+            id: 332,
+            name: BBC Two,
+            origin_country: GB
+          },
+          {
+            id: 649,
+            name: VPRO,
+            origin_country: NL
+          }
+        ],
+        original_language: en,
+        original_name: The Young Ones,
+        origin_country: [
+          GB
+        ],
+        overview: The Young Ones is a British sitcom, broadcast in Great Britain from 1982 to 1984 in two six-part series. Shown on BBC2, it featured anarchic, offbeat humour which helped bring alternative comedy to television in the 1980s and made household names of its writers and performers. In 1985, it was shown on MTV, one of the first non-music television shows on the fledgling channel.,
+        poster_path: <non-empty>,
+      },
+      {
+        backdrop_path: <non-empty>,
+        first_air_date: DateTime_19,
+        genre_ids: [
+          35
+        ],
+        id: 4493,
+        name: Absolutely Fabulous,
+        networks: [
+          {
+            id: 4,
+            name: BBC One,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: Absolutely Fabulous,
+        origin_country: [
+          GB
+        ],
+        overview: Set in the world of fashion and PR, immature fun-loving mother Edina Monsoon and her best friend Patsy drive Eddie's sensible daughter, Saffron, up the wall with their constant drug abuse and outrageous selfishness. Numerous in-jokes and heavy doses of cruel humour have made this series a cult hit in the UK and abroad.,
+        poster_path: <non-empty>,
+      },
+      {
+        backdrop_path: <non-empty>,
+        first_air_date: DateTime_20,
+        genre_ids: [
+          35
+        ],
+        id: 4548,
+        name: One Foot in the Grave,
+        networks: [
+          {
+            id: 4,
+            name: BBC One,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: One Foot in the Grave,
+        origin_country: [
+          GB
+        ],
+        overview: One Foot in the Grave is a BBC television sitcom series  The series features the exploits of Victor Meldrew and his long-suffering wife, Margaret. The programmes invariably deal with Meldrew's battle against the problems he creates for himself. Living in a typical household in an unnamed English suburb, Victor takes involuntary early retirement. His various efforts to keep himself busy, while encountering various misfortunes and misunderstandings are the themes of the sitcom. The series was largely filmed on location in Walkford, near New Milton in Hampshire, although several clues show that the series may have been set in Hampshire – possibly Winchester. Despite its traditional production, the series supplants its domestic sitcom setting with elements of black humour and surrealism.,
+        poster_path: <non-empty>,
+      },
+      {
+        backdrop_path: <non-empty>,
+        first_air_date: DateTime_21,
+        genre_ids: [
+          18,
+          35,
+          10765
+        ],
+        id: 5632,
+        name: Goodnight Sweetheart,
+        networks: [
+          {
+            id: 4,
+            name: BBC One,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: Goodnight Sweetheart,
+        origin_country: [
+          GB
+        ],
+        overview: Gary Sparrow is an ordinary bloke in 1990s Britain, married to the ambitious Yvonne and working as a TV repairman. Then his whole world changes when he stumbles upon a portal to WWII-era London and begins a dual life as an accidental time traveler.,
+        poster_path: <non-empty>,
+      },
+      {
+        backdrop_path: <non-empty>,
+        first_air_date: DateTime_22,
+        genre_ids: [
+          35
+        ],
+        id: 5986,
+        name: Some Mothers Do 'Ave 'Em,
+        networks: [
+          {
+            id: 4,
+            name: BBC One,
+            origin_country: GB
+          }
+        ],
+        original_language: en,
+        original_name: Some Mothers Do 'Ave 'Em,
+        origin_country: [
+          GB
+        ],
+        overview: 
+Some Mothers Do 'Ave 'Em is a BBC situation comedy, written by Raymond Allen and starring Michael Crawford and Michele Dotrice. It was first broadcast in 1973 and ran for three series, ending in 1978.
+
+The series follows the accident-prone Frank Spencer and his tolerant, if long-suffering, wife, Betty, through Frank's various attempts to hold down a job, which frequently end in disaster.
+
+Noted for its stuntwork, performed by Michael Crawford himself as well as featuring various well-remembered catchphrases, the series was voted #22 in the BBC's poll "Britain's Best Sitcom".,
+        poster_path: <non-empty>,
+      }
+    ]
+  },
+  seasons: [
+    {
+      air_date: DateTime_23,
+      episode_count: 7,
+      id: 22,
+      name: Season 3,
+      overview: ,
+      poster_path: <non-empty>,
+      season_number: 3
+    },
+    {
+      air_date: DateTime_24,
+      episode_count: 10,
+      id: 23,
+      name: Season 2,
+      overview: ,
+      poster_path: <non-empty>,
+      season_number: 2
+    },
+    {
+      air_date: DateTime_1,
+      episode_count: 6,
+      id: 24,
+      name: Season 1,
+      overview: ,
+      poster_path: <non-empty>,
+      season_number: 1
+    },
+    {
+      air_date: DateTime_25,
+      episode_count: 10,
+      id: 25,
+      name: Season 5,
+      overview: ,
+      poster_path: <non-empty>,
+      season_number: 5
+    },
+    {
+      air_date: DateTime_26,
+      episode_count: 7,
+      id: 26,
+      name: Season 4,
+      overview: ,
+      poster_path: <non-empty>,
+      season_number: 4
+    },
+    {
+      air_date: DateTime_27,
+      episode_count: 14,
+      id: 27,
+      name: Specials,
+      overview: Christmas may come but once a year, but for arch-snob Hyacinth Bucket (pronounced Bouquet, if you please), disaster, drama and humiliation – all obstacles on the ladder to social-climbing success – are far more frequent. In these Christmas Specials we see a delightful cruise on the QE2 start in a less-than-delightful muddy field. We see a glorious English Civil War pageant, with Hyacinth as Queen Henrietta Maria, go royally wrong when the cast fails to turn up and her unsavoury relatives step into the breach. And we see that even The Season of Good Will isn’t immune from woe, as a sherry-fuelled Richard, dressed as Santa, brings Hyacinth tidings devoid of any comfort and joy.,
+      poster_path: <non-empty>
+    }
+  ],
+  spoken_languages: [
+    {
+      Iso_639_1: en,
+      Name: English
+    }
+  ],
+  status: Ended,
+  tagline: ,
+  type: Scripted,
+  watch/providers: {
+    results: {
+      AU: {
+        link: https://www.themoviedb.org/tv/34-keeping-up-appearances/watch?locale=AU,
+        flatrate: [
+          {
+            display_priority: 5,
+            logo_path: <non-empty>,
+            provider_id: 134,
+            provider_name: Foxtel Now
+          },
+          {
+            display_priority: 6,
+            logo_path: <non-empty>,
+            provider_id: 21,
+            provider_name: Stan
+          },
+          {
+            display_priority: 61,
+            logo_path: <non-empty>,
+            provider_id: 151,
+            provider_name: BritBox
+          }
+        ]
+      },
+      CA: {
+        link: https://www.themoviedb.org/tv/34-keeping-up-appearances/watch?locale=CA,
+        flatrate: [
+          {
+            display_priority: 61,
+            logo_path: <non-empty>,
+            provider_id: 151,
+            provider_name: BritBox
+          }
+        ],
+        buy: [
+          {
+            display_priority: 2,
+            logo_path: <non-empty>,
+            provider_id: 2,
+            provider_name: Apple iTunes
+          }
+        ]
+      },
+      DK: {
+        link: https://www.themoviedb.org/tv/34-keeping-up-appearances/watch?locale=DK,
+        flatrate: [
+          {
+            display_priority: 9,
+            logo_path: <non-empty>,
+            provider_id: 383,
+            provider_name: TV 2
+          }
+        ]
+      },
+      GB: {
+        link: https://www.themoviedb.org/tv/34-keeping-up-appearances/watch?locale=GB,
+        flatrate: [
+          {
+            display_priority: 3,
+            logo_path: <non-empty>,
+            provider_id: 39,
+            provider_name: Now TV
+          },
+          {
+            display_priority: 8,
+            logo_path: <non-empty>,
+            provider_id: 29,
+            provider_name: Sky Go
+          },
+          {
+            display_priority: 35,
+            logo_path: <non-empty>,
+            provider_id: 380,
+            provider_name: BritBox
+          }
+        ]
+      },
+      IE: {
+        link: https://www.themoviedb.org/tv/34-keeping-up-appearances/watch?locale=IE,
+        flatrate: [
+          {
+            display_priority: 3,
+            logo_path: <non-empty>,
+            provider_id: 39,
+            provider_name: Now TV
+          },
+          {
+            display_priority: 8,
+            logo_path: <non-empty>,
+            provider_id: 29,
+            provider_name: Sky Go
+          }
+        ]
+      },
+      US: {
+        link: https://www.themoviedb.org/tv/34-keeping-up-appearances/watch?locale=US,
+        flatrate: [
+          {
+            display_priority: 61,
+            logo_path: <non-empty>,
+            provider_id: 151,
+            provider_name: BritBox
+          },
+          {
+            display_priority: 117,
+            logo_path: <non-empty>,
+            provider_id: 197,
+            provider_name: BritBox Amazon Channel
+          }
+        ],
+        buy: [
+          {
+            display_priority: 2,
+            logo_path: <non-empty>,
+            provider_id: 2,
+            provider_name: Apple iTunes
+          },
+          {
+            display_priority: 3,
+            logo_path: <non-empty>,
+            provider_id: 3,
+            provider_name: Google Play Movies
+          },
+          {
+            display_priority: 10,
+            logo_path: <non-empty>,
+            provider_id: 10,
+            provider_name: Amazon Video
+          },
+          {
+            display_priority: 24,
+            logo_path: <non-empty>,
+            provider_id: 7,
+            provider_name: Vudu
+          }
+        ]
+      }
+    }
+  },
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowExtrasNoneAsync.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowExtrasNoneAsync.verified.txt
new file mode 100644
index 0000000..c3bc88d
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowExtrasNoneAsync.verified.txt
@@ -0,0 +1,142 @@
+{
+  backdrop_path: <non-empty>,
+  created_by: [
+    {
+      id: 66633,
+      credit_id: 52542286760ee31328001a7b,
+      name: Vince Gilligan,
+      gender: Male,
+      profile_path: <non-empty>
+    }
+  ],
+  episode_run_time: [
+    45,
+    47
+  ],
+  first_air_date: DateTime_1,
+  genres: [
+    {
+      id: 18,
+      name: Drama
+    }
+  ],
+  homepage: http://www.amc.com/shows/breaking-bad,
+  id: 1396,
+  languages: [
+    en
+  ],
+  last_air_date: DateTime_2,
+  last_episode_to_air: {
+    air_date: DateTime_2,
+    name: Felina,
+    overview: All bad things must come to an end.,
+    production_code: ,
+    still_path: <non-empty>,
+    id: 62161,
+    season_number: 5,
+    episode_number: 16
+  },
+  name: Breaking Bad,
+  networks: [
+    {
+      logo_path: <non-empty>,
+      id: 174,
+      name: AMC,
+      origin_country: US
+    }
+  ],
+  number_of_episodes: 62,
+  number_of_seasons: 5,
+  original_language: en,
+  original_name: Breaking Bad,
+  origin_country: [
+    US
+  ],
+  overview: When Walter White, a New Mexico chemistry teacher, is diagnosed with Stage III cancer and given a prognosis of only two years left to live. He becomes filled with a sense of fearlessness and an unrelenting desire to secure his family's financial future at any cost as he enters the dangerous world of drugs and crime.,
+  poster_path: <non-empty>,
+  production_companies: [
+    {
+      id: 2605,
+      name: Gran Via Productions,
+      origin_country: US
+    },
+    {
+      id: 11073,
+      name: Sony Pictures Television,
+      logo_path: <non-empty>,
+      origin_country: US
+    },
+    {
+      id: 33742,
+      name: High Bridge Entertainment,
+      origin_country: US
+    }
+  ],
+  seasons: [
+    {
+      air_date: DateTime_1,
+      episode_count: 7,
+      id: 3572,
+      name: Season 1,
+      overview: High school chemistry teacher Walter White's life is suddenly transformed by a dire medical diagnosis. Street-savvy former student Jesse Pinkman "teaches" Walter a new trade.,
+      poster_path: <non-empty>,
+      season_number: 1
+    },
+    {
+      air_date: DateTime_3,
+      episode_count: 13,
+      id: 3573,
+      name: Season 2,
+      overview: In the second season, Walt must deal with the chain reaction of his choice, as he and Jesse face new and severe consequences. When danger and suspicion around Walt escalate, he is pushed to new levels of desperation. Just how much higher will the stakes rise? How far is Walt willing to go to ensure his family's security? Will his grand plan spiral out of control?,
+      poster_path: <non-empty>,
+      season_number: 2
+    },
+    {
+      air_date: DateTime_4,
+      episode_count: 13,
+      id: 3575,
+      name: Season 3,
+      overview: In the third season, Walt continues to battle dueling identities: a desperate husband and father trying to provide for his family, and a newly appointed key player in the Albuquerque drug trade. As the danger around him escalates, Walt is now entrenched in the complex worlds of an angst-ridden family on the verge of dissolution, and the ruthless and unrelenting drug cartel.,
+      poster_path: <non-empty>,
+      season_number: 3
+    },
+    {
+      air_date: DateTime_5,
+      episode_count: 13,
+      id: 3576,
+      name: Season 4,
+      overview: This season, Walt and Jesse must cope with the fallout of their previous actions, both personally and professionally. Tension mounts as Walt faces a true standoff with his employer, Gus, with neither side willing or able to back down. Walt must also adjust to a new relationship with Skyler, whom while still reconciling her relationship with Walt, is committed to properly laundering Walt’s money and ensuring her sister Marie and an ailing Hank are financially stable.,
+      poster_path: <non-empty>,
+      season_number: 4
+    },
+    {
+      air_date: DateTime_6,
+      episode_count: 41,
+      id: 3577,
+      name: Specials,
+      overview: ,
+      poster_path: <non-empty>
+    },
+    {
+      air_date: DateTime_7,
+      episode_count: 16,
+      id: 3578,
+      name: Season 5,
+      overview: 
+In season five, Walt is faced with the prospect of moving on in a world without his enemy. As the pressure of a criminal life starts to build, Skyler struggles to keep Walt’s terrible secrets. Facing resistance from sometime adversary and former Fring lieutenant Mike, Walt tries to keep his world from falling apart even as his DEA Agent brother in law, Hank, finds numerous leads that could blaze a path straight to Walt. 
+
+All bad things must come to an end.,
+      poster_path: <non-empty>,
+      season_number: 5
+    }
+  ],
+  spoken_languages: [
+    {
+      Iso_639_1: en,
+      Name: English
+    }
+  ],
+  status: Ended,
+  tagline: Remember my name,
+  type: Scripted,
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowGetImagesWithImageLanguageAsync.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowGetImagesWithImageLanguageAsync.verified.txt
new file mode 100644
index 0000000..8915fca
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowGetImagesWithImageLanguageAsync.verified.txt
@@ -0,0 +1,16 @@
+{
+  backdrop: {
+    aspect_ratio: 1.777777777777778,
+    file_path: <non-empty>,
+    height: 1080,
+    iso_639_1: en,
+    width: 1920
+  },
+  poster: {
+    aspect_ratio: 0.6666666666666666,
+    file_path: <non-empty>,
+    height: 1800,
+    iso_639_1: en,
+    width: 1200
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowGetTvShowWithImageLanguageAsync.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowGetTvShowWithImageLanguageAsync.verified.txt
new file mode 100644
index 0000000..e382c3e
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowGetTvShowWithImageLanguageAsync.verified.txt
@@ -0,0 +1,9 @@
+{
+  poster: {
+    aspect_ratio: 0.6666666666666666,
+    file_path: <non-empty>,
+    height: 2100,
+    iso_639_1: pt,
+    width: 1400
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowRecommendationsAsync.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowRecommendationsAsync.verified.txt
new file mode 100644
index 0000000..89e9d4c
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowRecommendationsAsync.verified.txt
@@ -0,0 +1,18 @@
+{
+  first_air_date: DateTime_1,
+  name: Narcos,
+  original_name: Narcos,
+  origin_country: [
+    US
+  ],
+  backdrop_path: <non-empty>,
+  genre_ids: [
+    18,
+    80
+  ],
+  original_language: en,
+  overview: A gritty chronicle of the war against Colombia's infamously violent and powerful drug cartels.,
+  poster_path: <non-empty>,
+  id: 63351,
+  media_type: tv,
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowReviews.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowReviews.verified.txt
new file mode 100644
index 0000000..ca83d31
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowReviews.verified.txt
@@ -0,0 +1,6 @@
+{
+  author: slyone10001,
+  content: Wow....where to start. Not really into "DRUG" inspired shows. But this one had me from the start. The only bad about this show was the split seasons when it was a first run show. But now you can go right through to the next episode with out having to wait.....MUST WATCH ! !,
+  id: 5accdbe6c3a3687e2702d058,
+  url: https://www.themoviedb.org/review/5accdbe6c3a3687e2702d058
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeasonCountAsync.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeasonCountAsync.verified.txt
new file mode 100644
index 0000000..f07a8e7
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeasonCountAsync.verified.txt
@@ -0,0 +1,189 @@
+{
+  backdrop_path: <non-empty>,
+  created_by: [
+    {
+      id: 163461,
+      credit_id: 525710bf19c295731c03280b,
+      name: Marta Kauffman,
+      gender: Female,
+      profile_path: <non-empty>
+    },
+    {
+      id: 1216352,
+      credit_id: 525710bf19c295731c032811,
+      name: David Crane,
+      gender: Male,
+      profile_path: <non-empty>
+    }
+  ],
+  episode_run_time: [
+    25
+  ],
+  first_air_date: DateTime_1,
+  genres: [
+    {
+      id: 18,
+      name: Drama
+    },
+    {
+      id: 35,
+      name: Comedy
+    }
+  ],
+  homepage: ,
+  id: 1668,
+  languages: [
+    en
+  ],
+  last_air_date: DateTime_2,
+  last_episode_to_air: {
+    air_date: DateTime_2,
+    name: The Last One (2),
+    overview: Ross and Phoebe chase Rachel to the airport, but end up at the wrong one.  They narrowly make it to the right airport, where Ross declares his love for Rachel, but she gets on the plane anyway.  A rejected Ross returns home, where he finds a message on his answering machine, revealing that Rachel got off the plane, just as the real thing shows up behind him.  They decide to be together.  Meanwhile, Chandler and Monica finish packing for their move to the suburbs, and Joey loses Chick Jr. and Duck Jr. in the foosball table.,
+    production_code: 176267,
+    still_path: <non-empty>,
+    id: 87634,
+    season_number: 10,
+    episode_number: 18
+  },
+  name: Friends,
+  networks: [
+    {
+      logo_path: <non-empty>,
+      id: 6,
+      name: NBC,
+      origin_country: US
+    }
+  ],
+  number_of_episodes: 236,
+  number_of_seasons: 10,
+  original_language: en,
+  original_name: Friends,
+  origin_country: [
+    US
+  ],
+  overview: The misadventures of a group of friends as they navigate the pitfalls of work, life and love in Manhattan.,
+  poster_path: <non-empty>,
+  production_companies: [
+    {
+      id: 1957,
+      name: Warner Bros. Television,
+      logo_path: <non-empty>,
+      origin_country: US
+    },
+    {
+      id: 31810,
+      name: Bright/Kauffman/Crane Productions,
+      origin_country: US
+    }
+  ],
+  seasons: [
+    {
+      air_date: DateTime_1,
+      episode_count: 24,
+      id: 4573,
+      name: Season 1,
+      overview: Season 1 of the hit sitcom introduces us to hapless Ross, spoiled Rachel, quirky Chandler, dim-witted Joey, free-spirited Phoebe and uptight Monica.,
+      poster_path: <non-empty>,
+      season_number: 1
+    },
+    {
+      air_date: DateTime_3,
+      episode_count: 24,
+      id: 4574,
+      name: Season 2,
+      overview: Rachel gets jealous of Ross's new girlfriend, Monica dates an older man, and Joey stars on a soap opera as the hit sitcom hits its stride in Season 2.,
+      poster_path: <non-empty>,
+      season_number: 2
+    },
+    {
+      air_date: DateTime_4,
+      episode_count: 25,
+      id: 4575,
+      name: Season 3,
+      overview: ,
+      poster_path: <non-empty>,
+      season_number: 3
+    },
+    {
+      air_date: DateTime_5,
+      episode_count: 24,
+      id: 4576,
+      name: Season 4,
+      overview: Chandler makes amends to Joey by spending Thanksgiving in a box, Monica finally lands her dream job of head chef, and Phoebe supports her brother.,
+      poster_path: <non-empty>,
+      season_number: 4
+    },
+    {
+      air_date: DateTime_6,
+      episode_count: 24,
+      id: 4577,
+      name: Season 5,
+      overview: The friends continue to haphazardly navigate their way through Manhattan, landing in more improbable situations than anyone has a right to imagine.,
+      poster_path: <non-empty>,
+      season_number: 5
+    },
+    {
+      air_date: DateTime_7,
+      episode_count: 25,
+      id: 4578,
+      name: Season 6,
+      overview: In Season 6 of the Emmy-winning series, Ross doesn't tell Rachel that their accidental marriage was never annulled, but he does tell Phoebe.,
+      poster_path: <non-empty>,
+      season_number: 6
+    },
+    {
+      air_date: DateTime_8,
+      episode_count: 24,
+      id: 4579,
+      name: Season 7,
+      overview: Monica and Chandler prepare for their wedding but must deal with a competition between Rachel and Phoebe to be Monica's maid of honor.,
+      poster_path: <non-empty>,
+      season_number: 7
+    },
+    {
+      air_date: DateTime_9,
+      episode_count: 24,
+      id: 4580,
+      name: Season 8,
+      overview: Rachel is pregnant and faces single parenthood, while Joey agonizes over his feelings for her. Chandler and Monica are now dealing with married life.,
+      poster_path: <non-empty>,
+      season_number: 8
+    },
+    {
+      air_date: DateTime_10,
+      episode_count: 24,
+      id: 4581,
+      name: Season 9,
+      overview: Rachel finds herself surprisingly adept at taking care of Emma but struggles to define her complicated relationships with Joey and Ross.,
+      poster_path: <non-empty>,
+      season_number: 9
+    },
+    {
+      air_date: DateTime_11,
+      episode_count: 18,
+      id: 4582,
+      name: Season 10,
+      overview: The touching final season of this Emmy-winning sitcom wraps up the stories of the Manhattan sextet, including Ross and Rachel's on-and-off romance.,
+      poster_path: <non-empty>,
+      season_number: 10
+    },
+    {
+      air_date: DateTime_12,
+      episode_count: 39,
+      id: 4583,
+      name: Specials,
+      overview: Special features, bonus material, producer cuts of episodes and music videos released as part of the boxed set. Episode Order and information from the boxed set booklet and disk menus.,
+      poster_path: <non-empty>
+    }
+  ],
+  spoken_languages: [
+    {
+      Iso_639_1: en,
+      Name: English
+    }
+  ],
+  status: Ended,
+  tagline: I'll be there for you,
+  type: Scripted,
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasAlternativeTitlesAsync.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasAlternativeTitlesAsync.verified.txt
new file mode 100644
index 0000000..26e4ae8
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasAlternativeTitlesAsync.verified.txt
@@ -0,0 +1,25 @@
+{
+  id: 1396,
+  results: [
+    {
+      iso_3166_1: IL,
+      title: Shover shurot,
+      type: romanization
+    },
+    {
+      iso_3166_1: IR,
+      title: بدبیاری,
+      type: 
+    },
+    {
+      iso_3166_1: JP,
+      title: Bureikingu baddo,
+      type: romaji
+    },
+    {
+      iso_3166_1: PT,
+      title: Breaking Bad: Ruptura Total,
+      type: 
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasContentRatingsAsync.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasContentRatingsAsync.verified.txt
new file mode 100644
index 0000000..32e6d67
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasContentRatingsAsync.verified.txt
@@ -0,0 +1,49 @@
+{
+  id: 1396,
+  results: [
+    {
+      Iso_3166_1: AU,
+      Rating: MA15+
+    },
+    {
+      Iso_3166_1: BR,
+      Rating: 18
+    },
+    {
+      Iso_3166_1: DE,
+      Rating: 16
+    },
+    {
+      Iso_3166_1: ES,
+      Rating: 16
+    },
+    {
+      Iso_3166_1: FR,
+      Rating: 12
+    },
+    {
+      Iso_3166_1: GB,
+      Rating: 18
+    },
+    {
+      Iso_3166_1: HU,
+      Rating: 18
+    },
+    {
+      Iso_3166_1: KR,
+      Rating: 19
+    },
+    {
+      Iso_3166_1: NL,
+      Rating: 16
+    },
+    {
+      Iso_3166_1: PT,
+      Rating: 18
+    },
+    {
+      Iso_3166_1: US,
+      Rating: TV-MA
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasCreditsAsync.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasCreditsAsync.verified.txt
new file mode 100644
index 0000000..ef29099
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasCreditsAsync.verified.txt
@@ -0,0 +1,275 @@
+{
+  cast: [
+    {
+      character: Walter White,
+      credit_id: 52542282760ee313280017f9,
+      id: 17419,
+      name: Bryan Cranston,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Bryan Cranston,
+    },
+    {
+      character: Skyler White,
+      credit_id: 52542282760ee3132800181b,
+      id: 134531,
+      name: Anna Gunn,
+      order: 2,
+      profile_path: <non-empty>,
+      gender: Female,
+      known_for_department: Acting,
+      original_name: Anna Gunn,
+    },
+    {
+      character: Jesse Pinkman,
+      credit_id: 52542282760ee31328001845,
+      id: 84497,
+      name: Aaron Paul,
+      order: 1,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Aaron Paul,
+    },
+    {
+      character: Hank Schrader,
+      credit_id: 52542283760ee3132800187b,
+      id: 14329,
+      name: Dean Norris,
+      order: 3,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Dean Norris,
+    },
+    {
+      character: Marie Schrader,
+      credit_id: 52542283760ee31328001891,
+      id: 1217934,
+      name: Betsy Brandt,
+      order: 7,
+      profile_path: <non-empty>,
+      gender: Female,
+      known_for_department: Acting,
+      original_name: Betsy Brandt,
+    },
+    {
+      character: Walter White Jr.,
+      credit_id: 52542284760ee313280018a9,
+      id: 209674,
+      name: RJ Mitte,
+      order: 8,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: RJ Mitte,
+    },
+    {
+      character: Saul Goodman,
+      credit_id: 5271b180760ee35afc09bb8d,
+      id: 59410,
+      name: Bob Odenkirk,
+      order: 6,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Bob Odenkirk,
+    },
+    {
+      character: Mike Ehrmantraut,
+      credit_id: 5271b1e6760ee35af60941ad,
+      id: 783,
+      name: Jonathan Banks,
+      order: 5,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Jonathan Banks,
+    }
+  ],
+  crew: [
+    {
+      credit_id: 52542287760ee31328001af1,
+      department: Production,
+      id: 66633,
+      job: Executive Producer,
+      name: Vince Gilligan,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: Vince Gilligan,
+    },
+    {
+      credit_id: 52542287760ee31328001b07,
+      department: Production,
+      id: 1218856,
+      job: Producer,
+      name: Patty Lin,
+      gender: Female,
+      known_for_department: Writing,
+      original_name: Patty Lin,
+    },
+    {
+      credit_id: 52542287760ee31328001b27,
+      department: Production,
+      id: 29924,
+      job: Producer,
+      name: John Shiban,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: John Shiban,
+    },
+    {
+      credit_id: 52542287760ee31328001b69,
+      department: Production,
+      id: 5162,
+      job: Executive Producer,
+      name: Mark Johnson,
+      gender: Male,
+      known_for_department: Production,
+      original_name: Mark Johnson,
+    },
+    {
+      credit_id: 52542288760ee31328001b83,
+      department: Production,
+      id: 29779,
+      job: Executive Producer,
+      name: Michelle MacLaren,
+      gender: Female,
+      known_for_department: Directing,
+      original_name: Michelle MacLaren,
+    },
+    {
+      credit_id: 52542289760ee31328001b9d,
+      department: Production,
+      id: 1223199,
+      job: Producer,
+      name: Melissa Bernstein,
+      gender: Female,
+      known_for_department: Production,
+      original_name: Melissa Bernstein,
+    },
+    {
+      credit_id: 52542289760ee31328001bb3,
+      department: Production,
+      id: 1223194,
+      job: Producer,
+      name: Sam Catlin,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: Sam Catlin,
+    },
+    {
+      credit_id: 52542289760ee31328001bd1,
+      department: Production,
+      id: 24951,
+      job: Producer,
+      name: Peter Gould,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: Peter Gould,
+    },
+    {
+      credit_id: 52542289760ee31328001be9,
+      department: Production,
+      id: 1223193,
+      job: Producer,
+      name: George Mastras,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: George Mastras,
+    },
+    {
+      credit_id: 52542289760ee31328001c03,
+      department: Production,
+      id: 103009,
+      job: Producer,
+      name: Thomas Schnauz,
+      gender: Male,
+      known_for_department: Writing,
+      original_name: Thomas Schnauz,
+    },
+    {
+      credit_id: 5254228a760ee31328001c1d,
+      department: Production,
+      id: 1223200,
+      job: Producer,
+      name: Stewart Lyons,
+      known_for_department: Production,
+      original_name: Stewart Lyons,
+    },
+    {
+      credit_id: 5254228c760ee31328001c37,
+      department: Production,
+      id: 1223201,
+      job: Producer,
+      name: Karen Moore,
+      known_for_department: Production,
+      original_name: Karen Moore,
+    },
+    {
+      credit_id: 5254228c760ee31328001c6d,
+      department: Production,
+      id: 1223198,
+      job: Producer,
+      name: Moira Walley-Beckett,
+      profile_path: <non-empty>,
+      gender: Female,
+      known_for_department: Writing,
+      original_name: Moira Walley-Beckett,
+    },
+    {
+      credit_id: 5254228d760ee31328001cc7,
+      department: Production,
+      id: 17419,
+      job: Producer,
+      name: Bryan Cranston,
+      profile_path: <non-empty>,
+      gender: Male,
+      known_for_department: Acting,
+      original_name: Bryan Cranston,
+    },
+    {
+      credit_id: 5254228e760ee31328001ce1,
+      department: Production,
+      id: 1223202,
+      job: Producer,
+      name: Diane Mercer,
+      gender: Female,
+      known_for_department: Production,
+      original_name: Diane Mercer,
+    },
+    {
+      credit_id: 52b7008819c29559eb03dd72,
+      department: Sound,
+      id: 1280070,
+      job: Original Music Composer,
+      name: Dave Porter,
+      gender: Male,
+      known_for_department: Sound,
+      original_name: Dave Porter,
+    },
+    {
+      credit_id: 52b7020b19c295223b0a46e8,
+      department: Art,
+      id: 21640,
+      job: Production Design,
+      name: Robb Wilson King,
+      gender: Male,
+      known_for_department: Art,
+      original_name: Robb Wilson King,
+    },
+    {
+      credit_id: 52b7034f19c2955402184de6,
+      department: Costume & Make-Up,
+      id: 35583,
+      job: Costume Design,
+      name: Kathleen Detoro,
+      known_for_department: Costume & Make-Up,
+      original_name: Kathleen Detoro,
+    }
+  ],
+  id: 1396
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasExternalIdsAsync.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasExternalIdsAsync.verified.txt
new file mode 100644
index 0000000..af6de62
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasExternalIdsAsync.verified.txt
@@ -0,0 +1,11 @@
+{
+  imdb_id: tt0944947,
+  tvdb_id: 121361,
+  facebook_id: GameOfThrones,
+  twitter_id: GameOfThrones,
+  instagram_id: gameofthrones,
+  freebase_id: /en/game_of_thrones,
+  freebase_mid: /m/0524b41,
+  id: 1399,
+  tvrage_id: 24493
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasImagesAsync.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasImagesAsync.verified.txt
new file mode 100644
index 0000000..99de533
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasImagesAsync.verified.txt
@@ -0,0 +1,15 @@
+{
+  backdrop: {
+    aspect_ratio: 1.777251184834123,
+    file_path: <non-empty>,
+    height: 1688,
+    width: 3000
+  },
+  poster: {
+    aspect_ratio: 0.6666666666666666,
+    file_path: <non-empty>,
+    height: 1800,
+    iso_639_1: en,
+    width: 1200
+  }
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasKeywordsAsync.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasKeywordsAsync.verified.txt
new file mode 100644
index 0000000..a5fa2f7
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasKeywordsAsync.verified.txt
@@ -0,0 +1,4 @@
+{
+  id: 15484,
+  name: meth lab
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasTranslationsAsync.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasTranslationsAsync.verified.txt
new file mode 100644
index 0000000..72e7223
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasTranslationsAsync.verified.txt
@@ -0,0 +1,6 @@
+{
+  english_name: Danish,
+  iso_639_1: da,
+  iso_3166_1: DK,
+  name: Dansk
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasVideosAsync.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasVideosAsync.verified.txt
new file mode 100644
index 0000000..f379109
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSeparateExtrasVideosAsync.verified.txt
@@ -0,0 +1,10 @@
+{
+  id: 5759db2fc3a3683e7c003df7,
+  iso_3166_1: US,
+  iso_639_1: en,
+  key: XZ8daibM3AE,
+  name: BREAKING BAD - Seasons 1-5 Trailer,
+  site: YouTube,
+  size: 720,
+  type: Trailer
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSimilarsAsync.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSimilarsAsync.verified.txt
new file mode 100644
index 0000000..89e9d4c
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowSimilarsAsync.verified.txt
@@ -0,0 +1,18 @@
+{
+  first_air_date: DateTime_1,
+  name: Narcos,
+  original_name: Narcos,
+  origin_country: [
+    US
+  ],
+  backdrop_path: <non-empty>,
+  genre_ids: [
+    18,
+    80
+  ],
+  original_language: en,
+  overview: A gritty chronicle of the war against Colombia's infamously violent and powerful drug cartels.,
+  poster_path: <non-empty>,
+  id: 63351,
+  media_type: tv,
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowTranslationsAsync.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowTranslationsAsync.verified.txt
new file mode 100644
index 0000000..ae91836
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowTranslationsAsync.verified.txt
@@ -0,0 +1,251 @@
+{
+  id: 1396,
+  translations: [
+    {
+      english_name: Bulgarian,
+      iso_639_1: bg,
+      iso_3166_1: BG,
+      name: български език
+    },
+    {
+      english_name: Portuguese,
+      iso_639_1: pt,
+      iso_3166_1: BR,
+      name: Português
+    },
+    {
+      english_name: Bosnian,
+      iso_639_1: bs,
+      iso_3166_1: BS,
+      name: Bosanski
+    },
+    {
+      english_name: French,
+      iso_639_1: fr,
+      iso_3166_1: CA,
+      name: Français
+    },
+    {
+      english_name: Mandarin,
+      iso_639_1: zh,
+      iso_3166_1: CN,
+      name: 普通话
+    },
+    {
+      english_name: Czech,
+      iso_639_1: cs,
+      iso_3166_1: CZ,
+      name: Český
+    },
+    {
+      english_name: German,
+      iso_639_1: de,
+      iso_3166_1: DE,
+      name: Deutsch
+    },
+    {
+      english_name: Danish,
+      iso_639_1: da,
+      iso_3166_1: DK,
+      name: Dansk
+    },
+    {
+      english_name: Estonian,
+      iso_639_1: et,
+      iso_3166_1: EE,
+      name: Eesti
+    },
+    {
+      english_name: Spanish,
+      iso_639_1: es,
+      iso_3166_1: ES,
+      name: Español
+    },
+    {
+      english_name: Catalan,
+      iso_639_1: ca,
+      iso_3166_1: ES,
+      name: Català
+    },
+    {
+      english_name: Finnish,
+      iso_639_1: fi,
+      iso_3166_1: FI,
+      name: suomi
+    },
+    {
+      english_name: French,
+      iso_639_1: fr,
+      iso_3166_1: FR,
+      name: Français
+    },
+    {
+      english_name: Greek,
+      iso_639_1: el,
+      iso_3166_1: GR,
+      name: ελληνικά
+    },
+    {
+      english_name: Croatian,
+      iso_639_1: hr,
+      iso_3166_1: HR,
+      name: Hrvatski
+    },
+    {
+      english_name: Hungarian,
+      iso_639_1: hu,
+      iso_3166_1: HU,
+      name: Magyar
+    },
+    {
+      english_name: Indonesian,
+      iso_639_1: id,
+      iso_3166_1: ID,
+      name: Bahasa indonesia
+    },
+    {
+      english_name: Hebrew,
+      iso_639_1: he,
+      iso_3166_1: IL,
+      name: עִבְרִית
+    },
+    {
+      english_name: Persian,
+      iso_639_1: fa,
+      iso_3166_1: IR,
+      name: فارسی
+    },
+    {
+      english_name: Italian,
+      iso_639_1: it,
+      iso_3166_1: IT,
+      name: Italiano
+    },
+    {
+      english_name: Japanese,
+      iso_639_1: ja,
+      iso_3166_1: JP,
+      name: 日本語
+    },
+    {
+      english_name: Korean,
+      iso_639_1: ko,
+      iso_3166_1: KR,
+      name: 한국어/조선말
+    },
+    {
+      english_name: Lithuanian,
+      iso_639_1: lt,
+      iso_3166_1: LT,
+      name: Lietuvių
+    },
+    {
+      english_name: Latvian,
+      iso_639_1: lv,
+      iso_3166_1: LV,
+      name: Latviešu
+    },
+    {
+      english_name: Spanish,
+      iso_639_1: es,
+      iso_3166_1: MX,
+      name: Español
+    },
+    {
+      english_name: Dutch,
+      iso_639_1: nl,
+      iso_3166_1: NL,
+      name: Nederlands
+    },
+    {
+      english_name: Norwegian,
+      iso_639_1: no,
+      iso_3166_1: NO,
+      name: Norsk
+    },
+    {
+      english_name: Polish,
+      iso_639_1: pl,
+      iso_3166_1: PL,
+      name: Polski
+    },
+    {
+      english_name: Portuguese,
+      iso_639_1: pt,
+      iso_3166_1: PT,
+      name: Português
+    },
+    {
+      english_name: Romanian,
+      iso_639_1: ro,
+      iso_3166_1: RO,
+      name: Română
+    },
+    {
+      english_name: Serbian,
+      iso_639_1: sr,
+      iso_3166_1: RS,
+      name: Srpski
+    },
+    {
+      english_name: Russian,
+      iso_639_1: ru,
+      iso_3166_1: RU,
+      name: Pусский
+    },
+    {
+      english_name: Arabic,
+      iso_639_1: ar,
+      iso_3166_1: SA,
+      name: العربية
+    },
+    {
+      english_name: Swedish,
+      iso_639_1: sv,
+      iso_3166_1: SE,
+      name: svenska
+    },
+    {
+      english_name: Slovak,
+      iso_639_1: sk,
+      iso_3166_1: SK,
+      name: Slovenčina
+    },
+    {
+      english_name: Thai,
+      iso_639_1: th,
+      iso_3166_1: TH,
+      name: ภาษาไทย
+    },
+    {
+      english_name: Turkish,
+      iso_639_1: tr,
+      iso_3166_1: TR,
+      name: Türkçe
+    },
+    {
+      english_name: Mandarin,
+      iso_639_1: zh,
+      iso_3166_1: TW,
+      name: 普通话
+    },
+    {
+      english_name: Ukrainian,
+      iso_639_1: uk,
+      iso_3166_1: UA,
+      name: Український
+    },
+    {
+      english_name: English,
+      iso_639_1: en,
+      iso_3166_1: US,
+      name: English
+    },
+    {
+      english_name: Vietnamese,
+      iso_639_1: vi,
+      iso_3166_1: VN,
+      name: Tiếng Việt
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowVideosAsync.verified.txt b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowVideosAsync.verified.txt
new file mode 100644
index 0000000..6c6aee7
--- /dev/null
+++ b/TMDbLibTests/Verification/ClientTvShowTests.TestTvShowVideosAsync.verified.txt
@@ -0,0 +1,233 @@
+{
+  backdrop_path: <non-empty>,
+  created_by: [
+    {
+      id: 163461,
+      credit_id: 525710bf19c295731c03280b,
+      name: Marta Kauffman,
+      gender: Female,
+      profile_path: <non-empty>
+    },
+    {
+      id: 1216352,
+      credit_id: 525710bf19c295731c032811,
+      name: David Crane,
+      gender: Male,
+      profile_path: <non-empty>
+    }
+  ],
+  episode_run_time: [
+    25
+  ],
+  first_air_date: DateTime_1,
+  genres: [
+    {
+      id: 18,
+      name: Drama
+    },
+    {
+      id: 35,
+      name: Comedy
+    }
+  ],
+  homepage: ,
+  id: 1668,
+  languages: [
+    en
+  ],
+  last_air_date: DateTime_2,
+  last_episode_to_air: {
+    air_date: DateTime_2,
+    name: The Last One (2),
+    overview: Ross and Phoebe chase Rachel to the airport, but end up at the wrong one.  They narrowly make it to the right airport, where Ross declares his love for Rachel, but she gets on the plane anyway.  A rejected Ross returns home, where he finds a message on his answering machine, revealing that Rachel got off the plane, just as the real thing shows up behind him.  They decide to be together.  Meanwhile, Chandler and Monica finish packing for their move to the suburbs, and Joey loses Chick Jr. and Duck Jr. in the foosball table.,
+    production_code: 176267,
+    still_path: <non-empty>,
+    id: 87634,
+    season_number: 10,
+    episode_number: 18
+  },
+  name: Friends,
+  networks: [
+    {
+      logo_path: <non-empty>,
+      id: 6,
+      name: NBC,
+      origin_country: US
+    }
+  ],
+  number_of_episodes: 236,
+  number_of_seasons: 10,
+  original_language: en,
+  original_name: Friends,
+  origin_country: [
+    US
+  ],
+  overview: The misadventures of a group of friends as they navigate the pitfalls of work, life and love in Manhattan.,
+  poster_path: <non-empty>,
+  production_companies: [
+    {
+      id: 1957,
+      name: Warner Bros. Television,
+      logo_path: <non-empty>,
+      origin_country: US
+    },
+    {
+      id: 31810,
+      name: Bright/Kauffman/Crane Productions,
+      origin_country: US
+    }
+  ],
+  seasons: [
+    {
+      air_date: DateTime_1,
+      episode_count: 24,
+      id: 4573,
+      name: Season 1,
+      overview: Season 1 of the hit sitcom introduces us to hapless Ross, spoiled Rachel, quirky Chandler, dim-witted Joey, free-spirited Phoebe and uptight Monica.,
+      poster_path: <non-empty>,
+      season_number: 1
+    },
+    {
+      air_date: DateTime_3,
+      episode_count: 24,
+      id: 4574,
+      name: Season 2,
+      overview: Rachel gets jealous of Ross's new girlfriend, Monica dates an older man, and Joey stars on a soap opera as the hit sitcom hits its stride in Season 2.,
+      poster_path: <non-empty>,
+      season_number: 2
+    },
+    {
+      air_date: DateTime_4,
+      episode_count: 25,
+      id: 4575,
+      name: Season 3,
+      overview: ,
+      poster_path: <non-empty>,
+      season_number: 3
+    },
+    {
+      air_date: DateTime_5,
+      episode_count: 24,
+      id: 4576,
+      name: Season 4,
+      overview: Chandler makes amends to Joey by spending Thanksgiving in a box, Monica finally lands her dream job of head chef, and Phoebe supports her brother.,
+      poster_path: <non-empty>,
+      season_number: 4
+    },
+    {
+      air_date: DateTime_6,
+      episode_count: 24,
+      id: 4577,
+      name: Season 5,
+      overview: The friends continue to haphazardly navigate their way through Manhattan, landing in more improbable situations than anyone has a right to imagine.,
+      poster_path: <non-empty>,
+      season_number: 5
+    },
+    {
+      air_date: DateTime_7,
+      episode_count: 25,
+      id: 4578,
+      name: Season 6,
+      overview: In Season 6 of the Emmy-winning series, Ross doesn't tell Rachel that their accidental marriage was never annulled, but he does tell Phoebe.,
+      poster_path: <non-empty>,
+      season_number: 6
+    },
+    {
+      air_date: DateTime_8,
+      episode_count: 24,
+      id: 4579,
+      name: Season 7,
+      overview: Monica and Chandler prepare for their wedding but must deal with a competition between Rachel and Phoebe to be Monica's maid of honor.,
+      poster_path: <non-empty>,
+      season_number: 7
+    },
+    {
+      air_date: DateTime_9,
+      episode_count: 24,
+      id: 4580,
+      name: Season 8,
+      overview: Rachel is pregnant and faces single parenthood, while Joey agonizes over his feelings for her. Chandler and Monica are now dealing with married life.,
+      poster_path: <non-empty>,
+      season_number: 8
+    },
+    {
+      air_date: DateTime_10,
+      episode_count: 24,
+      id: 4581,
+      name: Season 9,
+      overview: Rachel finds herself surprisingly adept at taking care of Emma but struggles to define her complicated relationships with Joey and Ross.,
+      poster_path: <non-empty>,
+      season_number: 9
+    },
+    {
+      air_date: DateTime_11,
+      episode_count: 18,
+      id: 4582,
+      name: Season 10,
+      overview: The touching final season of this Emmy-winning sitcom wraps up the stories of the Manhattan sextet, including Ross and Rachel's on-and-off romance.,
+      poster_path: <non-empty>,
+      season_number: 10
+    },
+    {
+      air_date: DateTime_12,
+      episode_count: 39,
+      id: 4583,
+      name: Specials,
+      overview: Special features, bonus material, producer cuts of episodes and music videos released as part of the boxed set. Episode Order and information from the boxed set booklet and disk menus.,
+      poster_path: <non-empty>
+    }
+  ],
+  spoken_languages: [
+    {
+      Iso_639_1: en,
+      Name: English
+    }
+  ],
+  status: Ended,
+  tagline: I'll be there for you,
+  type: Scripted,
+  videos: {
+    results: [
+      {
+        id: 552e1b53c3a3686c4e00207b,
+        iso_3166_1: US,
+        iso_639_1: en,
+        key: lGTOru7pwL8,
+        name: F.R.I.E.N.D.S - Opening Season 10,
+        site: YouTube,
+        size: 360,
+        type: Opening Credits
+      },
+      {
+        id: 5ade29b3c3a36876f6002c61,
+        iso_3166_1: US,
+        iso_639_1: en,
+        key: TgP8v60X23c,
+        name: Friends - HD - Opening Credits - Season One,
+        site: YouTube,
+        size: 1080,
+        type: Opening Credits
+      },
+      {
+        id: 5fa7158b6e3deb004548ffe6,
+        iso_3166_1: US,
+        iso_639_1: en,
+        key: gk5mmrCVwSc,
+        name: Phoebe Buffay’s Shocking Life Story | Friends | HBO Max,
+        site: YouTube,
+        size: 1080,
+        type: Featurette
+      },
+      {
+        id: 5fe8c3ed1d3563003ddb29fc,
+        iso_3166_1: US,
+        iso_639_1: en,
+        key: hDNNmeeJs1Q,
+        name: F.R.I.E.N.D.S Trailer: Season 1 - 4,
+        site: YouTube,
+        size: 1080,
+        type: Trailer
+      }
+    ]
+  },
+}
\ No newline at end of file
diff --git a/TestApplication/Program.cs b/TestApplication/Program.cs
index e39302a..3bfb1c6 100644
--- a/TestApplication/Program.cs
+++ b/TestApplication/Program.cs
@@ -52,7 +52,7 @@ namespace TestApplication
             else
             {
                 Console.WriteLine("Getting new config");
-                var config = await client.GetConfigAsync();
+                TMDbConfig config = await client.GetConfigAsync();
 
                 Console.WriteLine("Storing config");
                 string json = JsonConvert.SerializeObject(config);