diff --git a/packages/bumbag/src/Icon/__tests__/Icon.test.tsx b/packages/bumbag/src/Icon/__tests__/Icon.test.tsx
index 674ca8529..43bfb692a 100644
--- a/packages/bumbag/src/Icon/__tests__/Icon.test.tsx
+++ b/packages/bumbag/src/Icon/__tests__/Icon.test.tsx
@@ -73,7 +73,7 @@ describe('composition', () => {
   describe('as', () => {
     it('should render correctly', () => {
       const { container } = render(
-        <Icon use="div" icon="info-circle">
+        <Icon use="svg" icon="info-circle">
           Hello world
         </Icon>
       );
diff --git a/packages/bumbag/src/Icon/__tests__/__snapshots__/Icon.test.tsx.snap b/packages/bumbag/src/Icon/__tests__/__snapshots__/Icon.test.tsx.snap
index a4fc5f9a2..9c7e1c87c 100644
--- a/packages/bumbag/src/Icon/__tests__/__snapshots__/Icon.test.tsx.snap
+++ b/packages/bumbag/src/Icon/__tests__/__snapshots__/Icon.test.tsx.snap
@@ -23,18 +23,18 @@ exports[`composition as should render correctly 1`] = `
   width: 1em;
 }
 
-<div
+<svg
   aria-hidden="true"
   class="emotion-0 emotion-1 emotion-2 bb-Box bb-Icon"
   role="img"
-  viewbox="0 0 512 512"
+  viewBox="0 0 512 512"
 >
   <path
     d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 110c23.196 0 42 18.804 42 42s-18.804 42-42 42-42-18.804-42-42 18.804-42 42-42zm56 254c0 6.627-5.373 12-12 12h-88c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h12v-64h-12c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h64c6.627 0 12 5.373 12 12v100h12c6.627 0 12 5.373 12 12v24z"
     fill="currentColor"
     fill-rule="evenodd"
   />
-</div>
+</svg>
 `;
 
 exports[`composition hook should return with Icon props 1`] = `
diff --git a/packages/bumbag/src/Rating/Rating.tsx b/packages/bumbag/src/Rating/Rating.tsx
index e89785b79..40a6045bf 100644
--- a/packages/bumbag/src/Rating/Rating.tsx
+++ b/packages/bumbag/src/Rating/Rating.tsx
@@ -74,12 +74,9 @@ const useProps = createHook<RatingProps>(
       overrides,
       role: 'radiogroup',
       children: times(items ? items.length : maxValue, (index) => (
-        <Rover {...rover} {...roverProps} disabled={disabled}>
+        <Rover key={index} {...rover} {...roverProps} disabled={disabled}>
           {(props) => (
-            /*
-            // @ts-ignore */
             <RatingItem
-              key={index}
               {...props}
               aria-checked={value === index + 1}
               aria-posinset={index + 1}
diff --git a/packages/bumbag/src/Tooltip/__tests__/Tooltip.test.tsx b/packages/bumbag/src/Tooltip/__tests__/Tooltip.test.tsx
index 777b38fe8..7091d7d26 100644
--- a/packages/bumbag/src/Tooltip/__tests__/Tooltip.test.tsx
+++ b/packages/bumbag/src/Tooltip/__tests__/Tooltip.test.tsx
@@ -27,7 +27,7 @@ describe('composition', () => {
   describe('as', () => {
     it('should render correctly', () => {
       const { container } = render(
-        <Tooltip use="p" content="This is content" baseId="test">
+        <Tooltip use="div" content="This is content" baseId="test">
           Hello world
         </Tooltip>
       );
diff --git a/packages/bumbag/src/Tooltip/__tests__/__snapshots__/Tooltip.test.tsx.snap b/packages/bumbag/src/Tooltip/__tests__/__snapshots__/Tooltip.test.tsx.snap
index 0cbd6665c..de27c7849 100644
--- a/packages/bumbag/src/Tooltip/__tests__/__snapshots__/Tooltip.test.tsx.snap
+++ b/packages/bumbag/src/Tooltip/__tests__/__snapshots__/Tooltip.test.tsx.snap
@@ -16,7 +16,7 @@ exports[`composition as should render correctly 1`] = `
   outline: none;
 }
 
-<p>
+<div>
   <div
     aria-describedby="test"
     class="emotion-0 emotion-1 emotion-2 bb-Box bb-TooltipReference"
@@ -24,7 +24,7 @@ exports[`composition as should render correctly 1`] = `
   >
     Hello world
   </div>
-</p>
+</div>
 `;
 
 exports[`composition hook should return with Tooltip props 1`] = `