diff --git a/builds/RV64ACDFIMSU_Toooba_RVFIDII_verilator/Makefile b/builds/RV64ACDFIMSU_Toooba_RVFIDII_verilator/Makefile
index 4cbbadb..0a7a3b0 100644
--- a/builds/RV64ACDFIMSU_Toooba_RVFIDII_verilator/Makefile
+++ b/builds/RV64ACDFIMSU_Toooba_RVFIDII_verilator/Makefile
@@ -50,6 +50,7 @@ TEST ?= rv64ui-p-add
 
 BSC_COMPILATION_FLAGS += -D BSIM \
 
+CACHE_SIZE ?= TEST
 
 include $(REPO)/builds/Resources/Include_RISCY_Config.mk
 
diff --git a/builds/RV64ACDFIMSU_Toooba_verilator/Makefile b/builds/RV64ACDFIMSU_Toooba_verilator/Makefile
index f3d3316..fac860e 100644
--- a/builds/RV64ACDFIMSU_Toooba_verilator/Makefile
+++ b/builds/RV64ACDFIMSU_Toooba_verilator/Makefile
@@ -10,7 +10,7 @@ RISCY_DIRS = $(RISCY_HOME)/procs/RV64G_OOO:$(RISCY_HOME)/procs/lib:$(RISCY_HOME)
 
 CONNECTAL_DIRS = $(RISCY_HOME)/connectal/bsv:$(RISCY_HOME)/connectal/tests/spi:$(RISCY_HOME)/connectal/lib/bsv
 
-CHERI_DIRS = $(RISCY_HOME)/../CHERI:$(RISCY_HOME)/../../libs/cheri-cap-lib
+CHERI_DIRS = $(RISCY_HOME)/../../libs/cheri-cap-lib
 
 # ALL_RISCY_DIRS = $(RISCY_DIRS)
 ALL_RISCY_DIRS = $(RISCY_DIRS):$(CONNECTAL_DIRS):$(CHERI_DIRS)
diff --git a/builds/Resources/Include_RISCY_Config.mk b/builds/Resources/Include_RISCY_Config.mk
index e76a0da..e0d7811 100644
--- a/builds/Resources/Include_RISCY_Config.mk
+++ b/builds/Resources/Include_RISCY_Config.mk
@@ -57,7 +57,7 @@ else
 $(error unsupported CORE_SIZE)
 endif
 
-ifeq (,$(filter $(CACHE_SIZE),SMALL LARGE MC_1MB MC_2MB))
+ifeq (,$(filter $(CACHE_SIZE),TEST SMALL LARGE MC_1MB MC_2MB))
 $(error unsupported CACHE_SIZE)
 endif
 
diff --git a/src_Core/RISCY_OOO/procs/RV64G_OOO/ProcConfig.bsv b/src_Core/RISCY_OOO/procs/RV64G_OOO/ProcConfig.bsv
index b28d241..69c35f0 100644
--- a/src_Core/RISCY_OOO/procs/RV64G_OOO/ProcConfig.bsv
+++ b/src_Core/RISCY_OOO/procs/RV64G_OOO/ProcConfig.bsv
@@ -1,6 +1,6 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
-// 
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without
@@ -8,10 +8,10 @@
 // modify, merge, publish, distribute, sublicense, and/or sell copies
 // of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be
 // included in all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -90,6 +90,18 @@
 // ==== CACHE SIZE ====
 //
 
+`ifdef CACHE_TEST
+
+    // L1
+    `define LOG_L1_LINES 6 // 2KB
+    `define LOG_L1_WAYS 1 // 2 ways
+
+    // LLC
+    `define LOG_LLC_LINES 8 // 8KB
+    `define LOG_LLC_WAYS 1 // 2 ways
+
+`endif
+
 `ifdef CACHE_SMALL
 
     // L1
@@ -323,5 +335,3 @@
 //
 // ==== derived parameters ====
 //
-
-