diff --git a/package.json b/package.json
index 2539960..1dabf65 100644
--- a/package.json
+++ b/package.json
@@ -7,9 +7,9 @@
     "@babel/code-frame": "^7.10.4",
     "@babel/helper-split-export-declaration": "^7.11.0",
     "@craco/craco": "^6.1.1",
-    "@testing-library/jest-dom": "^5.11.4",
-    "@testing-library/react": "^11.1.0",
-    "@testing-library/user-event": "^12.1.10",
+    "@testing-library/jest-dom": "^4.2.4",
+    "@testing-library/react": "^9.3.2",
+    "@testing-library/user-event": "^7.1.2",
     "antd": "^4.15.0",
     "axios": "^0.21.1",
     "craco-less": "^1.17.1",
@@ -34,13 +34,10 @@
     "validator": "^13.5.2"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.22",
+    "@types/jest": "^26.0.15",
     "@types/lodash": "^4.14.168",
     "@types/luxon": "^1.26.3",
-    "@types/node": "^14.14.40",
     "@types/pluralize": "^0.0.29",
-    "@types/react": "^17.0.3",
-    "@types/react-dom": "^17.0.3",
     "@types/react-router-dom": "^5.1.7",
     "@types/styled-components": "^5.1.9",
     "@types/styled-system": "^5.1.11",
@@ -59,10 +56,7 @@
     "eslint:fix": "eslint ./src --fix"
   },
   "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
+    "extends": "react-app"
   },
   "browserslist": {
     "production": [
diff --git a/src/setupTests.ts b/src/setupTests.ts
index b11125c..74b1a27 100644
--- a/src/setupTests.ts
+++ b/src/setupTests.ts
@@ -2,5 +2,4 @@
 // allows you to do things like:
 // expect(element).toHaveTextContent(/react/i)
 // learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom';
-
+import '@testing-library/jest-dom/extend-expect';
diff --git a/tsconfig.json b/tsconfig.json
index 2cb5c08..7e37103 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,5 +21,5 @@
     "noFallthroughCasesInSwitch": true
   },
   "include": ["src", "src/client"],
-  "exclude": ["./node_modules/**/*"]
+  "exclude": ["src/server", "./node_modules/**/*"]
 }