diff --git a/tests/getters_test.go b/tests/getters_test.go
index e97a89ab..c8d328ee 100644
--- a/tests/getters_test.go
+++ b/tests/getters_test.go
@@ -114,7 +114,7 @@ var _ = ginkgo.Describe("FindConfigs", func() {
 		},
 		{
 			Name:      "field selector",
-			Selectors: []types.ResourceSelector{{FieldSelector: "config_class=Deployment"}},
+			Selectors: []types.ResourceSelector{{Search: "config_class=Deployment"}},
 			Results:   []uuid.UUID{dummy.LogisticsUIDeployment.ID, dummy.LogisticsAPIDeployment.ID},
 		},
 	}
diff --git a/tests/query_resource_selector_test.go b/tests/query_resource_selector_test.go
index 29b07a16..2d47a4e4 100644
--- a/tests/query_resource_selector_test.go
+++ b/tests/query_resource_selector_test.go
@@ -184,20 +184,6 @@ var _ = ginkgo.Describe("SearchResourceSelectors", func() {
 			},
 			Configs: []models.ConfigItem{dummy.EC2InstanceA, dummy.EC2InstanceB},
 		},
-		{
-			description: "field selector | IN Query",
-			query: query.SearchResourcesRequest{
-				Configs: []types.ResourceSelector{{FieldSelector: "config_class in (Cluster)"}},
-			},
-			Configs: []models.ConfigItem{dummy.EKSCluster, dummy.KubernetesCluster},
-		},
-		{
-			description: "field selector | NOT IN Query",
-			query: query.SearchResourcesRequest{
-				Configs: []types.ResourceSelector{{FieldSelector: "config_class notin (Node,Deployment,Database,Pod,Cluster)"}},
-			},
-			Configs: []models.ConfigItem{dummy.EC2InstanceA, dummy.EC2InstanceB},
-		},
 		{
 			description: "field selector | Tag selector Equals Query",
 			query: query.SearchResourcesRequest{
@@ -302,7 +288,7 @@ var _ = ginkgo.Describe("Resoure Selector limits", ginkgo.Ordered, func() {
 			ginkgo.It(fmt.Sprintf("should work with %d page size", limit), func() {
 				items, err := query.SearchResources(DefaultContext, query.SearchResourcesRequest{
 					Limit:   limit,
-					Configs: []types.ResourceSelector{{FieldSelector: fmt.Sprintf("config_class=%s", models.ConfigClassNode)}},
+					Configs: []types.ResourceSelector{{Search: fmt.Sprintf("config_class=%s", models.ConfigClassNode)}},
 				})
 
 				Expect(err).To(BeNil())
@@ -344,7 +330,7 @@ var _ = ginkgo.Describe("Resoure Selector limits", ginkgo.Ordered, func() {
 			ginkgo.It(fmt.Sprintf("should work with %d page size", pageSize), func() {
 				items, err := query.SearchResources(DefaultContext, query.SearchResourcesRequest{
 					Limit:      pageSize,
-					Configs:    []types.ResourceSelector{{FieldSelector: fmt.Sprintf("config_class=%s", models.ConfigClassNode)}},
+					Configs:    []types.ResourceSelector{{Search: fmt.Sprintf("config_class=%s", models.ConfigClassNode)}},
 					Components: []types.ResourceSelector{{Types: []string{"Application"}}},
 					Checks:     []types.ResourceSelector{{Types: []string{"http"}, Agent: "all"}},
 				})