diff --git a/packages/admin-portal/src/components/pages/apps-management/__tests__/__snapshots__/apps-management.test.tsx.snap b/packages/admin-portal/src/components/pages/apps-management/__tests__/__snapshots__/apps-management.test.tsx.snap
index 5c9bcc705f..c610ceed6d 100644
--- a/packages/admin-portal/src/components/pages/apps-management/__tests__/__snapshots__/apps-management.test.tsx.snap
+++ b/packages/admin-portal/src/components/pages/apps-management/__tests__/__snapshots__/apps-management.test.tsx.snap
@@ -226,7 +226,7 @@ exports[`admin-apps AdminApprovals should match a snapshot 1`] = `
                               validate={null}
                             >
                               <div
-                                className="field "
+                                className=""
                               >
                                 <div
                                   className="control "
@@ -238,7 +238,7 @@ exports[`admin-apps AdminApprovals should match a snapshot 1`] = `
                                     App Name
                                   </label>
                                   <input
-                                    className="input is-primary"
+                                    className=""
                                     data-test=""
                                     disabled={false}
                                     id="appName"
@@ -273,7 +273,7 @@ exports[`admin-apps AdminApprovals should match a snapshot 1`] = `
                               validate={null}
                             >
                               <div
-                                className="field "
+                                className=""
                               >
                                 <div
                                   className="control "
@@ -285,7 +285,7 @@ exports[`admin-apps AdminApprovals should match a snapshot 1`] = `
                                     Developer Name
                                   </label>
                                   <input
-                                    className="input is-primary"
+                                    className=""
                                     data-test=""
                                     disabled={false}
                                     id="developerName"
@@ -320,7 +320,7 @@ exports[`admin-apps AdminApprovals should match a snapshot 1`] = `
                               validate={null}
                             >
                               <div
-                                className="field "
+                                className=""
                               >
                                 <div
                                   className="control "
@@ -332,7 +332,7 @@ exports[`admin-apps AdminApprovals should match a snapshot 1`] = `
                                     Company Name
                                   </label>
                                   <input
-                                    className="input is-primary"
+                                    className=""
                                     data-test=""
                                     disabled={false}
                                     id="companyName"
diff --git a/packages/admin-portal/src/components/pages/devs-management/__tests__/devs-management.test.tsx b/packages/admin-portal/src/components/pages/devs-management/__tests__/devs-management.test.tsx
index f61ed45c0f..7e71fcdfea 100644
--- a/packages/admin-portal/src/components/pages/devs-management/__tests__/devs-management.test.tsx
+++ b/packages/admin-portal/src/components/pages/devs-management/__tests__/devs-management.test.tsx
@@ -1,7 +1,12 @@
 import * as React from 'react'
 import { mount } from 'enzyme'
-import { DevsManagement, onPageChangeHandler, onSearchHandler, handleFetchData } from '../devs-management'
-import { DevsManagementFilterFormValues } from '@/components/ui/devs-management-filter-form'
+import {
+  DevsManagement,
+  onPageChangeHandler,
+  onSearchHandler,
+  handleFetchData,
+  onClickStatusButton,
+} from '../devs-management'
 import { getMockRouterProps } from '@/utils/mock-helper'
 import { MemoryRouter } from 'react-router'
 import configureStore from 'redux-mock-store'
@@ -10,6 +15,7 @@ import Routes from '@/constants/routes'
 import appState from '@/reducers/__stubs__/app-state'
 import { PagedResultDeveloperModel_ } from '@reapit/foundations-ts-definitions'
 import { devsManagementRequestData } from '@/actions/devs-management'
+import { DevsManagementFilterFormValues } from '@/components/ui/devs-management-filter-form'
 
 const createStore = (loading: boolean, data?: PagedResultDeveloperModel_) => {
   return {
@@ -111,3 +117,15 @@ describe('handleFetchData', () => {
     expect(dispatch).toBeCalledWith(devsManagementRequestData(params))
   })
 })
+
+describe('onClickStatusButton', () => {
+  it('should run correctly', () => {
+    const setDeveloper = jest.fn()
+    const setIsSetStatusModalOpen = jest.fn()
+    const developerData = {}
+    const fn = onClickStatusButton(setDeveloper, setIsSetStatusModalOpen, developerData)
+    fn()
+    expect(setDeveloper).toBeCalledWith({ ...developerData })
+    expect(setIsSetStatusModalOpen).toBeCalledWith(true)
+  })
+})
diff --git a/packages/admin-portal/src/components/pages/devs-management/devs-management.tsx b/packages/admin-portal/src/components/pages/devs-management/devs-management.tsx
index 1c98f9ebe5..705a6719c5 100644
--- a/packages/admin-portal/src/components/pages/devs-management/devs-management.tsx
+++ b/packages/admin-portal/src/components/pages/devs-management/devs-management.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react'
+import React from 'react'
 import { History } from 'history'
 import { useDispatch, useSelector } from 'react-redux'
 import { Link } from 'react-router-dom'
@@ -82,6 +82,15 @@ export const onSearchHandler = (history: History<any>) => (
   }
 }
 
+export const onClickStatusButton = (
+  setDeveloper: React.Dispatch<DeveloperModel>,
+  setIsSetStatusModalOpen: React.Dispatch<boolean>,
+  developerData,
+) => () => {
+  setDeveloper({ ...developerData })
+  setIsSetStatusModalOpen(true)
+}
+
 export const DevsManagement: React.FC = () => {
   const dispatch = useDispatch()
   const history = useHistory()
@@ -92,7 +101,7 @@ export const DevsManagement: React.FC = () => {
   const onPageChange = React.useCallback(onPageChangeHandler(history, filterValues), [history, filterValues])
   const onSearch = React.useCallback(onSearchHandler(history), [history])
   const [isSetStatusModalOpen, setIsSetStatusModalOpen] = React.useState(false)
-  const [developer, setDeveloper] = React.useState({} as DeveloperModel)
+  const [developer, setDeveloper] = React.useState<DeveloperModel>({} as DeveloperModel)
 
   const devsManagementState = useSelector(selectDevsManagement)
   const { loading, data } = devsManagementState
@@ -105,6 +114,7 @@ export const DevsManagement: React.FC = () => {
       fetchData({ page: pageNumber, queryString: qs.stringify(filterValues as { name: string; company: string }) })
     }
   }
+
   const pageNo = pageNumber - 1
   const pageNoTimesRevsions = pageNo * REVISIONS_PER_PAGE
   const HeaderCell = ({ row: { index } }) => <div style={{ width: 'auto' }}>{pageNoTimesRevsions + index + 1}</div>
@@ -136,10 +146,7 @@ export const DevsManagement: React.FC = () => {
       <Button
         type="button"
         variant="primary"
-        onClick={() => {
-          setDeveloper({ ...original })
-          setIsSetStatusModalOpen(true)
-        }}
+        onClick={onClickStatusButton(setDeveloper, setIsSetStatusModalOpen, original)}
       >
         Status
       </Button>
diff --git a/packages/admin-portal/src/tests/badges/badge-branches.svg b/packages/admin-portal/src/tests/badges/badge-branches.svg
index 844f4973c1..50de188911 100644
--- a/packages/admin-portal/src/tests/badges/badge-branches.svg
+++ b/packages/admin-portal/src/tests/badges/badge-branches.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="170" height="20" role="img" aria-label="Coverage:branches: 73.57%"><title>Coverage:branches: 73.57%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="170" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="53" height="20" fill="#e05d44"/><rect width="170" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:branches</text><text x="595" y="140" transform="scale(.1)" fill="#fff" textLength="1070">Coverage:branches</text><text aria-hidden="true" x="1425" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">73.57%</text><text x="1425" y="140" transform="scale(.1)" fill="#fff" textLength="430">73.57%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="170" height="20" role="img" aria-label="Coverage:branches: 73.73%"><title>Coverage:branches: 73.73%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="170" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="53" height="20" fill="#e05d44"/><rect width="170" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:branches</text><text x="595" y="140" transform="scale(.1)" fill="#fff" textLength="1070">Coverage:branches</text><text aria-hidden="true" x="1425" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">73.73%</text><text x="1425" y="140" transform="scale(.1)" fill="#fff" textLength="430">73.73%</text></g></svg>
\ No newline at end of file
diff --git a/packages/admin-portal/src/tests/badges/badge-functions.svg b/packages/admin-portal/src/tests/badges/badge-functions.svg
index 070dcdd06c..80a64d5eb3 100644
--- a/packages/admin-portal/src/tests/badges/badge-functions.svg
+++ b/packages/admin-portal/src/tests/badges/badge-functions.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="170" height="20" role="img" aria-label="Coverage:functions: 83.72%"><title>Coverage:functions: 83.72%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="170" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="53" height="20" fill="#dfb317"/><rect width="170" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:functions</text><text x="595" y="140" transform="scale(.1)" fill="#fff" textLength="1070">Coverage:functions</text><text aria-hidden="true" x="1425" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">83.72%</text><text x="1425" y="140" transform="scale(.1)" fill="#fff" textLength="430">83.72%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="170" height="20" role="img" aria-label="Coverage:functions: 83.85%"><title>Coverage:functions: 83.85%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="170" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="53" height="20" fill="#dfb317"/><rect width="170" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:functions</text><text x="595" y="140" transform="scale(.1)" fill="#fff" textLength="1070">Coverage:functions</text><text aria-hidden="true" x="1425" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">83.85%</text><text x="1425" y="140" transform="scale(.1)" fill="#fff" textLength="430">83.85%</text></g></svg>
\ No newline at end of file
diff --git a/packages/admin-portal/src/tests/badges/badge-lines.svg b/packages/admin-portal/src/tests/badges/badge-lines.svg
index efe2e6285d..d88678ebe6 100644
--- a/packages/admin-portal/src/tests/badges/badge-lines.svg
+++ b/packages/admin-portal/src/tests/badges/badge-lines.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="146" height="20" role="img" aria-label="Coverage:lines: 88.58%"><title>Coverage:lines: 88.58%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="146" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="93" height="20" fill="#555"/><rect x="93" width="53" height="20" fill="#dfb317"/><rect width="146" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="475" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="830">Coverage:lines</text><text x="475" y="140" transform="scale(.1)" fill="#fff" textLength="830">Coverage:lines</text><text aria-hidden="true" x="1185" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">88.58%</text><text x="1185" y="140" transform="scale(.1)" fill="#fff" textLength="430">88.58%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="146" height="20" role="img" aria-label="Coverage:lines: 89.01%"><title>Coverage:lines: 89.01%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="146" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="93" height="20" fill="#555"/><rect x="93" width="53" height="20" fill="#dfb317"/><rect width="146" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="475" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="830">Coverage:lines</text><text x="475" y="140" transform="scale(.1)" fill="#fff" textLength="830">Coverage:lines</text><text aria-hidden="true" x="1185" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">89.01%</text><text x="1185" y="140" transform="scale(.1)" fill="#fff" textLength="430">89.01%</text></g></svg>
\ No newline at end of file
diff --git a/packages/admin-portal/src/tests/badges/badge-statements.svg b/packages/admin-portal/src/tests/badges/badge-statements.svg
index f4b37863ca..bcd2fd3498 100644
--- a/packages/admin-portal/src/tests/badges/badge-statements.svg
+++ b/packages/admin-portal/src/tests/badges/badge-statements.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="182" height="20" role="img" aria-label="Coverage:statements: 88.11%"><title>Coverage:statements: 88.11%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="182" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="129" height="20" fill="#555"/><rect x="129" width="53" height="20" fill="#dfb317"/><rect width="182" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="655" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1190">Coverage:statements</text><text x="655" y="140" transform="scale(.1)" fill="#fff" textLength="1190">Coverage:statements</text><text aria-hidden="true" x="1545" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">88.11%</text><text x="1545" y="140" transform="scale(.1)" fill="#fff" textLength="430">88.11%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="182" height="20" role="img" aria-label="Coverage:statements: 88.51%"><title>Coverage:statements: 88.51%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="182" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="129" height="20" fill="#555"/><rect x="129" width="53" height="20" fill="#dfb317"/><rect width="182" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="655" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1190">Coverage:statements</text><text x="655" y="140" transform="scale(.1)" fill="#fff" textLength="1190">Coverage:statements</text><text aria-hidden="true" x="1545" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">88.51%</text><text x="1545" y="140" transform="scale(.1)" fill="#fff" textLength="430">88.51%</text></g></svg>
\ No newline at end of file
diff --git a/packages/developer-portal/src/components/pages/edit-app/__tests__/__snapshots__/general-information-section.test.tsx.snap b/packages/developer-portal/src/components/pages/edit-app/__tests__/__snapshots__/general-information-section.test.tsx.snap
index 4af7006a12..723ffeceae 100644
--- a/packages/developer-portal/src/components/pages/edit-app/__tests__/__snapshots__/general-information-section.test.tsx.snap
+++ b/packages/developer-portal/src/components/pages/edit-app/__tests__/__snapshots__/general-information-section.test.tsx.snap
@@ -87,7 +87,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                           validate={[Function]}
                         >
                           <div
-                            className="field "
+                            className=""
                           >
                             <div
                               className="control "
@@ -99,7 +99,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                                 Name
                               </label>
                               <input
-                                className="input is-primary"
+                                className=""
                                 data-test="submit-app-name"
                                 disabled={false}
                                 id="name"
@@ -191,7 +191,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                           validate={null}
                         >
                           <div
-                            className="field "
+                            className=""
                           >
                             <div
                               className="control "
@@ -203,7 +203,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                                 Support email
                               </label>
                               <input
-                                className="input is-primary"
+                                className=""
                                 data-test="submit-app-support-email"
                                 disabled={false}
                                 id="supportEmail"
@@ -239,7 +239,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                           validate={null}
                         >
                           <div
-                            className="field "
+                            className=""
                           >
                             <div
                               className="control "
@@ -251,7 +251,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                                 Telephone
                               </label>
                               <input
-                                className="input is-primary"
+                                className=""
                                 data-test="submit-app-phone"
                                 disabled={false}
                                 id="telephone"
@@ -294,7 +294,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                           validate={null}
                         >
                           <div
-                            className="field "
+                            className=""
                           >
                             <div
                               className="control "
@@ -306,7 +306,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                                 Home page
                               </label>
                               <input
-                                className="input is-primary"
+                                className=""
                                 data-test="submit-app-home-page"
                                 disabled={false}
                                 id="homePage"
@@ -342,7 +342,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                           validate={null}
                         >
                           <div
-                            className="field "
+                            className=""
                           >
                             <div
                               className="control "
@@ -354,7 +354,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                                 Launch URI
                               </label>
                               <input
-                                className="input is-primary"
+                                className=""
                                 data-test="submit-app-launch-uri"
                                 disabled={false}
                                 id="launchUri"
@@ -597,7 +597,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                           validate={[Function]}
                         >
                           <div
-                            className="field "
+                            className=""
                           >
                             <div
                               className="control "
@@ -609,7 +609,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                                 Name
                               </label>
                               <input
-                                className="input is-primary"
+                                className=""
                                 data-test="submit-app-name"
                                 disabled={false}
                                 id="name"
@@ -701,7 +701,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                           validate={[Function]}
                         >
                           <div
-                            className="field "
+                            className=""
                           >
                             <div
                               className="control "
@@ -713,7 +713,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                                 Support email
                               </label>
                               <input
-                                className="input is-primary"
+                                className=""
                                 data-test="submit-app-support-email"
                                 disabled={false}
                                 id="supportEmail"
@@ -749,7 +749,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                           validate={[Function]}
                         >
                           <div
-                            className="field "
+                            className=""
                           >
                             <div
                               className="control "
@@ -761,7 +761,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                                 Telephone
                               </label>
                               <input
-                                className="input is-primary"
+                                className=""
                                 data-test="submit-app-phone"
                                 disabled={false}
                                 id="telephone"
@@ -804,7 +804,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                           validate={[Function]}
                         >
                           <div
-                            className="field "
+                            className=""
                           >
                             <div
                               className="control "
@@ -816,7 +816,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                                 Home page
                               </label>
                               <input
-                                className="input is-primary"
+                                className=""
                                 data-test="submit-app-home-page"
                                 disabled={false}
                                 id="homePage"
@@ -852,7 +852,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                           validate={[Function]}
                         >
                           <div
-                            className="field "
+                            className=""
                           >
                             <div
                               className="control "
@@ -864,7 +864,7 @@ exports[`GeneralInformationSection should match a snapshot when isListed equal t
                                 Launch URI
                               </label>
                               <input
-                                className="input is-primary"
+                                className=""
                                 data-test="submit-app-launch-uri"
                                 disabled={false}
                                 id="launchUri"
diff --git a/packages/developer-portal/src/components/pages/register/__tests__/__snapshots__/register.test.tsx.snap b/packages/developer-portal/src/components/pages/register/__tests__/__snapshots__/register.test.tsx.snap
index 3002cc7a8e..f3a441f3d3 100644
--- a/packages/developer-portal/src/components/pages/register/__tests__/__snapshots__/register.test.tsx.snap
+++ b/packages/developer-portal/src/components/pages/register/__tests__/__snapshots__/register.test.tsx.snap
@@ -298,7 +298,7 @@ exports[`Register should match a snapshot 1`] = `
                           validate={null}
                         >
                           <div
-                            className="field "
+                            className=""
                           >
                             <div
                               className="control "
@@ -310,7 +310,7 @@ exports[`Register should match a snapshot 1`] = `
                                 Full name
                               </label>
                               <input
-                                className="input is-primary"
+                                className=""
                                 data-test="register-name"
                                 disabled={false}
                                 id="name"
@@ -338,7 +338,7 @@ exports[`Register should match a snapshot 1`] = `
                           validate={null}
                         >
                           <div
-                            className="field "
+                            className=""
                           >
                             <div
                               className="control "
@@ -350,7 +350,7 @@ exports[`Register should match a snapshot 1`] = `
                                 Company name
                               </label>
                               <input
-                                className="input is-primary"
+                                className=""
                                 data-test="register-company-name"
                                 disabled={false}
                                 id="companyName"
@@ -378,7 +378,7 @@ exports[`Register should match a snapshot 1`] = `
                           validate={null}
                         >
                           <div
-                            className="field "
+                            className=""
                           >
                             <div
                               className="control "
@@ -390,7 +390,7 @@ exports[`Register should match a snapshot 1`] = `
                                 Email
                               </label>
                               <input
-                                className="input is-primary"
+                                className=""
                                 data-test="register-email"
                                 disabled={false}
                                 id="email"
@@ -418,7 +418,7 @@ exports[`Register should match a snapshot 1`] = `
                           validate={null}
                         >
                           <div
-                            className="field "
+                            className=""
                           >
                             <div
                               className="control "
@@ -430,7 +430,7 @@ exports[`Register should match a snapshot 1`] = `
                                 Telephone
                               </label>
                               <input
-                                className="input is-primary"
+                                className=""
                                 data-test="register-telephone"
                                 disabled={false}
                                 id="telephone"
diff --git a/packages/developer-portal/src/tests/badges/badge-branches.svg b/packages/developer-portal/src/tests/badges/badge-branches.svg
index 817d1972e9..81e6a0d0da 100644
--- a/packages/developer-portal/src/tests/badges/badge-branches.svg
+++ b/packages/developer-portal/src/tests/badges/badge-branches.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="164" height="20" role="img" aria-label="Coverage:branches: 68.5%"><title>Coverage:branches: 68.5%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="164" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="47" height="20" fill="#e05d44"/><rect width="164" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:branches</text><text x="595" y="140" transform="scale(.1)" fill="#fff" textLength="1070">Coverage:branches</text><text aria-hidden="true" x="1395" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="370">68.5%</text><text x="1395" y="140" transform="scale(.1)" fill="#fff" textLength="370">68.5%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="164" height="20" role="img" aria-label="Coverage:branches: 68.5%"><title>Coverage:branches: 68.5%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="164" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="47" height="20" fill="#e05d44"/><rect width="164" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:branches</text><text x="595" y="140" transform="scale(.1)" fill="#fff" textLength="1070">Coverage:branches</text><text aria-hidden="true" x="1395" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="370">68.5%</text><text x="1395" y="140" transform="scale(.1)" fill="#fff" textLength="370">68.5%</text></g></svg>
\ No newline at end of file
diff --git a/packages/developer-portal/src/tests/badges/badge-functions.svg b/packages/developer-portal/src/tests/badges/badge-functions.svg
index c3e2333d83..24abdd06a1 100644
--- a/packages/developer-portal/src/tests/badges/badge-functions.svg
+++ b/packages/developer-portal/src/tests/badges/badge-functions.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="170" height="20" role="img" aria-label="Coverage:functions: 80.81%"><title>Coverage:functions: 80.81%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="170" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="53" height="20" fill="#dfb317"/><rect width="170" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:functions</text><text x="595" y="140" transform="scale(.1)" fill="#fff" textLength="1070">Coverage:functions</text><text aria-hidden="true" x="1425" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">80.81%</text><text x="1425" y="140" transform="scale(.1)" fill="#fff" textLength="430">80.81%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="170" height="20" role="img" aria-label="Coverage:functions: 80.81%"><title>Coverage:functions: 80.81%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="170" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="53" height="20" fill="#dfb317"/><rect width="170" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:functions</text><text x="595" y="140" transform="scale(.1)" fill="#fff" textLength="1070">Coverage:functions</text><text aria-hidden="true" x="1425" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">80.81%</text><text x="1425" y="140" transform="scale(.1)" fill="#fff" textLength="430">80.81%</text></g></svg>
\ No newline at end of file
diff --git a/packages/developer-portal/src/tests/badges/badge-lines.svg b/packages/developer-portal/src/tests/badges/badge-lines.svg
index ad14152d55..b937fc2bbc 100644
--- a/packages/developer-portal/src/tests/badges/badge-lines.svg
+++ b/packages/developer-portal/src/tests/badges/badge-lines.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="146" height="20" role="img" aria-label="Coverage:lines: 89.88%"><title>Coverage:lines: 89.88%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="146" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="93" height="20" fill="#555"/><rect x="93" width="53" height="20" fill="#dfb317"/><rect width="146" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="475" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="830">Coverage:lines</text><text x="475" y="140" transform="scale(.1)" fill="#fff" textLength="830">Coverage:lines</text><text aria-hidden="true" x="1185" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">89.88%</text><text x="1185" y="140" transform="scale(.1)" fill="#fff" textLength="430">89.88%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="146" height="20" role="img" aria-label="Coverage:lines: 89.88%"><title>Coverage:lines: 89.88%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="146" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="93" height="20" fill="#555"/><rect x="93" width="53" height="20" fill="#dfb317"/><rect width="146" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="475" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="830">Coverage:lines</text><text x="475" y="140" transform="scale(.1)" fill="#fff" textLength="830">Coverage:lines</text><text aria-hidden="true" x="1185" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">89.88%</text><text x="1185" y="140" transform="scale(.1)" fill="#fff" textLength="430">89.88%</text></g></svg>
\ No newline at end of file
diff --git a/packages/developer-portal/src/tests/badges/badge-statements.svg b/packages/developer-portal/src/tests/badges/badge-statements.svg
index fd13e55bf7..cbbc103189 100644
--- a/packages/developer-portal/src/tests/badges/badge-statements.svg
+++ b/packages/developer-portal/src/tests/badges/badge-statements.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="164" height="20" role="img" aria-label="Coverage:statements: 89%"><title>Coverage:statements: 89%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="164" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="129" height="20" fill="#555"/><rect x="129" width="35" height="20" fill="#dfb317"/><rect width="164" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="655" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1190">Coverage:statements</text><text x="655" y="140" transform="scale(.1)" fill="#fff" textLength="1190">Coverage:statements</text><text aria-hidden="true" x="1455" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="250">89%</text><text x="1455" y="140" transform="scale(.1)" fill="#fff" textLength="250">89%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="164" height="20" role="img" aria-label="Coverage:statements: 89%"><title>Coverage:statements: 89%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="164" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="129" height="20" fill="#555"/><rect x="129" width="35" height="20" fill="#dfb317"/><rect width="164" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="655" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1190">Coverage:statements</text><text x="655" y="140" transform="scale(.1)" fill="#fff" textLength="1190">Coverage:statements</text><text aria-hidden="true" x="1455" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="250">89%</text><text x="1455" y="140" transform="scale(.1)" fill="#fff" textLength="250">89%</text></g></svg>
\ No newline at end of file
diff --git a/packages/elements/src/components/Input/index.tsx b/packages/elements/src/components/Input/index.tsx
index 790e1e9b2f..3ace2b1d0e 100644
--- a/packages/elements/src/components/Input/index.tsx
+++ b/packages/elements/src/components/Input/index.tsx
@@ -2,6 +2,7 @@ import * as React from 'react'
 import { Field, FieldProps } from 'formik'
 import { checkError } from '../../utils/form'
 import { fieldValidateRequire } from '../../utils/validators'
+import { cx } from 'linaria'
 
 export interface InputProps {
   type: 'text' | 'password' | 'email' | 'tel' | 'hidden' | 'time'
@@ -40,7 +41,7 @@ export const Input = ({
       const inputClassName = hasError ? 'input is-danger' : 'input is-primary'
       const defaultValue = ''
       return (
-        <div className={`field ${className}`}>
+        <div className={cx('field', className)}>
           <div className={`control ${rightIcon ? 'has-icons-right' : ''}`}>
             {type !== 'hidden' && !rightIcon && labelText && (
               <label className={`label inline-block ${required ? 'required-label' : ''}`} htmlFor={id}>
@@ -56,7 +57,7 @@ export const Input = ({
               type={type}
               id={id}
               placeholder={placeholder}
-              className={inputClassName}
+              className={cx(inputClassName)}
               {...field}
               value={field.value || defaultValue}
               maxLength={maxLength}
diff --git a/packages/elements/src/components/ModalV2/index.tsx b/packages/elements/src/components/ModalV2/index.tsx
index 5ced4fb7f3..0a42b7d883 100644
--- a/packages/elements/src/components/ModalV2/index.tsx
+++ b/packages/elements/src/components/ModalV2/index.tsx
@@ -8,11 +8,19 @@ export interface ModalProps extends IDialogPropTypes {
   isCentered?: boolean
 }
 
-export const Modal: React.FC<ModalProps> = ({ children, className, wrapClassName, isCentered, ...restProps }) => {
-  const centeredModal = isCentered && modalCentered
-
+export const Modal: React.FC<ModalProps> = ({
+  children,
+  className,
+  wrapClassName,
+  isCentered = false,
+  ...restProps
+}) => {
   return (
-    <Dialog {...restProps} className={cx(modalContainer, className)} wrapClassName={cx(wrapClassName, centeredModal)}>
+    <Dialog
+      {...restProps}
+      className={cx(modalContainer, className)}
+      wrapClassName={cx(isCentered && modalCentered, wrapClassName)}
+    >
       {children}
     </Dialog>
   )
diff --git a/packages/elements/src/tests/badges/badge-functions.svg b/packages/elements/src/tests/badges/badge-functions.svg
index a4a6949cc6..7d5a6be7c3 100644
--- a/packages/elements/src/tests/badges/badge-functions.svg
+++ b/packages/elements/src/tests/badges/badge-functions.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="170" height="20" role="img" aria-label="Coverage:functions: 95.14%"><title>Coverage:functions: 95.14%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="170" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="53" height="20" fill="#4c1"/><rect width="170" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:functions</text><text x="595" y="140" transform="scale(.1)" fill="#fff" textLength="1070">Coverage:functions</text><text aria-hidden="true" x="1425" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">95.14%</text><text x="1425" y="140" transform="scale(.1)" fill="#fff" textLength="430">95.14%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="170" height="20" role="img" aria-label="Coverage:functions: 95.14%"><title>Coverage:functions: 95.14%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="170" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="53" height="20" fill="#4c1"/><rect width="170" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:functions</text><text x="595" y="140" transform="scale(.1)" fill="#fff" textLength="1070">Coverage:functions</text><text aria-hidden="true" x="1425" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">95.14%</text><text x="1425" y="140" transform="scale(.1)" fill="#fff" textLength="430">95.14%</text></g></svg>
\ No newline at end of file
diff --git a/packages/elements/src/tests/badges/badge-lines.svg b/packages/elements/src/tests/badges/badge-lines.svg
index d0c28863cc..9928468949 100644
--- a/packages/elements/src/tests/badges/badge-lines.svg
+++ b/packages/elements/src/tests/badges/badge-lines.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="146" height="20" role="img" aria-label="Coverage:lines: 95.31%"><title>Coverage:lines: 95.31%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="146" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="93" height="20" fill="#555"/><rect x="93" width="53" height="20" fill="#4c1"/><rect width="146" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="475" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="830">Coverage:lines</text><text x="475" y="140" transform="scale(.1)" fill="#fff" textLength="830">Coverage:lines</text><text aria-hidden="true" x="1185" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">95.31%</text><text x="1185" y="140" transform="scale(.1)" fill="#fff" textLength="430">95.31%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="146" height="20" role="img" aria-label="Coverage:lines: 95.31%"><title>Coverage:lines: 95.31%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="146" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="93" height="20" fill="#555"/><rect x="93" width="53" height="20" fill="#4c1"/><rect width="146" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="475" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="830">Coverage:lines</text><text x="475" y="140" transform="scale(.1)" fill="#fff" textLength="830">Coverage:lines</text><text aria-hidden="true" x="1185" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">95.31%</text><text x="1185" y="140" transform="scale(.1)" fill="#fff" textLength="430">95.31%</text></g></svg>
\ No newline at end of file
diff --git a/packages/elements/src/tests/badges/badge-statements.svg b/packages/elements/src/tests/badges/badge-statements.svg
index a64b0e6895..2cd172fcac 100644
--- a/packages/elements/src/tests/badges/badge-statements.svg
+++ b/packages/elements/src/tests/badges/badge-statements.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="182" height="20" role="img" aria-label="Coverage:statements: 95.03%"><title>Coverage:statements: 95.03%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="182" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="129" height="20" fill="#555"/><rect x="129" width="53" height="20" fill="#4c1"/><rect width="182" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="655" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1190">Coverage:statements</text><text x="655" y="140" transform="scale(.1)" fill="#fff" textLength="1190">Coverage:statements</text><text aria-hidden="true" x="1545" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">95.03%</text><text x="1545" y="140" transform="scale(.1)" fill="#fff" textLength="430">95.03%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="182" height="20" role="img" aria-label="Coverage:statements: 95.03%"><title>Coverage:statements: 95.03%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="182" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="129" height="20" fill="#555"/><rect x="129" width="53" height="20" fill="#4c1"/><rect width="182" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="655" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1190">Coverage:statements</text><text x="655" y="140" transform="scale(.1)" fill="#fff" textLength="1190">Coverage:statements</text><text aria-hidden="true" x="1545" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">95.03%</text><text x="1545" y="140" transform="scale(.1)" fill="#fff" textLength="430">95.03%</text></g></svg>
\ No newline at end of file
diff --git a/packages/smb-onboarder/src/tests/badges/badge-branches.svg b/packages/smb-onboarder/src/tests/badges/badge-branches.svg
index 1f51d0e9c9..c50158d765 100644
--- a/packages/smb-onboarder/src/tests/badges/badge-branches.svg
+++ b/packages/smb-onboarder/src/tests/badges/badge-branches.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="170" height="20" role="img" aria-label="Coverage:branches: 63.08%"><title>Coverage:branches: 63.08%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="170" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="53" height="20" fill="#e05d44"/><rect width="170" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:branches</text><text x="595" y="140" transform="scale(.1)" fill="#fff" textLength="1070">Coverage:branches</text><text aria-hidden="true" x="1425" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">63.08%</text><text x="1425" y="140" transform="scale(.1)" fill="#fff" textLength="430">63.08%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="170" height="20" role="img" aria-label="Coverage:branches: 63.08%"><title>Coverage:branches: 63.08%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="170" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="53" height="20" fill="#e05d44"/><rect width="170" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:branches</text><text x="595" y="140" transform="scale(.1)" fill="#fff" textLength="1070">Coverage:branches</text><text aria-hidden="true" x="1425" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">63.08%</text><text x="1425" y="140" transform="scale(.1)" fill="#fff" textLength="430">63.08%</text></g></svg>
\ No newline at end of file
diff --git a/packages/smb-onboarder/src/tests/badges/badge-functions.svg b/packages/smb-onboarder/src/tests/badges/badge-functions.svg
index a854a50baa..06b25a161a 100644
--- a/packages/smb-onboarder/src/tests/badges/badge-functions.svg
+++ b/packages/smb-onboarder/src/tests/badges/badge-functions.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="170" height="20" role="img" aria-label="Coverage:functions: 75.44%"><title>Coverage:functions: 75.44%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="170" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="53" height="20" fill="#e05d44"/><rect width="170" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:functions</text><text x="595" y="140" transform="scale(.1)" fill="#fff" textLength="1070">Coverage:functions</text><text aria-hidden="true" x="1425" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">75.44%</text><text x="1425" y="140" transform="scale(.1)" fill="#fff" textLength="430">75.44%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="170" height="20" role="img" aria-label="Coverage:functions: 75.44%"><title>Coverage:functions: 75.44%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="170" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="53" height="20" fill="#e05d44"/><rect width="170" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:functions</text><text x="595" y="140" transform="scale(.1)" fill="#fff" textLength="1070">Coverage:functions</text><text aria-hidden="true" x="1425" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">75.44%</text><text x="1425" y="140" transform="scale(.1)" fill="#fff" textLength="430">75.44%</text></g></svg>
\ No newline at end of file
diff --git a/packages/smb-onboarder/src/tests/badges/badge-lines.svg b/packages/smb-onboarder/src/tests/badges/badge-lines.svg
index d4e0288c6d..bb1c7a1167 100644
--- a/packages/smb-onboarder/src/tests/badges/badge-lines.svg
+++ b/packages/smb-onboarder/src/tests/badges/badge-lines.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="146" height="20" role="img" aria-label="Coverage:lines: 91.51%"><title>Coverage:lines: 91.51%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="146" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="93" height="20" fill="#555"/><rect x="93" width="53" height="20" fill="#4c1"/><rect width="146" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="475" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="830">Coverage:lines</text><text x="475" y="140" transform="scale(.1)" fill="#fff" textLength="830">Coverage:lines</text><text aria-hidden="true" x="1185" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">91.51%</text><text x="1185" y="140" transform="scale(.1)" fill="#fff" textLength="430">91.51%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="146" height="20" role="img" aria-label="Coverage:lines: 91.51%"><title>Coverage:lines: 91.51%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="146" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="93" height="20" fill="#555"/><rect x="93" width="53" height="20" fill="#4c1"/><rect width="146" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="475" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="830">Coverage:lines</text><text x="475" y="140" transform="scale(.1)" fill="#fff" textLength="830">Coverage:lines</text><text aria-hidden="true" x="1185" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">91.51%</text><text x="1185" y="140" transform="scale(.1)" fill="#fff" textLength="430">91.51%</text></g></svg>
\ No newline at end of file
diff --git a/packages/smb-onboarder/src/tests/badges/badge-statements.svg b/packages/smb-onboarder/src/tests/badges/badge-statements.svg
index e648930eb8..e1085b2e21 100644
--- a/packages/smb-onboarder/src/tests/badges/badge-statements.svg
+++ b/packages/smb-onboarder/src/tests/badges/badge-statements.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="182" height="20" role="img" aria-label="Coverage:statements: 90.11%"><title>Coverage:statements: 90.11%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="182" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="129" height="20" fill="#555"/><rect x="129" width="53" height="20" fill="#4c1"/><rect width="182" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="655" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1190">Coverage:statements</text><text x="655" y="140" transform="scale(.1)" fill="#fff" textLength="1190">Coverage:statements</text><text aria-hidden="true" x="1545" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">90.11%</text><text x="1545" y="140" transform="scale(.1)" fill="#fff" textLength="430">90.11%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="182" height="20" role="img" aria-label="Coverage:statements: 90.11%"><title>Coverage:statements: 90.11%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="182" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="129" height="20" fill="#555"/><rect x="129" width="53" height="20" fill="#4c1"/><rect width="182" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="655" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1190">Coverage:statements</text><text x="655" y="140" transform="scale(.1)" fill="#fff" textLength="1190">Coverage:statements</text><text aria-hidden="true" x="1545" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">90.11%</text><text x="1545" y="140" transform="scale(.1)" fill="#fff" textLength="430">90.11%</text></g></svg>
\ No newline at end of file