From 731b83fd4d8f31cd8193b38edd79e5f5018b9d31 Mon Sep 17 00:00:00 2001
From: Austin Sullivan <ausulliv@redhat.com>
Date: Wed, 8 Nov 2023 13:58:47 -0500
Subject: [PATCH] chore(eslint): Added React Testing Library linter plugin

---
 .eslintignore                                 |  1 -
 .eslintrc.json                                |  9 ++
 package.json                                  |  2 +
 .../__tests__/AboutModalBox.test.tsx          |  6 +-
 .../__tests__/AccordionItem.test.tsx          |  4 +-
 .../Alert/__tests__/AlertGroup.test.tsx       |  2 +-
 .../BackToTop/__tests__/BackToTop.test.tsx    |  3 +-
 .../src/components/Button/Button.tsx          |  2 +-
 .../Button/__tests__/Button.test.tsx          |  1 -
 .../__tests__/CalendarMonth.test.tsx          |  4 +-
 .../Card/__tests__/CardBody.test.tsx          |  2 +-
 .../Card/__tests__/CardFooter.test.tsx        |  2 +-
 .../Chip/__tests__/ChipGroup.test.tsx         |  6 +-
 .../__tests__/ClipboardCopyToggle.test.tsx    |  1 -
 .../DatePicker/__tests__/DatePicker.test.tsx  | 10 +--
 .../Divider/__tests__/Divider.test.tsx        | 15 +---
 .../Drawer/__tests__/Drawer.test.tsx          | 12 +--
 .../Dropdown/__tests__/Dropdown.test.tsx      |  6 +-
 .../Form/__tests__/FormContext.test.tsx       | 89 ++++++++-----------
 .../Form/__tests__/FormFieldGroup.test.tsx    |  2 +-
 .../Form/__tests__/FormGroup.test.tsx         |  1 -
 .../Form/__tests__/FormHelperText.test.tsx    |  1 -
 .../HelperText/__tests__/HelperText.test.tsx  |  4 +-
 .../components/Icon/__tests__/Icon.test.tsx   |  4 +-
 .../InputGroup/__tests__/InputGroup.test.tsx  |  4 +-
 .../Masthead/__tests__/Masthead.test.tsx      |  2 +-
 .../components/Menu/__tests__/Menu.test.tsx   |  5 +-
 .../MenuToggle/__tests__/MenuToggle.test.tsx  | 34 +++----
 .../MultipleFileUploadStatus.test.tsx         |  2 +-
 .../MultipleFileUploadStatusItem.test.tsx     |  2 +-
 .../MultipleFileUploadTitle.test.tsx          |  2 +-
 .../MultipleFileUploadTitleIcon.test.tsx      |  2 +-
 .../MultipleFileUploadTitleText.test.tsx      |  2 +-
 ...tipleFileUploadTitleTextSeparator.test.tsx |  2 +-
 .../src/components/Nav/__tests__/Nav.test.tsx | 28 +++---
 .../__tests__/NotificationBadge.test.tsx      |  2 +-
 .../NotificationDrawerGroup.test.tsx          |  4 +-
 .../NotificationDrawerListItem.test.tsx       |  4 +-
 .../NotificationDrawerListItemHeader.test.tsx |  2 +-
 .../__tests__/NumberInput.test.tsx            | 12 +--
 .../Pagination/__tests__/Pagination.test.tsx  |  6 +-
 .../components/Panel/__tests__/Panel.test.tsx |  4 +-
 .../Popover/__tests__/Popover.test.tsx        |  2 +-
 .../Progress/__tests__/Progress.test.tsx      | 10 +--
 .../__tests__/ProgressStep.test.tsx           |  2 +-
 .../__tests__/SearchInput.test.tsx            | 21 ++---
 .../__snapshots__/SearchInput.test.tsx.snap   | 69 --------------
 .../__tests__/SkipToContent.test.tsx          |  1 -
 .../Spinner/__tests__/Spinner.test.tsx        |  2 +-
 .../Switch/__tests__/Switch.test.tsx          |  2 +-
 .../Tabs/__tests__/OverflowTab.test.tsx       |  2 +-
 .../components/Tabs/__tests__/Tabs.test.tsx   | 10 +--
 .../TextInput/__tests__/TextInput.test.tsx    | 10 ++-
 .../TimePicker/__tests__/TimePicker.test.tsx  | 14 +--
 .../Toolbar/__tests__/Toolbar.test.tsx        |  4 +-
 .../Toolbar/__tests__/ToolbarGroup.test.tsx   |  6 +-
 .../Toolbar/__tests__/ToolbarItem.test.tsx    |  6 +-
 .../TreeView/__tests__/TreeView.test.tsx      |  7 +-
 .../Wizard/__tests__/WizardToggle.test.tsx    |  4 +-
 .../Wizard/__tests__/utils.test.tsx           |  2 +-
 .../__tests__/ContextSelectorToggle.test.tsx  |  8 +-
 .../__tests__/DropdownToggle.test.tsx         |  2 +-
 .../Select/__tests__/Select.test.tsx          |  2 +-
 .../Wizard/__tests__/Wizard.test.tsx          |  6 +-
 .../GenerateId/__tests__/GenerateId.test.tsx  |  2 +-
 .../src/helpers/OUIA/__mocks__/ouia.ts        |  6 ++
 .../react-core/src/helpers/__mocks__/index.ts |  2 +
 .../src/helpers/__tests__/fileUtils.test.ts   | 15 ++--
 .../src/helpers/__tests__/util.test.ts        |  2 +-
 .../Bullseye/__tests__/Bullseye.test.tsx      |  2 +-
 .../layouts/Grid/__tests__/GridItem.test.tsx  |  2 +-
 .../src/__tests__/createIcon.test.tsx         |  8 +-
 .../Table/utils/transformers.test.tsx         |  1 +
 .../components/Table/__tests__/Table.test.tsx | 13 +--
 yarn.lock                                     |  9 +-
 75 files changed, 234 insertions(+), 328 deletions(-)
 create mode 100644 packages/react-core/src/helpers/OUIA/__mocks__/ouia.ts
 create mode 100644 packages/react-core/src/helpers/__mocks__/index.ts

diff --git a/.eslintignore b/.eslintignore
index 235d8b73c41..cdfefe2893d 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,7 +1,6 @@
 # Javascript builds
 node_modules
 dist
-__tests__
 thirdparty
 tsc_out
 .out
diff --git a/.eslintrc.json b/.eslintrc.json
index b78d47c5ef8..3a119092f7d 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -127,6 +127,15 @@
             "rules": {
                 "patternfly-react/no-anonymous-functions": "off"
             }
+        },
+        {
+            "files": ["**/*.test.[jt]s?(x)"],
+            "extends": ["plugin:testing-library/react"],
+            "rules": {
+                "testing-library/no-node-access": "off",
+                "react/jsx-key": "off",
+                "no-console": "off"
+            }
         }
     ]
 }
diff --git a/package.json b/package.json
index 42c169fbfd8..0267dda06c7 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "eslint-plugin-markdown": "^3.0.0",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-testing-library": "^6.1.0",
     "fs-extra": "^11.1.1",
     "glob": "^9.3.0",
     "husky": "^4.3.0",
@@ -85,6 +86,7 @@
     "lint:md": "yarn eslint packages --ext md --no-eslintrc --config .eslintrc-md.json --cache",
     "lint:ts": "yarn lint packages/*/src",
     "lint:versions": "node scripts/verifyPatternflyVersions.js",
+    "lint:tests": "yarn lint packages/*/src/components/*/__tests__/*.test.*",
     "prepare": "ts-patch install -s",
     "serve:docs": "yarn workspace @patternfly/react-docs serve",
     "serve:integration": "lerna run serve:demo-app",
diff --git a/packages/react-core/src/components/AboutModal/__tests__/AboutModalBox.test.tsx b/packages/react-core/src/components/AboutModal/__tests__/AboutModalBox.test.tsx
index 6c1c8b0aaf0..9587eb1a531 100644
--- a/packages/react-core/src/components/AboutModal/__tests__/AboutModalBox.test.tsx
+++ b/packages/react-core/src/components/AboutModal/__tests__/AboutModalBox.test.tsx
@@ -3,10 +3,6 @@ import { render } from '@testing-library/react';
 import { AboutModalBox } from '../AboutModalBox';
 
 test('AboutModalBox Test', () => {
-  const { asFragment } = render(
-    <AboutModalBox aria-labelledby="id">
-      This is a AboutModalBox
-    </AboutModalBox>
-  );
+  const { asFragment } = render(<AboutModalBox aria-labelledby="id">This is a AboutModalBox</AboutModalBox>);
   expect(asFragment()).toMatchSnapshot();
 });
diff --git a/packages/react-core/src/components/Accordion/__tests__/AccordionItem.test.tsx b/packages/react-core/src/components/Accordion/__tests__/AccordionItem.test.tsx
index d2a6c8ff540..ca18a80cf88 100644
--- a/packages/react-core/src/components/Accordion/__tests__/AccordionItem.test.tsx
+++ b/packages/react-core/src/components/Accordion/__tests__/AccordionItem.test.tsx
@@ -11,8 +11,6 @@ test('Renders children', () => {
 });
 
 test('Matches the snapshot', () => {
-  const { asFragment } = render(
-    <AccordionItem>Test</AccordionItem>
-  );
+  const { asFragment } = render(<AccordionItem>Test</AccordionItem>);
   expect(asFragment()).toMatchSnapshot();
 });
diff --git a/packages/react-core/src/components/Alert/__tests__/AlertGroup.test.tsx b/packages/react-core/src/components/Alert/__tests__/AlertGroup.test.tsx
index a2d6186f28d..09f37026d10 100644
--- a/packages/react-core/src/components/Alert/__tests__/AlertGroup.test.tsx
+++ b/packages/react-core/src/components/Alert/__tests__/AlertGroup.test.tsx
@@ -19,7 +19,7 @@ test('Alert Group renders without children', () => {
 });
 
 test('Alert Group works with n children', () => {
-  const { asFragment } = render(
+  render(
     <AlertGroup data-testid="container">
       <Alert variant="success" title="alert title" />
       <Alert variant="warning" title="another alert title" />
diff --git a/packages/react-core/src/components/BackToTop/__tests__/BackToTop.test.tsx b/packages/react-core/src/components/BackToTop/__tests__/BackToTop.test.tsx
index 438bae01e72..61ba74b68c6 100644
--- a/packages/react-core/src/components/BackToTop/__tests__/BackToTop.test.tsx
+++ b/packages/react-core/src/components/BackToTop/__tests__/BackToTop.test.tsx
@@ -115,10 +115,11 @@ test('Clicking backToTop scrolls back to top of the element passed via scrollabl
   const user = userEvent.setup();
   const wrapper = document.getElementById('backToTopWrapper');
   fireEvent.scroll(wrapper as HTMLElement, { target: { scrollY: 401 } });
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   wrapper!.scrollTo = jest.fn();
   await user.click(screen.getByRole(`button`).parentElement as Element);
 
-  expect(wrapper?.scrollTo).toBeCalledTimes(1);
+  expect(wrapper?.scrollTo).toHaveBeenCalledTimes(1);
 });
 
 test('Passes correct text content to button child component', () => {
diff --git a/packages/react-core/src/components/Button/Button.tsx b/packages/react-core/src/components/Button/Button.tsx
index 53863058344..4f0a834ceb6 100644
--- a/packages/react-core/src/components/Button/Button.tsx
+++ b/packages/react-core/src/components/Button/Button.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Button/button';
 import { css } from '@patternfly/react-styles';
 import { Spinner, spinnerSize } from '../Spinner';
-import { useOUIAProps, OUIAProps } from '../../helpers';
+import { useOUIAProps, OUIAProps } from '../../helpers/OUIA/ouia';
 import { Badge } from '../Badge';
 
 export enum ButtonVariant {
diff --git a/packages/react-core/src/components/Button/__tests__/Button.test.tsx b/packages/react-core/src/components/Button/__tests__/Button.test.tsx
index cbd758c1c83..a9d57d538f3 100644
--- a/packages/react-core/src/components/Button/__tests__/Button.test.tsx
+++ b/packages/react-core/src/components/Button/__tests__/Button.test.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 
 import { render, screen } from '@testing-library/react';
 
-import CartArrowDownIcon from '@patternfly/react-icons/dist/esm/icons/cart-arrow-down-icon';
 import { Button, ButtonVariant } from '../Button';
 
 Object.values(ButtonVariant).forEach((variant) => {
diff --git a/packages/react-core/src/components/CalendarMonth/__tests__/CalendarMonth.test.tsx b/packages/react-core/src/components/CalendarMonth/__tests__/CalendarMonth.test.tsx
index 4b70968618e..f94e4af16a0 100644
--- a/packages/react-core/src/components/CalendarMonth/__tests__/CalendarMonth.test.tsx
+++ b/packages/react-core/src/components/CalendarMonth/__tests__/CalendarMonth.test.tsx
@@ -57,7 +57,9 @@ test('Next year dates have correct year in aria label', () => {
 });
 
 test('InlineProps render correct wrapper component and attributes', () => {
-  render(<CalendarMonth inlineProps={{component: 'article', title: <div id="hi">Title</div>, ariaLabelledby: "hi"}} />);
+  render(
+    <CalendarMonth inlineProps={{ component: 'article', title: <div id="hi">Title</div>, ariaLabelledby: 'hi' }} />
+  );
 
   const article = screen.getByRole('article');
   expect(article).toHaveAttribute('aria-labelledby', 'hi');
diff --git a/packages/react-core/src/components/Card/__tests__/CardBody.test.tsx b/packages/react-core/src/components/Card/__tests__/CardBody.test.tsx
index b4f77d82415..140f3b25a9e 100644
--- a/packages/react-core/src/components/Card/__tests__/CardBody.test.tsx
+++ b/packages/react-core/src/components/Card/__tests__/CardBody.test.tsx
@@ -30,7 +30,7 @@ describe('CardBody', () => {
   test('allows passing in a React Component as the component', () => {
     const Component = () => <div>im a div</div>;
 
-    render(<CardBody component={(Component as unknown) as keyof JSX.IntrinsicElements} />);
+    render(<CardBody component={Component as unknown as keyof JSX.IntrinsicElements} />);
     expect(screen.getByText('im a div')).toBeInTheDocument();
   });
 
diff --git a/packages/react-core/src/components/Card/__tests__/CardFooter.test.tsx b/packages/react-core/src/components/Card/__tests__/CardFooter.test.tsx
index c48d145920c..19c7db7eab2 100644
--- a/packages/react-core/src/components/Card/__tests__/CardFooter.test.tsx
+++ b/packages/react-core/src/components/Card/__tests__/CardFooter.test.tsx
@@ -27,7 +27,7 @@ describe('CardFooter', () => {
 
   test('allows passing in a React Component as the component', () => {
     const Component = () => <div>im a div</div>;
-    render(<CardFooter component={(Component as unknown) as keyof JSX.IntrinsicElements} />);
+    render(<CardFooter component={Component as unknown as keyof JSX.IntrinsicElements} />);
     expect(screen.getByText('im a div')).toBeInTheDocument();
   });
 });
diff --git a/packages/react-core/src/components/Chip/__tests__/ChipGroup.test.tsx b/packages/react-core/src/components/Chip/__tests__/ChipGroup.test.tsx
index 807944710f1..148f985133e 100644
--- a/packages/react-core/src/components/Chip/__tests__/ChipGroup.test.tsx
+++ b/packages/react-core/src/components/Chip/__tests__/ChipGroup.test.tsx
@@ -115,7 +115,7 @@ test('chip group with closeBtnAriaLabel', () => {
     </ChipGroup>
   );
   expect(screen.getByLabelText('close button aria label')).toBeInTheDocument();
-  expect(screen.getByLabelText('close button aria label')).toHaveAccessibleName("close button aria label category");
+  expect(screen.getByLabelText('close button aria label')).toHaveAccessibleName('close button aria label category');
 });
 
 test('chip group onClick', async () => {
@@ -169,8 +169,6 @@ test('chip group expanded', async () => {
 });
 
 test('overflow chip does not render by default when < 4 children are passed', async () => {
-  const user = userEvent.setup();
-
   render(
     <ChipGroup>
       <Chip>1</Chip>
@@ -183,8 +181,6 @@ test('overflow chip does not render by default when < 4 children are passed', as
 });
 
 test('overflow chip collapsed by default', async () => {
-  const user = userEvent.setup();
-
   render(
     <ChipGroup>
       <Chip>1</Chip>
diff --git a/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyToggle.test.tsx b/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyToggle.test.tsx
index bb6a297c470..49bc2b64c1b 100644
--- a/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyToggle.test.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyToggle.test.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { screen, render } from '@testing-library/react';
 import { ClipboardCopyToggle } from '../ClipboardCopyToggle';
-import styles from '@patternfly/react-styles/css/components/ClipboardCopy/clipboard-copy';
 import userEvent from '@testing-library/user-event';
 
 const onClickMock = jest.fn();
diff --git a/packages/react-core/src/components/DatePicker/__tests__/DatePicker.test.tsx b/packages/react-core/src/components/DatePicker/__tests__/DatePicker.test.tsx
index 7262accc12d..bbb252c064e 100644
--- a/packages/react-core/src/components/DatePicker/__tests__/DatePicker.test.tsx
+++ b/packages/react-core/src/components/DatePicker/__tests__/DatePicker.test.tsx
@@ -16,13 +16,9 @@ test('disabled date picker', () => {
 test('Date picker with multiple validators does not show invalid icon on valid input', async () => {
   const user = userEvent.setup();
 
-  const rangeValidator = (date: Date) => {
-    return '';
-  };
+  const rangeValidator = (_date: Date) => '';
 
-  const rangeValidatorB = (date: Date) => {
-    return '';
-  };
+  const rangeValidatorB = (_date: Date) => '';
 
   render(<DatePicker value="2020-03-17" validators={[rangeValidator, rangeValidatorB]} />);
 
@@ -119,7 +115,7 @@ test('Does not render emptyDateText when requiredDateOptions.isRequired is false
   await user.click(screen.getByRole('textbox'));
   await user.click(document.body);
 
-  expect(screen.queryByText('Date cannot be blank')).not.toBeInTheDocument;
+  expect(screen.queryByText('Date cannot be blank')).not.toBeInTheDocument();
 });
 
 test('Renders text input as invalid on blur when requiredDateOptions.isRequired is true', async () => {
diff --git a/packages/react-core/src/components/Divider/__tests__/Divider.test.tsx b/packages/react-core/src/components/Divider/__tests__/Divider.test.tsx
index aa2b7b3e5a9..680e164373b 100644
--- a/packages/react-core/src/components/Divider/__tests__/Divider.test.tsx
+++ b/packages/react-core/src/components/Divider/__tests__/Divider.test.tsx
@@ -64,19 +64,8 @@ test(`Test all insets`, () => {
     'inset2xl',
     'inset3xl'
   ] as ['insetNone', 'insetXs', 'insetSm', 'insetMd', 'insetLg', 'insetXl', 'inset2xl', 'inset3xl']);
-  
-  insetValues.forEach((insetValue) => {
-
-    const modifiers = ['none', 'xs', 'sm', 'md', 'lg', 'xl', '2xl', '3xl'];
-
-    const classValue = modifiers.forEach((modifier, index) => {
-      const smClass = `pf-m-inset-${modifier}-on-sm`;
-      const mdClass = `pf-m-inset-${modifier}-on-md`;
-      const lgClass = `pf-m-inset-${modifier}-on-lg`;
-      const xlClass = `pf-m-inset-${modifier}-on-xl`;
-      const xl2Class = `pf-m-inset-${modifier}-on-2xl`;
-    });
 
+  insetValues.forEach((insetValue) => {
     render(
       <Divider
         inset={{
@@ -92,7 +81,7 @@ test(`Test all insets`, () => {
   });
   const modifiers = ['none', 'xs', 'sm', 'md', 'lg', 'xl', '2xl', '3xl'];
 
-  const classValue = modifiers.forEach((modifier, index) => {
+  modifiers.forEach((modifier, index) => {
     const smClass = `pf-m-inset-${modifier}-on-sm`;
     const mdClass = `pf-m-inset-${modifier}-on-md`;
     const lgClass = `pf-m-inset-${modifier}-on-lg`;
diff --git a/packages/react-core/src/components/Drawer/__tests__/Drawer.test.tsx b/packages/react-core/src/components/Drawer/__tests__/Drawer.test.tsx
index 224572e4088..b174efc01c1 100644
--- a/packages/react-core/src/components/Drawer/__tests__/Drawer.test.tsx
+++ b/packages/react-core/src/components/Drawer/__tests__/Drawer.test.tsx
@@ -10,7 +10,7 @@ import {
   DrawerPanelContent
 } from '../';
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { KeyTypes } from '../../../helpers';
 
@@ -134,13 +134,9 @@ test('Resizeable DrawerPanelContent can be wrapped in a context without causing
 
   const panelContent = (
     <TestContext.Provider value={{}}>
-      <DrawerPanelContent
-        isResizable
-      >
+      <DrawerPanelContent isResizable>
         <DrawerHead>
-          <span>
-            drawer-panel
-          </span>
+          <span>drawer-panel</span>
           <DrawerActions>
             <DrawerCloseButton />
           </DrawerActions>
@@ -163,4 +159,4 @@ test('Resizeable DrawerPanelContent can be wrapped in a context without causing
   await user.keyboard(`{${KeyTypes.ArrowLeft}}`);
 
   expect(consoleError).not.toHaveBeenCalled();
-})
+});
diff --git a/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx b/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx
index c01022d93cb..09951f3ee11 100644
--- a/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx
+++ b/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Dropdown } from '../../Dropdown';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 jest.mock('../../Menu');
@@ -176,7 +176,7 @@ test('onOpenChange is called when passed and user presses tab key', async () =>
     </Dropdown>
   );
 
-  //focus dropdown
+  // focus dropdown
   const dropdown = screen.getByRole('button', { name: 'Dropdown' });
   await user.click(dropdown);
   await user.keyboard('{Tab}');
@@ -194,7 +194,7 @@ test('onOpenChange is called when passed and user presses esc key', async () =>
     </Dropdown>
   );
 
-  //focus dropdown
+  // focus dropdown
   const dropdown = screen.getByRole('button', { name: 'Dropdown' });
   await user.click(dropdown);
   await user.keyboard('{Escape}');
diff --git a/packages/react-core/src/components/Form/__tests__/FormContext.test.tsx b/packages/react-core/src/components/Form/__tests__/FormContext.test.tsx
index 61f59fdeb37..647c9320466 100644
--- a/packages/react-core/src/components/Form/__tests__/FormContext.test.tsx
+++ b/packages/react-core/src/components/Form/__tests__/FormContext.test.tsx
@@ -3,9 +3,8 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { FormContextConsumer, FormContextProvider } from '../FormContext';
 
-const customRender = (ui, initialValues?: Record<string, any>) => {
-  return render(<FormContextProvider initialValues={initialValues}>{ui}</FormContextProvider>);
-};
+const customRender = (ui, initialValues?: Record<string, any>) =>
+  render(<FormContextProvider initialValues={initialValues}>{ui}</FormContextProvider>);
 
 test('consumers can show all values from "values" provided by "initialValues"', () => {
   const initialValues = { fieldOneId: 'some value', fieldTwoId: 'some other value' };
@@ -63,9 +62,9 @@ test('sets a new value for a single field using setValue', async () => {
 
   customRender(
     <FormContextConsumer>
-      {({ getValue, setValue }) => {
-        return <input onChange={(event) => setValue('someId', event.target.value)} value={getValue('someId')} />;
-      }}
+      {({ getValue, setValue }) => (
+        <input onChange={(event) => setValue('someId', event.target.value)} value={getValue('someId')} />
+      )}
     </FormContextConsumer>,
     {
       someId: 'some value'
@@ -86,16 +85,14 @@ test('using setValues, consumers can set multiple values at once', async () => {
 
   customRender(
     <FormContextConsumer>
-      {({ values, setValues }) => {
-        return (
-          <>
-            <input type="checkbox" onClick={() => setValues(newValues)} />
-            {Object.entries(values).map(([fieldId, value]) => (
-              <span key={fieldId}>{`${fieldId}: ${value}`}</span>
-            ))}
-          </>
-        );
-      }}
+      {({ values, setValues }) => (
+        <>
+          <input type="checkbox" onClick={() => setValues(newValues)} />
+          {Object.entries(values).map(([fieldId, value]) => (
+            <span key={fieldId}>{`${fieldId}: ${value}`}</span>
+          ))}
+        </>
+      )}
     </FormContextConsumer>,
     {
       someId: 'some value'
@@ -129,14 +126,12 @@ test('sets a new error for a single field using setError', async () => {
 
   customRender(
     <FormContextConsumer>
-      {({ errors, setError }) => {
-        return (
-          <>
-            <input type="checkbox" onClick={() => setError('someId', 'some error!')} />
-            {`Error: ${errors.someId}`}
-          </>
-        );
-      }}
+      {({ errors, setError }) => (
+        <>
+          <input type="checkbox" onClick={() => setError('someId', 'some error!')} />
+          {`Error: ${errors.someId}`}
+        </>
+      )}
     </FormContextConsumer>
   );
 
@@ -150,16 +145,14 @@ test('using setErrors, consumers can set multiple errors at once', async () => {
 
   customRender(
     <FormContextConsumer>
-      {({ errors, setErrors }) => {
-        return (
-          <>
-            <input type="checkbox" onClick={() => setErrors(newErrors)} />
-            {Object.entries(errors).map(([fieldId, error]) => (
-              <span key={fieldId}>{`${fieldId}: ${error}`}</span>
-            ))}
-          </>
-        );
-      }}
+      {({ errors, setErrors }) => (
+        <>
+          <input type="checkbox" onClick={() => setErrors(newErrors)} />
+          {Object.entries(errors).map(([fieldId, error]) => (
+            <span key={fieldId}>{`${fieldId}: ${error}`}</span>
+          ))}
+        </>
+      )}
     </FormContextConsumer>,
     {
       someId: 'some value'
@@ -175,14 +168,12 @@ test('sets a new touched state for a single field using setTouched', async () =>
 
   customRender(
     <FormContextConsumer>
-      {({ touched, setTouched }) => {
-        return (
-          <>
-            <input type="checkbox" onClick={() => setTouched('someId', true)} />
-            {`isTouched: ${touched.someId}`}
-          </>
-        );
-      }}
+      {({ touched, setTouched }) => (
+        <>
+          <input type="checkbox" onClick={() => setTouched('someId', true)} />
+          {`isTouched: ${touched.someId}`}
+        </>
+      )}
     </FormContextConsumer>
   );
 
@@ -195,14 +186,12 @@ test("can get a single field's touched state by using isTouched", async () => {
 
   customRender(
     <FormContextConsumer>
-      {({ touched, setTouched, isTouched }) => {
-        return (
-          <>
-            <input type="checkbox" onClick={() => setTouched('someId', !touched.someId)} />
-            {`isTouched: ${isTouched('someId')}`}
-          </>
-        );
-      }}
+      {({ touched, setTouched, isTouched }) => (
+        <>
+          <input type="checkbox" onClick={() => setTouched('someId', !touched.someId)} />
+          {`isTouched: ${isTouched('someId')}`}
+        </>
+      )}
     </FormContextConsumer>
   );
 
diff --git a/packages/react-core/src/components/Form/__tests__/FormFieldGroup.test.tsx b/packages/react-core/src/components/Form/__tests__/FormFieldGroup.test.tsx
index f6a9f119fe6..04e42efa54c 100644
--- a/packages/react-core/src/components/Form/__tests__/FormFieldGroup.test.tsx
+++ b/packages/react-core/src/components/Form/__tests__/FormFieldGroup.test.tsx
@@ -50,7 +50,7 @@ test('Verify console error logged when there is no aria-label or title', () => {
       header={<FormFieldGroupHeader titleDescription="Field group 4 description text." actions={<Button />} />}
     />
   );
-  const { asFragment } = render(FieldGroup);
+  render(FieldGroup);
   expect(consoleErrorMock).toHaveBeenCalled();
 });
 
diff --git a/packages/react-core/src/components/Form/__tests__/FormGroup.test.tsx b/packages/react-core/src/components/Form/__tests__/FormGroup.test.tsx
index 0e72a884954..5c3a4153340 100644
--- a/packages/react-core/src/components/Form/__tests__/FormGroup.test.tsx
+++ b/packages/react-core/src/components/Form/__tests__/FormGroup.test.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { ValidatedOptions } from '../../../helpers/constants';
 import { FormGroup } from '../FormGroup';
 import { Form } from '../Form';
 
diff --git a/packages/react-core/src/components/Form/__tests__/FormHelperText.test.tsx b/packages/react-core/src/components/Form/__tests__/FormHelperText.test.tsx
index 4bf14b4d3e4..1f8c1c547de 100644
--- a/packages/react-core/src/components/Form/__tests__/FormHelperText.test.tsx
+++ b/packages/react-core/src/components/Form/__tests__/FormHelperText.test.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 
 import { render, screen } from '@testing-library/react';
 
-import { ExclamationCircleIcon } from '@patternfly/react-icons';
 import { FormHelperText } from '../FormHelperText';
 
 describe('FormHelperText', () => {
diff --git a/packages/react-core/src/components/HelperText/__tests__/HelperText.test.tsx b/packages/react-core/src/components/HelperText/__tests__/HelperText.test.tsx
index e552b46f90c..a8bc23ceda2 100644
--- a/packages/react-core/src/components/HelperText/__tests__/HelperText.test.tsx
+++ b/packages/react-core/src/components/HelperText/__tests__/HelperText.test.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { render } from '@testing-library/react';
 import { HelperText } from '../HelperText';
 import { HelperTextItem } from '../HelperTextItem';
-import { CheckIcon } from '@patternfly/react-icons';
+import CheckIcon from '@patternfly/react-icons/dist/esm/icons/check-icon';
 
 describe('HelperText', () => {
   test('simple helper text renders successfully', () => {
@@ -14,7 +14,7 @@ describe('HelperText', () => {
     expect(asFragment()).toMatchSnapshot();
   });
 
-  Object.values(['default', 'indeterminate', 'warning', 'success', 'invalid']).forEach(variant => {
+  Object.values(['default', 'indeterminate', 'warning', 'success', 'invalid']).forEach((variant) => {
     test(`${variant} helper text variant applies successfully`, () => {
       const { asFragment } = render(
         <HelperTextItem variant={variant as 'default' | 'indeterminate' | 'warning' | 'success' | 'error'}>
diff --git a/packages/react-core/src/components/Icon/__tests__/Icon.test.tsx b/packages/react-core/src/components/Icon/__tests__/Icon.test.tsx
index b2f2e67de4f..54b56a0ea81 100644
--- a/packages/react-core/src/components/Icon/__tests__/Icon.test.tsx
+++ b/packages/react-core/src/components/Icon/__tests__/Icon.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Icon } from '../Icon';
-import { CheckIcon } from '@patternfly/react-icons';
+import CheckIcon from '@patternfly/react-icons/dist/esm/icons/check-icon';
 import styles from '@patternfly/react-styles/css/components/Icon/icon';
 
 test('renders basic icon successfully', () => {
@@ -14,7 +14,7 @@ test('renders basic icon successfully', () => {
 });
 
 test('checks basic icon structure', () => {
-  const { asFragment } = render(
+  render(
     <Icon title="icon">
       <CheckIcon />
     </Icon>
diff --git a/packages/react-core/src/components/InputGroup/__tests__/InputGroup.test.tsx b/packages/react-core/src/components/InputGroup/__tests__/InputGroup.test.tsx
index dd35dd426f7..0c9b1534937 100644
--- a/packages/react-core/src/components/InputGroup/__tests__/InputGroup.test.tsx
+++ b/packages/react-core/src/components/InputGroup/__tests__/InputGroup.test.tsx
@@ -23,7 +23,7 @@ describe('InputGroup', () => {
       </InputGroup>
     );
 
-    const formControl = screen.getByLabelText("User password");
-    expect(formControl).not.toHaveAttribute("aria-describedby");
+    const formControl = screen.getByLabelText('User password');
+    expect(formControl).not.toHaveAttribute('aria-describedby');
   });
 });
diff --git a/packages/react-core/src/components/Masthead/__tests__/Masthead.test.tsx b/packages/react-core/src/components/Masthead/__tests__/Masthead.test.tsx
index ef95c453749..df7b7cc1a35 100644
--- a/packages/react-core/src/components/Masthead/__tests__/Masthead.test.tsx
+++ b/packages/react-core/src/components/Masthead/__tests__/Masthead.test.tsx
@@ -62,7 +62,7 @@ describe('Masthead', () => {
     'insetXl',
     'inset2xl',
     'inset3xl'
-  ]).forEach(inset => {
+  ]).forEach((inset) => {
     test(`verify ${inset} inset breakpoints`, () => {
       const { asFragment } = render(
         <Masthead inset={{ default: inset, sm: inset, md: inset, lg: inset, xl: inset, '2xl': inset }}>test</Masthead>
diff --git a/packages/react-core/src/components/Menu/__tests__/Menu.test.tsx b/packages/react-core/src/components/Menu/__tests__/Menu.test.tsx
index 83627d08d58..b230896c249 100644
--- a/packages/react-core/src/components/Menu/__tests__/Menu.test.tsx
+++ b/packages/react-core/src/components/Menu/__tests__/Menu.test.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import userEvent from '@testing-library/user-event';
 
 import { Menu } from '../Menu';
 import { MenuItem } from '../MenuItem';
@@ -54,7 +53,7 @@ describe('Menu', () => {
 
   describe('with hasCheckbox', () => {
     test('should render Menu with checkbox items', () => {
-      const { asFragment } = render(
+      render(
         <Menu>
           <MenuContent>
             <MenuList>
@@ -67,7 +66,7 @@ describe('Menu', () => {
       );
       const checkbox1 = screen.getAllByRole('checkbox')[0];
       expect(checkbox1).not.toBeChecked();
-      expect(screen.getByText("Checkbox 1")).toBeInTheDocument();
+      expect(screen.getByText('Checkbox 1')).toBeInTheDocument();
     });
   });
 });
diff --git a/packages/react-core/src/components/MenuToggle/__tests__/MenuToggle.test.tsx b/packages/react-core/src/components/MenuToggle/__tests__/MenuToggle.test.tsx
index 55b75090b57..b56971f6ffd 100644
--- a/packages/react-core/src/components/MenuToggle/__tests__/MenuToggle.test.tsx
+++ b/packages/react-core/src/components/MenuToggle/__tests__/MenuToggle.test.tsx
@@ -5,7 +5,7 @@ import { Badge } from '../../Badge';
 import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
 import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
 import userEvent from '@testing-library/user-event';
-import { fireEvent, render, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 
 describe('menu toggle', () => {
   test('renders successfully', () => {
@@ -61,21 +61,23 @@ describe('menu toggle', () => {
     const mockClick = jest.fn();
     const user = userEvent.setup();
 
-    render(<MenuToggle
-      onClick={mockClick}
-      splitButtonOptions={{
-        items: [
-          <MenuToggleCheckbox
-            id="split-button-checkbox-with-text-disabled-example"
-            key="split-checkbox-with-text-disabled"
-            aria-label="Select all"
-          >
-            10 selected
-          </MenuToggleCheckbox>
-        ]
-      }}
-      aria-label="Menu toggle with checkbox split button and text"
-    />);
+    render(
+      <MenuToggle
+        onClick={mockClick}
+        splitButtonOptions={{
+          items: [
+            <MenuToggleCheckbox
+              id="split-button-checkbox-with-text-disabled-example"
+              key="split-checkbox-with-text-disabled"
+              aria-label="Select all"
+            >
+              10 selected
+            </MenuToggleCheckbox>
+          ]
+        }}
+        aria-label="Menu toggle with checkbox split button and text"
+      />
+    );
 
     await user.click(screen.getByRole(`button`) as Element);
     expect(mockClick).toHaveBeenCalled();
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadStatus.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadStatus.test.tsx
index f3c18f5e1ad..1c7db785c4b 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadStatus.test.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadStatus.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { render } from '@testing-library/react';
 import { MultipleFileUploadStatus } from '../MultipleFileUploadStatus';
 import InProgressIcon from '@patternfly/react-icons/dist/esm/icons/in-progress-icon';
 
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadStatusItem.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadStatusItem.test.tsx
index 7f59631f14c..e0e03319fb4 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadStatusItem.test.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadStatusItem.test.tsx
@@ -48,7 +48,7 @@ describe('MultipleFileUploadStatusItem', () => {
         fileName="testCustomFileName.txt"
         fileSize={42}
         progressId="test-progress-id"
-        progressAriaLiveMessage={loadPercentage => `test message ${loadPercentage}`}
+        progressAriaLiveMessage={(loadPercentage) => `test message ${loadPercentage}`}
       />
     );
 
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitle.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitle.test.tsx
index dce9b52bb21..c75908c453f 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitle.test.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitle.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { render } from '@testing-library/react';
 import { MultipleFileUploadTitle } from '../MultipleFileUploadTitle';
 
 describe('MultipleFileUploadTitle', () => {
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleIcon.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleIcon.test.tsx
index 192dfd8e49b..6a8c81d7a52 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleIcon.test.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleIcon.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { render } from '@testing-library/react';
 import { MultipleFileUploadTitleIcon } from '../MultipleFileUploadTitleIcon';
 
 describe('MultipleFileUploadTitleIcon', () => {
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleText.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleText.test.tsx
index ec683fc5199..5fb79577157 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleText.test.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleText.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { render } from '@testing-library/react';
 import { MultipleFileUploadTitleText } from '../MultipleFileUploadTitleText';
 
 describe('MultipleFileUploadTitleText', () => {
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleTextSeparator.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleTextSeparator.test.tsx
index b9db99b59be..c2f8fd39cf2 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleTextSeparator.test.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleTextSeparator.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { render } from '@testing-library/react';
 import { MultipleFileUploadTitleTextSeparator } from '../MultipleFileUploadTitleTextSeparator';
 
 describe('MultipleFileUploadTitleTextSeparator', () => {
diff --git a/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx b/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx
index 7af2ea1ab5e..cfe972719eb 100644
--- a/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx
+++ b/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx
@@ -30,7 +30,7 @@ describe('Nav', () => {
     const { asFragment } = renderNav(
       <Nav className="test-nav-class">
         <NavList className="test-nav-list-class">
-          {props.items.map(item => (
+          {props.items.map((item) => (
             <NavItem to={item.to} key={item.to} className="test-nav-item-class">
               {item.label}
             </NavItem>
@@ -47,7 +47,7 @@ describe('Nav', () => {
       <React.StrictMode>
         <Nav className="test-nav-class">
           <NavList className="test-nav-list-class">
-            {props.items.map(item => (
+            {props.items.map((item) => (
               <NavItem to={item.to} key={item.to} className="test-nav-item-class">
                 {item.label}
               </NavItem>
@@ -64,7 +64,7 @@ describe('Nav', () => {
     const { asFragment } = renderNav(
       <Nav className="test=nav-class" theme="dark">
         <NavList className="test-nav-list-class">
-          {props.items.map(item => (
+          {props.items.map((item) => (
             <NavItem to={item.to} key={item.to} className="test-nav-item-class">
               {item.label}
             </NavItem>
@@ -81,7 +81,7 @@ describe('Nav', () => {
     const { asFragment } = renderNav(
       <Nav>
         <NavList>
-          {props.items.map(item => (
+          {props.items.map((item) => (
             <NavItem to={item.to} key={item.to}>
               {item.label}
             </NavItem>
@@ -99,7 +99,7 @@ describe('Nav', () => {
       <Nav>
         <NavList>
           <NavExpandable id="grp-1" title="Section 1">
-            {props.items.map(item => (
+            {props.items.map((item) => (
               <NavItem to={item.to} key={item.to}>
                 {item.label}
               </NavItem>
@@ -119,7 +119,7 @@ describe('Nav', () => {
       <Nav>
         <NavList>
           <NavExpandable id="grp-1" title="Section 1" onExpand={onExpand}>
-            {props.items.map(item => (
+            {props.items.map((item) => (
               <NavItem to={item.to} key={item.to}>
                 {item.label}
               </NavItem>
@@ -141,7 +141,7 @@ describe('Nav', () => {
       <Nav>
         <NavList>
           <NavExpandable id="grp-1" title="Section 1" className="expandable-group" isExpanded>
-            {props.items.map(item => (
+            {props.items.map((item) => (
               <NavItem to={item.to} key={item.to}>
                 {item.label}
               </NavItem>
@@ -160,7 +160,7 @@ describe('Nav', () => {
       <Nav aria-label="Test">
         <NavList>
           <NavExpandable id="grp-1" title="Section 1" srText="Section 1 - Example sub-navigation">
-            {props.items.map(item => (
+            {props.items.map((item) => (
               <NavItem to={item.to} key={item.to}>
                 {item.label}
               </NavItem>
@@ -177,7 +177,7 @@ describe('Nav', () => {
       <Nav>
         <NavGroup id="grp-1" title="Section 1">
           <NavList>
-            {props.items.map(item => (
+            {props.items.map((item) => (
               <NavItem to={item.to} key={`section1_${item.to}`}>
                 {item.label}
               </NavItem>
@@ -186,7 +186,7 @@ describe('Nav', () => {
         </NavGroup>
         <NavGroup id="grp-2" title="Section 2">
           <NavList>
-            {props.items.map(item => (
+            {props.items.map((item) => (
               <NavItem to={item.to} key={`section2_${item.to}`}>
                 {item.label}
               </NavItem>
@@ -202,7 +202,7 @@ describe('Nav', () => {
     const { asFragment } = renderNav(
       <Nav variant="horizontal">
         <NavList>
-          {props.items.map(item => (
+          {props.items.map((item) => (
             <NavItem to={item.to} key={item.to}>
               {item.label}
             </NavItem>
@@ -217,7 +217,7 @@ describe('Nav', () => {
     const { asFragment } = renderNav(
       <Nav variant="horizontal-subnav">
         <NavList>
-          {props.items.map(item => (
+          {props.items.map((item) => (
             <NavItem to={item.to} key={item.to}>
               {item.label}
             </NavItem>
@@ -232,7 +232,7 @@ describe('Nav', () => {
     const { asFragment } = renderNav(
       <Nav variant="tertiary">
         <NavList>
-          {props.items.map(item => (
+          {props.items.map((item) => (
             <NavItem to={item.to} key={item.to}>
               {item.label}
             </NavItem>
@@ -269,7 +269,7 @@ describe('Nav', () => {
       </Nav>
     );
 
-    await user.hover(screen.getByText('My custom node'))
+    await user.hover(screen.getByText('My custom node'));
     expect(asFragment()).toMatchSnapshot();
   });
 });
diff --git a/packages/react-core/src/components/NotificationBadge/__tests__/NotificationBadge.test.tsx b/packages/react-core/src/components/NotificationBadge/__tests__/NotificationBadge.test.tsx
index d58920e05f2..9090d062955 100644
--- a/packages/react-core/src/components/NotificationBadge/__tests__/NotificationBadge.test.tsx
+++ b/packages/react-core/src/components/NotificationBadge/__tests__/NotificationBadge.test.tsx
@@ -2,7 +2,7 @@ import { NotificationBadge } from '../NotificationBadge';
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 
-Object.values([true, false]).forEach(attentionVariant => {
+Object.values([true, false]).forEach((attentionVariant) => {
   test(`${attentionVariant} NotificationBadge needs attention`, () => {
     const { asFragment } = render(
       <NotificationBadge variant="attention">
diff --git a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerGroup.test.tsx b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerGroup.test.tsx
index 9db5ee24483..64e6514124d 100644
--- a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerGroup.test.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerGroup.test.tsx
@@ -12,7 +12,9 @@ describe('NotificationDrawerGroup', () => {
   });
 
   test('renders correct heading level', () => {
-    const { asFragment } = render(<NotificationDrawerGroup count={2} isExpanded={false} title="Critical Alerts" headingLevel="h2" />);
+    const { asFragment } = render(
+      <NotificationDrawerGroup count={2} isExpanded={false} title="Critical Alerts" headingLevel="h2" />
+    );
     expect(asFragment()).toMatchSnapshot();
   });
 
diff --git a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItem.test.tsx b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItem.test.tsx
index fdaf8573796..2f184432325 100644
--- a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItem.test.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItem.test.tsx
@@ -25,7 +25,6 @@ describe('NotificationDrawerListItem', () => {
     render(<NotificationDrawerListItem isRead />);
     expect(screen.getByRole('listitem')).toHaveClass('pf-m-read');
     expect(screen.getByRole('listitem')).toContainHTML('<span class="pf-v5-screen-reader">read</span>');
-
   });
 
   test('drawer list item has screen reader text set to unread by default', () => {
@@ -34,8 +33,7 @@ describe('NotificationDrawerListItem', () => {
   });
 
   test('drawer list item screen reader textcan be customized', () => {
-    render(<NotificationDrawerListItem readStateScreenReaderText="was read"/>);
+    render(<NotificationDrawerListItem readStateScreenReaderText="was read" />);
     expect(screen.getByRole('listitem')).toContainHTML('<span class="pf-v5-screen-reader">was read</span>');
   });
 });
- 
\ No newline at end of file
diff --git a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItemHeader.test.tsx b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItemHeader.test.tsx
index 40060a4f504..c164a3ee93e 100644
--- a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItemHeader.test.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItemHeader.test.tsx
@@ -13,7 +13,7 @@ describe('NotificationDrawerListItemHeader', () => {
   });
 
   test('renders with correct heading level', () => {
-    const { asFragment } = render(<NotificationDrawerListItemHeader title="Pod quit unexpectedly" headingLevel="h3"/>);
+    const { asFragment } = render(<NotificationDrawerListItemHeader title="Pod quit unexpectedly" headingLevel="h3" />);
     expect(asFragment()).toMatchSnapshot();
   });
 
diff --git a/packages/react-core/src/components/NumberInput/__tests__/NumberInput.test.tsx b/packages/react-core/src/components/NumberInput/__tests__/NumberInput.test.tsx
index 84006073ef0..7506929d2d0 100644
--- a/packages/react-core/src/components/NumberInput/__tests__/NumberInput.test.tsx
+++ b/packages/react-core/src/components/NumberInput/__tests__/NumberInput.test.tsx
@@ -212,13 +212,13 @@ describe('numberInput', () => {
     expect(input).toHaveDisplayValue('');
   });
 
-  test('does not throw an error if onChange is passed via inputProps as well as the onChange prop', () => {
+  test('does not throw an error if onChange is passed via inputProps as well as the onChange prop', async () => {
     const consoleSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
 
     const NumberInputWrapper = () => {
       const [value, setValue] = React.useState(0);
-      const onChange = event => setValue(event.currentTarget.value);
-      const inputProps = { onChange: onChange };
+      const onChange = (event) => setValue(event.currentTarget.value);
+      const inputProps = { onChange };
 
       return <NumberInput value={value} onChange={onChange} inputProps={{ ...inputProps }} />;
     };
@@ -226,20 +226,20 @@ describe('numberInput', () => {
     render(<NumberInputWrapper />);
 
     const input = screen.getByRole('spinbutton');
-    userEvent.type(input, '0');
+    await userEvent.type(input, '0');
 
     expect(consoleSpy).not.toHaveBeenCalled();
   });
 
   test('input is read only if onChange not passed ', () => {
-    render(<NumberInput inputAriaLabel="readonly input" value={5}/>);
+    render(<NumberInput inputAriaLabel="readonly input" value={5} />);
     const input = screen.getByLabelText('readonly input');
     expect(input).toHaveAttribute('readOnly');
   });
 
   test('input is not read only if onChange passed ', () => {
     const onChangeMock = jest.fn();
-    render(<NumberInput inputAriaLabel="not readonly input" value={5} onChange={onChangeMock}/>);
+    render(<NumberInput inputAriaLabel="not readonly input" value={5} onChange={onChangeMock} />);
     const input = screen.getByLabelText('not readonly input');
     expect(input).not.toHaveAttribute('readOnly');
   });
diff --git a/packages/react-core/src/components/Pagination/__tests__/Pagination.test.tsx b/packages/react-core/src/components/Pagination/__tests__/Pagination.test.tsx
index ad6cdc3100e..111618eb136 100644
--- a/packages/react-core/src/components/Pagination/__tests__/Pagination.test.tsx
+++ b/packages/react-core/src/components/Pagination/__tests__/Pagination.test.tsx
@@ -340,10 +340,12 @@ describe('Pagination', () => {
       'insetLg',
       'insetXl',
       'inset2xl'
-    ]).forEach(inset => {
+    ]).forEach((inset) => {
       test(`verify ${inset} inset breakpoints`, () => {
         const { asFragment } = render(
-          <Pagination inset={{ default: inset, sm: inset, md: inset, lg: inset, xl: inset, '2xl': inset }}>test</Pagination>
+          <Pagination inset={{ default: inset, sm: inset, md: inset, lg: inset, xl: inset, '2xl': inset }}>
+            test
+          </Pagination>
         );
         expect(asFragment()).toMatchSnapshot();
       });
diff --git a/packages/react-core/src/components/Panel/__tests__/Panel.test.tsx b/packages/react-core/src/components/Panel/__tests__/Panel.test.tsx
index e117286864f..e3b535658cd 100644
--- a/packages/react-core/src/components/Panel/__tests__/Panel.test.tsx
+++ b/packages/react-core/src/components/Panel/__tests__/Panel.test.tsx
@@ -85,9 +85,9 @@ test('Renders with ref', async () => {
   render(<BasicPanel />);
 
   await user.click(document.body);
-  expect(screen.getByText('Last click was in panel: false')).toBeVisible;
+  expect(screen.getByText('Last click was in panel: false')).toBeVisible();
   await user.click(screen.getByText('Main content'));
-  expect(screen.getByText('Last click was in panel: true')).toBeVisible;
+  expect(screen.getByText('Last click was in panel: true')).toBeVisible();
 });
 
 test('Renders with the inherited element props spread to the component', () => {
diff --git a/packages/react-core/src/components/Popover/__tests__/Popover.test.tsx b/packages/react-core/src/components/Popover/__tests__/Popover.test.tsx
index fff0765e7b8..e24cf0f7404 100644
--- a/packages/react-core/src/components/Popover/__tests__/Popover.test.tsx
+++ b/packages/react-core/src/components/Popover/__tests__/Popover.test.tsx
@@ -70,7 +70,7 @@ test('popover can close from content (uncontrolled)', () => {
       aria-label="Popover with button in the body that can close it"
       isVisible
       headerContent={<div>Popover header</div>}
-      bodyContent={hide => (
+      bodyContent={(hide) => (
         <div>
           <div>
             All the content props (headerContent, bodyContent, footerContent) can take a function which the Popover
diff --git a/packages/react-core/src/components/Progress/__tests__/Progress.test.tsx b/packages/react-core/src/components/Progress/__tests__/Progress.test.tsx
index 1d666155b1a..24194cb6e7b 100644
--- a/packages/react-core/src/components/Progress/__tests__/Progress.test.tsx
+++ b/packages/react-core/src/components/Progress/__tests__/Progress.test.tsx
@@ -49,7 +49,7 @@ test('value scaled between minValue and maxValue', () => {
 });
 
 describe('Progress size', () => {
-  Object.keys(ProgressSize).forEach(oneSize => {
+  Object.keys(ProgressSize).forEach((oneSize) => {
     test(oneSize, () => {
       const { asFragment } = render(<Progress id={`${oneSize}-progress`} value={33} size={oneSize as ProgressSize} />);
       expect(asFragment()).toMatchSnapshot();
@@ -58,7 +58,7 @@ describe('Progress size', () => {
 });
 
 describe('Progress variant', () => {
-  Object.keys(ProgressVariant).forEach(oneVariant => {
+  Object.keys(ProgressVariant).forEach((oneVariant) => {
     test(oneVariant, () => {
       const { asFragment } = render(
         <Progress id={`${oneVariant}-progress`} value={33} variant={oneVariant as ProgressVariant} />
@@ -69,7 +69,7 @@ describe('Progress variant', () => {
 });
 
 describe('Progress measure location', () => {
-  Object.keys(ProgressMeasureLocation).forEach(oneLocation => {
+  Object.keys(ProgressMeasureLocation).forEach((oneLocation) => {
     test(oneLocation, () => {
       const { asFragment } = render(
         <Progress id={`${oneLocation}-progress`} value={33} measureLocation={oneLocation as ProgressMeasureLocation} />
@@ -99,10 +99,10 @@ test('progress component generates console warning when no accessible name is pr
 });
 
 test('Does not render helper text by default', () => {
-  render(<Progress/>);
+  render(<Progress />);
 
   expect(screen.queryByText('Test helper text')).not.toBeInTheDocument();
-})
+});
 
 test('Renders passed helper text', () => {
   render(<Progress helperText="Test helper text" />);
diff --git a/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStep.test.tsx b/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStep.test.tsx
index a493d3d2d5a..1fb64297dee 100644
--- a/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStep.test.tsx
+++ b/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStep.test.tsx
@@ -150,7 +150,7 @@ test('Does not renders with aria-labelledBy by default on Component element', ()
 
 test('Renders with an accessible name that matches children', () => {
   render(
-    <ProgressStep popoverRender={(stepRef) => <div>Popover content</div>} id="test-id" titleId="title-id">
+    <ProgressStep popoverRender={(_stepRef) => <div>Popover content</div>} id="test-id" titleId="title-id">
       Test
     </ProgressStep>
   );
diff --git a/packages/react-core/src/components/SearchInput/__tests__/SearchInput.test.tsx b/packages/react-core/src/components/SearchInput/__tests__/SearchInput.test.tsx
index df074772b64..b60eb19d9a8 100644
--- a/packages/react-core/src/components/SearchInput/__tests__/SearchInput.test.tsx
+++ b/packages/react-core/src/components/SearchInput/__tests__/SearchInput.test.tsx
@@ -6,10 +6,12 @@ import userEvent from '@testing-library/user-event';
 import { SearchInput } from '../SearchInput';
 import { FormGroup } from '../../Form';
 import { Button } from '../../Button';
-import { ExternalLinkSquareAltIcon } from '@patternfly/react-icons';
+import ExternalLinkSquareAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-square-alt-icon';
 import badgeStyles from '@patternfly/react-styles/css/components/Badge/badge';
 import textInputGroupStyles from '@patternfly/react-styles/css/components/TextInputGroup/text-input-group';
 
+jest.mock('../../../helpers/OUIA/ouia');
+
 const props = {
   onChange: jest.fn(),
   value: 'test input',
@@ -80,9 +82,9 @@ describe('SearchInput', () => {
   });
 
   test('hide clear button', () => {
-    const { onClear, ...testProps } = props;
-
-    render(<SearchInput {...testProps} resultsCount="3" aria-label="simple text input without on clear" />);
+    render(
+      <SearchInput {...props} onClear={undefined} resultsCount="3" aria-label="simple text input without on clear" />
+    );
     expect(screen.queryByRole('button', { name: 'Reset' })).not.toBeInTheDocument();
   });
 
@@ -146,9 +148,7 @@ describe('SearchInput', () => {
   test('advanced search with custom attributes and appendTo="inline', async () => {
     const user = userEvent.setup();
 
-    const { container } = render(
-      <SearchInput data-testid="test-id" attributes={[{ attr: 'test', display: 'test' }]} appendTo="inline" />
-    );
+    render(<SearchInput data-testid="test-id" attributes={[{ attr: 'test', display: 'test' }]} appendTo="inline" />);
 
     await user.click(screen.getByRole('button', { name: 'Open advanced search' }));
 
@@ -158,7 +158,7 @@ describe('SearchInput', () => {
   test('advanced search with custom attributes and appendTo external DOM element', async () => {
     const user = userEvent.setup();
 
-    const { container } = render(
+    render(
       <SearchInput data-testid="test-id" attributes={[{ attr: 'test', display: 'test' }]} appendTo={document.body} />
     );
 
@@ -252,9 +252,6 @@ test('toggleAriaLabel is applied to the expandable toggle', () => {
 });
 
 test('Utilities are rendered when areUtilitiesDisplayed is set', () => {
-  render(
-    <SearchInput {...props} areUtilitiesDisplayed resetButtonLabel='test-util-display'/>
-  );
+  render(<SearchInput {...props} areUtilitiesDisplayed resetButtonLabel="test-util-display" />);
   expect(screen.getByLabelText('test-util-display')).toBeVisible();
 });
-
diff --git a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
index 24719463b95..2a687388f8f 100644
--- a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
+++ b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
@@ -52,9 +52,6 @@ exports[`SearchInput advanced search 1`] = `
               aria-disabled="false"
               aria-label="Reset"
               class="pf-v5-c-button pf-m-plain"
-              data-ouia-component-id="OUIA-Generated-Button-plain-17"
-              data-ouia-component-type="PF5/Button"
-              data-ouia-safe="true"
               type="button"
             >
               <svg
@@ -82,9 +79,6 @@ exports[`SearchInput advanced search 1`] = `
           aria-expanded="false"
           aria-label="Open advanced search"
           class="pf-v5-c-button pf-m-control"
-          data-ouia-component-id="OUIA-Generated-Button-control-10"
-          data-ouia-component-type="PF5/Button"
-          data-ouia-safe="true"
           type="button"
         >
           <svg
@@ -109,9 +103,6 @@ exports[`SearchInput advanced search 1`] = `
           aria-disabled="false"
           aria-label="Search"
           class="pf-v5-c-button pf-m-control"
-          data-ouia-component-id="OUIA-Generated-Button-control-11"
-          data-ouia-component-type="PF5/Button"
-          data-ouia-safe="true"
           type="submit"
         >
           <span
@@ -202,9 +193,6 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
               aria-disabled="false"
               aria-label="Reset"
               class="pf-v5-c-button pf-m-plain"
-              data-ouia-component-id="OUIA-Generated-Button-plain-18"
-              data-ouia-component-type="PF5/Button"
-              data-ouia-safe="true"
               type="button"
             >
               <svg
@@ -232,9 +220,6 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
           aria-expanded="true"
           aria-label="Open advanced search"
           class="pf-v5-c-button pf-m-control pf-m-expanded"
-          data-ouia-component-id="OUIA-Generated-Button-control-12"
-          data-ouia-component-type="PF5/Button"
-          data-ouia-safe="true"
           type="button"
         >
           <svg
@@ -259,9 +244,6 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
           aria-disabled="false"
           aria-label="Search"
           class="pf-v5-c-button pf-m-control"
-          data-ouia-component-id="OUIA-Generated-Button-control-13"
-          data-ouia-component-type="PF5/Button"
-          data-ouia-safe="true"
           type="submit"
         >
           <span
@@ -334,9 +316,6 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
                   >
                     <input
                       aria-invalid="false"
-                      data-ouia-component-id="OUIA-Generated-TextInputBase-1"
-                      data-ouia-component-type="PF5/TextInput"
-                      data-ouia-safe="true"
                       id="username_0"
                       type="text"
                       value="player"
@@ -370,9 +349,6 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
                   >
                     <input
                       aria-invalid="false"
-                      data-ouia-component-id="OUIA-Generated-TextInputBase-2"
-                      data-ouia-component-type="PF5/TextInput"
-                      data-ouia-safe="true"
                       id="firstname_1"
                       type="text"
                       value="john"
@@ -406,9 +382,6 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
                   >
                     <input
                       aria-invalid="false"
-                      data-ouia-component-id="OUIA-Generated-TextInputBase-3"
-                      data-ouia-component-type="PF5/TextInput"
-                      data-ouia-safe="true"
                       id="pf-random-id-2"
                       type="text"
                       value=""
@@ -425,9 +398,6 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
                   <button
                     aria-disabled="false"
                     class="pf-v5-c-button pf-m-link pf-m-inline"
-                    data-ouia-component-id="OUIA-Generated-Button-link-1"
-                    data-ouia-component-type="PF5/Button"
-                    data-ouia-safe="true"
                     type="button"
                   >
                     Link
@@ -463,9 +433,6 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
                     <button
                       aria-disabled="false"
                       class="pf-v5-c-button pf-m-primary"
-                      data-ouia-component-id="OUIA-Generated-Button-primary-1"
-                      data-ouia-component-type="PF5/Button"
-                      data-ouia-safe="true"
                       type="submit"
                     >
                       Search
@@ -473,9 +440,6 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
                     <button
                       aria-disabled="false"
                       class="pf-v5-c-button pf-m-link"
-                      data-ouia-component-id="OUIA-Generated-Button-link-2"
-                      data-ouia-component-type="PF5/Button"
-                      data-ouia-safe="true"
                       type="reset"
                     >
                       Reset
@@ -544,9 +508,6 @@ exports[`SearchInput renders search input in strict mode 1`] = `
               aria-disabled="false"
               aria-label="Reset"
               class="pf-v5-c-button pf-m-plain"
-              data-ouia-component-id="OUIA-Generated-Button-plain-11"
-              data-ouia-component-type="PF5/Button"
-              data-ouia-safe="true"
               type="button"
             >
               <svg
@@ -574,9 +535,6 @@ exports[`SearchInput renders search input in strict mode 1`] = `
           aria-expanded="false"
           aria-label="Open advanced search"
           class="pf-v5-c-button pf-m-control"
-          data-ouia-component-id="OUIA-Generated-Button-control-5"
-          data-ouia-component-type="PF5/Button"
-          data-ouia-safe="true"
           type="button"
         >
           <svg
@@ -601,9 +559,6 @@ exports[`SearchInput renders search input in strict mode 1`] = `
           aria-disabled="false"
           aria-label="Search"
           class="pf-v5-c-button pf-m-control"
-          data-ouia-component-id="OUIA-Generated-Button-control-7"
-          data-ouia-component-type="PF5/Button"
-          data-ouia-safe="true"
           type="submit"
         >
           <span
@@ -700,9 +655,6 @@ exports[`SearchInput search input with hint 1`] = `
               aria-disabled="false"
               aria-label="Previous"
               class="pf-v5-c-button pf-m-plain"
-              data-ouia-component-id="OUIA-Generated-Button-plain-4"
-              data-ouia-component-type="PF5/Button"
-              data-ouia-safe="true"
               type="button"
             >
               <svg
@@ -723,9 +675,6 @@ exports[`SearchInput search input with hint 1`] = `
               aria-disabled="false"
               aria-label="Next"
               class="pf-v5-c-button pf-m-plain"
-              data-ouia-component-id="OUIA-Generated-Button-plain-5"
-              data-ouia-component-type="PF5/Button"
-              data-ouia-safe="true"
               type="button"
             >
               <svg
@@ -747,9 +696,6 @@ exports[`SearchInput search input with hint 1`] = `
             aria-disabled="false"
             aria-label="Reset"
             class="pf-v5-c-button pf-m-plain"
-            data-ouia-component-id="OUIA-Generated-Button-plain-6"
-            data-ouia-component-type="PF5/Button"
-            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -776,9 +722,6 @@ exports[`SearchInput search input with hint 1`] = `
         aria-disabled="false"
         aria-label="Search"
         class="pf-v5-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-2"
-        data-ouia-component-type="PF5/Button"
-        data-ouia-safe="true"
         type="submit"
       >
         <span
@@ -860,9 +803,6 @@ exports[`SearchInput simple search input 1`] = `
               aria-disabled="false"
               aria-label="Previous"
               class="pf-v5-c-button pf-m-plain"
-              data-ouia-component-id="OUIA-Generated-Button-plain-1"
-              data-ouia-component-type="PF5/Button"
-              data-ouia-safe="true"
               type="button"
             >
               <svg
@@ -883,9 +823,6 @@ exports[`SearchInput simple search input 1`] = `
               aria-disabled="false"
               aria-label="Next"
               class="pf-v5-c-button pf-m-plain"
-              data-ouia-component-id="OUIA-Generated-Button-plain-2"
-              data-ouia-component-type="PF5/Button"
-              data-ouia-safe="true"
               type="button"
             >
               <svg
@@ -907,9 +844,6 @@ exports[`SearchInput simple search input 1`] = `
             aria-disabled="false"
             aria-label="Reset"
             class="pf-v5-c-button pf-m-plain"
-            data-ouia-component-id="OUIA-Generated-Button-plain-3"
-            data-ouia-component-type="PF5/Button"
-            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -936,9 +870,6 @@ exports[`SearchInput simple search input 1`] = `
         aria-disabled="false"
         aria-label="Search"
         class="pf-v5-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-1"
-        data-ouia-component-type="PF5/Button"
-        data-ouia-safe="true"
         type="submit"
       >
         <span
diff --git a/packages/react-core/src/components/SkipToContent/__tests__/SkipToContent.test.tsx b/packages/react-core/src/components/SkipToContent/__tests__/SkipToContent.test.tsx
index 9299f5d1c9b..b60dd68265d 100644
--- a/packages/react-core/src/components/SkipToContent/__tests__/SkipToContent.test.tsx
+++ b/packages/react-core/src/components/SkipToContent/__tests__/SkipToContent.test.tsx
@@ -9,4 +9,3 @@ test('Verify Skip To Content', () => {
   // Add a useful assertion here.
   expect(asFragment()).toMatchSnapshot();
 });
-
diff --git a/packages/react-core/src/components/Spinner/__tests__/Spinner.test.tsx b/packages/react-core/src/components/Spinner/__tests__/Spinner.test.tsx
index a757090bc47..eb1402d7004 100644
--- a/packages/react-core/src/components/Spinner/__tests__/Spinner.test.tsx
+++ b/packages/react-core/src/components/Spinner/__tests__/Spinner.test.tsx
@@ -25,4 +25,4 @@ test('large spinner', () => {
 test('extra large spinner', () => {
   const { asFragment } = render(<Spinner size="xl" />);
   expect(asFragment()).toMatchSnapshot();
-});
\ No newline at end of file
+});
diff --git a/packages/react-core/src/components/Switch/__tests__/Switch.test.tsx b/packages/react-core/src/components/Switch/__tests__/Switch.test.tsx
index 0fc6b35494f..79459ccbe14 100644
--- a/packages/react-core/src/components/Switch/__tests__/Switch.test.tsx
+++ b/packages/react-core/src/components/Switch/__tests__/Switch.test.tsx
@@ -77,7 +77,7 @@ describe('Switch', () => {
 
   test('switch passes value and event to onChange handler', async () => {
     const user = userEvent.setup();
-    
+
     render(<Switch id="onChange-switch" {...props} aria-label="Switch label" />);
 
     await user.click(screen.getByLabelText('Switch label'));
diff --git a/packages/react-core/src/components/Tabs/__tests__/OverflowTab.test.tsx b/packages/react-core/src/components/Tabs/__tests__/OverflowTab.test.tsx
index d57b6b55a01..a304d9eb8b0 100644
--- a/packages/react-core/src/components/Tabs/__tests__/OverflowTab.test.tsx
+++ b/packages/react-core/src/components/Tabs/__tests__/OverflowTab.test.tsx
@@ -39,7 +39,7 @@ jest.mock('../../Menu', () => {
 });
 
 const tabsContextDefaultProps = {
-  variant: 'default' as 'default',
+  variant: 'default' as const,
   mountOnEnter: false,
   unmountOnExit: false,
   localActiveKey: '',
diff --git a/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx b/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx
index 29254e4e9a0..17c98137885 100644
--- a/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx
+++ b/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx
@@ -39,7 +39,7 @@ test('should render simple tabs', () => {
 });
 
 test('should render closeable tabs', () => {
-  const view = render(
+  render(
     <Tabs onClose={jest.fn()}>
       <Tab eventKey={0} title={<TabTitleText>"Tab item 1"</TabTitleText>} closeButtonAriaLabel="close-label">
         Tab 1 section
@@ -50,7 +50,7 @@ test('should render closeable tabs', () => {
 });
 
 test('should render add button', () => {
-  const view = render(
+  render(
     <Tabs onAdd={jest.fn()} addButtonAriaLabel="add-label">
       <Tab eventKey={0} title={<TabTitleText>"Tab item 1"</TabTitleText>} closeButtonAriaLabel="close-label">
         Tab 1 section
@@ -156,7 +156,7 @@ test('should render expandable vertical tabs', () => {
 test('should log error when there is no aria-label or toggleText for expandable vertical tabs', () => {
   const consoleErrorMock = jest.fn();
   global.console = { error: consoleErrorMock } as any;
-  const { asFragment } = render(
+  render(
     <Tabs id="verticalTabs" isVertical expandable={{ default: 'expandable' }}>
       <Tab id="tab1" eventKey={0} title={<TabTitleText>"Tab item 1"</TabTitleText>}>
         Tab 1 section
@@ -429,7 +429,7 @@ test('should not render scroll buttons by default', () => {
 
   expect(screen.queryByLabelText('Scroll left')).not.toBeInTheDocument();
   expect(screen.queryByLabelText('Scroll right')).not.toBeInTheDocument();
-})
+});
 
 test('should not render scroll buttons when isVertical is true', () => {
   render(
@@ -448,4 +448,4 @@ test('should not render scroll buttons when isVertical is true', () => {
 
   expect(screen.queryByLabelText('Scroll left')).not.toBeInTheDocument();
   expect(screen.queryByLabelText('Scroll right')).not.toBeInTheDocument();
-})
+});
diff --git a/packages/react-core/src/components/TextInput/__tests__/TextInput.test.tsx b/packages/react-core/src/components/TextInput/__tests__/TextInput.test.tsx
index 99a76fc6be5..918d777f4bf 100644
--- a/packages/react-core/src/components/TextInput/__tests__/TextInput.test.tsx
+++ b/packages/react-core/src/components/TextInput/__tests__/TextInput.test.tsx
@@ -33,7 +33,9 @@ describe('TextInput', () => {
   });
 
   test('read only text input using isReadOnly', () => {
-    const { asFragment } = render(<TextInput readOnlyVariant="default" value="read only" aria-label="read only text input" />);
+    const { asFragment } = render(
+      <TextInput readOnlyVariant="default" value="read only" aria-label="read only text input" />
+    );
     expect(asFragment()).toMatchSnapshot();
   });
 
@@ -113,20 +115,20 @@ describe('TextInput', () => {
 
   test('trimLeft is called when isStartTruncated is true', async () => {
     const trimLeftFn = jest.spyOn(ReactCoreUtils, 'trimLeft').mockImplementation();
-  
+
     render(<TextInput isStartTruncated aria-label="start truncated text input" />);
     expect(trimLeftFn).toHaveBeenCalled();
   });
 
   test('trimLeft is called when isLeftTruncated is true', async () => {
     const trimLeftFn = jest.spyOn(ReactCoreUtils, 'trimLeft').mockImplementation();
-  
+
     render(<TextInput isLeftTruncated aria-label="start truncated text input" />);
     expect(trimLeftFn).toHaveBeenCalled();
   });
 
   test('has aria-expanded set to true when ariaProps.isExpanded is true', () => {
-    render(<TextInput expandedProps={{isExpanded: true, ariaControls: 'test'}}  aria-label="isExpanded"/>);
+    render(<TextInput expandedProps={{ isExpanded: true, ariaControls: 'test' }} aria-label="isExpanded" />);
 
     const input = screen.getByLabelText('isExpanded');
     expect(input).toHaveAttribute('aria-expanded', 'true');
diff --git a/packages/react-core/src/components/TimePicker/__tests__/TimePicker.test.tsx b/packages/react-core/src/components/TimePicker/__tests__/TimePicker.test.tsx
index 98634ea599f..f0fa3aa6bb7 100644
--- a/packages/react-core/src/components/TimePicker/__tests__/TimePicker.test.tsx
+++ b/packages/react-core/src/components/TimePicker/__tests__/TimePicker.test.tsx
@@ -7,12 +7,10 @@ import { TimePicker, TimePickerProps } from '../TimePicker';
 
 describe('TimePicker', () => {
   test('Renders in strict mode', () => {
-    const validateTime = (_time: string) => {
-      return true;
-    };
+    const validateTime = (_time: string) => true;
 
     const consoleError = jest.spyOn(console, 'error');
-    const { asFragment } = render(
+    render(
       <React.StrictMode>
         <TimePicker value={'00:00'} validateTime={validateTime} aria-label="time picker" />
       </React.StrictMode>
@@ -112,9 +110,7 @@ describe('TimePicker', () => {
 
   describe('test isInvalid', () => {
     test('should be valid by default', () => {
-      const validateTime = (_time: string) => {
-        return true;
-      };
+      const validateTime = (_time: string) => true;
 
       render(<TimePicker value={'00:00'} validateTime={validateTime} aria-label="time picker" />);
 
@@ -122,9 +118,7 @@ describe('TimePicker', () => {
     });
 
     test('should stay valid after onChange', async () => {
-      const validateTime = (_time: string) => {
-        return true;
-      };
+      const validateTime = (_time: string) => true;
       const user = userEvent.setup();
 
       render(<TimePicker value="00:00" validateTime={validateTime} aria-label="time picker" />);
diff --git a/packages/react-core/src/components/Toolbar/__tests__/Toolbar.test.tsx b/packages/react-core/src/components/Toolbar/__tests__/Toolbar.test.tsx
index 57c83cdce8a..51d91fa772e 100644
--- a/packages/react-core/src/components/Toolbar/__tests__/Toolbar.test.tsx
+++ b/packages/react-core/src/components/Toolbar/__tests__/Toolbar.test.tsx
@@ -64,8 +64,8 @@ describe('Toolbar', () => {
           <ToolbarGroup variant="filter-group">
             <ToolbarFilter
               chips={['New', 'Pending']}
-              deleteChip={(category, chip) => {}}
-              deleteChipGroup={(category) => {}}
+              deleteChip={(_category, _chip) => {}}
+              deleteChipGroup={(_category) => {}}
               categoryName="Status"
             >
               test content
diff --git a/packages/react-core/src/components/Toolbar/__tests__/ToolbarGroup.test.tsx b/packages/react-core/src/components/Toolbar/__tests__/ToolbarGroup.test.tsx
index 9c34c0a99b2..b6c467f1503 100644
--- a/packages/react-core/src/components/Toolbar/__tests__/ToolbarGroup.test.tsx
+++ b/packages/react-core/src/components/Toolbar/__tests__/ToolbarGroup.test.tsx
@@ -4,7 +4,11 @@ import { ToolbarGroup } from '../ToolbarGroup';
 
 describe('ToolbarItem', () => {
   it('should render with pf-m-overflow-container when isOverflowContainer is set', () => {
-    render(<ToolbarGroup data-testid="toolbargroup" isOverflowContainer>Test</ToolbarGroup>);
+    render(
+      <ToolbarGroup data-testid="toolbargroup" isOverflowContainer>
+        Test
+      </ToolbarGroup>
+    );
     expect(screen.getByTestId('toolbargroup')).toHaveClass('pf-m-overflow-container');
   });
 });
diff --git a/packages/react-core/src/components/Toolbar/__tests__/ToolbarItem.test.tsx b/packages/react-core/src/components/Toolbar/__tests__/ToolbarItem.test.tsx
index af810124f1d..fcfb30af079 100644
--- a/packages/react-core/src/components/Toolbar/__tests__/ToolbarItem.test.tsx
+++ b/packages/react-core/src/components/Toolbar/__tests__/ToolbarItem.test.tsx
@@ -18,7 +18,11 @@ describe('ToolbarItem', () => {
   });
 
   it('should render with pf-m-overflow-container when isOverflowContainer is set', () => {
-    render(<ToolbarItem data-testid="toolbaritem" isOverflowContainer>Test</ToolbarItem>);
+    render(
+      <ToolbarItem data-testid="toolbaritem" isOverflowContainer>
+        Test
+      </ToolbarItem>
+    );
     expect(screen.getByTestId('toolbaritem')).toHaveClass('pf-m-overflow-container');
   });
 });
diff --git a/packages/react-core/src/components/TreeView/__tests__/TreeView.test.tsx b/packages/react-core/src/components/TreeView/__tests__/TreeView.test.tsx
index 9b893398742..07f197ab765 100644
--- a/packages/react-core/src/components/TreeView/__tests__/TreeView.test.tsx
+++ b/packages/react-core/src/components/TreeView/__tests__/TreeView.test.tsx
@@ -2,7 +2,8 @@ import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
 import { TreeView } from '../TreeView';
 import { Button } from '@patternfly/react-core';
-import { FolderIcon, FolderOpenIcon } from '@patternfly/react-icons';
+import FolderIcon from '@patternfly/react-icons/dist/esm/icons/folder-icon';
+import FolderOpenIcon from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
 import { TreeViewSearch } from '../TreeViewSearch';
 
 const options = [
@@ -151,9 +152,7 @@ describe('tree view', () => {
   test('calls onExpand and onCollapse appropriately', () => {
     const onExpand = jest.fn();
     const onCollapse = jest.fn();
-    const { asFragment } = render(
-      <TreeView data={options} onSelect={jest.fn()} onExpand={onExpand} onCollapse={onCollapse} />
-    );
+    render(<TreeView data={options} onSelect={jest.fn()} onExpand={onExpand} onCollapse={onCollapse} />);
     expect(onExpand).not.toHaveBeenCalled();
     expect(onCollapse).not.toHaveBeenCalled();
     expect(screen.queryByText('Application 3')).toBeNull();
diff --git a/packages/react-core/src/components/Wizard/__tests__/WizardToggle.test.tsx b/packages/react-core/src/components/Wizard/__tests__/WizardToggle.test.tsx
index 99efefe596e..e87d4003aab 100644
--- a/packages/react-core/src/components/Wizard/__tests__/WizardToggle.test.tsx
+++ b/packages/react-core/src/components/Wizard/__tests__/WizardToggle.test.tsx
@@ -58,7 +58,7 @@ test('renders only the active step content by default', async () => {
   render(<WizardToggle {...defaultProps} />);
 
   expect(screen.getByText('First step content')).toBeInTheDocument();
-  expect(screen.queryByText('Second step content')).toBeNull;
+  expect(screen.queryByText('Second step content')).toBeNull();
 });
 
 test('has expanded properties when the toggle dropdown button is clicked', async () => {
@@ -95,7 +95,7 @@ test('unsets expanded properties when using the Escape key', async () => {
   expect(toggleButton).not.toHaveClass('pf-m-expanded');
 });
 
-const WizardToggleExpand = props => {
+const WizardToggleExpand = (props) => {
   const [isExpanded, setIsExpanded] = React.useState(false);
 
   return (
diff --git a/packages/react-core/src/components/Wizard/__tests__/utils.test.tsx b/packages/react-core/src/components/Wizard/__tests__/utils.test.tsx
index 5e4732c29b4..511c3a77154 100644
--- a/packages/react-core/src/components/Wizard/__tests__/utils.test.tsx
+++ b/packages/react-core/src/components/Wizard/__tests__/utils.test.tsx
@@ -31,7 +31,7 @@ describe('buildSteps', () => {
   });
 
   test('returns flattened array of steps and sub-steps when sub-steps exist', () => {
-    const CustomSubStep = props => <div {...props} />;
+    const CustomSubStep = (props) => <div {...props} />;
 
     const component = (
       <WizardStep
diff --git a/packages/react-core/src/deprecated/components/ContextSelector/__tests__/ContextSelectorToggle.test.tsx b/packages/react-core/src/deprecated/components/ContextSelector/__tests__/ContextSelectorToggle.test.tsx
index 572a0165c86..6b54fa96311 100644
--- a/packages/react-core/src/deprecated/components/ContextSelector/__tests__/ContextSelectorToggle.test.tsx
+++ b/packages/react-core/src/deprecated/components/ContextSelector/__tests__/ContextSelectorToggle.test.tsx
@@ -24,7 +24,7 @@ describe('ContextSelectorToggle', () => {
 
   test('Verify ESC press', async () => {
     const user = userEvent.setup();
-    
+
     const { asFragment } = render(<ContextSelectorToggle isOpen id="toggle-id" />);
 
     await user.type(screen.getByRole('button'), `{${KeyTypes.Escape}}`);
@@ -33,7 +33,7 @@ describe('ContextSelectorToggle', () => {
 
   test('Verify ESC press with not isOpen', async () => {
     const user = userEvent.setup();
-    
+
     const { asFragment } = render(<ContextSelectorToggle onToggle={jest.fn()} id="toggle-id" />);
 
     await user.type(screen.getByRole('button'), `{${KeyTypes.Escape}}`);
@@ -42,7 +42,7 @@ describe('ContextSelectorToggle', () => {
 
   test('Verify keydown tab ', async () => {
     const user = userEvent.setup();
-    
+
     const { asFragment } = render(<ContextSelectorToggle isOpen id="toggle-id" />);
 
     await user.type(screen.getByRole('button'), `{${KeyTypes.Tab}}`);
@@ -51,7 +51,7 @@ describe('ContextSelectorToggle', () => {
 
   test('Verify keydown enter ', async () => {
     const user = userEvent.setup();
-    
+
     const { asFragment } = render(<ContextSelectorToggle onToggle={jest.fn()} onEnter={jest.fn()} id="toggle-id" />);
 
     await user.type(screen.getByRole('button'), `{${KeyTypes.Enter}}`);
diff --git a/packages/react-core/src/deprecated/components/Dropdown/__tests__/DropdownToggle.test.tsx b/packages/react-core/src/deprecated/components/Dropdown/__tests__/DropdownToggle.test.tsx
index c80db019cfb..6585ef86318 100644
--- a/packages/react-core/src/deprecated/components/Dropdown/__tests__/DropdownToggle.test.tsx
+++ b/packages/react-core/src/deprecated/components/Dropdown/__tests__/DropdownToggle.test.tsx
@@ -187,7 +187,7 @@ describe('DropdownToggle', () => {
     });
 
     test('action split button - renders secondary variant', () => {
-      const { asFragment } = render(
+      render(
         <DropdownToggle
           id="Dropdown Toggle"
           toggleVariant="secondary"
diff --git a/packages/react-core/src/deprecated/components/Select/__tests__/Select.test.tsx b/packages/react-core/src/deprecated/components/Select/__tests__/Select.test.tsx
index d7cfbf7278b..060501e8539 100644
--- a/packages/react-core/src/deprecated/components/Select/__tests__/Select.test.tsx
+++ b/packages/react-core/src/deprecated/components/Select/__tests__/Select.test.tsx
@@ -123,7 +123,7 @@ describe('Select', () => {
 
   describe('custom select filter', () => {
     test('filters properly', async () => {
-      const customFilter = (e: React.ChangeEvent<HTMLInputElement>, value: string) => {
+      const customFilter = (e: React.ChangeEvent<HTMLInputElement>, _value: string) => {
         let input: RegExp;
         try {
           input = new RegExp(e.target.value, 'i');
diff --git a/packages/react-core/src/deprecated/components/Wizard/__tests__/Wizard.test.tsx b/packages/react-core/src/deprecated/components/Wizard/__tests__/Wizard.test.tsx
index d5f6a7aa09c..ef6193fa4b1 100644
--- a/packages/react-core/src/deprecated/components/Wizard/__tests__/Wizard.test.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/__tests__/Wizard.test.tsx
@@ -29,7 +29,7 @@ describe('Wizard', () => {
       { name: 'C', id: 'step-C', component: <p>Step 4</p> },
       { name: 'D', id: 'step-D', component: <p>Step 5</p> }
     ];
-    const onBack: WizardStepFunctionType = step => {
+    const onBack: WizardStepFunctionType = (step) => {
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       const name = { step };
     };
@@ -62,7 +62,7 @@ describe('Wizard', () => {
       { name: 'C', component: <p>Step 4</p> },
       { name: 'D', component: <p>Step 5</p> }
     ];
-    const onBack: WizardStepFunctionType = step => {
+    const onBack: WizardStepFunctionType = (step) => {
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       const name = { step };
     };
@@ -289,7 +289,7 @@ test('startAtStep can be used to externally control the current step of the wiza
     const [step, setStep] = React.useState(1);
 
     const incrementStep = () => {
-      setStep(prevStep => prevStep + 1);
+      setStep((prevStep) => prevStep + 1);
     };
 
     const steps: WizardStep[] = [
diff --git a/packages/react-core/src/helpers/GenerateId/__tests__/GenerateId.test.tsx b/packages/react-core/src/helpers/GenerateId/__tests__/GenerateId.test.tsx
index 9112eccde98..9ab6f5edcda 100644
--- a/packages/react-core/src/helpers/GenerateId/__tests__/GenerateId.test.tsx
+++ b/packages/react-core/src/helpers/GenerateId/__tests__/GenerateId.test.tsx
@@ -3,7 +3,7 @@ import { render } from '@testing-library/react';
 import { GenerateId } from '../GenerateId';
 
 test('generates id', () => {
-  const { asFragment } = render(<GenerateId>{id => <div id={id}>div with random ID</div>}</GenerateId>);
+  const { asFragment } = render(<GenerateId>{(id) => <div id={id}>div with random ID</div>}</GenerateId>);
 
   expect(asFragment()).toMatchSnapshot();
 });
diff --git a/packages/react-core/src/helpers/OUIA/__mocks__/ouia.ts b/packages/react-core/src/helpers/OUIA/__mocks__/ouia.ts
new file mode 100644
index 00000000000..569fe777126
--- /dev/null
+++ b/packages/react-core/src/helpers/OUIA/__mocks__/ouia.ts
@@ -0,0 +1,6 @@
+import { OUIAProps } from '../../index';
+
+export const useOUIAProps = () => ({});
+export const getOUIAProps = () => ({});
+export const getDefaultOUIAId = () => '';
+export { OUIAProps };
diff --git a/packages/react-core/src/helpers/__mocks__/index.ts b/packages/react-core/src/helpers/__mocks__/index.ts
new file mode 100644
index 00000000000..c38b09faa0c
--- /dev/null
+++ b/packages/react-core/src/helpers/__mocks__/index.ts
@@ -0,0 +1,2 @@
+export * from '../OUIA/__mocks__/ouia';
+export * from './util';
diff --git a/packages/react-core/src/helpers/__tests__/fileUtils.test.ts b/packages/react-core/src/helpers/__tests__/fileUtils.test.ts
index 5055621654a..6c75414942b 100644
--- a/packages/react-core/src/helpers/__tests__/fileUtils.test.ts
+++ b/packages/react-core/src/helpers/__tests__/fileUtils.test.ts
@@ -3,15 +3,12 @@ import { readFile, fileReaderType } from '../fileUtils';
 describe('readFile', () => {
   const file = new File(['File contents here'], 'testfile.txt');
 
-  test('text file', () => {
-    return expect(readFile(file, fileReaderType.text)).resolves.toBe('File contents here');
-  });
+  test('text file', () => expect(readFile(file, fileReaderType.text)).resolves.toBe('File contents here'));
 
-  test('dataURL file', () => {
-    return expect(readFile(file, fileReaderType.dataURL)).resolves.toBe('data:application/octet-stream;base64,RmlsZSBjb250ZW50cyBoZXJl');
-  });
+  test('dataURL file', () =>
+    expect(readFile(file, fileReaderType.dataURL)).resolves.toBe(
+      'data:application/octet-stream;base64,RmlsZSBjb250ZW50cyBoZXJl'
+    ));
 
-  test('rejects on unknown type', () => {
-    return expect(readFile(file, 'foo' as fileReaderType)).rejects.toBe('unknown type');
-  });
+  test('rejects on unknown type', () => expect(readFile(file, 'foo' as fileReaderType)).rejects.toBe('unknown type'));
 });
diff --git a/packages/react-core/src/helpers/__tests__/util.test.ts b/packages/react-core/src/helpers/__tests__/util.test.ts
index 9f9710acb8a..9a6aa74dc6e 100644
--- a/packages/react-core/src/helpers/__tests__/util.test.ts
+++ b/packages/react-core/src/helpers/__tests__/util.test.ts
@@ -14,7 +14,7 @@ import styles from '@patternfly/react-styles/css/layouts/Flex/flex';
 const createMockHtmlElement = (bounds: Partial<DOMRect>) =>
   ({
     getBoundingClientRect: () => bounds
-  } as HTMLElement);
+  }) as HTMLElement;
 
 test('capitalize', () => {
   expect(capitalize('foo')).toBe('Foo');
diff --git a/packages/react-core/src/layouts/Bullseye/__tests__/Bullseye.test.tsx b/packages/react-core/src/layouts/Bullseye/__tests__/Bullseye.test.tsx
index d220f103dcd..27527f95ebb 100644
--- a/packages/react-core/src/layouts/Bullseye/__tests__/Bullseye.test.tsx
+++ b/packages/react-core/src/layouts/Bullseye/__tests__/Bullseye.test.tsx
@@ -23,7 +23,7 @@ describe('Bullseye', () => {
   test('allows passing in a React Component as the component', () => {
     const Component: React.FunctionComponent = () => <div>Some text</div>;
 
-    render(<Bullseye component={(Component as unknown) as keyof JSX.IntrinsicElements} />);
+    render(<Bullseye component={Component as unknown as keyof JSX.IntrinsicElements} />);
     expect(screen.getByText('Some text')).toBeInTheDocument();
   });
 });
diff --git a/packages/react-core/src/layouts/Grid/__tests__/GridItem.test.tsx b/packages/react-core/src/layouts/Grid/__tests__/GridItem.test.tsx
index 954109b632c..1e3c04de9bf 100644
--- a/packages/react-core/src/layouts/Grid/__tests__/GridItem.test.tsx
+++ b/packages/react-core/src/layouts/Grid/__tests__/GridItem.test.tsx
@@ -18,7 +18,7 @@ test('adds row class', () => {
   expect(asFragment()).toMatchSnapshot();
 });
 
-Object.keys(DeviceSizes).forEach(size => {
+Object.keys(DeviceSizes).forEach((size) => {
   test(`adds ${size} span class`, () => {
     const props = { [size]: 4 };
     const { asFragment } = render(<GridItem {...props} />);
diff --git a/packages/react-icons/src/__tests__/createIcon.test.tsx b/packages/react-icons/src/__tests__/createIcon.test.tsx
index 3c44643c763..bd72064c422 100644
--- a/packages/react-icons/src/__tests__/createIcon.test.tsx
+++ b/packages/react-icons/src/__tests__/createIcon.test.tsx
@@ -21,11 +21,7 @@ test('sets correct viewBox', () => {
 
 test('sets correct svgPath', () => {
   render(<SVGIcon />);
-  expect(
-    screen
-      .getByRole('img', { hidden: true })
-      .querySelector('path')
-  ).toHaveAttribute('d', iconDef.svgPath);
+  expect(screen.getByRole('img', { hidden: true }).querySelector('path')).toHaveAttribute('d', iconDef.svgPath);
 });
 
 test('aria-hidden is true if no title is specified', () => {
@@ -35,7 +31,7 @@ test('aria-hidden is true if no title is specified', () => {
 
 test('title is not renderd if a title is not passed', () => {
   render(<SVGIcon />);
-  expect(screen.getByRole('img', { hidden: true }).querySelector('title')).toBeNull();
+  expect(screen.queryByRole('img', { hidden: true })?.querySelector('title')).toBeNull();
 });
 
 test('aria-labelledby is null if a title is not passed', () => {
diff --git a/packages/react-table/src/components/Table/utils/transformers.test.tsx b/packages/react-table/src/components/Table/utils/transformers.test.tsx
index a9333cec331..e17f0a5c267 100644
--- a/packages/react-table/src/components/Table/utils/transformers.test.tsx
+++ b/packages/react-table/src/components/Table/utils/transformers.test.tsx
@@ -76,6 +76,7 @@ const testCellActions = async ({
     const { container } = render(returnedData.children as React.ReactElement<any>);
     await user.click(screen.getAllByRole('button')[0]);
     await waitFor(() =>
+      // eslint-disable-next-line testing-library/no-container
       expect(container.querySelectorAll(`.${dropdownStyles.dropdownMenu} li button`)).toHaveLength(
         expectDisabled ? 0 : 1
       )
diff --git a/packages/react-table/src/deprecated/components/Table/__tests__/Table.test.tsx b/packages/react-table/src/deprecated/components/Table/__tests__/Table.test.tsx
index 4d8ca16c325..2ef44c2acf8 100644
--- a/packages/react-table/src/deprecated/components/Table/__tests__/Table.test.tsx
+++ b/packages/react-table/src/deprecated/components/Table/__tests__/Table.test.tsx
@@ -24,11 +24,7 @@ import {
   fitContent,
   ICell
 } from '../../../../components';
-import {
-  Table,
-  TableHeader,
-  TableBody
-} from '../index';
+import { Table, TableHeader, TableBody } from '../index';
 import { rows, columns, editableRows, editableColumns, actions } from '../../../../test-helpers/data-sets';
 import { ColumnsType } from '../../../../components/Table/base/types';
 
@@ -52,8 +48,7 @@ describe('Table', () => {
         </Table>
       );
       const table = screen.getByLabelText('Table with ouiaSafe');
-      expect(table.getAttribute('data-ouia-safe')).toEqual("false");
-
+      expect(table.getAttribute('data-ouia-safe')).toEqual('false');
     });
 
     test('header', () => {
@@ -116,7 +111,7 @@ describe('Table', () => {
   });
 
   describe('Table variants', () => {
-    Object.values(TableGridBreakpoint).forEach(oneBreakpoint => {
+    Object.values(TableGridBreakpoint).forEach((oneBreakpoint) => {
       test(`Breakpoint - ${oneBreakpoint}`, () => {
         const { asFragment } = render(
           <Table aria-label="Aria labeled" gridBreakPoint={oneBreakpoint} cells={columns} rows={rows}>
@@ -128,7 +123,7 @@ describe('Table', () => {
       });
     });
 
-    Object.values(TableVariant).forEach(onevariant => {
+    Object.values(TableVariant).forEach((onevariant) => {
       test(`Size - ${onevariant}`, () => {
         const { asFragment } = render(
           <Table aria-label="Aria labeled" variant={onevariant} cells={columns} rows={rows}>
diff --git a/yarn.lock b/yarn.lock
index 607d1736bb3..403f79208ba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4796,7 +4796,7 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.62.0":
+"@typescript-eslint/utils@5.62.0", "@typescript-eslint/utils@^5.58.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
   integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
@@ -9156,6 +9156,13 @@ eslint-plugin-standard@^4.0.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.1.0.tgz#0c3bf3a67e853f8bbbc580fb4945fbf16f41b7c5"
   integrity sha512-ZL7+QRixjTR6/528YNGyDotyffm5OQst/sGxKDwGb9Uqs4In5Egi4+jbobhqJoyoCM6/7v/1A5fhQ7ScMtDjaQ==
 
+eslint-plugin-testing-library@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-6.1.0.tgz#6f4fbc50dfbac100b0c6083b1e6b06cea9a86feb"
+  integrity sha512-r7kE+az3tbp8vyRwfyAGZ6V/xw+XvdWFPicIo6jbOPZoossOFDeHizARqPGV6gEkyF8hyCFhhH3mlQOGS3N5Sg==
+  dependencies:
+    "@typescript-eslint/utils" "^5.58.0"
+
 eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"