diff --git a/makefile b/makefile
index 69e566789..1fb5dace8 100644
--- a/makefile
+++ b/makefile
@@ -2,9 +2,9 @@ build:
 	@printf "\033[0;32m>>> Build packages\033[0m\n"
 	pnpm build
 
-demo:
-	@printf "\033[0;32m>>> Running demo-app\033[0m\n"
-	cd apps/demo && make run
+demo: run
+
+dev: run
 
 install:
 	@printf "\033[0;32m>>> Installing dependencies\033[0m\n"
@@ -30,6 +30,10 @@ release:
 	@printf "\033[0;32m>>> Prepare packages for release033[0m\n"
 	npx shipjs prepare
 
+run:
+	@printf "\033[0;32m>>> Run demo app\033[0m\n"
+	pnpm dev
+
 snapshot-update:
 	@printf "\033[0;32m>>> Update snapshot files\033[0m\n"
 	pnpm -r run snapshot:update
@@ -54,6 +58,10 @@ test.unit:
 	@printf "\033[0;32m>>> Running unit tests\033[0m\n"
 	pnpm test:unit
 
+test.watch:
+	@printf "\033[0;32m>>> Watch running tests\033[0m\n"
+	pnpm test:watch
+
 typecheck:
 	@printf "\033[0;32m>>> Running Type check\033[0m\n"
 	pnpm typecheck
diff --git a/package.json b/package.json
index 7cce0b5ef..12f7fa828 100644
--- a/package.json
+++ b/package.json
@@ -3,11 +3,16 @@
   "version": "0.72.1",
   "scripts": {
     "build": "turbo run build",
+    "dev": "turbo run dev",
     "lint": "turbo run lint",
     "lint:fix": "turbo run lint:fix",
-    "prepare": "husky",
+    "prepare": "husky install",
     "sort-package": "npx sort-package-json && turbo run sort-package",
     "test": "turbo run test --parallel",
+    "test:ci": "turbo run test:ci --parallel",
+    "test:integration": "turbo run test:integration --parallel",
+    "test:unit": "turbo run test:unit --parallel",
+    "test:watch": "turbo run test:watch --parallel",
     "typecheck": "turbo run typecheck"
   },
   "devDependencies": {
diff --git a/packages/config/package.json b/packages/config/package.json
index 89e7c6a54..ee64c0561 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -20,11 +20,13 @@
     "build": "vite build && tsc --emitDeclarationOnly",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
+    "snapshot:update": "vitest --environment jsdom run --update --passWithNoTests",
     "sort-package": "npx sort-package-json",
     "test": "vitest --environment jsdom run --coverage --passWithNoTests",
     "test:component": "vitest --environment jsdom run component/ --passWithNoTests",
     "test:snapshot": "vitest --environment jsdom run snapshot/ --passWithNoTests",
     "test:unit": "vitest --environment jsdom run unit/ --passWithNoTests",
+    "test:watch": "vitest --environment jsdom",
     "typecheck": "tsc --noEmit -p tsconfig.vitest.json --composite false"
   },
   "devDependencies": {
diff --git a/packages/form/package.json b/packages/form/package.json
index 572dade0d..63a234004 100644
--- a/packages/form/package.json
+++ b/packages/form/package.json
@@ -18,12 +18,13 @@
     "build": "vite build && tsc --emitDeclarationOnly",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "snapshot:update": "vitest --environment jsdom run --update",
+    "snapshot:update": "vitest --environment jsdom run --update --passWithNoTests",
     "sort-package": "npx sort-package-json",
     "test": "vitest --environment jsdom run --coverage",
     "test:component": "vitest --environment jsdom run component/",
     "test:snapshot": "vitest --environment jsdom run snapshot/",
     "test:unit": "vitest --environment jsdom run unit/",
+    "test:watch": "vitest --environment jsdom",
     "typecheck": "tsc --noEmit -p tsconfig.vitest.json --composite false"
   },
   "dependencies": {
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index e5b10d35e..f0ae64b8a 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -18,13 +18,13 @@
     "build": "vite build && tsc --emitDeclarationOnly",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "snapshot:update": "vitest --environment jsdom run --update",
+    "snapshot:update": "vitest --environment jsdom run --update --passWithNoTests",
     "sort-package": "npx sort-package-json",
     "test": "vitest --environment jsdom run --coverage",
     "test:component": "vitest --environment jsdom run component/",
     "test:snapshot": "vitest --environment jsdom run snapshot/",
     "test:unit": "vitest --environment jsdom run unit/",
-    "test:watch": "vitest",
+    "test:watch": "vitest --environment jsdom",
     "typecheck": "tsc --noEmit -p tsconfig.vitest.json --composite false"
   },
   "dependencies": {
diff --git a/packages/layout/package.json b/packages/layout/package.json
index 51dc75bb5..a993e9b38 100644
--- a/packages/layout/package.json
+++ b/packages/layout/package.json
@@ -18,12 +18,13 @@
     "build": "vite build && tsc --emitDeclarationOnly",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "snapshot:update": "vitest --environment jsdom run --update",
+    "snapshot:update": "vitest --environment jsdom run --update --passWithNoTests",
     "sort-package": "npx sort-package-json",
     "test": "vitest --environment jsdom run --coverage",
     "test:component": "vitest --environment jsdom run component/",
     "test:snapshot": "vitest --environment jsdom run snapshot/",
     "test:unit": "vitest --environment jsdom run unit/",
+    "test:watch": "vitest --environment jsdom",
     "typecheck": "tsc --noEmit -p tsconfig.vitest.json --composite false"
   },
   "devDependencies": {
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 50711dab4..000b33233 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -21,12 +21,13 @@
     "build": "vite build && tsc --emitDeclarationOnly",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "snapshot:update": "vitest --environment jsdom run --update",
+    "snapshot:update": "vitest --environment jsdom run --update --passWithNoTests",
     "sort-package": "npx sort-package-json",
     "test": "vitest --environment jsdom run --coverage",
     "test:component": "vitest --environment jsdom run component/",
     "test:snapshot": "vitest --environment jsdom run snapshot/",
     "test:unit": "vitest --environment jsdom run unit/",
+    "test:watch": "vitest --environment jsdom",
     "typecheck": "tsc --noEmit -p tsconfig.vitest.json --composite false"
   },
   "dependencies": {
diff --git a/packages/user/package.json b/packages/user/package.json
index 5ab5e078f..2d25bddf9 100644
--- a/packages/user/package.json
+++ b/packages/user/package.json
@@ -18,12 +18,13 @@
     "build": "vite build && tsc --emitDeclarationOnly",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "snapshot:update": "vitest --environment jsdom run --update",
+    "snapshot:update": "vitest --environment jsdom run --update --passWithNoTests",
     "sort-package": "npx sort-package-json",
     "test": "pnpm build && vitest --environment jsdom run --coverage",
     "test:component": "vitest --environment jsdom run component/",
     "test:snapshot": "vitest --environment jsdom run snapshot/",
     "test:unit": "vitest --environment jsdom run unit/",
+    "test:watch": "vitest --environment jsdom",
     "typecheck": "tsc --noEmit -p tsconfig.vitest.json --composite false"
   },
   "dependencies": {
diff --git a/turbo.json b/turbo.json
index d084b05c5..47d6dcd5e 100644
--- a/turbo.json
+++ b/turbo.json
@@ -9,7 +9,13 @@
         "dist/**"
       ]
     },
+    "dev": {
+      "cache": false,
+      "persistent": true,
+      "outputs": []
+    },
     "lint": {
+      "env": ["NODE_ENV", "BASE_URL"],
       "outputs": []
     },
     "lint:fix": {
@@ -39,6 +45,9 @@
     "test:unit": {
       "outputs": []
     },
+    "test:watch": {
+      "outputs": []
+    },
     "typecheck": {
       "outputs": []
     }