diff --git a/reddit/account_test.go b/reddit/account_test.go
index b69713d..36dad5a 100644
--- a/reddit/account_test.go
+++ b/reddit/account_test.go
@@ -123,7 +123,7 @@ var expectedRelationships2 = []Relationship{
 }
 
 func TestAccountService_Info(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/account/info.json")
@@ -140,7 +140,7 @@ func TestAccountService_Info(t *testing.T) {
 }
 
 func TestAccountService_Karma(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/account/karma.json")
@@ -157,7 +157,7 @@ func TestAccountService_Karma(t *testing.T) {
 }
 
 func TestAccountService_Settings(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/account/settings.json")
@@ -174,7 +174,7 @@ func TestAccountService_Settings(t *testing.T) {
 }
 
 func TestAccountService_UpdateSettings(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/account/settings.json")
@@ -199,7 +199,7 @@ func TestAccountService_UpdateSettings(t *testing.T) {
 }
 
 func TestAccountService_Trophies(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/account/trophies.json")
@@ -216,7 +216,7 @@ func TestAccountService_Trophies(t *testing.T) {
 }
 
 func TestAccountService_Friends(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/account/friends.json")
@@ -233,7 +233,7 @@ func TestAccountService_Friends(t *testing.T) {
 }
 
 func TestAccountService_Blocked(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/account/blocked.json")
@@ -250,7 +250,7 @@ func TestAccountService_Blocked(t *testing.T) {
 }
 
 func TestAccountService_Messaging(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/account/messaging.json")
@@ -268,7 +268,7 @@ func TestAccountService_Messaging(t *testing.T) {
 }
 
 func TestAccountService_Trusted(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/account/trusted.json")
@@ -285,7 +285,7 @@ func TestAccountService_Trusted(t *testing.T) {
 }
 
 func TestAccountService_AddTrusted(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/add_whitelisted", func(w http.ResponseWriter, r *http.Request) {
@@ -305,7 +305,7 @@ func TestAccountService_AddTrusted(t *testing.T) {
 }
 
 func TestAccountService_RemoveTrusted(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/remove_whitelisted", func(w http.ResponseWriter, r *http.Request) {
diff --git a/reddit/collection_test.go b/reddit/collection_test.go
index 14a1c25..729b370 100644
--- a/reddit/collection_test.go
+++ b/reddit/collection_test.go
@@ -71,7 +71,7 @@ var expectedCollections = []*Collection{
 }
 
 func TestCollectionService_Get(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/collection/collection.json")
@@ -97,7 +97,7 @@ func TestCollectionService_Get(t *testing.T) {
 }
 
 func TestCollectionService_FromSubreddit(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/collection/collections.json")
@@ -122,7 +122,7 @@ func TestCollectionService_FromSubreddit(t *testing.T) {
 }
 
 func TestCollectionService_Create(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/collection/collection.json")
@@ -156,7 +156,7 @@ func TestCollectionService_Create(t *testing.T) {
 }
 
 func TestCollectionService_Delete(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/collections/delete_collection", func(w http.ResponseWriter, r *http.Request) {
@@ -175,7 +175,7 @@ func TestCollectionService_Delete(t *testing.T) {
 }
 
 func TestCollectionService_AddPost(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/collections/add_post_to_collection", func(w http.ResponseWriter, r *http.Request) {
@@ -195,7 +195,7 @@ func TestCollectionService_AddPost(t *testing.T) {
 }
 
 func TestCollectionService_RemovePost(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/collections/remove_post_in_collection", func(w http.ResponseWriter, r *http.Request) {
@@ -215,7 +215,7 @@ func TestCollectionService_RemovePost(t *testing.T) {
 }
 
 func TestCollectionService_ReorderPosts(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/collections/reorder_collection", func(w http.ResponseWriter, r *http.Request) {
@@ -235,7 +235,7 @@ func TestCollectionService_ReorderPosts(t *testing.T) {
 }
 
 func TestCollectionService_UpdateTitle(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/collections/update_collection_title", func(w http.ResponseWriter, r *http.Request) {
@@ -255,7 +255,7 @@ func TestCollectionService_UpdateTitle(t *testing.T) {
 }
 
 func TestCollectionService_UpdateDescription(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/collections/update_collection_description", func(w http.ResponseWriter, r *http.Request) {
@@ -275,7 +275,7 @@ func TestCollectionService_UpdateDescription(t *testing.T) {
 }
 
 func TestCollectionService_UpdateLayoutTimeline(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/collections/update_collection_display_layout", func(w http.ResponseWriter, r *http.Request) {
@@ -295,7 +295,7 @@ func TestCollectionService_UpdateLayoutTimeline(t *testing.T) {
 }
 
 func TestCollectionService_UpdateLayoutGallery(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/collections/update_collection_display_layout", func(w http.ResponseWriter, r *http.Request) {
@@ -315,7 +315,7 @@ func TestCollectionService_UpdateLayoutGallery(t *testing.T) {
 }
 
 func TestCollectionService_Follow(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/collections/follow_collection", func(w http.ResponseWriter, r *http.Request) {
@@ -335,7 +335,7 @@ func TestCollectionService_Follow(t *testing.T) {
 }
 
 func TestCollectionService_Unfollow(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/collections/follow_collection", func(w http.ResponseWriter, r *http.Request) {
diff --git a/reddit/comment_test.go b/reddit/comment_test.go
index 6d227d1..cb987e0 100644
--- a/reddit/comment_test.go
+++ b/reddit/comment_test.go
@@ -39,7 +39,7 @@ var expectedCommentSubmitOrEdit = &Comment{
 }
 
 func TestCommentService_Submit(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/comment/submit-or-edit.json")
@@ -67,7 +67,7 @@ func TestCommentService_Submit(t *testing.T) {
 }
 
 func TestCommentService_Edit(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/comment/submit-or-edit.json")
@@ -95,7 +95,7 @@ func TestCommentService_Edit(t *testing.T) {
 }
 
 func TestCommentService_Delete(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/del", func(w http.ResponseWriter, r *http.Request) {
@@ -115,7 +115,7 @@ func TestCommentService_Delete(t *testing.T) {
 }
 
 func TestCommentService_Save(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/save", func(w http.ResponseWriter, r *http.Request) {
@@ -135,7 +135,7 @@ func TestCommentService_Save(t *testing.T) {
 }
 
 func TestCommentService_Unsave(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/unsave", func(w http.ResponseWriter, r *http.Request) {
@@ -155,7 +155,7 @@ func TestCommentService_Unsave(t *testing.T) {
 }
 
 func TestCommentService_EnableReplies(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/sendreplies", func(w http.ResponseWriter, r *http.Request) {
@@ -176,7 +176,7 @@ func TestCommentService_EnableReplies(t *testing.T) {
 }
 
 func TestCommentService_DisableReplies(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/sendreplies", func(w http.ResponseWriter, r *http.Request) {
@@ -197,7 +197,7 @@ func TestCommentService_DisableReplies(t *testing.T) {
 }
 
 func TestCommentService_Lock(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/lock", func(w http.ResponseWriter, r *http.Request) {
@@ -217,7 +217,7 @@ func TestCommentService_Lock(t *testing.T) {
 }
 
 func TestCommentService_Unlock(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/unlock", func(w http.ResponseWriter, r *http.Request) {
@@ -237,7 +237,7 @@ func TestCommentService_Unlock(t *testing.T) {
 }
 
 func TestCommentService_Upvote(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/vote", func(w http.ResponseWriter, r *http.Request) {
@@ -259,7 +259,7 @@ func TestCommentService_Upvote(t *testing.T) {
 }
 
 func TestCommentService_Downvote(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/vote", func(w http.ResponseWriter, r *http.Request) {
@@ -281,7 +281,7 @@ func TestCommentService_Downvote(t *testing.T) {
 }
 
 func TestCommentService_RemoveVote(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/vote", func(w http.ResponseWriter, r *http.Request) {
@@ -303,7 +303,7 @@ func TestCommentService_RemoveVote(t *testing.T) {
 }
 
 func TestCommentService_LoadMoreReplies(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/comment/more.json")
@@ -349,7 +349,7 @@ func TestCommentService_LoadMoreReplies(t *testing.T) {
 }
 
 func TestCommentService_Report(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/report", func(w http.ResponseWriter, r *http.Request) {
diff --git a/reddit/emoji_test.go b/reddit/emoji_test.go
index be9a06f..d7990d6 100644
--- a/reddit/emoji_test.go
+++ b/reddit/emoji_test.go
@@ -44,7 +44,7 @@ var expectedSubredditEmojis = []*Emoji{
 }
 
 func TestEmojiService_Get(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/emoji/emojis.json")
@@ -64,7 +64,7 @@ func TestEmojiService_Get(t *testing.T) {
 }
 
 func TestEmojiService_Delete(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/testsubreddit/emoji/testemoji", func(w http.ResponseWriter, r *http.Request) {
@@ -76,7 +76,7 @@ func TestEmojiService_Delete(t *testing.T) {
 }
 
 func TestEmojiService_SetSize(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/testsubreddit/emoji_custom_size", func(w http.ResponseWriter, r *http.Request) {
@@ -96,7 +96,7 @@ func TestEmojiService_SetSize(t *testing.T) {
 }
 
 func TestEmojiService_DisableCustomSize(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/testsubreddit/emoji_custom_size", func(w http.ResponseWriter, r *http.Request) {
@@ -114,13 +114,10 @@ func TestEmojiService_DisableCustomSize(t *testing.T) {
 }
 
 func TestEmojiService_Upload(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
-	u, err := url.Parse(server.URL)
-	require.NoError(t, err)
-
-	uploadURL := u.Host + "/api/emoji_upload"
+	uploadURL := client.BaseURL.Host + "/api/emoji_upload"
 
 	blob, err := readFileContents("../testdata/emoji/lease.json")
 	require.NoError(t, err)
@@ -205,7 +202,7 @@ func TestEmojiService_Upload(t *testing.T) {
 }
 
 func TestEmojiService_Update(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/testsubreddit/emoji_permissions", func(w http.ResponseWriter, r *http.Request) {
diff --git a/reddit/flair_test.go b/reddit/flair_test.go
index 965172e..d0fbfe7 100644
--- a/reddit/flair_test.go
+++ b/reddit/flair_test.go
@@ -62,7 +62,7 @@ var expectedListUserFlairs = []*FlairSummary{
 }
 
 func TestFlairService_GetUserFlairs(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/flair/user-flairs.json")
@@ -79,7 +79,7 @@ func TestFlairService_GetUserFlairs(t *testing.T) {
 }
 
 func TestFlairService_GetPostFlairs(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/flair/post-flairs.json")
@@ -96,7 +96,7 @@ func TestFlairService_GetPostFlairs(t *testing.T) {
 }
 
 func TestFlairService_ListUserFlairs(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/flair/list-user-flairs.json")
diff --git a/reddit/gold_test.go b/reddit/gold_test.go
index 47329bf..ea41f02 100644
--- a/reddit/gold_test.go
+++ b/reddit/gold_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func TestGoldService_Gild(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/gold/gild/t1_test", func(w http.ResponseWriter, r *http.Request) {
@@ -21,7 +21,7 @@ func TestGoldService_Gild(t *testing.T) {
 }
 
 func TestGoldService_Give(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/gold/give/testuser", func(w http.ResponseWriter, r *http.Request) {
diff --git a/reddit/listings_test.go b/reddit/listings_test.go
index 7069ba0..49824d0 100644
--- a/reddit/listings_test.go
+++ b/reddit/listings_test.go
@@ -138,7 +138,7 @@ var expectedListingPosts2 = []*Post{
 }
 
 func TestListingsService_Get(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/listings/posts-comments-subreddits.json")
@@ -165,7 +165,7 @@ func TestListingsService_Get(t *testing.T) {
 }
 
 func TestListingsService_GetPosts(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/listings/posts.json")
diff --git a/reddit/message_test.go b/reddit/message_test.go
index 191b4b1..512cb4d 100644
--- a/reddit/message_test.go
+++ b/reddit/message_test.go
@@ -53,7 +53,7 @@ var expectedMessages = &Messages{
 }
 
 func TestMessageService_ReadAll(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/read_all_messages", func(w http.ResponseWriter, r *http.Request) {
@@ -67,7 +67,7 @@ func TestMessageService_ReadAll(t *testing.T) {
 }
 
 func TestMessageService_Read(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/read_message", func(w http.ResponseWriter, r *http.Request) {
@@ -89,7 +89,7 @@ func TestMessageService_Read(t *testing.T) {
 }
 
 func TestMessageService_Unread(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/unread_message", func(w http.ResponseWriter, r *http.Request) {
@@ -111,7 +111,7 @@ func TestMessageService_Unread(t *testing.T) {
 }
 
 func TestMessageService_Block(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/block", func(w http.ResponseWriter, r *http.Request) {
@@ -130,7 +130,7 @@ func TestMessageService_Block(t *testing.T) {
 }
 
 func TestMessageService_Collapse(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/collapse_message", func(w http.ResponseWriter, r *http.Request) {
@@ -152,7 +152,7 @@ func TestMessageService_Collapse(t *testing.T) {
 }
 
 func TestMessageService_Uncollapse(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/uncollapse_message", func(w http.ResponseWriter, r *http.Request) {
@@ -174,7 +174,7 @@ func TestMessageService_Uncollapse(t *testing.T) {
 }
 
 func TestMessageService_Delete(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/del_msg", func(w http.ResponseWriter, r *http.Request) {
@@ -193,7 +193,7 @@ func TestMessageService_Delete(t *testing.T) {
 }
 
 func TestMessageService_Send(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/compose", func(w http.ResponseWriter, r *http.Request) {
@@ -224,7 +224,7 @@ func TestMessageService_Send(t *testing.T) {
 }
 
 func TestMessageService_Inbox(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/message/inbox.json")
@@ -242,7 +242,7 @@ func TestMessageService_Inbox(t *testing.T) {
 }
 
 func TestMessageService_InboxUnread(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/message/inbox.json")
@@ -260,7 +260,7 @@ func TestMessageService_InboxUnread(t *testing.T) {
 }
 
 func TestMessageService_Sent(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/message/inbox.json")
diff --git a/reddit/moderation_test.go b/reddit/moderation_test.go
index be95142..d9c272d 100644
--- a/reddit/moderation_test.go
+++ b/reddit/moderation_test.go
@@ -50,7 +50,7 @@ var expectedModActions = &ModActions{
 }
 
 func TestModerationService_GetActions(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/moderation/actions.json")
@@ -76,7 +76,7 @@ func TestModerationService_GetActions(t *testing.T) {
 }
 
 func TestModerationService_AcceptInvite(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/moderation/actions.json")
@@ -100,7 +100,7 @@ func TestModerationService_AcceptInvite(t *testing.T) {
 }
 
 func TestModerationService_Approve(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/approve", func(w http.ResponseWriter, r *http.Request) {
@@ -119,7 +119,7 @@ func TestModerationService_Approve(t *testing.T) {
 }
 
 func TestModerationService_Remove(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/remove", func(w http.ResponseWriter, r *http.Request) {
@@ -139,7 +139,7 @@ func TestModerationService_Remove(t *testing.T) {
 }
 
 func TestModerationService_RemoveSpam(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/remove", func(w http.ResponseWriter, r *http.Request) {
@@ -159,7 +159,7 @@ func TestModerationService_RemoveSpam(t *testing.T) {
 }
 
 func TestModerationService_Leave(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/leavemoderator", func(w http.ResponseWriter, r *http.Request) {
@@ -178,7 +178,7 @@ func TestModerationService_Leave(t *testing.T) {
 }
 
 func TestModerationService_LeaveContributor(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/leavecontributor", func(w http.ResponseWriter, r *http.Request) {
@@ -197,7 +197,7 @@ func TestModerationService_LeaveContributor(t *testing.T) {
 }
 
 func TestModerationService_Edited(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// contains posts and comments
@@ -224,7 +224,7 @@ func TestModerationService_Edited(t *testing.T) {
 }
 
 func TestModerationService_IgnoreReports(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/ignore_reports", func(w http.ResponseWriter, r *http.Request) {
@@ -243,7 +243,7 @@ func TestModerationService_IgnoreReports(t *testing.T) {
 }
 
 func TestModerationService_UnignoreReports(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/unignore_reports", func(w http.ResponseWriter, r *http.Request) {
diff --git a/reddit/multi_test.go b/reddit/multi_test.go
index 4c3e7a7..d95cecf 100644
--- a/reddit/multi_test.go
+++ b/reddit/multi_test.go
@@ -44,7 +44,7 @@ var expectedMulti2 = &Multi{
 }
 
 func TestMultiService_Get(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/multi/multi.json")
@@ -61,7 +61,7 @@ func TestMultiService_Get(t *testing.T) {
 }
 
 func TestMultiService_Mine(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/multi/multis.json")
@@ -78,7 +78,7 @@ func TestMultiService_Mine(t *testing.T) {
 }
 
 func TestMultiService_Of(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/multi/multis.json")
@@ -95,7 +95,7 @@ func TestMultiService_Of(t *testing.T) {
 }
 
 func TestMultiService_Copy(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/multi/multi.json")
@@ -131,7 +131,7 @@ func TestMultiService_Copy(t *testing.T) {
 }
 
 func TestMultiService_Create(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/multi/multi.json")
@@ -169,7 +169,7 @@ func TestMultiService_Create(t *testing.T) {
 }
 
 func TestMultiService_Update(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/multi/multi.json")
@@ -206,7 +206,7 @@ func TestMultiService_Update(t *testing.T) {
 }
 
 func TestMultiService_Delete(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/multi/user/testuser/m/testmulti", func(w http.ResponseWriter, r *http.Request) {
@@ -218,7 +218,7 @@ func TestMultiService_Delete(t *testing.T) {
 }
 
 func TestMultiService_GetDescription(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/multi/description.json")
@@ -235,7 +235,7 @@ func TestMultiService_GetDescription(t *testing.T) {
 }
 
 func TestMultiService_UpdateDescription(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/multi/description.json")
@@ -260,7 +260,7 @@ func TestMultiService_UpdateDescription(t *testing.T) {
 }
 
 func TestMultiService_AddSubreddit(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/multi/user/testuser/m/testmulti/r/golang", func(w http.ResponseWriter, r *http.Request) {
@@ -279,7 +279,7 @@ func TestMultiService_AddSubreddit(t *testing.T) {
 }
 
 func TestMultiService_DeleteSubreddit(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/multi/user/testuser/m/testmulti/r/golang", func(w http.ResponseWriter, r *http.Request) {
diff --git a/reddit/post_test.go b/reddit/post_test.go
index e865d02..d50aedf 100644
--- a/reddit/post_test.go
+++ b/reddit/post_test.go
@@ -211,7 +211,7 @@ var expectedPostDuplicates = &Posts{
 }
 
 func TestPostService_Get(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/post/post.json")
@@ -228,7 +228,7 @@ func TestPostService_Get(t *testing.T) {
 }
 
 func TestPostService_Duplicates(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/post/duplicates.json")
@@ -260,7 +260,7 @@ func TestPostService_Duplicates(t *testing.T) {
 }
 
 func TestPostService_SubmitText(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/post/submit.json")
@@ -295,7 +295,7 @@ func TestPostService_SubmitText(t *testing.T) {
 }
 
 func TestPostService_SubmitLink(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/post/submit.json")
@@ -334,7 +334,7 @@ func TestPostService_SubmitLink(t *testing.T) {
 }
 
 func TestPostService_Edit(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/post/edit.json")
@@ -362,7 +362,7 @@ func TestPostService_Edit(t *testing.T) {
 }
 
 func TestPostService_Hide(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/hide", func(w http.ResponseWriter, r *http.Request) {
@@ -385,7 +385,7 @@ func TestPostService_Hide(t *testing.T) {
 }
 
 func TestPostService_Unhide(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/unhide", func(w http.ResponseWriter, r *http.Request) {
@@ -408,7 +408,7 @@ func TestPostService_Unhide(t *testing.T) {
 }
 
 func TestPostService_MarkNSFW(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/marknsfw", func(w http.ResponseWriter, r *http.Request) {
@@ -428,7 +428,7 @@ func TestPostService_MarkNSFW(t *testing.T) {
 }
 
 func TestPostService_UnmarkNSFW(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/unmarknsfw", func(w http.ResponseWriter, r *http.Request) {
@@ -448,7 +448,7 @@ func TestPostService_UnmarkNSFW(t *testing.T) {
 }
 
 func TestPostService_Spoiler(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/spoiler", func(w http.ResponseWriter, r *http.Request) {
@@ -468,7 +468,7 @@ func TestPostService_Spoiler(t *testing.T) {
 }
 
 func TestPostService_Unspoiler(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/unspoiler", func(w http.ResponseWriter, r *http.Request) {
@@ -488,7 +488,7 @@ func TestPostService_Unspoiler(t *testing.T) {
 }
 
 func TestPostService_Sticky(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/set_subreddit_sticky", func(w http.ResponseWriter, r *http.Request) {
@@ -511,7 +511,7 @@ func TestPostService_Sticky(t *testing.T) {
 }
 
 func TestPostService_Unsticky(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/set_subreddit_sticky", func(w http.ResponseWriter, r *http.Request) {
@@ -533,7 +533,7 @@ func TestPostService_Unsticky(t *testing.T) {
 }
 
 func TestPostService_PinToProfile(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/set_subreddit_sticky", func(w http.ResponseWriter, r *http.Request) {
@@ -556,7 +556,7 @@ func TestPostService_PinToProfile(t *testing.T) {
 }
 
 func TestPostService_UnpinFromProfile(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/set_subreddit_sticky", func(w http.ResponseWriter, r *http.Request) {
@@ -579,7 +579,7 @@ func TestPostService_UnpinFromProfile(t *testing.T) {
 }
 
 func TestPostService_SetSuggestedSortBest(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) {
@@ -601,7 +601,7 @@ func TestPostService_SetSuggestedSortBest(t *testing.T) {
 }
 
 func TestPostService_SetSuggestedSortTop(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) {
@@ -623,7 +623,7 @@ func TestPostService_SetSuggestedSortTop(t *testing.T) {
 }
 
 func TestPostService_SetSuggestedSortNew(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) {
@@ -645,7 +645,7 @@ func TestPostService_SetSuggestedSortNew(t *testing.T) {
 }
 
 func TestPostService_SetSuggestedSortControversial(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) {
@@ -667,7 +667,7 @@ func TestPostService_SetSuggestedSortControversial(t *testing.T) {
 }
 
 func TestPostService_SetSuggestedSortOld(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) {
@@ -689,7 +689,7 @@ func TestPostService_SetSuggestedSortOld(t *testing.T) {
 }
 
 func TestPostService_SetSuggestedSortRandom(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) {
@@ -711,7 +711,7 @@ func TestPostService_SetSuggestedSortRandom(t *testing.T) {
 }
 
 func TestPostService_SetSuggestedSortAMA(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) {
@@ -733,7 +733,7 @@ func TestPostService_SetSuggestedSortAMA(t *testing.T) {
 }
 
 func TestPostService_SetSuggestedSortLive(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) {
@@ -755,7 +755,7 @@ func TestPostService_SetSuggestedSortLive(t *testing.T) {
 }
 
 func TestPostService_ClearSuggestedSort(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/set_suggested_sort", func(w http.ResponseWriter, r *http.Request) {
@@ -777,7 +777,7 @@ func TestPostService_ClearSuggestedSort(t *testing.T) {
 }
 
 func TestPostService_EnableContestMode(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/set_contest_mode", func(w http.ResponseWriter, r *http.Request) {
@@ -799,7 +799,7 @@ func TestPostService_EnableContestMode(t *testing.T) {
 }
 
 func TestPostService_DisableContestMode(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/set_contest_mode", func(w http.ResponseWriter, r *http.Request) {
@@ -821,7 +821,7 @@ func TestPostService_DisableContestMode(t *testing.T) {
 }
 
 func TestPostService_LoadMoreReplies(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/post/more.json")
@@ -873,7 +873,7 @@ func TestPostService_LoadMoreReplies(t *testing.T) {
 }
 
 func TestPostService_RandomFromSubreddits(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/post/post.json")
@@ -890,7 +890,7 @@ func TestPostService_RandomFromSubreddits(t *testing.T) {
 }
 
 func TestPostService_Random(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/post/post.json")
@@ -907,7 +907,7 @@ func TestPostService_Random(t *testing.T) {
 }
 
 func TestPostService_RandomFromSubscriptions(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/post/post.json")
@@ -924,7 +924,7 @@ func TestPostService_RandomFromSubscriptions(t *testing.T) {
 }
 
 func TestPostService_Delete(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/del", func(w http.ResponseWriter, r *http.Request) {
@@ -944,7 +944,7 @@ func TestPostService_Delete(t *testing.T) {
 }
 
 func TestPostService_Save(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/save", func(w http.ResponseWriter, r *http.Request) {
@@ -964,7 +964,7 @@ func TestPostService_Save(t *testing.T) {
 }
 
 func TestPostService_Unsave(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/unsave", func(w http.ResponseWriter, r *http.Request) {
@@ -984,7 +984,7 @@ func TestPostService_Unsave(t *testing.T) {
 }
 
 func TestPostService_EnableReplies(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/sendreplies", func(w http.ResponseWriter, r *http.Request) {
@@ -1005,7 +1005,7 @@ func TestPostService_EnableReplies(t *testing.T) {
 }
 
 func TestPostService_DisableReplies(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/sendreplies", func(w http.ResponseWriter, r *http.Request) {
@@ -1026,7 +1026,7 @@ func TestPostService_DisableReplies(t *testing.T) {
 }
 
 func TestPostService_Lock(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/lock", func(w http.ResponseWriter, r *http.Request) {
@@ -1046,7 +1046,7 @@ func TestPostService_Lock(t *testing.T) {
 }
 
 func TestPostService_Unlock(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/unlock", func(w http.ResponseWriter, r *http.Request) {
@@ -1066,7 +1066,7 @@ func TestPostService_Unlock(t *testing.T) {
 }
 
 func TestPostService_Upvote(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/vote", func(w http.ResponseWriter, r *http.Request) {
@@ -1088,7 +1088,7 @@ func TestPostService_Upvote(t *testing.T) {
 }
 
 func TestPostService_Downvote(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/vote", func(w http.ResponseWriter, r *http.Request) {
@@ -1110,7 +1110,7 @@ func TestPostService_Downvote(t *testing.T) {
 }
 
 func TestPostService_RemoveVote(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/vote", func(w http.ResponseWriter, r *http.Request) {
@@ -1132,7 +1132,7 @@ func TestPostService_RemoveVote(t *testing.T) {
 }
 
 func TestPostService_MarkVisited(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/store_visits", func(w http.ResponseWriter, r *http.Request) {
@@ -1154,7 +1154,7 @@ func TestPostService_MarkVisited(t *testing.T) {
 }
 
 func TestPostService_Report(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/report", func(w http.ResponseWriter, r *http.Request) {
diff --git a/reddit/reddit_test.go b/reddit/reddit_test.go
index 068bbea..af136c4 100644
--- a/reddit/reddit_test.go
+++ b/reddit/reddit_test.go
@@ -14,39 +14,30 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var (
-	mux    *http.ServeMux
-	ctx    = context.Background()
-	client *Client
-	server *httptest.Server
-)
+var ctx = context.Background()
 
-func setup() {
-	mux = http.NewServeMux()
-	server = httptest.NewServer(mux)
+func setup() (*Client, *http.ServeMux, func()) {
+	mux := http.NewServeMux()
+	server := httptest.NewServer(mux)
 
 	mux.HandleFunc("/api/v1/access_token", func(w http.ResponseWriter, r *http.Request) {
-		response := `
-		{
+		response := `{
 			"access_token": "token1",
 			"token_type": "bearer",
 			"expires_in": 3600,
 			"scope": "*"
-		}
-		`
+		}`
 		w.Header().Add(headerContentType, mediaTypeJSON)
 		fmt.Fprint(w, response)
 	})
 
-	client, _ = NewClient(nil,
+	client, _ := NewClient(nil,
 		&Credentials{"id1", "secret1", "user1", "password1"},
 		WithBaseURL(server.URL),
 		WithTokenURL(server.URL+"/api/v1/access_token"),
 	)
-}
 
-func teardown() {
-	server.Close()
+	return client, mux, server.Close
 }
 
 func readFileContents(path string) (string, error) {
@@ -116,7 +107,7 @@ func TestNewClient_Error(t *testing.T) {
 }
 
 func TestClient_OnRequestComplemented(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	var i int
@@ -146,7 +137,7 @@ func TestClient_OnRequestComplemented(t *testing.T) {
 }
 
 func TestClient_JSONErrorResponse(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/test", func(w http.ResponseWriter, r *http.Request) {
@@ -169,12 +160,12 @@ func TestClient_JSONErrorResponse(t *testing.T) {
 
 	resp, err := client.Do(ctx, req, nil)
 	require.IsType(t, &JSONErrorResponse{}, err)
-	require.EqualError(t, err, fmt.Sprintf(`GET %s/api/v1/test: 200 field "test field" caused TEST_ERROR: this is a test error`, server.URL))
+	require.EqualError(t, err, fmt.Sprintf(`GET %s/api/v1/test: 200 field "test field" caused TEST_ERROR: this is a test error`, client.BaseURL))
 	require.Equal(t, http.StatusOK, resp.StatusCode)
 }
 
 func TestClient_ErrorResponse(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/test", func(w http.ResponseWriter, r *http.Request) {
@@ -190,6 +181,6 @@ func TestClient_ErrorResponse(t *testing.T) {
 
 	resp, err := client.Do(ctx, req, nil)
 	require.IsType(t, &ErrorResponse{}, err)
-	require.EqualError(t, err, fmt.Sprintf(`GET %s/api/v1/test: 403 error message`, server.URL))
+	require.EqualError(t, err, fmt.Sprintf(`GET %s/api/v1/test: 403 error message`, client.BaseURL))
 	require.Equal(t, http.StatusForbidden, resp.StatusCode)
 }
diff --git a/reddit/stream_test.go b/reddit/stream_test.go
index 35c7c1d..9ac54cd 100644
--- a/reddit/stream_test.go
+++ b/reddit/stream_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestStreamService_Posts(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	var counter int
@@ -162,7 +162,7 @@ loop:
 }
 
 func TestStreamService_Posts_DiscardInitial(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	var counter int
diff --git a/reddit/subreddit_test.go b/reddit/subreddit_test.go
index 16b1c9e..2488da3 100644
--- a/reddit/subreddit_test.go
+++ b/reddit/subreddit_test.go
@@ -290,7 +290,7 @@ var expectedModerators = []*Moderator{
 }
 
 func TestSubredditService_HotPosts(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/posts.json")
@@ -307,7 +307,7 @@ func TestSubredditService_HotPosts(t *testing.T) {
 }
 
 func TestSubredditService_NewPosts(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/posts.json")
@@ -324,7 +324,7 @@ func TestSubredditService_NewPosts(t *testing.T) {
 }
 
 func TestSubredditService_RisingPosts(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/posts.json")
@@ -341,7 +341,7 @@ func TestSubredditService_RisingPosts(t *testing.T) {
 }
 
 func TestSubredditService_ControversialPosts(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/posts.json")
@@ -358,7 +358,7 @@ func TestSubredditService_ControversialPosts(t *testing.T) {
 }
 
 func TestSubredditService_TopPosts(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/posts.json")
@@ -375,7 +375,7 @@ func TestSubredditService_TopPosts(t *testing.T) {
 }
 
 func TestSubredditService_Get(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/about.json")
@@ -395,7 +395,7 @@ func TestSubredditService_Get(t *testing.T) {
 }
 
 func TestSubredditService_Popular(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/list.json")
@@ -412,7 +412,7 @@ func TestSubredditService_Popular(t *testing.T) {
 }
 
 func TestSubredditService_New(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/list.json")
@@ -429,7 +429,7 @@ func TestSubredditService_New(t *testing.T) {
 }
 
 func TestSubredditService_Gold(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/list.json")
@@ -446,7 +446,7 @@ func TestSubredditService_Gold(t *testing.T) {
 }
 
 func TestSubredditService_Default(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/list.json")
@@ -463,7 +463,7 @@ func TestSubredditService_Default(t *testing.T) {
 }
 
 func TestSubredditService_Subscribed(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/list.json")
@@ -480,7 +480,7 @@ func TestSubredditService_Subscribed(t *testing.T) {
 }
 
 func TestSubredditService_Approved(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/list.json")
@@ -497,7 +497,7 @@ func TestSubredditService_Approved(t *testing.T) {
 }
 
 func TestSubredditService_Moderated(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/list.json")
@@ -514,7 +514,7 @@ func TestSubredditService_Moderated(t *testing.T) {
 }
 
 func TestSubredditService_GetSticky1(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/post/post.json")
@@ -536,7 +536,7 @@ func TestSubredditService_GetSticky1(t *testing.T) {
 }
 
 func TestSubredditService_GetSticky2(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/post/post.json")
@@ -558,7 +558,7 @@ func TestSubredditService_GetSticky2(t *testing.T) {
 }
 
 func TestSubredditService_Subscribe(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/subscribe", func(w http.ResponseWriter, r *http.Request) {
@@ -578,7 +578,7 @@ func TestSubredditService_Subscribe(t *testing.T) {
 }
 
 func TestSubredditService_SubscribeByID(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/subscribe", func(w http.ResponseWriter, r *http.Request) {
@@ -598,7 +598,7 @@ func TestSubredditService_SubscribeByID(t *testing.T) {
 }
 
 func TestSubredditService_Unsubscribe(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/subscribe", func(w http.ResponseWriter, r *http.Request) {
@@ -618,7 +618,7 @@ func TestSubredditService_Unsubscribe(t *testing.T) {
 }
 
 func TestSubredditService_UnsubscribeByID(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/subscribe", func(w http.ResponseWriter, r *http.Request) {
@@ -638,7 +638,7 @@ func TestSubredditService_UnsubscribeByID(t *testing.T) {
 }
 
 func TestSubredditService_Favorite(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/favorite", func(w http.ResponseWriter, r *http.Request) {
@@ -659,7 +659,7 @@ func TestSubredditService_Favorite(t *testing.T) {
 }
 
 func TestSubredditService_Unfavorite(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/favorite", func(w http.ResponseWriter, r *http.Request) {
@@ -680,7 +680,7 @@ func TestSubredditService_Unfavorite(t *testing.T) {
 }
 
 func TestSubredditService_Search(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/list.json")
@@ -712,7 +712,7 @@ func TestSubredditService_Search(t *testing.T) {
 }
 
 func TestSubredditService_SearchNames(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/search-names.json")
@@ -737,7 +737,7 @@ func TestSubredditService_SearchNames(t *testing.T) {
 }
 
 func TestSubredditService_SearchPosts(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/search-posts.json")
@@ -762,7 +762,7 @@ func TestSubredditService_SearchPosts(t *testing.T) {
 }
 
 func TestSubredditService_SearchPosts_InSubreddit(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/search-posts.json")
@@ -788,7 +788,7 @@ func TestSubredditService_SearchPosts_InSubreddit(t *testing.T) {
 }
 
 func TestSubredditService_SearchPosts_InSubreddits(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/search-posts.json")
@@ -814,7 +814,7 @@ func TestSubredditService_SearchPosts_InSubreddits(t *testing.T) {
 }
 
 func TestSubredditService_Random(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/random.json")
@@ -837,7 +837,7 @@ func TestSubredditService_Random(t *testing.T) {
 }
 
 func TestSubredditService_RandomNSFW(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/random.json")
@@ -860,7 +860,7 @@ func TestSubredditService_RandomNSFW(t *testing.T) {
 }
 
 func TestSubredditService_SubmissionText(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/r/test/api/submit_text", func(w http.ResponseWriter, r *http.Request) {
@@ -877,7 +877,7 @@ func TestSubredditService_SubmissionText(t *testing.T) {
 }
 
 func TestSubredditService_Banned(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/banned-users.json")
@@ -903,7 +903,7 @@ func TestSubredditService_Banned(t *testing.T) {
 }
 
 func TestSubredditService_Muted(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/relationships.json")
@@ -929,7 +929,7 @@ func TestSubredditService_Muted(t *testing.T) {
 }
 
 func TestSubredditService_WikiBanned(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/banned-users.json")
@@ -955,7 +955,7 @@ func TestSubredditService_WikiBanned(t *testing.T) {
 }
 
 func TestSubredditService_Contributors(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/relationships.json")
@@ -980,7 +980,7 @@ func TestSubredditService_Contributors(t *testing.T) {
 }
 
 func TestSubredditService_WikiContributors(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/relationships.json")
@@ -1005,7 +1005,7 @@ func TestSubredditService_WikiContributors(t *testing.T) {
 }
 
 func TestSubredditService_Moderators(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/subreddit/moderators.json")
diff --git a/reddit/user_test.go b/reddit/user_test.go
index 3ab62c3..443b8b3 100644
--- a/reddit/user_test.go
+++ b/reddit/user_test.go
@@ -187,7 +187,7 @@ var expectedSearchUsers = &Users{
 }
 
 func TestUserService_Get(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/get.json")
@@ -204,7 +204,7 @@ func TestUserService_Get(t *testing.T) {
 }
 
 func TestUserService_GetMultipleByID(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/get-multiple-by-id.json")
@@ -226,7 +226,7 @@ func TestUserService_GetMultipleByID(t *testing.T) {
 }
 
 func TestUserService_UsernameAvailable(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/username_available", func(w http.ResponseWriter, r *http.Request) {
@@ -252,7 +252,7 @@ func TestUserService_UsernameAvailable(t *testing.T) {
 }
 
 func TestUserService_Overview(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/overview.json")
@@ -278,7 +278,7 @@ func TestUserService_Overview(t *testing.T) {
 }
 
 func TestUserService_OverviewOf(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/overview.json")
@@ -304,7 +304,7 @@ func TestUserService_OverviewOf(t *testing.T) {
 }
 
 func TestUserService_Overview_Options(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/overview.json")
@@ -336,7 +336,7 @@ func TestUserService_Overview_Options(t *testing.T) {
 }
 
 func TestUserService_Posts(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/submitted.json")
@@ -357,7 +357,7 @@ func TestUserService_Posts(t *testing.T) {
 }
 
 func TestUserService_PostsOf(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/submitted.json")
@@ -378,7 +378,7 @@ func TestUserService_PostsOf(t *testing.T) {
 }
 
 func TestUserService_Posts_Options(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/submitted.json")
@@ -408,7 +408,7 @@ func TestUserService_Posts_Options(t *testing.T) {
 }
 
 func TestUserService_Comments(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/comments.json")
@@ -429,7 +429,7 @@ func TestUserService_Comments(t *testing.T) {
 }
 
 func TestUserService_CommentsOf(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/comments.json")
@@ -450,7 +450,7 @@ func TestUserService_CommentsOf(t *testing.T) {
 }
 
 func TestUserService_Comments_Options(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/comments.json")
@@ -480,7 +480,7 @@ func TestUserService_Comments_Options(t *testing.T) {
 }
 
 func TestUserService_Saved(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -507,7 +507,7 @@ func TestUserService_Saved(t *testing.T) {
 }
 
 func TestUserService_Saved_Options(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -537,7 +537,7 @@ func TestUserService_Saved_Options(t *testing.T) {
 	require.NoError(t, err)
 }
 func TestUserService_Upvoted(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -559,7 +559,7 @@ func TestUserService_Upvoted(t *testing.T) {
 }
 
 func TestUserService_Upvoted_Options(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -590,7 +590,7 @@ func TestUserService_Upvoted_Options(t *testing.T) {
 }
 
 func TestUserService_UpvotedOf(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -612,7 +612,7 @@ func TestUserService_UpvotedOf(t *testing.T) {
 }
 
 func TestUserService_Downvoted(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -634,7 +634,7 @@ func TestUserService_Downvoted(t *testing.T) {
 }
 
 func TestUserService_Downvoted_Options(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -665,7 +665,7 @@ func TestUserService_Downvoted_Options(t *testing.T) {
 }
 
 func TestUserService_DownvotedOf(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -687,7 +687,7 @@ func TestUserService_DownvotedOf(t *testing.T) {
 }
 
 func TestUserService_Hidden(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -709,7 +709,7 @@ func TestUserService_Hidden(t *testing.T) {
 }
 
 func TestUserService_Gilded(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	// we'll use this, similar payloads
@@ -731,7 +731,7 @@ func TestUserService_Gilded(t *testing.T) {
 }
 
 func TestUserService_GetFriendship(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/friend.json")
@@ -748,7 +748,7 @@ func TestUserService_GetFriendship(t *testing.T) {
 }
 
 func TestUserService_Friend(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/friend.json")
@@ -775,7 +775,7 @@ func TestUserService_Friend(t *testing.T) {
 }
 
 func TestUserService_Unfriend(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	mux.HandleFunc("/api/v1/me/friends/test123", func(w http.ResponseWriter, r *http.Request) {
@@ -789,7 +789,7 @@ func TestUserService_Unfriend(t *testing.T) {
 }
 
 func TestUserService_Block(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/block.json")
@@ -814,7 +814,7 @@ func TestUserService_Block(t *testing.T) {
 }
 
 func TestUserService_BlockByID(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/block.json")
@@ -839,7 +839,7 @@ func TestUserService_BlockByID(t *testing.T) {
 }
 
 func TestUserService_Unblock(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	client.redditID = "self123"
@@ -862,7 +862,7 @@ func TestUserService_Unblock(t *testing.T) {
 }
 
 func TestUserService_UnblockByID(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	client.redditID = "self123"
@@ -885,7 +885,7 @@ func TestUserService_UnblockByID(t *testing.T) {
 }
 
 func TestUserService_Trophies(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/trophies.json")
@@ -902,7 +902,7 @@ func TestUserService_Trophies(t *testing.T) {
 }
 
 func TestUserService_TrophiesOf(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/trophies.json")
@@ -919,7 +919,7 @@ func TestUserService_TrophiesOf(t *testing.T) {
 }
 
 func TestUserService_Popular(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/user-subreddits.json")
@@ -936,7 +936,7 @@ func TestUserService_Popular(t *testing.T) {
 }
 
 func TestUserService_New(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/user-subreddits.json")
@@ -953,7 +953,7 @@ func TestUserService_New(t *testing.T) {
 }
 
 func TestUserService_Search(t *testing.T) {
-	setup()
+	client, mux, teardown := setup()
 	defer teardown()
 
 	blob, err := readFileContents("../testdata/user/list.json")