3 files changed, 30 insertions, 32 deletions
diff --git a/src/components/atoms/forms/fieldset/fieldset.stories.tsx b/src/components/atoms/forms/fieldset/fieldset.stories.tsx
index faf355f..a7d665d 100644
--- a/src/components/atoms/forms/fieldset/fieldset.stories.tsx
+++ b/src/components/atoms/forms/fieldset/fieldset.stories.tsx
@@ -1,7 +1,7 @@
-import { ComponentMeta, ComponentStory } from '@storybook/react';
-import { Fieldset as FieldsetComponent } from './fieldset';
+import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import { Input } from '../fields';
 import { Legend } from '../legend';
+import { Fieldset as FieldsetComponent } from './fieldset';
 
 /**
  * Fieldset - Storybook Meta
@@ -31,28 +31,26 @@ export default {
   },
 } as ComponentMeta<typeof FieldsetComponent>;
 
-const Template: ComponentStory<typeof FieldsetComponent> = (args) => {
-  return (
-    <FieldsetComponent {...args}>
-      <div>
-        <Input
-          aria-label="A field example"
-          id="field1"
-          name="field1"
-          type="text"
-        />
-      </div>
-      <div>
-        <Input
-          aria-label="Another field example"
-          id="field2"
-          name="field2"
-          type="text"
-        />
-      </div>
-    </FieldsetComponent>
-  );
-};
+const Template: ComponentStory<typeof FieldsetComponent> = (args) => (
+  <FieldsetComponent {...args}>
+    <div>
+      <Input
+        aria-label="A field example"
+        id="field1"
+        name="field1"
+        type="text"
+      />
+    </div>
+    <div>
+      <Input
+        aria-label="Another field example"
+        id="field2"
+        name="field2"
+        type="text"
+      />
+    </div>
+  </FieldsetComponent>
+);
 
 /**
  * Fieldset Story
diff --git a/src/components/atoms/forms/fieldset/fieldset.test.tsx b/src/components/atoms/forms/fieldset/fieldset.test.tsx
index 2554d59..86acc8b 100644
--- a/src/components/atoms/forms/fieldset/fieldset.test.tsx
+++ b/src/components/atoms/forms/fieldset/fieldset.test.tsx
@@ -1,5 +1,5 @@
 import { describe, expect, it } from '@jest/globals';
-import { render, screen } from '../../../../../tests/utils';
+import { render, screen as rtlScreen } from '@testing-library/react';
 import { Input } from '../fields';
 import { Fieldset } from './fieldset';
 
@@ -15,8 +15,8 @@ describe('fieldset', () => {
         />
       </Fieldset>
     );
-    expect(screen.getByRole('group')).toBeInTheDocument();
-    expect(screen.getByRole('textbox')).not.toBeDisabled();
+    expect(rtlScreen.getByRole('group')).toBeInTheDocument();
+    expect(rtlScreen.getByRole('textbox')).not.toBeDisabled();
   });
 
   it('renders a disabled fieldset', () => {
@@ -30,7 +30,7 @@ describe('fieldset', () => {
         />
       </Fieldset>
     );
-    expect(screen.getByRole('group')).toBeInTheDocument();
-    expect(screen.getByRole('textbox')).toBeDisabled();
+    expect(rtlScreen.getByRole('group')).toBeInTheDocument();
+    expect(rtlScreen.getByRole('textbox')).toBeDisabled();
   });
 });
diff --git a/src/components/atoms/forms/fieldset/fieldset.tsx b/src/components/atoms/forms/fieldset/fieldset.tsx
index eb42961..85e7b3f 100644
--- a/src/components/atoms/forms/fieldset/fieldset.tsx
+++ b/src/components/atoms/forms/fieldset/fieldset.tsx
@@ -1,11 +1,11 @@
 import {
   forwardRef,
   type FieldsetHTMLAttributes,
-  ForwardRefRenderFunction,
-  ReactElement,
+  type ForwardRefRenderFunction,
+  type ReactElement,
 } from 'react';
+import type { LegendProps } from '../legend';
 import styles from './fieldset.module.scss';
-import { LegendProps } from '../legend';
 
 export type FieldsetProps = Omit<
   FieldsetHTMLAttributes<HTMLFieldSetElement>,