diff --git a/config/benchmark_configs/amip_diagedmf.yml b/config/benchmark_configs/amip_diagedmf.yml
index 1efd5138e1..0f4418f51f 100644
--- a/config/benchmark_configs/amip_diagedmf.yml
+++ b/config/benchmark_configs/amip_diagedmf.yml
@@ -1,5 +1,4 @@
 FLOAT_TYPE: "Float32"
-anim: false
 atmos_config_file: "config/benchmark_configs/climaatmos_diagedmf.yml"
 atmos_config_repo: "ClimaCoupler"
 dt_cpl: 120
@@ -10,7 +9,7 @@ land_albedo_type: "map_temporal"
 mode_name: "amip"
 mono_surface: false
 monthly_checkpoint: false
-start_date: "19790301"
+start_date: "20100101"
 t_end: "12hours"
 turb_flux_partition: "CombinedStateFluxesMOST"
 use_coupler_diagnostics: false
diff --git a/config/benchmark_configs/amip_diagedmf_io.yml b/config/benchmark_configs/amip_diagedmf_io.yml
index 1b1679bcdf..553873254a 100644
--- a/config/benchmark_configs/amip_diagedmf_io.yml
+++ b/config/benchmark_configs/amip_diagedmf_io.yml
@@ -1,5 +1,4 @@
 FLOAT_TYPE: "Float32"
-anim: false
 atmos_config_file: "config/benchmark_configs/climaatmos_diagedmf_io.yml"
 atmos_config_repo: "ClimaCoupler"
 dt_cpl: 120
@@ -10,7 +9,7 @@ land_albedo_type: "map_temporal"
 mode_name: "amip"
 mono_surface: false
 monthly_checkpoint: false
-start_date: "19790301"
+start_date: "20100101"
 t_end: "12hours"
 turb_flux_partition: "CombinedStateFluxesMOST"
 use_coupler_diagnostics: true
diff --git a/config/ci_configs/interactive_debug.yml b/config/ci_configs/interactive_debug.yml
index 9226a84d93..ba37db2dbf 100644
--- a/config/ci_configs/interactive_debug.yml
+++ b/config/ci_configs/interactive_debug.yml
@@ -13,7 +13,7 @@ moist: "equil"
 mono_surface: true
 precip_model: "0M"
 rad: "gray"
-start_date: "19790301"
+start_date: "20100101"
 surface_setup: "PrescribedSurface"
 t_end: "20days"
 turb_flux_partition: "CombinedStateFluxesMOST"
diff --git a/config/longrun_configs/amip_n1_shortrun.yml b/config/longrun_configs/amip_n1_shortrun.yml
index 404847bf6c..8882e87484 100644
--- a/config/longrun_configs/amip_n1_shortrun.yml
+++ b/config/longrun_configs/amip_n1_shortrun.yml
@@ -1,8 +1,6 @@
-apply_limiter: false
-dt: "150secs"
-dt_cpl: 150
+dt: "120secs"
+dt_cpl: 120
 dt_rad: "1hours"
-dt_save_to_sol: "100days"
 dz_bottom: 30
 dz_top: 3000
 energy_check: false
@@ -14,6 +12,6 @@ precip_model: "0M"
 rad: "gray"
 rayleigh_sponge: true
 t_end: "1days"
-vert_diff: "true"
-z_elem: 50
-z_stretch: false
+vert_diff: true
+z_max: 55000.0
+z_elem: 63
diff --git a/config/longrun_configs/amip_n1_shortrun_nocouple.yml b/config/longrun_configs/amip_n1_shortrun_nocouple.yml
deleted file mode 100644
index fcdb4f0aac..0000000000
--- a/config/longrun_configs/amip_n1_shortrun_nocouple.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-apply_limiter: false
-dt: "150secs"
-dt_cpl: 86200
-dt_rad: "1hours"
-dt_save_to_sol: "100days"
-dz_bottom: 30
-dz_top: 3000
-energy_check: false
-h_elem: 16
-mode_name: "amip"
-moist: "equil"
-mono_surface: false
-precip_model: "0M"
-rad: "gray"
-rayleigh_sponge: true
-t_end: "1days"
-vert_diff: "true"
-z_elem: 50
-z_stretch: false
diff --git a/config/longrun_configs/amip_n2_shortrun.yml b/config/longrun_configs/amip_n2_shortrun.yml
deleted file mode 100644
index 112f94d8e5..0000000000
--- a/config/longrun_configs/amip_n2_shortrun.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-apply_limiter: false
-dt: 150secs
-dt_cpl: 150
-dt_rad: 1hours
-dt_save_to_sol: "100days"
-dz_bottom: 30
-dz_top: 3000
-energy_check: false
-h_elem: 16
-mode_name: "amip"
-moist: "equil"
-mono_surface: false
-precip_model: "0M"
-rad: "gray"
-rayleigh_sponge: true
-t_end: "1days"
-vert_diff: "true"
-z_elem: 50
-z_stretch: false
diff --git a/config/longrun_configs/amip_n32_shortrun.yml b/config/longrun_configs/amip_n32_shortrun.yml
deleted file mode 100644
index 3efc860b02..0000000000
--- a/config/longrun_configs/amip_n32_shortrun.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-apply_limiter: false
-dt: "150secs"
-dt_cpl: 150
-dt_rad: "1hours"
-dt_save_to_sol: "100days"
-dz_bottom: 30
-dz_top: 3000
-energy_check: false
-h_elem: 16
-mode_name: "amip"
-moist: "equil"
-mono_surface: false
-precip_model: "0M"
-rad: "gray"
-rayleigh_sponge: true
-t_end: "10days"
-vert_diff: "true"
-z_elem: 50
-z_stretch: false
diff --git a/config/longrun_configs/amip_n64_shortrun.yml b/config/longrun_configs/amip_n64_shortrun.yml
deleted file mode 100644
index 3efc860b02..0000000000
--- a/config/longrun_configs/amip_n64_shortrun.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-apply_limiter: false
-dt: "150secs"
-dt_cpl: 150
-dt_rad: "1hours"
-dt_save_to_sol: "100days"
-dz_bottom: 30
-dz_top: 3000
-energy_check: false
-h_elem: 16
-mode_name: "amip"
-moist: "equil"
-mono_surface: false
-precip_model: "0M"
-rad: "gray"
-rayleigh_sponge: true
-t_end: "10days"
-vert_diff: "true"
-z_elem: 50
-z_stretch: false
diff --git a/config/longrun_configs/amip_n8_shortrun.yml b/config/longrun_configs/amip_n8_shortrun.yml
deleted file mode 100644
index 3efc860b02..0000000000
--- a/config/longrun_configs/amip_n8_shortrun.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-apply_limiter: false
-dt: "150secs"
-dt_cpl: 150
-dt_rad: "1hours"
-dt_save_to_sol: "100days"
-dz_bottom: 30
-dz_top: 3000
-energy_check: false
-h_elem: 16
-mode_name: "amip"
-moist: "equil"
-mono_surface: false
-precip_model: "0M"
-rad: "gray"
-rayleigh_sponge: true
-t_end: "10days"
-vert_diff: "true"
-z_elem: 50
-z_stretch: false
diff --git a/config/longrun_configs/amip_target.yml b/config/longrun_configs/amip_target.yml
index 9b227c762b..ed30e43e10 100644
--- a/config/longrun_configs/amip_target.yml
+++ b/config/longrun_configs/amip_target.yml
@@ -1,13 +1,10 @@
 FLOAT_TYPE: "Float32"
-anim: true
-apply_limiter: false
 atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
 dt: "120secs"
 dt_cloud_fraction: "1hours"
 dt_cpl: 120
 dt_rad: "1hours"
 dt_save_state_to_disk: "20days"
-dt_save_to_sol: "10days"
 energy_check: false
 hourly_checkpoint: true
 insolation: "timevarying"
diff --git a/config/longrun_configs/amip_target_topo.yml b/config/longrun_configs/amip_target_topo.yml
index 40c23b1c22..ae27587d86 100644
--- a/config/longrun_configs/amip_target_topo.yml
+++ b/config/longrun_configs/amip_target_topo.yml
@@ -1,14 +1,11 @@
 FLOAT_TYPE: "Float32"
 albedo_model: "CouplerAlbedo"
-anim: true
-apply_limiter: false
 atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M_earth.yml"
 dt: "120secs"
 dt_cloud_fraction: "1hours"
 dt_cpl: 120
 dt_rad: "1hours"
 dt_save_state_to_disk: "20days"
-dt_save_to_sol: "10days"
 energy_check: false
 hourly_checkpoint: true
 insolation: "timevarying"
diff --git a/config/longrun_configs/amip_target_topo_diagedmf_cpu.yml b/config/longrun_configs/amip_target_topo_diagedmf_cpu.yml
index dcf5b23fe6..5c8649b1ff 100644
--- a/config/longrun_configs/amip_target_topo_diagedmf_cpu.yml
+++ b/config/longrun_configs/amip_target_topo_diagedmf_cpu.yml
@@ -1,13 +1,11 @@
 FLOAT_TYPE: "Float32"
 albedo_model: "CouplerAlbedo"
-anim: false
 atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml"
 dt: "120secs"
 dt_cloud_fraction: "1hours"
 dt_cpl: 120
 dt_rad: "1hours"
 dt_save_state_to_disk: "20days"
-dt_save_to_sol: "10days"
 energy_check: false
 insolation: "timevarying"
 hourly_checkpoint: false
diff --git a/config/longrun_configs/amip_target_topo_diagedmf_gpu.yml b/config/longrun_configs/amip_target_topo_diagedmf_gpu.yml
index 3f464f8961..69a8c35e4a 100644
--- a/config/longrun_configs/amip_target_topo_diagedmf_gpu.yml
+++ b/config/longrun_configs/amip_target_topo_diagedmf_gpu.yml
@@ -1,13 +1,11 @@
 FLOAT_TYPE: "Float32"
 albedo_model: "CouplerAlbedo"
-anim: false
 atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml"
 dt: "120secs"
 dt_cloud_fraction: "1hours"
 dt_cpl: 120
 dt_rad: "1hours"
 dt_save_state_to_disk: "20days"
-dt_save_to_sol: "10days"
 energy_check: false
 insolation: "timevarying"
 hourly_checkpoint: false
diff --git a/config/longrun_configs/longrun_amip_dyamond.yml b/config/longrun_configs/longrun_amip_dyamond.yml
index f3de1d7986..5c6d17c83b 100644
--- a/config/longrun_configs/longrun_amip_dyamond.yml
+++ b/config/longrun_configs/longrun_amip_dyamond.yml
@@ -1,4 +1,3 @@
-anim: false
 atmos_config_file: "config/longrun_configs/longrun_aquaplanet_dyamond.yml"
 dt: "30secs"
 dt_cpl: 30
diff --git a/config/longrun_configs/slabplanet_aqua_atmos_sf_couple.yml b/config/longrun_configs/slabplanet_aqua_atmos_sf_couple.yml
index fac27d421c..68960deb59 100644
--- a/config/longrun_configs/slabplanet_aqua_atmos_sf_couple.yml
+++ b/config/longrun_configs/slabplanet_aqua_atmos_sf_couple.yml
@@ -1,5 +1,4 @@
 anim: true
-apply_limiter: false
 conservation_softfail: true
 dt: "200secs"
 dt_cpl: 200
@@ -13,8 +12,8 @@ moist: "equil"
 mono_surface: true
 precip_model: "0M"
 rad: "gray"
-start_date: "19790301"
+start_date: "20100101"
 surface_setup: "DefaultMoninObukhov"
 t_end: "20days"
 turb_flux_partition: "CombinedStateFluxesMOST"
-vert_diff: "true"
+vert_diff: "FriersonDiffusion"
diff --git a/config/longrun_configs/slabplanet_aqua_atmos_sf_nocouple.yml b/config/longrun_configs/slabplanet_aqua_atmos_sf_nocouple.yml
index b7128729df..3e42ced074 100644
--- a/config/longrun_configs/slabplanet_aqua_atmos_sf_nocouple.yml
+++ b/config/longrun_configs/slabplanet_aqua_atmos_sf_nocouple.yml
@@ -1,5 +1,4 @@
 anim: true
-apply_limiter: false
 conservation_softfail: true
 dt: "200secs"
 dt_cpl: 1728000
@@ -13,8 +12,8 @@ moist: "equil"
 mono_surface: true
 precip_model: "0M"
 rad: "gray"
-start_date: "19790301"
+start_date: "20100101"
 surface_setup: "DefaultMoninObukhov"
 t_end: "20days"
 turb_flux_partition: "CombinedStateFluxesMOST"
-vert_diff: "true"
+vert_diff: "FriersonDiffusion"
diff --git a/config/longrun_configs/slabplanet_aqua_coupler_sf.yml b/config/longrun_configs/slabplanet_aqua_coupler_sf.yml
index 4508d7a38f..58b2029cf5 100644
--- a/config/longrun_configs/slabplanet_aqua_coupler_sf.yml
+++ b/config/longrun_configs/slabplanet_aqua_coupler_sf.yml
@@ -1,5 +1,4 @@
 anim: true
-apply_limiter: false
 conservation_softfail: true
 dt: "200secs"
 dt_cpl: 200
@@ -13,8 +12,8 @@ moist: "equil"
 mono_surface: true
 precip_model: "0M"
 rad: "gray"
-start_date: "19790301"
+start_date: "20100101"
 surface_setup: "PrescribedSurface"
 t_end: "20days"
 turb_flux_partition: "CombinedStateFluxesMOST"
-vert_diff: "true"
+vert_diff: "FriersonDiffusion"
diff --git a/config/longrun_configs/slabplanet_aqua_coupler_sf_evolve_ocn.yml b/config/longrun_configs/slabplanet_aqua_coupler_sf_evolve_ocn.yml
index ad57a1b47f..646a5275e0 100644
--- a/config/longrun_configs/slabplanet_aqua_coupler_sf_evolve_ocn.yml
+++ b/config/longrun_configs/slabplanet_aqua_coupler_sf_evolve_ocn.yml
@@ -1,5 +1,4 @@
 anim: true
-apply_limiter: false
 dt: "200secs"
 dt_cpl: 200
 dt_save_to_sol: "10days"
@@ -12,7 +11,7 @@ moist: "equil"
 mono_surface: true
 precip_model: "0M"
 rad: "gray"
-start_date: "19790301"
+start_date: "20100101"
 surface_setup: "PrescribedSurface"
 t_end: "20days"
 turb_flux_partition: "CombinedStateFluxesMOST"
diff --git a/config/longrun_configs/slabplanet_aqua_target.yml b/config/longrun_configs/slabplanet_aqua_target.yml
index 18c129fe8a..6bbb5f9c13 100644
--- a/config/longrun_configs/slabplanet_aqua_target.yml
+++ b/config/longrun_configs/slabplanet_aqua_target.yml
@@ -1,5 +1,4 @@
 anim: true
-apply_limiter: false
 atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
 dt: "120secs"
 dt_cloud_fraction: "1hours"
@@ -13,7 +12,7 @@ hourly_checkpoint: true
 land_albedo_type: "function"
 mode_name: "slabplanet_aqua"
 mono_surface: false
-start_date: "19790301"
+start_date: "20100101"
 surface_setup: "PrescribedSurface"
 t_end: "120days"
 turb_flux_partition: "CombinedStateFluxesMOST"
diff --git a/config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml b/config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml
index a6ebc3a8ce..49aae5f470 100644
--- a/config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml
+++ b/config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml
@@ -1,5 +1,4 @@
 anim: true
-apply_limiter: false
 atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
 dt: "120secs"
 dt_cloud_fraction: "1hours"
@@ -13,7 +12,7 @@ hourly_checkpoint: true
 land_albedo_type: "function"
 mode_name: "slabplanet_aqua"
 mono_surface: false
-start_date: "19790301"
+start_date: "20100101"
 surface_setup: "PrescribedSurface"
 t_end: "120days"
 turb_flux_partition: "CombinedStateFluxesMOST"
diff --git a/config/longrun_configs/slabplanet_aqua_target_nocouple.yml b/config/longrun_configs/slabplanet_aqua_target_nocouple.yml
index c4ca3feee1..b8ac223402 100644
--- a/config/longrun_configs/slabplanet_aqua_target_nocouple.yml
+++ b/config/longrun_configs/slabplanet_aqua_target_nocouple.yml
@@ -1,9 +1,8 @@
 anim: true
-apply_limiter: false
 atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
 dt: "120secs"
 dt_cloud_fraction: "1hours"
-dt_cpl: 8639800
+dt_cpl: 10368000
 dt_rad: "1hours"
 dt_save_state_to_disk: "20days"
 dt_save_to_sol: "10days"
@@ -13,7 +12,7 @@ hourly_checkpoint: true
 land_albedo_type: "function"
 mode_name: "slabplanet_aqua"
 mono_surface: false
-start_date: "19790301"
+start_date: "20100101"
 surface_setup: "DefaultMoninObukhov"
 t_end: "120days"
 turb_flux_partition: "CombinedStateFluxesMOST"
diff --git a/config/longrun_configs/slabplanet_coupler_sf_evolve_ocn.yml b/config/longrun_configs/slabplanet_coupler_sf_evolve_ocn.yml
index c0b22b0936..c3134ee1fd 100644
--- a/config/longrun_configs/slabplanet_coupler_sf_evolve_ocn.yml
+++ b/config/longrun_configs/slabplanet_coupler_sf_evolve_ocn.yml
@@ -1,5 +1,4 @@
 anim: true
-apply_limiter: false
 dt: "200secs"
 dt_cpl: 200
 dt_save_to_sol: "10days"
@@ -12,7 +11,7 @@ moist: "equil"
 mono_surface: true
 precip_model: "0M"
 rad: "gray"
-start_date: "19790301"
+start_date: "20100101"
 surface_setup: "PrescribedSurface"
 t_end: "20days"
 turb_flux_partition: "CombinedStateFluxesMOST"
diff --git a/config/longrun_configs/slabplanet_target.yml b/config/longrun_configs/slabplanet_target.yml
index e2292c9824..fa21660e52 100644
--- a/config/longrun_configs/slabplanet_target.yml
+++ b/config/longrun_configs/slabplanet_target.yml
@@ -1,5 +1,4 @@
 anim: true
-apply_limiter: false
 atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
 dt: "120secs"
 dt_cloud_fraction: "1hours"
@@ -13,8 +12,8 @@ hourly_checkpoint: true
 land_albedo_type: "function"
 mode_name: "slabplanet"
 mono_surface: false
-start_date: "19790301"
+start_date: "20100101"
 surface_setup: "PrescribedSurface"
 t_end: "120days"
 turb_flux_partition: "CombinedStateFluxesMOST"
-vert_diff: "true"
+vert_diff: "FriersonDiffusion"
diff --git a/config/longrun_configs/slabplanet_target_evolve_ocn.yml b/config/longrun_configs/slabplanet_target_evolve_ocn.yml
index a30deeee3b..554a28fd74 100644
--- a/config/longrun_configs/slabplanet_target_evolve_ocn.yml
+++ b/config/longrun_configs/slabplanet_target_evolve_ocn.yml
@@ -1,5 +1,4 @@
 anim: true
-apply_limiter: false
 atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
 dt: "120secs"
 dt_cloud_fraction: "1hours"
@@ -13,7 +12,7 @@ hourly_checkpoint: true
 land_albedo_type: "function"
 mode_name: "slabplanet"
 mono_surface: false
-start_date: "19790301"
+start_date: "20100101"
 surface_setup: "PrescribedSurface"
 t_end: "120days"
 turb_flux_partition: "CombinedStateFluxesMOST"
diff --git a/config/longrun_configs/slabplanet_terra.yml b/config/longrun_configs/slabplanet_terra.yml
index 9dabce25c9..dc03ccdc0f 100644
--- a/config/longrun_configs/slabplanet_terra.yml
+++ b/config/longrun_configs/slabplanet_terra.yml
@@ -1,5 +1,4 @@
 anim: true
-apply_limiter: false
 conservation_softfail: true
 dt: "200secs"
 dt_cpl: 200
@@ -12,8 +11,8 @@ moist: "equil"
 mono_surface: true
 precip_model: "0M"
 rad: "gray"
-start_date: "19790301"
+start_date: "20100101"
 surface_setup: "PrescribedSurface"
 t_end: "20days"
 turb_flux_partition: "CombinedStateFluxesMOST"
-vert_diff: "true"
+vert_diff: "FriersonDiffusion"
diff --git a/test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.toml b/test/component_model_tests/climaatmos_standalone/longrun_aquaplanet.toml
similarity index 100%
rename from test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.toml
rename to test/component_model_tests/climaatmos_standalone/longrun_aquaplanet.toml
diff --git a/test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.yml b/test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_allsky_tvinsol_0M_slabocean.yml
similarity index 85%
rename from test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.yml
rename to test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_allsky_tvinsol_0M_slabocean.yml
index 8185a694a1..4a2cb4af89 100644
--- a/test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.yml
+++ b/test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_allsky_tvinsol_0M_slabocean.yml
@@ -1,21 +1,22 @@
 approximate_linear_solve_iters: 2
 bubble: false
 check_conservation: true
+dt_cloud_fraction: 1hours
 dt_rad: "1hours"
 dt_save_state_to_disk: "10days"
-dt: "150secs"
+dt: "120secs"
 dz_bottom: 30.0
 dz_top: 3000.0
 h_elem: 16
-idealized_insolation: false
+insolation: "timevarying"
 implicit_diffusion: true
 moist: "equil"
 precip_model: "0M"
 prognostic_surface: "PrognosticSurfaceTemperature"
-rad: "clearsky"
+rad: "allsky"
 rayleigh_sponge: true
 surface_setup: "DefaultMoninObukhov"
-t_end: "100days"
+t_end: "120days"
 coupler_toml_file: "test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.toml"
 vert_diff: "FriersonDiffusion"
 z_elem: 63