diff --git a/achievement_test.go b/achievement_test.go
index 4f23c31..cccfa21 100644
--- a/achievement_test.go
+++ b/achievement_test.go
@@ -21,7 +21,10 @@ func TestAchievementService_Get(t *testing.T) {
 	}
 
 	init := make([]*Achievement, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name            string
@@ -64,7 +67,10 @@ func TestAchievementService_List(t *testing.T) {
 	}
 
 	init := make([]*Achievement, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name             string
@@ -108,7 +114,10 @@ func TestAchievementService_Index(t *testing.T) {
 	}
 
 	init := make([]*Achievement, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name             string
diff --git a/achievementicon_test.go b/achievementicon_test.go
index 7757da8..fa255d3 100644
--- a/achievementicon_test.go
+++ b/achievementicon_test.go
@@ -21,7 +21,10 @@ func TestAchievementIconService_Get(t *testing.T) {
 	}
 
 	init := make([]*AchievementIcon, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                string
@@ -64,7 +67,10 @@ func TestAchievementIconService_List(t *testing.T) {
 	}
 
 	init := make([]*AchievementIcon, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                 string
@@ -108,7 +114,10 @@ func TestAchievementIconService_Index(t *testing.T) {
 	}
 
 	init := make([]*AchievementIcon, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                 string
diff --git a/agerating_test.go b/agerating_test.go
index 218d718..8608a90 100644
--- a/agerating_test.go
+++ b/agerating_test.go
@@ -21,7 +21,10 @@ func TestAgeRatingService_Get(t *testing.T) {
 	}
 
 	init := make([]*AgeRating, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name          string
@@ -64,7 +67,10 @@ func TestAgeRatingService_List(t *testing.T) {
 	}
 
 	init := make([]*AgeRating, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name           string
@@ -108,7 +114,10 @@ func TestAgeRatingService_Index(t *testing.T) {
 	}
 
 	init := make([]*AgeRating, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name           string
diff --git a/ageratingcontent_test.go b/ageratingcontent_test.go
index 592d75f..7205a8a 100644
--- a/ageratingcontent_test.go
+++ b/ageratingcontent_test.go
@@ -21,7 +21,10 @@ func TestAgeRatingContentService_Get(t *testing.T) {
 	}
 
 	init := make([]*AgeRatingContent, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                 string
@@ -64,7 +67,10 @@ func TestAgeRatingContentService_List(t *testing.T) {
 	}
 
 	init := make([]*AgeRatingContent, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                  string
@@ -108,7 +114,10 @@ func TestAgeRatingContentService_Index(t *testing.T) {
 	}
 
 	init := make([]*AgeRatingContent, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                  string
diff --git a/alternativename_test.go b/alternativename_test.go
index 4bf2283..58086aa 100644
--- a/alternativename_test.go
+++ b/alternativename_test.go
@@ -21,7 +21,10 @@ func TestAlternativeNameService_Get(t *testing.T) {
 	}
 
 	init := make([]*AlternativeName, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                string
@@ -64,7 +67,10 @@ func TestAlternativeNameService_List(t *testing.T) {
 	}
 
 	init := make([]*AlternativeName, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                 string
@@ -108,7 +114,10 @@ func TestAlternativeNameService_Index(t *testing.T) {
 	}
 
 	init := make([]*AlternativeName, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                 string
diff --git a/artwork_test.go b/artwork_test.go
index b50d715..281e407 100644
--- a/artwork_test.go
+++ b/artwork_test.go
@@ -21,7 +21,10 @@ func TestArtworkService_Get(t *testing.T) {
 	}
 
 	init := make([]*Artwork, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name        string
@@ -64,7 +67,10 @@ func TestArtworkService_List(t *testing.T) {
 	}
 
 	init := make([]*Artwork, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name         string
@@ -108,7 +114,10 @@ func TestArtworkService_Index(t *testing.T) {
 	}
 
 	init := make([]*Artwork, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name         string
diff --git a/character_test.go b/character_test.go
index 34cd282..e1ca2fe 100644
--- a/character_test.go
+++ b/character_test.go
@@ -22,7 +22,10 @@ func TestCharacterService_Get(t *testing.T) {
 	}
 
 	init := make([]*Character, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name          string
@@ -65,7 +68,10 @@ func TestCharacterService_List(t *testing.T) {
 	}
 
 	init := make([]*Character, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name           string
@@ -109,7 +115,10 @@ func TestCharacterService_Index(t *testing.T) {
 	}
 
 	init := make([]*Character, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name           string
@@ -150,7 +159,10 @@ func TestCharacterService_Search(t *testing.T) {
 	}
 
 	init := make([]*Character, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name           string
diff --git a/charactermugshot_test.go b/charactermugshot_test.go
index 30bc682..7cdd3f7 100644
--- a/charactermugshot_test.go
+++ b/charactermugshot_test.go
@@ -21,7 +21,10 @@ func TestCharacterMugshotService_Get(t *testing.T) {
 	}
 
 	init := make([]*CharacterMugshot, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                 string
@@ -64,7 +67,10 @@ func TestCharacterMugshotService_List(t *testing.T) {
 	}
 
 	init := make([]*CharacterMugshot, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                  string
@@ -108,7 +114,10 @@ func TestCharacterMugshotService_Index(t *testing.T) {
 	}
 
 	init := make([]*CharacterMugshot, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                  string
diff --git a/collection_test.go b/collection_test.go
index ee38968..34dced2 100644
--- a/collection_test.go
+++ b/collection_test.go
@@ -22,7 +22,10 @@ func TestCollectionService_Get(t *testing.T) {
 	}
 
 	init := make([]*Collection, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name           string
@@ -65,7 +68,10 @@ func TestCollectionService_List(t *testing.T) {
 	}
 
 	init := make([]*Collection, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name            string
@@ -109,7 +115,10 @@ func TestCollectionService_Index(t *testing.T) {
 	}
 
 	init := make([]*Collection, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name            string
@@ -150,7 +159,10 @@ func TestCollectionService_Search(t *testing.T) {
 	}
 
 	init := make([]*Collection, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name            string
diff --git a/company_test.go b/company_test.go
index 821aaa6..e693a3c 100644
--- a/company_test.go
+++ b/company_test.go
@@ -21,7 +21,10 @@ func TestCompanyService_Get(t *testing.T) {
 	}
 
 	init := make([]*Company, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name        string
@@ -64,7 +67,10 @@ func TestCompanyService_List(t *testing.T) {
 	}
 
 	init := make([]*Company, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name          string
@@ -108,7 +114,10 @@ func TestCompanyService_Index(t *testing.T) {
 	}
 
 	init := make([]*Company, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name          string
diff --git a/companylogo_test.go b/companylogo_test.go
index f5c4550..fac95ea 100644
--- a/companylogo_test.go
+++ b/companylogo_test.go
@@ -21,7 +21,10 @@ func TestCompanyLogoService_Get(t *testing.T) {
 	}
 
 	init := make([]*CompanyLogo, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name            string
@@ -64,7 +67,10 @@ func TestCompanyLogoService_List(t *testing.T) {
 	}
 
 	init := make([]*CompanyLogo, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name             string
@@ -108,7 +114,10 @@ func TestCompanyLogoService_Index(t *testing.T) {
 	}
 
 	init := make([]*CompanyLogo, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name             string
diff --git a/companywebsite_test.go b/companywebsite_test.go
index d81f20d..96017ec 100644
--- a/companywebsite_test.go
+++ b/companywebsite_test.go
@@ -21,7 +21,10 @@ func TestCompanyWebsiteService_Get(t *testing.T) {
 	}
 
 	init := make([]*CompanyWebsite, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name               string
@@ -64,7 +67,10 @@ func TestCompanyWebsiteService_List(t *testing.T) {
 	}
 
 	init := make([]*CompanyWebsite, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                string
@@ -108,7 +114,10 @@ func TestCompanyWebsiteService_Index(t *testing.T) {
 	}
 
 	init := make([]*CompanyWebsite, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                string
diff --git a/cover_test.go b/cover_test.go
index d37c689..853c239 100644
--- a/cover_test.go
+++ b/cover_test.go
@@ -21,7 +21,10 @@ func TestCoverService_Get(t *testing.T) {
 	}
 
 	init := make([]*Cover, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name      string
@@ -64,7 +67,10 @@ func TestCoverService_List(t *testing.T) {
 	}
 
 	init := make([]*Cover, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name       string
@@ -108,7 +114,10 @@ func TestCoverService_Index(t *testing.T) {
 	}
 
 	init := make([]*Cover, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name       string
diff --git a/credit_test.go b/credit_test.go
index f9929bd..ef0f0f1 100644
--- a/credit_test.go
+++ b/credit_test.go
@@ -21,7 +21,10 @@ func TestCreditService_Get(t *testing.T) {
 	}
 
 	init := make([]*Credit, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name       string
@@ -64,7 +67,10 @@ func TestCreditService_List(t *testing.T) {
 	}
 
 	init := make([]*Credit, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name        string
@@ -108,7 +114,10 @@ func TestCreditService_Index(t *testing.T) {
 	}
 
 	init := make([]*Credit, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name        string
diff --git a/externalgame_test.go b/externalgame_test.go
index ccce9f2..42fae25 100644
--- a/externalgame_test.go
+++ b/externalgame_test.go
@@ -21,7 +21,10 @@ func TestExternalGameService_Get(t *testing.T) {
 	}
 
 	init := make([]*ExternalGame, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name             string
@@ -64,7 +67,10 @@ func TestExternalGameService_List(t *testing.T) {
 	}
 
 	init := make([]*ExternalGame, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name              string
@@ -108,7 +114,10 @@ func TestExternalGameService_Index(t *testing.T) {
 	}
 
 	init := make([]*ExternalGame, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name              string
diff --git a/feed_test.go b/feed_test.go
index 85d9bab..cd328c6 100644
--- a/feed_test.go
+++ b/feed_test.go
@@ -21,7 +21,10 @@ func TestFeedService_Get(t *testing.T) {
 	}
 
 	init := make([]*Feed, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name     string
@@ -64,7 +67,10 @@ func TestFeedService_List(t *testing.T) {
 	}
 
 	init := make([]*Feed, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name      string
@@ -108,7 +114,10 @@ func TestFeedService_Index(t *testing.T) {
 	}
 
 	init := make([]*Feed, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name      string
diff --git a/feedfollow_test.go b/feedfollow_test.go
index 74d3760..5966302 100644
--- a/feedfollow_test.go
+++ b/feedfollow_test.go
@@ -21,7 +21,10 @@ func TestFeedFollowService_Get(t *testing.T) {
 	}
 
 	init := make([]*FeedFollow, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name           string
@@ -64,7 +67,10 @@ func TestFeedFollowService_List(t *testing.T) {
 	}
 
 	init := make([]*FeedFollow, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name            string
@@ -108,7 +114,10 @@ func TestFeedFollowService_Index(t *testing.T) {
 	}
 
 	init := make([]*FeedFollow, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name            string
diff --git a/follow_test.go b/follow_test.go
index bf37ccf..c4bc7dc 100644
--- a/follow_test.go
+++ b/follow_test.go
@@ -21,7 +21,10 @@ func TestFollowService_Get(t *testing.T) {
 	}
 
 	init := make([]*Follow, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name       string
@@ -64,7 +67,10 @@ func TestFollowService_List(t *testing.T) {
 	}
 
 	init := make([]*Follow, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name        string
@@ -108,7 +114,10 @@ func TestFollowService_Index(t *testing.T) {
 	}
 
 	init := make([]*Follow, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name        string
diff --git a/franchise_test.go b/franchise_test.go
index e265d26..af9911e 100644
--- a/franchise_test.go
+++ b/franchise_test.go
@@ -21,7 +21,10 @@ func TestFranchiseService_Get(t *testing.T) {
 	}
 
 	init := make([]*Franchise, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name          string
@@ -64,7 +67,10 @@ func TestFranchiseService_List(t *testing.T) {
 	}
 
 	init := make([]*Franchise, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name           string
@@ -108,7 +114,10 @@ func TestFranchiseService_Index(t *testing.T) {
 	}
 
 	init := make([]*Franchise, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name           string
diff --git a/game_test.go b/game_test.go
index 1b8dcbe..467f738 100644
--- a/game_test.go
+++ b/game_test.go
@@ -23,7 +23,10 @@ func TestGameService_Get(t *testing.T) {
 	}
 
 	init := make([]*Game, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name     string
@@ -66,7 +69,10 @@ func TestGameService_List(t *testing.T) {
 	}
 
 	init := make([]*Game, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name      string
@@ -110,7 +116,10 @@ func TestGameService_Index(t *testing.T) {
 	}
 
 	init := make([]*Game, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name      string
@@ -151,7 +160,10 @@ func TestGameService_Search(t *testing.T) {
 	}
 
 	init := make([]*Game, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name      string
diff --git a/gameengine_test.go b/gameengine_test.go
index d40e7b7..6a185d1 100644
--- a/gameengine_test.go
+++ b/gameengine_test.go
@@ -21,7 +21,10 @@ func TestGameEngineService_Get(t *testing.T) {
 	}
 
 	init := make([]*GameEngine, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name           string
@@ -64,7 +67,10 @@ func TestGameEngineService_List(t *testing.T) {
 	}
 
 	init := make([]*GameEngine, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name            string
@@ -108,7 +114,10 @@ func TestGameEngineService_Index(t *testing.T) {
 	}
 
 	init := make([]*GameEngine, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name            string
diff --git a/gameenginelogo_test.go b/gameenginelogo_test.go
index 88c365e..4dd8118 100644
--- a/gameenginelogo_test.go
+++ b/gameenginelogo_test.go
@@ -21,7 +21,10 @@ func TestGameEngineLogoService_Get(t *testing.T) {
 	}
 
 	init := make([]*GameEngineLogo, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name               string
@@ -64,7 +67,10 @@ func TestGameEngineLogoService_List(t *testing.T) {
 	}
 
 	init := make([]*GameEngineLogo, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                string
@@ -108,7 +114,10 @@ func TestGameEngineLogoService_Index(t *testing.T) {
 	}
 
 	init := make([]*GameEngineLogo, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                string
diff --git a/gamemode_test.go b/gamemode_test.go
index cf98ffe..8e863fa 100644
--- a/gamemode_test.go
+++ b/gamemode_test.go
@@ -21,7 +21,10 @@ func TestGameModeService_Get(t *testing.T) {
 	}
 
 	init := make([]*GameMode, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name         string
@@ -64,7 +67,10 @@ func TestGameModeService_List(t *testing.T) {
 	}
 
 	init := make([]*GameMode, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name          string
@@ -108,7 +114,10 @@ func TestGameModeService_Index(t *testing.T) {
 	}
 
 	init := make([]*GameMode, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name          string
diff --git a/gameversion_test.go b/gameversion_test.go
index c2ded53..65588b4 100644
--- a/gameversion_test.go
+++ b/gameversion_test.go
@@ -21,7 +21,10 @@ func TestGameVersionService_Get(t *testing.T) {
 	}
 
 	init := make([]*GameVersion, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name            string
@@ -64,7 +67,10 @@ func TestGameVersionService_List(t *testing.T) {
 	}
 
 	init := make([]*GameVersion, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name             string
@@ -108,7 +114,10 @@ func TestGameVersionService_Index(t *testing.T) {
 	}
 
 	init := make([]*GameVersion, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name             string
diff --git a/gameversionfeature_test.go b/gameversionfeature_test.go
index af08af9..221741a 100644
--- a/gameversionfeature_test.go
+++ b/gameversionfeature_test.go
@@ -21,7 +21,10 @@ func TestGameVersionFeatureService_Get(t *testing.T) {
 	}
 
 	init := make([]*GameVersionFeature, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                   string
@@ -64,7 +67,10 @@ func TestGameVersionFeatureService_List(t *testing.T) {
 	}
 
 	init := make([]*GameVersionFeature, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                    string
@@ -108,7 +114,10 @@ func TestGameVersionFeatureService_Index(t *testing.T) {
 	}
 
 	init := make([]*GameVersionFeature, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                    string
diff --git a/gameversionfeaturevalue_test.go b/gameversionfeaturevalue_test.go
index 3ac33a7..c4b0ea2 100644
--- a/gameversionfeaturevalue_test.go
+++ b/gameversionfeaturevalue_test.go
@@ -21,7 +21,10 @@ func TestGameVersionFeatureValueService_Get(t *testing.T) {
 	}
 
 	init := make([]*GameVersionFeatureValue, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                        string
@@ -64,7 +67,10 @@ func TestGameVersionFeatureValueService_List(t *testing.T) {
 	}
 
 	init := make([]*GameVersionFeatureValue, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                         string
@@ -108,7 +114,10 @@ func TestGameVersionFeatureValueService_Index(t *testing.T) {
 	}
 
 	init := make([]*GameVersionFeatureValue, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                         string
diff --git a/gamevideo_test.go b/gamevideo_test.go
index 752f5e8..b929d41 100644
--- a/gamevideo_test.go
+++ b/gamevideo_test.go
@@ -21,7 +21,10 @@ func TestGameVideoService_Get(t *testing.T) {
 	}
 
 	init := make([]*GameVideo, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name          string
@@ -64,7 +67,10 @@ func TestGameVideoService_List(t *testing.T) {
 	}
 
 	init := make([]*GameVideo, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name           string
@@ -108,7 +114,10 @@ func TestGameVideoService_Index(t *testing.T) {
 	}
 
 	init := make([]*GameVideo, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name           string
diff --git a/genre_test.go b/genre_test.go
index d76a7ff..791c8f8 100644
--- a/genre_test.go
+++ b/genre_test.go
@@ -21,7 +21,10 @@ func TestGenreService_Get(t *testing.T) {
 	}
 
 	init := make([]*Genre, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name      string
@@ -64,7 +67,10 @@ func TestGenreService_List(t *testing.T) {
 	}
 
 	init := make([]*Genre, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name       string
@@ -108,7 +114,10 @@ func TestGenreService_Index(t *testing.T) {
 	}
 
 	init := make([]*Genre, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name       string
diff --git a/involvedcompany_test.go b/involvedcompany_test.go
index 9c86646..f45ef05 100644
--- a/involvedcompany_test.go
+++ b/involvedcompany_test.go
@@ -21,7 +21,10 @@ func TestInvolvedCompanyService_Get(t *testing.T) {
 	}
 
 	init := make([]*InvolvedCompany, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                string
@@ -64,7 +67,10 @@ func TestInvolvedCompanyService_List(t *testing.T) {
 	}
 
 	init := make([]*InvolvedCompany, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                  string
@@ -108,7 +114,10 @@ func TestInvolvedCompanyService_Index(t *testing.T) {
 	}
 
 	init := make([]*InvolvedCompany, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                  string
diff --git a/keyword_test.go b/keyword_test.go
index e74c433..be4bb20 100644
--- a/keyword_test.go
+++ b/keyword_test.go
@@ -21,7 +21,10 @@ func TestKeywordService_Get(t *testing.T) {
 	}
 
 	init := make([]*Keyword, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name        string
@@ -64,7 +67,10 @@ func TestKeywordService_List(t *testing.T) {
 	}
 
 	init := make([]*Keyword, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name         string
@@ -108,7 +114,10 @@ func TestKeywordService_Index(t *testing.T) {
 	}
 
 	init := make([]*Keyword, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name         string
diff --git a/list_test.go b/list_test.go
index b8eee85..9f2fe58 100644
--- a/list_test.go
+++ b/list_test.go
@@ -21,7 +21,10 @@ func TestListService_Get(t *testing.T) {
 	}
 
 	init := make([]*List, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name     string
@@ -64,7 +67,10 @@ func TestListService_List(t *testing.T) {
 	}
 
 	init := make([]*List, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name      string
@@ -108,7 +114,10 @@ func TestListService_Index(t *testing.T) {
 	}
 
 	init := make([]*List, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name      string
diff --git a/listentry_test.go b/listentry_test.go
index 485dcac..d2bb2af 100644
--- a/listentry_test.go
+++ b/listentry_test.go
@@ -21,7 +21,10 @@ func TestListEntryService_Get(t *testing.T) {
 	}
 
 	init := make([]*ListEntry, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name          string
@@ -64,7 +67,10 @@ func TestListEntryService_List(t *testing.T) {
 	}
 
 	init := make([]*ListEntry, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name           string
@@ -108,7 +114,10 @@ func TestListEntryService_Index(t *testing.T) {
 	}
 
 	init := make([]*ListEntry, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name           string
diff --git a/multiplayermode_test.go b/multiplayermode_test.go
index 741a60e..fc55f62 100644
--- a/multiplayermode_test.go
+++ b/multiplayermode_test.go
@@ -21,7 +21,10 @@ func TestMultiplayerModeService_Get(t *testing.T) {
 	}
 
 	init := make([]*MultiplayerMode, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                string
@@ -64,7 +67,10 @@ func TestMultiplayerModeService_List(t *testing.T) {
 	}
 
 	init := make([]*MultiplayerMode, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                 string
@@ -108,7 +114,10 @@ func TestMultiplayerModeService_Index(t *testing.T) {
 	}
 
 	init := make([]*MultiplayerMode, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                 string
diff --git a/page_test.go b/page_test.go
index 882a10c..26bfa52 100644
--- a/page_test.go
+++ b/page_test.go
@@ -21,7 +21,10 @@ func TestPageService_Get(t *testing.T) {
 	}
 
 	init := make([]*Page, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name     string
@@ -64,7 +67,10 @@ func TestPageService_List(t *testing.T) {
 	}
 
 	init := make([]*Page, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name      string
@@ -108,7 +114,10 @@ func TestPageService_Index(t *testing.T) {
 	}
 
 	init := make([]*Page, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name      string
diff --git a/pagebackground_test.go b/pagebackground_test.go
index 2602b2b..a710e71 100644
--- a/pagebackground_test.go
+++ b/pagebackground_test.go
@@ -21,7 +21,10 @@ func TestPageBackgroundService_Get(t *testing.T) {
 	}
 
 	init := make([]*PageBackground, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name               string
@@ -64,7 +67,10 @@ func TestPageBackgroundService_List(t *testing.T) {
 	}
 
 	init := make([]*PageBackground, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                string
@@ -108,7 +114,10 @@ func TestPageBackgroundService_Index(t *testing.T) {
 	}
 
 	init := make([]*PageBackground, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                string
diff --git a/pagelogo_test.go b/pagelogo_test.go
index 7d2323c..24b056b 100644
--- a/pagelogo_test.go
+++ b/pagelogo_test.go
@@ -21,7 +21,10 @@ func TestPageLogoService_Get(t *testing.T) {
 	}
 
 	init := make([]*PageLogo, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name         string
@@ -64,7 +67,10 @@ func TestPageLogoService_List(t *testing.T) {
 	}
 
 	init := make([]*PageLogo, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name          string
@@ -108,7 +114,10 @@ func TestPageLogoService_Index(t *testing.T) {
 	}
 
 	init := make([]*PageLogo, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name          string
diff --git a/pagewebsite_test.go b/pagewebsite_test.go
index 5ebea81..4f45813 100644
--- a/pagewebsite_test.go
+++ b/pagewebsite_test.go
@@ -21,7 +21,10 @@ func TestPageWebsiteService_Get(t *testing.T) {
 	}
 
 	init := make([]*PageWebsite, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name            string
@@ -64,7 +67,10 @@ func TestPageWebsiteService_List(t *testing.T) {
 	}
 
 	init := make([]*PageWebsite, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name             string
@@ -108,7 +114,10 @@ func TestPageWebsiteService_Index(t *testing.T) {
 	}
 
 	init := make([]*PageWebsite, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name             string
diff --git a/person_test.go b/person_test.go
index 3b3a82b..a76d435 100644
--- a/person_test.go
+++ b/person_test.go
@@ -22,7 +22,10 @@ func TestPersonService_Get(t *testing.T) {
 	}
 
 	init := make([]*Person, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name       string
@@ -65,7 +68,10 @@ func TestPersonService_List(t *testing.T) {
 	}
 
 	init := make([]*Person, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name        string
@@ -109,7 +115,10 @@ func TestPersonService_Index(t *testing.T) {
 	}
 
 	init := make([]*Person, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name        string
@@ -150,7 +159,10 @@ func TestPersonService_Search(t *testing.T) {
 	}
 
 	init := make([]*Person, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name        string
diff --git a/personmugshot_test.go b/personmugshot_test.go
index dbc942f..0ee5bd9 100644
--- a/personmugshot_test.go
+++ b/personmugshot_test.go
@@ -21,7 +21,10 @@ func TestPersonMugshotService_Get(t *testing.T) {
 	}
 
 	init := make([]*PersonMugshot, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name              string
@@ -64,7 +67,10 @@ func TestPersonMugshotService_List(t *testing.T) {
 	}
 
 	init := make([]*PersonMugshot, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name               string
@@ -108,7 +114,10 @@ func TestPersonMugshotService_Index(t *testing.T) {
 	}
 
 	init := make([]*PersonMugshot, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name               string
diff --git a/personwebsite_test.go b/personwebsite_test.go
index bdb01cc..1246b51 100644
--- a/personwebsite_test.go
+++ b/personwebsite_test.go
@@ -21,7 +21,10 @@ func TestPersonWebsiteService_Get(t *testing.T) {
 	}
 
 	init := make([]*PersonWebsite, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name              string
@@ -64,7 +67,10 @@ func TestPersonWebsiteService_List(t *testing.T) {
 	}
 
 	init := make([]*PersonWebsite, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name               string
@@ -108,7 +114,10 @@ func TestPersonWebsiteService_Index(t *testing.T) {
 	}
 
 	init := make([]*PersonWebsite, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name               string
diff --git a/platform_test.go b/platform_test.go
index 66a8e5d..bf0d1e6 100644
--- a/platform_test.go
+++ b/platform_test.go
@@ -22,7 +22,10 @@ func TestPlatformService_Get(t *testing.T) {
 	}
 
 	init := make([]*Platform, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name         string
@@ -65,7 +68,10 @@ func TestPlatformService_List(t *testing.T) {
 	}
 
 	init := make([]*Platform, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name          string
@@ -109,7 +115,10 @@ func TestPlatformService_Index(t *testing.T) {
 	}
 
 	init := make([]*Platform, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name          string
@@ -150,7 +159,10 @@ func TestPlatformService_Search(t *testing.T) {
 	}
 
 	init := make([]*Platform, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name          string
diff --git a/platformlogo_test.go b/platformlogo_test.go
index 951b88e..3bc9dd3 100644
--- a/platformlogo_test.go
+++ b/platformlogo_test.go
@@ -21,7 +21,10 @@ func TestPlatformLogoService_Get(t *testing.T) {
 	}
 
 	init := make([]*PlatformLogo, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name             string
@@ -64,7 +67,10 @@ func TestPlatformLogoService_List(t *testing.T) {
 	}
 
 	init := make([]*PlatformLogo, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name              string
@@ -108,7 +114,10 @@ func TestPlatformLogoService_Index(t *testing.T) {
 	}
 
 	init := make([]*PlatformLogo, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name              string
diff --git a/platformversion_test.go b/platformversion_test.go
index 4306382..e295409 100644
--- a/platformversion_test.go
+++ b/platformversion_test.go
@@ -21,7 +21,10 @@ func TestPlatformVersionService_Get(t *testing.T) {
 	}
 
 	init := make([]*PlatformVersion, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                string
@@ -64,7 +67,10 @@ func TestPlatformVersionService_List(t *testing.T) {
 	}
 
 	init := make([]*PlatformVersion, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                 string
@@ -108,7 +114,10 @@ func TestPlatformVersionService_Index(t *testing.T) {
 	}
 
 	init := make([]*PlatformVersion, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                 string
diff --git a/platformversioncompany_test.go b/platformversioncompany_test.go
index c6e010e..e2f0438 100644
--- a/platformversioncompany_test.go
+++ b/platformversioncompany_test.go
@@ -21,7 +21,10 @@ func TestPlatformVersionCompanyService_Get(t *testing.T) {
 	}
 
 	init := make([]*PlatformVersionCompany, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                       string
@@ -64,7 +67,10 @@ func TestPlatformVersionCompanyService_List(t *testing.T) {
 	}
 
 	init := make([]*PlatformVersionCompany, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                         string
@@ -108,7 +114,10 @@ func TestPlatformVersionCompanyService_Index(t *testing.T) {
 	}
 
 	init := make([]*PlatformVersionCompany, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                         string
diff --git a/platformversionreleasedate_test.go b/platformversionreleasedate_test.go
index 89eed0c..db97c20 100644
--- a/platformversionreleasedate_test.go
+++ b/platformversionreleasedate_test.go
@@ -21,7 +21,10 @@ func TestPlatformVersionReleaseDateService_Get(t *testing.T) {
 	}
 
 	init := make([]*PlatformVersionReleaseDate, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                           string
@@ -64,7 +67,10 @@ func TestPlatformVersionReleaseDateService_List(t *testing.T) {
 	}
 
 	init := make([]*PlatformVersionReleaseDate, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                            string
@@ -108,7 +114,10 @@ func TestPlatformVersionReleaseDateService_Index(t *testing.T) {
 	}
 
 	init := make([]*PlatformVersionReleaseDate, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                            string
diff --git a/platformwebsite_test.go b/platformwebsite_test.go
index c5aab57..572066c 100644
--- a/platformwebsite_test.go
+++ b/platformwebsite_test.go
@@ -21,7 +21,10 @@ func TestPlatformWebsiteService_Get(t *testing.T) {
 	}
 
 	init := make([]*PlatformWebsite, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                string
@@ -64,7 +67,10 @@ func TestPlatformWebsiteService_List(t *testing.T) {
 	}
 
 	init := make([]*PlatformWebsite, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                 string
@@ -108,7 +114,10 @@ func TestPlatformWebsiteService_Index(t *testing.T) {
 	}
 
 	init := make([]*PlatformWebsite, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                 string
diff --git a/playerperspective_test.go b/playerperspective_test.go
index a447dc8..b226104 100644
--- a/playerperspective_test.go
+++ b/playerperspective_test.go
@@ -21,7 +21,10 @@ func TestPlayerPerspectiveService_Get(t *testing.T) {
 	}
 
 	init := make([]*PlayerPerspective, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                  string
@@ -64,7 +67,10 @@ func TestPlayerPerspectiveService_List(t *testing.T) {
 	}
 
 	init := make([]*PlayerPerspective, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                   string
@@ -108,7 +114,10 @@ func TestPlayerPerspectiveService_Index(t *testing.T) {
 	}
 
 	init := make([]*PlayerPerspective, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                   string
diff --git a/productfamily_test.go b/productfamily_test.go
index dbd2849..381cd84 100644
--- a/productfamily_test.go
+++ b/productfamily_test.go
@@ -21,7 +21,10 @@ func TestProductFamilyService_Get(t *testing.T) {
 	}
 
 	init := make([]*ProductFamily, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name              string
@@ -64,7 +67,10 @@ func TestProductFamilyService_List(t *testing.T) {
 	}
 
 	init := make([]*ProductFamily, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name                string
@@ -108,7 +114,10 @@ func TestProductFamilyService_Index(t *testing.T) {
 	}
 
 	init := make([]*ProductFamily, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                string
diff --git a/pulse_test.go b/pulse_test.go
index b01abbe..dba186c 100644
--- a/pulse_test.go
+++ b/pulse_test.go
@@ -21,7 +21,10 @@ func TestPulseService_Get(t *testing.T) {
 	}
 
 	init := make([]*Pulse, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name      string
@@ -64,7 +67,10 @@ func TestPulseService_List(t *testing.T) {
 	}
 
 	init := make([]*Pulse, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name       string
@@ -108,7 +114,10 @@ func TestPulseService_Index(t *testing.T) {
 	}
 
 	init := make([]*Pulse, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name       string
diff --git a/pulsegroup_test.go b/pulsegroup_test.go
index 431a840..2045f27 100644
--- a/pulsegroup_test.go
+++ b/pulsegroup_test.go
@@ -21,7 +21,10 @@ func TestPulseGroupService_Get(t *testing.T) {
 	}
 
 	init := make([]*PulseGroup, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name           string
@@ -64,7 +67,10 @@ func TestPulseGroupService_List(t *testing.T) {
 	}
 
 	init := make([]*PulseGroup, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name            string
@@ -108,7 +114,10 @@ func TestPulseGroupService_Index(t *testing.T) {
 	}
 
 	init := make([]*PulseGroup, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name            string
diff --git a/pulsesource_test.go b/pulsesource_test.go
index b601c3b..c043ba7 100644
--- a/pulsesource_test.go
+++ b/pulsesource_test.go
@@ -21,7 +21,10 @@ func TestPulseSourceService_Get(t *testing.T) {
 	}
 
 	init := make([]*PulseSource, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name            string
@@ -64,7 +67,10 @@ func TestPulseSourceService_List(t *testing.T) {
 	}
 
 	init := make([]*PulseSource, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name             string
@@ -108,7 +114,10 @@ func TestPulseSourceService_Index(t *testing.T) {
 	}
 
 	init := make([]*PulseSource, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name             string
diff --git a/pulseurl_test.go b/pulseurl_test.go
index a86a67c..b14d94f 100644
--- a/pulseurl_test.go
+++ b/pulseurl_test.go
@@ -21,7 +21,10 @@ func TestPulseURLService_Get(t *testing.T) {
 	}
 
 	init := make([]*PulseURL, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name         string
@@ -64,7 +67,10 @@ func TestPulseURLService_List(t *testing.T) {
 	}
 
 	init := make([]*PulseURL, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name          string
@@ -108,7 +114,10 @@ func TestPulseURLService_Index(t *testing.T) {
 	}
 
 	init := make([]*PulseURL, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name          string
diff --git a/rate_test.go b/rate_test.go
index d6eeeda..a1416b8 100644
--- a/rate_test.go
+++ b/rate_test.go
@@ -21,7 +21,10 @@ func TestRateService_Get(t *testing.T) {
 	}
 
 	init := make([]*Rate, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name     string
@@ -64,7 +67,10 @@ func TestRateService_List(t *testing.T) {
 	}
 
 	init := make([]*Rate, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name      string
@@ -108,7 +114,10 @@ func TestRateService_Index(t *testing.T) {
 	}
 
 	init := make([]*Rate, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name      string
diff --git a/releasedate_test.go b/releasedate_test.go
index 66a1007..9819bdf 100644
--- a/releasedate_test.go
+++ b/releasedate_test.go
@@ -21,7 +21,7 @@ func TestReleaseDateService_Get(t *testing.T) {
 	}
 
 	init := make([]*ReleaseDate, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
 
 	var tests = []struct {
 		name            string
@@ -64,7 +64,7 @@ func TestReleaseDateService_List(t *testing.T) {
 	}
 
 	init := make([]*ReleaseDate, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
 
 	var tests = []struct {
 		name             string
@@ -108,7 +108,7 @@ func TestReleaseDateService_Index(t *testing.T) {
 	}
 
 	init := make([]*ReleaseDate, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
 
 	tests := []struct {
 		name             string
diff --git a/review_test.go b/review_test.go
index 51ac7a2..07d389e 100644
--- a/review_test.go
+++ b/review_test.go
@@ -21,7 +21,10 @@ func TestReviewService_Get(t *testing.T) {
 	}
 
 	init := make([]*Review, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name       string
@@ -64,7 +67,10 @@ func TestReviewService_List(t *testing.T) {
 	}
 
 	init := make([]*Review, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name        string
@@ -108,7 +114,10 @@ func TestReviewService_Index(t *testing.T) {
 	}
 
 	init := make([]*Review, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name        string
diff --git a/reviewvideo_test.go b/reviewvideo_test.go
index d5ed0d0..3a2233f 100644
--- a/reviewvideo_test.go
+++ b/reviewvideo_test.go
@@ -21,7 +21,10 @@ func TestReviewVideoService_Get(t *testing.T) {
 	}
 
 	init := make([]*ReviewVideo, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name            string
@@ -64,7 +67,10 @@ func TestReviewVideoService_List(t *testing.T) {
 	}
 
 	init := make([]*ReviewVideo, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name             string
@@ -108,7 +114,10 @@ func TestReviewVideoService_Index(t *testing.T) {
 	}
 
 	init := make([]*ReviewVideo, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name             string
diff --git a/screenshot_test.go b/screenshot_test.go
index 1029612..13ae446 100644
--- a/screenshot_test.go
+++ b/screenshot_test.go
@@ -21,7 +21,10 @@ func TestScreenshotService_Get(t *testing.T) {
 	}
 
 	init := make([]*Screenshot, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name           string
@@ -64,7 +67,10 @@ func TestScreenshotService_List(t *testing.T) {
 	}
 
 	init := make([]*Screenshot, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name            string
@@ -108,7 +114,10 @@ func TestScreenshotService_Index(t *testing.T) {
 	}
 
 	init := make([]*Screenshot, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name            string
diff --git a/socialmetric_test.go b/socialmetric_test.go
index 59a47a6..d5abceb 100644
--- a/socialmetric_test.go
+++ b/socialmetric_test.go
@@ -21,7 +21,10 @@ func TestSocialMetricService_Get(t *testing.T) {
 	}
 
 	init := make([]*SocialMetric, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name             string
@@ -64,7 +67,10 @@ func TestSocialMetricService_List(t *testing.T) {
 	}
 
 	init := make([]*SocialMetric, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name              string
@@ -108,7 +114,10 @@ func TestSocialMetricService_Index(t *testing.T) {
 	}
 
 	init := make([]*SocialMetric, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name              string
diff --git a/status_test.go b/status_test.go
index be6f2aa..5380396 100644
--- a/status_test.go
+++ b/status_test.go
@@ -18,7 +18,10 @@ func TestClient_Status(t *testing.T) {
 	}
 
 	init := make([]*Status, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name     string
diff --git a/testdummy_test.go b/testdummy_test.go
index ca3e064..8a3b6f7 100644
--- a/testdummy_test.go
+++ b/testdummy_test.go
@@ -21,7 +21,10 @@ func TestTestDummyService_Get(t *testing.T) {
 	}
 
 	init := make([]*TestDummy, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name          string
@@ -64,7 +67,10 @@ func TestTestDummyService_List(t *testing.T) {
 	}
 
 	init := make([]*TestDummy, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name            string
@@ -108,7 +114,10 @@ func TestTestDummyService_Index(t *testing.T) {
 	}
 
 	init := make([]*TestDummy, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name            string
diff --git a/theme_test.go b/theme_test.go
index df4a647..dc67a5f 100644
--- a/theme_test.go
+++ b/theme_test.go
@@ -22,7 +22,10 @@ func TestThemeService_Get(t *testing.T) {
 	}
 
 	init := make([]*Theme, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name      string
@@ -65,7 +68,10 @@ func TestThemeService_List(t *testing.T) {
 	}
 
 	init := make([]*Theme, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name       string
@@ -109,7 +115,10 @@ func TestThemeService_Index(t *testing.T) {
 	}
 
 	init := make([]*Theme, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name       string
@@ -150,7 +159,10 @@ func TestThemeService_Search(t *testing.T) {
 	}
 
 	init := make([]*Theme, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name       string
diff --git a/timetobeat_test.go b/timetobeat_test.go
index 632f9e6..c4582d6 100644
--- a/timetobeat_test.go
+++ b/timetobeat_test.go
@@ -21,7 +21,10 @@ func TestTimeToBeatService_Get(t *testing.T) {
 	}
 
 	init := make([]*TimeToBeat, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name           string
@@ -64,7 +67,10 @@ func TestTimeToBeatService_List(t *testing.T) {
 	}
 
 	init := make([]*TimeToBeat, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name            string
@@ -108,7 +114,10 @@ func TestTimeToBeatService_Index(t *testing.T) {
 	}
 
 	init := make([]*TimeToBeat, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name            string
diff --git a/title_test.go b/title_test.go
index bd8db17..6e47fde 100644
--- a/title_test.go
+++ b/title_test.go
@@ -21,7 +21,10 @@ func TestTitleService_Get(t *testing.T) {
 	}
 
 	init := make([]*Title, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name      string
@@ -64,7 +67,10 @@ func TestTitleService_List(t *testing.T) {
 	}
 
 	init := make([]*Title, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name       string
@@ -108,7 +114,10 @@ func TestTitleService_Index(t *testing.T) {
 	}
 
 	init := make([]*Title, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name       string
diff --git a/website_test.go b/website_test.go
index f30129e..675173f 100644
--- a/website_test.go
+++ b/website_test.go
@@ -21,7 +21,10 @@ func TestWebsiteService_Get(t *testing.T) {
 	}
 
 	init := make([]*Website, 1)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name        string
@@ -64,7 +67,10 @@ func TestWebsiteService_List(t *testing.T) {
 	}
 
 	init := make([]*Website, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var tests = []struct {
 		name         string
@@ -108,7 +114,10 @@ func TestWebsiteService_Index(t *testing.T) {
 	}
 
 	init := make([]*Website, 0)
-	json.Unmarshal(f, &init)
+	err = json.Unmarshal(f, &init)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name         string