diff --git a/tests/Button.test.svelte b/tests/Button.test.svelte
index 5778fcb2..a2bc6ed9 100644
--- a/tests/Button.test.svelte
+++ b/tests/Button.test.svelte
@@ -21,7 +21,6 @@
 
 <Button
   icon="{Add16}"
-  hasIconOnly
   tooltipPosition="bottom"
   tooltipAlignment="center"
   iconDescription="Tooltip text"
diff --git a/tests/ContentSwitcher.test.svelte b/tests/ContentSwitcher.test.svelte
index 9ccdf33e..e534a0db 100644
--- a/tests/ContentSwitcher.test.svelte
+++ b/tests/ContentSwitcher.test.svelte
@@ -1,32 +1,11 @@
 <script lang="ts">
   import { ContentSwitcher, Switch } from "../types";
-  import Bullhorn16 from "carbon-icons-svelte/lib/Bullhorn16";
   import Analytics16 from "carbon-icons-svelte/lib/Analytics16";
 </script>
 
-<ContentSwitcher>
-  <Switch text="Latest news" />
+<ContentSwitcher size="xl" selectedIndex="{1}">
+  <Switch disabled text="Latest news" />
   <Switch text="Trending" />
-</ContentSwitcher>
-
-<ContentSwitcher selectedIndex="{1}">
-  <Switch text="Latest news" />
-  <Switch text="Trending" />
-  <Switch text="Recommended" />
-</ContentSwitcher>
-
-<ContentSwitcher light>
-  <Switch text="Latest news" />
-  <Switch text="Trending" />
-</ContentSwitcher>
-
-<ContentSwitcher>
-  <Switch>
-    <div style="display: flex; align-items: center;">
-      <Bullhorn16 style="margin-right: 0.5rem;" />
-      Latest news
-    </div>
-  </Switch>
   <Switch>
     <div style="display: flex; align-items: center;">
       <Analytics16 style="margin-right: 0.5rem;" />
@@ -34,22 +13,3 @@
     </div>
   </Switch>
 </ContentSwitcher>
-
-<Bullhorn16 style="margin-right: 0.5rem;" />
-
-<Analytics16 style="margin-right: 0.5rem;" />
-
-<ContentSwitcher size="xl">
-  <Switch text="All" />
-  <Switch text="Archived" />
-</ContentSwitcher>
-
-<ContentSwitcher size="sm">
-  <Switch text="All" />
-  <Switch text="Archived" />
-</ContentSwitcher>
-
-<ContentSwitcher>
-  <Switch disabled text="All" />
-  <Switch disabled text="Archived" />
-</ContentSwitcher>
diff --git a/tests/DataTable.test.svelte b/tests/DataTable.test.svelte
index 67af1f16..86c38fbc 100644
--- a/tests/DataTable.test.svelte
+++ b/tests/DataTable.test.svelte
@@ -111,7 +111,7 @@
     <ToolbarContent>
       <ToolbarSearch
         shouldFilterRows="{(row, value) => {
-          return true;
+          return row.name.includes(value);
         }}"
       />
       <ToolbarMenu>
diff --git a/tests/NumberInput.test.svelte b/tests/NumberInput.test.svelte
index d687d8ae..d75aa012 100644
--- a/tests/NumberInput.test.svelte
+++ b/tests/NumberInput.test.svelte
@@ -8,40 +8,17 @@
 {value}
 
 <NumberInput
+  disabled
+  light
+  min="{4}"
+  max="{20}"
+  value="{4}"
   label="Clusters"
+  helperText="Clusters provisioned in your region"
+  invalidText="Number must be between 4 and 20."
   on:change="{(e) => {
     console.log(e.detail); // null | number
   }}"
 />
 
-<NumberInput
-  label="Clusters"
-  helperText="Clusters provisioned in your region"
-/>
-
-<NumberInput
-  min="{4}"
-  max="{20}"
-  value="{4}"
-  invalidText="Number must be between 4 and 20."
-  helperText="Clusters provisioned in your region"
-  label="Clusters (4 min, 20 max)"
-/>
-
-<NumberInput hideLabel label="Clusters" />
-
-<NumberInput light label="Clusters" />
-
-<NumberInput mobile label="Clusters" />
-
-<NumberInput size="xl" label="Clusters" />
-
-<NumberInput size="sm" label="Clusters" />
-
-<NumberInput invalid invalidText="An error occurred" label="Clusters" />
-
-<NumberInput disabled label="Clusters" />
-
-<NumberInputSkeleton />
-
 <NumberInputSkeleton hideLabel />