diff --git a/test/IntegrationTests/refs/advection2d_bump_entropyav/advection2d_bump_entropyav.toml b/test/IntegrationTests/refs/inactive/advection2d_bump_entropyav/advection2d_bump_entropyav.toml
similarity index 100%
rename from test/IntegrationTests/refs/advection2d_bump_entropyav/advection2d_bump_entropyav.toml
rename to test/IntegrationTests/refs/inactive/advection2d_bump_entropyav/advection2d_bump_entropyav.toml
diff --git a/test/IntegrationTests/refs/advection_sine_no_inflow/advection_sine_no_inflow.toml b/test/IntegrationTests/refs/inactive/advection_sine_no_inflow/advection_sine_no_inflow.toml
similarity index 100%
rename from test/IntegrationTests/refs/advection_sine_no_inflow/advection_sine_no_inflow.toml
rename to test/IntegrationTests/refs/inactive/advection_sine_no_inflow/advection_sine_no_inflow.toml
diff --git a/test/IntegrationTests/refs/inactive/burgers_sine_weno/burgers_sine_weno.toml b/test/IntegrationTests/refs/inactive/burgers_sine_weno/burgers_sine_weno.toml
new file mode 100644
index 0000000000000000000000000000000000000000..d1e3eea40c39bce8e1f0769408f3969aa9773935
--- /dev/null
+++ b/test/IntegrationTests/refs/inactive/burgers_sine_weno/burgers_sine_weno.toml
@@ -0,0 +1,25 @@
+[Evolution]
+cfl = 0.1
+tend = 0.24
+
+[HRSC]
+method = "weno"
+weno_order = 5
+
+[Mesh]
+range = [0, 1]
+k = 70
+basis = "lgl"
+n = 4
+
+[Output]
+variables1d = ["u", "flag"]
+aligned_ts  = "$(collect(range(0.02,0.24,step=0.02)))"
+every_iteration = 1
+
+[ScalarEq]
+equation = "burgers"
+id = "sine"
+
+[TCI]
+method = "minmod"
diff --git a/test/IntegrationTests/refs/inactive/euler2d_isentropic_flow_entropyav/euler2d_isentropic_flow_entropyav.toml b/test/IntegrationTests/refs/inactive/euler2d_isentropic_flow_entropyav/euler2d_isentropic_flow_entropyav.toml
new file mode 100644
index 0000000000000000000000000000000000000000..e6b1b7b49ee0b212e35338ddeb3b1ceb63c255dc
--- /dev/null
+++ b/test/IntegrationTests/refs/inactive/euler2d_isentropic_flow_entropyav/euler2d_isentropic_flow_entropyav.toml
@@ -0,0 +1,25 @@
+[EulerEq]
+id = "smooth_isentropic_flow"
+
+[EquationOfState]
+eos = "idealgas"
+idealgas_gamma = 3.0
+
+[Mesh]
+range = [ -1.0,1.0, -1.0,1.0 ]
+cfl = 0.5
+n = [5,5]
+k = [38,38]
+basis = "lgl"
+
+[Output]
+every_dt    = 0.02
+variables2d = [ "rho", "qx", "qy", "E", "smoothed_mu" ]
+format2d    = "vtk"
+
+[Evolution]
+tend = 0.8
+
+[HRSC]
+method = "av"
+av_method = "entropy"
diff --git a/test/IntegrationTests/refs/euler_isentropic_flow_regulate-ns/euler_isentropic_flow_regulate-ns.toml b/test/IntegrationTests/refs/inactive/euler_isentropic_flow_regulate-ns/euler_isentropic_flow_regulate-ns.toml
similarity index 100%
rename from test/IntegrationTests/refs/euler_isentropic_flow_regulate-ns/euler_isentropic_flow_regulate-ns.toml
rename to test/IntegrationTests/refs/inactive/euler_isentropic_flow_regulate-ns/euler_isentropic_flow_regulate-ns.toml
diff --git a/test/IntegrationTests/refs/inactive/fv_burgers_sine/fv_burgers_sine.toml b/test/IntegrationTests/refs/inactive/fv_burgers_sine/fv_burgers_sine.toml
new file mode 100644
index 0000000000000000000000000000000000000000..e79ecc2bd1a9795c6dfc186b4dac27fd3125a4e7
--- /dev/null
+++ b/test/IntegrationTests/refs/inactive/fv_burgers_sine/fv_burgers_sine.toml
@@ -0,0 +1,16 @@
+[Evolution]
+cfl = 0.9
+tend = 0.5
+
+[Mesh]
+range = [0, 1]
+k = 4068
+scheme = "FV"
+
+[Output]
+variables1d     = ["u"]
+every_dt        = 0.01
+
+[ScalarEq]
+equation = "burgers"
+id = "sine"
diff --git a/test/IntegrationTests/refs/inactive/fv_grhd_tov/fv_grhd_tov.toml b/test/IntegrationTests/refs/inactive/fv_grhd_tov/fv_grhd_tov.toml
new file mode 100644
index 0000000000000000000000000000000000000000..a43d1d6e232b20db137147a1e968634733f833a4
--- /dev/null
+++ b/test/IntegrationTests/refs/inactive/fv_grhd_tov/fv_grhd_tov.toml
@@ -0,0 +1,27 @@
+[EquationOfState]
+eos = "polytrope"
+polytrope_k = 100.0
+polytrope_gamma = 2.0
+
+[GRHD]
+bc = "from_id"
+id = "tov"
+id_filename = "$(joinpath(ROOTDIR,\"initialdata\",\"TOV_stable.h5\"))"
+c2p_enforce_causal_atm = false
+formulation = "doublecartoon"
+hrsc = "fv_central"
+freeze_vars = ["rτ"]
+
+[Mesh]
+range = [ 0.0, 20.0 ]
+k = 512
+periodic = false
+scheme = "FV"
+
+[Output]
+variables1d = [ "rD", "rSx", "rτ" ]
+aligned_ts  = "$(collect(range(0.5,5.0,step=0.5)))"
+
+[Evolution]
+cfl = 0.8
+tend = 5.0
diff --git a/test/IntegrationTests/refs/inactive/fv_minmod_roe_grhd_bondi_accretion/fv_minmod_roe_grhd_bondi_accretion.toml b/test/IntegrationTests/refs/inactive/fv_minmod_roe_grhd_bondi_accretion/fv_minmod_roe_grhd_bondi_accretion.toml
new file mode 100644
index 0000000000000000000000000000000000000000..450c06cc65d00abee01417b82ca9edc47d0f5e6f
--- /dev/null
+++ b/test/IntegrationTests/refs/inactive/fv_minmod_roe_grhd_bondi_accretion/fv_minmod_roe_grhd_bondi_accretion.toml
@@ -0,0 +1,29 @@
+[EquationOfState]
+eos = "polytrope"
+polytrope_k = 100.0
+polytrope_gamma = 2.0
+
+[GRHD]
+bc = "from_id"
+id = "tov"
+formulation = "doublecartoon"
+id_filename = "$(joinpath(ROOTDIR,\"initialdata\",\"TOV_stable.h5\"))"
+freeze_vars = ["rτ"]
+c2p_enforce_atm = true
+c2p_threshold_velocity_limiter = 1e-6
+hrsc = "slope_limiter"
+slope_limiter_method = "minmod"
+
+[Mesh]
+range = [ 0.0, 20.0 ]
+k = 100
+periodic = false
+scheme = "FV"
+
+[Output]
+variables1d = [ "rD", "rSx", "ρ", "p", "vx" ]
+aligned_ts  = "$(collect(range(5.0,25.0,step=5.0)))"
+
+[Evolution]
+cfl = 0.1
+tend = 25.0
diff --git a/test/IntegrationTests/refs/inactive/fv_tvb_euler_sod_shock_tube/fv_tvb_euler_sod_shock_tube.toml b/test/IntegrationTests/refs/inactive/fv_tvb_euler_sod_shock_tube/fv_tvb_euler_sod_shock_tube.toml
new file mode 100644
index 0000000000000000000000000000000000000000..a447325a3aac38283d0beafb74a6aa97c84c7ddb
--- /dev/null
+++ b/test/IntegrationTests/refs/inactive/fv_tvb_euler_sod_shock_tube/fv_tvb_euler_sod_shock_tube.toml
@@ -0,0 +1,23 @@
+[EquationOfState]
+idealgas_gamma = 1.4
+eos = "idealgas"
+
+[EulerEq]
+id = "sod_shock_tube"
+bc = "from_id"
+hrsc = "slope_limiter"
+slope_limiter_method = "tvb"
+
+[Evolution]
+cfl = 0.4
+tend = 0.25
+
+[Mesh]
+periodic = [false]
+range = [0.0, 1.0]
+k = 512
+scheme = "FV"
+
+[Output]
+variables1d = ["rho", "q", "E"]
+aligned_ts  = "$(collect(range(0.01,0.4,step=0.01)))"
diff --git a/test/IntegrationTests/refs/inactive/fv_tvb_grhd_bondi_accretion/fv_tvb_grhd_bondi_accretion.toml b/test/IntegrationTests/refs/inactive/fv_tvb_grhd_bondi_accretion/fv_tvb_grhd_bondi_accretion.toml
new file mode 100644
index 0000000000000000000000000000000000000000..daf55fbe30a55de418bd15811dbdca1cc7e234fc
--- /dev/null
+++ b/test/IntegrationTests/refs/inactive/fv_tvb_grhd_bondi_accretion/fv_tvb_grhd_bondi_accretion.toml
@@ -0,0 +1,26 @@
+[EquationOfState]
+eos = "polytrope"
+polytrope_k = 0.02143872868864732
+polytrope_gamma = "$(4/3)"
+
+[GRHD]
+bc = "from_id"
+id = "bondi_accretion"
+id_filename = "$(joinpath(ROOTDIR,\"initialdata\",\"bondi_accretion.h5\"))"
+hrsc = "slope_limiter"
+slope_limiter_method = "superbee"
+# slope_limiter_method = "none"
+
+[Mesh]
+range = [ 1.8, 10.0 ]
+k = 256
+periodic = false
+scheme = "FV"
+
+[Output]
+variables1d  = [ "D", "Sr", "τ", "p", "ρ", "ϵ", "vr" ]
+aligned_ts = "$(collect(range(0.5,5.0,step=0.5)))"
+
+[Evolution]
+cfl = 0.8
+tend = 5.0
diff --git a/test/IntegrationTests/refs/inactive/srhd2d_shocktube_entropyav/srhd2d_shocktube_entropyav.toml b/test/IntegrationTests/refs/inactive/srhd2d_shocktube_entropyav/srhd2d_shocktube_entropyav.toml
new file mode 100644
index 0000000000000000000000000000000000000000..e49840b9d2d85241a1620dc40614cc91ecb587b7
--- /dev/null
+++ b/test/IntegrationTests/refs/inactive/srhd2d_shocktube_entropyav/srhd2d_shocktube_entropyav.toml
@@ -0,0 +1,30 @@
+[EquationOfState]
+eos = "idealgas"
+idealgas_gamma = 1.6666666666666666666667
+
+[SRHD]
+# id = "smooth_diagonal"
+id = "shocktube_2d"
+
+[Mesh]
+range = [ -1.0,1.0, -1.0,1.0 ]
+cfl = 0.50
+# cfl = 0.01
+n = [4,4]
+k = [32,32]
+basis = "lgl"
+
+[Output]
+every_iteration = 1
+variables2d = [ "D", "Sx", "Sy", "tau", "smoothed_mu", "E", "flx_E_x", "flx_E_y" ]
+format2d  = "vtk"
+
+[Log]
+progress_stdout = false
+
+[Evolution]
+tend = 4.4
+
+[HRSC]
+method = "av"
+av_method = "entropy"
diff --git a/test/IntegrationTests/refs/srhd2d_smooth/srhd2d_smooth.toml b/test/IntegrationTests/refs/inactive/srhd2d_smooth/srhd2d_smooth.toml
similarity index 100%
rename from test/IntegrationTests/refs/srhd2d_smooth/srhd2d_smooth.toml
rename to test/IntegrationTests/refs/inactive/srhd2d_smooth/srhd2d_smooth.toml
diff --git a/test/IntegrationTests/refs/inactive/srhd2d_smooth_entropyav/srhd2d_smooth_entropyav.toml b/test/IntegrationTests/refs/inactive/srhd2d_smooth_entropyav/srhd2d_smooth_entropyav.toml
new file mode 100644
index 0000000000000000000000000000000000000000..c873b582bf6dffcff34d8c33be39d4a55adc3f77
--- /dev/null
+++ b/test/IntegrationTests/refs/inactive/srhd2d_smooth_entropyav/srhd2d_smooth_entropyav.toml
@@ -0,0 +1,28 @@
+[EquationOfState]
+eos = "idealgas"
+idealgas_gamma = 1.6666666666666666666667
+
+[SRHD]
+id = "smooth_diagonal"
+
+[Mesh]
+range = [ -1.0,1.0, -1.0,1.0 ]
+cfl = 0.50
+n = [4,4]
+k = [32,32]
+basis = "lgl"
+
+[Output]
+every_dt    = 0.05
+variables2d = [ "D", "Sx", "Sy", "tau", "smoothed_mu" ]
+format2d    = "vtk"
+
+[Log]
+progress_stdout = true
+
+[Evolution]
+tend = 4.4
+
+[HRSC]
+method = "av"
+av_method = "entropy"
diff --git a/test/IntegrationTests/refs/srhd_blastwave1.toml b/test/IntegrationTests/refs/inactive/srhd_blastwave1/srhd_blastwave1.toml
similarity index 83%
rename from test/IntegrationTests/refs/srhd_blastwave1.toml
rename to test/IntegrationTests/refs/inactive/srhd_blastwave1/srhd_blastwave1.toml
index 0e31ef41369d5c42ce8cfb487dd3eea35135fe7d..9c05915adb5d386f2eb841c9c6a7167c88017672 100644
--- a/test/IntegrationTests/refs/srhd_blastwave1.toml
+++ b/test/IntegrationTests/refs/inactive/srhd_blastwave1/srhd_blastwave1.toml
@@ -14,9 +14,8 @@ basis = "lgl"
 
 [Output]
 every_iteration = 1
-every_dt = 0.1
-variables       = [ "flx_D", "flx_S", "flx_tau", "D", "S", "tau", "p", "rho", "eps", "smoothed_mu", "E", "v", "flag_consfixed" ]
-enable1d        = true
+every_dt        = 0.1
+variables1d     = [ "flx_D", "flx_S", "flx_tau", "D", "S", "tau", "p", "rho", "eps", "smoothed_mu", "E", "v", "flag_consfixed" ]
 
 [Evolution]
 tend = 1.5
diff --git a/test/IntegrationTests/refs/srhd_blastwave2.toml b/test/IntegrationTests/refs/inactive/srhd_blastwave2/srhd_blastwave2.toml
similarity index 83%
rename from test/IntegrationTests/refs/srhd_blastwave2.toml
rename to test/IntegrationTests/refs/inactive/srhd_blastwave2/srhd_blastwave2.toml
index 80bb8a0f63b889f32b8255e697c934aa36a400a4..2af61948e2d61e7abd20abed0f4e8d5d780b2167 100644
--- a/test/IntegrationTests/refs/srhd_blastwave2.toml
+++ b/test/IntegrationTests/refs/inactive/srhd_blastwave2/srhd_blastwave2.toml
@@ -14,9 +14,8 @@ basis = "lgl"
 
 [Output]
 every_iteration = 1
-every_dt = 0.1
-variables       = [ "flx_D", "flx_S", "flx_tau", "D", "S", "tau", "p", "rho", "eps", "smoothed_mu", "E", "v", "flag_consfixed" ]
-enable1d        = true
+every_dt        = 0.1
+variables1d     = [ "flx_D", "flx_S", "flx_tau", "D", "S", "tau", "p", "rho", "eps", "smoothed_mu", "E", "v", "flag_consfixed" ]
 
 [Evolution]
 tend = 1.5
diff --git a/test/IntegrationTests/refs/srhd_periodic_shock_tube_bernstein.toml b/test/IntegrationTests/refs/inactive/srhd_periodic_shock_tube_bernstein/srhd_periodic_shock_tube_bernstein.toml
similarity index 95%
rename from test/IntegrationTests/refs/srhd_periodic_shock_tube_bernstein.toml
rename to test/IntegrationTests/refs/inactive/srhd_periodic_shock_tube_bernstein/srhd_periodic_shock_tube_bernstein.toml
index 5b3521bcbccdcf1ed517b2182f7f18a78031e99f..be438b1f34d760ec6a352bb987e5465bf16682cc 100644
--- a/test/IntegrationTests/refs/srhd_periodic_shock_tube_bernstein.toml
+++ b/test/IntegrationTests/refs/inactive/srhd_periodic_shock_tube_bernstein/srhd_periodic_shock_tube_bernstein.toml
@@ -14,7 +14,6 @@ basis = "lgl"
 
 [Output]
 every_iteration = 1
-# TODO Enable this!
 # aligned_ts      = [ 0.5, 1.0, 1.5, 2.0, 2.5, 3.0 ]
 variables1d     = [ "D", "S", "tau", "p", "rho", "eps" ]
 
diff --git a/test/IntegrationTests/refs/srhd_periodic_shocktube_entropyav.toml b/test/IntegrationTests/refs/inactive/srhd_periodic_shocktube_entropyav/srhd_periodic_shocktube_entropyav.toml
similarity index 88%
rename from test/IntegrationTests/refs/srhd_periodic_shocktube_entropyav.toml
rename to test/IntegrationTests/refs/inactive/srhd_periodic_shocktube_entropyav/srhd_periodic_shocktube_entropyav.toml
index 31a8a48adf00141f21adbaedba57f2c731948d80..69edb504931e40f1c9431eaba85075e312a93077 100644
--- a/test/IntegrationTests/refs/srhd_periodic_shocktube_entropyav.toml
+++ b/test/IntegrationTests/refs/inactive/srhd_periodic_shocktube_entropyav/srhd_periodic_shocktube_entropyav.toml
@@ -16,10 +16,9 @@ basis = "lgl"
 
 [Output]
 every_iteration = 1
-every_dt = 0.1
+every_dt        = 0.1
 # aligned_ts      = [ 0.5, 1.0, 1.5, 2.0, 2.5, 3.0 ]
-variables       = [ "flx_D", "flx_S", "flx_tau", "D", "S", "tau", "p", "rho", "eps", "smoothed_mu", "E", "v", "flag_consfixed" ]
-enable1d        = true
+variables1d     = [ "flx_D", "flx_S", "flx_tau", "D", "S", "tau", "p", "rho", "eps", "smoothed_mu", "E", "v", "flag_consfixed" ]
 
 [Evolution]
 tend = 1.5
diff --git a/test/IntegrationTests/refs/inactive/srhd_simple_wave/srhd_simple_wave.toml b/test/IntegrationTests/refs/inactive/srhd_simple_wave/srhd_simple_wave.toml
new file mode 100644
index 0000000000000000000000000000000000000000..88eaf6984083fe791a0e85599e5faf607fecf24d
--- /dev/null
+++ b/test/IntegrationTests/refs/inactive/srhd_simple_wave/srhd_simple_wave.toml
@@ -0,0 +1,55 @@
+[EquationOfState]
+eos = "polytrope"
+polytrope_gamma = 1.6666666666666666667
+polytrope_k = 100.0
+
+[SRHD]
+id = "simple_wave"
+bc = "from_id"
+
+[Mesh]
+range = [ -1.5, 1.5 ]
+n = 5
+k = 100
+basis = "lgl"
+periodic = false
+
+[Output]
+# every_iteration = 1
+# every_dt = 0.1
+# aligned_ts      = [ 0.5, 1.0, 1.5, 2.0, 2.5, 3.0 ]
+# variables1d       = [ "flx_D", "flx_S", "flx_tau", "D", "S", "tau", "p", "rho", "eps", "smoothed_mu", "E", "v", "flag_consfixed" ]
+# variables1d       = [ "D", "S", "tau", "p", "rho", "eps", "smoothed_mu", "E", "v", "flag_consfixed" ]
+# variables1d       = [ "D", "S", "tau", "p", "rho", "eps", "E", "v", "smoothed_mu", "EP" ]
+variables1d = [ "D", "S", "tau", "p", "rho", "eps", "E", "Em1", "flx_E", "flx_Em1", "v", "EP", "smoothed_mu" ]
+aligned_ts  = "$(collect(range(0.01,1.2,step=0.01)))"
+# variables1d       = [ "D", "S", "tau", "p", "rho", "eps", "E", "v" ]
+
+[Evolution]
+cfl = 0.2
+tend = 1.2
+# tend = 0.2
+
+[Log]
+progress_stdout = true
+
+# sod_shocktube
+# [HRSC]
+# method = "av"
+# av_method = "entropy"
+# entropy_ce = 0.05
+# entropy_cmax = 0.1
+
+# [HRSC]
+# method = "av"
+# av_method = "mda"
+# mda_cmax = 5.0
+
+[HRSC]
+method = "av"
+av_method = "entropy"
+entropy_cmax = 0.1
+entropy_ce   = 1.0
+
+[TCI]
+method = "entropy_production"
diff --git a/test/IntegrationTests/refs/inactive/srhd_simple_wave_debug/srhd_simple_wave_debug.toml b/test/IntegrationTests/refs/inactive/srhd_simple_wave_debug/srhd_simple_wave_debug.toml
new file mode 100644
index 0000000000000000000000000000000000000000..1a90aa4c3c9b56f787a48092450826b92b761fe7
--- /dev/null
+++ b/test/IntegrationTests/refs/inactive/srhd_simple_wave_debug/srhd_simple_wave_debug.toml
@@ -0,0 +1,45 @@
+[EquationOfState]
+eos = "polytrope"
+polytrope_gamma = 1.6666666666666666667
+polytrope_k = 100.0
+
+[SRHD]
+id = "simple_wave"
+bc = "from_id"
+
+[Mesh]
+range = [ -1.5, 1.5 ]
+n = 5
+k = 100
+basis = "lgl"
+periodic = false
+
+[Output]
+every_dt = 0.01
+variables1d = [ "D", "S", "tau", "E", "Em1", "EP" ]
+aligned_ts  = "$(collect(range(0.01,1.2,step=0.01)))"
+
+[Evolution]
+cfl = 0.75
+tend = 0.2
+# tend = 0.2
+
+# sod_shocktube
+# [HRSC]
+# method = "av"
+# av_method = "entropy"
+# entropy_ce = 0.05
+# entropy_cmax = 0.1
+
+# [HRSC]
+# method = "av"
+# av_method = "mda"
+# mda_cmax = 5.0
+
+# [HRSC]
+# method = "av"
+# av_method = "entropy"
+# entropy_ce = 5.0
+
+[TCI]
+method = "entropy_production"
diff --git a/test/IntegrationTests/refs/inactive/srhd_simple_wave_fv_muscl/srhd_simple_wave_fv_muscl.toml b/test/IntegrationTests/refs/inactive/srhd_simple_wave_fv_muscl/srhd_simple_wave_fv_muscl.toml
new file mode 100644
index 0000000000000000000000000000000000000000..b56c6a449be8dbae1cedce3911a2f272a55b810f
--- /dev/null
+++ b/test/IntegrationTests/refs/inactive/srhd_simple_wave_fv_muscl/srhd_simple_wave_fv_muscl.toml
@@ -0,0 +1,24 @@
+[EquationOfState]
+eos = "polytrope"
+polytrope_gamma = 1.6666666666666666667
+polytrope_k = 100.0
+
+[SRHD]
+id = "simple_wave"
+bc = "from_id"
+hrsc = "slope_limiter"
+slope_limiter_method = "minmod"
+
+[Mesh]
+range = [ -1.5, 1.5 ]
+k = 256
+periodic = true
+scheme = "FV"
+
+[Output]
+variables1d = [ "D", "S", "tau" ]
+aligned_ts  = "$(collect(range(0.1,0.6,step=0.1)))"
+
+[Evolution]
+cfl = 0.9
+tend = 0.6
diff --git a/test/IntegrationTests/refs/inactive/srhd_smooth/srhd_smooth.toml b/test/IntegrationTests/refs/inactive/srhd_smooth/srhd_smooth.toml
new file mode 100644
index 0000000000000000000000000000000000000000..d422f742ec7e2aa1ac52d9097db0542c09bd6e8f
--- /dev/null
+++ b/test/IntegrationTests/refs/inactive/srhd_smooth/srhd_smooth.toml
@@ -0,0 +1,23 @@
+[EquationOfState]
+eos = "idealgas"
+idealgas_gamma = 1.6666666666666666666667
+
+[SRHD]
+id = "smooth"
+
+[Mesh]
+range = [ -1.0, 1.0 ]
+n = 4
+k = 67
+basis = "lgl"
+
+[Output]
+aligned_ts  = "$(collect(range(0.04,0.4,step=0.04)))"
+variables1d = [ "D", "S", "tau" ]
+
+[Evolution]
+tend = 0.4
+cfl = 0.10
+
+[TCI]
+method = "mda"
diff --git a/test/IntegrationTests/refs/srhd_sod_shocktube.toml b/test/IntegrationTests/refs/inactive/srhd_sod_shocktube/srhd_sod_shocktube.toml
similarity index 84%
rename from test/IntegrationTests/refs/srhd_sod_shocktube.toml
rename to test/IntegrationTests/refs/inactive/srhd_sod_shocktube/srhd_sod_shocktube.toml
index 02052b3e0f045cec28dde093d9cf34ca1d85df49..439a2495e8711a942748b84858a7327b5c5c053e 100644
--- a/test/IntegrationTests/refs/srhd_sod_shocktube.toml
+++ b/test/IntegrationTests/refs/inactive/srhd_sod_shocktube/srhd_sod_shocktube.toml
@@ -14,10 +14,9 @@ basis = "lgl"
 
 [Output]
 every_iteration = 1
-every_dt = 0.1
+every_dt        = 0.1
 # aligned_ts      = [ 0.5, 1.0, 1.5, 2.0, 2.5, 3.0 ]
-variables       = [ "flx_D", "flx_S", "flx_tau", "D", "S", "tau", "p", "rho", "eps", "smoothed_mu", "E", "v", "flag_consfixed" ]
-enable1d        = true
+variables1d     = [ "flx_D", "flx_S", "flx_tau", "D", "S", "tau", "p", "rho", "eps", "smoothed_mu", "E", "v", "flag_consfixed" ]
 
 [Evolution]
 tend = 1.5
diff --git a/test/IntegrationTests/refs/srhd_simple_wave.toml b/test/IntegrationTests/refs/srhd_simple_wave.toml
deleted file mode 100644
index 1ac5b4789c40178ca18eae583d55fa3cf875952c..0000000000000000000000000000000000000000
--- a/test/IntegrationTests/refs/srhd_simple_wave.toml
+++ /dev/null
@@ -1,51 +0,0 @@
-[EquationOfState]
-eos = "polytrope"
-polytrope_gamma = 1.6666666666666666667
-polytrope_k = 100.0
-
-[SRHD]
-id = "simple_wave"
-bc = "from_id"
-
-[Mesh]
-range = [ -1.5, 1.5 ]
-n = 6
-k = 255
-# k = 256
-# k = 26
-# n = 1
-# k = 512
-basis = "lgl"
-# periodic = false
-
-[Output]
-every_dt = 0.05
-# aligned_ts      = [ 0.5, 1.0, 1.5, 2.0, 2.5, 3.0 ]
-# variables       = [ "flx_D", "flx_S", "flx_tau", "D", "S", "tau", "p", "rho", "eps", "smoothed_mu", "E", "v", "flag_consfixed" ]
-variables       = [ "D", "S", "tau", "p", "rho", "eps", "smoothed_mu", "E", "v", "EP" ]
-# variables       = [ "D", "S", "tau", "p", "rho", "eps", "E", "v", "EP" ]
-enable1d        = true
-
-[Evolution]
-cfl = 0.20
-# tend = 1.5
-tend = 2.5
-
-[Log]
-progress_stdout = true
-
-# [HRSC]
-# method = "av"
-# av_method = "entropy"
-# entropy_ce = 10.0
-# entropy_cmax = 0.1
-
-[HRSC]
-method = "av"
-av_method = "mda"
-mda_cmax = 10.0
-# mda_n_low = 0.1
-# mda_n_high = 4.0
-
-[TCI]
-method = "entropy_production"