From 21fb81bf284a93df8314de6f49ce3280bd8a4337 Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Thu, 17 Feb 2022 11:42:21 -0700
Subject: [PATCH 1/6] Use --app flag for SAM inputs, as syntax got incompatible
 with bluecrab, refs #6

---
 htgr/mhtgr/tests         | 1 +
 msr/msre/tests           | 2 +-
 pbfhr/sam_model/tests    | 4 ++--
 sfr/bison_thermal_only.i | 2 +-
 sfr/tests                | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/htgr/mhtgr/tests b/htgr/mhtgr/tests
index 75244ab61..ba7aca4f2 100644
--- a/htgr/mhtgr/tests
+++ b/htgr/mhtgr/tests
@@ -4,5 +4,6 @@
     input = 'MHTGR.i'
     check_input = True
     executable_pattern = 'sam*|blue_crab*'
+    cli_args = '--app SamApp'
   []
 []
diff --git a/msr/msre/tests b/msr/msre/tests
index 61b86e8c2..cdc953a2f 100644
--- a/msr/msre/tests
+++ b/msr/msre/tests
@@ -3,7 +3,7 @@
     type = 'CSVDiff'
     input = 'msre_loop_1d.i'
     csvdiff = 'msre_loop_1d_csv.csv'
-    cli_args = 'Executioner/num_steps=10'
+    cli_args = '--app SamApp Executioner/num_steps=10'
     allow_warnings = true
     executable_pattern = 'sam*|blue_crab*'
   []
diff --git a/pbfhr/sam_model/tests b/pbfhr/sam_model/tests
index 5cb044d4f..025b38a12 100644
--- a/pbfhr/sam_model/tests
+++ b/pbfhr/sam_model/tests
@@ -21,7 +21,7 @@
     input = pbfhr-ss.i
     csvdiff = 'pbfhr-ss_bc.csv'
     executable_pattern = 'blue_crab*'
-    cli_args = "Outputs/file_base=pbfhr-ss_bc Executioner/num_steps=2 DefaultElementQuality/failure_type=Warning Outputs/hide='pool1:volume_change pool2:volume_change' "
+    cli_args = "--app SamApp Outputs/file_base=pbfhr-ss_bc Executioner/num_steps=2 DefaultElementQuality/failure_type=Warning Outputs/hide='pool1:volume_change pool2:volume_change'"
     allow_warnings = true
   []
   [transient_crab]
@@ -30,7 +30,7 @@
     check_input = true
     executable_pattern = 'blue_crab*'
     prereq = steady_state_crab
-    cli_args = "Problem/active='' DefaultElementQuality/failure_type=Warning Problem/restart_file_base=pbfhr-ss_bc_cp/LATEST"
+    cli_args = "--app SamApp Problem/active='' DefaultElementQuality/failure_type=Warning Problem/restart_file_base=pbfhr-ss_bc_cp/LATEST"
     allow_warnings = true
   []
 []
diff --git a/sfr/bison_thermal_only.i b/sfr/bison_thermal_only.i
index 1f8aecdba..8fbaedaee 100644
--- a/sfr/bison_thermal_only.i
+++ b/sfr/bison_thermal_only.i
@@ -355,7 +355,7 @@ plenum_height        = 1.
 [MultiApps]
   [sam]
     type = FullSolveMultiApp
-    app_type = BlueCrabApp
+    app_type = SamApp
     positions = '0 0 0'
     input_files = sam_channel.i
     execute_on = 'TIMESTEP_END'
diff --git a/sfr/tests b/sfr/tests
index 1c319c502..5057ae8a2 100644
--- a/sfr/tests
+++ b/sfr/tests
@@ -38,5 +38,6 @@
     input = 'sam_channel.i'
     check_input = True
     executable_pattern = 'sam*|blue_crab*'
+    cli_args = '--app SamApp'
   []
 []

From 23a08c22adae53feb264005ef073140fa7a7b4a8 Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Thu, 17 Feb 2022 22:48:14 -0700
Subject: [PATCH 2/6] Attempt to fix pbmr transient file

---
 .../oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i        | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/htgr/pbmr400/transient/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i b/htgr/pbmr400/transient/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i
index ad8daf18a..d82c76fca 100755
--- a/htgr/pbmr400/transient/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i
+++ b/htgr/pbmr400/transient/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i
@@ -141,11 +141,18 @@ fis_fract            = ${fparse 1 - dh_fract} # Fission power fraction at t = 0.
                      133 133 133 133 155 116 113 113 113 113 113 135 164 144 144 152 152 152 189 190 '
   []
   [cartesian_mesh_ids]
-    type = SubdomainElementIDs
+    type = SubdomainExtraElementIDGenerator
     input = cartesian_mesh
     subdomains   = ${all_bloks}
-    equivalence_ids = ${all_bloks}
-    material_ids = ${material_ids}
+    extra_element_id_names = 'material_id'
+    extra_element_ids = ${material_ids}
+  []
+  [cartesian_mesh_ids_2]
+    type = SubdomainExtraElementIDGenerator
+    input = cartesian_mesh
+    subdomains   = ${all_bloks}
+    extra_element_id_names = 'equivalence_id'
+    extra_element_ids = ${all_bloks}
   []
   uniform_refine = 0
 []

From b3bcaa075ec8ec7f9b6e3cdbf3b3f9f9f5fa69f0 Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Fri, 18 Feb 2022 09:58:34 -0700
Subject: [PATCH 3/6] Update PBMR inputs with PFNKMOrefs #6 Update syntax of
 fission source, power iteration, eigenvalue executioner, refs #6

---
 ...oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i | 11 +--
 htgr/pbmr400/steady/tests                     | 78 ++++++++++++++++---
 .../oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i  | 15 +---
 3 files changed, 75 insertions(+), 29 deletions(-)

diff --git a/htgr/pbmr400/steady/oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i b/htgr/pbmr400/steady/oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i
index bd99a1522..59f461555 100755
--- a/htgr/pbmr400/steady/oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i
+++ b/htgr/pbmr400/steady/oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i
@@ -640,7 +640,7 @@ fis_fract            = ${fparse 1 - dh_fract} # Fission power fraction at t = 0.
     n_delay_groups = 6
     family = LAGRANGE
     order = FIRST
-    fission_source_as_material = true
+    fission_source_aux = true
     assemble_scattering_jacobian = true
     assemble_fission_jacobian = true
     diffusion_kernel_type = tensor
@@ -656,8 +656,8 @@ fis_fract            = ${fparse 1 - dh_fract} # Fission power fraction at t = 0.
 []
 
 [Executioner]
-  type = PicardEigen # Picard iteration to reach stable NK+TH solution.
-  solve_type = 'PJFNK'
+  type = Eigenvalue # Picard iteration to reach stable NK+TH solution.
+  solve_type = 'PJFNKMO'
   petsc_options_iname = '-pc_type -pc_hypre_type -ksp_gmres_restart'
   petsc_options_value = 'hypre boomeramg 50'
   line_search = none
@@ -677,10 +677,7 @@ fis_fract            = ${fparse 1 - dh_fract} # Fission power fraction at t = 0.
   []
 
   # Power iterations.
-  free_power_iterations = 2
-  extra_free_pi = 2
-  output_after_power_iterations = false
-  output_before_normalization = false
+  free_power_iterations = 4
 
   # Multiphysics coupling iterationa.
   fixed_point_abs_tol = 1e-7
diff --git a/htgr/pbmr400/steady/tests b/htgr/pbmr400/steady/tests
index 6910276b6..461dbefa3 100644
--- a/htgr/pbmr400/steady/tests
+++ b/htgr/pbmr400/steady/tests
@@ -1,44 +1,100 @@
 [Tests]
-  [multiphysics]
+  # Individual steady syntax checks
+  [neutronics_syntax_only]
     type = RunApp
     input = 'oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i'
-    executable_pattern = 'blue_crab*|fenix*'
-    cli_args = 'Executioner/fixed_point_max_its=1'
+    check_input = True
+    executable_pattern = 'griffin*|blue_crab*|dire_wolf*|fenix*'
+    cli_args = "MultiApps/active='' Transfers/active=''"
     method = 'opt' # see Griffin #230
-    min_parallel = 4
   []
-  [neutronics]
+  [fluid_flow_syntax_only]
     type = RunApp
-    input = 'oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i'
+    input = 'oecd_pbmr400_ss1_phtn_flow_path.i'
+    check_input = True
+    executable_pattern = 'pronghorn*|blue_crab*|fenix*'
+    cli_args = "MultiApps/active='' Transfers/active=''"
+  []
+  [fuel_performance_syntax_only]
+    type = RunApp
+    input = 'oecd_pbmr400_ss2_mhtr_pebble_triso.i'
+    check_input = True
+    executable_pattern = 'pronghorn*|blue_crab*|fenix*'
+    cli_args = 'Executioner/num_steps=1'
+  []
+
+  # Individual transient syntax checks
+  [transient_neutronics_syntax_only]
+    type = RunApp
+    working_directory = '../transient'
+    input = 'oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i'
     check_input = True
     executable_pattern = 'griffin*|blue_crab*|dire_wolf*|fenix*'
     cli_args = "MultiApps/active='' Transfers/active=''"
+    prereq = 'multiphysics'
     method = 'opt' # see Griffin #230
   []
-  [fluid_flow]
+  [transient_fluid_flow_syntax_only]
     type = RunApp
-    input = 'oecd_pbmr400_ss1_phtn_flow_path.i'
+    working_directory = '../transient'
+    input = 'oecd_pbmr400_tr1_pplofc_phtn_flow_path.i'
     check_input = True
     executable_pattern = 'pronghorn*|blue_crab*|fenix*'
     cli_args = "MultiApps/active='' Transfers/active=''"
   []
-  [fuel_performance]
+  [transient_fuel_performance_syntax_only]
     type = RunApp
-    input = 'oecd_pbmr400_ss2_mhtr_pebble_triso.i'
+    working_directory = '../transient'
+    input = 'oecd_pbmr400_tr2_pplofc_mhtr_pebble_triso.i'
     check_input = True
     executable_pattern = 'pronghorn*|blue_crab*|fenix*'
     cli_args = 'Executioner/num_steps=1'
   []
+
+  # Run simulation, no results checking
+  [steady_multiphysics]
+    type = RunApp
+    input = 'oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i'
+    executable_pattern = 'blue_crab*|fenix*'
+    cli_args = 'Executioner/fixed_point_max_its=1'
+    method = 'opt' # see Griffin #230
+    min_parallel = 4
+  []
+
   # This will fail until:
   # - griffin can load restart binary files from another folder
   # - the issue with cross sections (tensor diffusion coef) is fixed
   [transient_multiphysics]
     type = RunApp
+    working_directory = '../transient'
     input = 'oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i'
     executable_pattern = 'blue_crab*|fenix*'
-    working_directory = '../transient'
     cli_args = 'Executioner/num_steps=1'
     prereq = 'multiphysics'
     method = 'opt' # see Griffin #230
   []
+
+  # Regression tests
+  [neutronics_syntax_only]
+    type = CSVDiff
+    input = 'oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i'
+    check_input = True
+    executable_pattern = 'griffin*|blue_crab*|dire_wolf*|fenix*'
+    cli_args = "MultiApps/active='' Transfers/active=''"
+    method = 'opt' # see Griffin #230
+  []
+  [fluid_flow_syntax_only]
+    type = CSVDiff
+    input = 'oecd_pbmr400_ss1_phtn_flow_path.i'
+    check_input = True
+    executable_pattern = 'pronghorn*|blue_crab*|fenix*'
+    cli_args = "MultiApps/active='' Transfers/active=''"
+  []
+  [fuel_performance_syntax_only]
+    type = CSVDiff
+    input = 'oecd_pbmr400_ss2_mhtr_pebble_triso.i'
+    check_input = True
+    executable_pattern = 'pronghorn*|blue_crab*|fenix*'
+    cli_args = 'Executioner/num_steps=1'
+  []
 []
diff --git a/htgr/pbmr400/transient/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i b/htgr/pbmr400/transient/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i
index d82c76fca..8073a869a 100755
--- a/htgr/pbmr400/transient/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i
+++ b/htgr/pbmr400/transient/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i
@@ -143,16 +143,9 @@ fis_fract            = ${fparse 1 - dh_fract} # Fission power fraction at t = 0.
   [cartesian_mesh_ids]
     type = SubdomainExtraElementIDGenerator
     input = cartesian_mesh
-    subdomains   = ${all_bloks}
-    extra_element_id_names = 'material_id'
-    extra_element_ids = ${material_ids}
-  []
-  [cartesian_mesh_ids_2]
-    type = SubdomainExtraElementIDGenerator
-    input = cartesian_mesh
-    subdomains   = ${all_bloks}
-    extra_element_id_names = 'equivalence_id'
-    extra_element_ids = ${all_bloks}
+    subdomains = ${all_bloks}
+    extra_element_id_names = 'material_id equivalence_id'
+    extra_element_ids = '${material_ids}; ${all_bloks}'
   []
   uniform_refine = 0
 []
@@ -680,7 +673,7 @@ fis_fract            = ${fparse 1 - dh_fract} # Fission power fraction at t = 0.
     n_delay_groups = 6
     family = LAGRANGE
     order = FIRST
-    fission_source_as_material = true
+    fission_source_aux = true
     assemble_scattering_jacobian = true
     assemble_fission_jacobian = true
     diffusion_kernel_type = tensor

From a3d6046cc22c2822c732527ab31fed56fb9b29df Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Fri, 18 Feb 2022 10:36:08 -0700
Subject: [PATCH 4/6] Add regression testing for PBMR inputs, refs #53

---
 ...cd_pbmr400_ss0_rsnk_eigen_value_ix_dep.csv |  3 +
 .../gold/oecd_pbmr400_ss1_phtn_flow_path.csv  |  7 ++
 .../oecd_pbmr400_ss2_mhtr_pebble_triso.csv    |  4 ++
 ...oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.csv |  3 +
 ...oecd_pbmr400_tr1_pplofc_phtn_flow_path.csv |  7 ++
 ...ecd_pbmr400_tr2_lf40_mhtr_pebble_triso.csv |  4 ++
 htgr/pbmr400/steady/tests                     | 64 ++++++++++++++-----
 7 files changed, 77 insertions(+), 15 deletions(-)
 create mode 100644 htgr/pbmr400/steady/gold/oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.csv
 create mode 100644 htgr/pbmr400/steady/gold/oecd_pbmr400_ss1_phtn_flow_path.csv
 create mode 100644 htgr/pbmr400/steady/gold/oecd_pbmr400_ss2_mhtr_pebble_triso.csv
 create mode 100644 htgr/pbmr400/steady/gold/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.csv
 create mode 100644 htgr/pbmr400/steady/gold/oecd_pbmr400_tr1_pplofc_phtn_flow_path.csv
 create mode 100644 htgr/pbmr400/steady/gold/oecd_pbmr400_tr2_lf40_mhtr_pebble_triso.csv

diff --git a/htgr/pbmr400/steady/gold/oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.csv b/htgr/pbmr400/steady/gold/oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.csv
new file mode 100644
index 000000000..85d90ed4e
--- /dev/null
+++ b/htgr/pbmr400/steady/gold/oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.csv
@@ -0,0 +1,3 @@
+time,Decay_heat_tot,FRR_avg,Fiss_power_tot,NI_avg,NXe_avg,T_fuel_avg,T_mod_avg,T_ref_avg,Tt_pow,Tt_pow_check,eigenvalue,flux0_avg,flux1_avg,iodine_yield_avg,power_density_max,power_scaling,scaled_fast_flux_max,scaled_thermal_flux_max,xenon_yield_avg
+0,25704000,1.5245216104979e+17,374296000,0,0,900,700,700,400000000,400000000,1,9.0972125609476e+17,9.0972125609476e+17,0,0,2.9898536896588e+18,0,0,0
+1,25704000,1.5244890404514e+17,374296000,0.33228066245312,0.069961311140756,900,700,700,400000000,400000000,0.97812617654251,9.4869507187592e+17,9.1709749412722e+17,0.063862452014911,6307002.4191342,3.0283398832533e+18,1.2239880893765e+18,1.6641083271698e+18,0.0043609085076789
diff --git a/htgr/pbmr400/steady/gold/oecd_pbmr400_ss1_phtn_flow_path.csv b/htgr/pbmr400/steady/gold/oecd_pbmr400_ss1_phtn_flow_path.csv
new file mode 100644
index 000000000..bb910554e
--- /dev/null
+++ b/htgr/pbmr400/steady/gold/oecd_pbmr400_ss1_phtn_flow_path.csv
@@ -0,0 +1,7 @@
+time,T_fluid_avg,T_fuel_avg,T_mod_avg,T_solid_avg,Tt_mfr_core_out,Tt_mfr_in,Tt_mfr_out,Tt_normalized_pow,Tt_pow,time_step_pp
+0,773.15,900,700,773.15,252.33485276416,-192.69977534233,123.11785397528,0,0,0
+0.01,773.15,900,700,773.15,86.611982323528,-173.4297978081,56.869583415037,0,0,0.01
+0.05,773.15,900,700,773.15,154.92155962714,-173.4297978081,99.771257151472,0,0,0.04
+0.21,773.15,900,700,773.15,187.21563454771,-173.4297978081,120.0497586682,0,0,0.16
+0.85,773.14999999554,900,700,773.1499999949,192.52245741576,-173.4297978081,123.38201449603,0,0,0.64
+3.41,773.1498033553,900,700,773.14978393211,192.76392310825,-173.4297978081,123.53362948339,0,0,2.56
diff --git a/htgr/pbmr400/steady/gold/oecd_pbmr400_ss2_mhtr_pebble_triso.csv b/htgr/pbmr400/steady/gold/oecd_pbmr400_ss2_mhtr_pebble_triso.csv
new file mode 100644
index 000000000..23e2b2b4c
--- /dev/null
+++ b/htgr/pbmr400/steady/gold/oecd_pbmr400_ss2_mhtr_pebble_triso.csv
@@ -0,0 +1,4 @@
+time,fuel_average_temp,moderator_average_temp,pebble_core_average_temp,pebble_surface_temp
+0,0,0,0,0
+1e+15,0,0,0,0
+2e+15,0,0,0,0
diff --git a/htgr/pbmr400/steady/gold/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.csv b/htgr/pbmr400/steady/gold/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.csv
new file mode 100644
index 000000000..d3aa2ab7d
--- /dev/null
+++ b/htgr/pbmr400/steady/gold/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.csv
@@ -0,0 +1,3 @@
+time,Decay_heat_tot,FRR_avg,Fiss_power_tot,NI_avg,NXe_avg,T_fuel_avg,T_fuel_max,T_fuel_max_kernel,T_mod_avg,Transient_decay_heat_tot,Tt_pow,decay_heat_scaling_factor,flux0_avg,flux1_avg,power_scaling,reactor_total_power_check,time_step_pp
+0,25704000,1.5226817225987e+17,374296000,0.33174283191916,0.078414685186854,1070.2345080393,1252.3069950345,0,1058.1738699979,25704000,400000000,1,9.6350136477002e+17,9.7379576073868e+17,3.2558804624351e+19,400000000,0
+180000,25704000,6195682259.3209,15.23355687097,0.05286222745581,0.074568457905985,1070.2345080393,1252.3069950345,0,1058.1738699979,1658411.7984,16.279689733227,0.0645196,47025903730.319,39013471849.589,3.2558804624351e+19,1658427.0319569,180000
diff --git a/htgr/pbmr400/steady/gold/oecd_pbmr400_tr1_pplofc_phtn_flow_path.csv b/htgr/pbmr400/steady/gold/oecd_pbmr400_tr1_pplofc_phtn_flow_path.csv
new file mode 100644
index 000000000..c2ba1a59e
--- /dev/null
+++ b/htgr/pbmr400/steady/gold/oecd_pbmr400_tr1_pplofc_phtn_flow_path.csv
@@ -0,0 +1,7 @@
+time,T_fluid_avg,T_fuel_avg,T_mod_avg,T_solid_avg,Tt_pow,courant_condition,he_mass_tt,he_temp_avg,he_vol_tt,min_courant_num,pressure_avg,switch,time_step_pp,timestep_pp,trip_valve
+0,773.1498033553,900,700,773.14978393211,0,0,836.50797263881,773.14984879563,149.30377617162,0,9123075.3591948,0,2.56,0,0
+0.01,773.1498027685,900,700,773.14978393061,0,8.3529046522884,836.41363257775,773.14984830227,149.30377617162,0.0011971883334332,9122032.367246,598.23363415754,0.01,0.99930769230769,0
+0.03,773.14980201063,900,700,773.14978392579,0,16.711510204839,836.11986334573,773.14984757067,149.30377617162,0.0011967799292136,9118784.2577271,598.23363415754,0.02,0.99792307692308,0
+0.07,773.14980125397,900,700,773.14978391241,0,33.399471261319,835.36053328338,773.14984668849,149.30377617162,0.0011976237494013,9110388.341142,598.23363415754,0.04,0.99515384615385,0
+0.15,773.14980066824,900,700,773.14978387987,0,66.581056176158,833.6547602585,773.1498458941,149.30377617162,0.0012015429702457,9091528.0226786,598.23363415754,0.08,0.98961538461538,0
+0.31,773.14980021172,900,700,773.14978380665,0,132.12384592471,830.12409596089,773.14984534562,149.30377617162,0.0012109850336265,9052493.5251907,598.23363415754,0.16,0.97853846153846,0
diff --git a/htgr/pbmr400/steady/gold/oecd_pbmr400_tr2_lf40_mhtr_pebble_triso.csv b/htgr/pbmr400/steady/gold/oecd_pbmr400_tr2_lf40_mhtr_pebble_triso.csv
new file mode 100644
index 000000000..2a1219d94
--- /dev/null
+++ b/htgr/pbmr400/steady/gold/oecd_pbmr400_tr2_lf40_mhtr_pebble_triso.csv
@@ -0,0 +1,4 @@
+time,fuel_average_temp,moderator_average_temp,pebble_core_average_temp,pebble_core_center_temp,pebble_surface_temp
+0,0,0,0,0,0
+1e+15,0,0,0,0,0
+2e+15,0,0,0,0,0
diff --git a/htgr/pbmr400/steady/tests b/htgr/pbmr400/steady/tests
index 461dbefa3..fbb147bf0 100644
--- a/htgr/pbmr400/steady/tests
+++ b/htgr/pbmr400/steady/tests
@@ -31,7 +31,8 @@
     check_input = True
     executable_pattern = 'griffin*|blue_crab*|dire_wolf*|fenix*'
     cli_args = "MultiApps/active='' Transfers/active=''"
-    prereq = 'multiphysics'
+    prereq = 'steady_multiphysics'
+    min_parallel = 4
     method = 'opt' # see Griffin #230
   []
   [transient_fluid_flow_syntax_only]
@@ -51,6 +52,31 @@
     cli_args = 'Executioner/num_steps=1'
   []
 
+  # Steady regression tests
+  # Run these before so they dont overwrite the good checkpoint file for transients
+  [neutronics_only]
+    type = CSVDiff
+    input = 'oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i'
+    csvdiff = 'oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.csv'
+    executable_pattern = 'griffin*|blue_crab*|dire_wolf*|fenix*'
+    cli_args = "MultiApps/active='' Transfers/active='' Executioner/nl_abs_tol=0.1"
+    method = 'opt' # see Griffin #230
+  []
+  [fluid_flow_only]
+    type = CSVDiff
+    input = 'oecd_pbmr400_ss1_phtn_flow_path.i'
+    csvdiff = 'oecd_pbmr400_ss1_phtn_flow_path.csv'
+    executable_pattern = 'pronghorn*|blue_crab*|fenix*'
+    cli_args = "MultiApps/active='' Transfers/active='' Executioner/num_steps=5"
+  []
+  [fuel_performance_only]
+    type = CSVDiff
+    input = 'oecd_pbmr400_ss2_mhtr_pebble_triso.i'
+    csvdiff = 'oecd_pbmr400_ss2_mhtr_pebble_triso.csv'
+    executable_pattern = 'pronghorn*|blue_crab*|fenix*'
+    cli_args = 'Executioner/num_steps=2 Outputs/csv=true'
+  []
+
   # Run simulation, no results checking
   [steady_multiphysics]
     type = RunApp
@@ -70,31 +96,39 @@
     input = 'oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i'
     executable_pattern = 'blue_crab*|fenix*'
     cli_args = 'Executioner/num_steps=1'
-    prereq = 'multiphysics'
     method = 'opt' # see Griffin #230
+    # Checkpoint file must have been generated with same number of ranks
+    prereq = 'steady_multiphysics'
+    min_parallel = 4
   []
 
-  # Regression tests
-  [neutronics_syntax_only]
+  # Transient regression tests
+  [transient_neutronics_only]
     type = CSVDiff
-    input = 'oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i'
-    check_input = True
+    working_directory = '../transient'
+    input = 'oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i'
+    csvdiff = 'oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.csv'
     executable_pattern = 'griffin*|blue_crab*|dire_wolf*|fenix*'
-    cli_args = "MultiApps/active='' Transfers/active=''"
+    cli_args = "MultiApps/active='' Transfers/active='' Executioner/num_steps=2"
     method = 'opt' # see Griffin #230
+    # Checkpoint file must have been generated with same number of ranks
+    prereq = 'steady_multiphysics'
+    min_parallel = 4
   []
-  [fluid_flow_syntax_only]
+  [transient_fluid_flow_only]
     type = CSVDiff
-    input = 'oecd_pbmr400_ss1_phtn_flow_path.i'
-    check_input = True
+    working_directory = '../transient'
+    input = 'oecd_pbmr400_tr1_pplofc_phtn_flow_path.i'
+    csvdiff = 'oecd_pbmr400_tr1_pplofc_phtn_flow_path.csv'
     executable_pattern = 'pronghorn*|blue_crab*|fenix*'
-    cli_args = "MultiApps/active='' Transfers/active=''"
+    cli_args = "MultiApps/active='' Transfers/active='' Executioner/num_steps=5"
   []
-  [fuel_performance_syntax_only]
+  [transient_fuel_performance_only]
     type = CSVDiff
-    input = 'oecd_pbmr400_ss2_mhtr_pebble_triso.i'
-    check_input = True
+    working_directory = '../transient'
+    input = 'oecd_pbmr400_tr2_pplofc_mhtr_pebble_triso.i'
+    csvdiff = 'oecd_pbmr400_tr2_pplofc_mhtr_pebble_triso.csv'
     executable_pattern = 'pronghorn*|blue_crab*|fenix*'
-    cli_args = 'Executioner/num_steps=1'
+    cli_args = 'Executioner/num_steps=2 Outputs/csv=true'
   []
 []

From 14a36e769e08f122b1df1cd2905615f5c5af23ef Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Fri, 18 Feb 2022 10:56:34 -0700
Subject: [PATCH 5/6] master -> main First try at mrad regression testing

---
 doc/content/pbfhr/reflector.md                |  6 ++--
 doc/content/pbfhr/steady/griffin.md           |  4 +--
 ...oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i |  2 +-
 .../steady/oecd_pbmr400_ss1_phtn_flow_path.i  |  6 ++--
 .../oecd_pbmr400_ss2_mhtr_pebble_triso.i      |  8 ++---
 .../oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i  |  4 +--
 .../oecd_pbmr400_tr1_pplofc_phtn_flow_path.i  |  4 +--
 ...ecd_pbmr400_tr2_pplofc_mhtr_pebble_triso.i |  8 ++---
 mrad/steady/MP_FC_ss_sockeye.i                |  6 ++--
 mrad/steady/tests                             | 30 +++++++++++++++++--
 pbfhr/reflector/cht/tests                     |  4 +--
 pbfhr/reflector/conduction/tests              |  4 +--
 sfr/griffin.i                                 |  6 ++--
 13 files changed, 59 insertions(+), 33 deletions(-)

diff --git a/doc/content/pbfhr/reflector.md b/doc/content/pbfhr/reflector.md
index d1844644a..33c3fe30c 100644
--- a/doc/content/pbfhr/reflector.md
+++ b/doc/content/pbfhr/reflector.md
@@ -619,11 +619,11 @@ in the graphite and steel.
 Next, the [MultiApps](https://mooseframework.inl.gov/syntax/MultiApps/index.html)
  and [Transfers](https://mooseframework.inl.gov/syntax/Transfers/index.html)
 blocks describe the interaction between Cardinal
-and MOOSE. The MOOSE heat conduction module is here run as the master application, with
+and MOOSE. The MOOSE heat conduction module is here run as the main application, with
 the nekRS wrapping run as the sub-application. We specify that MOOSE will run first on each
 time step. Allowing sub-cycling means that, if the MOOSE time step is 0.05 seconds, but
 the nekRS time step is 0.02 seconds, that for every MOOSE time step, nekRS will perform
-three time steps, of length 0.02, 0.02, and 0.01 seconds to "catch up" to the MOOSE master
+three time steps, of length 0.02, 0.02, and 0.01 seconds to "catch up" to the MOOSE main
 application. If sub-cycling is turned off, then the smallest time step among all the various
 applications is used.
 
@@ -762,7 +762,7 @@ The input consists of blocks and parameters. The `[GENERAL]` block describes the
 time stepping, simulation end control, and the polynomial order. Here, a time step
 of 0.025 (non-dimensional) is used; a nekRS output file is written every 100 time steps.
 Because nekRS is run as a sub-application to MOOSE, the `stopAt` and `numSteps`
-fields are actually ignored, so that the steady state tolerance in the MOOSE master
+fields are actually ignored, so that the steady state tolerance in the MOOSE main
 application dictates when a simulation terminates. Because the purpose of this
 simulation is only to obtain a reasonable initial condition, a low polynomial order
 of 2 is used.
diff --git a/doc/content/pbfhr/steady/griffin.md b/doc/content/pbfhr/steady/griffin.md
index 35c571060..fba94938f 100644
--- a/doc/content/pbfhr/steady/griffin.md
+++ b/doc/content/pbfhr/steady/griffin.md
@@ -1,6 +1,6 @@
 # Griffin steady state input
 
-We will first cover the input for the master application, Griffin, which tackles the neutronics
+We will first cover the input for the main application, Griffin, which tackles the neutronics
 problem. While the Griffin manual is ultimately the most complete reference on this input, we will
 try to provide enough details here for a complete comprehension of this input.
 
@@ -162,7 +162,7 @@ types:
   useful for easily importing then plotting the simulation results using Python or Matlab.
 
 - checkpoint files. [Checkpoint](https://mooseframework.inl.gov/source/outputs/Checkpoint.html) files are used solely for restarting simulations. Unlike Exodus files, they also
-  contain all the subapp information, so only the master app checkpoint files are necessary. Checkpoint files are
+  contain all the subapp information, so only the main app checkpoint files are necessary. Checkpoint files are
   output at a regular interval, specified by the `num_files` field.
 
 
diff --git a/htgr/pbmr400/steady/oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i b/htgr/pbmr400/steady/oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i
index 59f461555..257552535 100755
--- a/htgr/pbmr400/steady/oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i
+++ b/htgr/pbmr400/steady/oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i
@@ -1,6 +1,6 @@
 # ==============================================================================
 # PBMR-400 steady-state phase 1 exercise 3, NEA/NSC/DOC(2013)10.
-# MASTER0 Neutron kinetic model, T_fuel and T_mod feedback supplied by TH subapp.
+# MAIN0 Neutron kinetic model, T_fuel and T_mod feedback supplied by TH subapp.
 # FENIX input file
 # ------------------------------------------------------------------------------
 # Idaho Falls, INL, 02/22/2020
diff --git a/htgr/pbmr400/steady/oecd_pbmr400_ss1_phtn_flow_path.i b/htgr/pbmr400/steady/oecd_pbmr400_ss1_phtn_flow_path.i
index 17d9ed385..6e1af3927 100755
--- a/htgr/pbmr400/steady/oecd_pbmr400_ss1_phtn_flow_path.i
+++ b/htgr/pbmr400/steady/oecd_pbmr400_ss1_phtn_flow_path.i
@@ -1,12 +1,12 @@
 # ==============================================================================
 # PBMR-400 steady-state phase 1 exercise 3, NEA/NSC/DOC(2013)10.
-# SUBAPP1 MASTER1 thermal-hydraulics model, power supplied by NK MASTER0 app.
+# SUBAPP1 MAIN1 thermal-hydraulics model, power supplied by NK MAIN0 app.
 # FENIX input file
 # ------------------------------------------------------------------------------
 # Idaho Falls, Idaho National Laboratory, 02/03/2020
 # Author(s): Dr. Paolo Balestra, Dr. Sebastian Schunert
 # ==============================================================================
-# - ss1: Steady state simulation master app level 1
+# - ss1: Steady state simulation main app level 1
 # - phth: ProngHorn for thermal hydraulics
 # - lgcy: Legacy kernels
 # - supmix: Mixed superficial variables
@@ -904,7 +904,7 @@ riser_superficial_rho_v         = ${fparse reactor_total_mfr/riser_free_flow_are
   [barrel_to_rpv]
     type = GapHeatTransfer
     variable = T_solid
-    emissivity_master = ${global_emissivity}
+    emissivity_primary = ${global_emissivity}
     emissivity_secondary = ${global_emissivity}
     gap_geometry_type = CYLINDER
     primary = barrel_rpv_gap_outer
diff --git a/htgr/pbmr400/steady/oecd_pbmr400_ss2_mhtr_pebble_triso.i b/htgr/pbmr400/steady/oecd_pbmr400_ss2_mhtr_pebble_triso.i
index 926680217..7b2b8da83 100755
--- a/htgr/pbmr400/steady/oecd_pbmr400_ss2_mhtr_pebble_triso.i
+++ b/htgr/pbmr400/steady/oecd_pbmr400_ss2_mhtr_pebble_triso.i
@@ -1,7 +1,7 @@
 # ==============================================================================
 # PBMR-400 pebble/TRISO 1-D model, NEA/NSC/DOC(2013)10
 # SUBAPP2 Pebble/TRISO 1-D model, Pebble surface temp and power density supplied
-# by TH MASTER1 TH app.
+# by TH MAIN TH app.
 # FENIX input file
 # ------------------------------------------------------------------------------
 # Idaho Falls, INL, 01/20/2020
@@ -285,7 +285,7 @@ pebble_bed_porosity        = 0.39 # Pebble bed porosity (//)
   line_search = l2
 
   # Problem time parameters.
-  dt = 1e+15 # Let the master app control time steps.
+  dt = 1e+15 # Let the main app control time steps.
 
   # Linear/nonlinear iterations.
   nl_abs_tol = 1e-8
@@ -303,12 +303,12 @@ pebble_bed_porosity        = 0.39 # Pebble bed porosity (//)
     execute_on = 'LINEAR'
   []
 
-  # Feedbacks from the master.
+  # Feedbacks from the main app
   [pebble_surface_temp]
     type = Receiver
   []
 
-  # Feedbacks to the master.
+  # Feedbacks to the main app
   [moderator_average_temp]
     type = ElementAverageValue
     variable = T_pebble
diff --git a/htgr/pbmr400/transient/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i b/htgr/pbmr400/transient/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i
index 8073a869a..18bc751d1 100755
--- a/htgr/pbmr400/transient/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i
+++ b/htgr/pbmr400/transient/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i
@@ -1,6 +1,6 @@
 # ==============================================================================
 # PBMR-400 steady-state phase 1 exercise 3, NEA/NSC/DOC(2013)10.
-# MASTER0 Neutron kinetic model, T_fuel and T_mod feedback supplied by TH subapp.
+# MAIN0 Neutron kinetic model, T_fuel and T_mod feedback supplied by TH subapp.
 # FENIX input file
 # ------------------------------------------------------------------------------
 # Idaho Falls, INL, 02/22/2020
@@ -695,7 +695,7 @@ fis_fract            = ${fparse 1 - dh_fract} # Fission power fraction at t = 0.
 
   # end_time = 6000.0
   end_time = 180000.0
-  dt = 1e+15 # Let the master app control time steps.
+  dt = 1e+15 # Let the fluid control time steps.
 
   l_tol = 1e-4
   nl_rel_tol = 1e-7
diff --git a/htgr/pbmr400/transient/oecd_pbmr400_tr1_pplofc_phtn_flow_path.i b/htgr/pbmr400/transient/oecd_pbmr400_tr1_pplofc_phtn_flow_path.i
index 431757c22..087367ae8 100755
--- a/htgr/pbmr400/transient/oecd_pbmr400_tr1_pplofc_phtn_flow_path.i
+++ b/htgr/pbmr400/transient/oecd_pbmr400_tr1_pplofc_phtn_flow_path.i
@@ -1,6 +1,6 @@
 # ==============================================================================
 # PBMR-400 steady-state phase 1 exercise 3, NEA/NSC/DOC(2013)10.
-# SUBAPP1 MASTER1 Thermal-hydraulics only with provided power density
+# SUBAPP1 Thermal-hydraulics only with provided power density
 # FENIX input file
 # ------------------------------------------------------------------------------
 # Idaho Falls, INL, 10/12/2019
@@ -730,7 +730,7 @@ reactor_inlet_free_rho_u = ${fparse -reactor_total_mfr/reactor_inlet_free_flow_a
   line_search = 'l2'
 
   # Problem time parameters.
-  dt = 1e+15 # Let the master app control time steps.
+  dt = 1e+15 # Let the main app control time steps.
   reset_dt = true
   start_time = 0.0
 
diff --git a/htgr/pbmr400/transient/oecd_pbmr400_tr2_pplofc_mhtr_pebble_triso.i b/htgr/pbmr400/transient/oecd_pbmr400_tr2_pplofc_mhtr_pebble_triso.i
index 7d4c47946..894acae01 100755
--- a/htgr/pbmr400/transient/oecd_pbmr400_tr2_pplofc_mhtr_pebble_triso.i
+++ b/htgr/pbmr400/transient/oecd_pbmr400_tr2_pplofc_mhtr_pebble_triso.i
@@ -1,7 +1,7 @@
 # ==============================================================================
 # PBMR-400 pebble/TRISO 1-D model, NEA/NSC/DOC(2013)10
 # SUBAPP2 Pebble/TRISO 1-D model, Pebble surface temp and power density supplied
-# by TH MASTER1 TH app.
+# by TH MAIN1 TH app.
 # FENIX input file
 # ------------------------------------------------------------------------------
 # Idaho Falls, INL, 01/20/2020
@@ -293,7 +293,7 @@ pebble_bed_porosity        = 0.39 # Pebble bed porosity (//)
   line_search = l2
 
   # Problem time parameters.
-  dt = 1e+15 # Let the master app control time steps.
+  dt = 1e+15 # Let the parent app control time steps.
   reset_dt = true
   start_time = 0.0
 
@@ -321,12 +321,12 @@ pebble_bed_porosity        = 0.39 # Pebble bed porosity (//)
     execute_on = 'LINEAR'
   []
 
-  # Feedbacks from the master.
+  # Feedbacks from the fluid app
   [pebble_surface_temp]
     type = Receiver
   []
 
-  # Feedbacks to the master.
+  # Feedbacks to the fluid app
   [moderator_average_temp]
     type = ElementAverageValue
     variable = T_pebble
diff --git a/mrad/steady/MP_FC_ss_sockeye.i b/mrad/steady/MP_FC_ss_sockeye.i
index 23d78ee84..533f84461 100644
--- a/mrad/steady/MP_FC_ss_sockeye.i
+++ b/mrad/steady/MP_FC_ss_sockeye.i
@@ -220,7 +220,7 @@ corr_factor = ${fparse 2 * R_clad_o / R_hp_hole / R_hp_hole / area_correction /
     type = VectorPostprocessorFunction
     argument_column = z
     component  = z
-    value_column = master_flux
+    value_column = main_flux
     vectorpostprocessor_name = flux_vpp
   []
   [scale_fcn]
@@ -241,7 +241,7 @@ corr_factor = ${fparse 2 * R_clad_o / R_hp_hole / R_hp_hole / area_correction /
   [operational_aux]
     initial_condition = 1
   []
-  [master_flux]
+  [main_flux]
     initial_condition = ${q_evap}
   []
   [hp_temp_aux]
@@ -405,7 +405,7 @@ corr_factor = ${fparse 2 * R_clad_o / R_hp_hole / R_hp_hole / area_correction /
   []
   [flux_vpp]
     type = SideValueSampler
-    variable = master_flux
+    variable = main_flux
     boundary = 'hp:evap:inner'
     sort_by = z
     execute_on = 'timestep_begin TIMESTEP_END'
diff --git a/mrad/steady/tests b/mrad/steady/tests
index 2fa5a645b..949ae88b5 100644
--- a/mrad/steady/tests
+++ b/mrad/steady/tests
@@ -1,5 +1,6 @@
 [Tests]
-  [mechanics_bison]
+  # Syntax checks
+  [mechanics_bison_syntax]
     type = RunApp
     input = 'MP_FC_ss_bison.i'
     check_input = True
@@ -7,11 +8,36 @@
     executable_pattern = 'bison*|blue_crab*|dire_wolf*'
     cli_args = "MultiApps/active='' Transfers/active=''"
   []
-  [fluids_sockeye]
+  [fluids_sockeye_syntax]
     type = RunApp
     input = 'MP_FC_ss_sockeye.i'
     check_input = True
     ad_indexing_type = 'global'
     executable_pattern = 'sockeye*|dire_wolf*'
   []
+
+  # Regression tests
+  [mechanics_bison]
+    type = CSVDiff
+    input = 'MP_FC_ss_bison.i'
+    csvdiff = ''
+    ad_indexing_type = 'global'
+    executable_pattern = 'bison*|blue_crab*|dire_wolf*'
+    cli_args = "MultiApps/active='' Transfers/active=''"
+  []
+  [fluids_sockeye]
+    type = CSVDiff
+    input = 'MP_FC_ss_sockeye.i'
+    csvdiff = ''
+    ad_indexing_type = 'global'
+    executable_pattern = 'sockeye*|dire_wolf*'
+  []
+  [coupled_simulation]
+    type = CSVDiff
+    input = 'MP_FC_ss_bison.i'
+    csvdiff = ''
+    ad_indexing_type = 'global'
+    executable_pattern = 'dire_wolf*'
+    cli_args = ""
+  []
 []
diff --git a/pbfhr/reflector/cht/tests b/pbfhr/reflector/cht/tests
index bd8a0f1b6..d5c099f68 100644
--- a/pbfhr/reflector/cht/tests
+++ b/pbfhr/reflector/cht/tests
@@ -5,7 +5,7 @@
     check_input = true
     cli_args = "MultiApps/active='' Transfers/active='' Executioner/num_steps=2"
     requirement = "The pbfhr reflector conjugate heat transfer input shall not deprecate syntax from the "
-                  "MOOSE master application."
+                  "MOOSE main application."
     executable_pattern = 'cardinal*'
   []
   [nek]
@@ -13,7 +13,7 @@
     input = nek.i
     check_input = true
     requirement = "The pbfhr reflector  fluid flow input shall not deprecate syntax from the "
-                  "MOOSE master application."
+                  "MOOSE main application."
     executable_pattern = 'cardinal*'
   []
 []
diff --git a/pbfhr/reflector/conduction/tests b/pbfhr/reflector/conduction/tests
index 6c7cbfb47..e950ae3bf 100644
--- a/pbfhr/reflector/conduction/tests
+++ b/pbfhr/reflector/conduction/tests
@@ -5,7 +5,7 @@
     check_input = true
     cli_args = "MultiApps/active='' Transfers/active='' Executioner/num_steps=2"
     requirement = "The conduction heat transfer input shall not deprecate syntax from the "
-                  "MOOSE master application."
+                  "MOOSE main application."
     executable_pattern = 'cardinal*'
   []
   [nek]
@@ -13,7 +13,7 @@
     input = nek.i
     check_input = true
     requirement = "The pbfhr reflector  fluid flow input shall not deprecate syntax from the "
-                  "MOOSE master application."
+                  "MOOSE main application."
     executable_pattern = 'cardinal*'
   []
 []
diff --git a/sfr/griffin.i b/sfr/griffin.i
index 37f491012..65c36787f 100644
--- a/sfr/griffin.i
+++ b/sfr/griffin.i
@@ -129,8 +129,7 @@
 
 [Transfers]
 
-  # master -> sub-app
-
+  # main app -> sub-app
 
   #-----------------------
   # power_density to BISON
@@ -143,7 +142,8 @@
     source_variable = power_density
     multi_app = bison
   []
-  # sub-app -> master
+
+  # sub-app -> main app
 
   #------------------
   # tfuel from BISON

From 3335893991da94369bcd1089831f5b0ce514a204 Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Fri, 18 Feb 2022 13:19:16 -0700
Subject: [PATCH 6/6] Add regression testing for MRAD model, refs #53 Address
 test failures (timeout on bison model for mrad, forgot a csv for HPMR,
 scaleaux in pgh test for HPMR) Revert to still using two tests for msre SAM
 model, as BC diffs with SAM Dont use FenixApp in PBMR inputs, BlueCrab doesnt
 know what that is Use the single physics steady calculations as restart for
 the single physics transients in PBMR, allowing for full restart Fix the
 elemental auxkernel (INSCourant) being used on an auxvaraibles Update BC
 submodule, refs #0

---
 apps/blue_crab                                |  2 +-
 ...oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.csv |  3 -
 ...oecd_pbmr400_tr1_pplofc_phtn_flow_path.csv |  7 --
 htgr/pbmr400/steady/tests                     | 69 ++++++++++---------
 ...oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.csv |  3 +
 ...oecd_pbmr400_tr1_pplofc_phtn_flow_path.csv |  7 ++
 ...ecd_pbmr400_tr2_lf40_mhtr_pebble_triso.csv |  0
 .../oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i  |  3 +-
 .../oecd_pbmr400_tr1_pplofc_phtn_flow_path.i  | 16 +++--
 mrad/steady/MP_FC_ss_bison.i                  | 12 ++--
 mrad/steady/gold/MP_FC_ss_bison_out.csv       |  4 ++
 mrad/steady/gold/MP_FC_ss_sockeye_csv.csv     | 32 +++++++++
 mrad/steady/gold/mrad_bison_out.csv           |  4 ++
 .../gold/mrad_bison_out_sockeye001_csv.csv    |  4 ++
 mrad/steady/gold/mrad_sockeye001_out.csv      |  2 +
 mrad/steady/tests                             | 14 ++--
 msr/msfr/steady/gold/multiphysics_out.csv     |  3 +-
 msr/msfr/steady/gold/multiphysics_out_ns0.csv |  6 +-
 msr/msre/gold/msre_loop_1d_bc.csv             | 12 ----
 msr/msre/gold/msre_loop_1d_bc_csv.csv         | 20 +++---
 msr/msre/tests                                | 12 +++-
 21 files changed, 143 insertions(+), 92 deletions(-)
 delete mode 100644 htgr/pbmr400/steady/gold/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.csv
 delete mode 100644 htgr/pbmr400/steady/gold/oecd_pbmr400_tr1_pplofc_phtn_flow_path.csv
 create mode 100644 htgr/pbmr400/transient/gold/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.csv
 create mode 100644 htgr/pbmr400/transient/gold/oecd_pbmr400_tr1_pplofc_phtn_flow_path.csv
 rename htgr/pbmr400/{steady => transient}/gold/oecd_pbmr400_tr2_lf40_mhtr_pebble_triso.csv (100%)
 create mode 100644 mrad/steady/gold/MP_FC_ss_bison_out.csv
 create mode 100644 mrad/steady/gold/MP_FC_ss_sockeye_csv.csv
 create mode 100644 mrad/steady/gold/mrad_bison_out.csv
 create mode 100644 mrad/steady/gold/mrad_bison_out_sockeye001_csv.csv
 create mode 100644 mrad/steady/gold/mrad_sockeye001_out.csv
 delete mode 100644 msr/msre/gold/msre_loop_1d_bc.csv

diff --git a/apps/blue_crab b/apps/blue_crab
index 18637fabb..22c713de3 160000
--- a/apps/blue_crab
+++ b/apps/blue_crab
@@ -1 +1 @@
-Subproject commit 18637fabb8eb568309571332c9ec33916c974d2d
+Subproject commit 22c713de354804f621880e7cef5b7146e766b95f
diff --git a/htgr/pbmr400/steady/gold/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.csv b/htgr/pbmr400/steady/gold/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.csv
deleted file mode 100644
index d3aa2ab7d..000000000
--- a/htgr/pbmr400/steady/gold/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-time,Decay_heat_tot,FRR_avg,Fiss_power_tot,NI_avg,NXe_avg,T_fuel_avg,T_fuel_max,T_fuel_max_kernel,T_mod_avg,Transient_decay_heat_tot,Tt_pow,decay_heat_scaling_factor,flux0_avg,flux1_avg,power_scaling,reactor_total_power_check,time_step_pp
-0,25704000,1.5226817225987e+17,374296000,0.33174283191916,0.078414685186854,1070.2345080393,1252.3069950345,0,1058.1738699979,25704000,400000000,1,9.6350136477002e+17,9.7379576073868e+17,3.2558804624351e+19,400000000,0
-180000,25704000,6195682259.3209,15.23355687097,0.05286222745581,0.074568457905985,1070.2345080393,1252.3069950345,0,1058.1738699979,1658411.7984,16.279689733227,0.0645196,47025903730.319,39013471849.589,3.2558804624351e+19,1658427.0319569,180000
diff --git a/htgr/pbmr400/steady/gold/oecd_pbmr400_tr1_pplofc_phtn_flow_path.csv b/htgr/pbmr400/steady/gold/oecd_pbmr400_tr1_pplofc_phtn_flow_path.csv
deleted file mode 100644
index c2ba1a59e..000000000
--- a/htgr/pbmr400/steady/gold/oecd_pbmr400_tr1_pplofc_phtn_flow_path.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-time,T_fluid_avg,T_fuel_avg,T_mod_avg,T_solid_avg,Tt_pow,courant_condition,he_mass_tt,he_temp_avg,he_vol_tt,min_courant_num,pressure_avg,switch,time_step_pp,timestep_pp,trip_valve
-0,773.1498033553,900,700,773.14978393211,0,0,836.50797263881,773.14984879563,149.30377617162,0,9123075.3591948,0,2.56,0,0
-0.01,773.1498027685,900,700,773.14978393061,0,8.3529046522884,836.41363257775,773.14984830227,149.30377617162,0.0011971883334332,9122032.367246,598.23363415754,0.01,0.99930769230769,0
-0.03,773.14980201063,900,700,773.14978392579,0,16.711510204839,836.11986334573,773.14984757067,149.30377617162,0.0011967799292136,9118784.2577271,598.23363415754,0.02,0.99792307692308,0
-0.07,773.14980125397,900,700,773.14978391241,0,33.399471261319,835.36053328338,773.14984668849,149.30377617162,0.0011976237494013,9110388.341142,598.23363415754,0.04,0.99515384615385,0
-0.15,773.14980066824,900,700,773.14978387987,0,66.581056176158,833.6547602585,773.1498458941,149.30377617162,0.0012015429702457,9091528.0226786,598.23363415754,0.08,0.98961538461538,0
-0.31,773.14980021172,900,700,773.14978380665,0,132.12384592471,830.12409596089,773.14984534562,149.30377617162,0.0012109850336265,9052493.5251907,598.23363415754,0.16,0.97853846153846,0
diff --git a/htgr/pbmr400/steady/tests b/htgr/pbmr400/steady/tests
index fbb147bf0..7f0a35729 100644
--- a/htgr/pbmr400/steady/tests
+++ b/htgr/pbmr400/steady/tests
@@ -23,6 +23,31 @@
     cli_args = 'Executioner/num_steps=1'
   []
 
+  # Steady regression tests
+  # Run these before so they dont overwrite the good checkpoint file for transients
+  [neutronics_only]
+    type = CSVDiff
+    input = 'oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i'
+    csvdiff = 'oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.csv'
+    executable_pattern = 'griffin*|blue_crab*|dire_wolf*|fenix*'
+    cli_args = "MultiApps/active='' Transfers/active='' Executioner/nl_abs_tol=0.1"
+    method = 'opt' # see Griffin #230
+  []
+  [fluid_flow_only]
+    type = CSVDiff
+    input = 'oecd_pbmr400_ss1_phtn_flow_path.i'
+    csvdiff = 'oecd_pbmr400_ss1_phtn_flow_path.csv'
+    executable_pattern = 'pronghorn*|blue_crab*|fenix*'
+    cli_args = "MultiApps/active='' Transfers/active='' Executioner/num_steps=5"
+  []
+  [fuel_performance_only]
+    type = CSVDiff
+    input = 'oecd_pbmr400_ss2_mhtr_pebble_triso.i'
+    csvdiff = 'oecd_pbmr400_ss2_mhtr_pebble_triso.csv'
+    executable_pattern = 'pronghorn*|blue_crab*|fenix*'
+    cli_args = 'Executioner/num_steps=2 Outputs/csv=true'
+  []
+
   # Individual transient syntax checks
   [transient_neutronics_syntax_only]
     type = RunApp
@@ -31,8 +56,7 @@
     check_input = True
     executable_pattern = 'griffin*|blue_crab*|dire_wolf*|fenix*'
     cli_args = "MultiApps/active='' Transfers/active=''"
-    prereq = 'steady_multiphysics'
-    min_parallel = 4
+    prereq = 'neutronics_only'
     method = 'opt' # see Griffin #230
   []
   [transient_fluid_flow_syntax_only]
@@ -42,6 +66,7 @@
     check_input = True
     executable_pattern = 'pronghorn*|blue_crab*|fenix*'
     cli_args = "MultiApps/active='' Transfers/active=''"
+    prereq = 'fluid_flow_only'
   []
   [transient_fuel_performance_syntax_only]
     type = RunApp
@@ -52,31 +77,6 @@
     cli_args = 'Executioner/num_steps=1'
   []
 
-  # Steady regression tests
-  # Run these before so they dont overwrite the good checkpoint file for transients
-  [neutronics_only]
-    type = CSVDiff
-    input = 'oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.i'
-    csvdiff = 'oecd_pbmr400_ss0_rsnk_eigen_value_ix_dep.csv'
-    executable_pattern = 'griffin*|blue_crab*|dire_wolf*|fenix*'
-    cli_args = "MultiApps/active='' Transfers/active='' Executioner/nl_abs_tol=0.1"
-    method = 'opt' # see Griffin #230
-  []
-  [fluid_flow_only]
-    type = CSVDiff
-    input = 'oecd_pbmr400_ss1_phtn_flow_path.i'
-    csvdiff = 'oecd_pbmr400_ss1_phtn_flow_path.csv'
-    executable_pattern = 'pronghorn*|blue_crab*|fenix*'
-    cli_args = "MultiApps/active='' Transfers/active='' Executioner/num_steps=5"
-  []
-  [fuel_performance_only]
-    type = CSVDiff
-    input = 'oecd_pbmr400_ss2_mhtr_pebble_triso.i'
-    csvdiff = 'oecd_pbmr400_ss2_mhtr_pebble_triso.csv'
-    executable_pattern = 'pronghorn*|blue_crab*|fenix*'
-    cli_args = 'Executioner/num_steps=2 Outputs/csv=true'
-  []
-
   # Run simulation, no results checking
   [steady_multiphysics]
     type = RunApp
@@ -84,7 +84,9 @@
     executable_pattern = 'blue_crab*|fenix*'
     cli_args = 'Executioner/fixed_point_max_its=1'
     method = 'opt' # see Griffin #230
-    min_parallel = 4
+    min_parallel = 8
+    # require the others so the restart files dont get overwritten
+    prereq = 'transient_neutronics_only transient_fluid_flow_only'
   []
 
   # This will fail until:
@@ -95,11 +97,11 @@
     working_directory = '../transient'
     input = 'oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i'
     executable_pattern = 'blue_crab*|fenix*'
-    cli_args = 'Executioner/num_steps=1'
+    cli_args = 'Executioner/fixed_point_max_its=2 Executioner/num_steps=1 MultiApps/th_sub/cli_args=Executioner/end_time=800'
     method = 'opt' # see Griffin #230
     # Checkpoint file must have been generated with same number of ranks
     prereq = 'steady_multiphysics'
-    min_parallel = 4
+    min_parallel = 8
   []
 
   # Transient regression tests
@@ -111,9 +113,7 @@
     executable_pattern = 'griffin*|blue_crab*|dire_wolf*|fenix*'
     cli_args = "MultiApps/active='' Transfers/active='' Executioner/num_steps=2"
     method = 'opt' # see Griffin #230
-    # Checkpoint file must have been generated with same number of ranks
-    prereq = 'steady_multiphysics'
-    min_parallel = 4
+    prereq = 'neutronics_only'
   []
   [transient_fluid_flow_only]
     type = CSVDiff
@@ -122,12 +122,13 @@
     csvdiff = 'oecd_pbmr400_tr1_pplofc_phtn_flow_path.csv'
     executable_pattern = 'pronghorn*|blue_crab*|fenix*'
     cli_args = "MultiApps/active='' Transfers/active='' Executioner/num_steps=5"
+    prereq = 'fluid_flow_only'
   []
   [transient_fuel_performance_only]
     type = CSVDiff
     working_directory = '../transient'
     input = 'oecd_pbmr400_tr2_pplofc_mhtr_pebble_triso.i'
-    csvdiff = 'oecd_pbmr400_tr2_pplofc_mhtr_pebble_triso.csv'
+    csvdiff = 'oecd_pbmr400_tr2_lf40_mhtr_pebble_triso.csv'
     executable_pattern = 'pronghorn*|blue_crab*|fenix*'
     cli_args = 'Executioner/num_steps=2 Outputs/csv=true'
   []
diff --git a/htgr/pbmr400/transient/gold/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.csv b/htgr/pbmr400/transient/gold/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.csv
new file mode 100644
index 000000000..91e9ed5fb
--- /dev/null
+++ b/htgr/pbmr400/transient/gold/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.csv
@@ -0,0 +1,3 @@
+time,Decay_heat_tot,FRR_avg,Fiss_power_tot,NI_avg,NXe_avg,T_fuel_avg,T_fuel_max,T_fuel_max_kernel,T_mod_avg,Transient_decay_heat_tot,Tt_pow,decay_heat_scaling_factor,flux0_avg,flux1_avg,power_scaling,reactor_total_power_check,time_step_pp
+0,25704000,1.5244890404514e+17,374296000,0.33228066245312,0.069961311140756,900,900,0,700,25704000,400000000,1,9.4869507187592e+17,9.1709749412722e+17,3.2394800939706e+19,400000000,0
+180000,25704000,6409553311.883,15.735388296098,0.052952307182353,0.072892712857253,900,900,0,700,1658411.7984,16.815983388652,0.0645196,42311929996.041,37836922204.61,3.2394800939706e+19,1658427.5337883,180000
diff --git a/htgr/pbmr400/transient/gold/oecd_pbmr400_tr1_pplofc_phtn_flow_path.csv b/htgr/pbmr400/transient/gold/oecd_pbmr400_tr1_pplofc_phtn_flow_path.csv
new file mode 100644
index 000000000..1d38f72cc
--- /dev/null
+++ b/htgr/pbmr400/transient/gold/oecd_pbmr400_tr1_pplofc_phtn_flow_path.csv
@@ -0,0 +1,7 @@
+time,T_fluid_avg,T_fuel_avg,T_mod_avg,T_solid_avg,Tt_pow,courant_condition,he_mass_tt,he_temp_avg,he_vol_tt,min_courant_num,pressure_avg,switch,time_step_pp,timestep_pp,trip_valve
+0,773.1498033553,900,700,773.14978393211,0,0,836.50797263881,773.14984879563,149.30377617162,0,9123075.3591948,0,2.56,0,0
+0.01,773.1498027685,900,700,773.14978393061,0,15.711136829381,836.41363257775,773.14984830227,149.30377617162,0.00063649117874777,9122032.367246,598.23363415754,0.01,0.99930769230769,0
+0.03,773.14980201063,900,700,773.14978392579,0,31.432365530089,836.11986334573,773.14984757067,149.30377617162,0.00063628682291999,9118784.2577271,598.23363415754,0.02,0.99792307692308,0
+0.07,773.14980125397,900,700,773.14978391241,0,62.819249715482,835.36053328338,773.14984668849,149.30377617162,0.00063674749668559,9110388.341142,598.23363415754,0.04,0.99515384615385,0
+0.15,773.14980066824,900,700,773.14978387987,0,125.227342945,833.6547602585,773.1498458941,149.30377617162,0.00063883811728828,9091528.0226786,598.23363415754,0.08,0.98961538461538,0
+0.31,773.14980021172,900,700,773.14978380665,0,248.50089688814,830.12409596089,773.14984534562,149.30377617162,0.00064386085524683,9052493.5251907,598.23363415754,0.16,0.97853846153846,0
diff --git a/htgr/pbmr400/steady/gold/oecd_pbmr400_tr2_lf40_mhtr_pebble_triso.csv b/htgr/pbmr400/transient/gold/oecd_pbmr400_tr2_lf40_mhtr_pebble_triso.csv
similarity index 100%
rename from htgr/pbmr400/steady/gold/oecd_pbmr400_tr2_lf40_mhtr_pebble_triso.csv
rename to htgr/pbmr400/transient/gold/oecd_pbmr400_tr2_lf40_mhtr_pebble_triso.csv
diff --git a/htgr/pbmr400/transient/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i b/htgr/pbmr400/transient/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i
index 18bc751d1..47394c2e1 100755
--- a/htgr/pbmr400/transient/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i
+++ b/htgr/pbmr400/transient/oecd_pbmr400_tr0_pplofc_rsnk_keff_calc.i
@@ -724,10 +724,9 @@ fis_fract            = ${fparse 1 - dh_fract} # Fission power fraction at t = 0.
 [MultiApps]
   [th_sub]
     type = TransientMultiApp
-    app_type = FenixApp
     input_files = 'oecd_pbmr400_tr1_pplofc_phtn_flow_path.i'
     positions = '0.0 -2.8500 0.0' # Vertical offset between the two meshes.
-    # sub_cycling = true
+    sub_cycling = true
   []
 []
 
diff --git a/htgr/pbmr400/transient/oecd_pbmr400_tr1_pplofc_phtn_flow_path.i b/htgr/pbmr400/transient/oecd_pbmr400_tr1_pplofc_phtn_flow_path.i
index 087367ae8..7a20a9469 100755
--- a/htgr/pbmr400/transient/oecd_pbmr400_tr1_pplofc_phtn_flow_path.i
+++ b/htgr/pbmr400/transient/oecd_pbmr400_tr1_pplofc_phtn_flow_path.i
@@ -110,6 +110,8 @@ reactor_inlet_free_rho_u = ${fparse -reactor_total_mfr/reactor_inlet_free_flow_a
   []
   [courant_number]
     block = ' 1 2 14 15 16 17 18 '
+    family = MONOMIAL
+    order = CONSTANT
   []
   [alpha]
     family = MONOMIAL
@@ -329,10 +331,10 @@ reactor_inlet_free_rho_u = ${fparse -reactor_total_mfr/reactor_inlet_free_flow_a
 
 [AuxKernels]
   [T_solid_element_average]
-    type = ScaleAux
-    multiplier = 1.0
-    source_variable = T_solid
+    type = ParsedAux
     variable = T_solid_element_average
+    function = T_solid
+    args = T_solid
     block = ' 1 '
   []
 
@@ -826,10 +828,10 @@ reactor_inlet_free_rho_u = ${fparse -reactor_total_mfr/reactor_inlet_free_flow_a
 []
 
 [Postprocessors]
-    [timestep_pp]
-      type = FunctionValuePostprocessor
-      function = dts
-    []
+  [timestep_pp]
+    type = FunctionValuePostprocessor
+    function = dts
+  []
   [min_courant_num]
     type = ElementExtremeValue
     value_type = 'min'
diff --git a/mrad/steady/MP_FC_ss_bison.i b/mrad/steady/MP_FC_ss_bison.i
index bf383f089..38ed12a08 100644
--- a/mrad/steady/MP_FC_ss_bison.i
+++ b/mrad/steady/MP_FC_ss_bison.i
@@ -76,8 +76,10 @@
   []
   [temp_uo] #auxvariable to hold heat pipe surface temperature from UserObject
     initial_condition = 800
+    block = 'heat_pipes'
   []
   [hp_flux_aux]
+    block = 'heat_pipes'
   []
 []
 
@@ -235,11 +237,12 @@
 [Transfers]
   [from_sockeye_flux] # Transfer heat pipe heat flux from Sockeye subapps
     type = MultiAppNearestNodeTransfer
-     direction = from_multiapp
-     multi_app = sockeye
-     source_variable = flux_uo
-     variable = hp_flux_aux
+    direction = from_multiapp
+    multi_app = sockeye
+    source_variable = flux_uo
+    variable = hp_flux_aux
     execute_on = 'timestep_begin'
+    fixed_meshes = true
   []
   [to_sockeye_temp] # Transfer heat pipe surface temperature to Sockeye subapps
     type = MultiAppNearestNodeTransfer
@@ -248,6 +251,7 @@
     source_variable = temp_uo
     variable = T_wall_var
     execute_on = 'timestep_begin'
+    fixed_meshes = true
   []
 []
 
diff --git a/mrad/steady/gold/MP_FC_ss_bison_out.csv b/mrad/steady/gold/MP_FC_ss_bison_out.csv
new file mode 100644
index 000000000..2451e4001
--- /dev/null
+++ b/mrad/steady/gold/MP_FC_ss_bison_out.csv
@@ -0,0 +1,4 @@
+time,fuel_cP,fuel_k,fuel_temp_avg,fuel_temp_max,fuel_temp_min,heatpipe_surface_temp_avg,hp_heat_integral,mod_temp_avg,mod_temp_max,mod_temp_min,monolith_cP,monolith_k,monolith_temp_avg,monolith_temp_max,monolith_temp_min,power_density,total_evap_heat_exam
+-20000,0,0,0,0,0,0,4.6307765968693e-08,0,0,0,0,0,0,0,0,533118.7190201,0
+-19950,1077.5047127449,23.815344175017,823.60302859519,828.63210095822,806.39449304373,819.78359919915,-6656.7745771592,821.11290799691,825.23814637152,807.87091162557,1633.305420189,35.818500806851,821.4999200482,827.25362240766,805.18167007679,533118.7190201,0
+-19900,1087.606602325,23.71671743415,844.36898381336,853.6457688067,812.54811510135,839.14663707428,-8523.6560258564,841.93853835595,849.9958748231,815.74197853056,1654.5077020206,35.66712864279,841.88912864629,852.15447444274,810.44840047114,533118.7190201,0
diff --git a/mrad/steady/gold/MP_FC_ss_sockeye_csv.csv b/mrad/steady/gold/MP_FC_ss_sockeye_csv.csv
new file mode 100644
index 000000000..c6608a905
--- /dev/null
+++ b/mrad/steady/gold/MP_FC_ss_sockeye_csv.csv
@@ -0,0 +1,32 @@
+time,DT_inner,DT_outer,Integral_BC_Cond,Integral_BC_RelErr,Integral_BC_Total,T_cond_inner,T_cond_outer,T_evap_inner,T_evap_outer,T_inner_avg,T_inner_max,T_inner_min,T_wall_var_avg,ZeroPP,avg_flux_uo,bc_scale_pp,catastrophic_pp,condenser_boundary_integral,evaporator_boundary_integral,hp_boiling_limit,hp_capillary_limit,hp_entrainment_limit,hp_sonic_limit,hp_viscous_limit,operational_pp,recoverable_pp,scale_pp,total_evap_heat,total_evap_heat_exam
+-30000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,0,0,0
+-29000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-28000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-27000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-26000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-25000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-24000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-23000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-22000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-21000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-20000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-19000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-18000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-17000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-16000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-15000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-14000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-13000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-12000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-11000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-10000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-9000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-8000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-7000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-6000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-5000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-4000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-3000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-2000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-1000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+0,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
diff --git a/mrad/steady/gold/mrad_bison_out.csv b/mrad/steady/gold/mrad_bison_out.csv
new file mode 100644
index 000000000..4538d6b35
--- /dev/null
+++ b/mrad/steady/gold/mrad_bison_out.csv
@@ -0,0 +1,4 @@
+time,fuel_cP,fuel_k,fuel_temp_avg,fuel_temp_max,fuel_temp_min,heatpipe_surface_temp_avg,hp_heat_integral,mod_temp_avg,mod_temp_max,mod_temp_min,monolith_cP,monolith_k,monolith_temp_avg,monolith_temp_max,monolith_temp_min,power_density,total_evap_heat_exam
+-20000,0,0,0,0,0,0,4.6307765968693e-08,0,0,0,0,0,0,0,0,533118.71902011,0
+-19950,1077.5047127449,23.815344175017,823.60302859519,828.63210095816,806.39449304374,819.78359919913,-6656.7745858321,821.11290799691,825.23814637153,807.8709116256,1633.305420189,35.818500806851,821.4999200482,827.25362240771,805.18167007684,533118.71902011,0
+-19900,1084.4447338451,23.755075842236,836.71948254763,845.80099418047,810.14079493789,830.6376170243,-182735.30846074,834.33575321058,841.79446688769,812.27164492821,1647.9176160654,35.725010444749,833.77645825967,844.34715726448,808.40094337514,533118.71902011,-196376.48834355
diff --git a/mrad/steady/gold/mrad_bison_out_sockeye001_csv.csv b/mrad/steady/gold/mrad_bison_out_sockeye001_csv.csv
new file mode 100644
index 000000000..e4c6946b3
--- /dev/null
+++ b/mrad/steady/gold/mrad_bison_out_sockeye001_csv.csv
@@ -0,0 +1,4 @@
+time,DT_inner,DT_outer,Integral_BC_Cond,Integral_BC_RelErr,Integral_BC_Total,T_cond_inner,T_cond_outer,T_evap_inner,T_evap_outer,T_inner_avg,T_inner_max,T_inner_min,T_wall_var_avg,ZeroPP,avg_flux_uo,bc_scale_pp,catastrophic_pp,condenser_boundary_integral,evaporator_boundary_integral,hp_boiling_limit,hp_capillary_limit,hp_entrainment_limit,hp_sonic_limit,hp_viscous_limit,operational_pp,recoverable_pp,scale_pp,total_evap_heat,total_evap_heat_exam
+-30000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,0,0,0
+-29950,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,1,0,0
+-29900,4.946280329181,6.9701110415817,826.29801870874,0.22113384569257,182.72245856521,801.31753671314,800.01391634012,806.26381704232,806.9840273817,804.45291753903,807.5261736908,800.85587926922,815.07129530434,0,-1218942.0515281,1,1,-826.29801870874,1009.020477274,30672915.886475,10679.45341467,4439.6214893039,3848.0671734217,22001.815390389,1,1,1,-2720094.4791324,-182872.17702005
diff --git a/mrad/steady/gold/mrad_sockeye001_out.csv b/mrad/steady/gold/mrad_sockeye001_out.csv
new file mode 100644
index 000000000..cda80c9e0
--- /dev/null
+++ b/mrad/steady/gold/mrad_sockeye001_out.csv
@@ -0,0 +1,2 @@
+time,DT_inner,DT_outer,Integral_BC_Cond,Integral_BC_RelErr,Integral_BC_Total,T_cond_inner,T_cond_outer,T_evap_inner,T_evap_outer,T_inner_avg,T_inner_max,T_inner_min,T_wall_var_avg,ZeroPP,avg_flux_uo,bc_scale_pp,catastrophic_pp,condenser_boundary_integral,evaporator_boundary_integral,hp_boiling_limit,hp_capillary_limit,hp_entrainment_limit,hp_sonic_limit,hp_viscous_limit,operational_pp,recoverable_pp,scale_pp,total_evap_heat,total_evap_heat_exam
+-30000,-1.1368683772162e-12,-1.1368683772162e-12,0,0,0,800,800,800,800,800,800,800,799.99999999998,0,0,1,1,0,0,33420287.679108,10664.625862686,4260.5665504575,3510.4034606704,18381.695631363,1,1,0,0,0
diff --git a/mrad/steady/tests b/mrad/steady/tests
index 949ae88b5..b28b4600f 100644
--- a/mrad/steady/tests
+++ b/mrad/steady/tests
@@ -20,24 +20,28 @@
   [mechanics_bison]
     type = CSVDiff
     input = 'MP_FC_ss_bison.i'
-    csvdiff = ''
+    csvdiff = 'MP_FC_ss_bison_out.csv'
     ad_indexing_type = 'global'
     executable_pattern = 'bison*|blue_crab*|dire_wolf*'
-    cli_args = "MultiApps/active='' Transfers/active=''"
+    cli_args = "MultiApps/active='' Transfers/active='' Executioner/num_steps=2 Executioner/nl_abs_tol=1e-1 Outputs/csv=true"
+    min_parallel = 16
+    method = 'opt'
   []
   [fluids_sockeye]
     type = CSVDiff
     input = 'MP_FC_ss_sockeye.i'
-    csvdiff = ''
+    csvdiff = 'MP_FC_ss_sockeye_csv.csv'
     ad_indexing_type = 'global'
     executable_pattern = 'sockeye*|dire_wolf*'
   []
   [coupled_simulation]
     type = CSVDiff
     input = 'MP_FC_ss_bison.i'
-    csvdiff = ''
+    csvdiff = 'mrad_bison_out.csv mrad_bison_out_sockeye001_csv.csv'
     ad_indexing_type = 'global'
     executable_pattern = 'dire_wolf*'
-    cli_args = ""
+    cli_args = "Executioner/num_steps=2 Executioner/nl_abs_tol=1e-1 Outputs/csv=true Outputs/file_base=mrad_bison_out"
+    min_parallel = 48
+    # takes about 9 minutes on 48 cores
   []
 []
diff --git a/msr/msfr/steady/gold/multiphysics_out.csv b/msr/msfr/steady/gold/multiphysics_out.csv
index f9dcac2e1..83b1fddcb 100644
--- a/msr/msfr/steady/gold/multiphysics_out.csv
+++ b/msr/msfr/steady/gold/multiphysics_out.csv
@@ -1,4 +1,3 @@
 time,eigenvalue,eigenvalue_out,power_scaling
 0,1,0,2.2253933117807e+18
-1,0.9048085474014,0.9048085474014,2.5567507412343e+18
-8
+1,0.91105129073597,0.91105129073597,2.5421639659739e+18
diff --git a/msr/msfr/steady/gold/multiphysics_out_ns0.csv b/msr/msfr/steady/gold/multiphysics_out_ns0.csv
index 11f5a2592..f86e682a4 100644
--- a/msr/msfr/steady/gold/multiphysics_out_ns0.csv
+++ b/msr/msfr/steady/gold/multiphysics_out_ns0.csv
@@ -1,3 +1,3 @@
-time,dT,max_mdot_T,max_v,mdot,mdot_hx_bot,mdot_hx_top,min_mdot_T,total_fission_source,total_power,lambda
-0,0,0,0,0,0,0,0,0,0,-1.4148885348027e-14
-1.25,116.66730009519,-4389.2229258952,1.9696219985278,18655.740320161,4.3001392101145,-4.344168618678,3927.3420445919,103.17551370877,3000024962.815,-4.1068386908618e-13
+time,dT,max_v,mdot,total_fission_source,total_power,lambda
+0,0,0,0,0,0,-5.0671595532377e-13
+0.75,5.4742858927697,1.9257074486632,18189.664750893,103.76005656894,3000025438.1011,-4.8498294888077e-13
diff --git a/msr/msre/gold/msre_loop_1d_bc.csv b/msr/msre/gold/msre_loop_1d_bc.csv
deleted file mode 100644
index 665f45c55..000000000
--- a/msr/msre/gold/msre_loop_1d_bc.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-time,Core_P_in,Core_P_out,Core_T_in,Core_T_out,Core_vel_in,HX_Tin_p,HX_Tout_p,hx_j1:pressure,hx_j1:rho,hx_j1:temperature,hx_j1:velocity,hx_j2:pressure,hx_j2:rho,hx_j2:temperature,hx_j2:velocity,j1:pressure,j1:rho,j1:temperature,j1:velocity,j2:pressure,j2:rho,j2:temperature,j2:velocity,j3:pressure,j3:rho,j3:temperature,j3:velocity,j4:pressure,j4:rho,j4:temperature,j4:velocity,j5:pressure,j5:rho,j5:temperature,j5:velocity,j_c_up:pressure,j_c_up:rho,j_c_up:temperature,j_c_up:velocity,j_dn_pl:pressure,j_dn_pl:rho,j_dn_pl:temperature,j_dn_pl:velocity,j_ip_c:pressure,j_ip_c:rho,j_ip_c:temperature,j_ip_c:velocity,j_up_ps1:pressure,j_up_ps1:rho,j_up_ps1:temperature,j_up_ps1:velocity,pump:pressure,pump:pump_head,pump:rho,pump:temperature,pump:velocity
-0,0,0,0,0,0,0,0,100000,2010.7066504,824.8167,0,100000,2010.7066504,824.8167,0,100000,2196.4297,908.15,0,100000,2196.4297,908.15,0,100000,2196.4297,908.15,0,100000,2196.4297,908.15,0,100000,2196.4297,908.15,0,100000,2196.4297,908.15,0,100000,2196.4297,908.15,0,100000,2196.4297,908.15,0,100000,2196.4297,908.15,0,110000,43909.58,2196.4297,908.15,0
-0.2,173026.57569509,135448.5653371,908.66521996144,908.89775124248,0.020657400549063,908.00595597151,907.64274325535,167803.54013411,2010.6565644921,824.91933505715,1.6003180927482,166469.21733111,2010.6801055332,824.87109521885,1.6003180927444,113009.99193953,2196.4297000168,908.14999997013,0.60637096965641,126367.92077203,2196.4296999876,908.15000002208,0.61833566912805,124130.29153111,2196.7134079603,907.64518156525,0.60502912033819,143080.33359069,2196.4297049876,908.14999112521,0.57252744021931,136514.42231688,2196.429699997,908.15000000536,0.57252744022659,135444.05995562,2196.011483836,908.89415687553,0.067829611865567,173172.37405635,2196.4297000104,908.14999998153,0.062804525259658,173023.12044474,2196.4297000316,908.14999994382,0.062804525258387,125994.19820514,2196.4296933601,908.15001181481,0.067829549161126,133767.5211579,43909.58,2196.429699997,908.15000000531,0.6063709696437
-0.4,171839.81951422,134280.37600541,908.69829981918,909.64564563341,0.041553977430178,908.09378734519,906.80673454055,123864.83382789,2010.5273424644,825.18413429428,1.6008303922242,125797.93940869,2010.5947482108,825.04600776468,1.6008303922243,111172.57477663,2196.4296999857,908.1500000255,1.1743276336921,124643.45020211,2196.4296999995,908.15000000088,1.1974990550356,122437.79986452,2197.1823501971,906.81076477385,1.1756130994131,141086.44087614,2196.434165806,908.14205372601,1.1516739796468,134254.6313448,2196.4297496503,908.14991165423,1.1516739909021,134263.48128519,2195.5911772348,909.64203338996,0.13136225688156,171976.12747728,2196.4297000012,908.14999999789,0.12633514689456,171825.10655442,2196.4297000009,908.14999999848,0.12633514689451,124819.67675031,2196.4296767279,908.15004140944,0.13136201755909,131949.70371245,43909.58,2196.4297000005,908.14999999915,1.1743276336922
-0.6,171746.95095349,134215.15559222,908.42114074149,910.3936832537,0.061334277366411,908.15817156555,905.71870273355,123880.54050831,2010.3068233757,825.63601767279,1.6014377602929,125812.87492624,2010.42898952,825.38567721311,1.601437760293,109524.2098413,2196.4296995189,908.15000085599,1.7120680226099,122601.48111302,2196.4296999975,908.15000000446,1.7458499488628,120419.83011208,2197.7931389541,905.72395203904,1.7174012882639,139161.63594201,2196.5050645644,908.01589935168,1.7000078974523,132401.30347852,2196.4336066309,908.14304869944,1.7000081776471,134179.25247951,2195.1707805275,910.39007023578,0.19151497243715,171856.63357009,2196.4297000006,908.14999999888,0.18648574714237,171713.58778861,2196.4297000008,908.14999999865,0.18648574714234,124740.27670811,2196.429663388,908.15006514599,0.19151444895142,130086.25385974,43909.58,2196.4296999535,908.15000008277,1.712068022608
-0.8,171826.91949925,134326.25574661,908.14763880178,911.14186418581,0.079782377369479,908.16079187538,904.44053810981,123887.87112493,2009.9937420975,826.27757766901,1.6020782241634,125819.86364218,2010.1738220767,825.90856131817,1.6020782241634,107619.45110445,2196.4296967734,908.15000574129,2.2136694634412,120190.08792307,2196.4296999331,908.15000011896,2.2573488135297,118064.02626735,2198.5109505522,904.4467072024,2.2239496952668,136906.56358906,2196.8054854327,907.48134264648,2.2114887189765,130229.58018458,2196.478446126,908.06326312094,2.2114905185916,134266.24441696,2194.7503032329,911.13825047531,0.24762523665736,171902.76130405,2196.4297000001,908.14999999988,0.24259383428947,171769.25454395,2196.4297000008,908.14999999852,0.24259383428948,124833.11046733,2196.4296744664,908.15004543344,0.24762432440891,127905.47457757,43909.58,2196.4296993624,908.15000113455,2.2136694634259
-1,172000.96416501,134534.12796029,908.03003060799,911.89018851205,0.096761806111081,908.15233064893,903.02464660239,123886.21895743,2009.5941342317,827.09644624655,1.6027129762066,125818.32324495,2009.8298859672,826.61334842796,1.6027129762066,105516.29374388,2196.4296918729,908.15001446101,2.6753106854367,117505.83179804,2196.4296994503,908.15000097813,2.7280989783,115454.59277184,2199.3063070376,903.03148213942,2.6910959378517,134406.95129003,2197.4359134328,906.35958463914,2.6822178285348,127822.20670079,2196.6767465506,907.71041539045,2.6822234472403,134446.49373842,2194.3297453508,911.88657410891,0.29926557354,172038.57359981,2196.4296999995,908.15000000092,0.29423194336819,171915.61566072,2196.4297000007,908.14999999869,0.29423194336819,125019.90777234,2196.4297123647,908.14997799871,0.29926419094946,125485.77458971,43909.58,2196.4296971607,908.15000505209,2.6753106853928
-1.2,172217.50265032,134786.14151659,908.03795737307,912.6386563149,0.11220283493039,908.14801380306,901.51522339751,123875.7596606,2009.1190297495,828.07002100522,1.603318495638,125808.41050005,2009.4045324691,827.48497444861,1.6033184956379,103290.82175521,2196.4296919038,908.15001440597,3.0950611695885,114659.51531804,2196.4296980668,908.15000343991,3.1561318319007,112692.44841174,2200.1543484108,901.52251172461,3.1166376938363,131762.5961879,2198.3210608406,904.78458925159,3.110225789665,125275.16070601,2197.1581823084,906.85376813456,3.1102369756731,134668.87303715,2193.909106835,912.63504121878,0.34622001372783,172214.76697622,2196.4296999993,908.15000000127,0.34118411533368,172102.8686983,2196.4297000006,908.14999999893,0.34118411533367,125249.26375838,2196.4297450174,908.14991989779,0.34621809789119,122921.79720229,43909.58,2196.4296944546,908.1500098673,3.0950611695529
-1.4,172457.45330954,135061.72930699,908.08804558734,913.38726767694,0.12610165269316,908.14663871531,899.94879371406,123857.20731006,2008.5827421485,829.16897100711,1.6038818242001,125790.79003855,2008.90963229,828.49911415977,1.6038818241999,101026.81697967,2196.4297020106,908.14999642238,3.4728501200472,111757.87509271,2196.4296966894,908.15000589069,3.5413751816533,109875.94405069,2201.0345266717,899.95635823543,3.5002852428609,129065.64794311,2199.3240344916,902.99993862713,3.4954416585237,122674.01102448,2197.9463315204,905.45136740135,3.4954582111821,134914.11365674,2193.4883876393,913.38365188742,0.38848063051939,172413.86886368,2196.4296999994,908.15000000101,0.3834424456571,172313.0495342,2196.4297000004,908.14999999929,0.3834424456571,125501.63462672,2196.4297386742,908.14993118477,0.38847812594301,120310.31526408,43909.58,2196.4296959445,908.15000721616,3.4728501201047
-1.6,172707.51209593,135346.39031728,908.12914960586,914.13602268084,0.13850323174618,908.14632504204,898.35528615169,123831.58937894,2008.0014176235,830.36020978794,1.6043970304463,125766.4219087,2008.3598791972,829.62565738272,1.6043970304461,98796.02601415,2196.4297124083,908.14997792119,3.809938552205,108893.27229165,2196.4296977624,908.15000398149,3.8851149247775,107090.94100751,2201.9300040271,898.36298215815,3.8431362480684,126397.94887279,2200.3550058234,901.16547006516,3.8391531766671,120096.99910609,2198.9466072074,903.6715174246,3.8391733863307,135168.76137041,2193.067587717,914.13240619757,0.42618847376585,172623.71425808,2196.4296999997,908.15000000045,0.4211480042894,172533.64126385,2196.4297000001,908.14999999974,0.42114800428939,125763.37130681,2196.4296904448,908.15001700209,0.4261853341622,117734.46216859,43909.58,2196.4297027811,908.14999505139,3.8099385523423
-1.8,172981.49519067,135653.97615218,908.14972379086,914.88492140923,0.1494448079534,908.14632949566,896.75823464703,123800.10979485,2007.3917480618,831.60953266018,1.6048629691898,125736.43311558,2007.7713664971,830.83162603043,1.6048629691896,96714.67297639,2196.4296916345,908.15001488517,4.1073542323929,106228.15013405,2196.4296996014,908.15000070918,4.1883991066759,104416.53810152,2202.8275370439,896.76594832046,4.1460661462506,123853.44180557,2201.3761963043,899.34840515257,4.1424094622295,117650.74218021,2200.0368755437,901.73153817856,4.1424314472067,135447.5714613,2192.6467070218,914.88130423172,0.45945849830987,172858.83920726,2196.4297000015,908.14999999736,0.45441575984881,172779.24367592,2196.4297,908.15000000003,0.45441575984881,126049.27695164,2196.4295015721,908.15035307455,0.45945469010392,115332.58486603,43909.58,2196.429700906,908.14999838794,4.1073542322927
-2,173276.09386628,135980.74967978,908.15611799735,915.63396394477,0.15898687361768,908.14646655883,895.17600696036,123764.01259503,2006.769817416,832.88398070488,1.6052813127434,125701.99042762,2007.1603370513,832.08373555055,1.6052813127432,94840.175414662,2196.4294919533,908.15037018983,4.3667397848981,103837.81472528,2196.4296753119,908.15004392893,4.4529027612179,101915.7058096,2203.7167890013,895.18364946384,4.410611256459,121494.90001634,2202.3741043698,897.57276802531,4.4068858417155,115397.91850253,2201.1343357571,899.77876199801,4.4069083304965,135747.49665419,2192.2257455072,915.63034607268,0.48847444012578,173116.7933789,2196.4297000311,908.14999994472,0.48342945980919,173047.24422297,2196.4296999998,908.15000000035,0.48342945980923,126356.21614093,2196.4283705187,908.15236562514,0.48846994098701,113171.46950369,43909.58,2196.429616295,908.15014894136,4.3667397829013
diff --git a/msr/msre/gold/msre_loop_1d_bc_csv.csv b/msr/msre/gold/msre_loop_1d_bc_csv.csv
index 665f45c55..ae3343fd9 100644
--- a/msr/msre/gold/msre_loop_1d_bc_csv.csv
+++ b/msr/msre/gold/msre_loop_1d_bc_csv.csv
@@ -1,12 +1,12 @@
 time,Core_P_in,Core_P_out,Core_T_in,Core_T_out,Core_vel_in,HX_Tin_p,HX_Tout_p,hx_j1:pressure,hx_j1:rho,hx_j1:temperature,hx_j1:velocity,hx_j2:pressure,hx_j2:rho,hx_j2:temperature,hx_j2:velocity,j1:pressure,j1:rho,j1:temperature,j1:velocity,j2:pressure,j2:rho,j2:temperature,j2:velocity,j3:pressure,j3:rho,j3:temperature,j3:velocity,j4:pressure,j4:rho,j4:temperature,j4:velocity,j5:pressure,j5:rho,j5:temperature,j5:velocity,j_c_up:pressure,j_c_up:rho,j_c_up:temperature,j_c_up:velocity,j_dn_pl:pressure,j_dn_pl:rho,j_dn_pl:temperature,j_dn_pl:velocity,j_ip_c:pressure,j_ip_c:rho,j_ip_c:temperature,j_ip_c:velocity,j_up_ps1:pressure,j_up_ps1:rho,j_up_ps1:temperature,j_up_ps1:velocity,pump:pressure,pump:pump_head,pump:rho,pump:temperature,pump:velocity
 0,0,0,0,0,0,0,0,100000,2010.7066504,824.8167,0,100000,2010.7066504,824.8167,0,100000,2196.4297,908.15,0,100000,2196.4297,908.15,0,100000,2196.4297,908.15,0,100000,2196.4297,908.15,0,100000,2196.4297,908.15,0,100000,2196.4297,908.15,0,100000,2196.4297,908.15,0,100000,2196.4297,908.15,0,100000,2196.4297,908.15,0,110000,43909.58,2196.4297,908.15,0
-0.2,173026.57569509,135448.5653371,908.66521996144,908.89775124248,0.020657400549063,908.00595597151,907.64274325535,167803.54013411,2010.6565644921,824.91933505715,1.6003180927482,166469.21733111,2010.6801055332,824.87109521885,1.6003180927444,113009.99193953,2196.4297000168,908.14999997013,0.60637096965641,126367.92077203,2196.4296999876,908.15000002208,0.61833566912805,124130.29153111,2196.7134079603,907.64518156525,0.60502912033819,143080.33359069,2196.4297049876,908.14999112521,0.57252744021931,136514.42231688,2196.429699997,908.15000000536,0.57252744022659,135444.05995562,2196.011483836,908.89415687553,0.067829611865567,173172.37405635,2196.4297000104,908.14999998153,0.062804525259658,173023.12044474,2196.4297000316,908.14999994382,0.062804525258387,125994.19820514,2196.4296933601,908.15001181481,0.067829549161126,133767.5211579,43909.58,2196.429699997,908.15000000531,0.6063709696437
-0.4,171839.81951422,134280.37600541,908.69829981918,909.64564563341,0.041553977430178,908.09378734519,906.80673454055,123864.83382789,2010.5273424644,825.18413429428,1.6008303922242,125797.93940869,2010.5947482108,825.04600776468,1.6008303922243,111172.57477663,2196.4296999857,908.1500000255,1.1743276336921,124643.45020211,2196.4296999995,908.15000000088,1.1974990550356,122437.79986452,2197.1823501971,906.81076477385,1.1756130994131,141086.44087614,2196.434165806,908.14205372601,1.1516739796468,134254.6313448,2196.4297496503,908.14991165423,1.1516739909021,134263.48128519,2195.5911772348,909.64203338996,0.13136225688156,171976.12747728,2196.4297000012,908.14999999789,0.12633514689456,171825.10655442,2196.4297000009,908.14999999848,0.12633514689451,124819.67675031,2196.4296767279,908.15004140944,0.13136201755909,131949.70371245,43909.58,2196.4297000005,908.14999999915,1.1743276336922
-0.6,171746.95095349,134215.15559222,908.42114074149,910.3936832537,0.061334277366411,908.15817156555,905.71870273355,123880.54050831,2010.3068233757,825.63601767279,1.6014377602929,125812.87492624,2010.42898952,825.38567721311,1.601437760293,109524.2098413,2196.4296995189,908.15000085599,1.7120680226099,122601.48111302,2196.4296999975,908.15000000446,1.7458499488628,120419.83011208,2197.7931389541,905.72395203904,1.7174012882639,139161.63594201,2196.5050645644,908.01589935168,1.7000078974523,132401.30347852,2196.4336066309,908.14304869944,1.7000081776471,134179.25247951,2195.1707805275,910.39007023578,0.19151497243715,171856.63357009,2196.4297000006,908.14999999888,0.18648574714237,171713.58778861,2196.4297000008,908.14999999865,0.18648574714234,124740.27670811,2196.429663388,908.15006514599,0.19151444895142,130086.25385974,43909.58,2196.4296999535,908.15000008277,1.712068022608
-0.8,171826.91949925,134326.25574661,908.14763880178,911.14186418581,0.079782377369479,908.16079187538,904.44053810981,123887.87112493,2009.9937420975,826.27757766901,1.6020782241634,125819.86364218,2010.1738220767,825.90856131817,1.6020782241634,107619.45110445,2196.4296967734,908.15000574129,2.2136694634412,120190.08792307,2196.4296999331,908.15000011896,2.2573488135297,118064.02626735,2198.5109505522,904.4467072024,2.2239496952668,136906.56358906,2196.8054854327,907.48134264648,2.2114887189765,130229.58018458,2196.478446126,908.06326312094,2.2114905185916,134266.24441696,2194.7503032329,911.13825047531,0.24762523665736,171902.76130405,2196.4297000001,908.14999999988,0.24259383428947,171769.25454395,2196.4297000008,908.14999999852,0.24259383428948,124833.11046733,2196.4296744664,908.15004543344,0.24762432440891,127905.47457757,43909.58,2196.4296993624,908.15000113455,2.2136694634259
-1,172000.96416501,134534.12796029,908.03003060799,911.89018851205,0.096761806111081,908.15233064893,903.02464660239,123886.21895743,2009.5941342317,827.09644624655,1.6027129762066,125818.32324495,2009.8298859672,826.61334842796,1.6027129762066,105516.29374388,2196.4296918729,908.15001446101,2.6753106854367,117505.83179804,2196.4296994503,908.15000097813,2.7280989783,115454.59277184,2199.3063070376,903.03148213942,2.6910959378517,134406.95129003,2197.4359134328,906.35958463914,2.6822178285348,127822.20670079,2196.6767465506,907.71041539045,2.6822234472403,134446.49373842,2194.3297453508,911.88657410891,0.29926557354,172038.57359981,2196.4296999995,908.15000000092,0.29423194336819,171915.61566072,2196.4297000007,908.14999999869,0.29423194336819,125019.90777234,2196.4297123647,908.14997799871,0.29926419094946,125485.77458971,43909.58,2196.4296971607,908.15000505209,2.6753106853928
-1.2,172217.50265032,134786.14151659,908.03795737307,912.6386563149,0.11220283493039,908.14801380306,901.51522339751,123875.7596606,2009.1190297495,828.07002100522,1.603318495638,125808.41050005,2009.4045324691,827.48497444861,1.6033184956379,103290.82175521,2196.4296919038,908.15001440597,3.0950611695885,114659.51531804,2196.4296980668,908.15000343991,3.1561318319007,112692.44841174,2200.1543484108,901.52251172461,3.1166376938363,131762.5961879,2198.3210608406,904.78458925159,3.110225789665,125275.16070601,2197.1581823084,906.85376813456,3.1102369756731,134668.87303715,2193.909106835,912.63504121878,0.34622001372783,172214.76697622,2196.4296999993,908.15000000127,0.34118411533368,172102.8686983,2196.4297000006,908.14999999893,0.34118411533367,125249.26375838,2196.4297450174,908.14991989779,0.34621809789119,122921.79720229,43909.58,2196.4296944546,908.1500098673,3.0950611695529
-1.4,172457.45330954,135061.72930699,908.08804558734,913.38726767694,0.12610165269316,908.14663871531,899.94879371406,123857.20731006,2008.5827421485,829.16897100711,1.6038818242001,125790.79003855,2008.90963229,828.49911415977,1.6038818241999,101026.81697967,2196.4297020106,908.14999642238,3.4728501200472,111757.87509271,2196.4296966894,908.15000589069,3.5413751816533,109875.94405069,2201.0345266717,899.95635823543,3.5002852428609,129065.64794311,2199.3240344916,902.99993862713,3.4954416585237,122674.01102448,2197.9463315204,905.45136740135,3.4954582111821,134914.11365674,2193.4883876393,913.38365188742,0.38848063051939,172413.86886368,2196.4296999994,908.15000000101,0.3834424456571,172313.0495342,2196.4297000004,908.14999999929,0.3834424456571,125501.63462672,2196.4297386742,908.14993118477,0.38847812594301,120310.31526408,43909.58,2196.4296959445,908.15000721616,3.4728501201047
-1.6,172707.51209593,135346.39031728,908.12914960586,914.13602268084,0.13850323174618,908.14632504204,898.35528615169,123831.58937894,2008.0014176235,830.36020978794,1.6043970304463,125766.4219087,2008.3598791972,829.62565738272,1.6043970304461,98796.02601415,2196.4297124083,908.14997792119,3.809938552205,108893.27229165,2196.4296977624,908.15000398149,3.8851149247775,107090.94100751,2201.9300040271,898.36298215815,3.8431362480684,126397.94887279,2200.3550058234,901.16547006516,3.8391531766671,120096.99910609,2198.9466072074,903.6715174246,3.8391733863307,135168.76137041,2193.067587717,914.13240619757,0.42618847376585,172623.71425808,2196.4296999997,908.15000000045,0.4211480042894,172533.64126385,2196.4297000001,908.14999999974,0.42114800428939,125763.37130681,2196.4296904448,908.15001700209,0.4261853341622,117734.46216859,43909.58,2196.4297027811,908.14999505139,3.8099385523423
-1.8,172981.49519067,135653.97615218,908.14972379086,914.88492140923,0.1494448079534,908.14632949566,896.75823464703,123800.10979485,2007.3917480618,831.60953266018,1.6048629691898,125736.43311558,2007.7713664971,830.83162603043,1.6048629691896,96714.67297639,2196.4296916345,908.15001488517,4.1073542323929,106228.15013405,2196.4296996014,908.15000070918,4.1883991066759,104416.53810152,2202.8275370439,896.76594832046,4.1460661462506,123853.44180557,2201.3761963043,899.34840515257,4.1424094622295,117650.74218021,2200.0368755437,901.73153817856,4.1424314472067,135447.5714613,2192.6467070218,914.88130423172,0.45945849830987,172858.83920726,2196.4297000015,908.14999999736,0.45441575984881,172779.24367592,2196.4297,908.15000000003,0.45441575984881,126049.27695164,2196.4295015721,908.15035307455,0.45945469010392,115332.58486603,43909.58,2196.429700906,908.14999838794,4.1073542322927
-2,173276.09386628,135980.74967978,908.15611799735,915.63396394477,0.15898687361768,908.14646655883,895.17600696036,123764.01259503,2006.769817416,832.88398070488,1.6052813127434,125701.99042762,2007.1603370513,832.08373555055,1.6052813127432,94840.175414662,2196.4294919533,908.15037018983,4.3667397848981,103837.81472528,2196.4296753119,908.15004392893,4.4529027612179,101915.7058096,2203.7167890013,895.18364946384,4.410611256459,121494.90001634,2202.3741043698,897.57276802531,4.4068858417155,115397.91850253,2201.1343357571,899.77876199801,4.4069083304965,135747.49665419,2192.2257455072,915.63034607268,0.48847444012578,173116.7933789,2196.4297000311,908.14999994472,0.48342945980919,173047.24422297,2196.4296999998,908.15000000035,0.48342945980923,126356.21614093,2196.4283705187,908.15236562514,0.48846994098701,113171.46950369,43909.58,2196.429616295,908.15014894136,4.3667397829013
+0.2,173026.57568873,135448.56533317,908.66521991603,908.89775124216,0.020657400550373,908.00595594285,907.64274325928,167803.54013225,2010.656564492,824.91933505747,1.6003180927317,166469.21732596,2010.680105542,824.87109520088,1.6003180927345,113009.99193611,2196.429700037,908.14999993425,0.60637096962608,126367.92076671,2196.4297000013,908.14999999764,0.61833566911628,124130.29152568,2196.7134079524,907.64518157944,0.60502912027942,143080.33358555,2196.429705,908.14999110312,0.57252744034005,136514.42231115,2196.4296999284,908.15000012735,0.57252744014951,135444.05995159,2196.0114838683,908.89415681801,0.067829611866639,173172.37405085,2196.4297000519,908.14999990774,0.062804525260098,173023.12043835,2196.4297001095,908.14999980513,0.062804525266124,125994.19820128,2196.4296933729,908.15001179205,0.067829549158795,133767.52115397,43909.58,2196.4297000208,908.14999996294,0.60637096962551
+0.4,171839.81951524,134280.37600635,908.69829979076,909.64564563307,0.04155397742979,908.09378734095,906.80673454503,123864.83382851,2010.5273424636,825.18413429597,1.6008303922247,125797.93940925,2010.5947482096,825.04600776721,1.6008303922248,111172.57477737,2196.4296999864,908.15000002424,1.1743276336875,124643.45020226,2196.4297000001,908.14999999982,1.1974990550309,122437.79986455,2197.1823501947,906.81076477811,1.1756130994092,141086.44087661,2196.4341658059,908.14205372609,1.151673979644,134254.63134567,2196.4297496502,908.14991165441,1.1516739908998,134263.48128614,2195.5911772353,909.64203338923,0.13136225688107,171976.12747821,2196.4297000004,908.14999999931,0.12633514689421,171825.1065554,2196.4297000017,908.14999999702,0.12633514689419,124819.67675126,2196.4296767271,908.1500414109,0.13136201755858,131949.70371297,43909.58,2196.4297000012,908.14999999784,1.1743276336874
+0.6,171746.95095347,134215.15559218,908.42114072885,910.39368325349,0.061334277366101,908.15817156386,905.71870273549,123880.54050834,2010.306823375,825.63601767409,1.6014377602934,125812.87492628,2010.428989519,825.3856772151,1.6014377602934,109524.20984129,2196.4296995188,908.15000085629,1.7120680226055,122601.48111298,2196.4296999992,908.15000000148,1.7458499488585,120419.83011205,2197.793138953,905.72395204101,1.7174012882593,139161.63594197,2196.505064564,908.01589935226,1.7000078974488,132401.30347848,2196.4336066316,908.14304869822,1.7000081776436,134179.25247947,2195.1707805276,910.39007023554,0.1915149724367,171856.63357002,2196.4297000001,908.14999999989,0.18648574714199,171713.58778855,2196.4297000012,908.14999999784,0.18648574714199,124740.27670807,2196.4296633871,908.15006514757,0.19151444895094,130086.2538597,43909.58,2196.4296999555,908.15000007912,1.7120680226036
+0.8,171826.91949927,134326.25574662,908.14763879851,911.14186418576,0.079782377369257,908.16079187068,904.44053810822,123887.87112495,2009.993742097,826.27757766999,1.6020782241636,125819.86364221,2010.1738220761,825.90856131951,1.6020782241636,107619.45110448,2196.4296967732,908.15000574168,2.2136694634368,120190.08792308,2196.4296999359,908.15000011408,2.2573488135253,118064.02626737,2198.5109505531,904.44670720088,2.2239496952619,136906.56358909,2196.8054854319,907.48134264789,2.2114887189718,130229.58018462,2196.478446127,908.06326311926,2.2114905185869,134266.24441696,2194.7503032329,911.13825047522,0.24762523665686,171902.76130407,2196.4296999997,908.15000000045,0.24259383428895,171769.25454396,2196.4297000013,908.14999999776,0.24259383428895,124833.11046734,2196.4296744659,908.15004543443,0.24762432440841,127905.47457759,43909.58,2196.4296993644,908.15000113102,2.2136694634214
+1,172000.96416499,134534.12796026,908.03003060806,911.89018851233,0.096761806110932,908.15233064417,903.02464659902,123886.21895744,2009.5941342313,827.09644624724,1.6027129762067,125818.32324497,2009.8298859667,826.61334842889,1.6027129762067,105516.2937439,2196.4296918728,908.15001446113,2.675310685432,117505.83179806,2196.4296994529,908.15000097344,2.7280989782954,115454.59277187,2199.3063070395,903.03148213615,2.6910959378468,134406.95129004,2197.4359134322,906.35958464023,2.6822178285301,127822.2067008,2196.6767465511,907.71041538948,2.6822234472357,134446.49373839,2194.3297453506,911.88657410917,0.29926557353948,172038.57359979,2196.4296999996,908.15000000063,0.29423194336768,171915.6156607,2196.4297000012,908.1499999979,0.29423194336769,125019.90777232,2196.4297123646,908.14997799895,0.29926419094894,125485.77458973,43909.58,2196.4296971617,908.15000505033,2.6753106853882
+1.2,172217.50265031,134786.14151658,908.03795737364,912.63865631562,0.11220283493027,908.14801379985,901.51522339509,123875.75966061,2009.1190297493,828.07002100547,1.6033184956382,125808.41050006,2009.4045324688,827.48497444914,1.603318495638,103290.82175523,2196.4296919039,908.15001440593,3.0950611695844,114659.51531806,2196.4296980686,908.1500034367,3.1561318318964,112692.44841176,2200.1543484121,901.52251172218,3.1166376938321,131762.59618793,2198.3210608407,904.78458925143,3.1102257896606,125275.16070605,2197.1581823084,906.85376813451,3.1102369756689,134668.87303715,2193.9091068346,912.63504121949,0.34622001372737,172214.76697622,2196.4296999997,908.15000000045,0.34118411533319,172102.8686983,2196.4297000009,908.14999999837,0.34118411533319,125249.26375838,2196.4297450178,908.14991989719,0.34621809789072,122921.79720232,43909.58,2196.4296944548,908.15000986686,3.0950611695487
+1.4,172457.45330955,135061.729307,908.0880455877,913.38726767803,0.12610165269303,908.14663871359,899.94879371371,123857.20731007,2008.5827421486,829.16897100692,1.6038818242001,125790.79003856,2008.90963229,828.49911415982,1.6038818241999,101026.8169797,2196.4297020107,908.14999642225,3.4728501200434,111757.87509273,2196.4296966904,908.15000588891,3.5413751816493,109875.94405072,2201.0345266719,899.95635823505,3.5002852428571,129065.64794315,2199.3240344922,902.99993862602,3.4954416585198,122674.01102453,2197.9463315204,905.45136740135,3.4954582111781,134914.11365675,2193.4883876387,913.38365188852,0.38848063051896,172413.86886369,2196.4297,908.14999999994,0.38344244565666,172313.0495342,2196.4297000005,908.14999999905,0.38344244565665,125501.63462672,2196.4297386748,908.14993118369,0.38847812594259,120310.31526411,43909.58,2196.4296959446,908.15000721602,3.4728501201008
+1.6,172707.51209591,135346.39031725,908.12914960599,914.13602268194,0.13850323174604,908.14632504125,898.35528615274,123831.58937895,2008.0014176237,830.36020978746,1.6043970304464,125766.42190871,2008.3598791974,829.62565738246,1.6043970304461,98796.026014157,2196.4297124085,908.14997792085,3.809938552201,108893.27229168,2196.4296977628,908.15000398071,3.8851149247734,107090.94100754,2201.9300040265,898.36298215919,3.8431362480645,126397.94887282,2200.3550058239,901.16547006427,3.8391531766635,120096.99910611,2198.9466072077,903.67151742396,3.8391733863268,135168.76137039,2193.0675877164,914.13240619856,0.42618847376545,172623.71425806,2196.4297000004,908.14999999935,0.42114800428898,172533.64126383,2196.4297000002,908.1499999997,0.421148004289,125763.37130679,2196.4296904454,908.15001700099,0.42618533416177,117734.4621686,43909.58,2196.4297027812,908.14999505121,3.8099385523382
+1.8,172981.49519068,135653.97615219,908.14972379134,914.88492140993,0.14944480795327,908.14632949535,896.75823464819,123800.10979486,2007.3917480621,831.60953265959,1.6048629691898,125736.43311559,2007.7713664974,830.83162602995,1.6048629691895,96714.672976415,2196.4296916349,908.15001488455,4.1073542323895,106228.15013407,2196.4296996016,908.15000070888,4.1883991066725,104416.53810155,2202.8275370432,896.76594832164,4.1460661462474,123853.44180561,2201.3761963043,899.34840515255,4.142409462226,117650.74218026,2200.036875544,901.73153817801,4.1424314472031,135447.57146131,2192.6467070214,914.88130423241,0.45945849830948,172858.83920727,2196.4297000019,908.14999999669,0.45441575984842,172779.24367594,2196.4296999997,908.15000000054,0.45441575984842,126049.27695165,2196.4295015725,908.15035307387,0.45945469010353,115332.58486605,43909.58,2196.4297009062,908.1499983876,4.1073542322894
+2,173276.0938679,135980.74968058,908.15611801145,915.63396394617,0.1589868736189,908.14646654458,895.17600696703,123764.01259512,2006.769817415,832.883980707,1.6052813127311,125701.99042771,2007.1603370501,832.08373555313,1.6052813127312,94840.175415376,2196.4294919516,908.15037019285,4.3667397849382,103837.8147244,2196.4296753144,908.15004392448,4.4529027612694,101915.70580989,2203.7167889989,895.18364946814,4.4106112565125,121494.90001759,2202.3741043666,897.57276803094,4.4068858416771,115397.9185031,2201.1343357482,899.77876201393,4.4069083305201,135747.49665478,2192.2257455041,915.63034607814,0.48847444012615,173116.79338089,2196.4297000248,908.14999995579,0.48342945981527,173047.24422474,2196.4296999921,908.1500000141,0.48342945980868,126356.21614174,2196.4283705214,908.15236562025,0.48846994099315,113171.46950404,43909.58,2196.4296162991,908.15014893393,4.3667397829402
diff --git a/msr/msre/tests b/msr/msre/tests
index cdc953a2f..ba33aa390 100644
--- a/msr/msre/tests
+++ b/msr/msre/tests
@@ -3,8 +3,16 @@
     type = 'CSVDiff'
     input = 'msre_loop_1d.i'
     csvdiff = 'msre_loop_1d_csv.csv'
-    cli_args = '--app SamApp Executioner/num_steps=10'
+    cli_args = 'Executioner/num_steps=10'
     allow_warnings = true
-    executable_pattern = 'sam*|blue_crab*'
+    executable_pattern = 'sam*'
+  []
+  [msre_bc]
+    type = 'CSVDiff'
+    input = 'msre_loop_1d.i'
+    csvdiff = 'msre_loop_1d_bc_csv.csv'
+    cli_args = '--app SamApp Executioner/num_steps=10 Outputs/file_base=msre_loop_1d_bc_csv'
+    allow_warnings = true
+    executable_pattern = 'blue_crab*'
   []
 []