diff --git a/ctl/import_test.go b/ctl/import_test.go
index 3d48418cd..717c40342 100644
--- a/ctl/import_test.go
+++ b/ctl/import_test.go
@@ -177,7 +177,8 @@ func GetIO(buf bytes.Buffer) (io.Reader, io.Writer, io.Writer) {
 }
 
 func TestImportCommand_BugOverwriteValue(t *testing.T) {
-	t.Skip("test.NewServer broken")
+	cmd := test.MustRunMainWithCluster(t, 1)[0]
+
 	buf := bytes.Buffer{}
 	stdin, stdout, stderr := GetIO(buf)
 	cm := NewImportCommand(stdin, stdout, stderr)
@@ -188,18 +189,10 @@ func TestImportCommand_BugOverwriteValue(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	hldr := test.MustOpenHolder()
-	defer hldr.Close()
-	s := test.NewServer()
-	defer s.Close()
+	cm.Host = cmd.Server.Addr().String()
 
-	s.Handler.API.Cluster = test.NewCluster(1)
-	s.Handler.API.Cluster.Nodes[0].URI = s.HostURI()
-	s.Handler.API.Holder = hldr.Holder
-	cm.Host = s.Host()
-
-	http.DefaultClient.Do(MustNewHTTPRequest("POST", s.URL+"/index/i", strings.NewReader("")))
-	http.DefaultClient.Do(MustNewHTTPRequest("POST", s.URL+"/index/i/field/f", strings.NewReader(`{"options":{"type": "int", "min": 0, "max":2147483648 }}`)))
+	http.DefaultClient.Do(MustNewHTTPRequest("POST", "http://"+cm.Host+"/index/i", strings.NewReader("")))
+	http.DefaultClient.Do(MustNewHTTPRequest("POST", "http://"+cm.Host+"/index/i/field/f", strings.NewReader(`{"options":{"type": "int", "min": 0, "max":2147483648 }}`)))
 
 	cm.Index = "i"
 	cm.Field = "f"
diff --git a/fragment_internal_test.go b/fragment_internal_test.go
index 6da3ded7e..6c733ba4c 100644
--- a/fragment_internal_test.go
+++ b/fragment_internal_test.go
@@ -213,39 +213,6 @@ func TestFragment_SetValue(t *testing.T) {
 			t.Fatal(err)
 		}
 	})
-	t.Run("Crash", func(t *testing.T) {
-		f := mustOpenFragment("i", "f", ViewStandard, 0, "")
-		defer f.Close()
-
-		// Set value.
-		if changed, err := f.setValue(0, 32, 17); err != nil {
-			t.Fatal(err)
-		} else if !changed {
-			t.Fatal("expected change")
-		}
-
-		if changed, err := f.setValue(0, 32, 16); err != nil {
-			t.Fatal(err)
-		} else if !changed {
-			t.Fatal("expected change")
-		}
-
-		if changed, err := f.setValue(0, 32, 19); err != nil {
-			t.Fatal(err)
-		} else if !changed {
-			t.Fatal("expected change")
-		}
-
-		// Read value.
-		if value, exists, err := f.value(0, 32); err != nil {
-			t.Fatal(err)
-		} else if value != 19 {
-			t.Fatalf("unexpected value: %d", value)
-		} else if !exists {
-			t.Fatal("expected to exist")
-		}
-	})
-
 }
 
 // Ensure a fragment can sum values.
diff --git a/server/handler_test.go b/server/handler_test.go
index 0320b6f09..070a3176a 100644
--- a/server/handler_test.go
+++ b/server/handler_test.go
@@ -39,7 +39,7 @@ func TestHandler_Endpoints(t *testing.T) {
 	cmd := test.MustRunMainWithCluster(t, 1)[0]
 	h := cmd.Handler.(*http.Handler).Handler
 	holder := cmd.Server.Holder()
-	hldr := test.Holder{holder}
+	hldr := test.Holder{Holder: holder}
 
 	t.Run("Not Found", func(t *testing.T) {
 		w := httptest.NewRecorder()