@@ -447,7 +447,7 @@ func TestHandlePod(t *testing.T) {

 		if tc.startTimestamp != nil && build.StartTimestamp == nil {

 			t.Errorf("(%d) nil start timestamp!", i)

 		}

-		if tc.startTimestamp != nil && !tc.startTimestamp.Before(build.StartTimestamp.Time) && tc.startTimestamp.Time != build.StartTimestamp.Time {

+		if tc.startTimestamp != nil && !tc.startTimestamp.Before(*build.StartTimestamp) && tc.startTimestamp.Time != build.StartTimestamp.Time {

 			t.Errorf("(%d) Expected build start timestamp %v to be equal to or later than %v!", i, build.StartTimestamp, tc.startTimestamp)

 		}

@@ -457,7 +457,7 @@ func TestHandlePod(t *testing.T) {

 		if tc.completionTimestamp != nil && build.CompletionTimestamp == nil {

 			t.Errorf("(%d) nil completion timestamp!", i)

 		}

-		if tc.completionTimestamp != nil && !tc.completionTimestamp.Before(build.CompletionTimestamp.Time) && tc.completionTimestamp.Time != build.CompletionTimestamp.Time {

+		if tc.completionTimestamp != nil && !tc.completionTimestamp.Before(*build.CompletionTimestamp) && tc.completionTimestamp.Time != build.CompletionTimestamp.Time {

 			t.Errorf("(%d) Expected build completion timestamp %v to be equal to or later than %v!", i, build.CompletionTimestamp, tc.completionTimestamp)

 		}

 	}

@@ -570,7 +570,7 @@ func TestCancelBuild(t *testing.T) {

 		if tc.startTimestamp != nil && build.StartTimestamp == nil {

 			t.Errorf("(%d) nil start timestamp!", i)

 		}

-		if tc.startTimestamp != nil && !tc.startTimestamp.Before(build.StartTimestamp.Time) && tc.startTimestamp.Time != build.StartTimestamp.Time {

+		if tc.startTimestamp != nil && !tc.startTimestamp.Before(*build.StartTimestamp) && tc.startTimestamp.Time != build.StartTimestamp.Time {

 			t.Errorf("(%d) Expected build start timestamp %v to be equal to or later than %v!", i, build.StartTimestamp, tc.startTimestamp)

 		}

@@ -580,7 +580,7 @@ func TestCancelBuild(t *testing.T) {

 		if tc.completionTimestamp != nil && build.CompletionTimestamp == nil {

 			t.Errorf("(%d) nil start timestamp!", i)

 		}

-		if tc.completionTimestamp != nil && !tc.completionTimestamp.Before(build.CompletionTimestamp.Time) && tc.completionTimestamp.Time != build.CompletionTimestamp.Time {

+		if tc.completionTimestamp != nil && !tc.completionTimestamp.Before(*build.CompletionTimestamp) && tc.completionTimestamp.Time != build.CompletionTimestamp.Time {

 			t.Errorf("(%d) Expected build completion timestamp %v to be equal to or later than %v!", i, build.CompletionTimestamp, tc.completionTimestamp)

 		}

@@ -102,7 +102,7 @@ func NewCmdProcess(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.

 					ok   bool

 					data []byte

 				)

-				mapping, _, _, data, err := cmdutil.ResourceFromFile(filename, typer, mapper, schema, cfg.Version)

+				mapping, _, _, data, err = cmdutil.ResourceFromFile(filename, typer, mapper, schema, cfg.Version)

 				checkErr(err)

 				obj, err := mapping.Codec.Decode(data)

 				checkErr(err)

@@ -282,8 +282,8 @@ func (c *MasterConfig) InstallProtectedAPI(container *restful.Container) []strin

 		Mapper: latest.RESTMapper,

-		Creater: api.Scheme,

-		Typer:   api.Scheme,

+		Creater: kapi.Scheme,

+		Typer:   kapi.Scheme,

 		Linker:  latest.SelfLinker,

 		Admit:   admissionControl,

@@ -215,7 +215,25 @@ func NewTestBuildOpenshift(t *testing.T) *testBuildOpenshift {

 		"imageRepositories/status": imageRepositoryStatus,

 	}

-	apiserver.NewAPIGroupVersion(storage, latest.Codec, "/osapi", "v1beta1", interfaces.MetadataAccessor, admit.NewAlwaysAdmit(), kapi.NewRequestContextMapper(), latest.RESTMapper).InstallREST(handlerContainer, "/osapi", "v1beta1")

+	version := &apiserver.APIGroupVersion{

+		Root:    "/osapi",

+		Version: "v1beta1",

+

+		Storage: storage,

+		Codec:   latest.Codec,

+

+		Mapper: latest.RESTMapper,

+

+		Creater: kapi.Scheme,

+		Typer:   kapi.Scheme,

+		Linker:  interfaces.MetadataAccessor,

+

+		Admit:   admit.NewAlwaysAdmit(),

+		Context: kapi.NewRequestContextMapper(),

+	}

+	if err := version.InstallREST(handlerContainer); err != nil {

+		t.Fatalf("unable to install REST: %v", err)

+	}

 	openshift.whPrefix = "/osapi/v1beta1/buildConfigHooks/"

 	osMux.Handle(openshift.whPrefix, http.StripPrefix(openshift.whPrefix,

@@ -413,7 +413,25 @@ func NewTestOpenshift(t *testing.T) *testOpenshift {

 		"buildConfigs":              buildconfigregistry.NewREST(buildEtcd),

 	}

-	apiserver.NewAPIGroupVersion(storage, v1beta1.Codec, "/osapi", "v1beta1", interfaces.MetadataAccessor, admit.NewAlwaysAdmit(), kapi.NewRequestContextMapper(), latest.RESTMapper).InstallREST(handlerContainer, "/osapi", "v1beta1")

+	version := &apiserver.APIGroupVersion{

+		Root:    "/osapi",

+		Version: "v1beta1",

+

+		Storage: storage,

+		Codec:   latest.Codec,

+

+		Mapper: latest.RESTMapper,

+

+		Creater: kapi.Scheme,

+		Typer:   kapi.Scheme,

+		Linker:  interfaces.MetadataAccessor,

+

+		Admit:   admit.NewAlwaysAdmit(),

+		Context: kapi.NewRequestContextMapper(),

+	}

+	if err := version.InstallREST(handlerContainer); err != nil {

+		t.Fatalf("unable to install REST: %v", err)

+	}

 	dccFactory := deployconfigcontroller.DeploymentConfigControllerFactory{

 		Client:     osClient,

@@ -309,7 +309,24 @@ func NewTestImageOpenShift(t *testing.T) *testImageOpenshift {

 		"imageRepositoryTags":      imagerepositorytag.NewREST(imageRegistry, imageRepositoryRegistry),

 	}

-	apiserver.NewAPIGroupVersion(storage, latest.Codec, "/osapi", "v1beta1", interfaces.MetadataAccessor, admit.NewAlwaysAdmit(), kapi.NewRequestContextMapper(), latest.RESTMapper).InstallREST(handlerContainer, "/osapi", "v1beta1")

+	version := &apiserver.APIGroupVersion{

+		Root:    "/osapi",

+		Version: "v1beta1",

+		Storage: storage,

+		Codec:   latest.Codec,

+

+		Mapper: latest.RESTMapper,

+

+		Creater: kapi.Scheme,

+		Typer:   kapi.Scheme,

+		Linker:  interfaces.MetadataAccessor,

+

+		Admit:   admit.NewAlwaysAdmit(),

+		Context: kapi.NewRequestContextMapper(),

+	}

+	if err := version.InstallREST(handlerContainer); err != nil {

+		t.Fatalf("unable to install REST: %v", err)

+	}

 	return openshift

 }

@@ -56,7 +56,7 @@ func TestOAuthStorage(t *testing.T) {

 	testutil.DeleteAllEtcdKeys()

 	interfaces, _ := latest.InterfacesFor(latest.Version)

 	etcdClient := testutil.NewEtcdClient()

-	etcdHelper := tools.EtcdHelper{etcdClient, interfaces.Codec, tools.RuntimeVersionAdapter{interfaces.MetadataAccessor}}

+	etcdHelper := tools.NewEtcdHelper(etcdClient, interfaces.Codec)

 	registry := etcd.New(etcdHelper)

 	user := &testUser{UserName: "test", UserUID: "1"}

@@ -3,6 +3,7 @@

 package integration

 import (

+	"net/http"

 	"net/http/httptest"

 	"testing"

@@ -12,7 +13,7 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver"

 	kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/master"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/namespace"

+	namespaceetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/namespace/etcd"

 	"github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/admit"

 	"github.com/openshift/origin/pkg/api/latest"

@@ -38,13 +39,37 @@ func TestProjectIsNamespace(t *testing.T) {

 	// create a kube and its client

 	kubeInterfaces, _ := klatest.InterfacesFor(klatest.Version)

-	namespaceRegistry := namespace.NewEtcdRegistry(etcdHelper)

+	namespaceStorage := namespaceetcd.NewREST(etcdHelper)

 	kubeStorage := map[string]apiserver.RESTStorage{

-		"namespaces": namespace.NewREST(namespaceRegistry),

+		"namespaces": namespaceStorage,

 	}

-	kubeServer := httptest.NewServer(apiserver.Handle(kubeStorage, kv1beta1.Codec, "/api", "v1beta1", kubeInterfaces.MetadataAccessor, admit.NewAlwaysAdmit(), kapi.NewRequestContextMapper(), klatest.RESTMapper))

-	defer kubeServer.Close()

-	kubeClient, err := kclient.New(&kclient.Config{Host: kubeServer.URL})

+

+	osMux := http.NewServeMux()

+	server := httptest.NewServer(osMux)

+	defer server.Close()

+	handlerContainer := master.NewHandlerContainer(osMux)

+

+	version := &apiserver.APIGroupVersion{

+		Root:    "/api",

+		Version: "v1beta1",

+

+		Storage: kubeStorage,

+		Codec:   kv1beta1.Codec,

+

+		Mapper: klatest.RESTMapper,

+

+		Creater: kapi.Scheme,

+		Typer:   kapi.Scheme,

+		Linker:  kubeInterfaces.MetadataAccessor,

+

+		Admit:   admit.NewAlwaysAdmit(),

+		Context: kapi.NewRequestContextMapper(),

+	}

+	if err := version.InstallREST(handlerContainer); err != nil {

+		t.Fatalf("unable to install REST: %v", err)

+	}

+

+	kubeClient, err := kclient.New(&kclient.Config{Host: server.URL})

 	if err != nil {

 		t.Fatalf("Unexpected error: %v", err)

 	}

@@ -54,9 +79,27 @@ func TestProjectIsNamespace(t *testing.T) {

 	originStorage := map[string]apiserver.RESTStorage{

 		"projects": projectregistry.NewREST(kubeClient.Namespaces(), nil),

 	}

-	originServer := httptest.NewServer(apiserver.Handle(originStorage, v1beta1.Codec, "/osapi", "v1beta1", originInterfaces.MetadataAccessor, admit.NewAlwaysAdmit(), kapi.NewRequestContextMapper(), latest.RESTMapper))

-	defer originServer.Close()

-	originClient, err := client.New(&kclient.Config{Host: originServer.URL})

+	osVersion := &apiserver.APIGroupVersion{

+		Root:    "/osapi",

+		Version: "v1beta1",

+

+		Storage: originStorage,

+		Codec:   v1beta1.Codec,

+

+		Mapper: latest.RESTMapper,

+

+		Creater: kapi.Scheme,

+		Typer:   kapi.Scheme,

+		Linker:  originInterfaces.MetadataAccessor,

+

+		Admit:   admit.NewAlwaysAdmit(),

+		Context: kapi.NewRequestContextMapper(),

+	}

+	if err := osVersion.InstallREST(handlerContainer); err != nil {

+		t.Fatalf("unable to install REST: %v", err)

+	}

+

+	originClient, err := client.New(&kclient.Config{Host: server.URL})

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

 	}

@@ -13,12 +13,12 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver"

 	kuser "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user"

 	kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/master"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"

 	"github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/admit"

 	"github.com/openshift/origin/pkg/api/latest"

-	"github.com/openshift/origin/pkg/api/v1beta1"

 	oapauth "github.com/openshift/origin/pkg/auth/authenticator/password/oauthpassword/registry"

 	"github.com/openshift/origin/pkg/client"

 	"github.com/openshift/origin/pkg/user"

@@ -38,14 +38,36 @@ func TestUserInitialization(t *testing.T) {

 	testutil.DeleteAllEtcdKeys()

 	etcdClient := testutil.NewEtcdClient()

 	interfaces, _ := latest.InterfacesFor(latest.Version)

-	userRegistry := etcd.New(tools.EtcdHelper{etcdClient, interfaces.Codec, tools.RuntimeVersionAdapter{interfaces.MetadataAccessor}}, user.NewDefaultUserInitStrategy())

+	userRegistry := etcd.New(tools.NewEtcdHelper(etcdClient, interfaces.Codec), user.NewDefaultUserInitStrategy())

 	storage := map[string]apiserver.RESTStorage{

 		"userIdentityMappings": useridentitymapping.NewREST(userRegistry),

 		"users":                userregistry.NewREST(userRegistry),

 	}

-	server := httptest.NewServer(apiserver.Handle(storage, v1beta1.Codec, "/osapi", "v1beta1", interfaces.MetadataAccessor, admit.NewAlwaysAdmit(), kapi.NewRequestContextMapper(), latest.RESTMapper))

+	osMux := http.NewServeMux()

+	server := httptest.NewServer(osMux)

 	defer server.Close()

+	handlerContainer := master.NewHandlerContainer(osMux)

+

+	version := &apiserver.APIGroupVersion{

+		Root:    "/osapi",

+		Version: "v1beta1",

+

+		Storage: storage,

+		Codec:   latest.Codec,

+

+		Mapper: latest.RESTMapper,

+

+		Creater: kapi.Scheme,

+		Typer:   kapi.Scheme,

+		Linker:  interfaces.MetadataAccessor,

+

+		Admit:   admit.NewAlwaysAdmit(),

+		Context: kapi.NewRequestContextMapper(),

+	}

+	if err := version.InstallREST(handlerContainer); err != nil {

+		t.Fatalf("unable to install REST: %v", err)

+	}

 	mapping := api.UserIdentityMapping{

 		ObjectMeta: kapi.ObjectMeta{Name: ":test"},

@@ -154,7 +176,7 @@ func TestUserLookup(t *testing.T) {

 	testutil.DeleteAllEtcdKeys()

 	etcdClient := testutil.NewEtcdClient()

 	interfaces, _ := latest.InterfacesFor(latest.Version)

-	userRegistry := etcd.New(tools.EtcdHelper{etcdClient, interfaces.Codec, tools.RuntimeVersionAdapter{interfaces.MetadataAccessor}}, user.NewDefaultUserInitStrategy())

+	userRegistry := etcd.New(tools.NewEtcdHelper(etcdClient, interfaces.Codec), user.NewDefaultUserInitStrategy())

 	userInfo := &kuser.DefaultInfo{

 		Name: ":test",

 	}

@@ -165,7 +187,28 @@ func TestUserLookup(t *testing.T) {

 		"users":                userregistry.NewREST(userRegistry),

 	}

-	apihandler := apiserver.Handle(storage, interfaces.Codec, "/osapi", "v1beta1", interfaces.MetadataAccessor, admit.NewAlwaysAdmit(), contextMapper, latest.RESTMapper)

+	osMux := http.NewServeMux()

+	handlerContainer := master.NewHandlerContainer(osMux)

+

+	version := &apiserver.APIGroupVersion{

+		Root:    "/osapi",

+		Version: "v1beta1",

+

+		Storage: storage,

+		Codec:   latest.Codec,

+

+		Mapper: latest.RESTMapper,

+

+		Creater: kapi.Scheme,

+		Typer:   kapi.Scheme,

+		Linker:  interfaces.MetadataAccessor,

+

+		Admit:   admit.NewAlwaysAdmit(),

+		Context: contextMapper,

+	}

+	if err := version.InstallREST(handlerContainer); err != nil {

+		t.Fatalf("unable to install REST: %v", err)

+	}

 	// Wrap with authenticator

 	authenticatedHandler := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {

@@ -178,7 +221,7 @@ func TestUserLookup(t *testing.T) {

 			t.Fatalf("Could not set user on request")

 			return

 		}

-		apihandler.ServeHTTP(w, req)

+		osMux.ServeHTTP(w, req)

 	})

 	// Wrap with contextmapper