diff --git a/package.json b/package.json
index 20b4633..96d243a 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,6 @@
   },
   "dependencies": {
     "@oceanprotocol/squid": "^0.2.7",
-    "@types/classnames": "^2.2.7",
     "classnames": "^2.2.6",
     "react": "^16.7.0",
     "react-dom": "^16.7.0",
@@ -24,6 +23,7 @@
     "web3": "^1.0.0-beta.37"
   },
   "devDependencies": {
+    "@types/classnames": "^2.2.7",
     "@types/jest": "23.3.12",
     "@types/node": "10.12.18",
     "@types/react": "16.7.20",
diff --git a/src/components/atoms/Button.test.js b/src/components/atoms/Button.test.tsx
similarity index 86%
rename from src/components/atoms/Button.test.js
rename to src/components/atoms/Button.test.tsx
index 2be2aef..9155bc9 100644
--- a/src/components/atoms/Button.test.js
+++ b/src/components/atoms/Button.test.tsx
@@ -7,7 +7,7 @@ it('Button renders without crashing', () => {
     ReactDOM.render(
         <>
             <Button>I am a button</Button>
-            <Button primary="true">I am a primary button</Button>
+            <Button primary={true}>I am a primary button</Button>
             <Button href="https://hello.com">I am a button</Button>
         </>,
         div
diff --git a/src/components/atoms/Form/Help.test.js b/src/components/atoms/Form/Help.test.tsx
similarity index 100%
rename from src/components/atoms/Form/Help.test.js
rename to src/components/atoms/Form/Help.test.tsx
diff --git a/src/components/atoms/Form/Label.tsx b/src/components/atoms/Form/Label.tsx
index 38b1592..0774e92 100644
--- a/src/components/atoms/Form/Label.tsx
+++ b/src/components/atoms/Form/Label.tsx
@@ -12,8 +12,8 @@ const Label = ({
 }) => (
     <label
         className={required ? styles.required : styles.label}
-        {...props}
         title={required ? 'Required' : ''}
+        {...props}
     >
         {children}
     </label>