diff --git a/avocADO/src/main/scala/macros.scala b/avocADO/src/main/scala/macros.scala
index 6459bf0..42891b0 100644
--- a/avocADO/src/main/scala/macros.scala
+++ b/avocADO/src/main/scala/macros.scala
@@ -7,7 +7,7 @@ import scala.quoted.*
 private[avocado] object macros {
 
   def adoImpl[F[_]: Type, A: Type](compExpr: Expr[F[A]], instanceExpr: Expr[AvocADO[F]])(using Quotes): Expr[F[A]] =
-    ADOImpl(using quotes).adoImpl(compExpr, instanceExpr)
+    new ADOImpl(using quotes).adoImpl(compExpr, instanceExpr)
 
   class ADOImpl(using Quotes) {
     import quotes.reflect.*
diff --git a/avocADO/src/test/scala/FutureTests.scala b/avocADO/src/test/scalajvm/FutureTests.scala
similarity index 100%
rename from avocADO/src/test/scala/FutureTests.scala
rename to avocADO/src/test/scalajvm/FutureTests.scala
diff --git a/build.sbt b/build.sbt
index 143f9e1..98895d3 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,5 +1,7 @@
 val scala3 = "3.2.0"
 
+Global / concurrentRestrictions += Tags.limit(Tags.All, 1)
+
 val commonSettings = Seq(
   organization := "org.virtuslab",
   description := "Safe compile-time parallelization of for-comprehensions for Scala 3",
@@ -22,7 +24,7 @@ val commonSettings = Seq(
     "-feature"
   ),
   libraryDependencies ++= Seq(
-    "org.scalameta" %%% "munit" % "0.7.29" % Test
+    "org.scalameta" %%% "munit" % "1.0.0-M6" % Test
   )
 )
 
@@ -47,6 +49,8 @@ lazy val avocado = projectMatrix
     name := "avocADO"
   )
   .jvmPlatform(scalaVersions = List(scala3))
+  .jsPlatform(scalaVersions = Seq(scala3))
+  .nativePlatform(scalaVersions = Seq(scala3))
 
 lazy val cats = projectMatrix
   .in(file("cats"))
@@ -54,12 +58,14 @@ lazy val cats = projectMatrix
   .settings(
     name := "avocADO-cats",
     libraryDependencies ++= Seq(
-      "org.typelevel" %% "cats-core" % "2.8.0",
+      "org.typelevel" %%% "cats-core" % "2.8.0",
       "org.typelevel" %%% "cats-effect" % "3.3.14" % Test
     )
   )
   .dependsOn(avocado)
   .jvmPlatform(scalaVersions = List(scala3))
+  .jsPlatform(scalaVersions = Seq(scala3))
+  .nativePlatform(scalaVersions = Seq(scala3))
 
 lazy val zio2 = projectMatrix
   .in(file("zio-2"))
@@ -67,11 +73,14 @@ lazy val zio2 = projectMatrix
   .settings(
     name := "avocADO-zio-2",
     libraryDependencies ++= Seq(
-      "dev.zio" %%% "zio" % "2.0.0"
+      "dev.zio" %%% "zio" % "2.0.2"
     )
   )
   .dependsOn(avocado)
   .jvmPlatform(scalaVersions = List(scala3))
+  .jsPlatform(scalaVersions = Seq(scala3))
+  .nativePlatform(scalaVersions = Seq(scala3))
+
 
 lazy val zio1 = projectMatrix
   .in(file("zio-1"))
@@ -79,8 +88,10 @@ lazy val zio1 = projectMatrix
   .settings(
     name := "avocADO-zio-1",
     libraryDependencies ++= Seq(
-      "dev.zio" %% "zio" % "1.0.17"
+      "dev.zio" %%% "zio" % "1.0.17"
     )
   )
   .dependsOn(avocado)
   .jvmPlatform(scalaVersions = List(scala3))
+  .jsPlatform(scalaVersions = Seq(scala3))
+  .nativePlatform(scalaVersions = Seq(scala3))
diff --git a/cats/src/test/scala/BaseCatsEffect3Test.scala b/cats/src/test/scalajvm/BaseCatsEffect3Test.scala
similarity index 100%
rename from cats/src/test/scala/BaseCatsEffect3Test.scala
rename to cats/src/test/scalajvm/BaseCatsEffect3Test.scala
diff --git a/cats/src/test/scala/CatsEffect3TCTests.scala b/cats/src/test/scalajvm/CatsEffect3TCTests.scala
similarity index 100%
rename from cats/src/test/scala/CatsEffect3TCTests.scala
rename to cats/src/test/scalajvm/CatsEffect3TCTests.scala
diff --git a/cats/src/test/scala/CatsEffect3Tests.scala b/cats/src/test/scalajvm/CatsEffect3Tests.scala
similarity index 100%
rename from cats/src/test/scala/CatsEffect3Tests.scala
rename to cats/src/test/scalajvm/CatsEffect3Tests.scala
diff --git a/zio-1/src/test/scala/BaseZIO1Test.scala b/zio-1/src/test/scalajvm/BaseZIO1Test.scala
similarity index 100%
rename from zio-1/src/test/scala/BaseZIO1Test.scala
rename to zio-1/src/test/scalajvm/BaseZIO1Test.scala
diff --git a/zio-1/src/test/scala/ZIO1Tests.scala b/zio-1/src/test/scalajvm/ZIO1Tests.scala
similarity index 100%
rename from zio-1/src/test/scala/ZIO1Tests.scala
rename to zio-1/src/test/scalajvm/ZIO1Tests.scala
diff --git a/zio-2/src/test/scala/BaseZIO2Test.scala b/zio-2/src/test/scalajvm/BaseZIO2Test.scala
similarity index 100%
rename from zio-2/src/test/scala/BaseZIO2Test.scala
rename to zio-2/src/test/scalajvm/BaseZIO2Test.scala
diff --git a/zio-2/src/test/scala/ZIO2Tests.scala b/zio-2/src/test/scalajvm/ZIO2Tests.scala
similarity index 100%
rename from zio-2/src/test/scala/ZIO2Tests.scala
rename to zio-2/src/test/scalajvm/ZIO2Tests.scala