diff --git a/ui/components/app/detected-token/detected-token.test.js b/ui/components/app/detected-token/detected-token.test.js
index 7c7f9ee79..e130708f4 100644
--- a/ui/components/app/detected-token/detected-token.test.js
+++ b/ui/components/app/detected-token/detected-token.test.js
@@ -8,7 +8,11 @@ import DetectedToken from './detected-token';
 describe('DetectedToken', () => {
   it('should render the detected token found page', async () => {
     const store = configureStore(testData);
-    renderWithProvider(<DetectedToken />, store);
+    const props = {
+      setShowDetectedTokens: jest.fn(),
+    };
+
+    renderWithProvider(<DetectedToken {...props} />, store);
 
     expect(screen.getByText('0 LINK')).toBeInTheDocument();
     expect(screen.getByText('0 COMP')).toBeInTheDocument();
diff --git a/ui/components/app/signature-request/signature-request.component.test.js b/ui/components/app/signature-request/signature-request.component.test.js
index f2e235b6f..f20d49942 100644
--- a/ui/components/app/signature-request/signature-request.component.test.js
+++ b/ui/components/app/signature-request/signature-request.component.test.js
@@ -66,7 +66,7 @@ describe('Signature Request Component', () => {
       };
       const wrapper = shallowWithContext(
         <SignatureRequest
-          hardwareWalletRequiresConnection={() => false}
+          hardwareWalletRequiresConnection={false}
           clearConfirmTransaction={() => undefined}
           cancel={() => undefined}
           sign={() => undefined}
@@ -105,7 +105,7 @@ describe('Signature Request Component', () => {
       };
       const wrapper = shallowWithContext(
         <SignatureRequest
-          hardwareWalletRequiresConnection={() => false}
+          hardwareWalletRequiresConnection={false}
           clearConfirmTransaction={() => undefined}
           cancel={() => undefined}
           sign={() => undefined}
diff --git a/ui/components/app/signature-request/signature-request.container.test.js b/ui/components/app/signature-request/signature-request.container.test.js
index 0eb4a6deb..5ed1888ae 100644
--- a/ui/components/app/signature-request/signature-request.container.test.js
+++ b/ui/components/app/signature-request/signature-request.container.test.js
@@ -32,6 +32,7 @@ describe('Signature Request', () => {
     history: {
       push: sinon.spy(),
     },
+    hardwareWalletRequiresConnection: false,
     clearConfirmTransaction: sinon.spy(),
     cancelMessage: sinon.spy(),
     cancel: sinon.stub().resolves(),
diff --git a/ui/components/ui/site-icon/site-icon.test.js b/ui/components/ui/site-icon/site-icon.test.js
index 5c4efa156..f1e793c3b 100644
--- a/ui/components/ui/site-icon/site-icon.test.js
+++ b/ui/components/ui/site-icon/site-icon.test.js
@@ -4,6 +4,7 @@ import SiteIcon from '.';
 
 describe('SiteIcon', () => {
   const args = {
+    size: 32,
     name: 'Snap name',
     icon: './images/eth_logo.svg',
     className: 'classname-test',
@@ -11,7 +12,7 @@ describe('SiteIcon', () => {
   };
 
   it('should render without crashing', () => {
-    const { getByText } = render(<SiteIcon name={args.name} />);
+    const { getByText } = render(<SiteIcon size={32} name={args.name} />);
     expect(getByText('S')).toBeDefined();
   });
 
diff --git a/ui/pages/onboarding-flow/privacy-settings/setting.js b/ui/pages/onboarding-flow/privacy-settings/setting.js
index 82ba1275c..f2951fc97 100644
--- a/ui/pages/onboarding-flow/privacy-settings/setting.js
+++ b/ui/pages/onboarding-flow/privacy-settings/setting.js
@@ -29,5 +29,5 @@ Setting.propTypes = {
   value: PropTypes.bool,
   setValue: PropTypes.func,
   title: PropTypes.string,
-  description: PropTypes.string,
+  description: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),
 };
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
index 5c639e551..300003319 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
@@ -30,6 +30,7 @@ describe('AdvancedTab Component', () => {
         dismissSeedBackUpReminder={false}
         useTokenDetection
         setUseTokenDetection={toggleTokenDetection}
+        userHasALedgerAccount
       />,
       {
         context: {
@@ -59,6 +60,9 @@ describe('AdvancedTab Component', () => {
         setDismissSeedBackUpReminder={() => undefined}
         dismissSeedBackUpReminder={false}
         setShowTestNetworks={toggleTestnet}
+        useTokenDetection
+        setUseTokenDetection={toggleTokenDetection}
+        userHasALedgerAccount
       />,
       {
         context: {
@@ -103,6 +107,7 @@ describe('AdvancedTab Component', () => {
         dismissSeedBackUpReminder={false}
         useTokenDetection
         setUseTokenDetection={toggleTokenDetection}
+        userHasALedgerAccount
       />,
       {
         context: {
@@ -139,6 +144,7 @@ describe('AdvancedTab Component', () => {
         dismissSeedBackUpReminder={false}
         useTokenDetection
         setUseTokenDetection={toggleTokenDetection}
+        userHasALedgerAccount
       />,
       {
         context: {