diff --git a/pkg/rest/core/fake/rest_client_test.go b/pkg/rest/core/fake/rest_client_test.go
new file mode 100644
index 00000000000..b9cb1a55661
--- /dev/null
+++ b/pkg/rest/core/fake/rest_client_test.go
@@ -0,0 +1,287 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package fake
+
+import (
+	"bytes"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"testing"
+
+	"github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog"
+	_ "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/install"
+	"github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/testapi"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+const (
+	ns1   = "ns1"
+	ns2   = "ns2"
+	tipe1 = "tipe1"
+	name1 = "name1"
+	name2 = "name2"
+	name3 = "name3"
+)
+
+//Helpers
+func createSingleItemStorage() NamespacedStorage {
+	storage := make(NamespacedStorage)
+	storage.Set(ns1, tipe1, name1, &servicecatalog.Broker{})
+	return storage
+}
+
+func createMultipleItemStorage() NamespacedStorage {
+	storage := make(NamespacedStorage)
+	storage.Set(ns1, tipe1, name1, &servicecatalog.Broker{})
+	storage.Set(ns1, tipe1, name2, &servicecatalog.Broker{})
+	storage.Set(ns1, tipe1, name3, &servicecatalog.Broker{})
+
+	storage.Set(ns2, tipe1, name1, &servicecatalog.Broker{})
+	storage.Set(ns2, tipe1, name2, &servicecatalog.Broker{})
+
+	return storage
+
+}
+
+func TestNamespacedStorageSetDelete(t *testing.T) {
+	storage := make(NamespacedStorage)
+
+	if nil != storage.Get(ns1, tipe1, name1) {
+		t.Fatal("Expected no results from an empty storage")
+	}
+
+	storage = createSingleItemStorage()
+
+	if storage.Get(ns1, tipe1, name1) == nil {
+		t.Fatal("Expected a object to be stored")
+	}
+
+	storage.Delete(ns1, tipe1, name1)
+	if nil != storage.Get(ns1, tipe1, name1) {
+		t.Fatal("Expected the object to be deleted")
+	}
+}
+
+func TestNamespacedStorageGetList(t *testing.T) {
+	storage := createMultipleItemStorage()
+
+	objects := storage.GetList(ns1, tipe1)
+	if count := len(objects); count != 3 {
+		t.Fatal("Expected ", 3, "got", count)
+	}
+
+	objects = storage.GetList(ns2, tipe1)
+	if count := len(objects); count != 2 {
+		t.Fatal("Expected ", 2, "got", count)
+	}
+}
+
+func TestResponseWriter(t *testing.T) {
+	rw := newResponseWriter()
+	length, err := rw.Write([]byte{0, 0, 0})
+	if err != nil {
+		t.Fatal("Error writing response", err)
+	}
+
+	if length != 3 {
+		t.Fatal("Expected length", 3, "got", length)
+	}
+}
+
+func TestResponseWriterGetResponsePanic(t *testing.T) {
+	rw := newResponseWriter()
+	// no hearder status set should panic
+	defer func() {
+		if r := recover(); r == nil {
+			t.Fatal("Expected a panic")
+		}
+	}()
+	rw.getResponse()
+}
+
+func TestResponseWriterGetResponse(t *testing.T) {
+	rw := newResponseWriter()
+	rw.WriteHeader(http.StatusFound)
+
+	if response := rw.getResponse(); response.StatusCode != http.StatusFound {
+		t.Fatal("Expected", 0, "got", response.StatusCode)
+	}
+}
+
+func TestGetItem(t *testing.T) {
+	testCases := []struct {
+		name           string
+		storage        NamespacedStorage
+		watcher        *Watcher
+		rw             *responseWriter
+		url            string
+		expectedStatus int
+	}{
+		{"Empty Storage", make(NamespacedStorage), NewWatcher(), newResponseWriter(), fmt.Sprintf("/apis/servicecatalog.k8s.io/v1alpha1/namespaces/%s/%s/%s", ns1, tipe1, name1), http.StatusNotFound},
+		{"One Item in storage", createSingleItemStorage(), NewWatcher(), newResponseWriter(), fmt.Sprintf("/apis/servicecatalog.k8s.io/v1alpha1/namespaces/%s/%s/%s", ns1, tipe1, name1), http.StatusOK},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			request, err := http.NewRequest("GET", tc.url, nil)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			router := getRouter(tc.storage, tc.watcher, func() runtime.Object {
+				return &servicecatalog.Instance{}
+			})
+
+			router.ServeHTTP(tc.rw, request)
+
+			body, err := ioutil.ReadAll(tc.rw.getResponse().Body)
+			if err != nil {
+				t.Error("Could not read response.", err)
+			}
+
+			if tc.rw.getResponse().StatusCode != tc.expectedStatus && tc.rw.headerSet {
+				t.Error("Expected Status", tc.expectedStatus, "got", tc.rw.getResponse().StatusCode)
+				t.Error("Http error:", string(body))
+			}
+			if err != nil {
+				t.Fatal(err)
+			}
+		})
+	}
+}
+
+func TestGetItems(t *testing.T) {
+	testCases := []struct {
+		name           string
+		storage        NamespacedStorage
+		watcher        *Watcher
+		rw             *responseWriter
+		url            string
+		expectedStatus int
+	}{
+		{"Empty Storage", make(NamespacedStorage), NewWatcher(), newResponseWriter(), fmt.Sprintf("/apis/servicecatalog.k8s.io/v1alpha1/namespaces/%v/brokers", ns1), http.StatusOK},
+		{"Multiple Items", createMultipleItemStorage(), NewWatcher(), newResponseWriter(), fmt.Sprintf("/apis/servicecatalog.k8s.io/v1alpha1/namespaces/%v/brokers", ns1), http.StatusOK},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			request, err := http.NewRequest("GET", tc.url, nil)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			router := getRouter(tc.storage, tc.watcher, func() runtime.Object {
+				return &servicecatalog.Instance{}
+			})
+
+			router.ServeHTTP(tc.rw, request)
+
+			body, err := ioutil.ReadAll(tc.rw.getResponse().Body)
+			if err != nil {
+				t.Error("Could not read response.", err)
+			}
+
+			if tc.rw.getResponse().StatusCode != tc.expectedStatus && tc.rw.headerSet {
+				t.Error("Expected Status", tc.expectedStatus, "got", tc.rw.getResponse().StatusCode)
+				t.Error("Http error:", string(body))
+			}
+			if err != nil {
+				t.Fatal(err)
+			}
+		})
+	}
+
+}
+
+func TestCreateItem(t *testing.T) {
+	testCases := []struct {
+		name                  string
+		storage               NamespacedStorage
+		watcher               *Watcher
+		rw                    *responseWriter
+		url                   string
+		item                  runtime.Object
+		expectedStatus        int
+		expectedStorageLength int
+	}{
+		{
+			"Create Item (empty storage)",
+			make(NamespacedStorage), NewWatcher(),
+			newResponseWriter(),
+			fmt.Sprintf("/apis/servicecatalog.k8s.io/v1alpha1/namespaces/%s/%s", ns1, tipe1),
+			&servicecatalog.Broker{ObjectMeta: metav1.ObjectMeta{Name: name1}, TypeMeta: metav1.TypeMeta{Kind: "Broker", APIVersion: "servicecatalog.k8s.io/v1alpha1"}},
+			http.StatusCreated,
+			1,
+		},
+		{
+			"Create misformed item(no Kind)",
+			make(NamespacedStorage),
+			NewWatcher(),
+			newResponseWriter(),
+			fmt.Sprintf("/apis/servicecatalog.k8s.io/v1alpha1/namespaces/%s/%s", ns1, tipe1),
+			&servicecatalog.Broker{}, http.StatusInternalServerError,
+			0,
+		},
+		{
+			"Create Item(non-empty storage)",
+			createMultipleItemStorage(),
+			NewWatcher(),
+			newResponseWriter(),
+			fmt.Sprintf("/apis/servicecatalog.k8s.io/v1alpha1/namespaces/%s/%s", ns1, tipe1), &servicecatalog.Broker{TypeMeta: metav1.TypeMeta{Kind: "Broker", APIVersion: "servicecatalog.k8s.io/v1alpha1"}},
+			http.StatusCreated,
+			2,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			codec, err := testapi.GetCodecForObject(tc.item)
+			if err != nil {
+				t.Fatalf("error getting a codec for %#v (%s)", tc.item, err)
+			}
+			bodyBytes, err := runtime.Encode(codec, tc.item)
+			if err != nil {
+				t.Fatalf("error getting a encoding %#v (%s)", tc.item, err)
+			}
+			request, err := http.NewRequest("POST", tc.url, bytes.NewReader(bodyBytes))
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			router := getRouter(tc.storage, tc.watcher, func() runtime.Object {
+				return tc.item
+			})
+
+			router.ServeHTTP(tc.rw, request)
+
+			body, err := ioutil.ReadAll(tc.rw.getResponse().Body)
+			if err != nil {
+				t.Error("Could not read response.", err)
+			}
+
+			if tc.rw.getResponse().StatusCode != tc.expectedStatus && tc.rw.headerSet {
+				t.Error("Expected Status", tc.expectedStatus, "got", tc.rw.getResponse().StatusCode)
+				t.Error("Http error:", string(body))
+			}
+			if len(tc.storage) != tc.expectedStorageLength {
+				t.Error("Expected the length of the storage to be", tc.expectedStorageLength, "got", len(tc.storage))
+			}
+		})
+	}
+}