diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index fd582fa5e4..44e3d3210c 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -847,6 +847,13 @@ func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string)
 		kubeNodeName = "m01"
 	}
 
+	return createNode(cmd, k8sVersion, kubeNodeName, drvName,
+		repository, selectedEnableDefaultCNI, selectedNetworkPlugin)
+}
+
+func createNode(cmd *cobra.Command, k8sVersion, kubeNodeName, drvName, repository string,
+	selectedEnableDefaultCNI bool, selectedNetworkPlugin string) (config.ClusterConfig, config.Node, error) {
+
 	sysLimit, containerLimit, err := memoryLimits(drvName)
 	if err != nil {
 		glog.Warningf("Unable to query memory limits: %v", err)
diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go
index 923a9f32ea..8b203badec 100644
--- a/pkg/minikube/cruntime/docker.go
+++ b/pkg/minikube/cruntime/docker.go
@@ -37,10 +37,12 @@ import (
 // KubernetesContainerPrefix is the prefix of each kubernetes container
 const KubernetesContainerPrefix = "k8s_"
 
+// ErrISOFeature is the error returned when disk image is missing features
 type ErrISOFeature struct {
 	missing string
 }
 
+// NewErrISOFeature creates a new ErrISOFeature
 func NewErrISOFeature(missing string) *ErrISOFeature {
 	return &ErrISOFeature{
 		missing: missing,
diff --git a/pkg/minikube/docker/store_test.go b/pkg/minikube/docker/store_test.go
index d9e9ce2e3c..bccdfdd081 100644
--- a/pkg/minikube/docker/store_test.go
+++ b/pkg/minikube/docker/store_test.go
@@ -25,11 +25,11 @@ import (
 func TestMergeReferenceStores(t *testing.T) {
 	initial := ReferenceStore{
 		Repositories: map[string]repository{
-			"image1": repository{
+			"image1": {
 				"r1": "d1",
 				"r2": "d2",
 			},
-			"image2": repository{
+			"image2": {
 				"r1": "d1",
 				"r2": "d2",
 			},
@@ -38,11 +38,11 @@ func TestMergeReferenceStores(t *testing.T) {
 
 	afterPreload := ReferenceStore{
 		Repositories: map[string]repository{
-			"image1": repository{
+			"image1": {
 				"r1": "updated",
 				"r2": "updated",
 			},
-			"image3": repository{
+			"image3": {
 				"r3": "d3",
 			},
 		},
@@ -50,15 +50,15 @@ func TestMergeReferenceStores(t *testing.T) {
 
 	expected := ReferenceStore{
 		Repositories: map[string]repository{
-			"image1": repository{
+			"image1": {
 				"r1": "updated",
 				"r2": "updated",
 			},
-			"image2": repository{
+			"image2": {
 				"r1": "d1",
 				"r2": "d2",
 			},
-			"image3": repository{
+			"image3": {
 				"r3": "d3",
 			},
 		},