diff --git a/internal/iam/repository_group_test.go b/internal/iam/repository_group_test.go
index 2a51bfc401..c78cb4151a 100644
--- a/internal/iam/repository_group_test.go
+++ b/internal/iam/repository_group_test.go
@@ -239,7 +239,7 @@ func TestRepository_UpdateGroup(t *testing.T) {
 			newScopeId:     org.PublicId,
 			wantErr:        true,
 			wantRowsUpdate: 0,
-			wantErrMsg:     "update group: update: lookup error lookup after write: failed record not found for 1",
+			wantErrMsg:     "update group: update: lookup after write: record not found for 1",
 			wantIsError:    db.ErrRecordNotFound,
 		},
 		{
diff --git a/internal/iam/repository_role_test.go b/internal/iam/repository_role_test.go
index cc6e595b8b..9ae05f1448 100644
--- a/internal/iam/repository_role_test.go
+++ b/internal/iam/repository_role_test.go
@@ -240,7 +240,7 @@ func TestRepository_UpdateRole(t *testing.T) {
 			newScopeId:     org.PublicId,
 			wantErr:        true,
 			wantRowsUpdate: 0,
-			wantErrMsg:     "update role: update: lookup error lookup after write: failed record not found for 1",
+			wantErrMsg:     "update role: update: lookup after write: record not found for 1",
 			wantIsError:    db.ErrRecordNotFound,
 		},
 		{
diff --git a/internal/iam/repository_user_test.go b/internal/iam/repository_user_test.go
index aee0aa2b9a..c3a67634fc 100644
--- a/internal/iam/repository_user_test.go
+++ b/internal/iam/repository_user_test.go
@@ -169,7 +169,7 @@ func TestRepository_UpdateUser(t *testing.T) {
 			},
 			wantErr:        true,
 			wantRowsUpdate: 0,
-			wantErrMsg:     "update user: update: lookup error lookup after write: failed record not found for 1",
+			wantErrMsg:     "update user: update: lookup after write: record not found for 1",
 			wantIsErr:      db.ErrRecordNotFound,
 		},
 		{
diff --git a/internal/servers/controller/handler_test.go b/internal/servers/controller/handler_test.go
index 684beba592..2e0c289cc0 100644
--- a/internal/servers/controller/handler_test.go
+++ b/internal/servers/controller/handler_test.go
@@ -166,40 +166,3 @@ func TestGrpcGatewayRouting_CustomActions(t *testing.T) {
 		}
 	}
 }
-
-func TestHandleGrpcGateway(t *testing.T) {
-	c := NewTestController(t, &TestControllerOpts{
-		DisableAuthorizationFailures: true,
-	})
-	defer c.Shutdown()
-
-	cases := []struct {
-		name string
-		path string
-		code int
-	}{
-		{
-			"Non existent path",
-			"v1/this-is-made-ups",
-			http.StatusNotFound,
-		},
-		{
-			"Unimplemented path",
-			"v1/scopes/1/host-catalogs/3/host-sets/hs_4",
-			http.StatusMethodNotAllowed,
-		},
-	}
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			url := fmt.Sprintf("%s/%s", c.ApiAddrs()[0], tc.path)
-			resp, err := http.Get(url)
-			if err != nil {
-				t.Errorf("Got error: %v when non was expected.", err)
-			}
-			if got, want := resp.StatusCode, tc.code; got != want {
-				t.Errorf("GET on %q got code %d, wanted %d", tc.path, got, want)
-			}
-
-		})
-	}
-}