diff --git a/card_test.go b/card_test.go
index d4e3b1b..5fb9af8 100644
--- a/card_test.go
+++ b/card_test.go
@@ -6,7 +6,6 @@
 package trello
 
 import (
-	"fmt"
 	"net/http"
 	"testing"
 	"time"
@@ -27,10 +26,10 @@ func TestCardCreatedAt(t *testing.T) {
 func TestGetCardsOnBoard(t *testing.T) {
 	board := testBoard(t)
 
-	server := mockDynamicPathResponse()
+	server := NewMockResponder(t)
 	defer server.Close()
 
-	board.client.BaseURL = server.URL
+	board.client.BaseURL = server.URL()
 	cards, err := board.GetCards(Defaults())
 	if err != nil {
 		t.Fatal(err)
@@ -43,9 +42,9 @@ func TestGetCardsOnBoard(t *testing.T) {
 func TestGetCardsInList(t *testing.T) {
 	list := testList(t)
 
-	server := mockResponse("cards", "list-cards-api-example.json")
+	server := NewMockResponder(t, "cards", "list-cards-api-example.json")
 	defer server.Close()
-	list.client.BaseURL = server.URL
+	list.client.BaseURL = server.URL()
 
 	cards, err := list.GetCards(Defaults())
 	if err != nil {
@@ -59,9 +58,9 @@ func TestGetCardsInList(t *testing.T) {
 func TestCardsCustomFields(t *testing.T) {
 	list := testList(t)
 
-	server := mockResponse("cards", "list-cards-api-example.json")
+	server := NewMockResponder(t, "cards", "list-cards-api-example.json")
 	defer server.Close()
-	list.client.BaseURL = server.URL
+	list.client.BaseURL = server.URL()
 
 	cards, err := list.GetCards(Defaults())
 	if err != nil {
@@ -96,10 +95,10 @@ func TestCardsCustomFields(t *testing.T) {
 func TestBoardContainsCopyOfCard(t *testing.T) {
 	board := testBoard(t)
 
-	server := mockResponse("actions", "board-actions-copyCard.json")
+	server := NewMockResponder(t, "actions", "board-actions-copyCard.json")
 	defer server.Close()
 
-	board.client.BaseURL = server.URL
+	board.client.BaseURL = server.URL()
 	firstResult, err := board.ContainsCopyOfCard("57f50c552b96e3fffe588aad", Defaults())
 	if err != nil {
 		t.Error(err)
@@ -221,16 +220,16 @@ func TestAddCardToList(t *testing.T) {
 func TestArchiveUnarchive(t *testing.T) {
 	c := testCard(t)
 
-	server := mockResponse("cards", "card-archived.json")
-	c.client.BaseURL = server.URL
+	server := NewMockResponder(t, "cards", "card-archived.json")
+	c.client.BaseURL = server.URL()
 	c.Archive()
 	if c.Closed == false {
 		t.Errorf("Card should have been archived.")
 	}
 	server.Close()
 
-	server = mockResponse("cards", "card-unarchived.json")
-	c.client.BaseURL = server.URL
+	server = NewMockResponder(t, "cards", "card-unarchived.json")
+	c.client.BaseURL = server.URL()
 	c.Unarchive()
 	if c.Closed == true {
 		t.Errorf("Card should have been unarchived.")
@@ -241,9 +240,9 @@ func TestArchiveUnarchive(t *testing.T) {
 func TestCopyCardToList(t *testing.T) {
 	c := testCard(t)
 
-	server := mockResponse("cards", "card-copied.json")
+	server := NewMockResponder(t, "cards", "card-copied.json")
 	defer server.Close()
-	c.client.BaseURL = server.URL
+	c.client.BaseURL = server.URL()
 
 	newCard, err := c.CopyToList("57f03a022cd45c863ca581f1", Defaults())
 	if err != nil {
@@ -262,9 +261,9 @@ func TestCopyCardToList(t *testing.T) {
 func TestGetParentCard(t *testing.T) {
 	c := testCard(t)
 
-	server := mockDynamicPathResponse()
+	server := NewMockResponder(t)
 	defer server.Close()
-	c.client.BaseURL = server.URL
+	c.client.BaseURL = server.URL()
 
 	parent, err := c.GetParentCard(Defaults())
 	if err != nil {
@@ -293,10 +292,10 @@ func TestGetAncestorCards(t *testing.T) {
 
 func TestAddMemberIdToCard(t *testing.T) {
 	c := testCard(t)
-	server := mockResponse("cards", "card-add-member-response.json")
+	server := NewMockResponder(t, "cards", "card-add-member-response.json")
 	defer server.Close()
 
-	c.client.BaseURL = server.URL
+	c.client.BaseURL = server.URL()
 	member, err := c.AddMemberID("testmemberid")
 	if err != nil {
 		t.Error(err)
@@ -311,10 +310,10 @@ func TestAddMemberIdToCard(t *testing.T) {
 
 func TestAddURLAttachmentToCard(t *testing.T) {
 	c := testCard(t)
-	server := mockResponse("cards", "url-attachments.json")
+	server := NewMockResponder(t, "cards", "url-attachments.json")
 	defer server.Close()
 
-	c.client.BaseURL = server.URL
+	c.client.BaseURL = server.URL()
 	attachment := Attachment{
 		Name: "Test",
 		URL:  "https://github.com/test",
@@ -341,10 +340,10 @@ func TestCardSetClient(t *testing.T) {
 //
 func testCard(t *testing.T) *Card {
 	c := testClient()
-	server := mockResponse("cards", "card-api-example.json")
+	server := NewMockResponder(t, "cards", "card-api-example.json")
 	defer server.Close()
 
-	c.BaseURL = server.URL
+	c.BaseURL = server.URL()
 	card, err := c.GetCard("4eea503", Defaults())
 	if err != nil {
 		t.Fatal(err)