diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 66d01931..540474e2 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -272,331 +272,331 @@
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta2",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1beta1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1beta1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v2beta1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1beta1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v2alpha1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/certificates/v1beta1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/coordination/v1beta1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/core/v1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/events/v1beta1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/extensions/v1beta1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/networking/v1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/policy/v1beta1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1alpha1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1beta1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1alpha1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1beta1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/settings/v1alpha1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1alpha1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1beta1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "70491ec73e10be2989242c913738f049a37e72c7"
+		},
+		{
+			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+		},
+		{
+			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+		},
+		{
+			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
-		},
-		{
-			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
-		},
-		{
-			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
-		},
-		{
-			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "183f3326a9353bd6d41430fc80f96259331d029c"
+			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/scale/roundtrip_test.go b/scale/roundtrip_test.go
index 2d3b28bf..1da98704 100644
--- a/scale/roundtrip_test.go
+++ b/scale/roundtrip_test.go
@@ -19,7 +19,7 @@ package scale
 import (
 	"testing"
 
-	"k8s.io/apimachinery/pkg/api/testing/roundtrip"
+	"k8s.io/apimachinery/pkg/api/apitesting/roundtrip"
 )
 
 // NB: this can't be in the scheme package, because importing'