diff --git a/cmake/testbench.cmake b/cmake/testbench.cmake
index 56f1a82..4f5be5f 100644
--- a/cmake/testbench.cmake
+++ b/cmake/testbench.cmake
@@ -89,6 +89,9 @@ macro(add_testbench)
 
   get_all_sources_recursive(lib${TARGET} ${TARGET}_SOURCES)
 
+  set(CMAKE_CXX_STANDARD 20)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
   # Create the test executable
   add_executable(${TARGET} ${ARG_BENCH_DIR}/${ARG_MODULE}/${TARGET}.cpp)
   if(ARG_DEPENDS)
diff --git a/include/testbench.h b/include/testbench.h
index aaf06ec..7fa6e1a 100644
--- a/include/testbench.h
+++ b/include/testbench.h
@@ -20,6 +20,8 @@
  * along with ECAP5-DTESTLIB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <cstdlib>
+
 #ifndef TESTBENCH_H
 #define TESTBENCH_H
 
@@ -50,6 +52,7 @@ template<class Module> class Testbench {
   int * err_cycles;
   int cycle;
 
+  uint8_t * clk_ptr;
   uint64_t clk_period_in_ps;
 
   Testbench() {
@@ -63,6 +66,13 @@ template<class Module> class Testbench {
     this->conditions = NULL;
     this->err_cycles = NULL;
     this->cycle = 0;
+
+    // Only configure the clk pointer if clk_i exists
+    if constexpr(requires {this->core->clk_i;}) {
+      this->clk_ptr = &this->core->clk_i;
+    } else {
+      this->clk_ptr = NULL;
+    }
   }
 
   ~Testbench() {
@@ -106,13 +116,18 @@ template<class Module> class Testbench {
   }
 
   void tick() {
-    core->clk_i = 1;
+    if(this->clk_ptr == NULL) {
+      printf("ERROR: clk_i not found. If the clk signal is named differently, define clk_ptr\n");
+      std::exit(-1);
+    }
+
+    *this->clk_ptr = 1;
     core->eval();
     if(this->trace) {
       this->trace->dump(this->clk_period_in_ps * this->tickcount + (this->clk_period_in_ps / 10));
     }
 
-    core->clk_i = 0;
+    *this->clk_ptr = 0;
     core->eval();
     if(this->trace) {
       this->trace->dump(this->clk_period_in_ps * this->tickcount + (this->clk_period_in_ps / 2));
@@ -122,7 +137,7 @@ template<class Module> class Testbench {
     this->tickcount += 1;
     this->cycle += 1;
 
-    core->clk_i = 1;
+    *this->clk_ptr = 1;
     core->eval();
     if(this->trace) {
       this->trace->dump(this->clk_period_in_ps * this->tickcount);