diff --git a/generators/chipyard/src/main/scala/config/RadianceConfigs.scala b/generators/chipyard/src/main/scala/config/RadianceConfigs.scala
index 2fe22774..12c5c9af 100644
--- a/generators/chipyard/src/main/scala/config/RadianceConfigs.scala
+++ b/generators/chipyard/src/main/scala/config/RadianceConfigs.scala
@@ -53,7 +53,7 @@ class RadianceBaseConfig extends Config(
 
 class RadianceFP16ClusterConfig extends Config(
   new radiance.subsystem.WithRadianceGemmini(location = InCluster(0), dim = 16, accSizeInKB = 64, tileSize = (8, 4, 8), dataType = RadianceGemminiDataType.FP16) ++
-  new radiance.subsystem.WithRadianceCores(8, location = InCluster(0), tensorCoreFP16 = true, useVxCache = false) ++
+  new radiance.subsystem.WithRadianceCores(8, location = InCluster(0), tensorCoreFP16 = true, tensorCoreDecoupled = false, useVxCache = false) ++
   new radiance.subsystem.WithRadianceSharedMem(address = x"ff000000", size = 128 << 10, numBanks = 4, numWords = 16) ++
   new radiance.subsystem.WithCoalescer(nNewSrcIds = 16) ++
   new radiance.subsystem.WithVortexL1Banks(nBanks = 8) ++
diff --git a/generators/radiance b/generators/radiance
index 8307d8d1..c22fd206 160000
--- a/generators/radiance
+++ b/generators/radiance
@@ -1 +1 @@
-Subproject commit 8307d8d1548825ed81127dc0b4bfa393ead7a408
+Subproject commit c22fd20616313163c4fe2e5c883b708164a748eb
diff --git a/variables.mk b/variables.mk
index 0a62d2fa..8b5a3647 100644
--- a/variables.mk
+++ b/variables.mk
@@ -131,9 +131,20 @@ ifeq ($(SUB_PROJECT),coalescer)
 	SBT_PROJECT       ?= chipyard
 	MODEL             ?= TestHarness
 	VLOG_MODEL        ?= $(MODEL)
-	MODEL_PACKAGE     ?= freechips.rocketchip.unittest
+	MODEL_PACKAGE     ?= chipyard.unittest
 	CONFIG            ?= CoalescingUnitTestConfig
-	CONFIG_PACKAGE    ?= radiance.memory
+	CONFIG_PACKAGE    ?= radiance.unittest
+	GENERATOR_PACKAGE ?= chipyard
+	TB                ?= TestDriver
+	TOP               ?= UnitTestSuite
+endif
+ifeq ($(SUB_PROJECT),tensor)
+	SBT_PROJECT       ?= chipyard
+	MODEL             ?= TestHarness
+	VLOG_MODEL        ?= $(MODEL)
+	MODEL_PACKAGE     ?= chipyard.unittest
+	CONFIG            ?= TensorUnitTestConfig
+	CONFIG_PACKAGE    ?= radiance.unittest
 	GENERATOR_PACKAGE ?= chipyard
 	TB                ?= TestDriver
 	TOP               ?= UnitTestSuite