diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b74dbc9a4..87d423a7b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -747,22 +747,17 @@ add_custom_target(
 # =============================================================================
 if(NRN_ENABLE_CORENEURON OR NRN_ENABLE_MOD_COMPATIBILITY)
   set(GLOBAL_VAR_TOGGLE_COMMAND "'s/ GLOBAL minf/ RANGE minf/'")
-  set(TABLE_VAR_TOGGLE_COMMAND "'s/ TABLE minf/ :TABLE minf/'")
 else()
   set(GLOBAL_VAR_TOGGLE_COMMAND "'s/ RANGE minf/ GLOBAL minf/'")
-  set(TABLE_VAR_TOGGLE_COMMAND "'s/ :TABLE minf/ TABLE minf/'")
 endif()
 separate_arguments(GLOBAL_VAR_TOGGLE_COMMAND UNIX_COMMAND "${GLOBAL_VAR_TOGGLE_COMMAND}")
-separate_arguments(TABLE_VAR_TOGGLE_COMMAND UNIX_COMMAND "${TABLE_VAR_TOGGLE_COMMAND}")
 add_custom_target(
   hh_update
   COMMAND sed ${GLOBAL_VAR_TOGGLE_COMMAND} ${CMAKE_SOURCE_DIR}/src/nrnoc/hh.mod >
           ${CMAKE_BINARY_DIR}/hh.mod.1
-  COMMAND sed ${TABLE_VAR_TOGGLE_COMMAND} ${CMAKE_BINARY_DIR}/hh.mod.1 >
-          ${CMAKE_BINARY_DIR}/hh.mod.2
-  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/hh.mod.2
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/hh.mod.1
           ${CMAKE_SOURCE_DIR}/src/nrnoc/hh.mod
-  COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/hh.mod.1 ${CMAKE_BINARY_DIR}/hh.mod.2
+  COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/hh.mod.1
   COMMENT "Update hh.mod for CoreNEURON compatibility"
   VERBATIM)
 add_dependencies(nrniv_lib hh_update)
diff --git a/src/coreneuron/mechanism/mech/modfile/hh.mod b/src/coreneuron/mechanism/mech/modfile/hh.mod
index 053a15f43f..bbb336197c 100644
--- a/src/coreneuron/mechanism/mech/modfile/hh.mod
+++ b/src/coreneuron/mechanism/mech/modfile/hh.mod
@@ -90,7 +90,7 @@ DERIVATIVE states {
 PROCEDURE rates(v(mV)) {  :Computes rate and other constants at current v.
                       :Call once from HOC to initialize inf at resting v.
         LOCAL  alpha, beta, sum, q10
-:        TABLE minf, mtau, hinf, htau, ninf, ntau DEPEND celsius FROM -100 TO 100 WITH 200
+        TABLE minf, mtau, hinf, htau, ninf, ntau DEPEND celsius FROM -100 TO 100 WITH 200
 
 UNITSOFF
         q10 = 3^((celsius - 6.3)/10)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7af63ec56c..c6efbaa74c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -100,11 +100,7 @@ list(APPEND TESTS ringtest)
 # Add small hoc test
 # =============================================================================
 set(HOCTEST_DIR ${PROJECT_SOURCE_DIR}/test/hoc_tests/connect_dend)
-if(NRN_ENABLE_CORENEURON OR NRN_ENABLE_MOD_COMPATIBILITY)
-  set(REF_FILE cell3soma.core.dat.ref)
-else()
-  set(REF_FILE cell3soma.dat.ref)
-endif()
+set(REF_FILE cell3soma.dat.ref)
 add_test(
   connect_dend
   ${CMAKE_COMMAND}
diff --git a/test/api/hh_sim.cpp b/test/api/hh_sim.cpp
index 0dd548c637..b0ab735ce0 100644
--- a/test/api/hh_sim.cpp
+++ b/test/api/hh_sim.cpp
@@ -16,15 +16,9 @@ using std::endl;
 using std::ofstream;
 
 constexpr std::array<double, 3> EXPECTED_V{
-#ifndef CORENEURON_ENABLED
     -0x1.04p+6,
     -0x1.b254ad82e20edp+5,
     -0x1.24a52af1ab463p+6,
-#else
-    -0x1.04p+6,
-    -0x1.b0c75635b5bdbp+5,
-    -0x1.24a84bedb7246p+6,
-#endif
 };
 
 extern "C" void modl_reg(){/* No modl_reg */};
diff --git a/test/api/netcon.cpp b/test/api/netcon.cpp
index 87cfd567d5..674ae6d0ec 100644
--- a/test/api/netcon.cpp
+++ b/test/api/netcon.cpp
@@ -12,21 +12,12 @@ using std::endl;
 using std::ofstream;
 
 constexpr std::array<double, 6> EXPECTED_V{
-#ifndef CORENEURON_ENABLED
     -0x1.04p+6,
     -0x1.085a63d029bc3p+6,
     -0x1.112a5e95eb67cp+6,
     -0x1.1795abaec26c1p+6,
     -0x1.0422351f3f9dcp+6,
     -0x1.03e5317ac368cp+6,
-#else
-    -0x1.04p+6,
-    -0x1.085a703d657a7p+6,
-    -0x1.112d0039e9c38p+6,
-    -0x1.17974aa201b7bp+6,
-    -0x1.041fdf57a182bp+6,
-    -0x1.03e58fad20b92p+6,
-#endif
 };
 
 extern "C" void modl_reg(){/* No modl_reg */};
diff --git a/test/external/CMakeLists.txt b/test/external/CMakeLists.txt
index 5dcf1a4bce..243a3ab904 100644
--- a/test/external/CMakeLists.txt
+++ b/test/external/CMakeLists.txt
@@ -7,13 +7,13 @@ include(FetchContent)
 FetchContent_Declare(
   ringtest
   GIT_REPOSITORY https://github.com/neuronsimulator/ringtest
-  GIT_TAG 4ede4751c68f72a9884c6af4f94f65ff638054a8
+  GIT_TAG 7d1aee72939f6dfcb2a14db4c7b00725d9e485fa
   SOURCE_DIR ${PROJECT_SOURCE_DIR}/external/tests/ringtest)
 
 FetchContent_Declare(
   testcorenrn
   GIT_REPOSITORY https://github.com/neuronsimulator/testcorenrn
-  GIT_TAG 014aab9bee60a2bdd44b28a784c88092d2f6b92b
+  GIT_TAG e53831b3963af8be412e16807a85157e4413f307
   SOURCE_DIR ${PROJECT_SOURCE_DIR}/external/tests/testcorenrn)
 
 FetchContent_Declare(
diff --git a/test/hoc_tests/connect_dend/cell3soma.core.dat.ref b/test/hoc_tests/connect_dend/cell3soma.core.dat.ref
deleted file mode 100644
index b0d38144b5..0000000000
--- a/test/hoc_tests/connect_dend/cell3soma.core.dat.ref
+++ /dev/null
@@ -1,203 +0,0 @@
-t soma.v(0.5)
-201 2
- 0 -65
- 0.025 -65.025
- 0.05 -65.0671
- 0.075 -65.1203
- 0.1 -65.1809
- 0.125 -65.2462
- 0.15 -65.3146
- 0.175 -65.3848
- 0.2 -65.4561
- 0.225 -65.5279
- 0.25 -65.5998
- 0.275 -65.6714
- 0.3 -65.7427
- 0.325 -65.8134
- 0.35 -65.8835
- 0.375 -65.9528
- 0.4 -66.0213
- 0.425 -66.0889
- 0.45 -66.1555
- 0.475 -66.2213
- 0.5 -66.286
- 0.525 -66.3497
- 0.55 -66.4124
- 0.575 -66.4741
- 0.6 -66.5348
- 0.625 -66.5944
- 0.65 -66.6529
- 0.675 -66.7104
- 0.7 -66.7669
- 0.725 -66.8223
- 0.75 -66.8766
- 0.775 -66.93
- 0.8 -66.9823
- 0.825 -67.0335
- 0.85 -67.0838
- 0.875 -67.1331
- 0.9 -67.1813
- 0.925 -67.2286
- 0.95 -67.2749
- 0.975 -67.3203
- 1 -67.3647
- 1.025 -67.4081
- 1.05 -67.4507
- 1.075 -67.4923
- 1.1 -67.5331
- 1.125 -67.573
- 1.15 -67.612
- 1.175 -67.6502
- 1.2 -67.6875
- 1.225 -67.724
- 1.25 -67.7597
- 1.275 -67.7946
- 1.3 -67.8287
- 1.325 -67.8621
- 1.35 -67.8947
- 1.375 -67.9265
- 1.4 -67.9577
- 1.425 -67.9881
- 1.45 -68.0178
- 1.475 -68.0469
- 1.5 -68.0753
- 1.525 -68.103
- 1.55 -68.1301
- 1.575 -68.1565
- 1.6 -68.1823
- 1.625 -68.2076
- 1.65 -68.2322
- 1.675 -68.2563
- 1.7 -68.2797
- 1.725 -68.3027
- 1.75 -68.325
- 1.775 -68.3469
- 1.8 -68.3682
- 1.825 -68.389
- 1.85 -68.4093
- 1.875 -68.4291
- 1.9 -68.4485
- 1.925 -68.4673
- 1.95 -68.4858
- 1.975 -68.5037
- 2 -68.5212
- 2.025 -68.5383
- 2.05 -68.555
- 2.075 -68.5712
- 2.1 -68.5871
- 2.125 -68.6026
- 2.15 -68.6176
- 2.175 -68.6323
- 2.2 -68.6467
- 2.225 -68.6606
- 2.25 -68.6743
- 2.275 -68.6875
- 2.3 -68.7005
- 2.325 -68.7131
- 2.35 -68.7254
- 2.375 -68.7374
- 2.4 -68.749
- 2.425 -68.7604
- 2.45 -68.7715
- 2.475 -68.7823
- 2.5 -68.7928
- 2.525 -68.803
- 2.55 -68.813
- 2.575 -68.8227
- 2.6 -68.8321
- 2.625 -68.8413
- 2.65 -68.8503
- 2.675 -68.859
- 2.7 -68.8675
- 2.725 -68.8758
- 2.75 -68.8838
- 2.775 -68.8916
- 2.8 -68.8992
- 2.825 -68.9066
- 2.85 -68.9139
- 2.875 -68.9209
- 2.9 -68.9277
- 2.925 -68.9343
- 2.95 -68.9407
- 2.975 -68.947
- 3 -68.9531
- 3.025 -68.959
- 3.05 -68.9648
- 3.075 -68.9703
- 3.1 -68.9758
- 3.125 -68.981
- 3.15 -68.9862
- 3.175 -68.9911
- 3.2 -68.996
- 3.225 -69.0007
- 3.25 -69.0052
- 3.275 -69.0096
- 3.3 -69.0139
- 3.325 -69.0181
- 3.35 -69.0221
- 3.375 -69.026
- 3.4 -69.0298
- 3.425 -69.0335
- 3.45 -69.037
- 3.475 -69.0405
- 3.5 -69.0438
- 3.525 -69.0471
- 3.55 -69.0502
- 3.575 -69.0532
- 3.6 -69.0562
- 3.625 -69.059
- 3.65 -69.0617
- 3.675 -69.0644
- 3.7 -69.067
- 3.725 -69.0694
- 3.75 -69.0718
- 3.775 -69.0741
- 3.8 -69.0764
- 3.825 -69.0785
- 3.85 -69.0806
- 3.875 -69.0826
- 3.9 -69.0845
- 3.925 -69.0864
- 3.95 -69.0882
- 3.975 -69.0899
- 4 -69.0916
- 4.025 -69.0932
- 4.05 -69.0947
- 4.075 -69.0962
- 4.1 -69.0976
- 4.125 -69.0989
- 4.15 -69.1002
- 4.175 -69.1015
- 4.2 -69.1027
- 4.225 -69.1038
- 4.25 -69.1049
- 4.275 -69.1059
- 4.3 -69.1069
- 4.325 -69.1078
- 4.35 -69.1087
- 4.375 -69.1096
- 4.4 -69.1104
- 4.425 -69.1112
- 4.45 -69.1119
- 4.475 -69.1126
- 4.5 -69.1132
- 4.525 -69.1138
- 4.55 -69.1144
- 4.575 -69.1149
- 4.6 -69.1154
- 4.625 -69.1159
- 4.65 -69.1163
- 4.675 -69.1167
- 4.7 -69.117
- 4.725 -69.1174
- 4.75 -69.1177
- 4.775 -69.118
- 4.8 -69.1182
- 4.825 -69.1184
- 4.85 -69.1186
- 4.875 -69.1188
- 4.9 -69.1189
- 4.925 -69.119
- 4.95 -69.1191
- 4.975 -69.1192
- 5 -69.1192