diff --git a/.cypress/integration/trace_analytics_test/trace_analytics_services.spec.js b/.cypress/integration/trace_analytics_test/trace_analytics_services.spec.js
index 592b8832a..7051c94f7 100644
--- a/.cypress/integration/trace_analytics_test/trace_analytics_services.spec.js
+++ b/.cypress/integration/trace_analytics_test/trace_analytics_services.spec.js
@@ -125,8 +125,7 @@ describe('Testing service view', () => {
   });
 
   it('Renders spans data grid, flyout, filters', () => {
-    // cy.get("[data-test-subj='spanId-link']").contains(SERVICE_SPAN_ID).trigger('mouseover', { force: true });
-    cy.get("[data-test-subj='spanId-link']").contains("e275ac9d21929e9b").trigger('mouseover', { force: true });
+    cy.get("[data-test-subj='spanId-link']").contains(SERVICE_SPAN_ID).trigger('mouseover', { force: true });
     cy.get('button[data-datagrid-interactable="true"]').eq(0).click({ force: true });
     cy.contains('Span detail').should('exist');
     cy.contains('Span attributes').should('exist');
@@ -223,7 +222,6 @@ describe('Testing traces Spans table verify table headers functionality', () =>
   });
 
   it('Render Spans table and change data table Density', () => {
-    // cy.get('.euiLink.euiLink--primary').contains('authentication').should('exist').click();
     cy.get('*[data-test-subj^="service-flyout-action-btntrace_service"]').eq(1).click();
     cy.get('[data-test-subj="ActionContextMenu"]').click();
     cy.get('[data-test-subj="viewServiceButton"]').click();
@@ -269,7 +267,6 @@ describe('Testing traces Spans table and verify columns functionality', () => {
   });
 
   it('Renders the spans table and click on first span to verify details', () => {
-    // cy.get('.euiLink.euiLink--primary').contains('authentication').should('exist').click();
     cy.get('.euiLink.euiLink--primary').contains('authentication').should('exist');
     cy.get('*[data-test-subj^="service-flyout-action-btntrace_service"]').eq(1).click();
     cy.get('[data-test-subj="ActionContextMenu"]').click();
@@ -287,6 +284,7 @@ describe('Testing traces Spans table and verify columns functionality', () => {
     cy.get('.euiBadge__content .euiBadge__text').contains('spanId: 277a5934acf55dcf').should('exist');
     count_table_row(1);
     cy.get('[aria-label="remove current filter"]').click();
+    cy.get('[aria-label="remove current filter"]').should('not.exist');
     count_table_row(8);
   });
 
diff --git a/.cypress/utils/constants.js b/.cypress/utils/constants.js
index d36e8b68d..177f67507 100644
--- a/.cypress/utils/constants.js
+++ b/.cypress/utils/constants.js
@@ -18,7 +18,7 @@ export const DATASOURCES_PATH = {
 export const TRACE_ID = '8832ed6abbb2a83516461960c89af49d';
 export const SPAN_ID = 'a673bc074b438374';
 export const SERVICE_NAME = 'frontend-client';
-export const SERVICE_SPAN_ID = '7df5609a6d104736';
+export const SERVICE_SPAN_ID = 'e275ac9d21929e9b';
 export const AUTH_SERVICE_SPAN_ID = '277a5934acf55dcf';
 
 export const testDataSet = [
diff --git a/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filter_edit_popover.test.tsx.snap b/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filter_edit_popover.test.tsx.snap
index 76e2ee091..ed16c4579 100644
--- a/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filter_edit_popover.test.tsx.snap
+++ b/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filter_edit_popover.test.tsx.snap
@@ -91,6 +91,7 @@ exports[`Filter popover component renders filter popover 1`] = `
                   <EuiCompressedComboBox
                     async={false}
                     compressed={true}
+                    data-test-subj="field-selector-filter-panel"
                     fullWidth={false}
                     id="random_html_id"
                     isClearable={false}
@@ -129,6 +130,7 @@ exports[`Filter popover component renders filter popover 1`] = `
                       aria-expanded={false}
                       aria-haspopup="listbox"
                       className="euiComboBox euiComboBox--compressed"
+                      data-test-subj="field-selector-filter-panel"
                       onKeyDown={[Function]}
                       role="combobox"
                     >
@@ -371,6 +373,7 @@ exports[`Filter popover component renders filter popover 1`] = `
                   <EuiCompressedComboBox
                     async={false}
                     compressed={true}
+                    data-test-subj="operator-selector-filter-panel"
                     fullWidth={false}
                     id="random_html_id"
                     isClearable={false}
@@ -392,6 +395,7 @@ exports[`Filter popover component renders filter popover 1`] = `
                       aria-expanded={false}
                       aria-haspopup="listbox"
                       className="euiComboBox euiComboBox--compressed euiComboBox-isDisabled"
+                      data-test-subj="operator-selector-filter-panel"
                       onKeyDown={[Function]}
                       role="combobox"
                     >
diff --git a/public/components/trace_analytics/components/common/filters/filter_helpers.tsx b/public/components/trace_analytics/components/common/filters/filter_helpers.tsx
index 66fc43655..663400302 100644
--- a/public/components/trace_analytics/components/common/filters/filter_helpers.tsx
+++ b/public/components/trace_analytics/components/common/filters/filter_helpers.tsx
@@ -109,42 +109,34 @@ export const getOperatorOptions = (field: string) => {
     long: [
       {
         label: 'is between',
-        'data-test-subj': 'is-between-operator',
       },
       {
         label: 'is not between',
-        'data-test-subj': 'is-not-between-operator',
       },
     ],
     date_nanos: [
       {
         label: 'is between',
-        'data-test-subj': 'is-between-operator',
       },
       {
         label: 'is not between',
-        'data-test-subj': 'is-not-between-operator',
       },
     ],
     keyword: [],
     default_first: [
       {
         label: 'is',
-        'data-test-subj': 'is-operator',
       },
       {
         label: 'is not',
-        'data-test-subj': 'is-not-operator',
       },
     ],
     default_last: [
       {
         label: 'exists',
-        'data-test-subj': 'exists-operator',
       },
       {
         label: 'does not exist',
-        'data-test-subj': 'does-not-exist-operator',
       },
     ],
   };