diff --git a/.cypress/integration/4_trace_analytics_dashboard.spec.js b/.cypress/integration/4_trace_analytics_dashboard.spec.js
index f9bfb57603..38441914db 100644
--- a/.cypress/integration/4_trace_analytics_dashboard.spec.js
+++ b/.cypress/integration/4_trace_analytics_dashboard.spec.js
@@ -5,7 +5,7 @@
 
 /// <reference types="cypress" />
 
-import { testDataSet, delay, setTimeFilter } from '../utils/constants';
+import { testDataSet, delay, setTimeFilter, jaegerTestDataSet } from '../utils/constants';
 
 describe('Dump test data', () => {
   it('Indexes test data', () => {
@@ -100,13 +100,10 @@ describe('Testing dashboard table', () => {
 
   it('Has working breadcrumbs', () => {
     cy.get('.euiBreadcrumb').contains('Dashboard').click();
-    cy.wait(delay);
     cy.get('.euiTitle').contains('Dashboard').should('exist');
     cy.get('.euiBreadcrumb').contains('Trace analytics').click();
-    cy.wait(delay);
     cy.get('.euiTitle').contains('Dashboard').should('exist');
     cy.get('.euiBreadcrumb').contains('Observability').click();
-    cy.wait(delay);
     cy.get('.euiTitle').contains('Event analytics').should('exist');
   });
 
@@ -137,7 +134,7 @@ describe('Testing dashboard table', () => {
   });
 
   it('Redirects to traces table with filter', () => {
-    cy.wait(delay * 5);
+    cy.wait(delay);
     cy.get('.euiLink').contains('13').click();
     cy.wait(delay);
 
@@ -177,7 +174,6 @@ describe('Testing plots', () => {
     cy.get('text[data-unformatted="50"]').should('exist');
 
     cy.get('input[type="search"]').eq(1).focus().type('payment{enter}');
-    cy.wait(delay);
   });
 
   it('Renders plots', () => {
@@ -200,13 +196,12 @@ describe('Latency by trace group table', () =>{
 
   it('Verify columns in Latency by trace group table along with pagination functionality', () => {
     cy.get('span.panel-title').eq(0).should('exist');
-    cy.wait(delay);
-    cy.get('span[title="Trace group name"]').should('exist');
-    cy.get('span[title="Latency variance (ms)"]').should('exist');
-    cy.get('span[title="Average latency (ms)"]').should('exist');
-    cy.get('span[title="24-hour latency trend"]').should('exist');
-    cy.get('span[title="Error rate"] .euiToolTipAnchor').should('exist');
-    cy.get('span[title="Traces"] .euiToolTipAnchor').should('exist');
+    cy.get('[data-test-subj="tableHeaderCell_dashboard_trace_group_name_0"]').should('exist');
+    cy.get('[data-test-subj="tableHeaderCell_dashboard_latency_variance_1"]').should('exist');
+    cy.get('[data-test-subj="tableHeaderCell_dashboard_average_latency_2"]').should('exist');
+    cy.get('[data-test-subj="tableHeaderCell_24_hour_latency_trend_3"]').should('exist');
+    cy.get('[data-test-subj="tableHeaderCell_dashboard_error_rate_4"]').should('exist');
+    cy.get('[data-test-subj="tableHeaderCell_dashboard_traces_5"]').should('exist');
     cy.get('[data-test-subj="tablePaginationPopoverButton"]').click();
     cy.get('.euiIcon.euiIcon--medium.euiIcon--inherit.euiContextMenu__icon').eq(0).should('exist').click();
     cy.get('[data-test-subj="pagination-button-next"]').should('exist').click();
@@ -235,7 +230,8 @@ describe('Latency by trace group table', () =>{
   });
 
   it('Verify Search engine on Trace dashboard', () => {
-    cy.get('.euiFieldSearch.euiFieldSearch--fullWidth').click().type('client_pay_order{enter}');
+    cy.get('.euiFieldSearch.euiFieldSearch--fullWidth').click().type('client_pay_order');
+    cy.get('[data-test-subj="superDatePickerApplyTimeButton"]').click();
     cy.wait(delay);
     cy.get('.euiTableCellContent.euiTableCellContent--alignRight.euiTableCellContent--overflowingContent').contains('211.04').should('exist');
     cy.get('button[data-test-subj="dashboard-table-trace-group-name-button"]').click();
@@ -257,7 +253,7 @@ describe('Latency by trace group table', () =>{
   });
 });
 
-describe('Testing filters on trace analytics page', () =>{
+describe('Testing filters on trace analytics page', { scrollBehavior: false }, () =>{
   beforeEach(() => {
     cy.visit('app/observability-dashboards#/trace_analytics/home', {
       onBeforeLoad: (win) => {
@@ -268,7 +264,7 @@ describe('Testing filters on trace analytics page', () =>{
   });
 
   it('Verify Change all filters', () =>{
-    cy.get('.euiButtonIcon.euiButtonIcon--primary.euiButtonIcon--empty.euiButtonIcon--xSmall').click();
+    cy.get('[data-test-subj="global-filter-button"]').click();
     cy.get('.euiContextMenuPanelTitle').contains('Change all filters').should('exist');
     cy.get('.euiContextMenuItem__text').eq(0).contains('Enable all');
     cy.get('.euiContextMenuItem__text').eq(1).contains('Disable all');
@@ -278,9 +274,8 @@ describe('Testing filters on trace analytics page', () =>{
   })
 
   it('Verify Add filter section', () => {
-    cy.get('.euiPopover.euiPopover--anchorDownLeft').contains('+ Add filter').click();
+    cy.get('[data-test-subj="addfilter"]').contains('+ Add filter').click();
     cy.get('.euiPopoverTitle').contains('Add filter').should('exist');
-    cy.wait(delay);
     cy.get('.euiComboBox__inputWrap.euiComboBox__inputWrap--noWrap').eq(0).trigger('mouseover').click();
     cy.get('.euiComboBoxOption__content').eq(1).click();
     cy.get('.euiComboBox__inputWrap.euiComboBox__inputWrap--noWrap').eq(1).trigger('mouseover').click();
@@ -292,3 +287,108 @@ describe('Testing filters on trace analytics page', () =>{
     cy.get('.euiIcon.euiIcon--small.euiIcon--inherit.euiBadge__icon').click();
   })
 });
+
+describe('Dump jaeger test data', () => {
+  it('Indexes test data', () => {
+    const dumpDataSet = (mapping_url, data_url, index) => {
+      cy.request({
+        method: 'POST',
+        failOnStatusCode: false,
+        url: 'api/console/proxy',
+        headers: {
+          'content-type': 'application/json;charset=UTF-8',
+          'osd-xsrf': true,
+        },
+        qs: {
+          path: `${index}`,
+          method: 'PUT',
+        },
+      });
+
+      cy.request(mapping_url).then((response) => {
+        cy.request({
+          method: 'POST',
+          form: true,
+          url: 'api/console/proxy',
+          headers: {
+            'content-type': 'application/json;charset=UTF-8',
+            'osd-xsrf': true,
+          },
+          qs: {
+            path: `${index}/_mapping`,
+            method: 'POST',
+          },
+          body: response.body,
+        });
+      });
+
+      cy.request(data_url).then((response) => {
+        cy.request({
+          method: 'POST',
+          form: true,
+          url: 'api/console/proxy',
+          headers: {
+            'content-type': 'application/json;charset=UTF-8',
+            'osd-xsrf': true,
+          },
+          qs: {
+            path: `${index}/_bulk`,
+            method: 'POST',
+          },
+          body: response.body,
+        });
+      });
+    };
+
+    jaegerTestDataSet.forEach(({ mapping_url, data_url, index }) =>
+      dumpDataSet(mapping_url, data_url, index)
+    );
+  });
+});
+
+describe('Testing switch mode to jaeger', () => {
+  beforeEach(() => {
+    cy.visit('app/observability-dashboards#/trace_analytics/home', {
+      onBeforeLoad: (win) => {
+        win.sessionStorage.clear();
+      },
+    });
+    setTimeFilter();
+    cy.get("[data-test-subj='indexPattern-switch-link']").click();
+    cy.get("[data-test-subj='jaeger-mode']").click();
+  });
+
+  it('Verifies errors mode columns and data', () => {
+    cy.contains('redis,GetDriver').should('exist');
+    cy.contains('14.7').should('exist');
+    cy.contains('100%').should('exist');
+    cy.contains('7').should('exist');
+    cy.contains('Service and Operation Name').should('exist');
+    cy.contains('Average latency (ms)').should('exist');
+    cy.contains('Error rate').should('exist');
+    cy.contains('Traces').should('exist');
+  });
+
+  it('Verifies traces links to traces page', () => {
+    cy.wait(delay);
+    cy.get('.euiLink').contains('7').click();
+    cy.wait(delay);
+
+    cy.get('h2.euiTitle').contains('Traces').should('exist');
+    cy.contains(' (7)').should('exist');
+    cy.get("[data-test-subj='filterBadge']").eq(0).contains('process.serviceName: redis')
+    cy.get("[data-test-subj='filterBadge']").eq(1).contains('operationName: GetDriver');  
+  })
+
+  it('Switches to throughput mode and verifies columns and data', () => {
+    cy.get("[data-test-subj='throughput-toggle']").click();
+    cy.contains('frontend,HTTP GET /dispatch').should('exist');
+    cy.contains('711.38').should('exist');
+    cy.contains('0%').should('exist');
+    cy.contains('8').should('exist');
+    cy.contains('Service and Operation Name').should('exist');
+    cy.contains('Average latency (ms)').should('exist');
+    cy.contains('Error rate').should('exist');
+    cy.contains('Traces').should('exist');
+  });
+});
diff --git a/.cypress/integration/5_trace_analytics_services.spec.js b/.cypress/integration/5_trace_analytics_services.spec.js
index bd2cd4c419..66ca860b13 100644
--- a/.cypress/integration/5_trace_analytics_services.spec.js
+++ b/.cypress/integration/5_trace_analytics_services.spec.js
@@ -98,12 +98,16 @@ describe('Testing service view', () => {
       if (err.message.includes('ResizeObserver loop'))
         return false;
     });
-    cy.visit(`app/observability-dashboards#/trace_analytics/services/${SERVICE_NAME}`, {
+    cy.visit(`app/observability-dashboards#/trace_analytics/services`, {
       onBeforeLoad: (win) => {
         win.sessionStorage.clear();
       },
     });
-    setTimeFilter(undefined, false);
+    setTimeFilter();
+    cy.get('input[type="search"]').first().focus().type(`${SERVICE_NAME}`);
+    cy.get('[data-test-subj="superDatePickerApplyTimeButton"]').click();
+    cy.wait(delay);
+    cy.get('[data-test-subj="service-link"]').eq(0).click();
   });
 
   it('Renders service view', () => {
@@ -129,7 +133,7 @@ describe('Testing service view', () => {
   });
 
   it('Renders spans data grid, flyout, filters', () => {
-    cy.get('.euiLink').contains(SERVICE_SPAN_ID).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.wait(delay);
     cy.contains('Span detail').should('exist');
@@ -168,6 +172,10 @@ describe('Testing Service map', () => {
 
 describe('Testing traces Spans table verify table headers functionality', () => {
   beforeEach(() => {
+    cy.on('uncaught:exception', (err, runnable) => {
+      if (err.message.includes('ResizeObserver loop'))
+        return false;
+    });
     cy.visit('app/observability-dashboards#/trace_analytics/services', {
       onBeforeLoad: (win) => {
         win.sessionStorage.clear();
@@ -181,7 +189,7 @@ describe('Testing traces Spans table verify table headers functionality', () =>
     cy.contains('analytics-service, frontend-client, recommendation').should('exist');
     cy.get('.euiLink.euiLink--primary').contains('authentication').should('exist').click();
     cy.get('.panel-title').contains('Spans').should('exist');
-    cy.get('.panel-title-count').contains('5').should('exist');
+    cy.get('.panel-title-count').contains('8').should('exist');
     verify_traces_spans_data_grid_cols_exists();
   });
 
@@ -189,8 +197,8 @@ describe('Testing traces Spans table verify table headers functionality', () =>
     cy.get('.euiLink.euiLink--primary').contains('authentication').should('exist').click();
     cy.get('[data-test-subj = "dataGridColumnSelectorButton"]').click();
     cy.get('.euiSwitch.euiSwitch--compressed.euiSwitch--mini .euiSwitch__button').eq(3).click();
-    cy.get('.euiButtonEmpty__text').eq(3).click().should('have.text', '2 columns hidden');
-    count_table_row(5);
+    cy.get('[data-test-subj = "dataGridColumnSelectorButton"]').click().should('have.text', '2 columns hidden');
+    count_table_row(8);
   });
 
   it('Show all button Spans table', () => {
@@ -231,8 +239,8 @@ describe('Testing traces Spans table verify table headers functionality', () =>
     cy.get('[data-test-subj="dataGridColumnSortingPopoverColumnSelection-startTime"]').click();
     cy.get('[data-test-subj="dataGridColumnSortingPopoverColumnSelection-endTime').click();
     cy.get('[data-test-subj="dataGridColumnSortingPopoverColumnSelection-status.code"]').click();
-    cy.get('.euiButtonEmpty__text').eq(5).contains('8 fields sorted').should('exist');
     cy.get('[data-test-subj="dataGridColumnSortingPopoverColumnSelection"]').click();
+    cy.get('[data-test-subj="dataGridColumnSortingButton"]').should('have.text', '8 fields sorted');
     cy.get('[data-test-subj="dataGridColumnSortingButton"]').should('exist').click();
   });
 });
@@ -255,15 +263,17 @@ describe('Testing traces Spans table and verify columns functionality', () => {
     cy.get('[data-test-subj="spanDetailFlyout"] .euiTitle.euiTitle--medium').contains('Span detail').should('exist');
     cy.get('.euiFlyoutBody .panel-title').contains('Overview').should('exist');
     cy.get('.euiTextColor.euiTextColor--subdued').contains('Span ID').should('exist');
-    cy.get('.euiDescriptionList__description .euiFlexItem').eq(0).contains('d03fecfa0f55b77c').should('exist');
+    cy.get('[data-test-subj="parentSpanId"]').contains('d03fecfa0f55b77c').should('exist');
     cy.get('.euiFlyoutBody__overflowContent .panel-title').contains('Span attributes').should('exist');
     cy.get('.euiDescriptionList__description .euiFlexItem').eq(0).trigger('mouseover').click();
     cy.get('[aria-label="span-flyout-filter-icon"]').click();
     cy.get('.euiFlyout__closeButton.euiFlyout__closeButton--inside').click();
-    cy.get('.euiBadge__content .euiBadge__text').contains('spanId: d03fecfa0f55b77c').should('exist');
+    cy.get('.euiBadge__content .euiBadge__text').contains('spanId: 277a5934acf55dcf').should('exist');
+    cy.wait(delay);
     count_table_row(1);
     cy.get('[aria-label="remove current filter"]').click();
-    count_table_row(5);
+    cy.wait(delay);
+    count_table_row(8);
   });
 
   it('Render Spans table and verify Column functionality', () => {
@@ -277,3 +287,38 @@ describe('Testing traces Spans table and verify columns functionality', () => {
     cy.get('.euiListGroupItem__label').contains('Move left').click();
   });
 });
+
+
+describe('Testing switch mode to jaeger', () => {
+  beforeEach(() => {
+    cy.visit('app/observability-dashboards#/trace_analytics/services', {
+      onBeforeLoad: (win) => {
+        win.sessionStorage.clear();
+      },
+    });
+    setTimeFilter();
+    cy.get("[data-test-subj='indexPattern-switch-link']").click();
+    cy.get("[data-test-subj='jaeger-mode']").click();
+  });
+
+  it('Verifies columns and data', () => {
+    cy.contains('customer').should('exist');
+    cy.contains('310.29').should('exist');
+    cy.contains('0%').should('exist');
+    cy.contains('Name').should('exist');
+    cy.contains('Average latency (ms)').should('exist');
+    cy.contains('Error rate').should('exist');
+    cy.contains('Throughput').should('exist');
+    cy.contains('Traces').should('exist');
+  });
+
+  it('Verifies traces links to traces page with filter applied', () => {
+    cy.wait(delay);
+    cy.get('.euiLink').contains('7').click();
+    cy.wait(delay);
+
+    cy.get('h2.euiTitle').contains('Traces').should('exist');
+    cy.contains(' (7)').should('exist');
+    cy.get("[data-test-subj='filterBadge']").eq(0).contains('process.serviceName: customer')
+  })
+});
\ No newline at end of file
diff --git a/.cypress/integration/6_trace_analytics_traces.spec.js b/.cypress/integration/6_trace_analytics_traces.spec.js
index 14f71ec101..8943991ff7 100644
--- a/.cypress/integration/6_trace_analytics_traces.spec.js
+++ b/.cypress/integration/6_trace_analytics_traces.spec.js
@@ -61,11 +61,16 @@ describe('Testing traces table', () => {
 
 describe('Testing trace view', () => {
   beforeEach(() => {
-    cy.visit(`app/observability-dashboards#/trace_analytics/traces/${TRACE_ID}`, {
+    cy.visit(`app/observability-dashboards#/trace_analytics/traces`, {
       onBeforeLoad: (win) => {
         win.sessionStorage.clear();
       },
     });
+    setTimeFilter();
+    cy.get('input[type="search"]').focus().type(`${TRACE_ID}`);
+    cy.get('.euiButton__text').contains('Refresh').click();
+    cy.wait(delay);
+    cy.get('[data-test-subj="trace-link"]').eq(0).click();
   });
 
   it('Renders the trace view', () => {
@@ -153,3 +158,33 @@ describe('Testing traces table', () => {
     });
   });
 });
+
+describe('Testing switch mode to jaeger', () => {
+  beforeEach(() => {
+    cy.visit('app/observability-dashboards#/trace_analytics/traces', {
+      onBeforeLoad: (win) => {
+        win.sessionStorage.clear();
+      },
+    });
+    setTimeFilter();
+    cy.get("[data-test-subj='indexPattern-switch-link']").click();
+    cy.get("[data-test-subj='jaeger-mode']").click();
+  });
+
+  it('Verifies columns and data', () => {
+    cy.contains('08ee9fd9bf964384').should('exist');
+    cy.contains('0.012').should('exist');
+    cy.contains('No').should('exist');
+    cy.contains('01/24/2023 08:33:35').should('exist');
+    cy.contains('Latency (ms)').should('exist');
+    cy.contains('Trace ID').should('exist');
+    cy.contains('Errors').should('exist');
+    cy.contains('Last updated').should('exist');
+  });
+
+  it('Verifies Trace View', () => {
+    cy.contains('08ee9fd9bf964384').click();
+    cy.contains("Time spent by service").should('exist');
+    cy.get("[data-test-subj='span-gantt-chart-panel']").should('exist');
+  })
+});
diff --git a/.cypress/utils/constants.js b/.cypress/utils/constants.js
index 415679aba7..6b9e7b77e8 100644
--- a/.cypress/utils/constants.js
+++ b/.cypress/utils/constants.js
@@ -30,6 +30,19 @@ export const testDataSet = [
   },
 ]
 
+export const jaegerTestDataSet = [
+  {
+    mapping_url: 'https://raw.githubusercontent.com/opensearch-project/dashboards-observability/main/.cypress/utils/jaeger-service-2023-01-24-mappings.json',
+    data_url: 'https://raw.githubusercontent.com/opensearch-project/dashboards-observability/main/.cypress/utils/jaeger-service-2023-01-24.json',
+    index: 'jaeger-service-2023-01-24',
+  },
+  {
+    mapping_url: 'https://raw.githubusercontent.com/opensearch-project/dashboards-observability/main/.cypress/utils/jaeger-span-2023-01-24-mappings.json',
+    data_url: 'https://raw.githubusercontent.com/opensearch-project/dashboards-observability/main/.cypress/utils/jaeger-span-2023-01-24.json',
+    index: 'jaeger-span-2023-01-24',
+  },
+]
+
 export const setTimeFilter = (setEndTime = false, refresh = true) => {
   const startTime = 'Mar 25, 2021 @ 10:00:00.000';
   const endTime = 'Mar 25, 2021 @ 11:00:00.000';
diff --git a/public/components/trace_analytics/components/common/__tests__/__snapshots__/search_bar.test.tsx.snap b/public/components/trace_analytics/components/common/__tests__/__snapshots__/search_bar.test.tsx.snap
index ae5d60c25d..8489eec0a0 100644
--- a/public/components/trace_analytics/components/common/__tests__/__snapshots__/search_bar.test.tsx.snap
+++ b/public/components/trace_analytics/components/common/__tests__/__snapshots__/search_bar.test.tsx.snap
@@ -1015,6 +1015,7 @@ exports[`Search bar components renders search bar 1`] = `
                   />
                 }
                 closePopover={[Function]}
+                data-test-subj="global-filter-button"
                 display="inlineBlock"
                 hasArrow={true}
                 isOpen={false}
@@ -1024,6 +1025,7 @@ exports[`Search bar components renders search bar 1`] = `
               >
                 <div
                   className="euiPopover euiPopover--anchorRightUp"
+                  data-test-subj="global-filter-button"
                   withTitle={true}
                 >
                   <div
@@ -1096,6 +1098,7 @@ exports[`Search bar components renders search bar 1`] = `
                   </EuiButtonEmpty>
                 }
                 closePopover={[Function]}
+                data-test-subj="addfilter"
                 display="inlineBlock"
                 hasArrow={true}
                 isOpen={false}
@@ -1105,6 +1108,7 @@ exports[`Search bar components renders search bar 1`] = `
               >
                 <div
                   className="euiPopover euiPopover--anchorDownLeft"
+                  data-test-subj="addfilter"
                   withTitle={true}
                 >
                   <div
diff --git a/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filters.test.tsx.snap b/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filters.test.tsx.snap
index 86019861ce..3d483d4dd2 100644
--- a/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filters.test.tsx.snap
+++ b/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filters.test.tsx.snap
@@ -43,6 +43,7 @@ exports[`Filter component renders filters 1`] = `
                 />
               }
               closePopover={[Function]}
+              data-test-subj="global-filter-button"
               display="inlineBlock"
               hasArrow={true}
               isOpen={false}
@@ -52,6 +53,7 @@ exports[`Filter component renders filters 1`] = `
             >
               <div
                 className="euiPopover euiPopover--anchorRightUp"
+                data-test-subj="global-filter-button"
                 withTitle={true}
               >
                 <div
@@ -124,6 +126,7 @@ exports[`Filter component renders filters 1`] = `
                 </EuiButtonEmpty>
               }
               closePopover={[Function]}
+              data-test-subj="addfilter"
               display="inlineBlock"
               hasArrow={true}
               isOpen={false}
@@ -133,6 +136,7 @@ exports[`Filter component renders filters 1`] = `
             >
               <div
                 className="euiPopover euiPopover--anchorDownLeft"
+                data-test-subj="addfilter"
                 withTitle={true}
               >
                 <div
diff --git a/public/components/trace_analytics/components/common/filters/filters.tsx b/public/components/trace_analytics/components/common/filters/filters.tsx
index ea06985eba..aa2cc086cb 100644
--- a/public/components/trace_analytics/components/common/filters/filters.tsx
+++ b/public/components/trace_analytics/components/common/filters/filters.tsx
@@ -52,7 +52,7 @@ export function Filters(props: FiltersOwnProps) {
     props.setFilters(newFilters);
   };
 
-  const validFilterFields = useMemo(() => getValidFilterFields(props.mode, props.page), [props.page]);
+  const validFilterFields = useMemo(() => getValidFilterFields(props.mode, props.page), [props.page, props.mode]);
   const filterFieldOptions = useMemo(
     () => getFilterFields(props.mode, props.page).map((field) => ({ label: field })),
     [props.page]
@@ -201,6 +201,7 @@ export function Filters(props: FiltersOwnProps) {
         anchorPosition="rightUp"
         panelPaddingSize="none"
         withTitle
+        data-test-subj='global-filter-button'
       >
         <EuiContextMenu initialPanelId={0} panels={globalPopoverPanels} />
       </EuiPopover>
@@ -226,6 +227,7 @@ export function Filters(props: FiltersOwnProps) {
         isOpen={isPopoverOpen}
         closePopover={() => setIsPopoverOpen(false)}
         anchorPosition="downLeft"
+        data-test-subj="addfilter"
         withTitle
       >
         <EuiPopoverTitle>{'Add filter'}</EuiPopoverTitle>
diff --git a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap
index 8d722ce6d4..452952c19a 100644
--- a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap
+++ b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap
@@ -1001,6 +1001,7 @@ exports[`Dashboard component renders dashboard 1`] = `
                       />
                     }
                     closePopover={[Function]}
+                    data-test-subj="global-filter-button"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -1010,6 +1011,7 @@ exports[`Dashboard component renders dashboard 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorRightUp"
+                      data-test-subj="global-filter-button"
                       withTitle={true}
                     >
                       <div
@@ -1087,6 +1089,7 @@ exports[`Dashboard component renders dashboard 1`] = `
                       </EuiButtonEmpty>
                     }
                     closePopover={[Function]}
+                    data-test-subj="addfilter"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -1096,6 +1099,7 @@ exports[`Dashboard component renders dashboard 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorDownLeft"
+                      data-test-subj="addfilter"
                       withTitle={true}
                     >
                       <div
@@ -3250,6 +3254,7 @@ exports[`Dashboard component renders empty dashboard 1`] = `
                       />
                     }
                     closePopover={[Function]}
+                    data-test-subj="global-filter-button"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -3259,6 +3264,7 @@ exports[`Dashboard component renders empty dashboard 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorRightUp"
+                      data-test-subj="global-filter-button"
                       withTitle={true}
                     >
                       <div
@@ -3331,6 +3337,7 @@ exports[`Dashboard component renders empty dashboard 1`] = `
                       </EuiButtonEmpty>
                     }
                     closePopover={[Function]}
+                    data-test-subj="addfilter"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -3340,6 +3347,7 @@ exports[`Dashboard component renders empty dashboard 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorDownLeft"
+                      data-test-subj="addfilter"
                       withTitle={true}
                     >
                       <div
@@ -5515,6 +5523,7 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
                       />
                     }
                     closePopover={[Function]}
+                    data-test-subj="global-filter-button"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -5524,6 +5533,7 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorRightUp"
+                      data-test-subj="global-filter-button"
                       withTitle={true}
                     >
                       <div
@@ -5601,6 +5611,7 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
                       </EuiButtonEmpty>
                     }
                     closePopover={[Function]}
+                    data-test-subj="addfilter"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -5610,6 +5621,7 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorDownLeft"
+                      data-test-subj="addfilter"
                       withTitle={true}
                     >
                       <div
@@ -5711,10 +5723,12 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
           toggleButtons={
             Array [
               Object {
+                "data-test-subj": "errors-toggle",
                 "id": "error_rate",
                 "label": "Error rate",
               },
               Object {
+                "data-test-subj": "throughput-toggle",
                 "id": "throughput",
                 "label": "Throughput",
               },
@@ -5770,10 +5784,12 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
                     options={
                       Array [
                         Object {
+                          "data-test-subj": "errors-toggle",
                           "id": "error_rate",
                           "label": "Error rate",
                         },
                         Object {
+                          "data-test-subj": "throughput-toggle",
                           "id": "throughput",
                           "label": "Throughput",
                         },
@@ -5794,6 +5810,7 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
                       >
                         <EuiButtonGroupButton
                           color="text"
+                          data-test-subj="errors-toggle"
                           element="label"
                           id="error_rate"
                           isDisabled={false}
@@ -5809,6 +5826,7 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
                             baseClassName="euiButtonGroupButton"
                             className="euiButtonGroupButton-isSelected"
                             color="text"
+                            data-test-subj="errors-toggle"
                             element="label"
                             fill={true}
                             htmlFor="random_html_id"
@@ -5826,6 +5844,7 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
                           >
                             <label
                               className="euiButtonGroupButton euiButtonGroupButton--text euiButtonGroupButton--small euiButtonGroupButton--fill euiButtonGroupButton-isSelected"
+                              data-test-subj="errors-toggle"
                               disabled={false}
                               htmlFor="random_html_id"
                               onClick={[Function]}
@@ -5874,6 +5893,7 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
                         </EuiButtonGroupButton>
                         <EuiButtonGroupButton
                           color="text"
+                          data-test-subj="throughput-toggle"
                           element="label"
                           id="throughput"
                           isDisabled={false}
@@ -5889,6 +5909,7 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
                             baseClassName="euiButtonGroupButton"
                             className=""
                             color="text"
+                            data-test-subj="throughput-toggle"
                             element="label"
                             fill={false}
                             htmlFor="random_html_id"
@@ -5906,6 +5927,7 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
                           >
                             <label
                               className="euiButtonGroupButton euiButtonGroupButton--text euiButtonGroupButton--small"
+                              data-test-subj="throughput-toggle"
                               disabled={false}
                               htmlFor="random_html_id"
                               onClick={[Function]}
diff --git a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/mode_picker.test.tsx.snap b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/mode_picker.test.tsx.snap
index 88d8ab540e..469f17277f 100644
--- a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/mode_picker.test.tsx.snap
+++ b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/mode_picker.test.tsx.snap
@@ -541,12 +541,14 @@ exports[`Mode picker component renders mode picker 2`] = `
                                     Array [
                                       Object {
                                         "checked": "on",
+                                        "data-test-subj": "jaeger-mode",
                                         "key": "jaeger",
                                         "label": "Jaeger",
                                         "value": "jaeger",
                                       },
                                       Object {
                                         "checked": undefined,
+                                        "data-test-subj": "data_prepper-mode",
                                         "key": "data_prepper",
                                         "label": "Data Prepper",
                                         "value": "data_prepper",
@@ -585,12 +587,14 @@ exports[`Mode picker component renders mode picker 2`] = `
                                           Array [
                                             Object {
                                               "checked": "on",
+                                              "data-test-subj": "jaeger-mode",
                                               "key": "jaeger",
                                               "label": "Jaeger",
                                               "value": "jaeger",
                                             },
                                             Object {
                                               "checked": undefined,
+                                              "data-test-subj": "data_prepper-mode",
                                               "key": "data_prepper",
                                               "label": "Data Prepper",
                                               "value": "data_prepper",
@@ -714,12 +718,14 @@ exports[`Mode picker component renders mode picker 2`] = `
                                           Array [
                                             Object {
                                               "checked": "on",
+                                              "data-test-subj": "jaeger-mode",
                                               "key": "jaeger",
                                               "label": "Jaeger",
                                               "value": "jaeger",
                                             },
                                             Object {
                                               "checked": undefined,
+                                              "data-test-subj": "data_prepper-mode",
                                               "key": "data_prepper",
                                               "label": "Data Prepper",
                                               "value": "data_prepper",
@@ -735,12 +741,14 @@ exports[`Mode picker component renders mode picker 2`] = `
                                           Array [
                                             Object {
                                               "checked": "on",
+                                              "data-test-subj": "jaeger-mode",
                                               "key": "jaeger",
                                               "label": "Jaeger",
                                               "value": "jaeger",
                                             },
                                             Object {
                                               "checked": undefined,
+                                              "data-test-subj": "data_prepper-mode",
                                               "key": "data_prepper",
                                               "label": "Data Prepper",
                                               "value": "data_prepper",
diff --git a/public/components/trace_analytics/components/dashboard/mode_picker.tsx b/public/components/trace_analytics/components/dashboard/mode_picker.tsx
index 15c685a5ed..14594958ca 100644
--- a/public/components/trace_analytics/components/dashboard/mode_picker.tsx
+++ b/public/components/trace_analytics/components/dashboard/mode_picker.tsx
@@ -70,6 +70,7 @@ export function DataSourcePicker(props: {
               key: x.id,
               value: x.id,
               checked: x.id === selectedMode ? 'on' : undefined,
+              "data-test-subj": x.id + '-mode',
             }))}
             onChange={(choices) => {
               const choice = choices.find(({ checked }) => checked) as unknown as {
diff --git a/public/components/trace_analytics/components/dashboard/top_groups_page.tsx b/public/components/trace_analytics/components/dashboard/top_groups_page.tsx
index 2e2b3fc418..f086332843 100644
--- a/public/components/trace_analytics/components/dashboard/top_groups_page.tsx
+++ b/public/components/trace_analytics/components/dashboard/top_groups_page.tsx
@@ -30,10 +30,12 @@ export function TopGroupsPage(props: {
     {
       id: 'error_rate',
       label: 'Error rate',
+      'data-test-subj': 'errors-toggle'
     },
     {
       id: 'throughput',
       label: 'Throughput',
+      'data-test-subj': 'throughput-toggle'
     },
   ];
   const [idSelected, setIdSelected] = useState('error_rate');
diff --git a/public/components/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap b/public/components/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap
index 2788e3cdb3..42291d3fa6 100644
--- a/public/components/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap
+++ b/public/components/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap
@@ -982,6 +982,7 @@ exports[`Services component renders empty services page 1`] = `
                       />
                     }
                     closePopover={[Function]}
+                    data-test-subj="global-filter-button"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -991,6 +992,7 @@ exports[`Services component renders empty services page 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorRightUp"
+                      data-test-subj="global-filter-button"
                       withTitle={true}
                     >
                       <div
@@ -1063,6 +1065,7 @@ exports[`Services component renders empty services page 1`] = `
                       </EuiButtonEmpty>
                     }
                     closePopover={[Function]}
+                    data-test-subj="addfilter"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -1072,6 +1075,7 @@ exports[`Services component renders empty services page 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorDownLeft"
+                      data-test-subj="addfilter"
                       withTitle={true}
                     >
                       <div
@@ -2810,6 +2814,7 @@ exports[`Services component renders jaeger services page 1`] = `
                       />
                     }
                     closePopover={[Function]}
+                    data-test-subj="global-filter-button"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -2819,6 +2824,7 @@ exports[`Services component renders jaeger services page 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorRightUp"
+                      data-test-subj="global-filter-button"
                       withTitle={true}
                     >
                       <div
@@ -2896,6 +2902,7 @@ exports[`Services component renders jaeger services page 1`] = `
                       </EuiButtonEmpty>
                     }
                     closePopover={[Function]}
+                    data-test-subj="addfilter"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -2905,6 +2912,7 @@ exports[`Services component renders jaeger services page 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorDownLeft"
+                      data-test-subj="addfilter"
                       withTitle={true}
                     >
                       <div
@@ -4120,6 +4128,7 @@ exports[`Services component renders services page 1`] = `
                       />
                     }
                     closePopover={[Function]}
+                    data-test-subj="global-filter-button"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -4129,6 +4138,7 @@ exports[`Services component renders services page 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorRightUp"
+                      data-test-subj="global-filter-button"
                       withTitle={true}
                     >
                       <div
@@ -4206,6 +4216,7 @@ exports[`Services component renders services page 1`] = `
                       </EuiButtonEmpty>
                     }
                     closePopover={[Function]}
+                    data-test-subj="addfilter"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -4215,6 +4226,7 @@ exports[`Services component renders services page 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorDownLeft"
+                      data-test-subj="addfilter"
                       withTitle={true}
                     >
                       <div
diff --git a/public/components/trace_analytics/components/services/__tests__/__snapshots__/services_table.test.tsx.snap b/public/components/trace_analytics/components/services/__tests__/__snapshots__/services_table.test.tsx.snap
index 972e3ab3dc..9d99f82c4f 100644
--- a/public/components/trace_analytics/components/services/__tests__/__snapshots__/services_table.test.tsx.snap
+++ b/public/components/trace_analytics/components/services/__tests__/__snapshots__/services_table.test.tsx.snap
@@ -1101,11 +1101,13 @@ exports[`Services table component renders jaeger services table 1`] = `
                               >
                                 <EuiLink
                                   className=""
+                                  data-test-subj="service-link"
                                   key=".0"
                                   onClick={[Function]}
                                 >
                                   <button
                                     className="euiLink euiLink--primary"
+                                    data-test-subj="service-link"
                                     disabled={false}
                                     onClick={[Function]}
                                     type="button"
@@ -2679,11 +2681,13 @@ exports[`Services table component renders services table 1`] = `
                               >
                                 <EuiLink
                                   className=""
+                                  data-test-subj="service-link"
                                   key=".0"
                                   onClick={[Function]}
                                 >
                                   <button
                                     className="euiLink euiLink--primary"
+                                    data-test-subj="service-link"
                                     disabled={false}
                                     onClick={[Function]}
                                     type="button"
diff --git a/public/components/trace_analytics/components/services/services_table.tsx b/public/components/trace_analytics/components/services/services_table.tsx
index 99fe679867..4ffe85107c 100644
--- a/public/components/trace_analytics/components/services/services_table.tsx
+++ b/public/components/trace_analytics/components/services/services_table.tsx
@@ -69,7 +69,7 @@ export function ServicesTable(props: ServicesTableProps) {
           align: 'left',
           sortable: true,
           render: (item: any) => (
-            <EuiLink onClick={() => nameColumnAction(item)}>
+            <EuiLink data-test-subj="service-link" onClick={() => nameColumnAction(item)}>
               {item.length < 24 ? item : <div title={item}>{_.truncate(item, { length: 24 })}</div>}
             </EuiLink>
           ),
@@ -97,24 +97,36 @@ export function ServicesTable(props: ServicesTableProps) {
           truncateText: true,
           render: (item: any) => (item === 0 || item ? <EuiI18nNumber value={item} /> : '-'),
         },
-        ... mode === 'data_prepper' ? [{
-          field: 'number_of_connected_services',
-          name: 'No. of connected services',
-          align: 'right',
-          sortable: true,
-          truncateText: true,
-          width: '80px',
-          render: (item: any) => (item === 0 || item ? item : '-'),
-        }] : [],
-        ... mode === 'data_prepper' ? [{
-          field: 'connected_services',
-          name: 'Connected services',
-          align: 'left',
-          sortable: true,
-          truncateText: true,
-          render: (item: any) =>
-            item ? <EuiText size="s">{_.truncate(item.join(', '), { length: 50 })}</EuiText> : '-',
-        }] : [],
+        ...(mode === 'data_prepper'
+          ? [
+              {
+                field: 'number_of_connected_services',
+                name: 'No. of connected services',
+                align: 'right',
+                sortable: true,
+                truncateText: true,
+                width: '80px',
+                render: (item: any) => (item === 0 || item ? item : '-'),
+              },
+            ]
+          : []),
+        ...(mode === 'data_prepper'
+          ? [
+              {
+                field: 'connected_services',
+                name: 'Connected services',
+                align: 'left',
+                sortable: true,
+                truncateText: true,
+                render: (item: any) =>
+                  item ? (
+                    <EuiText size="s">{_.truncate(item.join(', '), { length: 50 })}</EuiText>
+                  ) : (
+                    '-'
+                  ),
+              },
+            ]
+          : []),
         {
           field: 'traces',
           name: 'Traces',
@@ -128,7 +140,7 @@ export function ServicesTable(props: ServicesTableProps) {
                   onClick={() => {
                     setRedirect(true);
                     addFilter({
-                      field: mode === 'jaeger' ? 'process.serviceName': 'serviceName',
+                      field: mode === 'jaeger' ? 'process.serviceName' : 'serviceName',
                       operator: 'is',
                       value: row.name,
                       inverted: false,
@@ -157,9 +169,12 @@ export function ServicesTable(props: ServicesTableProps) {
         {titleBar}
         <EuiSpacer size="m" />
         <EuiHorizontalRule margin="none" />
-        {!((mode === 'data_prepper' && dataPrepperIndicesExist) || mode === 'jaeger' && jaegerIndicesExist) ? (
-          <MissingConfigurationMessage mode={mode}/>
-        ) : ( items?.length > 0 ? (
+        {!(
+          (mode === 'data_prepper' && dataPrepperIndicesExist) ||
+          (mode === 'jaeger' && jaegerIndicesExist)
+        ) ? (
+          <MissingConfigurationMessage mode={mode} />
+        ) : items?.length > 0 ? (
           <EuiInMemoryTable
             tableLayout="auto"
             items={items}
@@ -178,7 +193,7 @@ export function ServicesTable(props: ServicesTableProps) {
           />
         ) : (
           <NoMatchMessage size="xl" />
-        ))}
+        )}
       </EuiPanel>
     </>
   );
diff --git a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/service_breakdown_panel.test.tsx.snap b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/service_breakdown_panel.test.tsx.snap
index 420393e592..4b25a19b50 100644
--- a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/service_breakdown_panel.test.tsx.snap
+++ b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/service_breakdown_panel.test.tsx.snap
@@ -9,6 +9,7 @@ exports[`Service breakdown panel component renders empty service breakdown panel
       className="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
     >
       <PanelTitle
+        data-test-subj="time-spent-by-service-panel"
         title="Time spent by service"
       >
         <EuiText
@@ -94,6 +95,7 @@ exports[`Service breakdown panel component renders service breakdown panel 1`] =
       className="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
     >
       <PanelTitle
+        data-test-subj="time-spent-by-service-panel"
         title="Time spent by service"
       >
         <EuiText
diff --git a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_panel.test.tsx.snap b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_panel.test.tsx.snap
index a7c9e6ea46..9c05f6040d 100644
--- a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_panel.test.tsx.snap
+++ b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_panel.test.tsx.snap
@@ -63,9 +63,12 @@ exports[`Service breakdown panel component renders service breakdown panel 1`] =
   mode="data_prepper"
   setData={[MockFunction]}
 >
-  <EuiPanel>
+  <EuiPanel
+    data-test-subj="span-gantt-chart-panel"
+  >
     <div
       className="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
+      data-test-subj="span-gantt-chart-panel"
     >
       <EuiFlexGroup>
         <div
diff --git a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap
index bc0e6270e5..1aeeab3f1d 100644
--- a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap
+++ b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap
@@ -980,6 +980,7 @@ exports[`Traces component renders empty traces page 1`] = `
                       />
                     }
                     closePopover={[Function]}
+                    data-test-subj="global-filter-button"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -989,6 +990,7 @@ exports[`Traces component renders empty traces page 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorRightUp"
+                      data-test-subj="global-filter-button"
                       withTitle={true}
                     >
                       <div
@@ -1061,6 +1063,7 @@ exports[`Traces component renders empty traces page 1`] = `
                       </EuiButtonEmpty>
                     }
                     closePopover={[Function]}
+                    data-test-subj="addfilter"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -1070,6 +1073,7 @@ exports[`Traces component renders empty traces page 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorDownLeft"
+                      data-test-subj="addfilter"
                       withTitle={true}
                     >
                       <div
@@ -2274,6 +2278,7 @@ exports[`Traces component renders jaeger traces page 1`] = `
                       />
                     }
                     closePopover={[Function]}
+                    data-test-subj="global-filter-button"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -2283,6 +2288,7 @@ exports[`Traces component renders jaeger traces page 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorRightUp"
+                      data-test-subj="global-filter-button"
                       withTitle={true}
                     >
                       <div
@@ -2360,6 +2366,7 @@ exports[`Traces component renders jaeger traces page 1`] = `
                       </EuiButtonEmpty>
                     }
                     closePopover={[Function]}
+                    data-test-subj="addfilter"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -2369,6 +2376,7 @@ exports[`Traces component renders jaeger traces page 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorDownLeft"
+                      data-test-subj="addfilter"
                       withTitle={true}
                     >
                       <div
@@ -3572,6 +3580,7 @@ exports[`Traces component renders traces page 1`] = `
                       />
                     }
                     closePopover={[Function]}
+                    data-test-subj="global-filter-button"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -3581,6 +3590,7 @@ exports[`Traces component renders traces page 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorRightUp"
+                      data-test-subj="global-filter-button"
                       withTitle={true}
                     >
                       <div
@@ -3658,6 +3668,7 @@ exports[`Traces component renders traces page 1`] = `
                       </EuiButtonEmpty>
                     }
                     closePopover={[Function]}
+                    data-test-subj="addfilter"
                     display="inlineBlock"
                     hasArrow={true}
                     isOpen={false}
@@ -3667,6 +3678,7 @@ exports[`Traces component renders traces page 1`] = `
                   >
                     <div
                       className="euiPopover euiPopover--anchorDownLeft"
+                      data-test-subj="addfilter"
                       withTitle={true}
                     >
                       <div
diff --git a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces_table.test.tsx.snap b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces_table.test.tsx.snap
index 9cb9ba1a18..ac654a6f71 100644
--- a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces_table.test.tsx.snap
+++ b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces_table.test.tsx.snap
@@ -2656,10 +2656,12 @@ exports[`Traces table component renders traces table 1`] = `
                                         className="euiFlexItem euiFlexItem--flexGrow10"
                                       >
                                         <EuiLink
+                                          data-test-subj="trace-link"
                                           onClick={[Function]}
                                         >
                                           <button
                                             className="euiLink euiLink--primary"
+                                            data-test-subj="trace-link"
                                             disabled={false}
                                             onClick={[Function]}
                                             type="button"
diff --git a/public/components/trace_analytics/components/traces/service_breakdown_panel.tsx b/public/components/trace_analytics/components/traces/service_breakdown_panel.tsx
index 71987208d0..6f8703a03e 100644
--- a/public/components/trace_analytics/components/traces/service_breakdown_panel.tsx
+++ b/public/components/trace_analytics/components/traces/service_breakdown_panel.tsx
@@ -68,7 +68,7 @@ export function ServiceBreakdownPanel(props: { data: Plotly.Data[] }) {
   return (
     <>
       <EuiPanel>
-        <PanelTitle title="Time spent by service" />
+        <PanelTitle title="Time spent by service" data-test-subj='time-spent-by-service-panel'/>
         <EuiHorizontalRule margin="m" />
         <EuiFlexGroup direction="column" alignItems="center">
           <EuiFlexItem>
diff --git a/public/components/trace_analytics/components/traces/span_detail_flyout.tsx b/public/components/trace_analytics/components/traces/span_detail_flyout.tsx
index fcfbe1f27c..5a3089bc1a 100644
--- a/public/components/trace_analytics/components/traces/span_detail_flyout.tsx
+++ b/public/components/trace_analytics/components/traces/span_detail_flyout.tsx
@@ -88,36 +88,64 @@ export function SpanDetailFlyout(props: {
         (mode === 'data_prepper' ? span.parentSpanId : span.references.length) ? (
           <EuiFlexGroup gutterSize="xs" style={{ marginTop: -4, marginBottom: -4 }}>
             <EuiFlexItem grow={false}>
-              <EuiCopy textToCopy={mode === 'data_prepper' ? span.parentSpanId : span.references[0].spanID}>
+              <EuiCopy
+                textToCopy={mode === 'data_prepper' ? span.parentSpanId : span.references[0].spanID}
+              >
                 {(copy) => (
                   <EuiButtonIcon aria-label="copy-button" onClick={copy} iconType="copyClipboard" />
                 )}
               </EuiCopy>
             </EuiFlexItem>
-            <EuiFlexItem>{mode === 'data_prepper' ? span.parentSpanId : span.references[0].spanID}</EuiFlexItem>
+            <EuiFlexItem data-test-subj="parentSpanId">
+              {mode === 'data_prepper' ? span.parentSpanId : span.references[0].spanID}
+            </EuiFlexItem>
           </EuiFlexGroup>
         ) : (
           '-'
         )
       ),
-      getListItem('serviceName', 'Service', (mode === 'data_prepper' ? span.serviceName : span.process['serviceName']) || '-'),
-      getListItem('name', 'Operation', (mode === 'data_prepper' ? span.name : span.operationName) || '-'),
+      getListItem(
+        'serviceName',
+        'Service',
+        (mode === 'data_prepper' ? span.serviceName : span.process.serviceName) || '-'
+      ),
+      getListItem(
+        'name',
+        'Operation',
+        (mode === 'data_prepper' ? span.name : span.operationName) || '-'
+      ),
       getListItem(
         'durationInNanos',
         'Duration',
-        `${(mode === 'data_prepper' ? _.round(nanoToMilliSec(Math.max(0, span.durationInNanos)), 2) : _.round(microToMilliSec(Math.max(0, span.duration)), 2))} ms`
+        `${
+          mode === 'data_prepper'
+            ? _.round(nanoToMilliSec(Math.max(0, span.durationInNanos)), 2)
+            : _.round(microToMilliSec(Math.max(0, span.duration)), 2)
+        } ms`
       ),
       getListItem(
         'startTime',
         'Start time',
-        mode === 'data_prepper' ? moment(span.startTime).format(TRACE_ANALYTICS_DATE_FORMAT) : moment(_.round(microToMilliSec(Math.max(0, span.startTime)), 2)).format(TRACE_ANALYTICS_DATE_FORMAT)
+        mode === 'data_prepper'
+          ? moment(span.startTime).format(TRACE_ANALYTICS_DATE_FORMAT)
+          : moment(_.round(microToMilliSec(Math.max(0, span.startTime)), 2)).format(
+              TRACE_ANALYTICS_DATE_FORMAT
+            )
+      ),
+      getListItem(
+        'endTime',
+        'End time',
+        mode === 'data_prepper'
+          ? moment(span.endTime).format(TRACE_ANALYTICS_DATE_FORMAT)
+          : moment(_.round(microToMilliSec(Math.max(0, span.startTime + span.duration)), 2)).format(
+              TRACE_ANALYTICS_DATE_FORMAT
+            )
       ),
-      getListItem('endTime', 'End time',  mode === 'data_prepper' ? moment(span.endTime).format(TRACE_ANALYTICS_DATE_FORMAT) : moment(_.round(microToMilliSec(Math.max(0, span.startTime + span.duration)), 2)).format(TRACE_ANALYTICS_DATE_FORMAT)),
       getListItem(
         'status.code',
         'Errors',
-        (mode === 'data_prepper' ? span['status.code'] === 2 : span.tag['error']) ? (
-          <EuiText color="danger" size="s" style={{fontWeight: 700}}>
+        (mode === 'data_prepper' ? span['status.code'] === 2 : span.tag.error) ? (
+          <EuiText color="danger" size="s" style={{ fontWeight: 700 }}>
             Yes
           </EuiText>
         ) : (
@@ -162,13 +190,13 @@ export function SpanDetailFlyout(props: {
         return getListItem(key, key, value);
       });
 
-    const eventsComponent = _.isEmpty(span['events']) ? null : (
+    const eventsComponent = _.isEmpty(span.events) ? null : (
       <>
         <EuiText size="m">
           <span className="panel-title">Event</span>
         </EuiText>
         <EuiCodeBlock language="json" paddingSize="s" isCopyable overflowHeight={400}>
-          {JSON.stringify(span['events'], null, 2)}
+          {JSON.stringify(span.events, null, 2)}
         </EuiCodeBlock>
         <EuiSpacer size="xs" />
         <EuiHorizontalRule margin="s" />
diff --git a/public/components/trace_analytics/components/traces/span_detail_panel.tsx b/public/components/trace_analytics/components/traces/span_detail_panel.tsx
index e4fb34dba4..4c2ebedb63 100644
--- a/public/components/trace_analytics/components/traces/span_detail_panel.tsx
+++ b/public/components/trace_analytics/components/traces/span_detail_panel.tsx
@@ -239,7 +239,7 @@ export function SpanDetailPanel(props: {
 
   return (
     <>
-      <EuiPanel>
+      <EuiPanel data-test-subj='span-gantt-chart-panel'>
         <EuiFlexGroup>
           <EuiFlexItem>
             <PanelTitle title="Spans" totalItems={data.gantt.length / 2} />
diff --git a/public/components/trace_analytics/components/traces/span_detail_table.tsx b/public/components/trace_analytics/components/traces/span_detail_table.tsx
index af2934b860..30f60010f8 100644
--- a/public/components/trace_analytics/components/traces/span_detail_table.tsx
+++ b/public/components/trace_analytics/components/traces/span_detail_table.tsx
@@ -18,7 +18,7 @@ interface SpanDetailTableProps {
   http: HttpSetup;
   hiddenColumns: string[];
   openFlyout: (spanId: string) => void;
-  mode: TraceAnalyticsMode
+  mode: TraceAnalyticsMode;
   DSL?: any;
   setTotal?: (total: number) => void;
 }
@@ -58,70 +58,122 @@ export function SpanDetailTable(props: SpanDetailTableProps) {
   }, [total]);
 
   const columns: EuiDataGridColumn[] = [
-    ... mode === 'jaeger' ? [{
-      id: 'spanID',
-      display: 'Span ID',
-    }] : [{
-      id: 'spanId',
-      display: 'Span ID',
-    }],
-    ... mode === 'jaeger' ? [{
-      id: 'references',
-      display: 'Parent span ID',
-    }] : [{
-      id: 'parentSpanId',
-      display: 'Parent span ID',
-    }],
-    ... mode === 'jaeger' ? [{
-      id: 'traceID',
-      display: 'Trace ID',
-    }] : [{
-      id: 'traceId',
-      display: 'Trace ID',
-    }],
-    ... mode === 'jaeger' ? [] : [{
-      id: 'traceGroup',
-      display: 'Trace group',
-    }],
-    ... mode === 'jaeger' ? [{
-      id: 'process',
-      display: 'Service',
-    }] : [{
-      id: 'serviceName',
-      display: 'Service',
-    }],
-    ... mode === 'jaeger' ? [{
-      id: 'operationName',
-      display: 'Operation',
-    }] : [{
-      id: 'name',
-      display: 'Operation',
-    }],
-    ... mode === 'jaeger' ? [{
-      id: 'duration',
-      display: 'Duration',
-    }] : [{
-      id: 'durationInNanos',
-      display: 'Duration',
-    }],
+    ...(mode === 'jaeger'
+      ? [
+          {
+            id: 'spanID',
+            display: 'Span ID',
+          },
+        ]
+      : [
+          {
+            id: 'spanId',
+            display: 'Span ID',
+          },
+        ]),
+    ...(mode === 'jaeger'
+      ? [
+          {
+            id: 'references',
+            display: 'Parent span ID',
+          },
+        ]
+      : [
+          {
+            id: 'parentSpanId',
+            display: 'Parent span ID',
+          },
+        ]),
+    ...(mode === 'jaeger'
+      ? [
+          {
+            id: 'traceID',
+            display: 'Trace ID',
+          },
+        ]
+      : [
+          {
+            id: 'traceId',
+            display: 'Trace ID',
+          },
+        ]),
+    ...(mode === 'jaeger'
+      ? []
+      : [
+          {
+            id: 'traceGroup',
+            display: 'Trace group',
+          },
+        ]),
+    ...(mode === 'jaeger'
+      ? [
+          {
+            id: 'process',
+            display: 'Service',
+          },
+        ]
+      : [
+          {
+            id: 'serviceName',
+            display: 'Service',
+          },
+        ]),
+    ...(mode === 'jaeger'
+      ? [
+          {
+            id: 'operationName',
+            display: 'Operation',
+          },
+        ]
+      : [
+          {
+            id: 'name',
+            display: 'Operation',
+          },
+        ]),
+    ...(mode === 'jaeger'
+      ? [
+          {
+            id: 'duration',
+            display: 'Duration',
+          },
+        ]
+      : [
+          {
+            id: 'durationInNanos',
+            display: 'Duration',
+          },
+        ]),
     {
       id: 'startTime',
       display: 'Start time',
     },
-    ... mode === 'jaeger' ? [{
-      id: 'jaegerEndTime',
-      display: 'End time',
-    }] : [{
-      id: 'endTime',
-      display: 'End time',
-    }],
-    ... mode === 'jaeger' ? [{
-      id: 'tag',
-      display: 'Errors',
-    }] : [{
-      id: 'status.code',
-      display: 'Errors',
-    }],
+    ...(mode === 'jaeger'
+      ? [
+          {
+            id: 'jaegerEndTime',
+            display: 'End time',
+          },
+        ]
+      : [
+          {
+            id: 'endTime',
+            display: 'End time',
+          },
+        ]),
+    ...(mode === 'jaeger'
+      ? [
+          {
+            id: 'tag',
+            display: 'Errors',
+          },
+        ]
+      : [
+          {
+            id: 'status.code',
+            display: 'Errors',
+          },
+        ]),
   ];
 
   const [visibleColumns, setVisibleColumns] = useState(() =>
@@ -138,19 +190,23 @@ export function SpanDetailTable(props: SpanDetailTableProps) {
       if ((value == null || value === '') && columnId !== 'jaegerEndTime') return '-';
       switch (columnId) {
         case 'tag':
-          return (value["error"] === true) ? (
+          return value.error === true ? (
             <EuiText color="danger" size="s">
               Yes
             </EuiText>
           ) : (
             'No'
-          );;
+          );
         case 'references':
-          return value.length > 0 ? value[0]["spanID"] : '';
+          return value.length > 0 ? value[0].spanID : '';
         case 'process':
-          return value["serviceName"];
+          return value.serviceName;
         case 'spanId':
-          return <EuiLink onClick={() => props.openFlyout(value)}>{value}</EuiLink>;
+          return (
+            <EuiLink data-test-subj="spanId-link" onClick={() => props.openFlyout(value)}>
+              {value}
+            </EuiLink>
+          );
         case 'spanID':
           return <EuiLink onClick={() => props.openFlyout(value)}>{value}</EuiLink>;
         case 'durationInNanos':
@@ -158,9 +214,20 @@ export function SpanDetailTable(props: SpanDetailTableProps) {
         case 'duration':
           return `${_.round(microToMilliSec(Math.max(0, value)), 2)} ms`;
         case 'startTime':
-          return mode === 'jaeger' ? moment(_.round(microToMilliSec(Math.max(0, value)), 2)).format(TRACE_ANALYTICS_DATE_FORMAT) : moment(value).format(TRACE_ANALYTICS_DATE_FORMAT);
+          return mode === 'jaeger'
+            ? moment(_.round(microToMilliSec(Math.max(0, value)), 2)).format(
+                TRACE_ANALYTICS_DATE_FORMAT
+              )
+            : moment(value).format(TRACE_ANALYTICS_DATE_FORMAT);
         case 'jaegerEndTime':
-          return moment(_.round(microToMilliSec(Math.max(0, items[adjustedRowIndex]["startTime"] + items[adjustedRowIndex]["duration"])), 2)).format(TRACE_ANALYTICS_DATE_FORMAT);
+          return moment(
+            _.round(
+              microToMilliSec(
+                Math.max(0, items[adjustedRowIndex].startTime + items[adjustedRowIndex].duration)
+              ),
+              2
+            )
+          ).format(TRACE_ANALYTICS_DATE_FORMAT);
         case 'endTime':
           return moment(value).format(TRACE_ANALYTICS_DATE_FORMAT);
         case 'status.code':
diff --git a/public/components/trace_analytics/components/traces/traces_table.tsx b/public/components/trace_analytics/components/traces/traces_table.tsx
index 085da31c25..03fa6c68aa 100644
--- a/public/components/trace_analytics/components/traces/traces_table.tsx
+++ b/public/components/trace_analytics/components/traces/traces_table.tsx
@@ -64,7 +64,7 @@ export function TracesTable(props: TracesTableProps) {
           render: (item) => (
             <EuiFlexGroup gutterSize="s" alignItems="center">
               <EuiFlexItem grow={10}>
-                <EuiLink onClick={() => traceIdColumnAction(item)}>
+                <EuiLink data-test-subj='trace-link' onClick={() => traceIdColumnAction(item)}>
                   {item.length < 24 ? (
                     item
                   ) : (
diff --git a/public/components/trace_analytics/home.tsx b/public/components/trace_analytics/home.tsx
index 3e154010d4..d9c443ff15 100644
--- a/public/components/trace_analytics/home.tsx
+++ b/public/components/trace_analytics/home.tsx
@@ -87,8 +87,8 @@ export const Home = (props: HomeProps) => {
 
 
   const modes = [
-    { id: 'jaeger', title: 'Jaeger' },
-    { id: 'data_prepper', title: 'Data Prepper' },
+    { id: 'jaeger', title: 'Jaeger', 'data-test-subj': 'jaeger-mode' },
+    { id: 'data_prepper', title: 'Data Prepper', 'data-test-subj': 'data-prepper-mode' },
   ];
 
   useEffect(() => {