diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index cefee34e..3a48a5b0 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -364,215 +364,215 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
+			"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/testing/fake.go b/testing/fake.go
index da47b23b..900c2636 100644
--- a/testing/fake.go
+++ b/testing/fake.go
@@ -22,10 +22,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/version"
 	"k8s.io/apimachinery/pkg/watch"
-	kubeversion "k8s.io/client-go/pkg/version"
 	restclient "k8s.io/client-go/rest"
 )
 
@@ -214,46 +211,3 @@ func (c *Fake) Actions() []Action {
 	copy(fa, c.actions)
 	return fa
 }
-
-// TODO: this probably should be moved to somewhere else.
-type FakeDiscovery struct {
-	*Fake
-}
-
-func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) {
-	action := ActionImpl{
-		Verb:     "get",
-		Resource: schema.GroupVersionResource{Resource: "resource"},
-	}
-	c.Invokes(action, nil)
-	for _, rl := range c.Resources {
-		if rl.GroupVersion == groupVersion {
-			return rl, nil
-		}
-	}
-
-	return nil, fmt.Errorf("GroupVersion %q not found", groupVersion)
-}
-
-func (c *FakeDiscovery) ServerResources() ([]*metav1.APIResourceList, error) {
-	action := ActionImpl{
-		Verb:     "get",
-		Resource: schema.GroupVersionResource{Resource: "resource"},
-	}
-	c.Invokes(action, nil)
-	return c.Resources, nil
-}
-
-func (c *FakeDiscovery) ServerGroups() (*metav1.APIGroupList, error) {
-	return nil, nil
-}
-
-func (c *FakeDiscovery) ServerVersion() (*version.Info, error) {
-	action := ActionImpl{}
-	action.Verb = "get"
-	action.Resource = schema.GroupVersionResource{Resource: "version"}
-
-	c.Invokes(action, nil)
-	versionInfo := kubeversion.Get()
-	return &versionInfo, nil
-}