diff --git a/Makefile b/Makefile
index 80b1372c..46a234d4 100644
--- a/Makefile
+++ b/Makefile
@@ -3,23 +3,16 @@
 build: test
 
 lint:
-	deno lint --ignore=docs/,debug/
+	deno lint
 
 test: clean
-	deno test --allow-all --parallel --reload --quiet --coverage=coverage core/tests/ jetstream/tests kv/tests/ obj/tests/ services/tests/
-	deno test --allow-all --parallel --reload --quiet --unsafely-ignore-certificate-errors --coverage=coverage core/unsafe_tests/
-
-
-testw: clean
-	deno test --allow-all --unstable --reload --parallel --watch --fail-fast tests/ jetstream/ kv/tests/ obj/tests/ services/tests/
+	deno task test
 
 cover:
-	deno coverage --unstable ./coverage --lcov > ./coverage/out.lcov
-	genhtml -o ./coverage/html ./coverage/out.lcov
-	open ./coverage/html/index.html
+	deno task cover
 
 clean:
-	rm -rf ./coverage
+	deno task clean
 
 bundle:
 	deno bundle --log-level info --unstable src/mod.ts ./nats.js
@@ -30,4 +23,4 @@ bundle:
 
 
 fmt:
-	deno fmt transport-deno/ doc/ bin/ core/ examples/ tests/ debug/ unsafe_tests/ jetstream/ kv/ obj/ services/ test_helpers/ jetstream.md README.md migration.md services.md
+	deno fmt
\ No newline at end of file
diff --git a/deno.json b/deno.json
index ebfe377f..8d77635b 100644
--- a/deno.json
+++ b/deno.json
@@ -14,7 +14,7 @@
     "test-kv": "deno test -A --parallel --reload --quiet --coverage=coverage kv/tests",
     "test-obj": "deno test -A --parallel --reload --quiet --coverage=coverage obj/tests",
     "test-services": "deno test -A --parallel --reload --quiet --coverage=coverage services/tests",
-    "cover": "deno coverage --unstable ./coverage --lcov > ./coverage/out.lcov && genhtml -o ./coverage/html ./coverage/out.lcov && open ./coverage/html/index.html",
+    "cover": "deno coverage ./coverage --lcov > ./coverage/out.lcov && genhtml -o ./coverage/html ./coverage/out.lcov && open ./coverage/html/index.html",
     "lint": "deno task lint-core && deno task lint-jetstream && deno task lint-kv && deno task lint-obj && deno task lint-services && deno task lint-test_helpers",
     "lint-core": "cd core && deno lint",
     "lint-jetstream": "cd jetstream && deno lint",