diff --git a/cmd/manager/main_test.go b/cmd/manager/main_test.go
index c4f0eab567d..e21da7f4ba0 100644
--- a/cmd/manager/main_test.go
+++ b/cmd/manager/main_test.go
@@ -8,14 +8,12 @@ import (
 
 	api "github.com/kubeflow/katib/pkg/api"
 	mockdb "github.com/kubeflow/katib/pkg/mock/db"
-	mockmodelstore "github.com/kubeflow/katib/pkg/mock/modelstore"
 )
 
 func TestCreateStudy(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 	mockDB := mockdb.NewMockVizierDBInterface(ctrl)
-	mockModelStore := mockmodelstore.NewMockModelStore(ctrl)
 	sid := "teststudy"
 	sc := &api.StudyConfig{
 		Name:               "test",
@@ -27,16 +25,9 @@ func TestCreateStudy(t *testing.T) {
 	mockDB.EXPECT().CreateStudy(
 		sc,
 	).Return(sid, nil)
-	ssr := &api.SaveStudyRequest{
-		StudyName:   "test",
-		Owner:       "admin",
-		Description: "StudyID: " + sid,
-	}
-	mockModelStore.EXPECT().SaveStudy(ssr).Return(nil)
 
-	s := &server{
-		msIf: mockModelStore,
-	}
+	s := &server{}
+
 	req := &api.CreateStudyRequest{StudyConfig: sc}
 	ret, err := s.CreateStudy(context.Background(), req)
 	if err != nil {
@@ -50,11 +41,8 @@ func TestGetStudies(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 	mockDB := mockdb.NewMockVizierDBInterface(ctrl)
-	mockModelStore := mockmodelstore.NewMockModelStore(ctrl)
 	sid := []string{"teststudy1", "teststudy2"}
-	s := &server{
-		msIf: mockModelStore,
-	}
+	s := &server{}
 	dbIf = mockDB
 	sc := []*api.StudyConfig{
 		&api.StudyConfig{
diff --git a/pkg/db/interface_test.go b/pkg/db/interface_test.go
index 040ea6127fa..76227a6c8c2 100644
--- a/pkg/db/interface_test.go
+++ b/pkg/db/interface_test.go
@@ -12,9 +12,8 @@ import (
 
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/golang/protobuf/jsonpb"
-	"gopkg.in/DATA-DOG/go-sqlmock.v1"
-
 	api "github.com/kubeflow/katib/pkg/api"
+	sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1"
 )
 
 var dbInterface, mysqlInterface VizierDBInterface
diff --git a/test/scripts/create-cluster.sh b/test/scripts/create-cluster.sh
index 5009f9371d5..580878296fa 100755
--- a/test/scripts/create-cluster.sh
+++ b/test/scripts/create-cluster.sh
@@ -33,7 +33,7 @@ echo "Creating GPU cluster"
 gcloud --project ${PROJECT} beta container clusters create ${CLUSTER_NAME} \
     --zone ${ZONE} \
     --accelerator type=nvidia-tesla-k80,count=1 \
-    --cluster-version 1.10
+    --cluster-version 1.11
 echo "Configuring kubectl"
 gcloud --project ${PROJECT} container clusters get-credentials ${CLUSTER_NAME} \
     --zone ${ZONE}