From 11e618fe81a2d7515a093d9549d083cc82bd73c2 Mon Sep 17 00:00:00 2001
From: Ethan Peterson <ethan.peterson@mit.edu>
Date: Tue, 28 Feb 2023 11:31:04 -0500
Subject: [PATCH] adding export_to_xml to run and updating tests

---
 openmc/model/model.py                         |   11 +-
 src/cell.cpp                                  |    2 +-
 .../adj_cell_rotation/inputs_true.dat         |   74 +-
 .../asymmetric_lattice/inputs_true.dat        |  411 +-
 .../cpp_driver/inputs_true.dat                |   84 +-
 .../create_fission_neutrons/inputs_true.dat   |   71 +-
 .../create_fission_neutrons/test.py           |   16 +-
 .../dagmc/external/inputs_true.dat            |   77 +-
 .../dagmc/legacy/inputs_true.dat              |   75 +-
 .../dagmc/refl/inputs_true.dat                |   55 +-
 tests/regression_tests/dagmc/refl/test.py     |   23 +-
 .../dagmc/universes/inputs_true.dat           |  108 +-
 .../regression_tests/dagmc/universes/test.py  |   23 +-
 .../dagmc/uwuw/inputs_true.dat                |   55 +-
 tests/regression_tests/dagmc/uwuw/test.py     |   22 +-
 .../diff_tally/inputs_true.dat                |  723 ++-
 .../distribmat/inputs_true.dat                |  117 +-
 .../distribmat/results_true.dat               |    2 +-
 tests/regression_tests/distribmat/test.py     |   17 +-
 .../eigenvalue_genperbatch/inputs_true.dat    |   59 +-
 .../energy_cutoff/inputs_true.dat             |   81 +-
 tests/regression_tests/energy_cutoff/test.py  |   15 +-
 .../energy_laws/inputs_true.dat               |   44 +-
 .../external_moab/inputs_true.dat             |  143 +-
 tests/regression_tests/external_moab/test.py  |    2 -
 .../filter_cellinstance/inputs_true.dat       |  119 +-
 .../filter_energyfun/inputs_true.dat          |  209 +-
 .../filter_mesh/inputs_true.dat               |  301 +-
 .../filter_translations/inputs_true.dat       |  165 +-
 .../fixed_source/inputs_true.dat              |   59 +-
 .../iso_in_lab/inputs_true.dat                |  488 +--
 .../lattice_hex_coincident/inputs_true.dat    |  160 +-
 .../lattice_hex_coincident/test.py            |   13 +-
 .../lattice_hex_x/inputs_true.dat             |  160 +-
 tests/regression_tests/lattice_hex_x/test.py  |   15 +-
 .../lattice_multiple/inputs_true.dat          |   96 +-
 .../lattice_rotated/inputs_true.dat           |  114 +-
 .../regression_tests/mg_basic/inputs_true.dat |  126 +-
 .../mg_basic_delayed/inputs_true.dat          |  124 +-
 .../mg_convert/inputs_true.dat                |   56 +-
 tests/regression_tests/mg_convert/test.py     |   12 +-
 .../mg_legendre/inputs_true.dat               |   64 +-
 .../mg_max_order/inputs_true.dat              |   66 +-
 .../mg_survival_biasing/inputs_true.dat       |   66 +-
 .../mg_tallies/inputs_true.dat                |  327 +-
 .../mgxs_library_ce_to_mg/inputs_true.dat     |  499 ++-
 .../mgxs_library_ce_to_mg/test.py             |    9 +-
 .../inputs_true.dat                           |  499 ++-
 .../mgxs_library_ce_to_mg_nuclides/test.py    |    9 +-
 .../mgxs_library_condense/inputs_true.dat     | 1061 +++--
 .../mgxs_library_correction/inputs_true.dat   |  685 ++-
 .../mgxs_library_distribcell/inputs_true.dat  | 1047 +++--
 .../mgxs_library_hdf5/inputs_true.dat         | 1061 +++--
 .../mgxs_library_histogram/inputs_true.dat    |  535 ++-
 .../mgxs_library_mesh/inputs_true.dat         | 1021 +++--
 .../mgxs_library_no_nuclides/inputs_true.dat  | 3901 ++++++++---------
 .../mgxs_library_nuclides/inputs_true.dat     | 3535 ++++++++-------
 .../multipole/inputs_true.dat                 |  103 +-
 .../regression_tests/ncrystal/inputs_true.dat |   87 +-
 .../regression_tests/periodic/inputs_true.dat |   72 +-
 .../periodic_6fold/inputs_true.dat            |   66 +-
 .../periodic_hex/inputs_true.dat              |   46 +-
 .../photon_production/inputs_true.dat         |  133 +-
 .../photon_production_fission/inputs_true.dat |   95 +-
 .../photon_source/inputs_true.dat             |   87 +-
 tests/regression_tests/photon_source/test.py  |   15 +-
 .../resonance_scattering/inputs_true.dat      |   66 +-
 .../resonance_scattering/test.py              |   14 +-
 .../salphabeta/inputs_true.dat                |  118 +-
 .../score_current/inputs_true.dat             |  107 +-
 tests/regression_tests/source/inputs_true.dat |  298 +-
 tests/regression_tests/source/test.py         |   14 +-
 .../source_dlopen/inputs_true.dat             |   44 +-
 .../inputs_true.dat                           |   44 +-
 .../surface_source/inputs_true_read.dat       |   65 +-
 .../surface_source/inputs_true_write.dat      |   77 +-
 .../surface_source/surface_source_true.h5     |  Bin 106144 -> 106144 bytes
 .../surface_tally/inputs_true.dat             |  203 +-
 tests/regression_tests/surface_tally/test.py  |   15 +-
 .../regression_tests/tallies/inputs_true.dat  |  853 ++--
 .../tally_aggregation/inputs_true.dat         |  107 +-
 .../tally_arithmetic/inputs_true.dat          |  109 +-
 .../tally_slice_merge/inputs_true.dat         |  541 ++-
 tests/regression_tests/torus/inputs_true.dat  |   66 +-
 .../torus/large_major/inputs_true.dat         |   71 +-
 .../inputs_true.dat                           |   67 +-
 tests/regression_tests/triso/inputs_true.dat  |  878 ++--
 tests/regression_tests/triso/test.py          |   14 +-
 .../unstructured_mesh/inputs_true.dat         |  179 +-
 .../unstructured_mesh/inputs_true0.dat        |  179 +-
 .../unstructured_mesh/inputs_true1.dat        |  179 +-
 .../unstructured_mesh/inputs_true10.dat       |  179 +-
 .../unstructured_mesh/inputs_true11.dat       |  179 +-
 .../unstructured_mesh/inputs_true12.dat       |  179 +-
 .../unstructured_mesh/inputs_true13.dat       |  179 +-
 .../unstructured_mesh/inputs_true14.dat       |  179 +-
 .../unstructured_mesh/inputs_true15.dat       |  179 +-
 .../unstructured_mesh/inputs_true2.dat        |  179 +-
 .../unstructured_mesh/inputs_true3.dat        |  179 +-
 .../unstructured_mesh/inputs_true4.dat        |  181 +-
 .../unstructured_mesh/inputs_true5.dat        |  181 +-
 .../unstructured_mesh/inputs_true6.dat        |  181 +-
 .../unstructured_mesh/inputs_true7.dat        |  181 +-
 .../unstructured_mesh/inputs_true8.dat        |  179 +-
 .../unstructured_mesh/inputs_true9.dat        |  179 +-
 tests/regression_tests/void/inputs_true.dat   |  261 +-
 .../volume_calc/inputs_true.dat               |  148 +-
 .../volume_calc/inputs_true_mg.dat            |  150 +-
 tests/regression_tests/volume_calc/test.py    |   10 +-
 .../weightwindows/inputs_true.dat             |  189 +-
 tests/testing_harness.py                      |    7 +-
 111 files changed, 13560 insertions(+), 13643 deletions(-)

diff --git a/openmc/model/model.py b/openmc/model/model.py
index 3e0422eb1..78f02242f 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -596,7 +596,8 @@ class Model:
 
     def run(self, particles=None, threads=None, geometry_debug=False,
             restart_file=None, tracks=False, output=True, cwd='.',
-            openmc_exec='openmc', mpi_args=None, event_based=None):
+            openmc_exec='openmc', mpi_args=None, event_based=None,
+            export_model_xml=True):
         """Runs OpenMC. If the C API has been initialized, then the C API is
         used, otherwise, this method creates the XML files and runs OpenMC via
         a system call. In both cases this method returns the path to the last
@@ -639,6 +640,9 @@ class Model:
         event_based : None or bool, optional
             Turns on event-based parallelism if True. If None, the value in
             the Settings will be used.
+        export_model_xml : bool, optional
+            Exports a single model.xml file rather than separate files.
+            Defaults to True.
 
         Returns
         -------
@@ -688,7 +692,10 @@ class Model:
 
             else:
                 # Then run via the command line
-                self.export_to_xml()
+                if export_model_xml:
+                    self.export_to_model_xml()
+                else:
+                    self.export_to_xml()
                 openmc.run(particles, threads, geometry_debug, restart_file,
                            tracks, output, Path('.'), openmc_exec, mpi_args,
                            event_based)
diff --git a/src/cell.cpp b/src/cell.cpp
index 9ba14c6cf..c96abf39b 100644
--- a/src/cell.cpp
+++ b/src/cell.cpp
@@ -291,7 +291,7 @@ CSGCell::CSGCell(pugi::xml_node cell_node)
   if (fill_present) {
     fill_ = std::stoi(get_node_value(cell_node, "fill"));
     if (fill_ == universe_) {
-      fatal_error(fmt::format("Cell {} is filled with the same universe that"
+      fatal_error(fmt::format("Cell {} is filled with the same universe that "
                               "it is contained in.",
         id_));
     }
diff --git a/tests/regression_tests/adj_cell_rotation/inputs_true.dat b/tests/regression_tests/adj_cell_rotation/inputs_true.dat
index 24b00199b..1c4516f42 100644
--- a/tests/regression_tests/adj_cell_rotation/inputs_true.dat
+++ b/tests/regression_tests/adj_cell_rotation/inputs_true.dat
@@ -1,38 +1,38 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <cell id="2" material="2" region="1" universe="1" />
-  <cell fill="1" id="3" region="2 -3 4 -5 6 -8" rotation="10 20 30" universe="2" />
-  <cell fill="1" id="4" region="2 -3 4 -5 8 -7" translation="0 0 15" universe="2" />
-  <surface coeffs="1.0 0.0 0.0 5.0" id="1" type="sphere" />
-  <surface boundary="vacuum" coeffs="-7.5" id="2" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="7.5" id="3" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-7.5" id="4" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="7.5" id="5" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-7.5" id="6" type="z-plane" />
-  <surface boundary="vacuum" coeffs="22.5" id="7" type="z-plane" />
-  <surface coeffs="7.5" id="8" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cc" value="10.0" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2">
-    <density units="g/cc" value="0.1" />
-    <nuclide ao="0.1" name="H1" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>10000</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
-    </space>
-  </source>
-</settings>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="10.0" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2">
+      <density units="g/cc" value="0.1" />
+      <nuclide ao="0.1" name="H1" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <cell id="2" material="2" region="1" universe="1" />
+    <cell fill="1" id="3" region="2 -3 4 -5 6 -8" rotation="10 20 30" universe="2" />
+    <cell fill="1" id="4" region="2 -3 4 -5 8 -7" translation="0 0 15" universe="2" />
+    <surface coeffs="1.0 0.0 0.0 5.0" id="1" type="sphere" />
+    <surface boundary="vacuum" coeffs="-7.5" id="2" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="7.5" id="3" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-7.5" id="4" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="7.5" id="5" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-7.5" id="6" type="z-plane" />
+    <surface boundary="vacuum" coeffs="22.5" id="7" type="z-plane" />
+    <surface coeffs="7.5" id="8" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>10000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
+      </space>
+    </source>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/asymmetric_lattice/inputs_true.dat b/tests/regression_tests/asymmetric_lattice/inputs_true.dat
index bbdc79715..b247412e5 100644
--- a/tests/regression_tests/asymmetric_lattice/inputs_true.dat
+++ b/tests/regression_tests/asymmetric_lattice/inputs_true.dat
@@ -1,19 +1,168 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell fill="202" id="1" region="9 -10 11 -12 13 -14" universe="0" />
-  <cell id="27" material="1" region="-1" universe="3" />
-  <cell id="28" material="2" region="1 -2" universe="3" />
-  <cell id="29" material="4" region="2" universe="3" />
-  <cell id="30" material="4" region="-3" universe="4" />
-  <cell id="31" material="2" region="3 -4" universe="4" />
-  <cell id="32" material="4" region="4" universe="4" />
-  <cell id="70" material="4" region="35 -36" universe="7" />
-  <cell fill="101" id="80" region="35 -36" universe="8" />
-  <lattice id="101" name="Fuel assembly (upper half)">
-    <pitch>1.26 1.26</pitch>
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <universes>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UOX fuel">
+      <density units="g/cm3" value="10.062" />
+      <nuclide ao="4.9476e-06" name="U234" />
+      <nuclide ao="0.00048218" name="U235" />
+      <nuclide ao="0.021504" name="U238" />
+      <nuclide ao="1.0801e-08" name="Xe135" />
+      <nuclide ao="0.045737" name="O16" />
+    </material>
+    <material id="2" name="Zircaloy">
+      <density units="g/cm3" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="Cold borated water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <nuclide ao="0.000649" name="B10" />
+      <nuclide ao="0.002689" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="4" name="Hot borated water">
+      <density units="atom/b-cm" value="0.06614" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <nuclide ao="0.000649" name="B10" />
+      <nuclide ao="0.002689" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="5" name="Reactor pressure vessel steel">
+      <density units="g/cm3" value="7.9" />
+      <nuclide name="Fe54" wo="0.05437098" />
+      <nuclide name="Fe56" wo="0.88500663" />
+      <nuclide name="Fe57" wo="0.0208008" />
+      <nuclide name="Fe58" wo="0.00282159" />
+      <nuclide name="Ni58" wo="0.0067198" />
+      <nuclide name="Ni60" wo="0.0026776" />
+      <nuclide name="Mn55" wo="0.01" />
+      <nuclide name="Cr52" wo="0.002092475" />
+      <nuclide name="C0" wo="0.0025" />
+      <nuclide name="Cu63" wo="0.0013696" />
+    </material>
+    <material id="6" name="Lower radial reflector">
+      <density units="g/cm3" value="4.32" />
+      <nuclide name="H1" wo="0.0095661" />
+      <nuclide name="O16" wo="0.0759107" />
+      <nuclide name="B10" wo="3.08409e-05" />
+      <nuclide name="B11" wo="0.000140499" />
+      <nuclide name="Fe54" wo="0.035620772088" />
+      <nuclide name="Fe56" wo="0.579805982228" />
+      <nuclide name="Fe57" wo="0.01362750048" />
+      <nuclide name="Fe58" wo="0.001848545204" />
+      <nuclide name="Ni58" wo="0.055298376566" />
+      <nuclide name="Mn55" wo="0.018287" />
+      <nuclide name="Cr52" wo="0.145407678031" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="7" name="Upper radial reflector / Top plate region">
+      <density units="g/cm3" value="4.28" />
+      <nuclide name="H1" wo="0.0086117" />
+      <nuclide name="O16" wo="0.0683369" />
+      <nuclide name="B10" wo="2.77638e-05" />
+      <nuclide name="B11" wo="0.000126481" />
+      <nuclide name="Fe54" wo="0.035953677186" />
+      <nuclide name="Fe56" wo="0.585224740891" />
+      <nuclide name="Fe57" wo="0.01375486056" />
+      <nuclide name="Fe58" wo="0.001865821363" />
+      <nuclide name="Ni58" wo="0.055815129186" />
+      <nuclide name="Mn55" wo="0.0184579" />
+      <nuclide name="Cr52" wo="0.146766614995" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="8" name="Bottom plate region">
+      <density units="g/cm3" value="7.184" />
+      <nuclide name="H1" wo="0.0011505" />
+      <nuclide name="O16" wo="0.0091296" />
+      <nuclide name="B10" wo="3.70915e-06" />
+      <nuclide name="B11" wo="1.68974e-05" />
+      <nuclide name="Fe54" wo="0.03855611055" />
+      <nuclide name="Fe56" wo="0.627585036425" />
+      <nuclide name="Fe57" wo="0.014750478" />
+      <nuclide name="Fe58" wo="0.002000875025" />
+      <nuclide name="Ni58" wo="0.059855207342" />
+      <nuclide name="Mn55" wo="0.019794" />
+      <nuclide name="Cr52" wo="0.157390026871" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="9" name="Bottom nozzle region">
+      <density units="g/cm3" value="2.53" />
+      <nuclide name="H1" wo="0.0245014" />
+      <nuclide name="O16" wo="0.1944274" />
+      <nuclide name="B10" wo="7.89917e-05" />
+      <nuclide name="B11" wo="0.000359854" />
+      <nuclide name="Fe54" wo="0.030411411144" />
+      <nuclide name="Fe56" wo="0.495012237964" />
+      <nuclide name="Fe57" wo="0.01163454624" />
+      <nuclide name="Fe58" wo="0.001578204652" />
+      <nuclide name="Ni58" wo="0.047211231662" />
+      <nuclide name="Mn55" wo="0.0156126" />
+      <nuclide name="Cr52" wo="0.124142524198" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="10" name="Top nozzle region">
+      <density units="g/cm3" value="1.746" />
+      <nuclide name="H1" wo="0.035887" />
+      <nuclide name="O16" wo="0.2847761" />
+      <nuclide name="B10" wo="0.000115699" />
+      <nuclide name="B11" wo="0.000527075" />
+      <nuclide name="Fe54" wo="0.02644016154" />
+      <nuclide name="Fe56" wo="0.43037146399" />
+      <nuclide name="Fe57" wo="0.0101152584" />
+      <nuclide name="Fe58" wo="0.00137211607" />
+      <nuclide name="Ni58" wo="0.04104621835" />
+      <nuclide name="Mn55" wo="0.0135739" />
+      <nuclide name="Cr52" wo="0.107931450781" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="11" name="Top of fuel assemblies">
+      <density units="g/cm3" value="3.044" />
+      <nuclide name="H1" wo="0.0162913" />
+      <nuclide name="O16" wo="0.1292776" />
+      <nuclide name="B10" wo="5.25228e-05" />
+      <nuclide name="B11" wo="0.000239272" />
+      <nuclide name="Zr90" wo="0.43313403903" />
+      <nuclide name="Zr91" wo="0.09549277374" />
+      <nuclide name="Zr92" wo="0.14759527104" />
+      <nuclide name="Zr94" wo="0.15280552077" />
+      <nuclide name="Zr96" wo="0.02511169542" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="12" name="Bottom of fuel assemblies">
+      <density units="g/cm3" value="1.762" />
+      <nuclide name="H1" wo="0.0292856" />
+      <nuclide name="O16" wo="0.2323919" />
+      <nuclide name="B10" wo="9.44159e-05" />
+      <nuclide name="B11" wo="0.00043012" />
+      <nuclide name="Zr90" wo="0.3741373658" />
+      <nuclide name="Zr91" wo="0.0824858164" />
+      <nuclide name="Zr92" wo="0.1274914944" />
+      <nuclide name="Zr94" wo="0.1319920622" />
+      <nuclide name="Zr96" wo="0.0216912612" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell fill="202" id="1" region="9 -10 11 -12 13 -14" universe="0" />
+    <cell id="27" material="1" region="-1" universe="3" />
+    <cell id="28" material="2" region="1 -2" universe="3" />
+    <cell id="29" material="4" region="2" universe="3" />
+    <cell id="30" material="4" region="-3" universe="4" />
+    <cell id="31" material="2" region="3 -4" universe="4" />
+    <cell id="32" material="4" region="4" universe="4" />
+    <cell id="70" material="4" region="35 -36" universe="7" />
+    <cell fill="101" id="80" region="35 -36" universe="8" />
+    <lattice id="101" name="Fuel assembly (upper half)">
+      <pitch>1.26 1.26</pitch>
+      <dimension>17 17</dimension>
+      <lower_left>-10.71 -10.71</lower_left>
+      <universes>
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 
@@ -31,197 +180,47 @@
 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
-  </lattice>
-  <lattice id="202" name="3x3 Core Lattice">
-    <pitch>21.42 21.42</pitch>
-    <dimension>3 3</dimension>
-    <lower_left>-32.13 -32.13</lower_left>
-    <universes>
+    </lattice>
+    <lattice id="202" name="3x3 Core Lattice">
+      <pitch>21.42 21.42</pitch>
+      <dimension>3 3</dimension>
+      <lower_left>-32.13 -32.13</lower_left>
+      <universes>
 8 7 7 
 8 8 8 
 7 7 7 </universes>
-  </lattice>
-  <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="-32.13" id="9" type="x-plane" />
-  <surface boundary="reflective" coeffs="32.13" id="10" type="x-plane" />
-  <surface boundary="reflective" coeffs="-32.13" id="11" type="y-plane" />
-  <surface boundary="reflective" coeffs="32.13" id="12" type="y-plane" />
-  <surface boundary="reflective" coeffs="0" id="13" type="z-plane" />
-  <surface boundary="reflective" coeffs="32.13" id="14" type="z-plane" />
-  <surface coeffs="0.0" id="35" type="z-plane" />
-  <surface coeffs="183.0" id="36" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="UOX fuel">
-    <density units="g/cm3" value="10.062" />
-    <nuclide ao="4.9476e-06" name="U234" />
-    <nuclide ao="0.00048218" name="U235" />
-    <nuclide ao="0.021504" name="U238" />
-    <nuclide ao="1.0801e-08" name="Xe135" />
-    <nuclide ao="0.045737" name="O16" />
-  </material>
-  <material id="2" name="Zircaloy">
-    <density units="g/cm3" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="Cold borated water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <nuclide ao="0.000649" name="B10" />
-    <nuclide ao="0.002689" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="4" name="Hot borated water">
-    <density units="atom/b-cm" value="0.06614" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <nuclide ao="0.000649" name="B10" />
-    <nuclide ao="0.002689" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="5" name="Reactor pressure vessel steel">
-    <density units="g/cm3" value="7.9" />
-    <nuclide name="Fe54" wo="0.05437098" />
-    <nuclide name="Fe56" wo="0.88500663" />
-    <nuclide name="Fe57" wo="0.0208008" />
-    <nuclide name="Fe58" wo="0.00282159" />
-    <nuclide name="Ni58" wo="0.0067198" />
-    <nuclide name="Ni60" wo="0.0026776" />
-    <nuclide name="Mn55" wo="0.01" />
-    <nuclide name="Cr52" wo="0.002092475" />
-    <nuclide name="C0" wo="0.0025" />
-    <nuclide name="Cu63" wo="0.0013696" />
-  </material>
-  <material id="6" name="Lower radial reflector">
-    <density units="g/cm3" value="4.32" />
-    <nuclide name="H1" wo="0.0095661" />
-    <nuclide name="O16" wo="0.0759107" />
-    <nuclide name="B10" wo="3.08409e-05" />
-    <nuclide name="B11" wo="0.000140499" />
-    <nuclide name="Fe54" wo="0.035620772088" />
-    <nuclide name="Fe56" wo="0.579805982228" />
-    <nuclide name="Fe57" wo="0.01362750048" />
-    <nuclide name="Fe58" wo="0.001848545204" />
-    <nuclide name="Ni58" wo="0.055298376566" />
-    <nuclide name="Mn55" wo="0.018287" />
-    <nuclide name="Cr52" wo="0.145407678031" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="7" name="Upper radial reflector / Top plate region">
-    <density units="g/cm3" value="4.28" />
-    <nuclide name="H1" wo="0.0086117" />
-    <nuclide name="O16" wo="0.0683369" />
-    <nuclide name="B10" wo="2.77638e-05" />
-    <nuclide name="B11" wo="0.000126481" />
-    <nuclide name="Fe54" wo="0.035953677186" />
-    <nuclide name="Fe56" wo="0.585224740891" />
-    <nuclide name="Fe57" wo="0.01375486056" />
-    <nuclide name="Fe58" wo="0.001865821363" />
-    <nuclide name="Ni58" wo="0.055815129186" />
-    <nuclide name="Mn55" wo="0.0184579" />
-    <nuclide name="Cr52" wo="0.146766614995" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="8" name="Bottom plate region">
-    <density units="g/cm3" value="7.184" />
-    <nuclide name="H1" wo="0.0011505" />
-    <nuclide name="O16" wo="0.0091296" />
-    <nuclide name="B10" wo="3.70915e-06" />
-    <nuclide name="B11" wo="1.68974e-05" />
-    <nuclide name="Fe54" wo="0.03855611055" />
-    <nuclide name="Fe56" wo="0.627585036425" />
-    <nuclide name="Fe57" wo="0.014750478" />
-    <nuclide name="Fe58" wo="0.002000875025" />
-    <nuclide name="Ni58" wo="0.059855207342" />
-    <nuclide name="Mn55" wo="0.019794" />
-    <nuclide name="Cr52" wo="0.157390026871" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="9" name="Bottom nozzle region">
-    <density units="g/cm3" value="2.53" />
-    <nuclide name="H1" wo="0.0245014" />
-    <nuclide name="O16" wo="0.1944274" />
-    <nuclide name="B10" wo="7.89917e-05" />
-    <nuclide name="B11" wo="0.000359854" />
-    <nuclide name="Fe54" wo="0.030411411144" />
-    <nuclide name="Fe56" wo="0.495012237964" />
-    <nuclide name="Fe57" wo="0.01163454624" />
-    <nuclide name="Fe58" wo="0.001578204652" />
-    <nuclide name="Ni58" wo="0.047211231662" />
-    <nuclide name="Mn55" wo="0.0156126" />
-    <nuclide name="Cr52" wo="0.124142524198" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="10" name="Top nozzle region">
-    <density units="g/cm3" value="1.746" />
-    <nuclide name="H1" wo="0.035887" />
-    <nuclide name="O16" wo="0.2847761" />
-    <nuclide name="B10" wo="0.000115699" />
-    <nuclide name="B11" wo="0.000527075" />
-    <nuclide name="Fe54" wo="0.02644016154" />
-    <nuclide name="Fe56" wo="0.43037146399" />
-    <nuclide name="Fe57" wo="0.0101152584" />
-    <nuclide name="Fe58" wo="0.00137211607" />
-    <nuclide name="Ni58" wo="0.04104621835" />
-    <nuclide name="Mn55" wo="0.0135739" />
-    <nuclide name="Cr52" wo="0.107931450781" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="11" name="Top of fuel assemblies">
-    <density units="g/cm3" value="3.044" />
-    <nuclide name="H1" wo="0.0162913" />
-    <nuclide name="O16" wo="0.1292776" />
-    <nuclide name="B10" wo="5.25228e-05" />
-    <nuclide name="B11" wo="0.000239272" />
-    <nuclide name="Zr90" wo="0.43313403903" />
-    <nuclide name="Zr91" wo="0.09549277374" />
-    <nuclide name="Zr92" wo="0.14759527104" />
-    <nuclide name="Zr94" wo="0.15280552077" />
-    <nuclide name="Zr96" wo="0.02511169542" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="12" name="Bottom of fuel assemblies">
-    <density units="g/cm3" value="1.762" />
-    <nuclide name="H1" wo="0.0292856" />
-    <nuclide name="O16" wo="0.2323919" />
-    <nuclide name="B10" wo="9.44159e-05" />
-    <nuclide name="B11" wo="0.00043012" />
-    <nuclide name="Zr90" wo="0.3741373658" />
-    <nuclide name="Zr91" wo="0.0824858164" />
-    <nuclide name="Zr92" wo="0.1274914944" />
-    <nuclide name="Zr94" wo="0.1319920622" />
-    <nuclide name="Zr96" wo="0.0216912612" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="fission">
-      <parameters>-32 -32 0 32 32 32</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="distribcell">
-    <bins>27</bins>
-  </filter>
-  <tally id="27" name="distribcell tally">
-    <filters>1</filters>
-    <scores>nu-fission</scores>
-  </tally>
-</tallies>
+    </lattice>
+    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-32.13" id="9" type="x-plane" />
+    <surface boundary="reflective" coeffs="32.13" id="10" type="x-plane" />
+    <surface boundary="reflective" coeffs="-32.13" id="11" type="y-plane" />
+    <surface boundary="reflective" coeffs="32.13" id="12" type="y-plane" />
+    <surface boundary="reflective" coeffs="0" id="13" type="z-plane" />
+    <surface boundary="reflective" coeffs="32.13" id="14" type="z-plane" />
+    <surface coeffs="0.0" id="35" type="z-plane" />
+    <surface coeffs="183.0" id="36" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="fission">
+        <parameters>-32 -32 0 32 32 32</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <filter id="1" type="distribcell">
+      <bins>27</bins>
+    </filter>
+    <tally id="27" name="distribcell tally">
+      <filters>1</filters>
+      <scores>nu-fission</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/cpp_driver/inputs_true.dat b/tests/regression_tests/cpp_driver/inputs_true.dat
index faa3fa9b1..cdace34f0 100644
--- a/tests/regression_tests/cpp_driver/inputs_true.dat
+++ b/tests/regression_tests/cpp_driver/inputs_true.dat
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <cell id="2" material="2" region="1 -2" universe="1" />
-  <cell id="3" material="3" region="2" universe="1" />
-  <cell fill="1" id="4" universe="2" />
-  <cell fill="3" id="5" region="3 -4 5 -6" universe="4" />
-  <lattice id="3">
-    <pitch>4.0 4.0</pitch>
-    <dimension>2 2</dimension>
-    <lower_left>-4.0 -4.0</lower_left>
-    <universes>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="fuel">
+      <density units="g/cc" value="11" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2" name="cladding">
+      <density units="g/cc" value="6.44" />
+      <nuclide ao="1.0" name="Zr90" />
+    </material>
+    <material id="3" name="water">
+      <density units="g/cc" value="1.0" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <cell id="2" material="2" region="1 -2" universe="1" />
+    <cell id="3" material="3" region="2" universe="1" />
+    <cell fill="1" id="4" universe="2" />
+    <cell fill="3" id="5" region="3 -4 5 -6" universe="4" />
+    <lattice id="3">
+      <pitch>4.0 4.0</pitch>
+      <dimension>2 2</dimension>
+      <lower_left>-4.0 -4.0</lower_left>
+      <universes>
 2 2 
 2 2 </universes>
-  </lattice>
-  <surface coeffs="0.0 0.0 1.5" id="1" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 1.7" id="2" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="-4.0" id="3" name="minimum x" type="x-plane" />
-  <surface boundary="reflective" coeffs="4.0" id="4" name="maximum x" type="x-plane" />
-  <surface boundary="reflective" coeffs="-4.0" id="5" name="minimum y" type="y-plane" />
-  <surface boundary="reflective" coeffs="4.0" id="6" name="maximum y" type="y-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="fuel">
-    <density units="g/cc" value="11" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2" name="cladding">
-    <density units="g/cc" value="6.44" />
-    <nuclide ao="1.0" name="Zr90" />
-  </material>
-  <material id="3" name="water">
-    <density units="g/cc" value="1.0" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <inactive>1</inactive>
-</settings>
+    </lattice>
+    <surface coeffs="0.0 0.0 1.5" id="1" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 1.7" id="2" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-4.0" id="3" name="minimum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="4.0" id="4" name="maximum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="-4.0" id="5" name="minimum y" type="y-plane" />
+    <surface boundary="reflective" coeffs="4.0" id="6" name="maximum y" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>1</inactive>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/create_fission_neutrons/inputs_true.dat b/tests/regression_tests/create_fission_neutrons/inputs_true.dat
index b0ca89647..f79ba379c 100644
--- a/tests/regression_tests/create_fission_neutrons/inputs_true.dat
+++ b/tests/regression_tests/create_fission_neutrons/inputs_true.dat
@@ -1,37 +1,36 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="box" region="1 -2 3 -4 5 -6" universe="0" />
-  <surface boundary="reflective" coeffs="-1" id="1" type="x-plane" />
-  <surface boundary="reflective" coeffs="1" id="2" type="x-plane" />
-  <surface boundary="reflective" coeffs="-1" id="3" type="y-plane" />
-  <surface boundary="reflective" coeffs="1" id="4" type="y-plane" />
-  <surface boundary="reflective" coeffs="-1" id="5" type="z-plane" />
-  <surface boundary="reflective" coeffs="1" id="6" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="mat">
-    <density units="atom/b-cm" value="0.069335" />
-    <nuclide ao="40.0" name="H1" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-1 -1 -1 1 1 1</parameters>
-    </space>
-    <energy parameters="988000.0 2.249e-06" type="watt" />
-  </source>
-  <create_fission_neutrons>false</create_fission_neutrons>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <tally id="1">
-    <scores>flux</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="mat">
+      <density units="atom/b-cm" value="0.069335" />
+      <nuclide ao="40.0" name="H1" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="box" region="1 -2 3 -4 5 -6" universe="0" />
+    <surface boundary="reflective" coeffs="-1" id="1" type="x-plane" />
+    <surface boundary="reflective" coeffs="1" id="2" type="x-plane" />
+    <surface boundary="reflective" coeffs="-1" id="3" type="y-plane" />
+    <surface boundary="reflective" coeffs="1" id="4" type="y-plane" />
+    <surface boundary="reflective" coeffs="-1" id="5" type="z-plane" />
+    <surface boundary="reflective" coeffs="1" id="6" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-1 -1 -1 1 1 1</parameters>
+      </space>
+      <energy parameters="988000.0 2.249e-06" type="watt" />
+    </source>
+    <create_fission_neutrons>false</create_fission_neutrons>
+  </settings>
+  <tallies>
+    <tally id="1">
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/create_fission_neutrons/test.py b/tests/regression_tests/create_fission_neutrons/test.py
index f1c1d072c..82bfaafa6 100755
--- a/tests/regression_tests/create_fission_neutrons/test.py
+++ b/tests/regression_tests/create_fission_neutrons/test.py
@@ -4,14 +4,14 @@ from tests.testing_harness import PyAPITestHarness
 
 
 class CreateFissionNeutronsTestHarness(PyAPITestHarness):
-    def _build_inputs(self):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         # Material is composed of H-1 and U-235
         mat = openmc.Material(material_id=1, name='mat')
         mat.set_density('atom/b-cm', 0.069335)
         mat.add_nuclide('H1', 40.0)
         mat.add_nuclide('U235', 1.0)
-        materials_file = openmc.Materials([mat])
-        materials_file.export_to_xml()
+        self._model.materials = openmc.Materials([mat])
 
         # Cell is box with reflective boundary
         x1 = openmc.XPlane(surface_id=1, x0=-1)
@@ -27,8 +27,7 @@ class CreateFissionNeutronsTestHarness(PyAPITestHarness):
         box.fill = mat
         root = openmc.Universe(universe_id=0, name='root universe')
         root.add_cell(box)
-        geometry = openmc.Geometry(root)
-        geometry.export_to_xml()
+        self._model.geometry = openmc.Geometry(root)
 
         # Set the running parameters
         settings_file = openmc.Settings()
@@ -41,14 +40,14 @@ class CreateFissionNeutronsTestHarness(PyAPITestHarness):
         watt_dist = openmc.stats.Watt()
         settings_file.source = openmc.source.Source(space=uniform_dist,
                                                     energy=watt_dist)
-        settings_file.export_to_xml()
+        self._model.settings = settings_file
 
         # Create tallies
         tallies = openmc.Tallies()
         tally = openmc.Tally(1)
         tally.scores = ['flux']
         tallies.append(tally)
-        tallies.export_to_xml()
+        self._model.tallies = tallies
 
     def _get_results(self):
         """Digest info in the statepoint and return as a string."""
@@ -66,5 +65,6 @@ class CreateFissionNeutronsTestHarness(PyAPITestHarness):
 
 
 def test_create_fission_neutrons():
-    harness = CreateFissionNeutronsTestHarness('statepoint.10.h5')
+    harness = CreateFissionNeutronsTestHarness('statepoint.10.h5',
+                                               model=openmc.Model())
     harness.main()
diff --git a/tests/regression_tests/dagmc/external/inputs_true.dat b/tests/regression_tests/dagmc/external/inputs_true.dat
index dd75bbdbd..5547f333c 100644
--- a/tests/regression_tests/dagmc/external/inputs_true.dat
+++ b/tests/regression_tests/dagmc/external/inputs_true.dat
@@ -1,40 +1,39 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <dagmc_universe filename="dagmc.h5m" id="1" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="40" name="no-void fuel">
-    <density units="g/cc" value="11" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="41" name="water">
-    <density units="g/cc" value="1.0" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>5</batches>
-  <inactive>0</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-4 -4 -4 4 4 4</parameters>
-    </space>
-  </source>
-  <temperature_default>293</temperature_default>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="cell">
-    <bins>1</bins>
-  </filter>
-  <tally id="1">
-    <filters>1</filters>
-    <scores>total</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="40" name="no-void fuel">
+      <density units="g/cc" value="11" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="41" name="water">
+      <density units="g/cc" value="1.0" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <dagmc_universe filename="dagmc.h5m" id="1" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-4 -4 -4 4 4 4</parameters>
+      </space>
+    </source>
+    <temperature_default>293</temperature_default>
+  </settings>
+  <tallies>
+    <filter id="1" type="cell">
+      <bins>1</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>total</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/dagmc/legacy/inputs_true.dat b/tests/regression_tests/dagmc/legacy/inputs_true.dat
index 2f5641046..89d458a2b 100644
--- a/tests/regression_tests/dagmc/legacy/inputs_true.dat
+++ b/tests/regression_tests/dagmc/legacy/inputs_true.dat
@@ -1,39 +1,38 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <dagmc_universe filename="dagmc.h5m" id="1" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="40" name="no-void fuel">
-    <density units="g/cc" value="11" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="41" name="water">
-    <density units="g/cc" value="1.0" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>5</batches>
-  <inactive>0</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-4 -4 -4 4 4 4</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="cell">
-    <bins>1</bins>
-  </filter>
-  <tally id="1">
-    <filters>1</filters>
-    <scores>total</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="40" name="no-void fuel">
+      <density units="g/cc" value="11" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="41" name="water">
+      <density units="g/cc" value="1.0" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <dagmc_universe filename="dagmc.h5m" id="1" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-4 -4 -4 4 4 4</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <filter id="1" type="cell">
+      <bins>1</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>total</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/dagmc/refl/inputs_true.dat b/tests/regression_tests/dagmc/refl/inputs_true.dat
index 938916ece..894d50104 100644
--- a/tests/regression_tests/dagmc/refl/inputs_true.dat
+++ b/tests/regression_tests/dagmc/refl/inputs_true.dat
@@ -1,29 +1,28 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <dagmc_universe auto_geom_ids="true" filename="dagmc.h5m" id="9" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>5</batches>
-  <inactive>0</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-4 -4 -4 4 4 4</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="cell">
-    <bins>2</bins>
-  </filter>
-  <tally id="1">
-    <filters>1</filters>
-    <scores>total</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+  </materials>
+  <geometry>
+    <dagmc_universe auto_geom_ids="true" filename="dagmc.h5m" id="1" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-4 -4 -4 4 4 4</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <filter id="1" type="cell">
+      <bins>2</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>total</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/dagmc/refl/test.py b/tests/regression_tests/dagmc/refl/test.py
index 5afc1a7a2..5b08f0c4a 100644
--- a/tests/regression_tests/dagmc/refl/test.py
+++ b/tests/regression_tests/dagmc/refl/test.py
@@ -10,34 +10,29 @@ pytestmark = pytest.mark.skipif(
     reason="DAGMC CAD geometry is not enabled.")
 
 class UWUWTest(PyAPITestHarness):
-
-    def _build_inputs(self):
-        model = openmc.model.Model()
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
 
         # settings
-        model.settings.batches = 5
-        model.settings.inactive = 0
-        model.settings.particles = 100
+        self._model.settings.batches = 5
+        self._model.settings.inactive = 0
+        self._model.settings.particles = 100
 
         source = openmc.Source(space=Box([-4, -4, -4],
                                          [ 4,  4,  4]))
-        model.settings.source = source
-
-        model.settings.export_to_xml()
+        self._model.settings.source = source
 
         # geometry
         dag_univ = openmc.DAGMCUniverse("dagmc.h5m", auto_geom_ids=True)
-        model.geometry = openmc.Geometry(dag_univ)
+        self._model.geometry = openmc.Geometry(dag_univ)
 
         # tally
         tally = openmc.Tally()
         tally.scores = ['total']
         tally.filters = [openmc.CellFilter(2)]
-        model.tallies = [tally]
+        self._model.tallies = [tally]
 
-        model.tallies.export_to_xml()
-        model.export_to_xml()
 
 def test_refl():
-    harness = UWUWTest('statepoint.5.h5')
+    harness = UWUWTest('statepoint.5.h5', model=openmc.Model())
     harness.main()
diff --git a/tests/regression_tests/dagmc/universes/inputs_true.dat b/tests/regression_tests/dagmc/universes/inputs_true.dat
index ea6ad519b..b88e83df4 100644
--- a/tests/regression_tests/dagmc/universes/inputs_true.dat
+++ b/tests/regression_tests/dagmc/universes/inputs_true.dat
@@ -1,55 +1,55 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell fill="12" id="13" region="9 -10 11 -12 13 -14" universe="13" />
-  <dagmc_universe auto_geom_ids="true" filename="dagmc.h5m" id="9" />
-  <lattice id="12">
-    <pitch>24.0 24.0</pitch>
-    <dimension>2 2</dimension>
-    <lower_left>-24.0 -24.0</lower_left>
-    <universes>
-9 9 
-9 9 </universes>
-  </lattice>
-  <surface boundary="reflective" coeffs="-24.0" id="9" name="left" type="x-plane" />
-  <surface boundary="reflective" coeffs="24.0" id="10" name="right" type="x-plane" />
-  <surface boundary="reflective" coeffs="-24.0" id="11" name="front" type="y-plane" />
-  <surface boundary="reflective" coeffs="24.0" id="12" name="back" type="y-plane" />
-  <surface boundary="reflective" coeffs="-10.0" id="13" name="bottom" type="z-plane" />
-  <surface boundary="reflective" coeffs="10.0" id="14" name="top" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="13" name="no-void fuel">
-    <density units="g/cc" value="10.29769" />
-    <nuclide ao="0.93120485" name="U234" />
-    <nuclide ao="0.00055815" name="U235" />
-    <nuclide ao="0.022408" name="U238" />
-    <nuclide ao="0.045829" name="O16" />
-  </material>
-  <material id="14" name="clad">
-    <density units="g/cc" value="6.55" />
-    <nuclide ao="0.021827" name="Zr90" />
-    <nuclide ao="0.00476" name="Zr91" />
-    <nuclide ao="0.0072758" name="Zr92" />
-    <nuclide ao="0.0073734" name="Zr94" />
-    <nuclide ao="0.0011879" name="Zr96" />
-  </material>
-  <material id="15" name="water">
-    <density units="g/cc" value="0.740582" />
-    <nuclide ao="0.049457" name="H1" />
-    <nuclide ao="0.024672" name="O16" />
-    <nuclide ao="8.0042e-06" name="B10" />
-    <nuclide ao="3.2218e-05" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <inactive>2</inactive>
-  <output>
-    <summary>false</summary>
-  </output>
-</settings>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="no-void fuel">
+      <density units="g/cc" value="10.29769" />
+      <nuclide ao="0.93120485" name="U234" />
+      <nuclide ao="0.00055815" name="U235" />
+      <nuclide ao="0.022408" name="U238" />
+      <nuclide ao="0.045829" name="O16" />
+    </material>
+    <material id="2" name="clad">
+      <density units="g/cc" value="6.55" />
+      <nuclide ao="0.021827" name="Zr90" />
+      <nuclide ao="0.00476" name="Zr91" />
+      <nuclide ao="0.0072758" name="Zr92" />
+      <nuclide ao="0.0073734" name="Zr94" />
+      <nuclide ao="0.0011879" name="Zr96" />
+    </material>
+    <material id="3" name="water">
+      <density units="g/cc" value="0.740582" />
+      <nuclide ao="0.049457" name="H1" />
+      <nuclide ao="0.024672" name="O16" />
+      <nuclide ao="8.0042e-06" name="B10" />
+      <nuclide ao="3.2218e-05" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell fill="4" id="1" region="1 -2 3 -4 5 -6" universe="5" />
+    <dagmc_universe auto_geom_ids="true" filename="dagmc.h5m" id="1" />
+    <lattice id="4">
+      <pitch>24.0 24.0</pitch>
+      <dimension>2 2</dimension>
+      <lower_left>-24.0 -24.0</lower_left>
+      <universes>
+1 1 
+1 1 </universes>
+    </lattice>
+    <surface boundary="reflective" coeffs="-24.0" id="1" name="left" type="x-plane" />
+    <surface boundary="reflective" coeffs="24.0" id="2" name="right" type="x-plane" />
+    <surface boundary="reflective" coeffs="-24.0" id="3" name="front" type="y-plane" />
+    <surface boundary="reflective" coeffs="24.0" id="4" name="back" type="y-plane" />
+    <surface boundary="reflective" coeffs="-10.0" id="5" name="bottom" type="z-plane" />
+    <surface boundary="reflective" coeffs="10.0" id="6" name="top" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>2</inactive>
+    <output>
+      <summary>false</summary>
+    </output>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/dagmc/universes/test.py b/tests/regression_tests/dagmc/universes/test.py
index 47897ad56..a318275cd 100644
--- a/tests/regression_tests/dagmc/universes/test.py
+++ b/tests/regression_tests/dagmc/universes/test.py
@@ -12,9 +12,8 @@ pytestmark = pytest.mark.skipif(
 
 
 class DAGMCUniverseTest(PyAPITestHarness):
-
-    def _build_inputs(self):
-        model = openmc.model.Model()
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
 
         ### MATERIALS ###
         fuel = openmc.Material(name='no-void fuel')
@@ -40,7 +39,7 @@ class DAGMCUniverseTest(PyAPITestHarness):
         water.add_nuclide('B11', 3.2218e-05)
         water.add_s_alpha_beta('c_H_in_H2O')
 
-        model.materials = openmc.Materials([fuel, cladding, water])
+        self._model.materials = openmc.Materials([fuel, cladding, water])
 
         ### GEOMETRY ###
         # create the DAGMC universe
@@ -51,7 +50,7 @@ class DAGMCUniverseTest(PyAPITestHarness):
         # uses the bound_dag_cell as the root argument to test the type checks in openmc.Geometry
         bound_pincell_geometry = openmc.Geometry(root=bound_pincell_universe)
         # assigns the bound_dag_geometry to the model to test the type checks in model.Geometry setter
-        model.Geometry = bound_pincell_geometry
+        self._model.geometry = bound_pincell_geometry
 
         # create a 2 x 2 lattice using the DAGMC pincell
         pitch = np.asarray((24.0, 24.0))
@@ -71,17 +70,15 @@ class DAGMCUniverseTest(PyAPITestHarness):
         bounding_region = +left & -right & +front & -back & +bottom & -top
         bounding_cell = openmc.Cell(fill=lattice, region=bounding_region)
 
-        model.geometry = openmc.Geometry([bounding_cell])
+        self._model.geometry = openmc.Geometry([bounding_cell])
 
         # settings
-        model.settings.particles = 100
-        model.settings.batches = 10
-        model.settings.inactive = 2
-        model.settings.output = {'summary' : False}
-
-        model.export_to_xml()
+        self._model.settings.particles = 100
+        self._model.settings.batches = 10
+        self._model.settings.inactive = 2
+        self._model.settings.output = {'summary' : False}
 
 
 def test_univ():
-    harness = DAGMCUniverseTest('statepoint.10.h5')
+    harness = DAGMCUniverseTest('statepoint.10.h5', model=openmc.Model())
     harness.main()
diff --git a/tests/regression_tests/dagmc/uwuw/inputs_true.dat b/tests/regression_tests/dagmc/uwuw/inputs_true.dat
index 7d533c5db..07384b625 100644
--- a/tests/regression_tests/dagmc/uwuw/inputs_true.dat
+++ b/tests/regression_tests/dagmc/uwuw/inputs_true.dat
@@ -1,29 +1,28 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <dagmc_universe filename="dagmc.h5m" id="9" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>5</batches>
-  <inactive>0</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-4 -4 -4 4 4 4</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="cell">
-    <bins>1</bins>
-  </filter>
-  <tally id="1">
-    <filters>1</filters>
-    <scores>total</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+  </materials>
+  <geometry>
+    <dagmc_universe filename="dagmc.h5m" id="1" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-4 -4 -4 4 4 4</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <filter id="1" type="cell">
+      <bins>1</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>total</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/dagmc/uwuw/test.py b/tests/regression_tests/dagmc/uwuw/test.py
index a8da2da60..19986e589 100644
--- a/tests/regression_tests/dagmc/uwuw/test.py
+++ b/tests/regression_tests/dagmc/uwuw/test.py
@@ -10,33 +10,29 @@ pytestmark = pytest.mark.skipif(
     reason="DAGMC CAD geometry is not enabled.")
 
 class UWUWTest(PyAPITestHarness):
-
-    def _build_inputs(self):
-        model = openmc.model.Model()
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
 
         # settings
-        model.settings.batches = 5
-        model.settings.inactive = 0
-        model.settings.particles = 100
+        self._model.settings.batches = 5
+        self._model.settings.inactive = 0
+        self._model.settings.particles = 100
 
         source = openmc.Source(space=Box([-4, -4, -4],
                                          [ 4,  4,  4]))
-        model.settings.source = source
-
-        model.settings.export_to_xml()
+        self._model.settings.source = source
 
         # geometry
         dag_univ = openmc.DAGMCUniverse("dagmc.h5m")
-        model.geometry = openmc.Geometry(root=dag_univ)
+        self._model.geometry = openmc.Geometry(root=dag_univ)
 
         # tally
         tally = openmc.Tally()
         tally.scores = ['total']
         tally.filters = [openmc.CellFilter(1)]
-        model.tallies = [tally]
+        self._model.tallies = [tally]
 
-        model.export_to_xml()
 
 def test_uwuw():
-    harness = UWUWTest('statepoint.5.h5')
+    harness = UWUWTest('statepoint.5.h5', model=openmc.Model())
     harness.main()
diff --git a/tests/regression_tests/diff_tally/inputs_true.dat b/tests/regression_tests/diff_tally/inputs_true.dat
index 909475f96..99697a1e9 100644
--- a/tests/regression_tests/diff_tally/inputs_true.dat
+++ b/tests/regression_tests/diff_tally/inputs_true.dat
@@ -1,38 +1,187 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell fill="200" id="1" region="-6 34 -35" universe="0" />
-  <cell fill="201" id="2" region="-6 35 -36" universe="0" />
-  <cell id="3" material="8" region="-7 31 -32" universe="0" />
-  <cell id="4" material="9" region="-5 32 -33" universe="0" />
-  <cell id="5" material="12" region="-5 33 -34" universe="0" />
-  <cell id="6" material="11" region="-5 36 -37" universe="0" />
-  <cell id="7" material="10" region="-5 37 -38" universe="0" />
-  <cell id="8" material="7" region="-7 38 -39" universe="0" />
-  <cell id="9" material="9" region="6 -7 32 -38" universe="0" />
-  <cell id="10" material="5" region="7 -8 31 -39" universe="0" />
-  <cell id="11" material="6" region="5 -6 32 -34" universe="0" />
-  <cell id="12" material="7" region="5 -6 36 -38" universe="0" />
-  <cell id="21" material="1" region="-1" universe="1" />
-  <cell id="22" material="2" region="1 -2" universe="1" />
-  <cell id="23" material="3" region="2" universe="1" />
-  <cell id="24" material="3" region="-3" universe="2" />
-  <cell id="25" material="2" region="3 -4" universe="2" />
-  <cell id="26" material="3" region="4" universe="2" />
-  <cell id="27" material="1" region="-1" universe="3" />
-  <cell id="28" material="2" region="1 -2" universe="3" />
-  <cell id="29" material="4" region="2" universe="3" />
-  <cell id="30" material="4" region="-3" universe="4" />
-  <cell id="31" material="2" region="3 -4" universe="4" />
-  <cell id="32" material="4" region="4" universe="4" />
-  <cell id="50" material="3" region="34 -35" universe="5" />
-  <cell fill="100" id="60" region="34 -35" universe="6" />
-  <cell id="70" material="4" region="35 -36" universe="7" />
-  <cell fill="101" id="80" region="35 -36" universe="8" />
-  <lattice id="100" name="Fuel assembly (lower half)">
-    <pitch>1.26 1.26</pitch>
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <universes>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UOX fuel">
+      <density units="g/cm3" value="10.062" />
+      <nuclide ao="4.9476e-06" name="U234" />
+      <nuclide ao="0.00048218" name="U235" />
+      <nuclide ao="0.021504" name="U238" />
+      <nuclide ao="1.0801e-08" name="Xe135" />
+      <nuclide ao="0.045737" name="O16" />
+    </material>
+    <material id="2" name="Zircaloy">
+      <density units="g/cm3" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="Cold borated water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <nuclide ao="0.000649" name="B10" />
+      <nuclide ao="0.002689" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="4" name="Hot borated water">
+      <density units="atom/b-cm" value="0.06614" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <nuclide ao="0.000649" name="B10" />
+      <nuclide ao="0.002689" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="5" name="Reactor pressure vessel steel">
+      <density units="g/cm3" value="7.9" />
+      <nuclide name="Fe54" wo="0.05437098" />
+      <nuclide name="Fe56" wo="0.88500663" />
+      <nuclide name="Fe57" wo="0.0208008" />
+      <nuclide name="Fe58" wo="0.00282159" />
+      <nuclide name="Ni58" wo="0.0067198" />
+      <nuclide name="Ni60" wo="0.0026776" />
+      <nuclide name="Mn55" wo="0.01" />
+      <nuclide name="Cr52" wo="0.002092475" />
+      <nuclide name="C0" wo="0.0025" />
+      <nuclide name="Cu63" wo="0.0013696" />
+    </material>
+    <material id="6" name="Lower radial reflector">
+      <density units="g/cm3" value="4.32" />
+      <nuclide name="H1" wo="0.0095661" />
+      <nuclide name="O16" wo="0.0759107" />
+      <nuclide name="B10" wo="3.08409e-05" />
+      <nuclide name="B11" wo="0.000140499" />
+      <nuclide name="Fe54" wo="0.035620772088" />
+      <nuclide name="Fe56" wo="0.579805982228" />
+      <nuclide name="Fe57" wo="0.01362750048" />
+      <nuclide name="Fe58" wo="0.001848545204" />
+      <nuclide name="Ni58" wo="0.055298376566" />
+      <nuclide name="Mn55" wo="0.018287" />
+      <nuclide name="Cr52" wo="0.145407678031" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="7" name="Upper radial reflector / Top plate region">
+      <density units="g/cm3" value="4.28" />
+      <nuclide name="H1" wo="0.0086117" />
+      <nuclide name="O16" wo="0.0683369" />
+      <nuclide name="B10" wo="2.77638e-05" />
+      <nuclide name="B11" wo="0.000126481" />
+      <nuclide name="Fe54" wo="0.035953677186" />
+      <nuclide name="Fe56" wo="0.585224740891" />
+      <nuclide name="Fe57" wo="0.01375486056" />
+      <nuclide name="Fe58" wo="0.001865821363" />
+      <nuclide name="Ni58" wo="0.055815129186" />
+      <nuclide name="Mn55" wo="0.0184579" />
+      <nuclide name="Cr52" wo="0.146766614995" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="8" name="Bottom plate region">
+      <density units="g/cm3" value="7.184" />
+      <nuclide name="H1" wo="0.0011505" />
+      <nuclide name="O16" wo="0.0091296" />
+      <nuclide name="B10" wo="3.70915e-06" />
+      <nuclide name="B11" wo="1.68974e-05" />
+      <nuclide name="Fe54" wo="0.03855611055" />
+      <nuclide name="Fe56" wo="0.627585036425" />
+      <nuclide name="Fe57" wo="0.014750478" />
+      <nuclide name="Fe58" wo="0.002000875025" />
+      <nuclide name="Ni58" wo="0.059855207342" />
+      <nuclide name="Mn55" wo="0.019794" />
+      <nuclide name="Cr52" wo="0.157390026871" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="9" name="Bottom nozzle region">
+      <density units="g/cm3" value="2.53" />
+      <nuclide name="H1" wo="0.0245014" />
+      <nuclide name="O16" wo="0.1944274" />
+      <nuclide name="B10" wo="7.89917e-05" />
+      <nuclide name="B11" wo="0.000359854" />
+      <nuclide name="Fe54" wo="0.030411411144" />
+      <nuclide name="Fe56" wo="0.495012237964" />
+      <nuclide name="Fe57" wo="0.01163454624" />
+      <nuclide name="Fe58" wo="0.001578204652" />
+      <nuclide name="Ni58" wo="0.047211231662" />
+      <nuclide name="Mn55" wo="0.0156126" />
+      <nuclide name="Cr52" wo="0.124142524198" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="10" name="Top nozzle region">
+      <density units="g/cm3" value="1.746" />
+      <nuclide name="H1" wo="0.035887" />
+      <nuclide name="O16" wo="0.2847761" />
+      <nuclide name="B10" wo="0.000115699" />
+      <nuclide name="B11" wo="0.000527075" />
+      <nuclide name="Fe54" wo="0.02644016154" />
+      <nuclide name="Fe56" wo="0.43037146399" />
+      <nuclide name="Fe57" wo="0.0101152584" />
+      <nuclide name="Fe58" wo="0.00137211607" />
+      <nuclide name="Ni58" wo="0.04104621835" />
+      <nuclide name="Mn55" wo="0.0135739" />
+      <nuclide name="Cr52" wo="0.107931450781" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="11" name="Top of fuel assemblies">
+      <density units="g/cm3" value="3.044" />
+      <nuclide name="H1" wo="0.0162913" />
+      <nuclide name="O16" wo="0.1292776" />
+      <nuclide name="B10" wo="5.25228e-05" />
+      <nuclide name="B11" wo="0.000239272" />
+      <nuclide name="Zr90" wo="0.43313403903" />
+      <nuclide name="Zr91" wo="0.09549277374" />
+      <nuclide name="Zr92" wo="0.14759527104" />
+      <nuclide name="Zr94" wo="0.15280552077" />
+      <nuclide name="Zr96" wo="0.02511169542" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="12" name="Bottom of fuel assemblies">
+      <density units="g/cm3" value="1.762" />
+      <nuclide name="H1" wo="0.0292856" />
+      <nuclide name="O16" wo="0.2323919" />
+      <nuclide name="B10" wo="9.44159e-05" />
+      <nuclide name="B11" wo="0.00043012" />
+      <nuclide name="Zr90" wo="0.3741373658" />
+      <nuclide name="Zr91" wo="0.0824858164" />
+      <nuclide name="Zr92" wo="0.1274914944" />
+      <nuclide name="Zr94" wo="0.1319920622" />
+      <nuclide name="Zr96" wo="0.0216912612" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell fill="200" id="1" region="-6 34 -35" universe="0" />
+    <cell fill="201" id="2" region="-6 35 -36" universe="0" />
+    <cell id="3" material="8" region="-7 31 -32" universe="0" />
+    <cell id="4" material="9" region="-5 32 -33" universe="0" />
+    <cell id="5" material="12" region="-5 33 -34" universe="0" />
+    <cell id="6" material="11" region="-5 36 -37" universe="0" />
+    <cell id="7" material="10" region="-5 37 -38" universe="0" />
+    <cell id="8" material="7" region="-7 38 -39" universe="0" />
+    <cell id="9" material="9" region="6 -7 32 -38" universe="0" />
+    <cell id="10" material="5" region="7 -8 31 -39" universe="0" />
+    <cell id="11" material="6" region="5 -6 32 -34" universe="0" />
+    <cell id="12" material="7" region="5 -6 36 -38" universe="0" />
+    <cell id="21" material="1" region="-1" universe="1" />
+    <cell id="22" material="2" region="1 -2" universe="1" />
+    <cell id="23" material="3" region="2" universe="1" />
+    <cell id="24" material="3" region="-3" universe="2" />
+    <cell id="25" material="2" region="3 -4" universe="2" />
+    <cell id="26" material="3" region="4" universe="2" />
+    <cell id="27" material="1" region="-1" universe="3" />
+    <cell id="28" material="2" region="1 -2" universe="3" />
+    <cell id="29" material="4" region="2" universe="3" />
+    <cell id="30" material="4" region="-3" universe="4" />
+    <cell id="31" material="2" region="3 -4" universe="4" />
+    <cell id="32" material="4" region="4" universe="4" />
+    <cell id="50" material="3" region="34 -35" universe="5" />
+    <cell fill="100" id="60" region="34 -35" universe="6" />
+    <cell id="70" material="4" region="35 -36" universe="7" />
+    <cell fill="101" id="80" region="35 -36" universe="8" />
+    <lattice id="100" name="Fuel assembly (lower half)">
+      <pitch>1.26 1.26</pitch>
+      <dimension>17 17</dimension>
+      <lower_left>-10.71 -10.71</lower_left>
+      <universes>
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 
@@ -50,12 +199,12 @@
 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 </universes>
-  </lattice>
-  <lattice id="101" name="Fuel assembly (upper half)">
-    <pitch>1.26 1.26</pitch>
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <universes>
+    </lattice>
+    <lattice id="101" name="Fuel assembly (upper half)">
+      <pitch>1.26 1.26</pitch>
+      <dimension>17 17</dimension>
+      <lower_left>-10.71 -10.71</lower_left>
+      <universes>
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 
@@ -73,12 +222,12 @@
 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
-  </lattice>
-  <lattice id="200" name="Core lattice (lower half)">
-    <pitch>21.42 21.42</pitch>
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <universes>
+    </lattice>
+    <lattice id="200" name="Core lattice (lower half)">
+      <pitch>21.42 21.42</pitch>
+      <dimension>21 21</dimension>
+      <lower_left>-224.91 -224.91</lower_left>
+      <universes>
 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 
@@ -100,12 +249,12 @@
 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 
 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 </universes>
-  </lattice>
-  <lattice id="201" name="Core lattice (lower half)">
-    <pitch>21.42 21.42</pitch>
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <universes>
+    </lattice>
+    <lattice id="201" name="Core lattice (lower half)">
+      <pitch>21.42 21.42</pitch>
+      <dimension>21 21</dimension>
+      <lower_left>-224.91 -224.91</lower_left>
+      <universes>
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 
@@ -127,313 +276,163 @@
 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 </universes>
-  </lattice>
-  <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder" />
-  <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane" />
-  <surface coeffs="-199.0" id="32" type="z-plane" />
-  <surface coeffs="-193.0" id="33" type="z-plane" />
-  <surface coeffs="-183.0" id="34" type="z-plane" />
-  <surface coeffs="0.0" id="35" type="z-plane" />
-  <surface coeffs="183.0" id="36" type="z-plane" />
-  <surface coeffs="203.0" id="37" type="z-plane" />
-  <surface coeffs="215.0" id="38" type="z-plane" />
-  <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="UOX fuel">
-    <density units="g/cm3" value="10.062" />
-    <nuclide ao="4.9476e-06" name="U234" />
-    <nuclide ao="0.00048218" name="U235" />
-    <nuclide ao="0.021504" name="U238" />
-    <nuclide ao="1.0801e-08" name="Xe135" />
-    <nuclide ao="0.045737" name="O16" />
-  </material>
-  <material id="2" name="Zircaloy">
-    <density units="g/cm3" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="Cold borated water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <nuclide ao="0.000649" name="B10" />
-    <nuclide ao="0.002689" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="4" name="Hot borated water">
-    <density units="atom/b-cm" value="0.06614" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <nuclide ao="0.000649" name="B10" />
-    <nuclide ao="0.002689" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="5" name="Reactor pressure vessel steel">
-    <density units="g/cm3" value="7.9" />
-    <nuclide name="Fe54" wo="0.05437098" />
-    <nuclide name="Fe56" wo="0.88500663" />
-    <nuclide name="Fe57" wo="0.0208008" />
-    <nuclide name="Fe58" wo="0.00282159" />
-    <nuclide name="Ni58" wo="0.0067198" />
-    <nuclide name="Ni60" wo="0.0026776" />
-    <nuclide name="Mn55" wo="0.01" />
-    <nuclide name="Cr52" wo="0.002092475" />
-    <nuclide name="C0" wo="0.0025" />
-    <nuclide name="Cu63" wo="0.0013696" />
-  </material>
-  <material id="6" name="Lower radial reflector">
-    <density units="g/cm3" value="4.32" />
-    <nuclide name="H1" wo="0.0095661" />
-    <nuclide name="O16" wo="0.0759107" />
-    <nuclide name="B10" wo="3.08409e-05" />
-    <nuclide name="B11" wo="0.000140499" />
-    <nuclide name="Fe54" wo="0.035620772088" />
-    <nuclide name="Fe56" wo="0.579805982228" />
-    <nuclide name="Fe57" wo="0.01362750048" />
-    <nuclide name="Fe58" wo="0.001848545204" />
-    <nuclide name="Ni58" wo="0.055298376566" />
-    <nuclide name="Mn55" wo="0.018287" />
-    <nuclide name="Cr52" wo="0.145407678031" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="7" name="Upper radial reflector / Top plate region">
-    <density units="g/cm3" value="4.28" />
-    <nuclide name="H1" wo="0.0086117" />
-    <nuclide name="O16" wo="0.0683369" />
-    <nuclide name="B10" wo="2.77638e-05" />
-    <nuclide name="B11" wo="0.000126481" />
-    <nuclide name="Fe54" wo="0.035953677186" />
-    <nuclide name="Fe56" wo="0.585224740891" />
-    <nuclide name="Fe57" wo="0.01375486056" />
-    <nuclide name="Fe58" wo="0.001865821363" />
-    <nuclide name="Ni58" wo="0.055815129186" />
-    <nuclide name="Mn55" wo="0.0184579" />
-    <nuclide name="Cr52" wo="0.146766614995" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="8" name="Bottom plate region">
-    <density units="g/cm3" value="7.184" />
-    <nuclide name="H1" wo="0.0011505" />
-    <nuclide name="O16" wo="0.0091296" />
-    <nuclide name="B10" wo="3.70915e-06" />
-    <nuclide name="B11" wo="1.68974e-05" />
-    <nuclide name="Fe54" wo="0.03855611055" />
-    <nuclide name="Fe56" wo="0.627585036425" />
-    <nuclide name="Fe57" wo="0.014750478" />
-    <nuclide name="Fe58" wo="0.002000875025" />
-    <nuclide name="Ni58" wo="0.059855207342" />
-    <nuclide name="Mn55" wo="0.019794" />
-    <nuclide name="Cr52" wo="0.157390026871" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="9" name="Bottom nozzle region">
-    <density units="g/cm3" value="2.53" />
-    <nuclide name="H1" wo="0.0245014" />
-    <nuclide name="O16" wo="0.1944274" />
-    <nuclide name="B10" wo="7.89917e-05" />
-    <nuclide name="B11" wo="0.000359854" />
-    <nuclide name="Fe54" wo="0.030411411144" />
-    <nuclide name="Fe56" wo="0.495012237964" />
-    <nuclide name="Fe57" wo="0.01163454624" />
-    <nuclide name="Fe58" wo="0.001578204652" />
-    <nuclide name="Ni58" wo="0.047211231662" />
-    <nuclide name="Mn55" wo="0.0156126" />
-    <nuclide name="Cr52" wo="0.124142524198" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="10" name="Top nozzle region">
-    <density units="g/cm3" value="1.746" />
-    <nuclide name="H1" wo="0.035887" />
-    <nuclide name="O16" wo="0.2847761" />
-    <nuclide name="B10" wo="0.000115699" />
-    <nuclide name="B11" wo="0.000527075" />
-    <nuclide name="Fe54" wo="0.02644016154" />
-    <nuclide name="Fe56" wo="0.43037146399" />
-    <nuclide name="Fe57" wo="0.0101152584" />
-    <nuclide name="Fe58" wo="0.00137211607" />
-    <nuclide name="Ni58" wo="0.04104621835" />
-    <nuclide name="Mn55" wo="0.0135739" />
-    <nuclide name="Cr52" wo="0.107931450781" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="11" name="Top of fuel assemblies">
-    <density units="g/cm3" value="3.044" />
-    <nuclide name="H1" wo="0.0162913" />
-    <nuclide name="O16" wo="0.1292776" />
-    <nuclide name="B10" wo="5.25228e-05" />
-    <nuclide name="B11" wo="0.000239272" />
-    <nuclide name="Zr90" wo="0.43313403903" />
-    <nuclide name="Zr91" wo="0.09549277374" />
-    <nuclide name="Zr92" wo="0.14759527104" />
-    <nuclide name="Zr94" wo="0.15280552077" />
-    <nuclide name="Zr96" wo="0.02511169542" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="12" name="Bottom of fuel assemblies">
-    <density units="g/cm3" value="1.762" />
-    <nuclide name="H1" wo="0.0292856" />
-    <nuclide name="O16" wo="0.2323919" />
-    <nuclide name="B10" wo="9.44159e-05" />
-    <nuclide name="B11" wo="0.00043012" />
-    <nuclide name="Zr90" wo="0.3741373658" />
-    <nuclide name="Zr91" wo="0.0824858164" />
-    <nuclide name="Zr92" wo="0.1274914944" />
-    <nuclide name="Zr94" wo="0.1319920622" />
-    <nuclide name="Zr96" wo="0.0216912612" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>3</batches>
-  <inactive>0</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-160 -160 -183 160 160 183</parameters>
-    </space>
-  </source>
-  <temperature_multipole>true</temperature_multipole>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="material">
-    <bins>1 3</bins>
-  </filter>
-  <filter id="2" type="energyout">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <tally id="1">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <derivative>1</derivative>
-  </tally>
-  <tally id="2">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <derivative>2</derivative>
-  </tally>
-  <tally id="3">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <derivative>3</derivative>
-  </tally>
-  <tally id="4">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <derivative>4</derivative>
-  </tally>
-  <tally id="5">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <derivative>5</derivative>
-  </tally>
-  <tally id="6">
-    <filters>1</filters>
-    <nuclides>total U235</nuclides>
-    <scores>total absorption scatter fission nu-fission</scores>
-    <derivative>1</derivative>
-  </tally>
-  <tally id="7">
-    <filters>1</filters>
-    <nuclides>total U235</nuclides>
-    <scores>total absorption scatter fission nu-fission</scores>
-    <derivative>2</derivative>
-  </tally>
-  <tally id="8">
-    <filters>1</filters>
-    <nuclides>total U235</nuclides>
-    <scores>total absorption scatter fission nu-fission</scores>
-    <derivative>3</derivative>
-  </tally>
-  <tally id="9">
-    <filters>1</filters>
-    <nuclides>total U235</nuclides>
-    <scores>total absorption scatter fission nu-fission</scores>
-    <derivative>4</derivative>
-  </tally>
-  <tally id="10">
-    <filters>1</filters>
-    <nuclides>total U235</nuclides>
-    <scores>total absorption scatter fission nu-fission</scores>
-    <derivative>5</derivative>
-  </tally>
-  <tally id="11">
-    <filters>1</filters>
-    <scores>absorption</scores>
-    <estimator>analog</estimator>
-    <derivative>1</derivative>
-  </tally>
-  <tally id="12">
-    <filters>1</filters>
-    <scores>absorption</scores>
-    <estimator>analog</estimator>
-    <derivative>2</derivative>
-  </tally>
-  <tally id="13">
-    <filters>1</filters>
-    <scores>absorption</scores>
-    <estimator>analog</estimator>
-    <derivative>3</derivative>
-  </tally>
-  <tally id="14">
-    <filters>1</filters>
-    <scores>absorption</scores>
-    <estimator>analog</estimator>
-    <derivative>4</derivative>
-  </tally>
-  <tally id="15">
-    <filters>1</filters>
-    <scores>absorption</scores>
-    <estimator>analog</estimator>
-    <derivative>5</derivative>
-  </tally>
-  <tally id="16">
-    <filters>1 2</filters>
-    <nuclides>total U235</nuclides>
-    <scores>nu-fission scatter</scores>
-    <derivative>1</derivative>
-  </tally>
-  <tally id="17">
-    <filters>1 2</filters>
-    <nuclides>total U235</nuclides>
-    <scores>nu-fission scatter</scores>
-    <derivative>2</derivative>
-  </tally>
-  <tally id="18">
-    <filters>1 2</filters>
-    <nuclides>U235</nuclides>
-    <scores>nu-fission scatter</scores>
-    <derivative>3</derivative>
-  </tally>
-  <tally id="19">
-    <filters>1 2</filters>
-    <nuclides>U235</nuclides>
-    <scores>nu-fission scatter</scores>
-    <derivative>4</derivative>
-  </tally>
-  <tally id="20">
-    <filters>1 2</filters>
-    <nuclides>U235</nuclides>
-    <scores>nu-fission scatter</scores>
-    <derivative>5</derivative>
-  </tally>
-  <derivative id="1" material="3" variable="density" />
-  <derivative id="2" material="1" variable="density" />
-  <derivative id="3" material="1" nuclide="O16" variable="nuclide_density" />
-  <derivative id="4" material="1" nuclide="U235" variable="nuclide_density" />
-  <derivative id="5" material="1" variable="temperature" />
-</tallies>
+    </lattice>
+    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane" />
+    <surface coeffs="-199.0" id="32" type="z-plane" />
+    <surface coeffs="-193.0" id="33" type="z-plane" />
+    <surface coeffs="-183.0" id="34" type="z-plane" />
+    <surface coeffs="0.0" id="35" type="z-plane" />
+    <surface coeffs="183.0" id="36" type="z-plane" />
+    <surface coeffs="203.0" id="37" type="z-plane" />
+    <surface coeffs="215.0" id="38" type="z-plane" />
+    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>3</batches>
+    <inactive>0</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-160 -160 -183 160 160 183</parameters>
+      </space>
+    </source>
+    <temperature_multipole>true</temperature_multipole>
+  </settings>
+  <tallies>
+    <filter id="1" type="material">
+      <bins>1 3</bins>
+    </filter>
+    <filter id="2" type="energyout">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <derivative>1</derivative>
+    </tally>
+    <tally id="2">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <derivative>2</derivative>
+    </tally>
+    <tally id="3">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <derivative>3</derivative>
+    </tally>
+    <tally id="4">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <derivative>4</derivative>
+    </tally>
+    <tally id="5">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <derivative>5</derivative>
+    </tally>
+    <tally id="6">
+      <filters>1</filters>
+      <nuclides>total U235</nuclides>
+      <scores>total absorption scatter fission nu-fission</scores>
+      <derivative>1</derivative>
+    </tally>
+    <tally id="7">
+      <filters>1</filters>
+      <nuclides>total U235</nuclides>
+      <scores>total absorption scatter fission nu-fission</scores>
+      <derivative>2</derivative>
+    </tally>
+    <tally id="8">
+      <filters>1</filters>
+      <nuclides>total U235</nuclides>
+      <scores>total absorption scatter fission nu-fission</scores>
+      <derivative>3</derivative>
+    </tally>
+    <tally id="9">
+      <filters>1</filters>
+      <nuclides>total U235</nuclides>
+      <scores>total absorption scatter fission nu-fission</scores>
+      <derivative>4</derivative>
+    </tally>
+    <tally id="10">
+      <filters>1</filters>
+      <nuclides>total U235</nuclides>
+      <scores>total absorption scatter fission nu-fission</scores>
+      <derivative>5</derivative>
+    </tally>
+    <tally id="11">
+      <filters>1</filters>
+      <scores>absorption</scores>
+      <estimator>analog</estimator>
+      <derivative>1</derivative>
+    </tally>
+    <tally id="12">
+      <filters>1</filters>
+      <scores>absorption</scores>
+      <estimator>analog</estimator>
+      <derivative>2</derivative>
+    </tally>
+    <tally id="13">
+      <filters>1</filters>
+      <scores>absorption</scores>
+      <estimator>analog</estimator>
+      <derivative>3</derivative>
+    </tally>
+    <tally id="14">
+      <filters>1</filters>
+      <scores>absorption</scores>
+      <estimator>analog</estimator>
+      <derivative>4</derivative>
+    </tally>
+    <tally id="15">
+      <filters>1</filters>
+      <scores>absorption</scores>
+      <estimator>analog</estimator>
+      <derivative>5</derivative>
+    </tally>
+    <tally id="16">
+      <filters>1 2</filters>
+      <nuclides>total U235</nuclides>
+      <scores>nu-fission scatter</scores>
+      <derivative>1</derivative>
+    </tally>
+    <tally id="17">
+      <filters>1 2</filters>
+      <nuclides>total U235</nuclides>
+      <scores>nu-fission scatter</scores>
+      <derivative>2</derivative>
+    </tally>
+    <tally id="18">
+      <filters>1 2</filters>
+      <nuclides>U235</nuclides>
+      <scores>nu-fission scatter</scores>
+      <derivative>3</derivative>
+    </tally>
+    <tally id="19">
+      <filters>1 2</filters>
+      <nuclides>U235</nuclides>
+      <scores>nu-fission scatter</scores>
+      <derivative>4</derivative>
+    </tally>
+    <tally id="20">
+      <filters>1 2</filters>
+      <nuclides>U235</nuclides>
+      <scores>nu-fission scatter</scores>
+      <derivative>5</derivative>
+    </tally>
+    <derivative id="1" material="3" variable="density" />
+    <derivative id="2" material="1" variable="density" />
+    <derivative id="3" material="1" nuclide="O16" variable="nuclide_density" />
+    <derivative id="4" material="1" nuclide="U235" variable="nuclide_density" />
+    <derivative id="5" material="1" variable="temperature" />
+  </tallies>
+</model>
diff --git a/tests/regression_tests/distribmat/inputs_true.dat b/tests/regression_tests/distribmat/inputs_true.dat
index a1c1e8311..f6c43c19a 100644
--- a/tests/regression_tests/distribmat/inputs_true.dat
+++ b/tests/regression_tests/distribmat/inputs_true.dat
@@ -1,62 +1,61 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" universe="1" />
-  <cell id="11" material="2 void 3 2" region="-9" universe="11" />
-  <cell id="12" material="1" region="9" universe="11" />
-  <cell fill="101" id="101" region="10 -11 12 -13" universe="0" />
-  <lattice id="101">
-    <pitch>2.0 2.0</pitch>
-    <outer>1</outer>
-    <dimension>2 2</dimension>
-    <lower_left>-2.0 -2.0</lower_left>
-    <universes>
+<model>
+  <materials>
+    <material id="1">
+      <density units="g/cc" value="1.0" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+    <material depletable="true" id="2">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material depletable="true" id="3">
+      <density units="g/cc" value="2.0" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" universe="1" />
+    <cell id="11" material="2 void 3 2" region="-1" universe="11" />
+    <cell id="12" material="1" region="1" universe="11" />
+    <cell fill="101" id="101" region="2 -3 4 -5" universe="0" />
+    <lattice id="101">
+      <pitch>2.0 2.0</pitch>
+      <outer>1</outer>
+      <dimension>2 2</dimension>
+      <lower_left>-2.0 -2.0</lower_left>
+      <universes>
 11 11 
 11 11 </universes>
-  </lattice>
-  <surface coeffs="0.0 0.0 0.3" id="9" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="-3.0" id="10" type="x-plane" />
-  <surface boundary="reflective" coeffs="3.0" id="11" type="x-plane" />
-  <surface boundary="reflective" coeffs="-3.0" id="12" type="y-plane" />
-  <surface boundary="reflective" coeffs="3.0" id="13" type="y-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material id="1">
-    <density units="g/cc" value="1.0" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-  <material depletable="true" id="2">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material depletable="true" id="3">
-    <density units="g/cc" value="2.0" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>5</batches>
-  <inactive>0</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-1 -1 -1 1 1 1</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<plots>
-  <plot basis="xy" color_by="cell" filename="cellplot" id="1" type="slice">
-    <origin>0 0 0</origin>
-    <width>7 7</width>
-    <pixels>400 400</pixels>
-  </plot>
-  <plot basis="xy" color_by="material" filename="matplot" id="2" type="slice">
-    <origin>0 0 0</origin>
-    <width>7 7</width>
-    <pixels>400 400</pixels>
-  </plot>
-</plots>
+    </lattice>
+    <surface coeffs="0.0 0.0 0.3" id="1" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-3.0" id="2" type="x-plane" />
+    <surface boundary="reflective" coeffs="3.0" id="3" type="x-plane" />
+    <surface boundary="reflective" coeffs="-3.0" id="4" type="y-plane" />
+    <surface boundary="reflective" coeffs="3.0" id="5" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-1 -1 -1 1 1 1</parameters>
+      </space>
+    </source>
+  </settings>
+  <plots>
+    <plot basis="xy" color_by="cell" filename="cellplot" id="1" type="slice">
+      <origin>0 0 0</origin>
+      <width>7 7</width>
+      <pixels>400 400</pixels>
+    </plot>
+    <plot basis="xy" color_by="material" filename="matplot" id="2" type="slice">
+      <origin>0 0 0</origin>
+      <width>7 7</width>
+      <pixels>400 400</pixels>
+    </plot>
+  </plots>
+</model>
diff --git a/tests/regression_tests/distribmat/results_true.dat b/tests/regression_tests/distribmat/results_true.dat
index 4613434ce..af7b27fe7 100644
--- a/tests/regression_tests/distribmat/results_true.dat
+++ b/tests/regression_tests/distribmat/results_true.dat
@@ -4,7 +4,7 @@ Cell
 	ID             =	11
 	Name           =	
 	Fill           =	[2, None, 3, 2]
-	Region         =	-9
+	Region         =	-1
 	Rotation       =	None
 	Translation    =	None
 	Volume         =	None
diff --git a/tests/regression_tests/distribmat/test.py b/tests/regression_tests/distribmat/test.py
index 33f64ba03..ab7897313 100644
--- a/tests/regression_tests/distribmat/test.py
+++ b/tests/regression_tests/distribmat/test.py
@@ -4,7 +4,8 @@ from tests.testing_harness import TestHarness, PyAPITestHarness
 
 
 class DistribmatTestHarness(PyAPITestHarness):
-    def _build_inputs(self):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         ####################
         # Materials
         ####################
@@ -22,8 +23,8 @@ class DistribmatTestHarness(PyAPITestHarness):
         light_fuel.set_density('g/cc', 2.0)
         light_fuel.add_nuclide('U235', 1.0)
 
-        mats_file = openmc.Materials([moderator, dense_fuel, light_fuel])
-        mats_file.export_to_xml()
+        self._model.materials = openmc.Materials([moderator, dense_fuel,
+                                                  light_fuel])
 
         ####################
         # Geometry
@@ -54,8 +55,7 @@ class DistribmatTestHarness(PyAPITestHarness):
         c101.region = +x0 & -x1 & +y0 & -y1
         root_univ = openmc.Universe(universe_id=0, cells=[c101])
 
-        geometry = openmc.Geometry(root_univ)
-        geometry.export_to_xml()
+        self._model.geometry = openmc.Geometry(root_univ)
 
         ####################
         # Settings
@@ -67,7 +67,7 @@ class DistribmatTestHarness(PyAPITestHarness):
         sets_file.particles = 1000
         sets_file.source = openmc.Source(space=openmc.stats.Box(
             [-1, -1, -1], [1, 1, 1]))
-        sets_file.export_to_xml()
+        self._model.settings = sets_file
 
         ####################
         # Plots
@@ -89,8 +89,7 @@ class DistribmatTestHarness(PyAPITestHarness):
         plot2.width = (7, 7)
         plot2.pixels = (400, 400)
 
-        plots = openmc.Plots([plot1, plot2])
-        plots.export_to_xml()
+        self._model.plots = openmc.Plots([plot1, plot2])
 
     def _get_results(self):
         outstr = super()._get_results()
@@ -100,5 +99,5 @@ class DistribmatTestHarness(PyAPITestHarness):
 
 
 def test_distribmat():
-    harness = DistribmatTestHarness('statepoint.5.h5')
+    harness = DistribmatTestHarness('statepoint.5.h5', model=openmc.Model())
     harness.main()
diff --git a/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat b/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat
index 7348663e8..225b23ffa 100644
--- a/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat
+++ b/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat
@@ -1,31 +1,30 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cm3" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>7</batches>
-  <inactive>3</inactive>
-  <generations_per_batch>3</generations_per_batch>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <tally id="1">
-    <scores>flux</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cm3" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>7</batches>
+    <inactive>3</inactive>
+    <generations_per_batch>3</generations_per_batch>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <tally id="1">
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/energy_cutoff/inputs_true.dat b/tests/regression_tests/energy_cutoff/inputs_true.dat
index bb02369dc..e874a0c7a 100644
--- a/tests/regression_tests/energy_cutoff/inputs_true.dat
+++ b/tests/regression_tests/energy_cutoff/inputs_true.dat
@@ -1,42 +1,41 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="box" region="1 -2 3 -4 5 -6" universe="0" />
-  <surface boundary="reflective" coeffs="-1" id="1" type="x-plane" />
-  <surface boundary="reflective" coeffs="1" id="2" type="x-plane" />
-  <surface boundary="reflective" coeffs="-1" id="3" type="y-plane" />
-  <surface boundary="reflective" coeffs="1" id="4" type="y-plane" />
-  <surface boundary="reflective" coeffs="-1" id="5" type="z-plane" />
-  <surface boundary="reflective" coeffs="1" id="6" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material id="1" name="mat">
-    <density units="atom/b-cm" value="0.069335" />
-    <nuclide ao="40.0" name="H1" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-1 -1 -1 1 1 1</parameters>
-    </space>
-    <energy parameters="988000.0 2.249e-06" type="watt" />
-  </source>
-  <cutoff>
-    <energy_neutron>4.0</energy_neutron>
-  </cutoff>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="energy">
-    <bins>0.0 4.0</bins>
-  </filter>
-  <tally id="1">
-    <filters>1</filters>
-    <scores>flux</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material id="1" name="mat">
+      <density units="atom/b-cm" value="0.069335" />
+      <nuclide ao="40.0" name="H1" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="box" region="1 -2 3 -4 5 -6" universe="0" />
+    <surface boundary="reflective" coeffs="-1" id="1" type="x-plane" />
+    <surface boundary="reflective" coeffs="1" id="2" type="x-plane" />
+    <surface boundary="reflective" coeffs="-1" id="3" type="y-plane" />
+    <surface boundary="reflective" coeffs="1" id="4" type="y-plane" />
+    <surface boundary="reflective" coeffs="-1" id="5" type="z-plane" />
+    <surface boundary="reflective" coeffs="1" id="6" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-1 -1 -1 1 1 1</parameters>
+      </space>
+      <energy parameters="988000.0 2.249e-06" type="watt" />
+    </source>
+    <cutoff>
+      <energy_neutron>4.0</energy_neutron>
+    </cutoff>
+  </settings>
+  <tallies>
+    <filter id="1" type="energy">
+      <bins>0.0 4.0</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/energy_cutoff/test.py b/tests/regression_tests/energy_cutoff/test.py
index d76edd9a0..e05d17f5f 100755
--- a/tests/regression_tests/energy_cutoff/test.py
+++ b/tests/regression_tests/energy_cutoff/test.py
@@ -4,7 +4,8 @@ from tests.testing_harness import PyAPITestHarness
 
 
 class EnergyCutoffTestHarness(PyAPITestHarness):
-    def _build_inputs(self):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         # Set energy cutoff
         energy_cutoff = 4.0
 
@@ -12,8 +13,7 @@ class EnergyCutoffTestHarness(PyAPITestHarness):
         mat = openmc.Material(material_id=1, name='mat')
         mat.set_density('atom/b-cm', 0.069335)
         mat.add_nuclide('H1', 40.0)
-        materials_file = openmc.Materials([mat])
-        materials_file.export_to_xml()
+        self._model.materials = openmc.Materials([mat])
 
         # Cell is box with reflective boundary
         x1 = openmc.XPlane(surface_id=1, x0=-1)
@@ -29,8 +29,7 @@ class EnergyCutoffTestHarness(PyAPITestHarness):
         box.fill = mat
         root = openmc.Universe(universe_id=0, name='root universe')
         root.add_cell(box)
-        geometry = openmc.Geometry(root)
-        geometry.export_to_xml()
+        self._model.geometry = openmc.Geometry(root)
 
         # Set the running parameters
         settings_file = openmc.Settings()
@@ -43,7 +42,7 @@ class EnergyCutoffTestHarness(PyAPITestHarness):
         watt_dist = openmc.stats.Watt()
         settings_file.source = openmc.source.Source(space=uniform_dist,
                                                     energy=watt_dist)
-        settings_file.export_to_xml()
+        self._model.settings = settings_file
 
         # Tally flux under energy cutoff
         tallies = openmc.Tallies()
@@ -52,7 +51,7 @@ class EnergyCutoffTestHarness(PyAPITestHarness):
         energy_filter = openmc.filter.EnergyFilter((0.0, energy_cutoff))
         tally.filters = [energy_filter]
         tallies.append(tally)
-        tallies.export_to_xml()
+        self._model.tallies = tallies
 
     def _get_results(self):
         """Digest info in the statepoint and return as a string."""
@@ -70,5 +69,5 @@ class EnergyCutoffTestHarness(PyAPITestHarness):
 
 
 def test_energy_cutoff():
-    harness = EnergyCutoffTestHarness('statepoint.10.h5')
+    harness = EnergyCutoffTestHarness('statepoint.10.h5', model=openmc.Model())
     harness.main()
diff --git a/tests/regression_tests/energy_laws/inputs_true.dat b/tests/regression_tests/energy_laws/inputs_true.dat
index 2320b21d5..c89ccc97e 100644
--- a/tests/regression_tests/energy_laws/inputs_true.dat
+++ b/tests/regression_tests/energy_laws/inputs_true.dat
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <surface boundary="reflective" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cm3" value="20.0" />
-    <nuclide ao="1.0" name="U233" />
-    <nuclide ao="1.0" name="Am244" />
-    <nuclide ao="1.0" name="H2" />
-    <nuclide ao="1.0" name="Na23" />
-    <nuclide ao="1.0" name="Ta181" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-</settings>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cm3" value="20.0" />
+      <nuclide ao="1.0" name="U233" />
+      <nuclide ao="1.0" name="Am244" />
+      <nuclide ao="1.0" name="H2" />
+      <nuclide ao="1.0" name="Na23" />
+      <nuclide ao="1.0" name="Ta181" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <surface boundary="reflective" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/external_moab/inputs_true.dat b/tests/regression_tests/external_moab/inputs_true.dat
index af259eee4..2bcbad0df 100644
--- a/tests/regression_tests/external_moab/inputs_true.dat
+++ b/tests/regression_tests/external_moab/inputs_true.dat
@@ -1,73 +1,72 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-  <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-  <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-10" id="13" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="10" id="14" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-10" id="15" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="10" id="16" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-10" id="17" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="10" id="18" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space type="point">
-      <parameters>0.0 0.0 0.0</parameters>
-    </space>
-    <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional" />
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1" library="moab" type="unstructured">
-    <filename>test_mesh_tets.h5m</filename>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <tally id="1" name="unstructured mesh tally">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-10" id="13" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="10" id="14" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10" id="15" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="10" id="16" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-10" id="17" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="10" id="18" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space type="point">
+        <parameters>0.0 0.0 0.0</parameters>
+      </space>
+      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional" />
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1" library="moab" type="unstructured">
+      <filename>test_mesh_tets.h5m</filename>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <tally id="1" name="unstructured mesh tally">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/external_moab/test.py b/tests/regression_tests/external_moab/test.py
index b9d307239..12e0e5425 100644
--- a/tests/regression_tests/external_moab/test.py
+++ b/tests/regression_tests/external_moab/test.py
@@ -162,8 +162,6 @@ def test_external_mesh(cpp_driver):
     water_mat.set_density("atom/b-cm", 0.07416)
     materials.append(water_mat)
 
-    materials.export_to_xml()
-
     # Geometry
     fuel_min_x = openmc.XPlane(-5.0, name="minimum x")
     fuel_max_x = openmc.XPlane(5.0, name="maximum x")
diff --git a/tests/regression_tests/filter_cellinstance/inputs_true.dat b/tests/regression_tests/filter_cellinstance/inputs_true.dat
index f9d3ca58d..d00aae75d 100644
--- a/tests/regression_tests/filter_cellinstance/inputs_true.dat
+++ b/tests/regression_tests/filter_cellinstance/inputs_true.dat
@@ -1,65 +1,64 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="2" />
-  <cell id="2" material="2" region="1" universe="1" />
-  <cell fill="1" id="3" universe="2" />
-  <cell id="4" material="1" region="-2" universe="3" />
-  <cell id="5" material="2" region="2" universe="3" />
-  <cell fill="4" id="6" region="3 -4 5 -6" universe="5" />
-  <lattice id="4">
-    <pitch>2 2</pitch>
-    <dimension>4 4</dimension>
-    <lower_left>-4 -4</lower_left>
-    <universes>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2">
+      <density units="g/cc" value="1.0" />
+      <nuclide ao="1.0" name="H1" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="2" />
+    <cell id="2" material="2" region="1" universe="1" />
+    <cell fill="1" id="3" universe="2" />
+    <cell id="4" material="1" region="-2" universe="3" />
+    <cell id="5" material="2" region="2" universe="3" />
+    <cell fill="4" id="6" region="3 -4 5 -6" universe="5" />
+    <lattice id="4">
+      <pitch>2 2</pitch>
+      <dimension>4 4</dimension>
+      <lower_left>-4 -4</lower_left>
+      <universes>
 2 3 3 3 
 3 2 3 3 
 3 3 2 3 
 3 3 3 2 </universes>
-  </lattice>
-  <surface coeffs="0.0 0.0 0.7" id="1" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="-4.0" id="3" name="minimum x" type="x-plane" />
-  <surface boundary="reflective" coeffs="4.0" id="4" name="maximum x" type="x-plane" />
-  <surface boundary="reflective" coeffs="-4.0" id="5" name="minimum y" type="y-plane" />
-  <surface boundary="reflective" coeffs="4.0" id="6" name="maximum y" type="y-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2">
-    <density units="g/cc" value="1.0" />
-    <nuclide ao="1.0" name="H1" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>5</batches>
-  <inactive>0</inactive>
-  <source strength="1.0">
-    <space type="point">
-      <parameters>0.0 0.0 0.0</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="cellinstance">
-    <bins>4 0 4 1 4 2 4 3 4 4 4 5 4 6 4 7 4 8 4 9 4 10 4 11 2 0 2 1 2 2 2 3 3 0 3 1 3 2 3 3</bins>
-  </filter>
-  <filter id="2" type="cellinstance">
-    <bins>3 3 3 2 3 1 3 0 2 3 2 2 2 1 2 0 4 11 4 10 4 9 4 8 4 7 4 6 4 5 4 4 4 3 4 2 4 1 4 0</bins>
-  </filter>
-  <tally id="1">
-    <filters>1</filters>
-    <scores>total</scores>
-  </tally>
-  <tally id="2">
-    <filters>2</filters>
-    <scores>total</scores>
-  </tally>
-</tallies>
+    </lattice>
+    <surface coeffs="0.0 0.0 0.7" id="1" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-4.0" id="3" name="minimum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="4.0" id="4" name="maximum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="-4.0" id="5" name="minimum y" type="y-plane" />
+    <surface boundary="reflective" coeffs="4.0" id="6" name="maximum y" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+    <source strength="1.0">
+      <space type="point">
+        <parameters>0.0 0.0 0.0</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <filter id="1" type="cellinstance">
+      <bins>4 0 4 1 4 2 4 3 4 4 4 5 4 6 4 7 4 8 4 9 4 10 4 11 2 0 2 1 2 2 2 3 3 0 3 1 3 2 3 3</bins>
+    </filter>
+    <filter id="2" type="cellinstance">
+      <bins>3 3 3 2 3 1 3 0 2 3 2 2 2 1 2 0 4 11 4 10 4 9 4 8 4 7 4 6 4 5 4 4 4 3 4 2 4 1 4 0</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>total</scores>
+    </tally>
+    <tally id="2">
+      <filters>2</filters>
+      <scores>total</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/filter_energyfun/inputs_true.dat b/tests/regression_tests/filter_energyfun/inputs_true.dat
index db7f91ed0..706c70e34 100644
--- a/tests/regression_tests/filter_energyfun/inputs_true.dat
+++ b/tests/regression_tests/filter_energyfun/inputs_true.dat
@@ -1,106 +1,105 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cm3" value="10.0" />
-    <nuclide ao="1.0" name="Am241" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>5</batches>
-  <inactive>0</inactive>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="energyfunction">
-    <energy>1e-05 0.369 1000.0 100000.0 600000.0 1000000.0 2000000.0 4000000.0 30000000.0</energy>
-    <y>0.1 0.1 0.1333 0.158 0.18467 0.25618 0.4297 0.48 0.48</y>
-    <interpolation>linear-linear</interpolation>
-  </filter>
-  <filter id="3" type="energyfunction">
-    <energy>1e-05 0.369 1000.0 100000.0 600000.0 1000000.0 2000000.0 4000000.0 30000000.0</energy>
-    <y>0.1 0.1 0.1333 0.158 0.18467 0.25618 0.4297 0.48 0.48</y>
-    <interpolation>log-log</interpolation>
-  </filter>
-  <filter id="4" type="energyfunction">
-    <energy>1e-05 0.369 1000.0 100000.0 600000.0 1000000.0 2000000.0 4000000.0 30000000.0</energy>
-    <y>0.1 0.1 0.1333 0.158 0.18467 0.25618 0.4297 0.48 0.48</y>
-    <interpolation>linear-log</interpolation>
-  </filter>
-  <filter id="5" type="energyfunction">
-    <energy>1e-05 0.369 1000.0 100000.0 600000.0 1000000.0 2000000.0 4000000.0 30000000.0</energy>
-    <y>0.1 0.1 0.1333 0.158 0.18467 0.25618 0.4297 0.48 0.48</y>
-    <interpolation>log-linear</interpolation>
-  </filter>
-  <filter id="6" type="energyfunction">
-    <energy>0.0 5000000.0 10000000.0 15000000.0</energy>
-    <y>0.2 0.7 0.7 0.2</y>
-    <interpolation>linear-linear</interpolation>
-  </filter>
-  <filter id="7" type="energyfunction">
-    <energy>0.0 5000000.0 10000000.0 15000000.0</energy>
-    <y>0.2 0.7 0.7 0.2</y>
-    <interpolation>quadratic</interpolation>
-  </filter>
-  <filter id="8" type="energyfunction">
-    <energy>0.0 5000000.0 10000000.0 15000000.0</energy>
-    <y>0.2 0.7 0.7 0.2</y>
-    <interpolation>cubic</interpolation>
-  </filter>
-  <filter id="9" type="energyfunction">
-    <energy>0.0 5000000.0 10000000.0 15000000.0</energy>
-    <y>0.2 0.7 0.7 0.2</y>
-    <interpolation>histogram</interpolation>
-  </filter>
-  <tally id="1">
-    <nuclides>Am241</nuclides>
-    <scores>(n,gamma)</scores>
-  </tally>
-  <tally id="2">
-    <filters>1</filters>
-    <nuclides>Am241</nuclides>
-    <scores>(n,gamma)</scores>
-  </tally>
-  <tally id="3">
-    <filters>3</filters>
-    <nuclides>Am241</nuclides>
-    <scores>(n,gamma)</scores>
-  </tally>
-  <tally id="4">
-    <filters>4</filters>
-    <nuclides>Am241</nuclides>
-    <scores>(n,gamma)</scores>
-  </tally>
-  <tally id="5">
-    <filters>5</filters>
-    <nuclides>Am241</nuclides>
-    <scores>(n,gamma)</scores>
-  </tally>
-  <tally id="6">
-    <filters>6</filters>
-    <nuclides>Am241</nuclides>
-    <scores>(n,gamma)</scores>
-  </tally>
-  <tally id="7">
-    <filters>7</filters>
-    <nuclides>Am241</nuclides>
-    <scores>(n,gamma)</scores>
-  </tally>
-  <tally id="8">
-    <filters>8</filters>
-    <nuclides>Am241</nuclides>
-    <scores>(n,gamma)</scores>
-  </tally>
-  <tally id="9">
-    <filters>9</filters>
-    <nuclides>Am241</nuclides>
-    <scores>(n,gamma)</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cm3" value="10.0" />
+      <nuclide ao="1.0" name="Am241" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+  </settings>
+  <tallies>
+    <filter id="1" type="energyfunction">
+      <energy>1e-05 0.369 1000.0 100000.0 600000.0 1000000.0 2000000.0 4000000.0 30000000.0</energy>
+      <y>0.1 0.1 0.1333 0.158 0.18467 0.25618 0.4297 0.48 0.48</y>
+      <interpolation>linear-linear</interpolation>
+    </filter>
+    <filter id="3" type="energyfunction">
+      <energy>1e-05 0.369 1000.0 100000.0 600000.0 1000000.0 2000000.0 4000000.0 30000000.0</energy>
+      <y>0.1 0.1 0.1333 0.158 0.18467 0.25618 0.4297 0.48 0.48</y>
+      <interpolation>log-log</interpolation>
+    </filter>
+    <filter id="4" type="energyfunction">
+      <energy>1e-05 0.369 1000.0 100000.0 600000.0 1000000.0 2000000.0 4000000.0 30000000.0</energy>
+      <y>0.1 0.1 0.1333 0.158 0.18467 0.25618 0.4297 0.48 0.48</y>
+      <interpolation>linear-log</interpolation>
+    </filter>
+    <filter id="5" type="energyfunction">
+      <energy>1e-05 0.369 1000.0 100000.0 600000.0 1000000.0 2000000.0 4000000.0 30000000.0</energy>
+      <y>0.1 0.1 0.1333 0.158 0.18467 0.25618 0.4297 0.48 0.48</y>
+      <interpolation>log-linear</interpolation>
+    </filter>
+    <filter id="6" type="energyfunction">
+      <energy>0.0 5000000.0 10000000.0 15000000.0</energy>
+      <y>0.2 0.7 0.7 0.2</y>
+      <interpolation>linear-linear</interpolation>
+    </filter>
+    <filter id="7" type="energyfunction">
+      <energy>0.0 5000000.0 10000000.0 15000000.0</energy>
+      <y>0.2 0.7 0.7 0.2</y>
+      <interpolation>quadratic</interpolation>
+    </filter>
+    <filter id="8" type="energyfunction">
+      <energy>0.0 5000000.0 10000000.0 15000000.0</energy>
+      <y>0.2 0.7 0.7 0.2</y>
+      <interpolation>cubic</interpolation>
+    </filter>
+    <filter id="9" type="energyfunction">
+      <energy>0.0 5000000.0 10000000.0 15000000.0</energy>
+      <y>0.2 0.7 0.7 0.2</y>
+      <interpolation>histogram</interpolation>
+    </filter>
+    <tally id="1">
+      <nuclides>Am241</nuclides>
+      <scores>(n,gamma)</scores>
+    </tally>
+    <tally id="2">
+      <filters>1</filters>
+      <nuclides>Am241</nuclides>
+      <scores>(n,gamma)</scores>
+    </tally>
+    <tally id="3">
+      <filters>3</filters>
+      <nuclides>Am241</nuclides>
+      <scores>(n,gamma)</scores>
+    </tally>
+    <tally id="4">
+      <filters>4</filters>
+      <nuclides>Am241</nuclides>
+      <scores>(n,gamma)</scores>
+    </tally>
+    <tally id="5">
+      <filters>5</filters>
+      <nuclides>Am241</nuclides>
+      <scores>(n,gamma)</scores>
+    </tally>
+    <tally id="6">
+      <filters>6</filters>
+      <nuclides>Am241</nuclides>
+      <scores>(n,gamma)</scores>
+    </tally>
+    <tally id="7">
+      <filters>7</filters>
+      <nuclides>Am241</nuclides>
+      <scores>(n,gamma)</scores>
+    </tally>
+    <tally id="8">
+      <filters>8</filters>
+      <nuclides>Am241</nuclides>
+      <scores>(n,gamma)</scores>
+    </tally>
+    <tally id="9">
+      <filters>9</filters>
+      <nuclides>Am241</nuclides>
+      <scores>(n,gamma)</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/filter_mesh/inputs_true.dat b/tests/regression_tests/filter_mesh/inputs_true.dat
index 8b08a2a3c..d0b617903 100644
--- a/tests/regression_tests/filter_mesh/inputs_true.dat
+++ b/tests/regression_tests/filter_mesh/inputs_true.dat
@@ -1,152 +1,151 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1" />
-  <cell id="2" material="2" region="~(1 -2 3 -4) (5 -6 7 -8) 10 -9" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane" />
-  <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane" />
-  <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane" />
-  <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cm3" value="10.0" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2">
-    <density units="g/cm3" value="1.0" />
-    <nuclide ao="1.0" name="Zr90" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>5</batches>
-  <inactive>0</inactive>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>5</dimension>
-    <lower_left>-7.5</lower_left>
-    <upper_right>7.5</upper_right>
-  </mesh>
-  <mesh id="2">
-    <dimension>5 5</dimension>
-    <lower_left>-7.5 -7.5</lower_left>
-    <upper_right>7.5 7.5</upper_right>
-  </mesh>
-  <mesh id="3">
-    <dimension>5 5 5</dimension>
-    <lower_left>-7.5 -7.5 -7.5</lower_left>
-    <upper_right>7.5 7.5 7.5</upper_right>
-  </mesh>
-  <mesh id="4" type="rectilinear">
-    <x_grid>-7.5 -6.617647058823529 -5.735294117647059 -4.852941176470589 -3.9705882352941178 -3.0882352941176467 -2.2058823529411766 -1.3235294117647065 -0.4411764705882355 0.4411764705882355 1.3235294117647065 2.2058823529411757 3.0882352941176467 3.9705882352941178 4.852941176470587 5.735294117647058 6.617647058823529 7.5</x_grid>
-    <y_grid>-7.5 -6.617647058823529 -5.735294117647059 -4.852941176470589 -3.9705882352941178 -3.0882352941176467 -2.2058823529411766 -1.3235294117647065 -0.4411764705882355 0.4411764705882355 1.3235294117647065 2.2058823529411757 3.0882352941176467 3.9705882352941178 4.852941176470587 5.735294117647058 6.617647058823529 7.5</y_grid>
-    <z_grid>1.0 1.223224374241637 1.4962778697388448 1.8302835609029084 2.2388474634702153 2.7386127875258306 3.3499379133114306 4.09772570775871 5.012437964687018 6.131336292779302 7.500000000000001</z_grid>
-  </mesh>
-  <mesh id="5" type="cylindrical">
-    <r_grid>0.0 0.4411764705882353 0.8823529411764706 1.3235294117647058 1.7647058823529411 2.2058823529411766 2.6470588235294117 3.0882352941176467 3.5294117647058822 3.9705882352941178 4.411764705882353 4.852941176470588 5.294117647058823 5.735294117647059 6.1764705882352935 6.617647058823529 7.0588235294117645 7.5</r_grid>
-    <phi_grid>0.0 0.3490658503988659 0.6981317007977318 1.0471975511965976 1.3962634015954636 1.7453292519943295 2.0943951023931953 2.443460952792061 2.792526803190927 3.141592653589793 3.490658503988659 3.839724354387525 4.1887902047863905 4.537856055185257 4.886921905584122 5.235987755982989 5.585053606381854 5.93411945678072 6.283185307179586</phi_grid>
-    <z_grid>-7.5 -6.5625 -5.625 -4.6875 -3.75 -2.8125 -1.875 -0.9375 0.0 0.9375 1.875 2.8125 3.75 4.6875 5.625 6.5625 7.5</z_grid>
-    <origin>0.0 0.0 0.0</origin>
-  </mesh>
-  <mesh id="6" type="spherical">
-    <r_grid>0.0 0.4411764705882353 0.8823529411764706 1.3235294117647058 1.7647058823529411 2.2058823529411766 2.6470588235294117 3.0882352941176467 3.5294117647058822 3.9705882352941178 4.411764705882353 4.852941176470588 5.294117647058823 5.735294117647059 6.1764705882352935 6.617647058823529 7.0588235294117645 7.5</r_grid>
-    <theta_grid>0.0 0.39269908169872414 0.7853981633974483 1.1780972450961724 1.5707963267948966 1.9634954084936207 2.356194490192345 2.748893571891069 3.141592653589793</theta_grid>
-    <phi_grid>0.0 0.3490658503988659 0.6981317007977318 1.0471975511965976 1.3962634015954636 1.7453292519943295 2.0943951023931953 2.443460952792061 2.792526803190927 3.141592653589793 3.490658503988659 3.839724354387525 4.1887902047863905 4.537856055185257 4.886921905584122 5.235987755982989 5.585053606381854 5.93411945678072 6.283185307179586</phi_grid>
-    <origin>0.0 0.0 0.0</origin>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="7" type="meshsurface">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="mesh">
-    <bins>2</bins>
-  </filter>
-  <filter id="8" type="meshsurface">
-    <bins>2</bins>
-  </filter>
-  <filter id="3" type="mesh">
-    <bins>3</bins>
-  </filter>
-  <filter id="9" type="meshsurface">
-    <bins>3</bins>
-  </filter>
-  <filter id="4" type="mesh">
-    <bins>4</bins>
-  </filter>
-  <filter id="10" type="meshsurface">
-    <bins>4</bins>
-  </filter>
-  <filter id="5" type="mesh">
-    <bins>5</bins>
-  </filter>
-  <filter id="11" type="meshsurface">
-    <bins>5</bins>
-  </filter>
-  <filter id="6" type="mesh">
-    <bins>6</bins>
-  </filter>
-  <filter id="12" type="meshsurface">
-    <bins>6</bins>
-  </filter>
-  <tally id="1">
-    <filters>1</filters>
-    <scores>total</scores>
-  </tally>
-  <tally id="2">
-    <filters>7</filters>
-    <scores>current</scores>
-  </tally>
-  <tally id="3">
-    <filters>2</filters>
-    <scores>total</scores>
-  </tally>
-  <tally id="4">
-    <filters>8</filters>
-    <scores>current</scores>
-  </tally>
-  <tally id="5">
-    <filters>3</filters>
-    <scores>total</scores>
-  </tally>
-  <tally id="6">
-    <filters>9</filters>
-    <scores>current</scores>
-  </tally>
-  <tally id="7">
-    <filters>4</filters>
-    <scores>total</scores>
-  </tally>
-  <tally id="8">
-    <filters>10</filters>
-    <scores>current</scores>
-  </tally>
-  <tally id="9">
-    <filters>5</filters>
-    <scores>total</scores>
-  </tally>
-  <tally id="10">
-    <filters>11</filters>
-    <scores>current</scores>
-  </tally>
-  <tally id="11">
-    <filters>6</filters>
-    <scores>total</scores>
-  </tally>
-  <tally id="12">
-    <filters>12</filters>
-    <scores>current</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cm3" value="10.0" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2">
+      <density units="g/cm3" value="1.0" />
+      <nuclide ao="1.0" name="Zr90" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1" />
+    <cell id="2" material="2" region="~(1 -2 3 -4) (5 -6 7 -8) 10 -9" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane" />
+    <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>5</dimension>
+      <lower_left>-7.5</lower_left>
+      <upper_right>7.5</upper_right>
+    </mesh>
+    <mesh id="2">
+      <dimension>5 5</dimension>
+      <lower_left>-7.5 -7.5</lower_left>
+      <upper_right>7.5 7.5</upper_right>
+    </mesh>
+    <mesh id="3">
+      <dimension>5 5 5</dimension>
+      <lower_left>-7.5 -7.5 -7.5</lower_left>
+      <upper_right>7.5 7.5 7.5</upper_right>
+    </mesh>
+    <mesh id="4" type="rectilinear">
+      <x_grid>-7.5 -6.617647058823529 -5.735294117647059 -4.852941176470589 -3.9705882352941178 -3.0882352941176467 -2.2058823529411766 -1.3235294117647065 -0.4411764705882355 0.4411764705882355 1.3235294117647065 2.2058823529411757 3.0882352941176467 3.9705882352941178 4.852941176470587 5.735294117647058 6.617647058823529 7.5</x_grid>
+      <y_grid>-7.5 -6.617647058823529 -5.735294117647059 -4.852941176470589 -3.9705882352941178 -3.0882352941176467 -2.2058823529411766 -1.3235294117647065 -0.4411764705882355 0.4411764705882355 1.3235294117647065 2.2058823529411757 3.0882352941176467 3.9705882352941178 4.852941176470587 5.735294117647058 6.617647058823529 7.5</y_grid>
+      <z_grid>1.0 1.223224374241637 1.4962778697388448 1.8302835609029084 2.2388474634702153 2.7386127875258306 3.3499379133114306 4.09772570775871 5.012437964687018 6.131336292779302 7.500000000000001</z_grid>
+    </mesh>
+    <mesh id="5" type="cylindrical">
+      <r_grid>0.0 0.4411764705882353 0.8823529411764706 1.3235294117647058 1.7647058823529411 2.2058823529411766 2.6470588235294117 3.0882352941176467 3.5294117647058822 3.9705882352941178 4.411764705882353 4.852941176470588 5.294117647058823 5.735294117647059 6.1764705882352935 6.617647058823529 7.0588235294117645 7.5</r_grid>
+      <phi_grid>0.0 0.3490658503988659 0.6981317007977318 1.0471975511965976 1.3962634015954636 1.7453292519943295 2.0943951023931953 2.443460952792061 2.792526803190927 3.141592653589793 3.490658503988659 3.839724354387525 4.1887902047863905 4.537856055185257 4.886921905584122 5.235987755982989 5.585053606381854 5.93411945678072 6.283185307179586</phi_grid>
+      <z_grid>-7.5 -6.5625 -5.625 -4.6875 -3.75 -2.8125 -1.875 -0.9375 0.0 0.9375 1.875 2.8125 3.75 4.6875 5.625 6.5625 7.5</z_grid>
+      <origin>0.0 0.0 0.0</origin>
+    </mesh>
+    <mesh id="6" type="spherical">
+      <r_grid>0.0 0.4411764705882353 0.8823529411764706 1.3235294117647058 1.7647058823529411 2.2058823529411766 2.6470588235294117 3.0882352941176467 3.5294117647058822 3.9705882352941178 4.411764705882353 4.852941176470588 5.294117647058823 5.735294117647059 6.1764705882352935 6.617647058823529 7.0588235294117645 7.5</r_grid>
+      <theta_grid>0.0 0.39269908169872414 0.7853981633974483 1.1780972450961724 1.5707963267948966 1.9634954084936207 2.356194490192345 2.748893571891069 3.141592653589793</theta_grid>
+      <phi_grid>0.0 0.3490658503988659 0.6981317007977318 1.0471975511965976 1.3962634015954636 1.7453292519943295 2.0943951023931953 2.443460952792061 2.792526803190927 3.141592653589793 3.490658503988659 3.839724354387525 4.1887902047863905 4.537856055185257 4.886921905584122 5.235987755982989 5.585053606381854 5.93411945678072 6.283185307179586</phi_grid>
+      <origin>0.0 0.0 0.0</origin>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="7" type="meshsurface">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
+    </filter>
+    <filter id="8" type="meshsurface">
+      <bins>2</bins>
+    </filter>
+    <filter id="3" type="mesh">
+      <bins>3</bins>
+    </filter>
+    <filter id="9" type="meshsurface">
+      <bins>3</bins>
+    </filter>
+    <filter id="4" type="mesh">
+      <bins>4</bins>
+    </filter>
+    <filter id="10" type="meshsurface">
+      <bins>4</bins>
+    </filter>
+    <filter id="5" type="mesh">
+      <bins>5</bins>
+    </filter>
+    <filter id="11" type="meshsurface">
+      <bins>5</bins>
+    </filter>
+    <filter id="6" type="mesh">
+      <bins>6</bins>
+    </filter>
+    <filter id="12" type="meshsurface">
+      <bins>6</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>total</scores>
+    </tally>
+    <tally id="2">
+      <filters>7</filters>
+      <scores>current</scores>
+    </tally>
+    <tally id="3">
+      <filters>2</filters>
+      <scores>total</scores>
+    </tally>
+    <tally id="4">
+      <filters>8</filters>
+      <scores>current</scores>
+    </tally>
+    <tally id="5">
+      <filters>3</filters>
+      <scores>total</scores>
+    </tally>
+    <tally id="6">
+      <filters>9</filters>
+      <scores>current</scores>
+    </tally>
+    <tally id="7">
+      <filters>4</filters>
+      <scores>total</scores>
+    </tally>
+    <tally id="8">
+      <filters>10</filters>
+      <scores>current</scores>
+    </tally>
+    <tally id="9">
+      <filters>5</filters>
+      <scores>total</scores>
+    </tally>
+    <tally id="10">
+      <filters>11</filters>
+      <scores>current</scores>
+    </tally>
+    <tally id="11">
+      <filters>6</filters>
+      <scores>total</scores>
+    </tally>
+    <tally id="12">
+      <filters>12</filters>
+      <scores>current</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/filter_translations/inputs_true.dat b/tests/regression_tests/filter_translations/inputs_true.dat
index d38bec39f..8ed705413 100644
--- a/tests/regression_tests/filter_translations/inputs_true.dat
+++ b/tests/regression_tests/filter_translations/inputs_true.dat
@@ -1,84 +1,83 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1" />
-  <cell id="2" material="2" region="~(1 -2 3 -4) (5 -6 7 -8) 10 -9" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane" />
-  <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane" />
-  <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane" />
-  <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cm3" value="10.0" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2">
-    <density units="g/cm3" value="1.0" />
-    <nuclide ao="1.0" name="Zr90" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>5</batches>
-  <inactive>0</inactive>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>3 4 5</dimension>
-    <lower_left>-9 -9 -9</lower_left>
-    <upper_right>9 9 9</upper_right>
-  </mesh>
-  <mesh id="2" type="rectilinear">
-    <x_grid>-9.0 0.0 9.0</x_grid>
-    <y_grid>-9.0 -3.0 3.0 9.0</y_grid>
-    <z_grid>-9.0 -4.5 0.0 4.5 9.0</z_grid>
-  </mesh>
-  <mesh id="3">
-    <dimension>3 4 5</dimension>
-    <lower_left>-19 -4 -9</lower_left>
-    <upper_right>-1 14 9</upper_right>
-  </mesh>
-  <mesh id="4" type="rectilinear">
-    <x_grid>-19.0 -10.0 -1.0</x_grid>
-    <y_grid>-4.0 2.0 8.0 14.0</y_grid>
-    <z_grid>-9.0 -4.5 0.0 4.5 9.0</z_grid>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="mesh">
-    <bins>2</bins>
-  </filter>
-  <filter id="3" translation="10 -5 0" type="mesh">
-    <bins>3</bins>
-  </filter>
-  <filter id="4" translation="10 -5 0" type="mesh">
-    <bins>4</bins>
-  </filter>
-  <tally id="1">
-    <filters>1</filters>
-    <scores>total</scores>
-  </tally>
-  <tally id="2">
-    <filters>2</filters>
-    <scores>total</scores>
-  </tally>
-  <tally id="3">
-    <filters>3</filters>
-    <scores>total</scores>
-  </tally>
-  <tally id="4">
-    <filters>4</filters>
-    <scores>total</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cm3" value="10.0" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2">
+      <density units="g/cm3" value="1.0" />
+      <nuclide ao="1.0" name="Zr90" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1" />
+    <cell id="2" material="2" region="~(1 -2 3 -4) (5 -6 7 -8) 10 -9" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane" />
+    <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>3 4 5</dimension>
+      <lower_left>-9 -9 -9</lower_left>
+      <upper_right>9 9 9</upper_right>
+    </mesh>
+    <mesh id="2" type="rectilinear">
+      <x_grid>-9.0 0.0 9.0</x_grid>
+      <y_grid>-9.0 -3.0 3.0 9.0</y_grid>
+      <z_grid>-9.0 -4.5 0.0 4.5 9.0</z_grid>
+    </mesh>
+    <mesh id="3">
+      <dimension>3 4 5</dimension>
+      <lower_left>-19 -4 -9</lower_left>
+      <upper_right>-1 14 9</upper_right>
+    </mesh>
+    <mesh id="4" type="rectilinear">
+      <x_grid>-19.0 -10.0 -1.0</x_grid>
+      <y_grid>-4.0 2.0 8.0 14.0</y_grid>
+      <z_grid>-9.0 -4.5 0.0 4.5 9.0</z_grid>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
+    </filter>
+    <filter id="3" translation="10 -5 0" type="mesh">
+      <bins>3</bins>
+    </filter>
+    <filter id="4" translation="10 -5 0" type="mesh">
+      <bins>4</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>total</scores>
+    </tally>
+    <tally id="2">
+      <filters>2</filters>
+      <scores>total</scores>
+    </tally>
+    <tally id="3">
+      <filters>3</filters>
+      <scores>total</scores>
+    </tally>
+    <tally id="4">
+      <filters>4</filters>
+      <scores>total</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/fixed_source/inputs_true.dat b/tests/regression_tests/fixed_source/inputs_true.dat
index f1aebb3b2..57dcdb724 100644
--- a/tests/regression_tests/fixed_source/inputs_true.dat
+++ b/tests/regression_tests/fixed_source/inputs_true.dat
@@ -1,31 +1,30 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cc" value="7.5" />
-    <nuclide ao="1.0" name="O16" />
-    <nuclide ao="0.0001" name="U238" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <source strength="10.0">
-    <space type="point">
-      <parameters>0.0 0.0 0.0</parameters>
-    </space>
-  </source>
-  <temperature_default>294</temperature_default>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <tally id="1">
-    <scores>flux</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="7.5" />
+      <nuclide ao="1.0" name="O16" />
+      <nuclide ao="0.0001" name="U238" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <source strength="10.0">
+      <space type="point">
+        <parameters>0.0 0.0 0.0</parameters>
+      </space>
+    </source>
+    <temperature_default>294</temperature_default>
+  </settings>
+  <tallies>
+    <tally id="1">
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/iso_in_lab/inputs_true.dat b/tests/regression_tests/iso_in_lab/inputs_true.dat
index 2a302ada6..6dd8578ff 100644
--- a/tests/regression_tests/iso_in_lab/inputs_true.dat
+++ b/tests/regression_tests/iso_in_lab/inputs_true.dat
@@ -1,38 +1,199 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell fill="200" id="1" region="-6 34 -35" universe="0" />
-  <cell fill="201" id="2" region="-6 35 -36" universe="0" />
-  <cell id="3" material="8" region="-7 31 -32" universe="0" />
-  <cell id="4" material="9" region="-5 32 -33" universe="0" />
-  <cell id="5" material="12" region="-5 33 -34" universe="0" />
-  <cell id="6" material="11" region="-5 36 -37" universe="0" />
-  <cell id="7" material="10" region="-5 37 -38" universe="0" />
-  <cell id="8" material="7" region="-7 38 -39" universe="0" />
-  <cell id="9" material="9" region="6 -7 32 -38" universe="0" />
-  <cell id="10" material="5" region="7 -8 31 -39" universe="0" />
-  <cell id="11" material="6" region="5 -6 32 -34" universe="0" />
-  <cell id="12" material="7" region="5 -6 36 -38" universe="0" />
-  <cell id="21" material="1" region="-1" universe="1" />
-  <cell id="22" material="2" region="1 -2" universe="1" />
-  <cell id="23" material="3" region="2" universe="1" />
-  <cell id="24" material="3" region="-3" universe="2" />
-  <cell id="25" material="2" region="3 -4" universe="2" />
-  <cell id="26" material="3" region="4" universe="2" />
-  <cell id="27" material="1" region="-1" universe="3" />
-  <cell id="28" material="2" region="1 -2" universe="3" />
-  <cell id="29" material="4" region="2" universe="3" />
-  <cell id="30" material="4" region="-3" universe="4" />
-  <cell id="31" material="2" region="3 -4" universe="4" />
-  <cell id="32" material="4" region="4" universe="4" />
-  <cell id="50" material="3" region="34 -35" universe="5" />
-  <cell fill="100" id="60" region="34 -35" universe="6" />
-  <cell id="70" material="4" region="35 -36" universe="7" />
-  <cell fill="101" id="80" region="35 -36" universe="8" />
-  <lattice id="100" name="Fuel assembly (lower half)">
-    <pitch>1.26 1.26</pitch>
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <universes>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UOX fuel">
+      <density units="g/cm3" value="10.062" />
+      <nuclide ao="4.9476e-06" name="U234" />
+      <nuclide ao="0.00048218" name="U235" />
+      <nuclide ao="0.021504" name="U238" />
+      <nuclide ao="1.0801e-08" name="Xe135" />
+      <nuclide ao="0.045737" name="O16" />
+      <isotropic>U234 U235 U238 Xe135 O16</isotropic>
+    </material>
+    <material id="2" name="Zircaloy">
+      <density units="g/cm3" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+      <isotropic>Zr90 Zr91 Zr92 Zr94 Zr96</isotropic>
+    </material>
+    <material id="3" name="Cold borated water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <nuclide ao="0.000649" name="B10" />
+      <nuclide ao="0.002689" name="B11" />
+      <sab name="c_H_in_H2O" />
+      <isotropic>H1 O16 B10 B11</isotropic>
+    </material>
+    <material id="4" name="Hot borated water">
+      <density units="atom/b-cm" value="0.06614" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <nuclide ao="0.000649" name="B10" />
+      <nuclide ao="0.002689" name="B11" />
+      <sab name="c_H_in_H2O" />
+      <isotropic>H1 O16 B10 B11</isotropic>
+    </material>
+    <material id="5" name="Reactor pressure vessel steel">
+      <density units="g/cm3" value="7.9" />
+      <nuclide name="Fe54" wo="0.05437098" />
+      <nuclide name="Fe56" wo="0.88500663" />
+      <nuclide name="Fe57" wo="0.0208008" />
+      <nuclide name="Fe58" wo="0.00282159" />
+      <nuclide name="Ni58" wo="0.0067198" />
+      <nuclide name="Ni60" wo="0.0026776" />
+      <nuclide name="Mn55" wo="0.01" />
+      <nuclide name="Cr52" wo="0.002092475" />
+      <nuclide name="C0" wo="0.0025" />
+      <nuclide name="Cu63" wo="0.0013696" />
+      <isotropic>Fe54 Fe56 Fe57 Fe58 Ni58 Ni60 Mn55 Cr52 C0 Cu63</isotropic>
+    </material>
+    <material id="6" name="Lower radial reflector">
+      <density units="g/cm3" value="4.32" />
+      <nuclide name="H1" wo="0.0095661" />
+      <nuclide name="O16" wo="0.0759107" />
+      <nuclide name="B10" wo="3.08409e-05" />
+      <nuclide name="B11" wo="0.000140499" />
+      <nuclide name="Fe54" wo="0.035620772088" />
+      <nuclide name="Fe56" wo="0.579805982228" />
+      <nuclide name="Fe57" wo="0.01362750048" />
+      <nuclide name="Fe58" wo="0.001848545204" />
+      <nuclide name="Ni58" wo="0.055298376566" />
+      <nuclide name="Mn55" wo="0.018287" />
+      <nuclide name="Cr52" wo="0.145407678031" />
+      <sab name="c_H_in_H2O" />
+      <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
+    </material>
+    <material id="7" name="Upper radial reflector / Top plate region">
+      <density units="g/cm3" value="4.28" />
+      <nuclide name="H1" wo="0.0086117" />
+      <nuclide name="O16" wo="0.0683369" />
+      <nuclide name="B10" wo="2.77638e-05" />
+      <nuclide name="B11" wo="0.000126481" />
+      <nuclide name="Fe54" wo="0.035953677186" />
+      <nuclide name="Fe56" wo="0.585224740891" />
+      <nuclide name="Fe57" wo="0.01375486056" />
+      <nuclide name="Fe58" wo="0.001865821363" />
+      <nuclide name="Ni58" wo="0.055815129186" />
+      <nuclide name="Mn55" wo="0.0184579" />
+      <nuclide name="Cr52" wo="0.146766614995" />
+      <sab name="c_H_in_H2O" />
+      <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
+    </material>
+    <material id="8" name="Bottom plate region">
+      <density units="g/cm3" value="7.184" />
+      <nuclide name="H1" wo="0.0011505" />
+      <nuclide name="O16" wo="0.0091296" />
+      <nuclide name="B10" wo="3.70915e-06" />
+      <nuclide name="B11" wo="1.68974e-05" />
+      <nuclide name="Fe54" wo="0.03855611055" />
+      <nuclide name="Fe56" wo="0.627585036425" />
+      <nuclide name="Fe57" wo="0.014750478" />
+      <nuclide name="Fe58" wo="0.002000875025" />
+      <nuclide name="Ni58" wo="0.059855207342" />
+      <nuclide name="Mn55" wo="0.019794" />
+      <nuclide name="Cr52" wo="0.157390026871" />
+      <sab name="c_H_in_H2O" />
+      <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
+    </material>
+    <material id="9" name="Bottom nozzle region">
+      <density units="g/cm3" value="2.53" />
+      <nuclide name="H1" wo="0.0245014" />
+      <nuclide name="O16" wo="0.1944274" />
+      <nuclide name="B10" wo="7.89917e-05" />
+      <nuclide name="B11" wo="0.000359854" />
+      <nuclide name="Fe54" wo="0.030411411144" />
+      <nuclide name="Fe56" wo="0.495012237964" />
+      <nuclide name="Fe57" wo="0.01163454624" />
+      <nuclide name="Fe58" wo="0.001578204652" />
+      <nuclide name="Ni58" wo="0.047211231662" />
+      <nuclide name="Mn55" wo="0.0156126" />
+      <nuclide name="Cr52" wo="0.124142524198" />
+      <sab name="c_H_in_H2O" />
+      <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
+    </material>
+    <material id="10" name="Top nozzle region">
+      <density units="g/cm3" value="1.746" />
+      <nuclide name="H1" wo="0.035887" />
+      <nuclide name="O16" wo="0.2847761" />
+      <nuclide name="B10" wo="0.000115699" />
+      <nuclide name="B11" wo="0.000527075" />
+      <nuclide name="Fe54" wo="0.02644016154" />
+      <nuclide name="Fe56" wo="0.43037146399" />
+      <nuclide name="Fe57" wo="0.0101152584" />
+      <nuclide name="Fe58" wo="0.00137211607" />
+      <nuclide name="Ni58" wo="0.04104621835" />
+      <nuclide name="Mn55" wo="0.0135739" />
+      <nuclide name="Cr52" wo="0.107931450781" />
+      <sab name="c_H_in_H2O" />
+      <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
+    </material>
+    <material id="11" name="Top of fuel assemblies">
+      <density units="g/cm3" value="3.044" />
+      <nuclide name="H1" wo="0.0162913" />
+      <nuclide name="O16" wo="0.1292776" />
+      <nuclide name="B10" wo="5.25228e-05" />
+      <nuclide name="B11" wo="0.000239272" />
+      <nuclide name="Zr90" wo="0.43313403903" />
+      <nuclide name="Zr91" wo="0.09549277374" />
+      <nuclide name="Zr92" wo="0.14759527104" />
+      <nuclide name="Zr94" wo="0.15280552077" />
+      <nuclide name="Zr96" wo="0.02511169542" />
+      <sab name="c_H_in_H2O" />
+      <isotropic>H1 O16 B10 B11 Zr90 Zr91 Zr92 Zr94 Zr96</isotropic>
+    </material>
+    <material id="12" name="Bottom of fuel assemblies">
+      <density units="g/cm3" value="1.762" />
+      <nuclide name="H1" wo="0.0292856" />
+      <nuclide name="O16" wo="0.2323919" />
+      <nuclide name="B10" wo="9.44159e-05" />
+      <nuclide name="B11" wo="0.00043012" />
+      <nuclide name="Zr90" wo="0.3741373658" />
+      <nuclide name="Zr91" wo="0.0824858164" />
+      <nuclide name="Zr92" wo="0.1274914944" />
+      <nuclide name="Zr94" wo="0.1319920622" />
+      <nuclide name="Zr96" wo="0.0216912612" />
+      <sab name="c_H_in_H2O" />
+      <isotropic>H1 O16 B10 B11 Zr90 Zr91 Zr92 Zr94 Zr96</isotropic>
+    </material>
+  </materials>
+  <geometry>
+    <cell fill="200" id="1" region="-6 34 -35" universe="0" />
+    <cell fill="201" id="2" region="-6 35 -36" universe="0" />
+    <cell id="3" material="8" region="-7 31 -32" universe="0" />
+    <cell id="4" material="9" region="-5 32 -33" universe="0" />
+    <cell id="5" material="12" region="-5 33 -34" universe="0" />
+    <cell id="6" material="11" region="-5 36 -37" universe="0" />
+    <cell id="7" material="10" region="-5 37 -38" universe="0" />
+    <cell id="8" material="7" region="-7 38 -39" universe="0" />
+    <cell id="9" material="9" region="6 -7 32 -38" universe="0" />
+    <cell id="10" material="5" region="7 -8 31 -39" universe="0" />
+    <cell id="11" material="6" region="5 -6 32 -34" universe="0" />
+    <cell id="12" material="7" region="5 -6 36 -38" universe="0" />
+    <cell id="21" material="1" region="-1" universe="1" />
+    <cell id="22" material="2" region="1 -2" universe="1" />
+    <cell id="23" material="3" region="2" universe="1" />
+    <cell id="24" material="3" region="-3" universe="2" />
+    <cell id="25" material="2" region="3 -4" universe="2" />
+    <cell id="26" material="3" region="4" universe="2" />
+    <cell id="27" material="1" region="-1" universe="3" />
+    <cell id="28" material="2" region="1 -2" universe="3" />
+    <cell id="29" material="4" region="2" universe="3" />
+    <cell id="30" material="4" region="-3" universe="4" />
+    <cell id="31" material="2" region="3 -4" universe="4" />
+    <cell id="32" material="4" region="4" universe="4" />
+    <cell id="50" material="3" region="34 -35" universe="5" />
+    <cell fill="100" id="60" region="34 -35" universe="6" />
+    <cell id="70" material="4" region="35 -36" universe="7" />
+    <cell fill="101" id="80" region="35 -36" universe="8" />
+    <lattice id="100" name="Fuel assembly (lower half)">
+      <pitch>1.26 1.26</pitch>
+      <dimension>17 17</dimension>
+      <lower_left>-10.71 -10.71</lower_left>
+      <universes>
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 
@@ -50,12 +211,12 @@
 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 </universes>
-  </lattice>
-  <lattice id="101" name="Fuel assembly (upper half)">
-    <pitch>1.26 1.26</pitch>
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <universes>
+    </lattice>
+    <lattice id="101" name="Fuel assembly (upper half)">
+      <pitch>1.26 1.26</pitch>
+      <dimension>17 17</dimension>
+      <lower_left>-10.71 -10.71</lower_left>
+      <universes>
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 
@@ -73,12 +234,12 @@
 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
-  </lattice>
-  <lattice id="200" name="Core lattice (lower half)">
-    <pitch>21.42 21.42</pitch>
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <universes>
+    </lattice>
+    <lattice id="200" name="Core lattice (lower half)">
+      <pitch>21.42 21.42</pitch>
+      <dimension>21 21</dimension>
+      <lower_left>-224.91 -224.91</lower_left>
+      <universes>
 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 
@@ -100,12 +261,12 @@
 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 
 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 </universes>
-  </lattice>
-  <lattice id="201" name="Core lattice (lower half)">
-    <pitch>21.42 21.42</pitch>
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <universes>
+    </lattice>
+    <lattice id="201" name="Core lattice (lower half)">
+      <pitch>21.42 21.42</pitch>
+      <dimension>21 21</dimension>
+      <lower_left>-224.91 -224.91</lower_left>
+      <universes>
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 
@@ -127,195 +288,34 @@
 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 </universes>
-  </lattice>
-  <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder" />
-  <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane" />
-  <surface coeffs="-199.0" id="32" type="z-plane" />
-  <surface coeffs="-193.0" id="33" type="z-plane" />
-  <surface coeffs="-183.0" id="34" type="z-plane" />
-  <surface coeffs="0.0" id="35" type="z-plane" />
-  <surface coeffs="183.0" id="36" type="z-plane" />
-  <surface coeffs="203.0" id="37" type="z-plane" />
-  <surface coeffs="215.0" id="38" type="z-plane" />
-  <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="UOX fuel">
-    <density units="g/cm3" value="10.062" />
-    <nuclide ao="4.9476e-06" name="U234" />
-    <nuclide ao="0.00048218" name="U235" />
-    <nuclide ao="0.021504" name="U238" />
-    <nuclide ao="1.0801e-08" name="Xe135" />
-    <nuclide ao="0.045737" name="O16" />
-    <isotropic>U234 U235 U238 Xe135 O16</isotropic>
-  </material>
-  <material id="2" name="Zircaloy">
-    <density units="g/cm3" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-    <isotropic>Zr90 Zr91 Zr92 Zr94 Zr96</isotropic>
-  </material>
-  <material id="3" name="Cold borated water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <nuclide ao="0.000649" name="B10" />
-    <nuclide ao="0.002689" name="B11" />
-    <sab name="c_H_in_H2O" />
-    <isotropic>H1 O16 B10 B11</isotropic>
-  </material>
-  <material id="4" name="Hot borated water">
-    <density units="atom/b-cm" value="0.06614" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <nuclide ao="0.000649" name="B10" />
-    <nuclide ao="0.002689" name="B11" />
-    <sab name="c_H_in_H2O" />
-    <isotropic>H1 O16 B10 B11</isotropic>
-  </material>
-  <material id="5" name="Reactor pressure vessel steel">
-    <density units="g/cm3" value="7.9" />
-    <nuclide name="Fe54" wo="0.05437098" />
-    <nuclide name="Fe56" wo="0.88500663" />
-    <nuclide name="Fe57" wo="0.0208008" />
-    <nuclide name="Fe58" wo="0.00282159" />
-    <nuclide name="Ni58" wo="0.0067198" />
-    <nuclide name="Ni60" wo="0.0026776" />
-    <nuclide name="Mn55" wo="0.01" />
-    <nuclide name="Cr52" wo="0.002092475" />
-    <nuclide name="C0" wo="0.0025" />
-    <nuclide name="Cu63" wo="0.0013696" />
-    <isotropic>Fe54 Fe56 Fe57 Fe58 Ni58 Ni60 Mn55 Cr52 C0 Cu63</isotropic>
-  </material>
-  <material id="6" name="Lower radial reflector">
-    <density units="g/cm3" value="4.32" />
-    <nuclide name="H1" wo="0.0095661" />
-    <nuclide name="O16" wo="0.0759107" />
-    <nuclide name="B10" wo="3.08409e-05" />
-    <nuclide name="B11" wo="0.000140499" />
-    <nuclide name="Fe54" wo="0.035620772088" />
-    <nuclide name="Fe56" wo="0.579805982228" />
-    <nuclide name="Fe57" wo="0.01362750048" />
-    <nuclide name="Fe58" wo="0.001848545204" />
-    <nuclide name="Ni58" wo="0.055298376566" />
-    <nuclide name="Mn55" wo="0.018287" />
-    <nuclide name="Cr52" wo="0.145407678031" />
-    <sab name="c_H_in_H2O" />
-    <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
-  </material>
-  <material id="7" name="Upper radial reflector / Top plate region">
-    <density units="g/cm3" value="4.28" />
-    <nuclide name="H1" wo="0.0086117" />
-    <nuclide name="O16" wo="0.0683369" />
-    <nuclide name="B10" wo="2.77638e-05" />
-    <nuclide name="B11" wo="0.000126481" />
-    <nuclide name="Fe54" wo="0.035953677186" />
-    <nuclide name="Fe56" wo="0.585224740891" />
-    <nuclide name="Fe57" wo="0.01375486056" />
-    <nuclide name="Fe58" wo="0.001865821363" />
-    <nuclide name="Ni58" wo="0.055815129186" />
-    <nuclide name="Mn55" wo="0.0184579" />
-    <nuclide name="Cr52" wo="0.146766614995" />
-    <sab name="c_H_in_H2O" />
-    <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
-  </material>
-  <material id="8" name="Bottom plate region">
-    <density units="g/cm3" value="7.184" />
-    <nuclide name="H1" wo="0.0011505" />
-    <nuclide name="O16" wo="0.0091296" />
-    <nuclide name="B10" wo="3.70915e-06" />
-    <nuclide name="B11" wo="1.68974e-05" />
-    <nuclide name="Fe54" wo="0.03855611055" />
-    <nuclide name="Fe56" wo="0.627585036425" />
-    <nuclide name="Fe57" wo="0.014750478" />
-    <nuclide name="Fe58" wo="0.002000875025" />
-    <nuclide name="Ni58" wo="0.059855207342" />
-    <nuclide name="Mn55" wo="0.019794" />
-    <nuclide name="Cr52" wo="0.157390026871" />
-    <sab name="c_H_in_H2O" />
-    <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
-  </material>
-  <material id="9" name="Bottom nozzle region">
-    <density units="g/cm3" value="2.53" />
-    <nuclide name="H1" wo="0.0245014" />
-    <nuclide name="O16" wo="0.1944274" />
-    <nuclide name="B10" wo="7.89917e-05" />
-    <nuclide name="B11" wo="0.000359854" />
-    <nuclide name="Fe54" wo="0.030411411144" />
-    <nuclide name="Fe56" wo="0.495012237964" />
-    <nuclide name="Fe57" wo="0.01163454624" />
-    <nuclide name="Fe58" wo="0.001578204652" />
-    <nuclide name="Ni58" wo="0.047211231662" />
-    <nuclide name="Mn55" wo="0.0156126" />
-    <nuclide name="Cr52" wo="0.124142524198" />
-    <sab name="c_H_in_H2O" />
-    <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
-  </material>
-  <material id="10" name="Top nozzle region">
-    <density units="g/cm3" value="1.746" />
-    <nuclide name="H1" wo="0.035887" />
-    <nuclide name="O16" wo="0.2847761" />
-    <nuclide name="B10" wo="0.000115699" />
-    <nuclide name="B11" wo="0.000527075" />
-    <nuclide name="Fe54" wo="0.02644016154" />
-    <nuclide name="Fe56" wo="0.43037146399" />
-    <nuclide name="Fe57" wo="0.0101152584" />
-    <nuclide name="Fe58" wo="0.00137211607" />
-    <nuclide name="Ni58" wo="0.04104621835" />
-    <nuclide name="Mn55" wo="0.0135739" />
-    <nuclide name="Cr52" wo="0.107931450781" />
-    <sab name="c_H_in_H2O" />
-    <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
-  </material>
-  <material id="11" name="Top of fuel assemblies">
-    <density units="g/cm3" value="3.044" />
-    <nuclide name="H1" wo="0.0162913" />
-    <nuclide name="O16" wo="0.1292776" />
-    <nuclide name="B10" wo="5.25228e-05" />
-    <nuclide name="B11" wo="0.000239272" />
-    <nuclide name="Zr90" wo="0.43313403903" />
-    <nuclide name="Zr91" wo="0.09549277374" />
-    <nuclide name="Zr92" wo="0.14759527104" />
-    <nuclide name="Zr94" wo="0.15280552077" />
-    <nuclide name="Zr96" wo="0.02511169542" />
-    <sab name="c_H_in_H2O" />
-    <isotropic>H1 O16 B10 B11 Zr90 Zr91 Zr92 Zr94 Zr96</isotropic>
-  </material>
-  <material id="12" name="Bottom of fuel assemblies">
-    <density units="g/cm3" value="1.762" />
-    <nuclide name="H1" wo="0.0292856" />
-    <nuclide name="O16" wo="0.2323919" />
-    <nuclide name="B10" wo="9.44159e-05" />
-    <nuclide name="B11" wo="0.00043012" />
-    <nuclide name="Zr90" wo="0.3741373658" />
-    <nuclide name="Zr91" wo="0.0824858164" />
-    <nuclide name="Zr92" wo="0.1274914944" />
-    <nuclide name="Zr94" wo="0.1319920622" />
-    <nuclide name="Zr96" wo="0.0216912612" />
-    <sab name="c_H_in_H2O" />
-    <isotropic>H1 O16 B10 B11 Zr90 Zr91 Zr92 Zr94 Zr96</isotropic>
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-160 -160 -183 160 160 183</parameters>
-    </space>
-  </source>
-</settings>
+    </lattice>
+    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane" />
+    <surface coeffs="-199.0" id="32" type="z-plane" />
+    <surface coeffs="-193.0" id="33" type="z-plane" />
+    <surface coeffs="-183.0" id="34" type="z-plane" />
+    <surface coeffs="0.0" id="35" type="z-plane" />
+    <surface coeffs="183.0" id="36" type="z-plane" />
+    <surface coeffs="203.0" id="37" type="z-plane" />
+    <surface coeffs="215.0" id="38" type="z-plane" />
+    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-160 -160 -183 160 160 183</parameters>
+      </space>
+    </source>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/lattice_hex_coincident/inputs_true.dat b/tests/regression_tests/lattice_hex_coincident/inputs_true.dat
index 0388a4f55..639235726 100644
--- a/tests/regression_tests/lattice_hex_coincident/inputs_true.dat
+++ b/tests/regression_tests/lattice_hex_coincident/inputs_true.dat
@@ -1,81 +1,81 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="13" material="13" region="-9 10 -11" universe="9" />
-  <cell id="14" material="14" region="9" universe="9" />
-  <cell id="15" material="16" name="coolant" region="-12 10 -11" universe="10" />
-  <cell id="16" material="17" name="zirconium_shell" region="12 -13 10 -11" universe="10" />
-  <cell id="17" material="15" name="lead_shell" region="13 -14 10 -11" universe="10" />
-  <cell id="18" material="14" name="matrix coolant surround" region="14 10 -11" universe="10" />
-  <cell id="19" material="14" universe="11" />
-  <cell fill="12" id="20" name="container cell" region="-15 16 -17 18 19 -20 10 -11" universe="13" />
-  <hex_lattice id="12" n_rings="2" name="regular fuel assembly">
-    <pitch>1.4</pitch>
-    <outer>11</outer>
-    <center>0.0 0.0</center>
-    <universes>
-  10
-10  10
-  9 
-10  10
-  10</universes>
-  </hex_lattice>
-  <surface coeffs="0.0 0.0 0.7" id="9" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="0.0" id="10" type="z-plane" />
-  <surface boundary="reflective" coeffs="10.0" id="11" type="z-plane" />
-  <surface coeffs="0.0 0.0 0.293" id="12" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.35" id="13" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.352" id="14" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="1.4" id="15" type="y-plane" />
-  <surface boundary="reflective" coeffs="-1.4" id="16" type="y-plane" />
-  <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 2.8" id="17" type="plane" />
-  <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 -2.8" id="18" type="plane" />
-  <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 -2.8" id="19" type="plane" />
-  <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 2.8" id="20" type="plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="13">
-    <density units="sum" />
-    <nuclide ao="0.0049817" name="U235" />
-  </material>
-  <material id="14">
-    <density units="atom/b-cm" value="0.017742" />
-    <nuclide ao="1.0" name="C0" />
-    <sab name="c_Graphite" />
-  </material>
-  <material id="15" name="Lead">
-    <density units="g/cm3" value="10.32" />
-    <nuclide ao="0.014" name="Pb204" />
-    <nuclide ao="0.241" name="Pb206" />
-    <nuclide ao="0.221" name="Pb207" />
-    <nuclide ao="0.524" name="Pb208" />
-  </material>
-  <material id="16">
-    <density units="atom/b-cm" value="0.00054464" />
-    <nuclide ao="1.0" name="He4" />
-  </material>
-  <material id="17" name="Zirc4">
-    <density units="sum" />
-    <nuclide ao="0.02217" name="Zr90" />
-    <nuclide ao="0.004781" name="Zr91" />
-    <nuclide ao="0.007228" name="Zr92" />
-    <nuclide ao="0.007169" name="Zr94" />
-    <nuclide ao="0.001131" name="Zr96" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>5</batches>
-  <inactive>2</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-0.9899494936611666 -0.9899494936611666 0.0 0.9899494936611666 0.9899494936611666 10.0</parameters>
-    </space>
-  </source>
-  <output>
-    <summary>false</summary>
-  </output>
-  <seed>22</seed>
-</settings>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="sum" />
+      <nuclide ao="0.0049817" name="U235" />
+    </material>
+    <material id="2">
+      <density units="atom/b-cm" value="0.017742" />
+      <nuclide ao="1.0" name="C0" />
+      <sab name="c_Graphite" />
+    </material>
+    <material id="3" name="Lead">
+      <density units="g/cm3" value="10.32" />
+      <nuclide ao="0.014" name="Pb204" />
+      <nuclide ao="0.241" name="Pb206" />
+      <nuclide ao="0.221" name="Pb207" />
+      <nuclide ao="0.524" name="Pb208" />
+    </material>
+    <material id="4">
+      <density units="atom/b-cm" value="0.00054464" />
+      <nuclide ao="1.0" name="He4" />
+    </material>
+    <material id="5" name="Zirc4">
+      <density units="sum" />
+      <nuclide ao="0.02217" name="Zr90" />
+      <nuclide ao="0.004781" name="Zr91" />
+      <nuclide ao="0.007228" name="Zr92" />
+      <nuclide ao="0.007169" name="Zr94" />
+      <nuclide ao="0.001131" name="Zr96" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1 2 -3" universe="1" />
+    <cell id="2" material="2" region="1" universe="1" />
+    <cell id="3" material="4" name="coolant" region="-4 2 -3" universe="2" />
+    <cell id="4" material="5" name="zirconium_shell" region="4 -5 2 -3" universe="2" />
+    <cell id="5" material="3" name="lead_shell" region="5 -6 2 -3" universe="2" />
+    <cell id="6" material="2" name="matrix coolant surround" region="6 2 -3" universe="2" />
+    <cell id="7" material="2" universe="3" />
+    <cell fill="4" id="8" name="container cell" region="-7 8 -9 10 11 -12 2 -3" universe="5" />
+    <hex_lattice id="4" n_rings="2" name="regular fuel assembly">
+      <pitch>1.4</pitch>
+      <outer>3</outer>
+      <center>0.0 0.0</center>
+      <universes>
+ 2
+2 2
+ 1
+2 2
+ 2</universes>
+    </hex_lattice>
+    <surface coeffs="0.0 0.0 0.7" id="1" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="0.0" id="2" type="z-plane" />
+    <surface boundary="reflective" coeffs="10.0" id="3" type="z-plane" />
+    <surface coeffs="0.0 0.0 0.293" id="4" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.35" id="5" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.352" id="6" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="1.4" id="7" type="y-plane" />
+    <surface boundary="reflective" coeffs="-1.4" id="8" type="y-plane" />
+    <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 2.8" id="9" type="plane" />
+    <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 -2.8" id="10" type="plane" />
+    <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 -2.8" id="11" type="plane" />
+    <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 2.8" id="12" type="plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>5</batches>
+    <inactive>2</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-0.9899494936611666 -0.9899494936611666 0.0 0.9899494936611666 0.9899494936611666 10.0</parameters>
+      </space>
+    </source>
+    <output>
+      <summary>false</summary>
+    </output>
+    <seed>22</seed>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/lattice_hex_coincident/test.py b/tests/regression_tests/lattice_hex_coincident/test.py
index 30bc470f2..fae7f939b 100644
--- a/tests/regression_tests/lattice_hex_coincident/test.py
+++ b/tests/regression_tests/lattice_hex_coincident/test.py
@@ -6,7 +6,8 @@ from tests.testing_harness import PyAPITestHarness
 
 
 class HexLatticeCoincidentTestHarness(PyAPITestHarness):
-    def _build_inputs(self):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         materials = openmc.Materials()
 
         fuel_mat = openmc.Material()
@@ -40,7 +41,7 @@ class HexLatticeCoincidentTestHarness(PyAPITestHarness):
         zirc.add_nuclide('Zr96', 1.131E-03, 'ao')
         materials.append(zirc)
 
-        materials.export_to_xml()
+        self._model.materials = materials
 
         ### Geometry ###
         pin_rad = 0.7 # cm
@@ -124,8 +125,7 @@ class HexLatticeCoincidentTestHarness(PyAPITestHarness):
 
         root_univ = openmc.Universe(name="root universe", cells=[pincell_only_cell,])
 
-        geom = openmc.Geometry(root_univ)
-        geom.export_to_xml()
+        self._model.geometry = openmc.Geometry(root_univ)
 
         ### Settings ###
 
@@ -144,8 +144,9 @@ class HexLatticeCoincidentTestHarness(PyAPITestHarness):
         settings.inactive = 2
         settings.particles = 1000
         settings.seed = 22
-        settings.export_to_xml()
+        self._model.settings = settings
 
 def test_lattice_hex_coincident_surf():
-    harness = HexLatticeCoincidentTestHarness('statepoint.5.h5')
+    harness = HexLatticeCoincidentTestHarness('statepoint.5.h5',
+                                              model=openmc.Model())
     harness.main()
diff --git a/tests/regression_tests/lattice_hex_x/inputs_true.dat b/tests/regression_tests/lattice_hex_x/inputs_true.dat
index b528a97b7..2cff10f75 100644
--- a/tests/regression_tests/lattice_hex_x/inputs_true.dat
+++ b/tests/regression_tests/lattice_hex_x/inputs_true.dat
@@ -1,23 +1,53 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <cell id="2" material="4" region="-2 1" universe="1" />
-  <cell id="3" material="2" region="2" universe="1" />
-  <cell id="4" material="2" region="-3" universe="2" />
-  <cell id="5" material="4" region="-4 3" universe="2" />
-  <cell id="6" material="2" region="4" universe="2" />
-  <cell id="7" material="3" region="-5" universe="3" />
-  <cell id="8" material="4" region="-6 5" universe="3" />
-  <cell id="9" material="2" region="-7 6" universe="3" />
-  <cell id="10" material="4" region="-8 7" universe="3" />
-  <cell id="11" material="2" region="8" universe="3" />
-  <cell id="12" material="2" universe="4" />
-  <cell fill="9" id="13" name="container assembly cell" region="-11 12 -13 14 15 -16 9 -10" universe="5" />
-  <hex_lattice id="9" n_axial="2" n_rings="11" name="regular fuel assembly" orientation="x">
-    <pitch>1.235 5.0</pitch>
-    <outer>4</outer>
-    <center>0.0 0.0 5.0</center>
-    <universes>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UO2">
+      <density units="sum" />
+      <nuclide ao="0.0008737" name="U235" />
+      <nuclide ao="0.018744" name="U238" />
+      <nuclide ao="0.039235" name="O16" />
+    </material>
+    <material id="2" name="borated H2O">
+      <density units="sum" />
+      <nuclide ao="0.06694" name="H1" />
+      <nuclide ao="0.03347" name="O16" />
+      <nuclide ao="6.6262e-06" name="B10" />
+      <nuclide ao="2.6839e-05" name="B11" />
+    </material>
+    <material id="3" name="pellet B4C">
+      <density units="sum" />
+      <nuclide ao="0.01966" name="C0" />
+      <nuclide ao="4.7344e-06" name="B11" />
+      <nuclide ao="1.9177e-05" name="B10" />
+    </material>
+    <material id="4" name="Zirc4">
+      <density units="sum" />
+      <nuclide ao="0.021763349999999997" name="Zr90" />
+      <nuclide ao="0.00474606" name="Zr91" />
+      <nuclide ao="0.00725445" name="Zr92" />
+      <nuclide ao="0.00735174" name="Zr94" />
+      <nuclide ao="0.0011844" name="Zr96" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <cell id="2" material="4" region="-2 1" universe="1" />
+    <cell id="3" material="2" region="2" universe="1" />
+    <cell id="4" material="2" region="-3" universe="2" />
+    <cell id="5" material="4" region="-4 3" universe="2" />
+    <cell id="6" material="2" region="4" universe="2" />
+    <cell id="7" material="3" region="-5" universe="3" />
+    <cell id="8" material="4" region="-6 5" universe="3" />
+    <cell id="9" material="2" region="-7 6" universe="3" />
+    <cell id="10" material="4" region="-8 7" universe="3" />
+    <cell id="11" material="2" region="8" universe="3" />
+    <cell id="12" material="2" universe="4" />
+    <cell fill="6" id="13" name="container assembly cell" region="-11 12 -13 14 15 -16 9 -10" universe="5" />
+    <hex_lattice id="6" n_axial="2" n_rings="11" name="regular fuel assembly" orientation="x">
+      <pitch>1.235 5.0</pitch>
+      <outer>4</outer>
+      <center>0.0 0.0 5.0</center>
+      <universes>
           1 1 1 1 1 1 1 1 1 1 1
          1 1 1 1 1 1 1 1 1 1 1 1
         1 1 1 1 1 1 1 1 1 1 1 1 1
@@ -60,64 +90,34 @@
         1 1 1 1 1 1 1 1 1 1 1 1 1
          1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1</universes>
-  </hex_lattice>
-  <surface coeffs="0.0 0.0 0.386" id="1" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.4582" id="2" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.45" id="3" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.5177" id="4" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.35" id="5" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.41" id="6" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.545" id="7" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.6323" id="8" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="0.0" id="9" type="z-plane" />
-  <surface boundary="reflective" coeffs="10.0" id="10" type="z-plane" />
-  <surface boundary="reflective" coeffs="11.8" id="11" type="y-plane" />
-  <surface boundary="reflective" coeffs="-11.8" id="12" type="y-plane" />
-  <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 23.6" id="13" type="plane" />
-  <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 -23.6" id="14" type="plane" />
-  <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 -23.6" id="15" type="plane" />
-  <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 23.6" id="16" type="plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="UO2">
-    <density units="sum" />
-    <nuclide ao="0.0008737" name="U235" />
-    <nuclide ao="0.018744" name="U238" />
-    <nuclide ao="0.039235" name="O16" />
-  </material>
-  <material id="2" name="borated H2O">
-    <density units="sum" />
-    <nuclide ao="0.06694" name="H1" />
-    <nuclide ao="0.03347" name="O16" />
-    <nuclide ao="6.6262e-06" name="B10" />
-    <nuclide ao="2.6839e-05" name="B11" />
-  </material>
-  <material id="3" name="pellet B4C">
-    <density units="sum" />
-    <nuclide ao="0.01966" name="C0" />
-    <nuclide ao="4.7344e-06" name="B11" />
-    <nuclide ao="1.9177e-05" name="B10" />
-  </material>
-  <material id="4" name="Zirc4">
-    <density units="sum" />
-    <nuclide ao="0.021763349999999997" name="Zr90" />
-    <nuclide ao="0.00474606" name="Zr91" />
-    <nuclide ao="0.00725445" name="Zr92" />
-    <nuclide ao="0.00735174" name="Zr94" />
-    <nuclide ao="0.0011844" name="Zr96" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-13.62546635287517 -13.62546635287517 0.0 13.62546635287517 13.62546635287517 10.0</parameters>
-    </space>
-  </source>
-  <seed>22</seed>
-</settings>
+    </hex_lattice>
+    <surface coeffs="0.0 0.0 0.386" id="1" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.4582" id="2" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.45" id="3" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.5177" id="4" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.35" id="5" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.41" id="6" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.545" id="7" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.6323" id="8" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="0.0" id="9" type="z-plane" />
+    <surface boundary="reflective" coeffs="10.0" id="10" type="z-plane" />
+    <surface boundary="reflective" coeffs="11.8" id="11" type="y-plane" />
+    <surface boundary="reflective" coeffs="-11.8" id="12" type="y-plane" />
+    <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 23.6" id="13" type="plane" />
+    <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 -23.6" id="14" type="plane" />
+    <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 -23.6" id="15" type="plane" />
+    <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 23.6" id="16" type="plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-13.62546635287517 -13.62546635287517 0.0 13.62546635287517 13.62546635287517 10.0</parameters>
+      </space>
+    </source>
+    <seed>22</seed>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/lattice_hex_x/test.py b/tests/regression_tests/lattice_hex_x/test.py
index ecb27c9c2..e582c68ae 100644
--- a/tests/regression_tests/lattice_hex_x/test.py
+++ b/tests/regression_tests/lattice_hex_x/test.py
@@ -4,8 +4,8 @@ import numpy as np
 
 
 class HexLatticeOXTestHarness(PyAPITestHarness):
-
-    def _build_inputs(self):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         materials = openmc.Materials()
 
         fuel_mat = openmc.Material(material_id=1, name="UO2")
@@ -35,7 +35,7 @@ class HexLatticeOXTestHarness(PyAPITestHarness):
         zirc.add_element('Zr', 4.23e-2)
         materials.append(zirc)
 
-        materials.export_to_xml()
+        self._model.materials = materials
 
         # Geometry #
 
@@ -165,7 +165,7 @@ class HexLatticeOXTestHarness(PyAPITestHarness):
                     (4, 21), (5, 20), (4, 27), (5, 25), (4, 33)]
         for i, j in channels:
             universes[i][j] = abs_ch_univ
-        lattice = openmc.HexLattice(name="regular fuel assembly")
+        lattice = openmc.HexLattice(lattice_id=6, name="regular fuel assembly")
         lattice.orientation = "x"
         lattice.center = (0., 0., length/2.0)
         lattice.pitch = (assembly_pitch, length/2.0)
@@ -180,8 +180,7 @@ class HexLatticeOXTestHarness(PyAPITestHarness):
         root_univ = openmc.Universe(universe_id=5, name="root universe",
                                     cells=[assembly_cell])
 
-        geom = openmc.Geometry(root_univ)
-        geom.export_to_xml()
+        self._model.geometry = openmc.Geometry(root_univ)
 
         # Settings #
 
@@ -198,9 +197,9 @@ class HexLatticeOXTestHarness(PyAPITestHarness):
         settings.inactive = 5
         settings.particles = 1000
         settings.seed = 22
-        settings.export_to_xml()
+        self._model.settings = settings
 
 
 def test_lattice_hex_ox_surf():
-    harness = HexLatticeOXTestHarness('statepoint.10.h5')
+    harness = HexLatticeOXTestHarness('statepoint.10.h5', model=openmc.Model())
     harness.main()
diff --git a/tests/regression_tests/lattice_multiple/inputs_true.dat b/tests/regression_tests/lattice_multiple/inputs_true.dat
index c92e841bc..0eed3c201 100644
--- a/tests/regression_tests/lattice_multiple/inputs_true.dat
+++ b/tests/regression_tests/lattice_multiple/inputs_true.dat
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <cell id="2" material="2" region="1" universe="1" />
-  <cell id="3" material="1" region="-2" universe="2" />
-  <cell id="4" material="2" region="2" universe="2" />
-  <cell fill="3" id="5" universe="4" />
-  <cell fill="5" id="6" region="3 -4 5 -6" universe="6" />
-  <lattice id="3">
-    <pitch>1.2 1.2</pitch>
-    <outer>1</outer>
-    <dimension>2 2</dimension>
-    <lower_left>-1.2 -1.2</lower_left>
-    <universes>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UO2">
+      <density units="g/cm3" value="10.0" />
+      <nuclide ao="1.0" name="U235" />
+      <nuclide ao="2.0" name="O16" />
+    </material>
+    <material id="2" name="light water">
+      <density units="g/cm3" value="1.0" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <cell id="2" material="2" region="1" universe="1" />
+    <cell id="3" material="1" region="-2" universe="2" />
+    <cell id="4" material="2" region="2" universe="2" />
+    <cell fill="3" id="5" universe="4" />
+    <cell fill="5" id="6" region="3 -4 5 -6" universe="6" />
+    <lattice id="3">
+      <pitch>1.2 1.2</pitch>
+      <outer>1</outer>
+      <dimension>2 2</dimension>
+      <lower_left>-1.2 -1.2</lower_left>
+      <universes>
 2 1 
 1 1 </universes>
-  </lattice>
-  <lattice id="5">
-    <pitch>2.4 2.4</pitch>
-    <dimension>2 2</dimension>
-    <lower_left>-2.4 -2.4</lower_left>
-    <universes>
+    </lattice>
+    <lattice id="5">
+      <pitch>2.4 2.4</pitch>
+      <dimension>2 2</dimension>
+      <lower_left>-2.4 -2.4</lower_left>
+      <universes>
 4 4 
 4 4 </universes>
-  </lattice>
-  <surface coeffs="0.0 0.0 0.4" id="1" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="-2.4" id="3" name="minimum x" type="x-plane" />
-  <surface boundary="reflective" coeffs="2.4" id="4" name="maximum x" type="x-plane" />
-  <surface boundary="reflective" coeffs="-2.4" id="5" name="minimum y" type="y-plane" />
-  <surface boundary="reflective" coeffs="2.4" id="6" name="maximum y" type="y-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="UO2">
-    <density units="g/cm3" value="10.0" />
-    <nuclide ao="1.0" name="U235" />
-    <nuclide ao="2.0" name="O16" />
-  </material>
-  <material id="2" name="light water">
-    <density units="g/cm3" value="1.0" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-</settings>
+    </lattice>
+    <surface coeffs="0.0 0.0 0.4" id="1" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-2.4" id="3" name="minimum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="2.4" id="4" name="maximum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="-2.4" id="5" name="minimum y" type="y-plane" />
+    <surface boundary="reflective" coeffs="2.4" id="6" name="maximum y" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/lattice_rotated/inputs_true.dat b/tests/regression_tests/lattice_rotated/inputs_true.dat
index 8ee34b4f3..8e54bdf88 100644
--- a/tests/regression_tests/lattice_rotated/inputs_true.dat
+++ b/tests/regression_tests/lattice_rotated/inputs_true.dat
@@ -1,18 +1,35 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <cell id="2" material="3" region="1" universe="1" />
-  <cell id="3" material="2" region="-2" universe="2" />
-  <cell id="4" material="3" region="2" universe="2" />
-  <cell id="5" material="3" universe="30" />
-  <cell fill="4" id="6" region="-3" rotation="0.0 0.0 45.0" translation="-4.0 0.0 0.0" universe="5" />
-  <cell fill="3" id="7" region="-4" rotation="0.0 0.0 30.0" translation="4.0 0.0 0.0" universe="5" />
-  <cell id="8" material="3" region="-5 3 4" universe="5" />
-  <hex_lattice id="3" n_rings="3">
-    <pitch>1.25</pitch>
-    <outer>30</outer>
-    <center>0.0 0.0</center>
-    <universes>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cm3" value="10.0" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material depletable="true" id="2">
+      <density units="g/cm3" value="10.0" />
+      <nuclide ao="1.0" name="U238" />
+    </material>
+    <material id="3">
+      <density units="g/cm3" value="1.0" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <cell id="2" material="3" region="1" universe="1" />
+    <cell id="3" material="2" region="-2" universe="2" />
+    <cell id="4" material="3" region="2" universe="2" />
+    <cell id="5" material="3" universe="30" />
+    <cell fill="4" id="6" region="-3" rotation="0.0 0.0 45.0" translation="-4.0 0.0 0.0" universe="5" />
+    <cell fill="3" id="7" region="-4" rotation="0.0 0.0 30.0" translation="4.0 0.0 0.0" universe="5" />
+    <cell id="8" material="3" region="-5 3 4" universe="5" />
+    <hex_lattice id="3" n_rings="3">
+      <pitch>1.25</pitch>
+      <outer>30</outer>
+      <center>0.0 0.0</center>
+      <universes>
   2
  1 1
 1 2 1
@@ -22,50 +39,33 @@
 1 1 1
  1 1
   1</universes>
-  </hex_lattice>
-  <lattice id="4">
-    <pitch>1.25 1.25</pitch>
-    <outer>30</outer>
-    <dimension>4 4</dimension>
-    <lower_left>-2.5 -2.5</lower_left>
-    <universes>
+    </hex_lattice>
+    <lattice id="4">
+      <pitch>1.25 1.25</pitch>
+      <outer>30</outer>
+      <dimension>4 4</dimension>
+      <lower_left>-2.5 -2.5</lower_left>
+      <universes>
 2 2 2 2 
 1 1 1 1 
 1 1 1 1 
 1 1 1 1 </universes>
-  </lattice>
-  <surface coeffs="0.0 0.0 0.25" id="1" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder" />
-  <surface coeffs="-4.0 0.0 4.0" id="3" type="z-cylinder" />
-  <surface coeffs="4.0 0.0 4.0" id="4" type="z-cylinder" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 8.0" id="5" type="z-cylinder" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cm3" value="10.0" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material depletable="true" id="2">
-    <density units="g/cm3" value="10.0" />
-    <nuclide ao="1.0" name="U238" />
-  </material>
-  <material id="3">
-    <density units="g/cm3" value="1.0" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>5</batches>
-  <inactive>0</inactive>
-  <source strength="1.0">
-    <space type="point">
-      <parameters>0.0 0.0 0.0</parameters>
-    </space>
-  </source>
-</settings>
+    </lattice>
+    <surface coeffs="0.0 0.0 0.25" id="1" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder" />
+    <surface coeffs="-4.0 0.0 4.0" id="3" type="z-cylinder" />
+    <surface coeffs="4.0 0.0 4.0" id="4" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 8.0" id="5" type="z-cylinder" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+    <source strength="1.0">
+      <space type="point">
+        <parameters>0.0 0.0 0.0</parameters>
+      </space>
+    </source>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/mg_basic/inputs_true.dat b/tests/regression_tests/mg_basic/inputs_true.dat
index 4f2fd3f0b..06406b5f2 100644
--- a/tests/regression_tests/mg_basic/inputs_true.dat
+++ b/tests/regression_tests/mg_basic/inputs_true.dat
@@ -1,64 +1,64 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="1 -2" universe="0" />
-  <cell id="2" material="2" region="2 -3" universe="0" />
-  <cell id="3" material="3" region="3 -4" universe="0" />
-  <cell id="4" material="4" region="4 -5" universe="0" />
-  <cell id="5" material="5" region="5 -6" universe="0" />
-  <cell id="6" material="6" region="6 -7" universe="0" />
-  <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
-  <surface coeffs="154.90833333333333" id="2" type="x-plane" />
-  <surface coeffs="309.81666666666666" id="3" type="x-plane" />
-  <surface coeffs="464.725" id="4" type="x-plane" />
-  <surface coeffs="619.6333333333333" id="5" type="x-plane" />
-  <surface coeffs="774.5416666666666" id="6" type="x-plane" />
-  <surface boundary="vacuum" coeffs="929.45" id="7" type="x-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <cross_sections>2g.h5</cross_sections>
-  <material id="1" name="base leg">
-    <density units="macro" value="1.0" />
-    <macroscopic name="mat_1" />
-  </material>
-  <material id="2" name="base tab">
-    <density units="macro" value="1.0" />
-    <macroscopic name="mat_2" />
-  </material>
-  <material id="3" name="base hist">
-    <density units="macro" value="1.0" />
-    <macroscopic name="mat_3" />
-  </material>
-  <material id="4" name="base matrix">
-    <density units="macro" value="1.0" />
-    <macroscopic name="mat_4" />
-  </material>
-  <material id="5" name="base ang">
-    <density units="macro" value="1.0" />
-    <macroscopic name="mat_5" />
-  </material>
-  <material id="6" name="micro">
-    <density units="sum" />
-    <nuclide ao="0.5" name="mat_1" />
-    <nuclide ao="0.5" name="mat_6" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>0.0 -1000.0 -1000.0 154.90833333333333 1000.0 1000.0</parameters>
-    </space>
-  </source>
-  <output>
-    <summary>false</summary>
-  </output>
-  <energy_mode>multi-group</energy_mode>
-  <tabular_legendre>
-    <enable>false</enable>
-  </tabular_legendre>
-</settings>
+<model>
+  <materials>
+    <cross_sections>2g.h5</cross_sections>
+    <material id="1" name="base leg">
+      <density units="macro" value="1.0" />
+      <macroscopic name="mat_1" />
+    </material>
+    <material id="2" name="base tab">
+      <density units="macro" value="1.0" />
+      <macroscopic name="mat_2" />
+    </material>
+    <material id="3" name="base hist">
+      <density units="macro" value="1.0" />
+      <macroscopic name="mat_3" />
+    </material>
+    <material id="4" name="base matrix">
+      <density units="macro" value="1.0" />
+      <macroscopic name="mat_4" />
+    </material>
+    <material id="5" name="base ang">
+      <density units="macro" value="1.0" />
+      <macroscopic name="mat_5" />
+    </material>
+    <material id="6" name="micro">
+      <density units="sum" />
+      <nuclide ao="0.5" name="mat_1" />
+      <nuclide ao="0.5" name="mat_6" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="1 -2" universe="0" />
+    <cell id="2" material="2" region="2 -3" universe="0" />
+    <cell id="3" material="3" region="3 -4" universe="0" />
+    <cell id="4" material="4" region="4 -5" universe="0" />
+    <cell id="5" material="5" region="5 -6" universe="0" />
+    <cell id="6" material="6" region="6 -7" universe="0" />
+    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
+    <surface coeffs="154.90833333333333" id="2" type="x-plane" />
+    <surface coeffs="309.81666666666666" id="3" type="x-plane" />
+    <surface coeffs="464.725" id="4" type="x-plane" />
+    <surface coeffs="619.6333333333333" id="5" type="x-plane" />
+    <surface coeffs="774.5416666666666" id="6" type="x-plane" />
+    <surface boundary="vacuum" coeffs="929.45" id="7" type="x-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>0.0 -1000.0 -1000.0 154.90833333333333 1000.0 1000.0</parameters>
+      </space>
+    </source>
+    <output>
+      <summary>false</summary>
+    </output>
+    <energy_mode>multi-group</energy_mode>
+    <tabular_legendre>
+      <enable>false</enable>
+    </tabular_legendre>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/mg_basic_delayed/inputs_true.dat b/tests/regression_tests/mg_basic_delayed/inputs_true.dat
index 9fb7afe7e..05108d87d 100644
--- a/tests/regression_tests/mg_basic_delayed/inputs_true.dat
+++ b/tests/regression_tests/mg_basic_delayed/inputs_true.dat
@@ -1,63 +1,63 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="1 -2" universe="0" />
-  <cell id="2" material="2" region="2 -3" universe="0" />
-  <cell id="3" material="3" region="3 -4" universe="0" />
-  <cell id="4" material="4" region="4 -5" universe="0" />
-  <cell id="5" material="5" region="5 -6" universe="0" />
-  <cell id="6" material="6" region="6 -7" universe="0" />
-  <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
-  <surface coeffs="154.90833333333333" id="2" type="x-plane" />
-  <surface coeffs="309.81666666666666" id="3" type="x-plane" />
-  <surface coeffs="464.725" id="4" type="x-plane" />
-  <surface coeffs="619.6333333333333" id="5" type="x-plane" />
-  <surface coeffs="774.5416666666666" id="6" type="x-plane" />
-  <surface boundary="vacuum" coeffs="929.45" id="7" type="x-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <cross_sections>2g.h5</cross_sections>
-  <material id="1" name="vec beta">
-    <density units="macro" value="1.0" />
-    <macroscopic name="mat_1" />
-  </material>
-  <material id="2" name="vec no beta">
-    <density units="macro" value="1.0" />
-    <macroscopic name="mat_2" />
-  </material>
-  <material id="3" name="matrix beta">
-    <density units="macro" value="1.0" />
-    <macroscopic name="mat_3" />
-  </material>
-  <material id="4" name="matrix no beta">
-    <density units="macro" value="1.0" />
-    <macroscopic name="mat_4" />
-  </material>
-  <material id="5" name="vec group beta">
-    <density units="macro" value="1.0" />
-    <macroscopic name="mat_5" />
-  </material>
-  <material id="6" name="matrix group beta">
-    <density units="macro" value="1.0" />
-    <macroscopic name="mat_6" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>0.0 -1000.0 -1000.0 154.90833333333333 1000.0 1000.0</parameters>
-    </space>
-  </source>
-  <output>
-    <summary>false</summary>
-  </output>
-  <energy_mode>multi-group</energy_mode>
-  <tabular_legendre>
-    <enable>false</enable>
-  </tabular_legendre>
-</settings>
+<model>
+  <materials>
+    <cross_sections>2g.h5</cross_sections>
+    <material id="1" name="vec beta">
+      <density units="macro" value="1.0" />
+      <macroscopic name="mat_1" />
+    </material>
+    <material id="2" name="vec no beta">
+      <density units="macro" value="1.0" />
+      <macroscopic name="mat_2" />
+    </material>
+    <material id="3" name="matrix beta">
+      <density units="macro" value="1.0" />
+      <macroscopic name="mat_3" />
+    </material>
+    <material id="4" name="matrix no beta">
+      <density units="macro" value="1.0" />
+      <macroscopic name="mat_4" />
+    </material>
+    <material id="5" name="vec group beta">
+      <density units="macro" value="1.0" />
+      <macroscopic name="mat_5" />
+    </material>
+    <material id="6" name="matrix group beta">
+      <density units="macro" value="1.0" />
+      <macroscopic name="mat_6" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="1 -2" universe="0" />
+    <cell id="2" material="2" region="2 -3" universe="0" />
+    <cell id="3" material="3" region="3 -4" universe="0" />
+    <cell id="4" material="4" region="4 -5" universe="0" />
+    <cell id="5" material="5" region="5 -6" universe="0" />
+    <cell id="6" material="6" region="6 -7" universe="0" />
+    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
+    <surface coeffs="154.90833333333333" id="2" type="x-plane" />
+    <surface coeffs="309.81666666666666" id="3" type="x-plane" />
+    <surface coeffs="464.725" id="4" type="x-plane" />
+    <surface coeffs="619.6333333333333" id="5" type="x-plane" />
+    <surface coeffs="774.5416666666666" id="6" type="x-plane" />
+    <surface boundary="vacuum" coeffs="929.45" id="7" type="x-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>0.0 -1000.0 -1000.0 154.90833333333333 1000.0 1000.0</parameters>
+      </space>
+    </source>
+    <output>
+      <summary>false</summary>
+    </output>
+    <energy_mode>multi-group</energy_mode>
+    <tabular_legendre>
+      <enable>false</enable>
+    </tabular_legendre>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/mg_convert/inputs_true.dat b/tests/regression_tests/mg_convert/inputs_true.dat
index 753c0d304..9276a7a7b 100644
--- a/tests/regression_tests/mg_convert/inputs_true.dat
+++ b/tests/regression_tests/mg_convert/inputs_true.dat
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="cell 1" region="4 -5 6 -7" universe="0" />
-  <surface boundary="reflective" coeffs="-5.0" id="4" name="left" type="x-plane" />
-  <surface boundary="vacuum" coeffs="5.0" id="5" name="right" type="x-plane" />
-  <surface boundary="reflective" coeffs="-5.0" id="6" name="bottom" type="y-plane" />
-  <surface boundary="reflective" coeffs="5.0" id="7" name="top" type="y-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <cross_sections>mgxs.h5</cross_sections>
-  <material id="1" name="UO2 fuel">
-    <density units="macro" value="1.1" />
-    <macroscopic name="UO2" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-5 -5 -5 5 5 5</parameters>
-    </space>
-  </source>
-  <energy_mode>multi-group</energy_mode>
-</settings>
+<model>
+  <materials>
+    <cross_sections>mgxs.h5</cross_sections>
+    <material id="1" name="UO2 fuel">
+      <density units="macro" value="1.1" />
+      <macroscopic name="UO2" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="cell 1" region="4 -5 6 -7" universe="0" />
+    <surface boundary="reflective" coeffs="-5.0" id="4" name="left" type="x-plane" />
+    <surface boundary="vacuum" coeffs="5.0" id="5" name="right" type="x-plane" />
+    <surface boundary="reflective" coeffs="-5.0" id="6" name="bottom" type="y-plane" />
+    <surface boundary="reflective" coeffs="5.0" id="7" name="top" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-5 -5 -5 5 5 5</parameters>
+      </space>
+    </source>
+    <energy_mode>multi-group</energy_mode>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/mg_convert/test.py b/tests/regression_tests/mg_convert/test.py
index c6ab485ea..d9c4a57bd 100755
--- a/tests/regression_tests/mg_convert/test.py
+++ b/tests/regression_tests/mg_convert/test.py
@@ -61,7 +61,8 @@ def build_mgxs_library(convert):
 
 
 class MGXSTestHarness(PyAPITestHarness):
-    def _build_inputs(self):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         # Instantiate some Macroscopic Data
         uo2_data = openmc.Macroscopic('UO2')
 
@@ -73,7 +74,7 @@ class MGXSTestHarness(PyAPITestHarness):
         # Instantiate a Materials collection and export to XML
         materials_file = openmc.Materials([mat])
         materials_file.cross_sections = "./mgxs.h5"
-        materials_file.export_to_xml()
+        self._model.materials = materials_file
 
         # Instantiate ZCylinder surfaces
         left = openmc.XPlane(surface_id=4, x0=-5., name='left')
@@ -102,8 +103,7 @@ class MGXSTestHarness(PyAPITestHarness):
         root.add_cells([fuel])
 
         # Instantiate a Geometry, register the root Universe, and export to XML
-        geometry = openmc.Geometry(root)
-        geometry.export_to_xml()
+        self._model.geometry = openmc.Geometry(root)
 
         settings_file = openmc.Settings()
         settings_file.energy_mode = "multi-group"
@@ -116,7 +116,7 @@ class MGXSTestHarness(PyAPITestHarness):
         uniform_dist = openmc.stats.Box(bounds[:3], bounds[3:])
         settings_file.source = openmc.source.Source(space=uniform_dist)
 
-        settings_file.export_to_xml()
+        self._model.settings = settings_file
 
     def _run_openmc(self):
         # Run multiple conversions to compare results
@@ -194,5 +194,5 @@ class MGXSTestHarness(PyAPITestHarness):
 
 
 def test_mg_convert():
-    harness = MGXSTestHarness('statepoint.10.h5')
+    harness = MGXSTestHarness('statepoint.10.h5', model=openmc.Model())
     harness.main()
diff --git a/tests/regression_tests/mg_legendre/inputs_true.dat b/tests/regression_tests/mg_legendre/inputs_true.dat
index ad3b434e6..d90dfb802 100644
--- a/tests/regression_tests/mg_legendre/inputs_true.dat
+++ b/tests/regression_tests/mg_legendre/inputs_true.dat
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="1 -2" universe="0" />
-  <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
-  <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <cross_sections>2g.h5</cross_sections>
-  <material id="1" name="mat_1">
-    <density units="macro" value="1.0" />
-    <macroscopic name="mat_1" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>0.0 -1000.0 -1000.0 929.45 1000.0 1000.0</parameters>
-    </space>
-  </source>
-  <output>
-    <summary>false</summary>
-  </output>
-  <energy_mode>multi-group</energy_mode>
-  <tabular_legendre>
-    <enable>false</enable>
-  </tabular_legendre>
-</settings>
+<model>
+  <materials>
+    <cross_sections>2g.h5</cross_sections>
+    <material id="1" name="mat_1">
+      <density units="macro" value="1.0" />
+      <macroscopic name="mat_1" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="1 -2" universe="0" />
+    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
+    <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>0.0 -1000.0 -1000.0 929.45 1000.0 1000.0</parameters>
+      </space>
+    </source>
+    <output>
+      <summary>false</summary>
+    </output>
+    <energy_mode>multi-group</energy_mode>
+    <tabular_legendre>
+      <enable>false</enable>
+    </tabular_legendre>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/mg_max_order/inputs_true.dat b/tests/regression_tests/mg_max_order/inputs_true.dat
index 2ac83852c..9bfcd54df 100644
--- a/tests/regression_tests/mg_max_order/inputs_true.dat
+++ b/tests/regression_tests/mg_max_order/inputs_true.dat
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="1 -2" universe="0" />
-  <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
-  <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <cross_sections>2g.h5</cross_sections>
-  <material id="1" name="mat_1">
-    <density units="macro" value="1.0" />
-    <macroscopic name="mat_1" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>0.0 -1000.0 -1000.0 929.45 1000.0 1000.0</parameters>
-    </space>
-  </source>
-  <output>
-    <summary>false</summary>
-  </output>
-  <energy_mode>multi-group</energy_mode>
-  <max_order>1</max_order>
-  <tabular_legendre>
-    <enable>false</enable>
-  </tabular_legendre>
-</settings>
+<model>
+  <materials>
+    <cross_sections>2g.h5</cross_sections>
+    <material id="1" name="mat_1">
+      <density units="macro" value="1.0" />
+      <macroscopic name="mat_1" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="1 -2" universe="0" />
+    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
+    <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>0.0 -1000.0 -1000.0 929.45 1000.0 1000.0</parameters>
+      </space>
+    </source>
+    <output>
+      <summary>false</summary>
+    </output>
+    <energy_mode>multi-group</energy_mode>
+    <max_order>1</max_order>
+    <tabular_legendre>
+      <enable>false</enable>
+    </tabular_legendre>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/mg_survival_biasing/inputs_true.dat b/tests/regression_tests/mg_survival_biasing/inputs_true.dat
index 5ece3ce9f..a3a2a726f 100644
--- a/tests/regression_tests/mg_survival_biasing/inputs_true.dat
+++ b/tests/regression_tests/mg_survival_biasing/inputs_true.dat
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="1 -2" universe="0" />
-  <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
-  <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <cross_sections>2g.h5</cross_sections>
-  <material id="1" name="mat_1">
-    <density units="macro" value="1.0" />
-    <macroscopic name="mat_1" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>0.0 -1000.0 -1000.0 929.45 1000.0 1000.0</parameters>
-    </space>
-  </source>
-  <output>
-    <summary>false</summary>
-  </output>
-  <energy_mode>multi-group</energy_mode>
-  <survival_biasing>true</survival_biasing>
-  <tabular_legendre>
-    <enable>false</enable>
-  </tabular_legendre>
-</settings>
+<model>
+  <materials>
+    <cross_sections>2g.h5</cross_sections>
+    <material id="1" name="mat_1">
+      <density units="macro" value="1.0" />
+      <macroscopic name="mat_1" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="1 -2" universe="0" />
+    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
+    <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>0.0 -1000.0 -1000.0 929.45 1000.0 1000.0</parameters>
+      </space>
+    </source>
+    <output>
+      <summary>false</summary>
+    </output>
+    <energy_mode>multi-group</energy_mode>
+    <survival_biasing>true</survival_biasing>
+    <tabular_legendre>
+      <enable>false</enable>
+    </tabular_legendre>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/mg_tallies/inputs_true.dat b/tests/regression_tests/mg_tallies/inputs_true.dat
index 562958722..bdd41c7f8 100644
--- a/tests/regression_tests/mg_tallies/inputs_true.dat
+++ b/tests/regression_tests/mg_tallies/inputs_true.dat
@@ -1,165 +1,164 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="1 -2" universe="0" />
-  <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
-  <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <cross_sections>2g.h5</cross_sections>
-  <material id="1" name="mat_1">
-    <density units="macro" value="1.0" />
-    <macroscopic name="mat_1" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>0.0 -1000.0 -1000.0 929.45 1000.0 1000.0</parameters>
-    </space>
-  </source>
-  <output>
-    <summary>false</summary>
-  </output>
-  <energy_mode>multi-group</energy_mode>
-  <tabular_legendre>
-    <enable>false</enable>
-  </tabular_legendre>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>10 1 1</dimension>
-    <lower_left>0.0 0.0 0.0</lower_left>
-    <upper_right>929.45 1000 1000</upper_right>
-  </mesh>
-  <filter id="5" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="6" type="material">
-    <bins>1</bins>
-  </filter>
-  <filter id="1" type="energy">
-    <bins>0.0 20000000.0</bins>
-  </filter>
-  <filter id="2" type="energyout">
-    <bins>0.0 20000000.0</bins>
-  </filter>
-  <filter id="3" type="energy">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="4" type="energyout">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <tally id="1">
-    <filters>5</filters>
-    <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="2">
-    <filters>5</filters>
-    <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="3">
-    <filters>6 1</filters>
-    <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate flux scatter nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="4">
-    <filters>6 1</filters>
-    <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="5">
-    <filters>6 1</filters>
-    <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="6">
-    <filters>6 1 2</filters>
-    <scores>scatter nu-scatter nu-fission</scores>
-  </tally>
-  <tally id="7">
-    <filters>6 3</filters>
-    <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate flux scatter nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="8">
-    <filters>6 3</filters>
-    <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="9">
-    <filters>6 3</filters>
-    <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="10">
-    <filters>6 3 4</filters>
-    <scores>scatter nu-scatter nu-fission</scores>
-  </tally>
-  <tally id="11">
-    <filters>5</filters>
-    <nuclides>mat_1</nuclides>
-    <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="12">
-    <filters>5</filters>
-    <nuclides>mat_1</nuclides>
-    <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="13">
-    <filters>6 1</filters>
-    <nuclides>mat_1</nuclides>
-    <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate scatter nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="14">
-    <filters>6 1</filters>
-    <nuclides>mat_1</nuclides>
-    <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="15">
-    <filters>6 1</filters>
-    <nuclides>mat_1</nuclides>
-    <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="16">
-    <filters>6 1 2</filters>
-    <nuclides>mat_1</nuclides>
-    <scores>scatter nu-scatter nu-fission</scores>
-  </tally>
-  <tally id="17">
-    <filters>6 3</filters>
-    <nuclides>mat_1</nuclides>
-    <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate scatter nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="18">
-    <filters>6 3</filters>
-    <nuclides>mat_1</nuclides>
-    <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="19">
-    <filters>6 3</filters>
-    <nuclides>mat_1</nuclides>
-    <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="20">
-    <filters>6 3 4</filters>
-    <nuclides>mat_1</nuclides>
-    <scores>scatter nu-scatter nu-fission</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <cross_sections>2g.h5</cross_sections>
+    <material id="1" name="mat_1">
+      <density units="macro" value="1.0" />
+      <macroscopic name="mat_1" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="1 -2" universe="0" />
+    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
+    <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>0.0 -1000.0 -1000.0 929.45 1000.0 1000.0</parameters>
+      </space>
+    </source>
+    <output>
+      <summary>false</summary>
+    </output>
+    <energy_mode>multi-group</energy_mode>
+    <tabular_legendre>
+      <enable>false</enable>
+    </tabular_legendre>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 1 1</dimension>
+      <lower_left>0.0 0.0 0.0</lower_left>
+      <upper_right>929.45 1000 1000</upper_right>
+    </mesh>
+    <filter id="5" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="6" type="material">
+      <bins>1</bins>
+    </filter>
+    <filter id="1" type="energy">
+      <bins>0.0 20000000.0</bins>
+    </filter>
+    <filter id="2" type="energyout">
+      <bins>0.0 20000000.0</bins>
+    </filter>
+    <filter id="3" type="energy">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="4" type="energyout">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <tally id="1">
+      <filters>5</filters>
+      <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="2">
+      <filters>5</filters>
+      <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="3">
+      <filters>6 1</filters>
+      <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate flux scatter nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="4">
+      <filters>6 1</filters>
+      <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="5">
+      <filters>6 1</filters>
+      <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="6">
+      <filters>6 1 2</filters>
+      <scores>scatter nu-scatter nu-fission</scores>
+    </tally>
+    <tally id="7">
+      <filters>6 3</filters>
+      <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate flux scatter nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="8">
+      <filters>6 3</filters>
+      <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="9">
+      <filters>6 3</filters>
+      <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="10">
+      <filters>6 3 4</filters>
+      <scores>scatter nu-scatter nu-fission</scores>
+    </tally>
+    <tally id="11">
+      <filters>5</filters>
+      <nuclides>mat_1</nuclides>
+      <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="12">
+      <filters>5</filters>
+      <nuclides>mat_1</nuclides>
+      <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="13">
+      <filters>6 1</filters>
+      <nuclides>mat_1</nuclides>
+      <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate scatter nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="14">
+      <filters>6 1</filters>
+      <nuclides>mat_1</nuclides>
+      <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="15">
+      <filters>6 1</filters>
+      <nuclides>mat_1</nuclides>
+      <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="16">
+      <filters>6 1 2</filters>
+      <nuclides>mat_1</nuclides>
+      <scores>scatter nu-scatter nu-fission</scores>
+    </tally>
+    <tally id="17">
+      <filters>6 3</filters>
+      <nuclides>mat_1</nuclides>
+      <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate scatter nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="18">
+      <filters>6 3</filters>
+      <nuclides>mat_1</nuclides>
+      <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="19">
+      <filters>6 3</filters>
+      <nuclides>mat_1</nuclides>
+      <scores>total absorption fission nu-fission inverse-velocity prompt-nu-fission delayed-nu-fission kappa-fission events decay-rate</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="20">
+      <filters>6 3 4</filters>
+      <nuclides>mat_1</nuclides>
+      <scores>scatter nu-scatter nu-fission</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/mgxs_library_ce_to_mg/inputs_true.dat b/tests/regression_tests/mgxs_library_ce_to_mg/inputs_true.dat
index bc5c4b2d4..533160577 100644
--- a/tests/regression_tests/mgxs_library_ce_to_mg/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_ce_to_mg/inputs_true.dat
@@ -1,251 +1,250 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
-  <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
-  <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
-  <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-  <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
-  <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
-  <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
-  <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="UO2 (2.4%)">
-    <density units="g/cm3" value="10.29769" />
-    <nuclide ao="4.4843e-06" name="U234" />
-    <nuclide ao="0.00055815" name="U235" />
-    <nuclide ao="0.022408" name="U238" />
-    <nuclide ao="0.045829" name="O16" />
-  </material>
-  <material id="2" name="Zircaloy">
-    <density units="g/cm3" value="6.55" />
-    <nuclide ao="0.021827" name="Zr90" />
-    <nuclide ao="0.00476" name="Zr91" />
-    <nuclide ao="0.0072758" name="Zr92" />
-    <nuclide ao="0.0073734" name="Zr94" />
-    <nuclide ao="0.0011879" name="Zr96" />
-  </material>
-  <material id="3" name="Hot borated water">
-    <density units="g/cm3" value="0.740582" />
-    <nuclide ao="0.049457" name="H1" />
-    <nuclide ao="0.024672" name="O16" />
-    <nuclide ao="8.0042e-06" name="B10" />
-    <nuclide ao="3.2218e-05" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="fission">
-      <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="material">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="energy">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="7" type="energyout">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="11" type="legendre">
-    <order>3</order>
-  </filter>
-  <filter id="15" type="material">
-    <bins>2</bins>
-  </filter>
-  <filter id="29" type="material">
-    <bins>3</bins>
-  </filter>
-  <tally id="1">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="2">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="3">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="4">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="5">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="6">
-    <filters>1 2 7</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="7">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="8">
-    <filters>1 2 7 11</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="9">
-    <filters>1 2 7</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="10">
-    <filters>1 2 7</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="11">
-    <filters>15 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="12">
-    <filters>15 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="13">
-    <filters>15 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="14">
-    <filters>15 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="15">
-    <filters>15 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="16">
-    <filters>15 2 7</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="17">
-    <filters>15 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="18">
-    <filters>15 2 7 11</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="19">
-    <filters>15 2 7</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="20">
-    <filters>15 2 7</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="21">
-    <filters>29 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="22">
-    <filters>29 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="23">
-    <filters>29 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="24">
-    <filters>29 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="25">
-    <filters>29 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="26">
-    <filters>29 2 7</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="27">
-    <filters>29 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="28">
-    <filters>29 2 7 11</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="29">
-    <filters>29 2 7</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="30">
-    <filters>29 2 7</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UO2 (2.4%)">
+      <density units="g/cm3" value="10.29769" />
+      <nuclide ao="4.4843e-06" name="U234" />
+      <nuclide ao="0.00055815" name="U235" />
+      <nuclide ao="0.022408" name="U238" />
+      <nuclide ao="0.045829" name="O16" />
+    </material>
+    <material id="2" name="Zircaloy">
+      <density units="g/cm3" value="6.55" />
+      <nuclide ao="0.021827" name="Zr90" />
+      <nuclide ao="0.00476" name="Zr91" />
+      <nuclide ao="0.0072758" name="Zr92" />
+      <nuclide ao="0.0073734" name="Zr94" />
+      <nuclide ao="0.0011879" name="Zr96" />
+    </material>
+    <material id="3" name="Hot borated water">
+      <density units="g/cm3" value="0.740582" />
+      <nuclide ao="0.049457" name="H1" />
+      <nuclide ao="0.024672" name="O16" />
+      <nuclide ao="8.0042e-06" name="B10" />
+      <nuclide ao="3.2218e-05" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="fission">
+        <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <filter id="1" type="material">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="energy">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="7" type="energyout">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="11" type="legendre">
+      <order>3</order>
+    </filter>
+    <filter id="15" type="material">
+      <bins>2</bins>
+    </filter>
+    <filter id="29" type="material">
+      <bins>3</bins>
+    </filter>
+    <tally id="1">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="2">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="3">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="4">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="5">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="6">
+      <filters>1 2 7</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="7">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="8">
+      <filters>1 2 7 11</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="9">
+      <filters>1 2 7</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="10">
+      <filters>1 2 7</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="11">
+      <filters>15 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="12">
+      <filters>15 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="13">
+      <filters>15 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="14">
+      <filters>15 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="15">
+      <filters>15 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="16">
+      <filters>15 2 7</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="17">
+      <filters>15 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="18">
+      <filters>15 2 7 11</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="19">
+      <filters>15 2 7</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="20">
+      <filters>15 2 7</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="21">
+      <filters>29 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="22">
+      <filters>29 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="23">
+      <filters>29 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="24">
+      <filters>29 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="25">
+      <filters>29 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="26">
+      <filters>29 2 7</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="27">
+      <filters>29 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="28">
+      <filters>29 2 7 11</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="29">
+      <filters>29 2 7</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="30">
+      <filters>29 2 7</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/mgxs_library_ce_to_mg/test.py b/tests/regression_tests/mgxs_library_ce_to_mg/test.py
index 72f052e68..4dff67323 100644
--- a/tests/regression_tests/mgxs_library_ce_to_mg/test.py
+++ b/tests/regression_tests/mgxs_library_ce_to_mg/test.py
@@ -48,15 +48,12 @@ class MGXSTestHarness(PyAPITestHarness):
         # Modify materials and settings so we can run in MG mode
         self._model.materials.cross_sections = './mgxs.h5'
         self._model.settings.energy_mode = 'multi-group'
+        # Dont need tallies so clear them from the model
+        self._model.tallies = openmc.Tallies()
 
         # Write modified input files
-        self._model.settings.export_to_xml()
-        self._model.geometry.export_to_xml()
-        self._model.materials.export_to_xml()
+        self._model.export_to_model_xml()
         self._model.mgxs_file.export_to_hdf5()
-        # Dont need tallies.xml, so remove the file
-        if os.path.exists('tallies.xml'):
-            os.remove('tallies.xml')
 
         # Enforce closing statepoint and summary files so HDF5
         # does not throw an error during the next OpenMC execution
diff --git a/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/inputs_true.dat b/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/inputs_true.dat
index 576f27966..fe154a018 100644
--- a/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/inputs_true.dat
@@ -1,251 +1,250 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
-  <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
-  <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
-  <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-  <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
-  <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
-  <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
-  <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="UO2 (2.4%)">
-    <density units="g/cm3" value="10.29769" />
-    <nuclide ao="4.4843e-06" name="U234" />
-    <nuclide ao="0.00055815" name="U235" />
-    <nuclide ao="0.022408" name="U238" />
-    <nuclide ao="0.045829" name="O16" />
-  </material>
-  <material id="2" name="Zircaloy">
-    <density units="g/cm3" value="6.55" />
-    <nuclide ao="0.021827" name="Zr90" />
-    <nuclide ao="0.00476" name="Zr91" />
-    <nuclide ao="0.0072758" name="Zr92" />
-    <nuclide ao="0.0073734" name="Zr94" />
-    <nuclide ao="0.0011879" name="Zr96" />
-  </material>
-  <material id="3" name="Hot borated water">
-    <density units="g/cm3" value="0.740582" />
-    <nuclide ao="0.049457" name="H1" />
-    <nuclide ao="0.024672" name="O16" />
-    <nuclide ao="8.0042e-06" name="B10" />
-    <nuclide ao="3.2218e-05" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="fission">
-      <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="material">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="energy">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="7" type="energyout">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="11" type="legendre">
-    <order>3</order>
-  </filter>
-  <filter id="15" type="material">
-    <bins>2</bins>
-  </filter>
-  <filter id="29" type="material">
-    <bins>3</bins>
-  </filter>
-  <tally id="1">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="2">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="3">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="4">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="5">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="6">
-    <filters>1 2 7</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="7">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="8">
-    <filters>1 2 7 11</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="9">
-    <filters>1 2 7</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="10">
-    <filters>1 2 7</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="11">
-    <filters>15 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="12">
-    <filters>15 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="13">
-    <filters>15 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="14">
-    <filters>15 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="15">
-    <filters>15 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="16">
-    <filters>15 2 7</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="17">
-    <filters>15 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="18">
-    <filters>15 2 7 11</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="19">
-    <filters>15 2 7</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="20">
-    <filters>15 2 7</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="21">
-    <filters>29 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="22">
-    <filters>29 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="23">
-    <filters>29 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="24">
-    <filters>29 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="25">
-    <filters>29 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="26">
-    <filters>29 2 7</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="27">
-    <filters>29 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="28">
-    <filters>29 2 7 11</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="29">
-    <filters>29 2 7</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="30">
-    <filters>29 2 7</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UO2 (2.4%)">
+      <density units="g/cm3" value="10.29769" />
+      <nuclide ao="4.4843e-06" name="U234" />
+      <nuclide ao="0.00055815" name="U235" />
+      <nuclide ao="0.022408" name="U238" />
+      <nuclide ao="0.045829" name="O16" />
+    </material>
+    <material id="2" name="Zircaloy">
+      <density units="g/cm3" value="6.55" />
+      <nuclide ao="0.021827" name="Zr90" />
+      <nuclide ao="0.00476" name="Zr91" />
+      <nuclide ao="0.0072758" name="Zr92" />
+      <nuclide ao="0.0073734" name="Zr94" />
+      <nuclide ao="0.0011879" name="Zr96" />
+    </material>
+    <material id="3" name="Hot borated water">
+      <density units="g/cm3" value="0.740582" />
+      <nuclide ao="0.049457" name="H1" />
+      <nuclide ao="0.024672" name="O16" />
+      <nuclide ao="8.0042e-06" name="B10" />
+      <nuclide ao="3.2218e-05" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="fission">
+        <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <filter id="1" type="material">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="energy">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="7" type="energyout">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="11" type="legendre">
+      <order>3</order>
+    </filter>
+    <filter id="15" type="material">
+      <bins>2</bins>
+    </filter>
+    <filter id="29" type="material">
+      <bins>3</bins>
+    </filter>
+    <tally id="1">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="2">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="3">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="4">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="5">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="6">
+      <filters>1 2 7</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="7">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="8">
+      <filters>1 2 7 11</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="9">
+      <filters>1 2 7</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="10">
+      <filters>1 2 7</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="11">
+      <filters>15 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="12">
+      <filters>15 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="13">
+      <filters>15 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="14">
+      <filters>15 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="15">
+      <filters>15 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="16">
+      <filters>15 2 7</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="17">
+      <filters>15 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="18">
+      <filters>15 2 7 11</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="19">
+      <filters>15 2 7</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="20">
+      <filters>15 2 7</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="21">
+      <filters>29 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="22">
+      <filters>29 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="23">
+      <filters>29 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="24">
+      <filters>29 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="25">
+      <filters>29 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="26">
+      <filters>29 2 7</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="27">
+      <filters>29 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="28">
+      <filters>29 2 7 11</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="29">
+      <filters>29 2 7</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="30">
+      <filters>29 2 7</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/test.py b/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/test.py
index b624140d4..ee0cdf0d9 100644
--- a/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/test.py
+++ b/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/test.py
@@ -48,15 +48,12 @@ class MGXSTestHarness(PyAPITestHarness):
         # Modify materials and settings so we can run in MG mode
         self._model.materials.cross_sections = './mgxs.h5'
         self._model.settings.energy_mode = 'multi-group'
+        # Dont need tallies so clear them from the model
+        self._model.tallies = openmc.Tallies()
 
         # Write modified input files
-        self._model.settings.export_to_xml()
-        self._model.geometry.export_to_xml()
-        self._model.materials.export_to_xml()
+        self._model.export_to_model_xml()
         self._model.mgxs_file.export_to_hdf5()
-        # Dont need tallies.xml, so remove the file
-        if os.path.exists('tallies.xml'):
-            os.remove('tallies.xml')
 
         # Enforce closing statepoint and summary files so HDF5
         # does not throw an error during the next OpenMC execution
diff --git a/tests/regression_tests/mgxs_library_condense/inputs_true.dat b/tests/regression_tests/mgxs_library_condense/inputs_true.dat
index cac18ffcd..c8f140f80 100644
--- a/tests/regression_tests/mgxs_library_condense/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_condense/inputs_true.dat
@@ -1,532 +1,531 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
-  <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
-  <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
-  <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-  <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
-  <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
-  <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
-  <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="UO2 (2.4%)">
-    <density units="g/cm3" value="10.29769" />
-    <nuclide ao="4.4843e-06" name="U234" />
-    <nuclide ao="0.00055815" name="U235" />
-    <nuclide ao="0.022408" name="U238" />
-    <nuclide ao="0.045829" name="O16" />
-  </material>
-  <material id="2" name="Zircaloy">
-    <density units="g/cm3" value="6.55" />
-    <nuclide ao="0.021827" name="Zr90" />
-    <nuclide ao="0.00476" name="Zr91" />
-    <nuclide ao="0.0072758" name="Zr92" />
-    <nuclide ao="0.0073734" name="Zr94" />
-    <nuclide ao="0.0011879" name="Zr96" />
-  </material>
-  <material id="3" name="Hot borated water">
-    <density units="g/cm3" value="0.740582" />
-    <nuclide ao="0.049457" name="H1" />
-    <nuclide ao="0.024672" name="O16" />
-    <nuclide ao="8.0042e-06" name="B10" />
-    <nuclide ao="3.2218e-05" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="fission">
-      <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>2 2</dimension>
-    <lower_left>-100.0 -100.0</lower_left>
-    <width>100.0 100.0</width>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="energy">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="5" type="energyout">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="6" type="legendre">
-    <order>1</order>
-  </filter>
-  <filter id="30" type="legendre">
-    <order>3</order>
-  </filter>
-  <filter id="54" type="energy">
-    <bins>0.0 20000000.0</bins>
-  </filter>
-  <filter id="68" type="meshsurface">
-    <bins>1</bins>
-  </filter>
-  <filter id="79" type="delayedgroup">
-    <bins>1 2 3 4 5 6</bins>
-  </filter>
-  <tally id="1">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="2">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="3">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="4">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="5">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="6">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="7">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="8">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="9">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="10">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="11">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="12">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="13">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="14">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="15">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="16">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,3n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="17">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,4n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="18">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="19">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="20">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="21">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="22">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="23">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="24">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="25">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="26">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>kappa-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="27">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="28">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="29">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="30">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="31">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="32">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="33">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="34">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="35">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="36">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="37">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="38">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="39">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="40">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="41">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="42">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="43">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="44">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="45">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="46">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="47">
-    <filters>1 54</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="48">
-    <filters>1 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="49">
-    <filters>1 54</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="50">
-    <filters>1 5</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="51">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="52">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>inverse-velocity</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="53">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="54">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="55">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="56">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="57">
-    <filters>68 2</filters>
-    <nuclides>total</nuclides>
-    <scores>current</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="58">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="59">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="60">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="61">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="62">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="63">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="64">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="65">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="66">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="67">
-    <filters>1 79 2</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="68">
-    <filters>1 79 54</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="69">
-    <filters>1 79 5</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="70">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="71">
-    <filters>1 79 2</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="72">
-    <filters>1 79</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="73">
-    <filters>1 79</filters>
-    <nuclides>total</nuclides>
-    <scores>decay-rate</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="74">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="75">
-    <filters>1 79 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UO2 (2.4%)">
+      <density units="g/cm3" value="10.29769" />
+      <nuclide ao="4.4843e-06" name="U234" />
+      <nuclide ao="0.00055815" name="U235" />
+      <nuclide ao="0.022408" name="U238" />
+      <nuclide ao="0.045829" name="O16" />
+    </material>
+    <material id="2" name="Zircaloy">
+      <density units="g/cm3" value="6.55" />
+      <nuclide ao="0.021827" name="Zr90" />
+      <nuclide ao="0.00476" name="Zr91" />
+      <nuclide ao="0.0072758" name="Zr92" />
+      <nuclide ao="0.0073734" name="Zr94" />
+      <nuclide ao="0.0011879" name="Zr96" />
+    </material>
+    <material id="3" name="Hot borated water">
+      <density units="g/cm3" value="0.740582" />
+      <nuclide ao="0.049457" name="H1" />
+      <nuclide ao="0.024672" name="O16" />
+      <nuclide ao="8.0042e-06" name="B10" />
+      <nuclide ao="3.2218e-05" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="fission">
+        <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>2 2</dimension>
+      <lower_left>-100.0 -100.0</lower_left>
+      <width>100.0 100.0</width>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="energy">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="5" type="energyout">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="6" type="legendre">
+      <order>1</order>
+    </filter>
+    <filter id="30" type="legendre">
+      <order>3</order>
+    </filter>
+    <filter id="54" type="energy">
+      <bins>0.0 20000000.0</bins>
+    </filter>
+    <filter id="68" type="meshsurface">
+      <bins>1</bins>
+    </filter>
+    <filter id="79" type="delayedgroup">
+      <bins>1 2 3 4 5 6</bins>
+    </filter>
+    <tally id="1">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="2">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="3">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="4">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="5">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="6">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="7">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="8">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="9">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="10">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="11">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="12">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="13">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="14">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="15">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="16">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,3n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="17">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,4n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="18">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="19">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="20">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="21">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="22">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="23">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="24">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="25">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="26">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>kappa-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="27">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="28">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="29">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="30">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="31">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="32">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="33">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="34">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="35">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="36">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="37">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="38">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="39">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="40">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="41">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="42">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="43">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="44">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="45">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="46">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="47">
+      <filters>1 54</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="48">
+      <filters>1 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="49">
+      <filters>1 54</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="50">
+      <filters>1 5</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="51">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="52">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>inverse-velocity</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="53">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="54">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="55">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="56">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="57">
+      <filters>68 2</filters>
+      <nuclides>total</nuclides>
+      <scores>current</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="58">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="59">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="60">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="61">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="62">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="63">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="64">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="65">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="66">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="67">
+      <filters>1 79 2</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="68">
+      <filters>1 79 54</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="69">
+      <filters>1 79 5</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="70">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="71">
+      <filters>1 79 2</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="72">
+      <filters>1 79</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="73">
+      <filters>1 79</filters>
+      <nuclides>total</nuclides>
+      <scores>decay-rate</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="74">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="75">
+      <filters>1 79 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/mgxs_library_correction/inputs_true.dat b/tests/regression_tests/mgxs_library_correction/inputs_true.dat
index 8c1cd4d16..a1cc111de 100644
--- a/tests/regression_tests/mgxs_library_correction/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_correction/inputs_true.dat
@@ -1,344 +1,343 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
-  <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
-  <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
-  <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-  <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
-  <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
-  <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
-  <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="UO2 (2.4%)">
-    <density units="g/cm3" value="10.29769" />
-    <nuclide ao="4.4843e-06" name="U234" />
-    <nuclide ao="0.00055815" name="U235" />
-    <nuclide ao="0.022408" name="U238" />
-    <nuclide ao="0.045829" name="O16" />
-  </material>
-  <material id="2" name="Zircaloy">
-    <density units="g/cm3" value="6.55" />
-    <nuclide ao="0.021827" name="Zr90" />
-    <nuclide ao="0.00476" name="Zr91" />
-    <nuclide ao="0.0072758" name="Zr92" />
-    <nuclide ao="0.0073734" name="Zr94" />
-    <nuclide ao="0.0011879" name="Zr96" />
-  </material>
-  <material id="3" name="Hot borated water">
-    <density units="g/cm3" value="0.740582" />
-    <nuclide ao="0.049457" name="H1" />
-    <nuclide ao="0.024672" name="O16" />
-    <nuclide ao="8.0042e-06" name="B10" />
-    <nuclide ao="3.2218e-05" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="fission">
-      <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="material">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="energy">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="3" type="energyout">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="4" type="legendre">
-    <order>1</order>
-  </filter>
-  <filter id="12" type="legendre">
-    <order>0</order>
-  </filter>
-  <filter id="19" type="material">
-    <bins>2</bins>
-  </filter>
-  <filter id="37" type="material">
-    <bins>3</bins>
-  </filter>
-  <tally id="1">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="2">
-    <filters>1 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="3">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="4">
-    <filters>1 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="5">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="6">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="7">
-    <filters>1 2 3 12</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="8">
-    <filters>1 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="9">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="10">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="11">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="12">
-    <filters>1 2 3 12</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="13">
-    <filters>1 2 3</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="14">
-    <filters>1 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="15">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="16">
-    <filters>19 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="17">
-    <filters>19 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="18">
-    <filters>19 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="19">
-    <filters>19 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="20">
-    <filters>19 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="21">
-    <filters>19 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="22">
-    <filters>19 2 3 12</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="23">
-    <filters>19 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="24">
-    <filters>19 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="25">
-    <filters>19 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="26">
-    <filters>19 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="27">
-    <filters>19 2 3 12</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="28">
-    <filters>19 2 3</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="29">
-    <filters>19 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="30">
-    <filters>19 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="31">
-    <filters>37 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="32">
-    <filters>37 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="33">
-    <filters>37 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="34">
-    <filters>37 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="35">
-    <filters>37 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="36">
-    <filters>37 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="37">
-    <filters>37 2 3 12</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="38">
-    <filters>37 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="39">
-    <filters>37 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="40">
-    <filters>37 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="41">
-    <filters>37 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="42">
-    <filters>37 2 3 12</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="43">
-    <filters>37 2 3</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="44">
-    <filters>37 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="45">
-    <filters>37 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UO2 (2.4%)">
+      <density units="g/cm3" value="10.29769" />
+      <nuclide ao="4.4843e-06" name="U234" />
+      <nuclide ao="0.00055815" name="U235" />
+      <nuclide ao="0.022408" name="U238" />
+      <nuclide ao="0.045829" name="O16" />
+    </material>
+    <material id="2" name="Zircaloy">
+      <density units="g/cm3" value="6.55" />
+      <nuclide ao="0.021827" name="Zr90" />
+      <nuclide ao="0.00476" name="Zr91" />
+      <nuclide ao="0.0072758" name="Zr92" />
+      <nuclide ao="0.0073734" name="Zr94" />
+      <nuclide ao="0.0011879" name="Zr96" />
+    </material>
+    <material id="3" name="Hot borated water">
+      <density units="g/cm3" value="0.740582" />
+      <nuclide ao="0.049457" name="H1" />
+      <nuclide ao="0.024672" name="O16" />
+      <nuclide ao="8.0042e-06" name="B10" />
+      <nuclide ao="3.2218e-05" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="fission">
+        <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <filter id="1" type="material">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="energy">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="3" type="energyout">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="4" type="legendre">
+      <order>1</order>
+    </filter>
+    <filter id="12" type="legendre">
+      <order>0</order>
+    </filter>
+    <filter id="19" type="material">
+      <bins>2</bins>
+    </filter>
+    <filter id="37" type="material">
+      <bins>3</bins>
+    </filter>
+    <tally id="1">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="2">
+      <filters>1 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="3">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="4">
+      <filters>1 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="5">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="6">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="7">
+      <filters>1 2 3 12</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="8">
+      <filters>1 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="9">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="10">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="11">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="12">
+      <filters>1 2 3 12</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="13">
+      <filters>1 2 3</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="14">
+      <filters>1 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="15">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="16">
+      <filters>19 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="17">
+      <filters>19 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="18">
+      <filters>19 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="19">
+      <filters>19 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="20">
+      <filters>19 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="21">
+      <filters>19 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="22">
+      <filters>19 2 3 12</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="23">
+      <filters>19 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="24">
+      <filters>19 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="25">
+      <filters>19 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="26">
+      <filters>19 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="27">
+      <filters>19 2 3 12</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="28">
+      <filters>19 2 3</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="29">
+      <filters>19 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="30">
+      <filters>19 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="31">
+      <filters>37 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="32">
+      <filters>37 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="33">
+      <filters>37 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="34">
+      <filters>37 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="35">
+      <filters>37 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="36">
+      <filters>37 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="37">
+      <filters>37 2 3 12</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="38">
+      <filters>37 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="39">
+      <filters>37 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="40">
+      <filters>37 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="41">
+      <filters>37 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="42">
+      <filters>37 2 3 12</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="43">
+      <filters>37 2 3</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="44">
+      <filters>37 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="45">
+      <filters>37 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat b/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat
index bd6abbb7c..895389fb9 100644
--- a/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat
@@ -1,17 +1,43 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="fuel" region="-1" universe="1" />
-  <cell id="2" material="2" name="clad" region="1 -2" universe="1" />
-  <cell id="3" material="3" name="hot water" region="2" universe="1" />
-  <cell id="4" material="3" name="guide tube inner water" region="-1" universe="2" />
-  <cell id="5" material="2" name="guide tube clad" region="1 -2" universe="2" />
-  <cell id="6" material="3" name="guide tube outer water" region="2" universe="2" />
-  <cell fill="3" id="7" name="root cell" region="3 -4 5 -6" universe="4" />
-  <lattice id="3" name="Fuel Assembly">
-    <pitch>1.26 1.26</pitch>
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <universes>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="Fuel">
+      <density units="g/cm3" value="10.29769" />
+      <nuclide ao="4.4843e-06" name="U234" />
+      <nuclide ao="0.00055815" name="U235" />
+      <nuclide ao="0.022408" name="U238" />
+      <nuclide ao="0.045829" name="O16" />
+    </material>
+    <material id="2" name="Cladding">
+      <density units="g/cm3" value="6.55" />
+      <nuclide ao="0.021827" name="Zr90" />
+      <nuclide ao="0.00476" name="Zr91" />
+      <nuclide ao="0.0072758" name="Zr92" />
+      <nuclide ao="0.0073734" name="Zr94" />
+      <nuclide ao="0.0011879" name="Zr96" />
+    </material>
+    <material id="3" name="Hot borated water">
+      <density units="g/cm3" value="0.740582" />
+      <nuclide ao="0.049457" name="H1" />
+      <nuclide ao="0.024672" name="O16" />
+      <nuclide ao="8.0042e-06" name="B10" />
+      <nuclide ao="3.2218e-05" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="fuel" region="-1" universe="1" />
+    <cell id="2" material="2" name="clad" region="1 -2" universe="1" />
+    <cell id="3" material="3" name="hot water" region="2" universe="1" />
+    <cell id="4" material="3" name="guide tube inner water" region="-1" universe="2" />
+    <cell id="5" material="2" name="guide tube clad" region="1 -2" universe="2" />
+    <cell id="6" material="3" name="guide tube outer water" region="2" universe="2" />
+    <cell fill="3" id="7" name="root cell" region="3 -4 5 -6" universe="4" />
+    <lattice id="3" name="Fuel Assembly">
+      <pitch>1.26 1.26</pitch>
+      <dimension>17 17</dimension>
+      <lower_left>-10.71 -10.71</lower_left>
+      <universes>
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 
@@ -29,514 +55,487 @@
 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 </universes>
-  </lattice>
-  <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-  <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="-10.71" id="3" type="x-plane" />
-  <surface boundary="reflective" coeffs="10.71" id="4" type="x-plane" />
-  <surface boundary="reflective" coeffs="-10.71" id="5" type="y-plane" />
-  <surface boundary="reflective" coeffs="10.71" id="6" type="y-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="Fuel">
-    <density units="g/cm3" value="10.29769" />
-    <nuclide ao="4.4843e-06" name="U234" />
-    <nuclide ao="0.00055815" name="U235" />
-    <nuclide ao="0.022408" name="U238" />
-    <nuclide ao="0.045829" name="O16" />
-  </material>
-  <material id="2" name="Cladding">
-    <density units="g/cm3" value="6.55" />
-    <nuclide ao="0.021827" name="Zr90" />
-    <nuclide ao="0.00476" name="Zr91" />
-    <nuclide ao="0.0072758" name="Zr92" />
-    <nuclide ao="0.0073734" name="Zr94" />
-    <nuclide ao="0.0011879" name="Zr96" />
-  </material>
-  <material id="3" name="Hot borated water">
-    <density units="g/cm3" value="0.740582" />
-    <nuclide ao="0.049457" name="H1" />
-    <nuclide ao="0.024672" name="O16" />
-    <nuclide ao="8.0042e-06" name="B10" />
-    <nuclide ao="3.2218e-05" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="fission">
-      <parameters>-10.71 -10.71 -1 10.71 10.71 1</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="distribcell">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="energy">
-    <bins>0.0 20000000.0</bins>
-  </filter>
-  <filter id="5" type="energyout">
-    <bins>0.0 20000000.0</bins>
-  </filter>
-  <filter id="6" type="legendre">
-    <order>1</order>
-  </filter>
-  <filter id="30" type="legendre">
-    <order>3</order>
-  </filter>
-  <filter id="75" type="delayedgroup">
-    <bins>1 2 3 4 5 6</bins>
-  </filter>
-  <tally id="1">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="2">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="3">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="4">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="5">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="6">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="7">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="8">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="9">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="10">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="11">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="12">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="13">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="14">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="15">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="16">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,3n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="17">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,4n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="18">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="19">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="20">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="21">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="22">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="23">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="24">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="25">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="26">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>kappa-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="27">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="28">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="29">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="30">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="31">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="32">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="33">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="34">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="35">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="36">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="37">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="38">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="39">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="40">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="41">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="42">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="43">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="44">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="45">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="46">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="47">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="48">
-    <filters>1 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="49">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="50">
-    <filters>1 5</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="51">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="52">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>inverse-velocity</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="53">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="54">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="55">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="56">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="57">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="58">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="59">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="60">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="61">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="62">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="63">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="64">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="65">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="66">
-    <filters>1 75 2</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="67">
-    <filters>1 75 2</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="68">
-    <filters>1 75 5</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="69">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="70">
-    <filters>1 75 2</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="71">
-    <filters>1 75</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="72">
-    <filters>1 75</filters>
-    <nuclides>total</nuclides>
-    <scores>decay-rate</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="73">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="74">
-    <filters>1 75 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-</tallies>
+    </lattice>
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-10.71" id="3" type="x-plane" />
+    <surface boundary="reflective" coeffs="10.71" id="4" type="x-plane" />
+    <surface boundary="reflective" coeffs="-10.71" id="5" type="y-plane" />
+    <surface boundary="reflective" coeffs="10.71" id="6" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="fission">
+        <parameters>-10.71 -10.71 -1 10.71 10.71 1</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <filter id="1" type="distribcell">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="energy">
+      <bins>0.0 20000000.0</bins>
+    </filter>
+    <filter id="5" type="energyout">
+      <bins>0.0 20000000.0</bins>
+    </filter>
+    <filter id="6" type="legendre">
+      <order>1</order>
+    </filter>
+    <filter id="30" type="legendre">
+      <order>3</order>
+    </filter>
+    <filter id="75" type="delayedgroup">
+      <bins>1 2 3 4 5 6</bins>
+    </filter>
+    <tally id="1">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="2">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="3">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="4">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="5">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="6">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="7">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="8">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="9">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="10">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="11">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="12">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="13">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="14">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="15">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="16">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,3n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="17">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,4n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="18">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="19">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="20">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="21">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="22">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="23">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="24">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="25">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="26">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>kappa-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="27">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="28">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="29">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="30">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="31">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="32">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="33">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="34">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="35">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="36">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="37">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="38">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="39">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="40">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="41">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="42">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="43">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="44">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="45">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="46">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="47">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="48">
+      <filters>1 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="49">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="50">
+      <filters>1 5</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="51">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="52">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>inverse-velocity</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="53">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="54">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="55">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="56">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="57">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="58">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="59">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="60">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="61">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="62">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="63">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="64">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="65">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="66">
+      <filters>1 75 2</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="67">
+      <filters>1 75 2</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="68">
+      <filters>1 75 5</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="69">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="70">
+      <filters>1 75 2</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="71">
+      <filters>1 75</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="72">
+      <filters>1 75</filters>
+      <nuclides>total</nuclides>
+      <scores>decay-rate</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="73">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="74">
+      <filters>1 75 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat b/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat
index cac18ffcd..c8f140f80 100644
--- a/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat
@@ -1,532 +1,531 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
-  <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
-  <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
-  <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-  <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
-  <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
-  <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
-  <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="UO2 (2.4%)">
-    <density units="g/cm3" value="10.29769" />
-    <nuclide ao="4.4843e-06" name="U234" />
-    <nuclide ao="0.00055815" name="U235" />
-    <nuclide ao="0.022408" name="U238" />
-    <nuclide ao="0.045829" name="O16" />
-  </material>
-  <material id="2" name="Zircaloy">
-    <density units="g/cm3" value="6.55" />
-    <nuclide ao="0.021827" name="Zr90" />
-    <nuclide ao="0.00476" name="Zr91" />
-    <nuclide ao="0.0072758" name="Zr92" />
-    <nuclide ao="0.0073734" name="Zr94" />
-    <nuclide ao="0.0011879" name="Zr96" />
-  </material>
-  <material id="3" name="Hot borated water">
-    <density units="g/cm3" value="0.740582" />
-    <nuclide ao="0.049457" name="H1" />
-    <nuclide ao="0.024672" name="O16" />
-    <nuclide ao="8.0042e-06" name="B10" />
-    <nuclide ao="3.2218e-05" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="fission">
-      <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>2 2</dimension>
-    <lower_left>-100.0 -100.0</lower_left>
-    <width>100.0 100.0</width>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="energy">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="5" type="energyout">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="6" type="legendre">
-    <order>1</order>
-  </filter>
-  <filter id="30" type="legendre">
-    <order>3</order>
-  </filter>
-  <filter id="54" type="energy">
-    <bins>0.0 20000000.0</bins>
-  </filter>
-  <filter id="68" type="meshsurface">
-    <bins>1</bins>
-  </filter>
-  <filter id="79" type="delayedgroup">
-    <bins>1 2 3 4 5 6</bins>
-  </filter>
-  <tally id="1">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="2">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="3">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="4">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="5">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="6">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="7">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="8">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="9">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="10">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="11">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="12">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="13">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="14">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="15">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="16">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,3n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="17">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,4n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="18">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="19">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="20">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="21">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="22">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="23">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="24">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="25">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="26">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>kappa-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="27">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="28">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="29">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="30">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="31">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="32">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="33">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="34">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="35">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="36">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="37">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="38">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="39">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="40">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="41">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="42">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="43">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="44">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="45">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="46">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="47">
-    <filters>1 54</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="48">
-    <filters>1 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="49">
-    <filters>1 54</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="50">
-    <filters>1 5</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="51">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="52">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>inverse-velocity</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="53">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="54">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="55">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="56">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="57">
-    <filters>68 2</filters>
-    <nuclides>total</nuclides>
-    <scores>current</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="58">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="59">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="60">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="61">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="62">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="63">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="64">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="65">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="66">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="67">
-    <filters>1 79 2</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="68">
-    <filters>1 79 54</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="69">
-    <filters>1 79 5</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="70">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="71">
-    <filters>1 79 2</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="72">
-    <filters>1 79</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="73">
-    <filters>1 79</filters>
-    <nuclides>total</nuclides>
-    <scores>decay-rate</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="74">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="75">
-    <filters>1 79 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UO2 (2.4%)">
+      <density units="g/cm3" value="10.29769" />
+      <nuclide ao="4.4843e-06" name="U234" />
+      <nuclide ao="0.00055815" name="U235" />
+      <nuclide ao="0.022408" name="U238" />
+      <nuclide ao="0.045829" name="O16" />
+    </material>
+    <material id="2" name="Zircaloy">
+      <density units="g/cm3" value="6.55" />
+      <nuclide ao="0.021827" name="Zr90" />
+      <nuclide ao="0.00476" name="Zr91" />
+      <nuclide ao="0.0072758" name="Zr92" />
+      <nuclide ao="0.0073734" name="Zr94" />
+      <nuclide ao="0.0011879" name="Zr96" />
+    </material>
+    <material id="3" name="Hot borated water">
+      <density units="g/cm3" value="0.740582" />
+      <nuclide ao="0.049457" name="H1" />
+      <nuclide ao="0.024672" name="O16" />
+      <nuclide ao="8.0042e-06" name="B10" />
+      <nuclide ao="3.2218e-05" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="fission">
+        <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>2 2</dimension>
+      <lower_left>-100.0 -100.0</lower_left>
+      <width>100.0 100.0</width>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="energy">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="5" type="energyout">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="6" type="legendre">
+      <order>1</order>
+    </filter>
+    <filter id="30" type="legendre">
+      <order>3</order>
+    </filter>
+    <filter id="54" type="energy">
+      <bins>0.0 20000000.0</bins>
+    </filter>
+    <filter id="68" type="meshsurface">
+      <bins>1</bins>
+    </filter>
+    <filter id="79" type="delayedgroup">
+      <bins>1 2 3 4 5 6</bins>
+    </filter>
+    <tally id="1">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="2">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="3">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="4">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="5">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="6">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="7">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="8">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="9">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="10">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="11">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="12">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="13">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="14">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="15">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="16">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,3n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="17">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,4n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="18">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="19">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="20">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="21">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="22">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="23">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="24">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="25">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="26">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>kappa-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="27">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="28">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="29">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="30">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="31">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="32">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="33">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="34">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="35">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="36">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="37">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="38">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="39">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="40">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="41">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="42">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="43">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="44">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="45">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="46">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="47">
+      <filters>1 54</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="48">
+      <filters>1 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="49">
+      <filters>1 54</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="50">
+      <filters>1 5</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="51">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="52">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>inverse-velocity</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="53">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="54">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="55">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="56">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="57">
+      <filters>68 2</filters>
+      <nuclides>total</nuclides>
+      <scores>current</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="58">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="59">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="60">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="61">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="62">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="63">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="64">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="65">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="66">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="67">
+      <filters>1 79 2</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="68">
+      <filters>1 79 54</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="69">
+      <filters>1 79 5</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="70">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="71">
+      <filters>1 79 2</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="72">
+      <filters>1 79</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="73">
+      <filters>1 79</filters>
+      <nuclides>total</nuclides>
+      <scores>decay-rate</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="74">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="75">
+      <filters>1 79 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/mgxs_library_histogram/inputs_true.dat b/tests/regression_tests/mgxs_library_histogram/inputs_true.dat
index d1bd197a7..0ea55bb04 100644
--- a/tests/regression_tests/mgxs_library_histogram/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_histogram/inputs_true.dat
@@ -1,269 +1,268 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
-  <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
-  <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
-  <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-  <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
-  <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
-  <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
-  <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="UO2 (2.4%)">
-    <density units="g/cm3" value="10.29769" />
-    <nuclide ao="4.4843e-06" name="U234" />
-    <nuclide ao="0.00055815" name="U235" />
-    <nuclide ao="0.022408" name="U238" />
-    <nuclide ao="0.045829" name="O16" />
-  </material>
-  <material id="2" name="Zircaloy">
-    <density units="g/cm3" value="6.55" />
-    <nuclide ao="0.021827" name="Zr90" />
-    <nuclide ao="0.00476" name="Zr91" />
-    <nuclide ao="0.0072758" name="Zr92" />
-    <nuclide ao="0.0073734" name="Zr94" />
-    <nuclide ao="0.0011879" name="Zr96" />
-  </material>
-  <material id="3" name="Hot borated water">
-    <density units="g/cm3" value="0.740582" />
-    <nuclide ao="0.049457" name="H1" />
-    <nuclide ao="0.024672" name="O16" />
-    <nuclide ao="8.0042e-06" name="B10" />
-    <nuclide ao="3.2218e-05" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="fission">
-      <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="material">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="energy">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="3" type="energyout">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="4" type="mu">
-    <bins>-1.0 -0.8181818181818181 -0.6363636363636364 -0.4545454545454546 -0.2727272727272727 -0.09090909090909083 0.09090909090909083 0.2727272727272727 0.4545454545454546 0.6363636363636365 0.8181818181818183 1.0</bins>
-  </filter>
-  <filter id="17" type="material">
-    <bins>2</bins>
-  </filter>
-  <filter id="33" type="material">
-    <bins>3</bins>
-  </filter>
-  <tally id="1">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="2">
-    <filters>1 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="3">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="4">
-    <filters>1 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="5">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="6">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="7">
-    <filters>1 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="8">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="9">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="10">
-    <filters>1 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="11">
-    <filters>1 2 3</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="12">
-    <filters>17 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="13">
-    <filters>17 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="14">
-    <filters>17 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="15">
-    <filters>17 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="16">
-    <filters>17 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="17">
-    <filters>17 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="18">
-    <filters>17 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="19">
-    <filters>17 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="20">
-    <filters>17 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="21">
-    <filters>17 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="22">
-    <filters>17 2 3</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="23">
-    <filters>33 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="24">
-    <filters>33 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="25">
-    <filters>33 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="26">
-    <filters>33 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="27">
-    <filters>33 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="28">
-    <filters>33 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="29">
-    <filters>33 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="30">
-    <filters>33 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="31">
-    <filters>33 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="32">
-    <filters>33 2 3 4</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="33">
-    <filters>33 2 3</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UO2 (2.4%)">
+      <density units="g/cm3" value="10.29769" />
+      <nuclide ao="4.4843e-06" name="U234" />
+      <nuclide ao="0.00055815" name="U235" />
+      <nuclide ao="0.022408" name="U238" />
+      <nuclide ao="0.045829" name="O16" />
+    </material>
+    <material id="2" name="Zircaloy">
+      <density units="g/cm3" value="6.55" />
+      <nuclide ao="0.021827" name="Zr90" />
+      <nuclide ao="0.00476" name="Zr91" />
+      <nuclide ao="0.0072758" name="Zr92" />
+      <nuclide ao="0.0073734" name="Zr94" />
+      <nuclide ao="0.0011879" name="Zr96" />
+    </material>
+    <material id="3" name="Hot borated water">
+      <density units="g/cm3" value="0.740582" />
+      <nuclide ao="0.049457" name="H1" />
+      <nuclide ao="0.024672" name="O16" />
+      <nuclide ao="8.0042e-06" name="B10" />
+      <nuclide ao="3.2218e-05" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="fission">
+        <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <filter id="1" type="material">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="energy">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="3" type="energyout">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="4" type="mu">
+      <bins>-1.0 -0.8181818181818181 -0.6363636363636364 -0.4545454545454546 -0.2727272727272727 -0.09090909090909083 0.09090909090909083 0.2727272727272727 0.4545454545454546 0.6363636363636365 0.8181818181818183 1.0</bins>
+    </filter>
+    <filter id="17" type="material">
+      <bins>2</bins>
+    </filter>
+    <filter id="33" type="material">
+      <bins>3</bins>
+    </filter>
+    <tally id="1">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="2">
+      <filters>1 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="3">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="4">
+      <filters>1 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="5">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="6">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="7">
+      <filters>1 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="8">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="9">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="10">
+      <filters>1 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="11">
+      <filters>1 2 3</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="12">
+      <filters>17 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="13">
+      <filters>17 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="14">
+      <filters>17 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="15">
+      <filters>17 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="16">
+      <filters>17 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="17">
+      <filters>17 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="18">
+      <filters>17 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="19">
+      <filters>17 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="20">
+      <filters>17 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="21">
+      <filters>17 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="22">
+      <filters>17 2 3</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="23">
+      <filters>33 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="24">
+      <filters>33 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="25">
+      <filters>33 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="26">
+      <filters>33 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="27">
+      <filters>33 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="28">
+      <filters>33 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="29">
+      <filters>33 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="30">
+      <filters>33 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="31">
+      <filters>33 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="32">
+      <filters>33 2 3 4</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="33">
+      <filters>33 2 3</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/mgxs_library_mesh/inputs_true.dat b/tests/regression_tests/mgxs_library_mesh/inputs_true.dat
index ac2ff0c81..b18e9773b 100644
--- a/tests/regression_tests/mgxs_library_mesh/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_mesh/inputs_true.dat
@@ -1,512 +1,511 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1" />
-  <cell id="2" material="2" region="~(1 -2 3 -4) (5 -6 7 -8) 10 -9" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane" />
-  <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane" />
-  <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane" />
-  <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cm3" value="10.0" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2">
-    <density units="g/cm3" value="1.0" />
-    <nuclide ao="1.0" name="Zr90" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>5</batches>
-  <inactive>0</inactive>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>2 2</dimension>
-    <lower_left>-100.0 -100.0</lower_left>
-    <width>100.0 100.0</width>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="energy">
-    <bins>0.0 20000000.0</bins>
-  </filter>
-  <filter id="5" type="energyout">
-    <bins>0.0 20000000.0</bins>
-  </filter>
-  <filter id="6" type="legendre">
-    <order>1</order>
-  </filter>
-  <filter id="30" type="legendre">
-    <order>3</order>
-  </filter>
-  <filter id="68" type="meshsurface">
-    <bins>1</bins>
-  </filter>
-  <filter id="79" type="delayedgroup">
-    <bins>1 2 3 4 5 6</bins>
-  </filter>
-  <tally id="1">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="2">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="3">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="4">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="5">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="6">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="7">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="8">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="9">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="10">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="11">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="12">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="13">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="14">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="15">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="16">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,3n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="17">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,4n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="18">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="19">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="20">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="21">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="22">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="23">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="24">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="25">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="26">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>kappa-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="27">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="28">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="29">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="30">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="31">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="32">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="33">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="34">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="35">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="36">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="37">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="38">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="39">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="40">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="41">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="42">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="43">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="44">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="45">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="46">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="47">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="48">
-    <filters>1 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="49">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="50">
-    <filters>1 5</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="51">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="52">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>inverse-velocity</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="53">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="54">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="55">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="56">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="57">
-    <filters>68 2</filters>
-    <nuclides>total</nuclides>
-    <scores>current</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="58">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="59">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="60">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="61">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="62">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="63">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="64">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="65">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="66">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="67">
-    <filters>1 79 2</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="68">
-    <filters>1 79 2</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="69">
-    <filters>1 79 5</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="70">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="71">
-    <filters>1 79 2</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="72">
-    <filters>1 79</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="73">
-    <filters>1 79</filters>
-    <nuclides>total</nuclides>
-    <scores>decay-rate</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="74">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="75">
-    <filters>1 79 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cm3" value="10.0" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2">
+      <density units="g/cm3" value="1.0" />
+      <nuclide ao="1.0" name="Zr90" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1" />
+    <cell id="2" material="2" region="~(1 -2 3 -4) (5 -6 7 -8) 10 -9" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane" />
+    <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>2 2</dimension>
+      <lower_left>-100.0 -100.0</lower_left>
+      <width>100.0 100.0</width>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="energy">
+      <bins>0.0 20000000.0</bins>
+    </filter>
+    <filter id="5" type="energyout">
+      <bins>0.0 20000000.0</bins>
+    </filter>
+    <filter id="6" type="legendre">
+      <order>1</order>
+    </filter>
+    <filter id="30" type="legendre">
+      <order>3</order>
+    </filter>
+    <filter id="68" type="meshsurface">
+      <bins>1</bins>
+    </filter>
+    <filter id="79" type="delayedgroup">
+      <bins>1 2 3 4 5 6</bins>
+    </filter>
+    <tally id="1">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="2">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="3">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="4">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="5">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="6">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="7">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="8">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="9">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="10">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="11">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="12">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="13">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="14">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="15">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="16">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,3n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="17">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,4n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="18">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="19">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="20">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="21">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="22">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="23">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="24">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="25">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="26">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>kappa-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="27">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="28">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="29">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="30">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="31">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="32">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="33">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="34">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="35">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="36">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="37">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="38">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="39">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="40">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="41">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="42">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="43">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="44">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="45">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="46">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="47">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="48">
+      <filters>1 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="49">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="50">
+      <filters>1 5</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="51">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="52">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>inverse-velocity</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="53">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="54">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="55">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="56">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="57">
+      <filters>68 2</filters>
+      <nuclides>total</nuclides>
+      <scores>current</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="58">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="59">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="60">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="61">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="62">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="63">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="64">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="65">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="66">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="67">
+      <filters>1 79 2</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="68">
+      <filters>1 79 2</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="69">
+      <filters>1 79 5</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="70">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="71">
+      <filters>1 79 2</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="72">
+      <filters>1 79</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="73">
+      <filters>1 79</filters>
+      <nuclides>total</nuclides>
+      <scores>decay-rate</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="74">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="75">
+      <filters>1 79 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat b/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat
index 59cbddec4..54d095ac6 100644
--- a/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat
@@ -1,1952 +1,1951 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
-  <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
-  <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
-  <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-  <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
-  <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
-  <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
-  <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="UO2 (2.4%)">
-    <density units="g/cm3" value="10.29769" />
-    <nuclide ao="4.4843e-06" name="U234" />
-    <nuclide ao="0.00055815" name="U235" />
-    <nuclide ao="0.022408" name="U238" />
-    <nuclide ao="0.045829" name="O16" />
-  </material>
-  <material id="2" name="Zircaloy">
-    <density units="g/cm3" value="6.55" />
-    <nuclide ao="0.021827" name="Zr90" />
-    <nuclide ao="0.00476" name="Zr91" />
-    <nuclide ao="0.0072758" name="Zr92" />
-    <nuclide ao="0.0073734" name="Zr94" />
-    <nuclide ao="0.0011879" name="Zr96" />
-  </material>
-  <material id="3" name="Hot borated water">
-    <density units="g/cm3" value="0.740582" />
-    <nuclide ao="0.049457" name="H1" />
-    <nuclide ao="0.024672" name="O16" />
-    <nuclide ao="8.0042e-06" name="B10" />
-    <nuclide ao="3.2218e-05" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="fission">
-      <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="material">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="energy">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="5" type="energyout">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="6" type="legendre">
-    <order>1</order>
-  </filter>
-  <filter id="30" type="legendre">
-    <order>3</order>
-  </filter>
-  <filter id="54" type="energy">
-    <bins>0.0 20000000.0</bins>
-  </filter>
-  <filter id="108" type="delayedgroup">
-    <bins>1 2 3 4 5 6</bins>
-  </filter>
-  <filter id="122" type="material">
-    <bins>2</bins>
-  </filter>
-  <filter id="243" type="material">
-    <bins>3</bins>
-  </filter>
-  <tally id="1">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="2">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="3">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="4">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="5">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="6">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="7">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="8">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="9">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="10">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="11">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="12">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="13">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="14">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="15">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="16">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,3n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="17">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,4n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="18">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="19">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="20">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="21">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="22">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="23">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="24">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="25">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="26">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>kappa-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="27">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="28">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="29">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="30">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="31">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="32">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="33">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="34">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="35">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="36">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="37">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="38">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="39">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="40">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="41">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="42">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="43">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="44">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="45">
-    <filters>1 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="46">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="47">
-    <filters>1 54</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="48">
-    <filters>1 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="49">
-    <filters>1 54</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="50">
-    <filters>1 5</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="51">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="52">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>inverse-velocity</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="53">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="54">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="55">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="56">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="57">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="58">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="59">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="60">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="61">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="62">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="63">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="64">
-    <filters>1 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="65">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="66">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,elastic)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="67">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="68">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,level)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="69">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="70">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="71">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="72">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,na)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="73">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="74">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,nc)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="75">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="76">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,gamma)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="77">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="78">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,a)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="79">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="80">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,Xa)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="81">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="82">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>heating</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="83">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="84">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>damage-energy</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="85">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="86">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,n1)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="87">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="88">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,a0)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="89">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="90">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,nc)</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="91">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="92">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,n1)</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="93">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="94">
-    <filters>1 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="95">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="96">
-    <filters>1 108 2</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="97">
-    <filters>1 108 54</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="98">
-    <filters>1 108 5</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="99">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="100">
-    <filters>1 108 2</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="101">
-    <filters>1 108</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="102">
-    <filters>1 108</filters>
-    <nuclides>total</nuclides>
-    <scores>decay-rate</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="103">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="104">
-    <filters>1 108 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="105">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="106">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="107">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="108">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="109">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="110">
-    <filters>122 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="111">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="112">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="113">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="114">
-    <filters>122 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="115">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="116">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="117">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="118">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="119">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="120">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,3n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="121">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,4n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="122">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="123">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="124">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="125">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="126">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="127">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="128">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="129">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="130">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>kappa-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="131">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="132">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="133">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="134">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="135">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="136">
-    <filters>122 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="137">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="138">
-    <filters>122 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="139">
-    <filters>122 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="140">
-    <filters>122 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="141">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="142">
-    <filters>122 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="143">
-    <filters>122 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="144">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="145">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="146">
-    <filters>122 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="147">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="148">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="149">
-    <filters>122 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="150">
-    <filters>122 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="151">
-    <filters>122 54</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="152">
-    <filters>122 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="153">
-    <filters>122 54</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="154">
-    <filters>122 5</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="155">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="156">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>inverse-velocity</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="157">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="158">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="159">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="160">
-    <filters>122 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="161">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="162">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="163">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="164">
-    <filters>122 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="165">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="166">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="167">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="168">
-    <filters>122 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="169">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="170">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,elastic)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="171">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="172">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,level)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="173">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="174">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="175">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="176">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,na)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="177">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="178">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,nc)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="179">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="180">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,gamma)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="181">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="182">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,a)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="183">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="184">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,Xa)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="185">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="186">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>heating</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="187">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="188">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>damage-energy</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="189">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="190">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,n1)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="191">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="192">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,a0)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="193">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="194">
-    <filters>122 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,nc)</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="195">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="196">
-    <filters>122 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,n1)</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="197">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="198">
-    <filters>122 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="199">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="200">
-    <filters>122 108 2</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="201">
-    <filters>122 108 54</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="202">
-    <filters>122 108 5</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="203">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="204">
-    <filters>122 108 2</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="205">
-    <filters>122 108</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="206">
-    <filters>122 108</filters>
-    <nuclides>total</nuclides>
-    <scores>decay-rate</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="207">
-    <filters>122 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="208">
-    <filters>122 108 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="209">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="210">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="211">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="212">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="213">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="214">
-    <filters>243 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="215">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="216">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="217">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="218">
-    <filters>243 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="219">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="220">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="221">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="222">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="223">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="224">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,3n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="225">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,4n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="226">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="227">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="228">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="229">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="230">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="231">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="232">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="233">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="234">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>kappa-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="235">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="236">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="237">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="238">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="239">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="240">
-    <filters>243 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="241">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="242">
-    <filters>243 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="243">
-    <filters>243 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="244">
-    <filters>243 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="245">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="246">
-    <filters>243 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="247">
-    <filters>243 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="248">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="249">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="250">
-    <filters>243 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="251">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="252">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="253">
-    <filters>243 2 5 30</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="254">
-    <filters>243 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="255">
-    <filters>243 54</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="256">
-    <filters>243 5</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="257">
-    <filters>243 54</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="258">
-    <filters>243 5</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="259">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="260">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>inverse-velocity</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="261">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="262">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="263">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="264">
-    <filters>243 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="265">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="266">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="267">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="268">
-    <filters>243 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="269">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="270">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="271">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="272">
-    <filters>243 5 6</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="273">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="274">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,elastic)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="275">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="276">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,level)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="277">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="278">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="279">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="280">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,na)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="281">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="282">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,nc)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="283">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="284">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,gamma)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="285">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="286">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,a)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="287">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="288">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,Xa)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="289">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="290">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>heating</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="291">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="292">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>damage-energy</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="293">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="294">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,n1)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="295">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="296">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,a0)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="297">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="298">
-    <filters>243 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,nc)</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="299">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="300">
-    <filters>243 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,n1)</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="301">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="302">
-    <filters>243 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="303">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="304">
-    <filters>243 108 2</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="305">
-    <filters>243 108 54</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="306">
-    <filters>243 108 5</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="307">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="308">
-    <filters>243 108 2</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="309">
-    <filters>243 108</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="310">
-    <filters>243 108</filters>
-    <nuclides>total</nuclides>
-    <scores>decay-rate</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="311">
-    <filters>243 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="312">
-    <filters>243 108 2 5</filters>
-    <nuclides>total</nuclides>
-    <scores>delayed-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UO2 (2.4%)">
+      <density units="g/cm3" value="10.29769" />
+      <nuclide ao="4.4843e-06" name="U234" />
+      <nuclide ao="0.00055815" name="U235" />
+      <nuclide ao="0.022408" name="U238" />
+      <nuclide ao="0.045829" name="O16" />
+    </material>
+    <material id="2" name="Zircaloy">
+      <density units="g/cm3" value="6.55" />
+      <nuclide ao="0.021827" name="Zr90" />
+      <nuclide ao="0.00476" name="Zr91" />
+      <nuclide ao="0.0072758" name="Zr92" />
+      <nuclide ao="0.0073734" name="Zr94" />
+      <nuclide ao="0.0011879" name="Zr96" />
+    </material>
+    <material id="3" name="Hot borated water">
+      <density units="g/cm3" value="0.740582" />
+      <nuclide ao="0.049457" name="H1" />
+      <nuclide ao="0.024672" name="O16" />
+      <nuclide ao="8.0042e-06" name="B10" />
+      <nuclide ao="3.2218e-05" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="fission">
+        <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <filter id="1" type="material">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="energy">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="5" type="energyout">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="6" type="legendre">
+      <order>1</order>
+    </filter>
+    <filter id="30" type="legendre">
+      <order>3</order>
+    </filter>
+    <filter id="54" type="energy">
+      <bins>0.0 20000000.0</bins>
+    </filter>
+    <filter id="108" type="delayedgroup">
+      <bins>1 2 3 4 5 6</bins>
+    </filter>
+    <filter id="122" type="material">
+      <bins>2</bins>
+    </filter>
+    <filter id="243" type="material">
+      <bins>3</bins>
+    </filter>
+    <tally id="1">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="2">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="3">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="4">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="5">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="6">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="7">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="8">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="9">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="10">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="11">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="12">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="13">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="14">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="15">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="16">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,3n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="17">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,4n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="18">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="19">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="20">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="21">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="22">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="23">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="24">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="25">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="26">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>kappa-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="27">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="28">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="29">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="30">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="31">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="32">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="33">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="34">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="35">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="36">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="37">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="38">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="39">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="40">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="41">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="42">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="43">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="44">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="45">
+      <filters>1 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="46">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="47">
+      <filters>1 54</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="48">
+      <filters>1 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="49">
+      <filters>1 54</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="50">
+      <filters>1 5</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="51">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="52">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>inverse-velocity</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="53">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="54">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="55">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="56">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="57">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="58">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="59">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="60">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="61">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="62">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="63">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="64">
+      <filters>1 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="65">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="66">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,elastic)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="67">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="68">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,level)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="69">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="70">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="71">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="72">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,na)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="73">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="74">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,nc)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="75">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="76">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,gamma)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="77">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="78">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,a)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="79">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="80">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,Xa)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="81">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="82">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>heating</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="83">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="84">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>damage-energy</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="85">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="86">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,n1)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="87">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="88">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,a0)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="89">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="90">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,nc)</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="91">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="92">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,n1)</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="93">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="94">
+      <filters>1 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="95">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="96">
+      <filters>1 108 2</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="97">
+      <filters>1 108 54</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="98">
+      <filters>1 108 5</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="99">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="100">
+      <filters>1 108 2</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="101">
+      <filters>1 108</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="102">
+      <filters>1 108</filters>
+      <nuclides>total</nuclides>
+      <scores>decay-rate</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="103">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="104">
+      <filters>1 108 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="105">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="106">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="107">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="108">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="109">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="110">
+      <filters>122 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="111">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="112">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="113">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="114">
+      <filters>122 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="115">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="116">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="117">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="118">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="119">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="120">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,3n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="121">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,4n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="122">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="123">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="124">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="125">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="126">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="127">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="128">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="129">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="130">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>kappa-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="131">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="132">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="133">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="134">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="135">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="136">
+      <filters>122 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="137">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="138">
+      <filters>122 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="139">
+      <filters>122 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="140">
+      <filters>122 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="141">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="142">
+      <filters>122 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="143">
+      <filters>122 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="144">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="145">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="146">
+      <filters>122 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="147">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="148">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="149">
+      <filters>122 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="150">
+      <filters>122 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="151">
+      <filters>122 54</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="152">
+      <filters>122 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="153">
+      <filters>122 54</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="154">
+      <filters>122 5</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="155">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="156">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>inverse-velocity</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="157">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="158">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="159">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="160">
+      <filters>122 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="161">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="162">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="163">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="164">
+      <filters>122 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="165">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="166">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="167">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="168">
+      <filters>122 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="169">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="170">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,elastic)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="171">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="172">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,level)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="173">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="174">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="175">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="176">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,na)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="177">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="178">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,nc)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="179">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="180">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,gamma)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="181">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="182">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,a)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="183">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="184">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,Xa)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="185">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="186">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>heating</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="187">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="188">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>damage-energy</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="189">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="190">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,n1)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="191">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="192">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,a0)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="193">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="194">
+      <filters>122 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,nc)</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="195">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="196">
+      <filters>122 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,n1)</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="197">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="198">
+      <filters>122 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="199">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="200">
+      <filters>122 108 2</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="201">
+      <filters>122 108 54</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="202">
+      <filters>122 108 5</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="203">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="204">
+      <filters>122 108 2</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="205">
+      <filters>122 108</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="206">
+      <filters>122 108</filters>
+      <nuclides>total</nuclides>
+      <scores>decay-rate</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="207">
+      <filters>122 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="208">
+      <filters>122 108 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="209">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="210">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="211">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="212">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="213">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="214">
+      <filters>243 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="215">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="216">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="217">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="218">
+      <filters>243 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="219">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="220">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="221">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="222">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="223">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="224">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,3n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="225">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,4n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="226">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="227">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="228">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="229">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="230">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="231">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="232">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="233">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="234">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>kappa-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="235">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="236">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="237">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="238">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="239">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="240">
+      <filters>243 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="241">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="242">
+      <filters>243 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="243">
+      <filters>243 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="244">
+      <filters>243 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="245">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="246">
+      <filters>243 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="247">
+      <filters>243 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="248">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="249">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="250">
+      <filters>243 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="251">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="252">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="253">
+      <filters>243 2 5 30</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="254">
+      <filters>243 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="255">
+      <filters>243 54</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="256">
+      <filters>243 5</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="257">
+      <filters>243 54</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="258">
+      <filters>243 5</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="259">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="260">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>inverse-velocity</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="261">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="262">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="263">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="264">
+      <filters>243 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="265">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="266">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="267">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="268">
+      <filters>243 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="269">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="270">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="271">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="272">
+      <filters>243 5 6</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="273">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="274">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,elastic)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="275">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="276">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,level)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="277">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="278">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="279">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="280">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,na)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="281">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="282">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,nc)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="283">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="284">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,gamma)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="285">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="286">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,a)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="287">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="288">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,Xa)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="289">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="290">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>heating</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="291">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="292">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>damage-energy</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="293">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="294">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,n1)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="295">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="296">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,a0)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="297">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="298">
+      <filters>243 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,nc)</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="299">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="300">
+      <filters>243 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,n1)</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="301">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="302">
+      <filters>243 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="303">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="304">
+      <filters>243 108 2</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="305">
+      <filters>243 108 54</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="306">
+      <filters>243 108 5</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="307">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="308">
+      <filters>243 108 2</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="309">
+      <filters>243 108</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="310">
+      <filters>243 108</filters>
+      <nuclides>total</nuclides>
+      <scores>decay-rate</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="311">
+      <filters>243 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="312">
+      <filters>243 108 2 5</filters>
+      <nuclides>total</nuclides>
+      <scores>delayed-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/mgxs_library_nuclides/inputs_true.dat b/tests/regression_tests/mgxs_library_nuclides/inputs_true.dat
index e45fe389e..5e9720ced 100644
--- a/tests/regression_tests/mgxs_library_nuclides/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_nuclides/inputs_true.dat
@@ -1,1769 +1,1768 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
-  <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
-  <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
-  <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-  <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
-  <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
-  <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
-  <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="UO2 (2.4%)">
-    <density units="g/cm3" value="10.29769" />
-    <nuclide ao="4.4843e-06" name="U234" />
-    <nuclide ao="0.00055815" name="U235" />
-    <nuclide ao="0.022408" name="U238" />
-    <nuclide ao="0.045829" name="O16" />
-  </material>
-  <material id="2" name="Zircaloy">
-    <density units="g/cm3" value="6.55" />
-    <nuclide ao="0.021827" name="Zr90" />
-    <nuclide ao="0.00476" name="Zr91" />
-    <nuclide ao="0.0072758" name="Zr92" />
-    <nuclide ao="0.0073734" name="Zr94" />
-    <nuclide ao="0.0011879" name="Zr96" />
-  </material>
-  <material id="3" name="Hot borated water">
-    <density units="g/cm3" value="0.740582" />
-    <nuclide ao="0.049457" name="H1" />
-    <nuclide ao="0.024672" name="O16" />
-    <nuclide ao="8.0042e-06" name="B10" />
-    <nuclide ao="3.2218e-05" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="fission">
-      <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="material">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="energy">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="5" type="energyout">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="6" type="legendre">
-    <order>1</order>
-  </filter>
-  <filter id="30" type="legendre">
-    <order>3</order>
-  </filter>
-  <filter id="54" type="energy">
-    <bins>0.0 20000000.0</bins>
-  </filter>
-  <filter id="106" type="material">
-    <bins>2</bins>
-  </filter>
-  <filter id="211" type="material">
-    <bins>3</bins>
-  </filter>
-  <tally id="1">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="2">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="3">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="4">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="5">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="6">
-    <filters>1 5 6</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="7">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="8">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="9">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="10">
-    <filters>1 5 6</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="11">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="12">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="13">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="14">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="15">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="16">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>(n,3n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="17">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>(n,4n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="18">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="19">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="20">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="21">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="22">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="23">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="24">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="25">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="26">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>kappa-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="27">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="28">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="29">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="30">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="31">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="32">
-    <filters>1 2 5 30</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="33">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="34">
-    <filters>1 2 5 30</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="35">
-    <filters>1 2 5</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="36">
-    <filters>1 2 5</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="37">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="38">
-    <filters>1 2 5</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="39">
-    <filters>1 2 5</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="40">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="41">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="42">
-    <filters>1 2 5 30</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="43">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="44">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="45">
-    <filters>1 2 5 30</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="46">
-    <filters>1 2 5</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="47">
-    <filters>1 54</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="48">
-    <filters>1 5</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="49">
-    <filters>1 54</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="50">
-    <filters>1 5</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="51">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="52">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>inverse-velocity</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="53">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="54">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="55">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="56">
-    <filters>1 2 5</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="57">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="58">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="59">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="60">
-    <filters>1 5 6</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="61">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="62">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="63">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="64">
-    <filters>1 5 6</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="65">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="66">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>(n,elastic)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="67">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="68">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>(n,level)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="69">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="70">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="71">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="72">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>(n,na)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="73">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="74">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>(n,nc)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="75">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="76">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>(n,gamma)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="77">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="78">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>(n,a)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="79">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="80">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>(n,Xa)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="81">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="82">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>heating</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="83">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="84">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>damage-energy</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="85">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="86">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>(n,n1)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="87">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="88">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>(n,a0)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="89">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="90">
-    <filters>1 2 5</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>(n,nc)</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="91">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="92">
-    <filters>1 2 5</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>(n,n1)</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="93">
-    <filters>1 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="94">
-    <filters>1 2 5</filters>
-    <nuclides>U234 U235 U238 O16</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="95">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="96">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="97">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="98">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="99">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="100">
-    <filters>106 5 6</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="101">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="102">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="103">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="104">
-    <filters>106 5 6</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="105">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="106">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="107">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="108">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="109">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="110">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>(n,3n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="111">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>(n,4n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="112">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="113">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="114">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="115">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="116">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="117">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="118">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="119">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="120">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>kappa-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="121">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="122">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="123">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="124">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="125">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="126">
-    <filters>106 2 5 30</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="127">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="128">
-    <filters>106 2 5 30</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="129">
-    <filters>106 2 5</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="130">
-    <filters>106 2 5</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="131">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="132">
-    <filters>106 2 5</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="133">
-    <filters>106 2 5</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="134">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="135">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="136">
-    <filters>106 2 5 30</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="137">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="138">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="139">
-    <filters>106 2 5 30</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="140">
-    <filters>106 2 5</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="141">
-    <filters>106 54</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="142">
-    <filters>106 5</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="143">
-    <filters>106 54</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="144">
-    <filters>106 5</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="145">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="146">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>inverse-velocity</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="147">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="148">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="149">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="150">
-    <filters>106 2 5</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="151">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="152">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="153">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="154">
-    <filters>106 5 6</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="155">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="156">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="157">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="158">
-    <filters>106 5 6</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="159">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="160">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>(n,elastic)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="161">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="162">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>(n,level)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="163">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="164">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="165">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="166">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>(n,na)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="167">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="168">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>(n,nc)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="169">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="170">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>(n,gamma)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="171">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="172">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>(n,a)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="173">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="174">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>(n,Xa)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="175">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="176">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>heating</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="177">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="178">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>damage-energy</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="179">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="180">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>(n,n1)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="181">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="182">
-    <filters>106 2</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>(n,a0)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="183">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="184">
-    <filters>106 2 5</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>(n,nc)</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="185">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="186">
-    <filters>106 2 5</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>(n,n1)</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="187">
-    <filters>106 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="188">
-    <filters>106 2 5</filters>
-    <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="189">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="190">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="191">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="192">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="193">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="194">
-    <filters>211 5 6</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="195">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="196">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="197">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="198">
-    <filters>211 5 6</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="199">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="200">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="201">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="202">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="203">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="204">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>(n,3n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="205">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>(n,4n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="206">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="207">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>absorption</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="208">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="209">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="210">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="211">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="212">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="213">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="214">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>kappa-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="215">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="216">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="217">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="218">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="219">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="220">
-    <filters>211 2 5 30</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="221">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="222">
-    <filters>211 2 5 30</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="223">
-    <filters>211 2 5</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="224">
-    <filters>211 2 5</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="225">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="226">
-    <filters>211 2 5</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="227">
-    <filters>211 2 5</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="228">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="229">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="230">
-    <filters>211 2 5 30</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="231">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="232">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>scatter</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="233">
-    <filters>211 2 5 30</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="234">
-    <filters>211 2 5</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="235">
-    <filters>211 54</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="236">
-    <filters>211 5</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="237">
-    <filters>211 54</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="238">
-    <filters>211 5</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="239">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="240">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>inverse-velocity</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="241">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="242">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="243">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="244">
-    <filters>211 2 5</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>prompt-nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="245">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="246">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="247">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="248">
-    <filters>211 5 6</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="249">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="250">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="251">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="252">
-    <filters>211 5 6</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="253">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="254">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>(n,elastic)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="255">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="256">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>(n,level)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="257">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="258">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="259">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="260">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>(n,na)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="261">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="262">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>(n,nc)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="263">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="264">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>(n,gamma)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="265">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="266">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>(n,a)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="267">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="268">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>(n,Xa)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="269">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="270">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>heating</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="271">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="272">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>damage-energy</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="273">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="274">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>(n,n1)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="275">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="276">
-    <filters>211 2</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>(n,a0)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="277">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="278">
-    <filters>211 2 5</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>(n,nc)</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="279">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="280">
-    <filters>211 2 5</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>(n,n1)</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="281">
-    <filters>211 2</filters>
-    <nuclides>total</nuclides>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="282">
-    <filters>211 2 5</filters>
-    <nuclides>H1 O16 B10 B11</nuclides>
-    <scores>(n,2n)</scores>
-    <estimator>analog</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UO2 (2.4%)">
+      <density units="g/cm3" value="10.29769" />
+      <nuclide ao="4.4843e-06" name="U234" />
+      <nuclide ao="0.00055815" name="U235" />
+      <nuclide ao="0.022408" name="U238" />
+      <nuclide ao="0.045829" name="O16" />
+    </material>
+    <material id="2" name="Zircaloy">
+      <density units="g/cm3" value="6.55" />
+      <nuclide ao="0.021827" name="Zr90" />
+      <nuclide ao="0.00476" name="Zr91" />
+      <nuclide ao="0.0072758" name="Zr92" />
+      <nuclide ao="0.0073734" name="Zr94" />
+      <nuclide ao="0.0011879" name="Zr96" />
+    </material>
+    <material id="3" name="Hot borated water">
+      <density units="g/cm3" value="0.740582" />
+      <nuclide ao="0.049457" name="H1" />
+      <nuclide ao="0.024672" name="O16" />
+      <nuclide ao="8.0042e-06" name="B10" />
+      <nuclide ao="3.2218e-05" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="fission">
+        <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <filter id="1" type="material">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="energy">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="5" type="energyout">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="6" type="legendre">
+      <order>1</order>
+    </filter>
+    <filter id="30" type="legendre">
+      <order>3</order>
+    </filter>
+    <filter id="54" type="energy">
+      <bins>0.0 20000000.0</bins>
+    </filter>
+    <filter id="106" type="material">
+      <bins>2</bins>
+    </filter>
+    <filter id="211" type="material">
+      <bins>3</bins>
+    </filter>
+    <tally id="1">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="2">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="3">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="4">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="5">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="6">
+      <filters>1 5 6</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="7">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="8">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="9">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="10">
+      <filters>1 5 6</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="11">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="12">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="13">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="14">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="15">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="16">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>(n,3n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="17">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>(n,4n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="18">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="19">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="20">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="21">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="22">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="23">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="24">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="25">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="26">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>kappa-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="27">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="28">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="29">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="30">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="31">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="32">
+      <filters>1 2 5 30</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="33">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="34">
+      <filters>1 2 5 30</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="35">
+      <filters>1 2 5</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="36">
+      <filters>1 2 5</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="37">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="38">
+      <filters>1 2 5</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="39">
+      <filters>1 2 5</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="40">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="41">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="42">
+      <filters>1 2 5 30</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="43">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="44">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="45">
+      <filters>1 2 5 30</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="46">
+      <filters>1 2 5</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="47">
+      <filters>1 54</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="48">
+      <filters>1 5</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="49">
+      <filters>1 54</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="50">
+      <filters>1 5</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="51">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="52">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>inverse-velocity</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="53">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="54">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="55">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="56">
+      <filters>1 2 5</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="57">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="58">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="59">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="60">
+      <filters>1 5 6</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="61">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="62">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="63">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="64">
+      <filters>1 5 6</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="65">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="66">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>(n,elastic)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="67">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="68">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>(n,level)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="69">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="70">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="71">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="72">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>(n,na)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="73">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="74">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>(n,nc)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="75">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="76">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>(n,gamma)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="77">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="78">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>(n,a)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="79">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="80">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>(n,Xa)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="81">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="82">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>heating</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="83">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="84">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>damage-energy</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="85">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="86">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>(n,n1)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="87">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="88">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>(n,a0)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="89">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="90">
+      <filters>1 2 5</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>(n,nc)</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="91">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="92">
+      <filters>1 2 5</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>(n,n1)</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="93">
+      <filters>1 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="94">
+      <filters>1 2 5</filters>
+      <nuclides>U234 U235 U238 O16</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="95">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="96">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="97">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="98">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="99">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="100">
+      <filters>106 5 6</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="101">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="102">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="103">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="104">
+      <filters>106 5 6</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="105">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="106">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="107">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="108">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="109">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="110">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>(n,3n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="111">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>(n,4n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="112">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="113">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="114">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="115">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="116">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="117">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="118">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="119">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="120">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>kappa-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="121">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="122">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="123">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="124">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="125">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="126">
+      <filters>106 2 5 30</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="127">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="128">
+      <filters>106 2 5 30</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="129">
+      <filters>106 2 5</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="130">
+      <filters>106 2 5</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="131">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="132">
+      <filters>106 2 5</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="133">
+      <filters>106 2 5</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="134">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="135">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="136">
+      <filters>106 2 5 30</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="137">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="138">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="139">
+      <filters>106 2 5 30</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="140">
+      <filters>106 2 5</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="141">
+      <filters>106 54</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="142">
+      <filters>106 5</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="143">
+      <filters>106 54</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="144">
+      <filters>106 5</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="145">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="146">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>inverse-velocity</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="147">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="148">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="149">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="150">
+      <filters>106 2 5</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="151">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="152">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="153">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="154">
+      <filters>106 5 6</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="155">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="156">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="157">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="158">
+      <filters>106 5 6</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="159">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="160">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>(n,elastic)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="161">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="162">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>(n,level)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="163">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="164">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="165">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="166">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>(n,na)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="167">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="168">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>(n,nc)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="169">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="170">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>(n,gamma)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="171">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="172">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>(n,a)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="173">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="174">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>(n,Xa)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="175">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="176">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>heating</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="177">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="178">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>damage-energy</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="179">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="180">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>(n,n1)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="181">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="182">
+      <filters>106 2</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>(n,a0)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="183">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="184">
+      <filters>106 2 5</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>(n,nc)</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="185">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="186">
+      <filters>106 2 5</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>(n,n1)</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="187">
+      <filters>106 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="188">
+      <filters>106 2 5</filters>
+      <nuclides>Zr90 Zr91 Zr92 Zr94 Zr96</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="189">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="190">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="191">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="192">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="193">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="194">
+      <filters>211 5 6</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="195">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="196">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="197">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="198">
+      <filters>211 5 6</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="199">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="200">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="201">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="202">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="203">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="204">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>(n,3n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="205">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>(n,4n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="206">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="207">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>absorption</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="208">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="209">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="210">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="211">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="212">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="213">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="214">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>kappa-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="215">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="216">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="217">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="218">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="219">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="220">
+      <filters>211 2 5 30</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="221">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="222">
+      <filters>211 2 5 30</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="223">
+      <filters>211 2 5</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="224">
+      <filters>211 2 5</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="225">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="226">
+      <filters>211 2 5</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="227">
+      <filters>211 2 5</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="228">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="229">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="230">
+      <filters>211 2 5 30</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="231">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="232">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>scatter</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="233">
+      <filters>211 2 5 30</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="234">
+      <filters>211 2 5</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="235">
+      <filters>211 54</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="236">
+      <filters>211 5</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="237">
+      <filters>211 54</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="238">
+      <filters>211 5</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="239">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="240">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>inverse-velocity</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="241">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="242">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="243">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="244">
+      <filters>211 2 5</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>prompt-nu-fission</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="245">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="246">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="247">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="248">
+      <filters>211 5 6</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="249">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="250">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="251">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="252">
+      <filters>211 5 6</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="253">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="254">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>(n,elastic)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="255">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="256">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>(n,level)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="257">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="258">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="259">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="260">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>(n,na)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="261">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="262">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>(n,nc)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="263">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="264">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>(n,gamma)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="265">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="266">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>(n,a)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="267">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="268">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>(n,Xa)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="269">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="270">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>heating</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="271">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="272">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>damage-energy</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="273">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="274">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>(n,n1)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="275">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="276">
+      <filters>211 2</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>(n,a0)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="277">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="278">
+      <filters>211 2 5</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>(n,nc)</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="279">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="280">
+      <filters>211 2 5</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>(n,n1)</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="281">
+      <filters>211 2</filters>
+      <nuclides>total</nuclides>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="282">
+      <filters>211 2 5</filters>
+      <nuclides>H1 O16 B10 B11</nuclides>
+      <scores>(n,2n)</scores>
+      <estimator>analog</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/multipole/inputs_true.dat b/tests/regression_tests/multipole/inputs_true.dat
index 3bbcc2024..3a602b28b 100644
--- a/tests/regression_tests/multipole/inputs_true.dat
+++ b/tests/regression_tests/multipole/inputs_true.dat
@@ -1,55 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" universe="1" />
-  <cell id="11" material="2" region="-1" temperature="500 700 0 800" universe="11" />
-  <cell id="12" material="1" region="1" universe="11" />
-  <cell fill="101" id="101" region="2 -3 4 -5" universe="0" />
-  <lattice id="101">
-    <pitch>2.0 2.0</pitch>
-    <outer>1</outer>
-    <dimension>2 2</dimension>
-    <lower_left>-2.0 -2.0</lower_left>
-    <universes>
+<model>
+  <materials>
+    <material id="1">
+      <density units="g/cc" value="1.0" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material depletable="true" id="2">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" universe="1" />
+    <cell id="11" material="2" region="-1" temperature="500 700 0 800" universe="11" />
+    <cell id="12" material="1" region="1" universe="11" />
+    <cell fill="101" id="101" region="2 -3 4 -5" universe="0" />
+    <lattice id="101">
+      <pitch>2.0 2.0</pitch>
+      <outer>1</outer>
+      <dimension>2 2</dimension>
+      <lower_left>-2.0 -2.0</lower_left>
+      <universes>
 11 11 
 11 11 </universes>
-  </lattice>
-  <surface coeffs="0.0 0.0 0.3" id="1" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="-3.0" id="2" type="x-plane" />
-  <surface boundary="reflective" coeffs="3.0" id="3" type="x-plane" />
-  <surface boundary="reflective" coeffs="-3.0" id="4" type="y-plane" />
-  <surface boundary="reflective" coeffs="3.0" id="5" type="y-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material id="1">
-    <density units="g/cc" value="1.0" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material depletable="true" id="2">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>5</batches>
-  <inactive>0</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-1 -1 -1 1 1 1</parameters>
-    </space>
-  </source>
-  <temperature_multipole>true</temperature_multipole>
-  <temperature_tolerance>1000</temperature_tolerance>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <tally id="1">
-    <nuclides>U235 O16 total</nuclides>
-    <scores>total fission (n,gamma) elastic (n,p)</scores>
-  </tally>
-</tallies>
+    </lattice>
+    <surface coeffs="0.0 0.0 0.3" id="1" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-3.0" id="2" type="x-plane" />
+    <surface boundary="reflective" coeffs="3.0" id="3" type="x-plane" />
+    <surface boundary="reflective" coeffs="-3.0" id="4" type="y-plane" />
+    <surface boundary="reflective" coeffs="3.0" id="5" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-1 -1 -1 1 1 1</parameters>
+      </space>
+    </source>
+    <temperature_multipole>true</temperature_multipole>
+    <temperature_tolerance>1000</temperature_tolerance>
+  </settings>
+  <tallies>
+    <tally id="1">
+      <nuclides>U235 O16 total</nuclides>
+      <scores>total fission (n,gamma) elastic (n,p)</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/ncrystal/inputs_true.dat b/tests/regression_tests/ncrystal/inputs_true.dat
index 7a3f20eb3..a609edcae 100644
--- a/tests/regression_tests/ncrystal/inputs_true.dat
+++ b/tests/regression_tests/ncrystal/inputs_true.dat
@@ -1,45 +1,44 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <cell id="2" material="void" region="1 -2" universe="1" />
-  <surface coeffs="0.0 0.0 0.0 0.1" id="1" type="sphere" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100" id="2" type="sphere" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material cfg="Al_sg225.ncmat" id="1" temperature="293.15">
-    <density units="g/cm3" value="2.6986455176922477" />
-    <nuclide ao="1.0" name="Al27" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>100000</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space type="point">
-      <parameters>0 0 -20</parameters>
-    </space>
-    <angle reference_uvw="0.0 0.0 1.0" type="monodirectional" />
-    <energy type="discrete">
-      <parameters>0.012 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="surface">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="polar">
-    <bins>0.0 0.017453292519943295 0.03490658503988659 0.05235987755982989 0.06981317007977318 0.08726646259971647 0.10471975511965978 0.12217304763960307 0.13962634015954636 0.15707963267948966 0.17453292519943295 0.19198621771937624 0.20943951023931956 0.22689280275926285 0.24434609527920614 0.2617993877991494 0.2792526803190927 0.29670597283903605 0.3141592653589793 0.33161255787892263 0.3490658503988659 0.3665191429188092 0.3839724354387525 0.4014257279586958 0.4188790204786391 0.4363323129985824 0.4537856055185257 0.47123889803846897 0.4886921905584123 0.5061454830783556 0.5235987755982988 0.5410520681182421 0.5585053606381855 0.5759586531581288 0.5934119456780721 0.6108652381980153 0.6283185307179586 0.6457718232379019 0.6632251157578453 0.6806784082777885 0.6981317007977318 0.7155849933176751 0.7330382858376184 0.7504915783575618 0.767944870877505 0.7853981633974483 0.8028514559173916 0.8203047484373349 0.8377580409572782 0.8552113334772214 0.8726646259971648 0.8901179185171081 0.9075712110370514 0.9250245035569946 0.9424777960769379 0.9599310885968813 0.9773843811168246 0.9948376736367679 1.0122909661567112 1.0297442586766545 1.0471975511965976 1.064650843716541 1.0821041362364843 1.0995574287564276 1.117010721276371 1.1344640137963142 1.1519173063162575 1.1693705988362009 1.1868238913561442 1.2042771838760873 1.2217304763960306 1.239183768915974 1.2566370614359172 1.2740903539558606 1.2915436464758039 1.3089969389957472 1.3264502315156905 1.3439035240356338 1.361356816555577 1.3788101090755203 1.3962634015954636 1.413716694115407 1.4311699866353502 1.4486232791552935 1.4660765716752369 1.4835298641951802 1.5009831567151235 1.5184364492350666 1.53588974175501 1.5533430342749532 1.5707963267948966 1.5882496193148399 1.6057029118347832 1.6231562043547265 1.6406094968746698 1.6580627893946132 1.6755160819145565 1.6929693744344996 1.710422666954443 1.7278759594743862 1.7453292519943295 1.7627825445142729 1.7802358370342162 1.7976891295541595 1.8151424220741028 1.8325957145940461 1.8500490071139892 1.8675022996339325 1.8849555921538759 1.9024088846738192 1.9198621771937625 1.9373154697137058 1.9547687622336491 1.9722220547535925 1.9896753472735358 2.007128639793479 2.0245819323134224 2.0420352248333655 2.059488517353309 2.076941809873252 2.0943951023931953 2.111848394913139 2.129301687433082 2.1467549799530254 2.1642082724729685 2.181661564992912 2.199114857512855 2.2165681500327987 2.234021442552742 2.251474735072685 2.2689280275926285 2.2863813201125716 2.303834612632515 2.321287905152458 2.3387411976724017 2.356194490192345 2.3736477827122884 2.3911010752322315 2.4085543677521746 2.426007660272118 2.443460952792061 2.4609142453120048 2.478367537831948 2.4958208303518914 2.5132741228718345 2.530727415391778 2.548180707911721 2.5656340004316642 2.5830872929516078 2.600540585471551 2.6179938779914944 2.6354471705114375 2.652900463031381 2.670353755551324 2.6878070480712677 2.705260340591211 2.722713633111154 2.7401669256310974 2.7576202181510405 2.775073510670984 2.792526803190927 2.8099800957108707 2.827433388230814 2.8448866807507573 2.8623399732707004 2.8797932657906435 2.897246558310587 2.91469985083053 2.9321531433504737 2.949606435870417 2.9670597283903604 2.9845130209103035 3.001966313430247 3.01941960595019 3.036872898470133 3.0543261909900767 3.07177948351002 3.0892327760299634 3.1066860685499065 3.12413936106985 3.141592653589793</bins>
-  </filter>
-  <filter id="3" type="cellfrom">
-    <bins>1</bins>
-  </filter>
-  <tally id="1" name="angular distribution">
-    <filters>1 2 3</filters>
-    <scores>current</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material cfg="Al_sg225.ncmat" id="1" temperature="293.15">
+      <density units="g/cm3" value="2.6986455176922477" />
+      <nuclide ao="1.0" name="Al27" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <cell id="2" material="void" region="1 -2" universe="1" />
+    <surface coeffs="0.0 0.0 0.0 0.1" id="1" type="sphere" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100" id="2" type="sphere" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>100000</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space type="point">
+        <parameters>0 0 -20</parameters>
+      </space>
+      <angle reference_uvw="0.0 0.0 1.0" type="monodirectional" />
+      <energy type="discrete">
+        <parameters>0.012 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <filter id="1" type="surface">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="polar">
+      <bins>0.0 0.017453292519943295 0.03490658503988659 0.05235987755982989 0.06981317007977318 0.08726646259971647 0.10471975511965978 0.12217304763960307 0.13962634015954636 0.15707963267948966 0.17453292519943295 0.19198621771937624 0.20943951023931956 0.22689280275926285 0.24434609527920614 0.2617993877991494 0.2792526803190927 0.29670597283903605 0.3141592653589793 0.33161255787892263 0.3490658503988659 0.3665191429188092 0.3839724354387525 0.4014257279586958 0.4188790204786391 0.4363323129985824 0.4537856055185257 0.47123889803846897 0.4886921905584123 0.5061454830783556 0.5235987755982988 0.5410520681182421 0.5585053606381855 0.5759586531581288 0.5934119456780721 0.6108652381980153 0.6283185307179586 0.6457718232379019 0.6632251157578453 0.6806784082777885 0.6981317007977318 0.7155849933176751 0.7330382858376184 0.7504915783575618 0.767944870877505 0.7853981633974483 0.8028514559173916 0.8203047484373349 0.8377580409572782 0.8552113334772214 0.8726646259971648 0.8901179185171081 0.9075712110370514 0.9250245035569946 0.9424777960769379 0.9599310885968813 0.9773843811168246 0.9948376736367679 1.0122909661567112 1.0297442586766545 1.0471975511965976 1.064650843716541 1.0821041362364843 1.0995574287564276 1.117010721276371 1.1344640137963142 1.1519173063162575 1.1693705988362009 1.1868238913561442 1.2042771838760873 1.2217304763960306 1.239183768915974 1.2566370614359172 1.2740903539558606 1.2915436464758039 1.3089969389957472 1.3264502315156905 1.3439035240356338 1.361356816555577 1.3788101090755203 1.3962634015954636 1.413716694115407 1.4311699866353502 1.4486232791552935 1.4660765716752369 1.4835298641951802 1.5009831567151235 1.5184364492350666 1.53588974175501 1.5533430342749532 1.5707963267948966 1.5882496193148399 1.6057029118347832 1.6231562043547265 1.6406094968746698 1.6580627893946132 1.6755160819145565 1.6929693744344996 1.710422666954443 1.7278759594743862 1.7453292519943295 1.7627825445142729 1.7802358370342162 1.7976891295541595 1.8151424220741028 1.8325957145940461 1.8500490071139892 1.8675022996339325 1.8849555921538759 1.9024088846738192 1.9198621771937625 1.9373154697137058 1.9547687622336491 1.9722220547535925 1.9896753472735358 2.007128639793479 2.0245819323134224 2.0420352248333655 2.059488517353309 2.076941809873252 2.0943951023931953 2.111848394913139 2.129301687433082 2.1467549799530254 2.1642082724729685 2.181661564992912 2.199114857512855 2.2165681500327987 2.234021442552742 2.251474735072685 2.2689280275926285 2.2863813201125716 2.303834612632515 2.321287905152458 2.3387411976724017 2.356194490192345 2.3736477827122884 2.3911010752322315 2.4085543677521746 2.426007660272118 2.443460952792061 2.4609142453120048 2.478367537831948 2.4958208303518914 2.5132741228718345 2.530727415391778 2.548180707911721 2.5656340004316642 2.5830872929516078 2.600540585471551 2.6179938779914944 2.6354471705114375 2.652900463031381 2.670353755551324 2.6878070480712677 2.705260340591211 2.722713633111154 2.7401669256310974 2.7576202181510405 2.775073510670984 2.792526803190927 2.8099800957108707 2.827433388230814 2.8448866807507573 2.8623399732707004 2.8797932657906435 2.897246558310587 2.91469985083053 2.9321531433504737 2.949606435870417 2.9670597283903604 2.9845130209103035 3.001966313430247 3.01941960595019 3.036872898470133 3.0543261909900767 3.07177948351002 3.0892327760299634 3.1066860685499065 3.12413936106985 3.141592653589793</bins>
+    </filter>
+    <filter id="3" type="cellfrom">
+      <bins>1</bins>
+    </filter>
+    <tally id="1" name="angular distribution">
+      <filters>1 2 3</filters>
+      <scores>current</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/periodic/inputs_true.dat b/tests/regression_tests/periodic/inputs_true.dat
index c1f6d1563..9934e2de0 100644
--- a/tests/regression_tests/periodic/inputs_true.dat
+++ b/tests/regression_tests/periodic/inputs_true.dat
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="1 -2 3 -4 5 -6 7" universe="0" />
-  <cell id="2" material="2" region="3 5 -6 -7" universe="0" />
-  <surface boundary="periodic" coeffs="0.0" id="1" periodic_surface_id="3" type="x-plane" />
-  <surface boundary="reflective" coeffs="5.0" id="2" type="x-plane" />
-  <surface boundary="periodic" coeffs="0.0" id="3" periodic_surface_id="1" type="y-plane" />
-  <surface boundary="reflective" coeffs="5.0" id="4" type="y-plane" />
-  <surface boundary="periodic" coeffs="-5.0" id="5" type="z-plane" />
-  <surface boundary="periodic" coeffs="0 0 1 5.0" id="6" type="plane" />
-  <surface coeffs="2.5 0.0 2.0" id="7" type="z-cylinder" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material id="1">
-    <density units="g/cc" value="1.0" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material depletable="true" id="2">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>4</batches>
-  <inactive>0</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>0 0 0 5 5 0</parameters>
-    </space>
-  </source>
-</settings>
+<model>
+  <materials>
+    <material id="1">
+      <density units="g/cc" value="1.0" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material depletable="true" id="2">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="1 -2 3 -4 5 -6 7" universe="0" />
+    <cell id="2" material="2" region="3 5 -6 -7" universe="0" />
+    <surface boundary="periodic" coeffs="0.0" id="1" periodic_surface_id="3" type="x-plane" />
+    <surface boundary="reflective" coeffs="5.0" id="2" type="x-plane" />
+    <surface boundary="periodic" coeffs="0.0" id="3" periodic_surface_id="1" type="y-plane" />
+    <surface boundary="reflective" coeffs="5.0" id="4" type="y-plane" />
+    <surface boundary="periodic" coeffs="-5.0" id="5" type="z-plane" />
+    <surface boundary="periodic" coeffs="0 0 1 5.0" id="6" type="plane" />
+    <surface coeffs="2.5 0.0 2.0" id="7" type="z-cylinder" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>4</batches>
+    <inactive>0</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>0 0 0 5 5 0</parameters>
+      </space>
+    </source>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/periodic_6fold/inputs_true.dat b/tests/regression_tests/periodic_6fold/inputs_true.dat
index 35bbcc047..9c2899417 100644
--- a/tests/regression_tests/periodic_6fold/inputs_true.dat
+++ b/tests/regression_tests/periodic_6fold/inputs_true.dat
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="1 2 -3 4" universe="0" />
-  <cell id="2" material="2" region="1 2 -4" universe="0" />
-  <surface boundary="periodic" coeffs="0.4999999999999999 0.8660254037844387 0.0 0.0" id="1" type="plane" />
-  <surface boundary="periodic" coeffs="0.4999999999999999 -0.8660254037844387 0.0 0.0" id="2" type="plane" />
-  <surface boundary="reflective" coeffs="5.0" id="3" type="x-plane" />
-  <surface coeffs="2.598076211353316 1.4999999999999998 2.0" id="4" type="z-cylinder" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material id="1">
-    <density units="g/cc" value="1.0" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material depletable="true" id="2">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>4</batches>
-  <inactive>0</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>0 0 0 5 5 0</parameters>
-    </space>
-  </source>
-</settings>
+<model>
+  <materials>
+    <material id="1">
+      <density units="g/cc" value="1.0" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material depletable="true" id="2">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="1 2 -3 4" universe="0" />
+    <cell id="2" material="2" region="1 2 -4" universe="0" />
+    <surface boundary="periodic" coeffs="0.4999999999999999 0.8660254037844387 0.0 0.0" id="1" type="plane" />
+    <surface boundary="periodic" coeffs="0.4999999999999999 -0.8660254037844387 0.0 0.0" id="2" type="plane" />
+    <surface boundary="reflective" coeffs="5.0" id="3" type="x-plane" />
+    <surface coeffs="2.598076211353316 1.4999999999999998 2.0" id="4" type="z-cylinder" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>4</batches>
+    <inactive>0</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>0 0 0 5 5 0</parameters>
+      </space>
+    </source>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/periodic_hex/inputs_true.dat b/tests/regression_tests/periodic_hex/inputs_true.dat
index 00e539d4b..f4869fa58 100644
--- a/tests/regression_tests/periodic_hex/inputs_true.dat
+++ b/tests/regression_tests/periodic_hex/inputs_true.dat
@@ -1,24 +1,24 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1 2 -3 -4 5 6" universe="1" />
-  <surface boundary="periodic" coeffs="8.660254037844386" id="1" periodic_surface_id="2" type="x-plane" />
-  <surface boundary="periodic" coeffs="-8.660254037844386" id="2" periodic_surface_id="1" type="x-plane" />
-  <surface boundary="periodic" coeffs="0.5773502691896257 1.0 0.0 10.0" id="3" periodic_surface_id="6" type="plane" />
-  <surface boundary="periodic" coeffs="-0.5773502691896257 1.0 0.0 10.0" id="4" periodic_surface_id="5" type="plane" />
-  <surface boundary="periodic" coeffs="-0.5773502691896257 1.0 0.0 -10.0" id="5" periodic_surface_id="4" type="plane" />
-  <surface boundary="periodic" coeffs="0.5773502691896257 1.0 0.0 -10.0" id="6" periodic_surface_id="3" type="plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>5</batches>
-  <inactive>0</inactive>
-</settings>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1 2 -3 -4 5 6" universe="1" />
+    <surface boundary="periodic" coeffs="8.660254037844386" id="1" periodic_surface_id="2" type="x-plane" />
+    <surface boundary="periodic" coeffs="-8.660254037844386" id="2" periodic_surface_id="1" type="x-plane" />
+    <surface boundary="periodic" coeffs="0.5773502691896257 1.0 0.0 10.0" id="3" periodic_surface_id="6" type="plane" />
+    <surface boundary="periodic" coeffs="-0.5773502691896257 1.0 0.0 10.0" id="4" periodic_surface_id="5" type="plane" />
+    <surface boundary="periodic" coeffs="-0.5773502691896257 1.0 0.0 -10.0" id="5" periodic_surface_id="4" type="plane" />
+    <surface boundary="periodic" coeffs="0.5773502691896257 1.0 0.0 -10.0" id="6" periodic_surface_id="3" type="plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/photon_production/inputs_true.dat b/tests/regression_tests/photon_production/inputs_true.dat
index 09f1fd290..0b2b43468 100644
--- a/tests/regression_tests/photon_production/inputs_true.dat
+++ b/tests/regression_tests/photon_production/inputs_true.dat
@@ -1,68 +1,67 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="void" region="-1 2 -3" universe="1" />
-  <cell id="2" material="1" region="-1 3 -4" universe="1" />
-  <cell id="3" material="void" region="~(-1 2 -4)" universe="1" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="x-cylinder" />
-  <surface boundary="vacuum" coeffs="-1.0" id="2" type="x-plane" />
-  <surface coeffs="1.0" id="3" type="x-plane" />
-  <surface boundary="vacuum" coeffs="1000000000.0" id="4" type="x-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material id="1">
-    <density units="g/cm3" value="2.6989" />
-    <nuclide ao="1.0" name="Al27" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>10000</particles>
-  <batches>1</batches>
-  <source strength="1.0">
-    <space type="point">
-      <parameters>0 0 0</parameters>
-    </space>
-    <angle reference_uvw="1.0 0.0 0.0" type="monodirectional" />
-    <energy type="discrete">
-      <parameters>14000000.0 1.0</parameters>
-    </energy>
-  </source>
-  <electron_treatment>ttb</electron_treatment>
-  <photon_transport>true</photon_transport>
-  <cutoff>
-    <energy_photon>1000.0</energy_photon>
-  </cutoff>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="surface">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="particle">
-    <bins>neutron photon electron positron</bins>
-  </filter>
-  <tally id="1">
-    <filters>1 2</filters>
-    <scores>current</scores>
-  </tally>
-  <tally id="2">
-    <filters>2</filters>
-    <nuclides>Al27 total</nuclides>
-    <scores>total (n,gamma)</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="3">
-    <filters>2</filters>
-    <nuclides>Al27 total</nuclides>
-    <scores>total heating (n,gamma)</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="4">
-    <filters>2</filters>
-    <nuclides>Al27 total</nuclides>
-    <scores>total heating (n,gamma)</scores>
-    <estimator>analog</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material id="1">
+      <density units="g/cm3" value="2.6989" />
+      <nuclide ao="1.0" name="Al27" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="void" region="-1 2 -3" universe="1" />
+    <cell id="2" material="1" region="-1 3 -4" universe="1" />
+    <cell id="3" material="void" region="~(-1 2 -4)" universe="1" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="x-cylinder" />
+    <surface boundary="vacuum" coeffs="-1.0" id="2" type="x-plane" />
+    <surface coeffs="1.0" id="3" type="x-plane" />
+    <surface boundary="vacuum" coeffs="1000000000.0" id="4" type="x-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>10000</particles>
+    <batches>1</batches>
+    <source strength="1.0">
+      <space type="point">
+        <parameters>0 0 0</parameters>
+      </space>
+      <angle reference_uvw="1.0 0.0 0.0" type="monodirectional" />
+      <energy type="discrete">
+        <parameters>14000000.0 1.0</parameters>
+      </energy>
+    </source>
+    <electron_treatment>ttb</electron_treatment>
+    <photon_transport>true</photon_transport>
+    <cutoff>
+      <energy_photon>1000.0</energy_photon>
+    </cutoff>
+  </settings>
+  <tallies>
+    <filter id="1" type="surface">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="particle">
+      <bins>neutron photon electron positron</bins>
+    </filter>
+    <tally id="1">
+      <filters>1 2</filters>
+      <scores>current</scores>
+    </tally>
+    <tally id="2">
+      <filters>2</filters>
+      <nuclides>Al27 total</nuclides>
+      <scores>total (n,gamma)</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="3">
+      <filters>2</filters>
+      <nuclides>Al27 total</nuclides>
+      <scores>total heating (n,gamma)</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="4">
+      <filters>2</filters>
+      <nuclides>Al27 total</nuclides>
+      <scores>total heating (n,gamma)</scores>
+      <estimator>analog</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/photon_production_fission/inputs_true.dat b/tests/regression_tests/photon_production_fission/inputs_true.dat
index c317f6273..ea6e9d9ee 100644
--- a/tests/regression_tests/photon_production_fission/inputs_true.dat
+++ b/tests/regression_tests/photon_production_fission/inputs_true.dat
@@ -1,49 +1,48 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <surface boundary="reflective" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cm3" value="10.0" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>5</batches>
-  <inactive>2</inactive>
-  <source strength="1.0">
-    <space type="point">
-      <parameters>0 0 0</parameters>
-    </space>
-  </source>
-  <photon_transport>true</photon_transport>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="particle">
-    <bins>neutron photon</bins>
-  </filter>
-  <tally id="1">
-    <filters>1</filters>
-    <nuclides>U235 total</nuclides>
-    <scores>fission heating-local</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="2">
-    <filters>1</filters>
-    <nuclides>U235 total</nuclides>
-    <scores>fission heating heating-local</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="3">
-    <filters>1</filters>
-    <nuclides>U235 total</nuclides>
-    <scores>fission heating heating-local</scores>
-    <estimator>analog</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cm3" value="10.0" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <surface boundary="reflective" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>5</batches>
+    <inactive>2</inactive>
+    <source strength="1.0">
+      <space type="point">
+        <parameters>0 0 0</parameters>
+      </space>
+    </source>
+    <photon_transport>true</photon_transport>
+  </settings>
+  <tallies>
+    <filter id="1" type="particle">
+      <bins>neutron photon</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <nuclides>U235 total</nuclides>
+      <scores>fission heating-local</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="2">
+      <filters>1</filters>
+      <nuclides>U235 total</nuclides>
+      <scores>fission heating heating-local</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="3">
+      <filters>1</filters>
+      <nuclides>U235 total</nuclides>
+      <scores>fission heating heating-local</scores>
+      <estimator>analog</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/photon_source/inputs_true.dat b/tests/regression_tests/photon_source/inputs_true.dat
index f7c9c24b4..4c61b47fc 100644
--- a/tests/regression_tests/photon_source/inputs_true.dat
+++ b/tests/regression_tests/photon_source/inputs_true.dat
@@ -1,45 +1,44 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="13" material="13" region="-9" universe="9" />
-  <surface boundary="reflective" coeffs="0.0 0.0 0.0 1000000000.0" id="9" type="sphere" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material id="13">
-    <density units="g/cm3" value="0.998207" />
-    <nuclide ao="0.11187657362844" name="H1" />
-    <nuclide ao="1.7426371559999997e-05" name="H2" />
-    <nuclide ao="0.8877694078259999" name="O16" />
-    <nuclide ao="0.000336592174" name="O17" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>10000</particles>
-  <batches>1</batches>
-  <source particle="photon" strength="1.0">
-    <space type="point">
-      <parameters>0 0 0</parameters>
-    </space>
-    <angle type="isotropic" />
-    <energy type="discrete">
-      <parameters>10000000.0 1.0</parameters>
-    </energy>
-  </source>
-  <electron_treatment>ttb</electron_treatment>
-  <photon_transport>true</photon_transport>
-  <cutoff>
-    <energy_photon>1000.0</energy_photon>
-  </cutoff>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="particle">
-    <bins>photon</bins>
-  </filter>
-  <tally id="1">
-    <filters>1</filters>
-    <scores>flux (n,gamma)</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material id="1">
+      <density units="g/cm3" value="0.998207" />
+      <nuclide ao="0.11187657362844" name="H1" />
+      <nuclide ao="1.7426371559999997e-05" name="H2" />
+      <nuclide ao="0.8877694078259999" name="O16" />
+      <nuclide ao="0.000336592174" name="O17" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <surface boundary="reflective" coeffs="0.0 0.0 0.0 1000000000.0" id="1" type="sphere" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>10000</particles>
+    <batches>1</batches>
+    <source particle="photon" strength="1.0">
+      <space type="point">
+        <parameters>0 0 0</parameters>
+      </space>
+      <angle type="isotropic" />
+      <energy type="discrete">
+        <parameters>10000000.0 1.0</parameters>
+      </energy>
+    </source>
+    <electron_treatment>ttb</electron_treatment>
+    <photon_transport>true</photon_transport>
+    <cutoff>
+      <energy_photon>1000.0</energy_photon>
+    </cutoff>
+  </settings>
+  <tallies>
+    <filter id="1" type="particle">
+      <bins>photon</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>flux (n,gamma)</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/photon_source/test.py b/tests/regression_tests/photon_source/test.py
index a2bfb9038..d4b4a69fd 100644
--- a/tests/regression_tests/photon_source/test.py
+++ b/tests/regression_tests/photon_source/test.py
@@ -7,20 +7,19 @@ from tests.testing_harness import PyAPITestHarness
 
 
 class SourceTestHarness(PyAPITestHarness):
-    def _build_inputs(self):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         mat = openmc.Material()
         mat.set_density('g/cm3', 0.998207)
         mat.add_element('H', 0.111894)
         mat.add_element('O', 0.888106)
-        materials = openmc.Materials([mat])
-        materials.export_to_xml()
+        self._model.materials = openmc.Materials([mat])
 
         sphere = openmc.Sphere(r=1.0e9, boundary_type='reflective')
         inside_sphere = openmc.Cell()
         inside_sphere.region = -sphere
         inside_sphere.fill = mat
-        geometry = openmc.Geometry([inside_sphere])
-        geometry.export_to_xml()
+        self._model.geometry = openmc.Geometry([inside_sphere])
 
         source = openmc.Source()
         source.space = openmc.stats.Point((0, 0, 0))
@@ -36,16 +35,16 @@ class SourceTestHarness(PyAPITestHarness):
         settings.cutoff = {'energy_photon' : 1000.0}
         settings.run_mode = 'fixed source'
         settings.source = source
-        settings.export_to_xml()
+        self._model.settings = settings
 
         particle_filter = openmc.ParticleFilter('photon')
         tally = openmc.Tally()
         tally.filters = [particle_filter]
         tally.scores = ['flux', '(n,gamma)']
         tallies = openmc.Tallies([tally])
-        tallies.export_to_xml()
+        self._model.tallies = tallies
 
 
 def test_photon_source():
-    harness = SourceTestHarness('statepoint.1.h5')
+    harness = SourceTestHarness('statepoint.1.h5', model=openmc.Model())
     harness.main()
diff --git a/tests/regression_tests/resonance_scattering/inputs_true.dat b/tests/regression_tests/resonance_scattering/inputs_true.dat
index 57a5e1a4b..7165fa72b 100644
--- a/tests/regression_tests/resonance_scattering/inputs_true.dat
+++ b/tests/regression_tests/resonance_scattering/inputs_true.dat
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-9" universe="0" />
-  <surface boundary="reflective" coeffs="100" id="9" type="x-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cc" value="1.0" />
-    <nuclide ao="1.0" name="U238" />
-    <nuclide ao="0.02" name="U235" />
-    <nuclide ao="0.02" name="Pu239" />
-    <nuclide ao="20.0" name="H1" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-4 -4 -4 4 4 4</parameters>
-    </space>
-  </source>
-  <resonance_scattering>
-    <enable>true</enable>
-    <method>rvs</method>
-    <energy_min>1.0</energy_min>
-    <energy_max>210.0</energy_max>
-    <nuclides>U238 U235 Pu239</nuclides>
-  </resonance_scattering>
-</settings>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="1.0" />
+      <nuclide ao="1.0" name="U238" />
+      <nuclide ao="0.02" name="U235" />
+      <nuclide ao="0.02" name="Pu239" />
+      <nuclide ao="20.0" name="H1" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="0" />
+    <surface boundary="reflective" coeffs="100" id="1" type="x-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-4 -4 -4 4 4 4</parameters>
+      </space>
+    </source>
+    <resonance_scattering>
+      <enable>true</enable>
+      <method>rvs</method>
+      <energy_min>1.0</energy_min>
+      <energy_max>210.0</energy_max>
+      <nuclides>U238 U235 Pu239</nuclides>
+    </resonance_scattering>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/resonance_scattering/test.py b/tests/regression_tests/resonance_scattering/test.py
index e77dd9258..d9f76fac5 100644
--- a/tests/regression_tests/resonance_scattering/test.py
+++ b/tests/regression_tests/resonance_scattering/test.py
@@ -4,7 +4,8 @@ from tests.testing_harness import PyAPITestHarness
 
 
 class ResonanceScatteringTestHarness(PyAPITestHarness):
-    def _build_inputs(self):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         # Materials
         mat = openmc.Material(material_id=1)
         mat.set_density('g/cc', 1.0)
@@ -13,15 +14,13 @@ class ResonanceScatteringTestHarness(PyAPITestHarness):
         mat.add_nuclide('Pu239', 0.02)
         mat.add_nuclide('H1', 20.0)
 
-        mats_file = openmc.Materials([mat])
-        mats_file.export_to_xml()
+        self._model.materials = openmc.Materials([mat])
 
         # Geometry
         dumb_surface = openmc.XPlane(100, boundary_type='reflective')
         c1 = openmc.Cell(cell_id=1, fill=mat, region=-dumb_surface)
         root_univ = openmc.Universe(universe_id=0, cells=[c1])
-        geometry = openmc.Geometry(root_univ)
-        geometry.export_to_xml()
+        self._model.geometry = openmc.Geometry(root_univ)
 
         # Resonance elastic scattering settings
         res_scat_settings = {
@@ -39,9 +38,10 @@ class ResonanceScatteringTestHarness(PyAPITestHarness):
         settings.source = openmc.source.Source(
              space=openmc.stats.Box([-4, -4, -4], [4, 4, 4]))
         settings.resonance_scattering = res_scat_settings
-        settings.export_to_xml()
+        self._model.settings = settings
 
 
 def test_resonance_scattering():
-    harness = ResonanceScatteringTestHarness('statepoint.10.h5')
+    harness = ResonanceScatteringTestHarness('statepoint.10.h5',
+                                             model=openmc.Model())
     harness.main()
diff --git a/tests/regression_tests/salphabeta/inputs_true.dat b/tests/regression_tests/salphabeta/inputs_true.dat
index 29d8065cf..31a81b2c8 100644
--- a/tests/regression_tests/salphabeta/inputs_true.dat
+++ b/tests/regression_tests/salphabeta/inputs_true.dat
@@ -1,60 +1,60 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="1 -2" universe="1" />
-  <cell id="2" material="2" region="2 -3" universe="1" />
-  <cell id="3" material="3" region="3 -4" universe="1" />
-  <cell id="4" material="4" region="4 -5" universe="1" />
-  <surface boundary="vacuum" coeffs="-10" id="1" type="x-plane" />
-  <surface coeffs="-5" id="2" type="x-plane" />
-  <surface coeffs="0" id="3" type="x-plane" />
-  <surface coeffs="5" id="4" type="x-plane" />
-  <surface boundary="vacuum" coeffs="10" id="5" type="x-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-    <nuclide ao="1.0" name="H1" />
-    <sab fraction="0.5" name="c_H_in_H2O" />
-  </material>
-  <material depletable="true" id="2">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-    <nuclide ao="1.0" name="C0" />
-    <sab name="c_Graphite" />
-  </material>
-  <material depletable="true" id="3">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-    <nuclide ao="1.0" name="Be9" />
-    <nuclide ao="1.0" name="O16" />
-    <sab name="c_Be_in_BeO" />
-    <sab name="c_O_in_BeO" />
-  </material>
-  <material depletable="true" id="4">
-    <density units="g/cm3" value="5.90168" />
-    <nuclide ao="0.3" name="H1" />
-    <nuclide ao="0.15" name="Zr90" />
-    <nuclide ao="0.1" name="Zr91" />
-    <nuclide ao="0.1" name="Zr92" />
-    <nuclide ao="0.05" name="Zr94" />
-    <nuclide ao="0.05" name="Zr96" />
-    <nuclide ao="0.1" name="U235" />
-    <nuclide ao="0.15" name="U238" />
-    <sab name="c_Zr_in_ZrH" />
-    <sab name="c_H_in_ZrH" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>400</particles>
-  <batches>5</batches>
-  <inactive>0</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-4 -4 -4 4 4 4</parameters>
-    </space>
-  </source>
-</settings>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+      <nuclide ao="1.0" name="H1" />
+      <sab fraction="0.5" name="c_H_in_H2O" />
+    </material>
+    <material depletable="true" id="2">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+      <nuclide ao="1.0" name="C0" />
+      <sab name="c_Graphite" />
+    </material>
+    <material depletable="true" id="3">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+      <nuclide ao="1.0" name="Be9" />
+      <nuclide ao="1.0" name="O16" />
+      <sab name="c_Be_in_BeO" />
+      <sab name="c_O_in_BeO" />
+    </material>
+    <material depletable="true" id="4">
+      <density units="g/cm3" value="5.90168" />
+      <nuclide ao="0.3" name="H1" />
+      <nuclide ao="0.15" name="Zr90" />
+      <nuclide ao="0.1" name="Zr91" />
+      <nuclide ao="0.1" name="Zr92" />
+      <nuclide ao="0.05" name="Zr94" />
+      <nuclide ao="0.05" name="Zr96" />
+      <nuclide ao="0.1" name="U235" />
+      <nuclide ao="0.15" name="U238" />
+      <sab name="c_Zr_in_ZrH" />
+      <sab name="c_H_in_ZrH" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="1 -2" universe="1" />
+    <cell id="2" material="2" region="2 -3" universe="1" />
+    <cell id="3" material="3" region="3 -4" universe="1" />
+    <cell id="4" material="4" region="4 -5" universe="1" />
+    <surface boundary="vacuum" coeffs="-10" id="1" type="x-plane" />
+    <surface coeffs="-5" id="2" type="x-plane" />
+    <surface coeffs="0" id="3" type="x-plane" />
+    <surface coeffs="5" id="4" type="x-plane" />
+    <surface boundary="vacuum" coeffs="10" id="5" type="x-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>400</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-4 -4 -4 4 4 4</parameters>
+      </space>
+    </source>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/score_current/inputs_true.dat b/tests/regression_tests/score_current/inputs_true.dat
index 2b81f508f..f9c9ba494 100644
--- a/tests/regression_tests/score_current/inputs_true.dat
+++ b/tests/regression_tests/score_current/inputs_true.dat
@@ -1,55 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1" />
-  <cell id="2" material="2" region="~(1 -2 3 -4) (5 -6 7 -8) 10 -9" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane" />
-  <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane" />
-  <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane" />
-  <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cm3" value="10.0" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2">
-    <density units="g/cm3" value="1.0" />
-    <nuclide ao="1.0" name="Zr90" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>5</batches>
-  <inactive>0</inactive>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>3 3 3</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <filter id="1" type="meshsurface">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="energy">
-    <bins>0.0 0.253 20000000.0</bins>
-  </filter>
-  <tally id="1">
-    <filters>1</filters>
-    <scores>current</scores>
-  </tally>
-  <tally id="2">
-    <filters>1 2</filters>
-    <scores>current</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cm3" value="10.0" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2">
+      <density units="g/cm3" value="1.0" />
+      <nuclide ao="1.0" name="Zr90" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1" />
+    <cell id="2" material="2" region="~(1 -2 3 -4) (5 -6 7 -8) 10 -9" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane" />
+    <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>3 3 3</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <filter id="1" type="meshsurface">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="energy">
+      <bins>0.0 0.253 20000000.0</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>current</scores>
+    </tally>
+    <tally id="2">
+      <filters>1 2</filters>
+      <scores>current</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/source/inputs_true.dat b/tests/regression_tests/source/inputs_true.dat
index c9c9c4277..adf60c814 100644
--- a/tests/regression_tests/source/inputs_true.dat
+++ b/tests/regression_tests/source/inputs_true.dat
@@ -1,150 +1,150 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="0" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" temperature="294">
-    <density units="g/cm3" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="0.3">
-    <space type="cartesian">
-      <x parameters="-3.0 3.0" type="uniform" />
-      <y type="discrete">
-        <parameters>-4.0 -1.0 3.0 0.2 0.3 0.5</parameters>
-      </y>
-      <z interpolation="linear-linear" type="tabular">
-        <parameters>-2.0 0.0 2.0 0.2 0.3 0.2</parameters>
-      </z>
-    </space>
-    <angle reference_uvw="0.0 0.0 1.0" type="mu-phi">
-      <mu type="discrete">
-        <parameters>-1.0 0.0 1.0 0.5 0.25 0.25</parameters>
-      </mu>
-      <phi parameters="0.0 6.28318530718" type="uniform" />
-    </angle>
-    <energy parameters="1289500.0" type="maxwell" />
-  </source>
-  <source strength="0.1">
-    <space type="box">
-      <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
-    </space>
-    <angle reference_uvw="0.0 1.0 0.0" type="monodirectional" />
-    <energy parameters="988000.0 2.249e-06" type="watt" />
-  </source>
-  <source strength="0.1">
-    <space type="point">
-      <parameters>1.2 -2.3 0.781</parameters>
-    </space>
-    <angle type="isotropic" />
-    <energy interpolation="histogram" type="tabular">
-      <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
-    </energy>
-  </source>
-  <source strength="0.1">
-    <space origin="1.0 1.0 0.0" type="spherical">
-      <r parameters="2.0 3.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>0.7071067811865476 0.0 -0.7071067811865475 0.3 0.4 0.3</parameters>
-      </cos_theta>
-      <phi parameters="0.0 6.283185307179586" type="uniform" />
-    </space>
-    <angle type="isotropic" />
-    <energy interpolation="histogram" type="tabular">
-      <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
-    </energy>
-  </source>
-  <source strength="0.1">
-    <space origin="1.0 1.0 0.0" type="cylindrical">
-      <r parameters="2.0 3.0" type="uniform" />
-      <phi parameters="0.0 6.283185307179586" type="uniform" />
-      <z interpolation="linear-linear" type="tabular">
-        <parameters>-2.0 0.0 2.0 0.2 0.3 0.2</parameters>
-      </z>
-    </space>
-    <angle type="isotropic" />
-    <energy interpolation="histogram" type="tabular">
-      <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
-    </energy>
-  </source>
-  <source strength="0.1">
-    <space origin="1.0 1.0 0.0" type="cylindrical">
-      <r parameters="2.0 3.0" type="uniform" />
-      <phi parameters="0.0 6.283185307179586" type="uniform" />
-      <z interpolation="linear-linear" type="tabular">
-        <parameters>-2.0 0.0 2.0 0.2 0.3 0.2</parameters>
-      </z>
-    </space>
-    <angle type="isotropic" />
-    <energy type="mixture">
-      <pair probability="1">
-        <dist parameters="1289500.0" type="maxwell" />
-      </pair>
-      <pair probability="2">
-        <dist parameters="988000.0 2.249e-06" type="watt" />
-      </pair>
-      <pair probability="3">
-        <dist interpolation="histogram" type="tabular">
-          <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
-        </dist>
-      </pair>
-    </energy>
-  </source>
-  <source strength="0.1">
-    <space origin="1.0 1.0 0.0" type="spherical">
-      <r parameters="2.0 3.0 2.0" type="powerlaw" />
-      <cos_theta type="discrete">
-        <parameters>0.7071067811865476 0.0 -0.7071067811865475 0.3 0.4 0.3</parameters>
-      </cos_theta>
-      <phi parameters="0.0 6.283185307179586" type="uniform" />
-    </space>
-    <angle type="isotropic" />
-    <energy type="mixture">
-      <pair probability="1">
-        <dist parameters="1289500.0" type="maxwell" />
-      </pair>
-      <pair probability="2">
-        <dist parameters="988000.0 2.249e-06" type="watt" />
-      </pair>
-      <pair probability="3">
-        <dist interpolation="histogram" type="tabular">
-          <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
-        </dist>
-      </pair>
-    </energy>
-    <time parameters="2 5" type="uniform" />
-  </source>
-  <source strength="0.1">
-    <space origin="1.0 1.0 0.0" type="cylindrical">
-      <r parameters="2.0 3.0 1.0" type="powerlaw" />
-      <phi parameters="0.0 6.283185307179586" type="uniform" />
-      <z interpolation="linear-linear" type="tabular">
-        <parameters>-2.0 0.0 2.0 0.2 0.3 0.2</parameters>
-      </z>
-    </space>
-    <angle type="isotropic" />
-    <energy type="mixture">
-      <pair probability="1">
-        <dist parameters="1289500.0" type="maxwell" />
-      </pair>
-      <pair probability="2">
-        <dist parameters="988000.0 2.249e-06" type="watt" />
-      </pair>
-      <pair probability="3">
-        <dist interpolation="histogram" type="tabular">
-          <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
-        </dist>
-      </pair>
-    </energy>
-    <time parameters="2 5" type="uniform" />
-  </source>
-</settings>
+<model>
+  <materials>
+    <material depletable="true" id="1" temperature="294">
+      <density units="g/cm3" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="0" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="0.3">
+      <space type="cartesian">
+        <x parameters="-3.0 3.0" type="uniform" />
+        <y type="discrete">
+          <parameters>-4.0 -1.0 3.0 0.2 0.3 0.5</parameters>
+        </y>
+        <z interpolation="linear-linear" type="tabular">
+          <parameters>-2.0 0.0 2.0 0.2 0.3 0.2</parameters>
+        </z>
+      </space>
+      <angle reference_uvw="0.0 0.0 1.0" type="mu-phi">
+        <mu type="discrete">
+          <parameters>-1.0 0.0 1.0 0.5 0.25 0.25</parameters>
+        </mu>
+        <phi parameters="0.0 6.28318530718" type="uniform" />
+      </angle>
+      <energy parameters="1289500.0" type="maxwell" />
+    </source>
+    <source strength="0.1">
+      <space type="box">
+        <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
+      </space>
+      <angle reference_uvw="0.0 1.0 0.0" type="monodirectional" />
+      <energy parameters="988000.0 2.249e-06" type="watt" />
+    </source>
+    <source strength="0.1">
+      <space type="point">
+        <parameters>1.2 -2.3 0.781</parameters>
+      </space>
+      <angle type="isotropic" />
+      <energy interpolation="histogram" type="tabular">
+        <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
+      </energy>
+    </source>
+    <source strength="0.1">
+      <space origin="1.0 1.0 0.0" type="spherical">
+        <r parameters="2.0 3.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>0.7071067811865476 0.0 -0.7071067811865475 0.3 0.4 0.3</parameters>
+        </cos_theta>
+        <phi parameters="0.0 6.283185307179586" type="uniform" />
+      </space>
+      <angle type="isotropic" />
+      <energy interpolation="histogram" type="tabular">
+        <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
+      </energy>
+    </source>
+    <source strength="0.1">
+      <space origin="1.0 1.0 0.0" type="cylindrical">
+        <r parameters="2.0 3.0" type="uniform" />
+        <phi parameters="0.0 6.283185307179586" type="uniform" />
+        <z interpolation="linear-linear" type="tabular">
+          <parameters>-2.0 0.0 2.0 0.2 0.3 0.2</parameters>
+        </z>
+      </space>
+      <angle type="isotropic" />
+      <energy interpolation="histogram" type="tabular">
+        <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
+      </energy>
+    </source>
+    <source strength="0.1">
+      <space origin="1.0 1.0 0.0" type="cylindrical">
+        <r parameters="2.0 3.0" type="uniform" />
+        <phi parameters="0.0 6.283185307179586" type="uniform" />
+        <z interpolation="linear-linear" type="tabular">
+          <parameters>-2.0 0.0 2.0 0.2 0.3 0.2</parameters>
+        </z>
+      </space>
+      <angle type="isotropic" />
+      <energy type="mixture">
+        <pair probability="1">
+          <dist parameters="1289500.0" type="maxwell" />
+        </pair>
+        <pair probability="2">
+          <dist parameters="988000.0 2.249e-06" type="watt" />
+        </pair>
+        <pair probability="3">
+          <dist interpolation="histogram" type="tabular">
+            <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
+          </dist>
+        </pair>
+      </energy>
+    </source>
+    <source strength="0.1">
+      <space origin="1.0 1.0 0.0" type="spherical">
+        <r parameters="2.0 3.0 2.0" type="powerlaw" />
+        <cos_theta type="discrete">
+          <parameters>0.7071067811865476 0.0 -0.7071067811865475 0.3 0.4 0.3</parameters>
+        </cos_theta>
+        <phi parameters="0.0 6.283185307179586" type="uniform" />
+      </space>
+      <angle type="isotropic" />
+      <energy type="mixture">
+        <pair probability="1">
+          <dist parameters="1289500.0" type="maxwell" />
+        </pair>
+        <pair probability="2">
+          <dist parameters="988000.0 2.249e-06" type="watt" />
+        </pair>
+        <pair probability="3">
+          <dist interpolation="histogram" type="tabular">
+            <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
+          </dist>
+        </pair>
+      </energy>
+      <time parameters="2 5" type="uniform" />
+    </source>
+    <source strength="0.1">
+      <space origin="1.0 1.0 0.0" type="cylindrical">
+        <r parameters="2.0 3.0 1.0" type="powerlaw" />
+        <phi parameters="0.0 6.283185307179586" type="uniform" />
+        <z interpolation="linear-linear" type="tabular">
+          <parameters>-2.0 0.0 2.0 0.2 0.3 0.2</parameters>
+        </z>
+      </space>
+      <angle type="isotropic" />
+      <energy type="mixture">
+        <pair probability="1">
+          <dist parameters="1289500.0" type="maxwell" />
+        </pair>
+        <pair probability="2">
+          <dist parameters="988000.0 2.249e-06" type="watt" />
+        </pair>
+        <pair probability="3">
+          <dist interpolation="histogram" type="tabular">
+            <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
+          </dist>
+        </pair>
+      </energy>
+      <time parameters="2 5" type="uniform" />
+    </source>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/source/test.py b/tests/regression_tests/source/test.py
index a1175c48f..af9e67baa 100644
--- a/tests/regression_tests/source/test.py
+++ b/tests/regression_tests/source/test.py
@@ -7,12 +7,12 @@ from tests.testing_harness import PyAPITestHarness
 
 
 class SourceTestHarness(PyAPITestHarness):
-    def _build_inputs(self):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         mat1 = openmc.Material(material_id=1, temperature=294)
         mat1.set_density('g/cm3', 4.5)
         mat1.add_nuclide(openmc.Nuclide('U235'), 1.0)
-        materials = openmc.Materials([mat1])
-        materials.export_to_xml()
+        self._model.materials = openmc.Materials([mat1])
 
         sphere = openmc.Sphere(surface_id=1, r=10.0, boundary_type='vacuum')
         inside_sphere = openmc.Cell(cell_id=1)
@@ -21,9 +21,7 @@ class SourceTestHarness(PyAPITestHarness):
 
         root = openmc.Universe(universe_id=0)
         root.add_cell(inside_sphere)
-        geometry = openmc.Geometry()
-        geometry.root_universe = root
-        geometry.export_to_xml()
+        self._model.geometry = openmc.Geometry(root)
 
         # Create an array of different sources
         x_dist = openmc.stats.Uniform(-3., 3.)
@@ -84,9 +82,9 @@ class SourceTestHarness(PyAPITestHarness):
         settings.inactive = 5
         settings.particles = 1000
         settings.source = [source1, source2, source3, source4, source5, source6, source7, source8]
-        settings.export_to_xml()
+        self._model.settings = settings
 
 
 def test_source():
-    harness = SourceTestHarness('statepoint.10.h5')
+    harness = SourceTestHarness('statepoint.10.h5', model=openmc.Model())
     harness.main()
diff --git a/tests/regression_tests/source_dlopen/inputs_true.dat b/tests/regression_tests/source_dlopen/inputs_true.dat
index 23878ac20..1a447ae3d 100644
--- a/tests/regression_tests/source_dlopen/inputs_true.dat
+++ b/tests/regression_tests/source_dlopen/inputs_true.dat
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100" id="1" type="sphere" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material id="1" name="natural_lead">
-    <density units="g/cm3" value="11.34" />
-    <nuclide ao="0.014" name="Pb204" />
-    <nuclide ao="0.241" name="Pb206" />
-    <nuclide ao="0.221" name="Pb207" />
-    <nuclide ao="0.524" name="Pb208" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <inactive>0</inactive>
-  <source library="build/libsource.so" strength="1.0" />
-</settings>
+<model>
+  <materials>
+    <material id="1" name="natural_lead">
+      <density units="g/cm3" value="11.34" />
+      <nuclide ao="0.014" name="Pb204" />
+      <nuclide ao="0.241" name="Pb206" />
+      <nuclide ao="0.221" name="Pb207" />
+      <nuclide ao="0.524" name="Pb208" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100" id="1" type="sphere" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>0</inactive>
+    <source library="build/libsource.so" strength="1.0" />
+  </settings>
+  </model>
diff --git a/tests/regression_tests/source_parameterized_dlopen/inputs_true.dat b/tests/regression_tests/source_parameterized_dlopen/inputs_true.dat
index f4a0eba73..208030e2e 100644
--- a/tests/regression_tests/source_parameterized_dlopen/inputs_true.dat
+++ b/tests/regression_tests/source_parameterized_dlopen/inputs_true.dat
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100" id="1" type="sphere" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material id="1" name="natural_lead">
-    <density units="g/cm3" value="11.34" />
-    <nuclide ao="0.014" name="Pb204" />
-    <nuclide ao="0.241" name="Pb206" />
-    <nuclide ao="0.221" name="Pb207" />
-    <nuclide ao="0.524" name="Pb208" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <inactive>0</inactive>
-  <source library="build/libsource.so" parameters="1e3" strength="1.0" />
-</settings>
+<model>
+  <materials>
+    <material id="1" name="natural_lead">
+      <density units="g/cm3" value="11.34" />
+      <nuclide ao="0.014" name="Pb204" />
+      <nuclide ao="0.241" name="Pb206" />
+      <nuclide ao="0.221" name="Pb207" />
+      <nuclide ao="0.524" name="Pb208" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100" id="1" type="sphere" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>0</inactive>
+    <source library="build/libsource.so" parameters="1e3" strength="1.0" />
+  </settings>
+  </model>
diff --git a/tests/regression_tests/surface_source/inputs_true_read.dat b/tests/regression_tests/surface_source/inputs_true_read.dat
index 3a122c737..fb843a6d1 100644
--- a/tests/regression_tests/surface_source/inputs_true_read.dat
+++ b/tests/regression_tests/surface_source/inputs_true_read.dat
@@ -1,34 +1,33 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="void" region="-1" universe="1" />
-  <cell id="2" material="void" region="1 -2" universe="1" />
-  <cell id="3" material="void" region="2 -3" universe="1" />
-  <cell id="4" material="void" region="3 -4" universe="1" />
-  <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 2.0" id="2" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 2.5" id="3" type="sphere" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 0.0 4.0" id="4" type="sphere" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <surf_source_read>
-    <path>surface_source_true.h5</path>
-  </surf_source_read>
-  <seed>1</seed>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="cell">
-    <bins>3</bins>
-  </filter>
-  <tally id="1">
-    <filters>1</filters>
-    <scores>flux</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+  </materials>
+  <geometry>
+    <cell id="1" material="void" region="-1" universe="1" />
+    <cell id="2" material="void" region="1 -2" universe="1" />
+    <cell id="3" material="void" region="2 -3" universe="1" />
+    <cell id="4" material="void" region="3 -4" universe="1" />
+    <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 2.0" id="2" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 2.5" id="3" type="sphere" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 4.0" id="4" type="sphere" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <surf_source_read>
+      <path>surface_source_true.h5</path>
+    </surf_source_read>
+    <seed>1</seed>
+  </settings>
+  <tallies>
+    <filter id="1" type="cell">
+      <bins>3</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/surface_source/inputs_true_write.dat b/tests/regression_tests/surface_source/inputs_true_write.dat
index 48dde9900..dbdf22395 100644
--- a/tests/regression_tests/surface_source/inputs_true_write.dat
+++ b/tests/regression_tests/surface_source/inputs_true_write.dat
@@ -1,40 +1,39 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="void" region="-1" universe="1" />
-  <cell id="2" material="void" region="1 -2" universe="1" />
-  <cell id="3" material="void" region="2 -3" universe="1" />
-  <cell id="4" material="void" region="3 -4" universe="1" />
-  <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 2.0" id="2" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 2.5" id="3" type="sphere" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 0.0 4.0" id="4" type="sphere" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space type="point">
-      <parameters>0 0 0</parameters>
-    </space>
-  </source>
-  <surf_source_write>
-    <surface_ids>1</surface_ids>
-    <max_particles>1000</max_particles>
-  </surf_source_write>
-  <seed>1</seed>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="cell">
-    <bins>3</bins>
-  </filter>
-  <tally id="1">
-    <filters>1</filters>
-    <scores>flux</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+  </materials>
+  <geometry>
+    <cell id="1" material="void" region="-1" universe="1" />
+    <cell id="2" material="void" region="1 -2" universe="1" />
+    <cell id="3" material="void" region="2 -3" universe="1" />
+    <cell id="4" material="void" region="3 -4" universe="1" />
+    <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 2.0" id="2" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 2.5" id="3" type="sphere" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 4.0" id="4" type="sphere" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space type="point">
+        <parameters>0 0 0</parameters>
+      </space>
+    </source>
+    <surf_source_write>
+      <surface_ids>1</surface_ids>
+      <max_particles>1000</max_particles>
+    </surf_source_write>
+    <seed>1</seed>
+  </settings>
+  <tallies>
+    <filter id="1" type="cell">
+      <bins>3</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/surface_source/surface_source_true.h5 b/tests/regression_tests/surface_source/surface_source_true.h5
index c1b6402118e353f0e55f01ab33d0f034b3d777bc..9090c9fac498c9bf36710154a028cd48ad748e8b 100644
GIT binary patch
delta 11109
zcmYjXcUYI@_kM>9)J&Y<1Xth$N8$!egG$9MngdM*ZGfgZa^M8hl%t+BCr!;tZ5Wo7
zwv;9|44aab+Jq+7w|;k@`@Gln<F9j_=RV^-&pGEg&+}pL@oIaIS36X{dX>M^noNJH
zarNt6sZncGH3xskTuBel2$3&3a;yf)$9&1CMRKt#-c=;;^rYCh|8peExKDX<GCV^r
zc=e@cO)9<Bmx{2As{iSCC9TG^korEZ#Dq~%XJ2;ICRy%DK~0j^dXjHa%Ot)wr79uS
zkn2la8PR~`^R6V<CHaygCmWG`+LHsuz0H?1=HEd$(~!>mBc)eQ3%TXV_(n7^-;<oH
zxtt_nw%kP$>rC?;M|Rhl5yCH*OZAC=*^#)$v{&ItRDF`S`*Jy&TJDy-hBR_T7DkYI
zTvkL=`~_F?TT$j;M{-TvN9gU-dLo>y33$enBlSooI}&4J3p~kcLhcDi$|5rU^K)=L
z`WY{EBWS3fD?6exq;+*{OB-&>FP<#wK*^=99E&0Omn#t+==yP~Y)prr5Vr~SRB<G#
z6Oq`=geZ~&9T^crp+q^{k<hz5$u;P+*ox+ao^&K5GUVjzkuyS>kl@RR&J_MtHaDhl
ze^<^mqeQkZ5s6%1Cg(eF{cl%#^&s;_No-0tpOmELT(0U!YA=eruH=}eLEv^Ix0fgB
z7S~rCDQrsaN=Fu%sf7~Ro4Sr-U!%F6<I53K`<o}>*OL1`gscV0L&&aHbgP<_4x$3j
zm9j*x_x8lQhUBZ*trmo?k`fE=09TH*B=b7i-j4Efk-f=eE|<E4$$So)lBww>R|*G`
zTm-M|W4rotr46MHOUe*R{f=xgRsTrhKr;J4D2?*ID_Pf2sJbMz=lW}oB(&rDYV2NH
zl7kT|^FK+l(+Dl{<c!H5k+3*2=lS9dqteB4I-Sfat{iBeAyul@m*sJzLRGa!DsSZC
zzpk8&r^M@08pquoA}KAo+|8GhH*oo7i62Vl3Reo+(6wZwb7zuI`Et&_?GI04x{!OP
zFL5(SR&^yVfn=B?JBE_%i|BSI`362Yo#YZv3U4NP4Bg3;twjqMPp*TOXyNIOOz1)%
zua^_!=;I0aXwY0Fa4e+;f@>~3jaJx=QuC#B5<mP;$;+mEHEfT$6^?e%o5)iV-;L|*
z&^V@1>D}0g?p%LH;%9OFdHC0r>nV;T_awOh-715m>&a!)T2msI(0+B<7fbmb$SL!`
zAFA7gPGT#2(o~+r_9yf-T7tQ<61`^@*DK{xCn_BzMSX~T7Q2~4^DlUE><*Gk(TJ_S
zQqgm6C)dLs_9b~2#QKq}g}PoxvIY)_=_LE3#4U-gmAt+*mXFPvOJA-?*dY2+EJ<^?
z{E92Nw{v-wRQBicQK?Me@^!9c4B+xY8Q+i08&C*~XmXh+85ZB3zT^xdw6>HM5E|x6
z@c=^CWB;z_`kPX|l<UVmNnRLgjt?(nbM(QvjuOwI51O6TIHs3T_%DgJ<QU*d*<eB!
z`BK<}<X~4Wo1Lp9Y!B^(qq|yg6MZSTk<hpBA%m&)9$C1S(B+;aBys&lN4%9>e@)Wz
zx&ERjy;gC(iYFsdNEZ2$eh;C4%f3~Fu0bEP4@km3rV_ds?Y|G9LnPK3KpjW&ZG8h0
zbp)YrJ5u~8$(pWI^rciUnYxh%UPt#F!u6X_wKtJGhW5EB6x1G@8PpY+GWv57v(K4f
zTpZ5DC8&nc)clU@A2Ce^pheYqhG%9iq_Rb$H$HJYac{`Nk@VnsL~{o<ufrbQKyoNr
z{aTXAIM26}{2vZQ+u9U3zLngUaN3ypd*$#bs=XU+VFGQvE18?ftcqg3pF+7P#?d6}
zI+Fe}p|z!G452Uh5_LV-`{45)AbARX=Mj>5I6{U~YM8`6!o2@S_HCy8K-8t}Y$`T!
zABA2<fsLckCMh3F=u%&jCv*Kh)S3mO8Wg-q=v7kr2%#&HS`!G3zyLXs<Z(34R6_eo
ziUnXeD*Q>VpLQjD63NYIcZW&l<CLF7sbvy*mImse+$;%hK)y`pdWr0x%=LQ6vLlpV
z<w@#Pk}vv_HH>6GUk)52SquXQNuEIRn%KYSvb)F~gz?NY6hQA-a??;#WhAe5B`Sk1
zESJ28=t6aD_i?VT$1G?r)|a{?xd%5&<qRTULY=%w<Z4v<NNVaYVXt%jO&lm$Tt9<}
z<~folJvsLS$+}4OOp*;SKfXi-j+9KKf)Oa0nVigKTAg6-w|ct{8Fq-mH83vBrtr(M
z@DzpbL0a6(_4kqOr%0~BG5RXWSI`{Bkh}>!+QKuym+&j(M&N8KA^Daoi%eNVM{;J9
zo9jz%G3~liI-7R4I8tGIG1!xc=LrqNZr(=d30XLW(2<Uud!Nh=QaP8*4;<Z5#idj|
z+-)WjFjSI0AYd*0zJtuIGIbuAjU2gbC(=q^isw=Oq%XZ}JV-(VUO=f2W$L?>dKI;Q
z3!$SNx$+6gw^92a5$fsbt6gI2qtV<+z&2#LZTt{y{1kGBVY|Pe*ha~=90*56nbayo
z_AahBmXi6@`U-OBZpwdz9QlIeI{0;t<ZFoG6iOvaW+tUZJ6aKCF=~LW_ARmRpd!qI
zO5HMIeKbIutcK%|xr@-%zNDTec|E$;C6f1IOfzpHaT+cm_f@oO%Y&L|Fcz?Z2=fX$
zc2=Ulp|RIJO>J$CHN-hrP7Uv(kd~6X&yfRjNRGkj^&QDP%obJ@Rj^T3HEEaxe<NTM
zCYldOrl8nO*&39?3UZ?yDOgT-UX%FGSgW<fwTKPEQN5PSAIpkzdiw?%#Q!M%o~tLX
zF~=L>8kI}zb}9Lj*s3t~JF)o)LJrBXj)Z?nG8IL*n&j(fQfsK7iEPiMg0<+P>&YyY
z%@^rlZO!ap`PCR%XB9F+BLAV#DRk+7sdO{0)TVTY##eEvpqge^Hw7iQ^jM8vhlXj9
zy#ZtKdTMBjEzP3`Z|Div#Ma{iGM|8Ps7L#Rb-pg@V)2MX6>cKp9E$rFs<=uvTg8ra
z^*{~7p2p^wx%(Z>xY{MSx@OlmduLp|T+`SEQf{NtU}V$p#NH@HHp%4SkiD0No1r{6
zkUZt<h+3xL9xdu>dZSQ&3y2tnP%fsj@shHYq5K4QCR4W4(R209;bKqogHo!2e)bPl
z)Im{fB$<!h6q2WXDceG_Iliu$>3HAOE1r3DlUDXHkD9o;sG&gwF|;TT@g@I0D)|&$
z%Zh9?I;^SQg%^`$1f)B9riH0^)6*l3jNX8*VCeO}mbEhDVRC63zqT0JW=2{#ni_6^
zt2MEgdDqm{+%~4}16RYNjo#wwu^_xdC1o-7U5`$>n?8MptyoTS49*R+vfI&|K*dI!
z!7GWFfE(OSl5hHQOiA8@8aHh%9bMGdOgD2SwUCI<9gT~1|2zA1W30==??YFU8`y``
z)uOicAzKmJUEJ+GlC+m~@s_4V+WIgg_%3SQfLo@yo`NiDYj)p4yM34%zR>b^CU>u=
zXF8a<nv%VmipR>~b)+WB;X(!{+R>OK)79M7!j49N<Z42Dqqn)bqq)%$*u8!9XfMwF
zhe*Ed>$xC;!|@Vih>fUa3uY=#kc0H|OFbQDe!lJLj=;($+!n3G$LaYl)+B04>;`&z
zv!j=TO|R!^#vuE?7LxcF5$_;z9tzDIV;*MMV;oHnT4Nf{-UsRKy}ssjvJZL(jr2*f
z&m-I7jeQo4p|jDOJ&oyR)@n<(UB4!w5(6cQ;dg^ot?nCQU)K^dntjm?vd^4s<>(b;
zN9eJtKDPG&$wJIIPmp}q*W3g{yo;H~5Sx7Uu%{ux5x5#YL$b`#d^i_ke~kVF$<X^p
zfkaw8O?I^ST0>mrYgB-^Pm+XzOUDbzJydZcN;1{J(eU5KwAMJHo+jcwU&Dj%Zh&ks
zuOGm1Qbfd8jz$CxcqHy6kCVOG*OT2%^?TUBz^77I<9e9aqT{>U&TrS~p+?4NSZ|AI
z9W-0}@-`ST?aDF*#tUfWCY<<38G;f?Q-0tCeBe`Df6&n*!6rAv9D1DW3%KbRq5$R9
z)%+QynTck(#M8oF#y+Pm*r7OY(d|7AvBTBkG()t~lzzs(8kcvAOj}2eyg=v9Na-GG
zm?|r_ks2zQM@c;-r%%%LuQ6#HrH|rE!cIz0)TBP<z*Y?#ZDeab-`9+Of(hn0vF&8@
z3F>;^*NPyK8)<0})BEvGVYj#pG)TK;4fAD@O~4O3dZ3T(+!-7?LBptv>)9JL@{OE-
zo<_F#T7c~gCFE%A{$7$dqc;yQ_NT6<j<Z0uk*W5j*EpKn-w@l-hHcjW04W==cVdv;
zPkqxIP3URp#u&l&(2wB~YajcFqay-?@1sk;Ou4PT#JolFTg<}N5hkJCU1!=N@XGf(
z5wX}W8#O=l^;o(g+PZos(fl8yl>;sOpXrHY3%}wa<2CAd6sJpX14l~fL2mGL+4mab
zwawS`WK+Bgcg%MwcG1y-fyVv-_d464G_<bkja?6qR&Nvi5e{bisyH;5n+?$pw=`=X
zlU?mK#Mqy^8W9{^W6>7hq>}xPdV>veA5QFk=5>@@Iz(S@!J%JFuwp9xkmMy?dxGHY
zMrZ;ZAL51c3?XNcy6=%}j{>~GG}o8Pcc}S*qghjodyOWgSV*_)rT!Muad>BWhbr#F
zv%^`EA49Qa#0boNLF@VgQ+p{h;<7CKkTLHd@z0W)Aq$_N-6^h~3*xy4j{)yf?PIv5
zAj?A)-bD9LGaq6RIG6~rKhkpar%;+VK*zq(*gG^9`4D1{M_QV`?YPO<6|EFS^Eg$E
zl;~1A)KOxerqEQ>$xXHiU*Z<~IUV{A4_EehFw@bfz}j9tJ;<yz#YTQi@If4vGt8ej
zJu%D>_j{T!!c;fJL}Tb3=y$Lf`lz#-IoQzYxa@yPedln~v!{_!Xs_l{Cltq51bmM-
zikC>vax^>$XfqsBpOXDJhN3Jp(q7$>W@M+Q>BG#WeHcZD8|1uZ2TiS!BtFN`WS}}s
z-TfG^pQYx}NQMg}KSAq(2A+i|dAnQwfcBMQ><PH#A^Sp*<|wNR{O-;Y{|b#{;*xis
z>rWuBgLoCXnsuwmbwDYNGDpiaX^ef#F1)Uq<WAhU>|XjQ=C+H}*9Eua?@9iMUN_!U
zG?tVXXnPtixkYqnj1+y%)Ob?%zrp1!oU7R;)KMeHo88@>o*QkhJ%Haazov;@nEihw
z`57u>tRcQalK((<Jklgcq={M*>`5uYVwc~aFkB2Zi!HQ#f?142(OssFLpU%_kerU&
z{M+<?wv@j_pT{D(=9z|0nipu;<H-)wu-n%o!C~;A6je~}bNo2=Gxa85_OPq;&yJp)
zXdiL`V?(gnH)H1fiRi=Vn+wcfXPug6jijZ<Pd4wPe2oaAaSj8F3GP8k{XrdH;Fk%r
z*cESyb`afy-LdDTa*R}y%#XeJ6l-mB(8NX>dlGJwcHKN8+by}q`Pyr$Irp`eEHdZ1
zXfy&7D!_+y-zf7l+SAKHj(nn}8OCmcef^7meu=JcHug$nvGq3HH`So~(16V2Zs^?q
zP^tpYpY}#{tJFP3sqvC&uLVz`TE^H%O!hQlsnPMSmQ6R`zu6jXCeHhs5k%r)+-Ck{
z0_>AmYwR<Tk@gJG-O(}xKJ=Y28acy0xv7qyXxcvYbWvcVP^bFF{>71qzv=wbIMr8}
zM+r!{b5wVml)uHqN%u9YssYM;jSG&#DM%61QRr*2Z;&3i|I9M_TU^7>P~R*qnPSEt
zaWy^D5X~?I%(O3fK-1C<(#qRfVTfmNE2wVtujn6>js6USy!Fl7QO04${t6vymC;>c
z$Tj)_{K{$XRug<pu3_wJ(Ofgk{#2bh+ah>TR-ENFW@_E(#(Y#Ov&_E-aUBd|@+_R1
zW9pjwnqS-K-*8=DYpT2H_^V9x0vrrN*cuOp_WXPY!UoCER`%4yYJnk4C-5)ST|Wof
z284;erru)g3|#r@8vQ$hb-U3mP#U+H#)tH9xM@6!JN9~mba&N@F#2oUhA=OLEVc2p
zEC}dBz9t0f6ESH7X20;H;v2%V(bTZzA>XIz{sw004;-s=O=C+m%%IagtVJ6Q(gQ80
zjzOMtv@r1ZlAdp9kZ;iMkRc(z_TvrE4*e|rVo*x%&1gTt(@HP&v#ZRNhcyXfM#!tS
zT0YCjFQw!=CUy>b&TPX@*P`Hw;7?p}=bOQ3q-W4<AJOyK=F?@ot$xYxovkGi#x25}
zxY_hwtDBK4A=?LZd=o=_i;nmiot}i<sb^Lm@iiuRcIu5@Vr_aZj<jItXs7XWOv!l+
z9nDR$66qW4_bs00Ha7k-<m5u5V|=|5^zTPCajUu2Q!`tb#*4mQ4kRD-^$d>Xkmrx-
z>1KxRBPm}oYLoFUX4AnOS7YupE8n4Y{K`+8=V)?_v9DlO4;(D>^kh)?*LYgc)G*KE
zl_1CH8J_l9Z07fC=@Rp>6}};W@5hDuK7%LXQ6VtZ7s=V$_<vzAsH8V{qWj)q?1Pvy
zS{nTV-t6u&`g_zt@X@hSd68dwD;~v=zoAfkC3*I$J;m3;K*s@;dk}z`o<_AXef>~l
z=<>GxY4_V#^l~-7ok9Kv1TS@=v_6ipAt;o`@$6;K(DPA0%MH>RRuPvF{0BUJ1z!}0
z5y@tf+wf`~<n0CAmTWMZiryT2=PbOt1P=6f^cecSZS?qE=3{SEB(f!B=m}Q~Jfjz&
zDpnfZ2Hj_w(LcI+B-p(67?>+4dOLn_`iaUj)WxwJQuwu};Y-YBre+4G^^;n;$`A+f
zCQ!}Ia2+{OrJmlG>+*-)pYUL|#w@nQtYl-w9j;ac@$Z1~)Dm!-uLtfn^dSTbbm%j`
z(eq2qP8RZPok1Q);nXyGA$r1UqkqODyUhjJ$g_OY(oPa9`8m^3H^BxS#(g)axQ<W=
ze#qvx8l7u4XXES-I`0$6|Df?LLJ{Yg&2l_AZ7|Vmw&s~+4x(vC?JYQggY)f(t2qc~
zD72kWT-cwG&5N3Hk4aXznt|^LvFB*)W@E>q*;h5mxp<@uI?-Yb0~-zgq{ey%pMen|
zILe;V!^@1_*;6lIU(&pLjr|K0BDNu$w`%4VW5;2zi8Gr^FjJychCDxn5e0`$2tH5C
z5v>r}MN9Gd|GoM4%Xj(za+mdVfhqeHkJQyo!Avv+#5E*!o9<Ur&|XUd(}%I!9Sw1}
zme)2Vce)xC1p66{Ut@yt8n(?4zX1`X#w^@Pfe!in9SZ4QQ+T_s*kO_#G&491=Hp@;
zbg3hrCU-W;rKqD#Ci$$UY&Xf@H9Oes1W&I7sga2nKA=N3zsCz-fl1z>c{@$Aqoy=6
zZx^6S#1KdIaF7FCJw0~6Dft6&t8a7`l3<I`KX@9q+vrZ{HCv6&Mp`v7`Yzn;x0(9q
z^aMIaDCB=?Id(oocGJkl=F4m-Z(-ntnuJXWeZ-G=1=();itv+25TYC$YH&S-=?-6l
zW<LjKJKAJO`y!1*phJ+KFv;&Q_*_qO;8uv=1N*Ym=$}2U0A2sTe{7wHJo^8C{|7{1
BXtw|W

delta 11119
zcmY*fX<U}o)4mr|(b6C{$WkyhaY;!{C^s?_a)T@rwFFCr)D&~W9aqpy7;O|+Y}Lxt
zR&2#qsVr>OR;(;-l~%2Pz1RI*bANdGbp7VccFviZGjl)ec)sqA=j-lmQm@Xp#V5u;
z-lE<hSEijiqHcK;$GOUtgs7YdeAt(&a|ti=#cM>k$dR)RbL#%H$Z=dp4%8?01xFGa
z=6K~zWNpI<5$P$ul%2=LD?G_Gz5}iloBDaKWHrb+CouXy$!#<~B6Y@<B$GPrNv*NY
z^yFXz>U!LhW9L)q5lOpXd|-0V1rs7_7E4VG)pYfxAckE1Wmok0h`XL6I~!BWi;m=*
zmZ`ESZhS<%kHj~l_@mf)Y-BfG;<%e`zLd70Y^o!tnh@UMOIGuobAq$*CAJBLUvebH
z%slJL!RBP`<;jso^k}|RG$rd<S5l)%{8ysQ_gS7aIG;jKcv9Ge>$S2Zo^JM)sEa7R
z$Cvch5jXd=rkhE=q+U$fs~zz!r0g`A4vE0aI*#PTl2|E66REJD6t$tk$9y^4mf}kt
z+25J)a$gQ!LO1|>kEi@}ISr{m={b%ZZ^iY4j^tfRxEE602>ZK|pGc`?lH8NFy2I6u
zT))PVr1o6Tmm<4^=UmBb%Jl`V?6zGcdy>+U)W2OhYgaNGq0)@h{~S324+6jHI#O!8
zc^Tnpyia<PcOiLy^(6la!c<q{x)AQerJCad9m%|k)E>UncBPNYWmiY;VTLaa61o10
zBMDt;w;t>!k-8sJy(x9IOdr7W?kQ)ID1Rq%q&t^aNOcb`Un@mjx%?{5r8{-jN9@|Z
zpLgYmUF<@sNFeJ!t|YdlrWA>8MdBRf%0+a<aiyRY*PoKKYq>rEn~vxDZ(y~fc-)uW
zy-1zuOW~D-E0ODV6oVYex{lN<e97xU_?jaH$#gaf41H+q3F$VJ#;$?e!^qkTQmI@|
zlSBQuzRHn<eYidgah*c=I;u@yYHi?1S$|TW^d+GU;S1Qq4TJ+-@htfM=gO%;q^9Ez
zZzN3i<wz>wY;5ux!Xhvv5H4~hryb#3Pj+@7ywZ~_i+|UZGK<vT<xo3%{<J4K{mA+T
zuIXyJ+Ys)K<|eO|eRkqc`EnqQ#5q!V9p#H5G?v5^afgw39pWjSrR7|S9!TOLM`Fg2
zbC4VwV&)M<L(OT#V+P@BM`}kB4tAt4hww^Yj&~w_5l3VZ|F0`Cov3!PWL!qIS9y}&
znZyDq8BAgoYTIynb)F=5Akl;P^;G%{a_2S*rODh*Tz|%s1aoB#s>+B^>5?v7{{v}w
zGv$Y%e&iBf<x9Tp<xOk=cO2w&Bjna7GF13->~_L*yc(kk=OMPn5Z;Aibq8T@1kA03
zLvh+Y>B39mj$sLFjOf0R#J9xlLBIZU<(T<(0L3hy>(@!t6<lB9%5g+|@PPG32wYA$
z&y%V<3H#s`8W*Y0pO0gGp6|=fJT4A{$;+tHmkw4CDm+QG-1`#`#u%=@E&H;^M_!rp
zW!GF*iNTUFo^CvgJ1rn%U&)xp<>68?fy)bgNt{5FccY$6;yFe;lAcZKVMnT#P=1KG
zxs-a&m!v|j_wyxXHrF#GdJ5MUB7Y{6xK84GlURw6vU1^gQrw&Jg*e6mgnc~OpF*km
za_DkO)j<a1nu6PnLAIN(@8D5cNvWZ(6y8Cp=cQr+r81GV#a!?2OPrZKfKZ!GY6%ix
zI;9p#hrX2h%aejBB)%&pGkEzIAR<agOqKpC$ay_nxr>^Hp(@yozJLlci_}s_8q6VF
zjHk?s$w60APym9MaA9j8;Znq>m97PNs?tgAi_4zNjW@yjG=tP?MD0C<SNl@Dns5X%
z-(u|?q}zJBJ6xg*=<bUM@P(03Td|PM&=PS|x%R9l#|Kj2jO1=*fDDkRQZC;BgY)S|
zQ>5oS8a#qTD<jN67qf`)CG3AGRTWD4GOAiHXRJKDjFxT_Id8-p@Bra8NXex%&<t7^
zllq<`$CeXT`f}=C!c4sSX@nkfY6#&nL_iVYQeXD3BHVzoFo@19l(Z3ark|AbC8{e&
zAK?xMB3O4&W~3u=_Aor>N#bCNpOxI*6uMrbR}#H1u|<rJ<~Sg;eh_JKxA}y;vH-aU
zUDcDMUh7NFLsWW`xa(;DW%&FU*GIT=z{2(eJP^<o#C;1#QiTkPXLLQ`a)ec8<W3*R
zWclzBQdVh~yOKAIe2Y+VvS_ov)I3X@gOC(^NgO3n14yigRI}K61v`0)@;5-$I>HYT
z02}C2EXu-WQdgjh*+^X*<!A<VJ&&j|U;g&Qdz!3S*wo8}X?T~m5Wb27c#iN!qynhH
zuH%rxO6o`G$G6kMCP~{#3oG%M+++&icoktfg5`O_(a4%nl&T}yS(I9VPN$s2*QESa
z5=XjH^$>+tAye)rEJKYcr!N<xZQM$!kELiNr52-z*{hKXi03%S>-rM)8rR3b>-VVY
zI?M+T626W%{!OypB$YQYnqH7yk5Z@z<@8~4ZifF53eKV>4t^)8M^Sl35&i?KN2zMC
z6um_SV^OY-aD5c^x`*p;NYu?-e+?tney$heto9OaK>^uATNmMuc2Vk>WKX2jIVeWA
zFxYMh3&`}_xpp-k=r1WSM5?Q~qno9CI8l_uA0=a!E460&5VrXYO|M2ESg379Rd}5J
z!^N^>FQq;~=VwjBi*oWKD!oNUeM>Y{qAG~0q<;-XMk9@0p!PKgbc=^=2wBU+PjNLB
z+-@tRueCp~!#}&w{~>&*P(xi$4vZ&U<;u<<2#2AU`jT)Q^iCu!^yKV!gkw;u%!fBI
zH&v3l9dE29z+I?&vq&9)X37%aGc<ND@(5bX$s4$z2AH~k<p~d$(<ivyY{@>z<+spC
z{7g+_api9i?m)~OB3z47F`4isJTTB7MC#`<9g!M@S3C;L-(1hY#n={e5cIjEzJWLH
z9m2a&*nTIx86D0W)b+MZpF?Nrp>7_IM9SL36C&CZ(6zlnwl5^gg63aLYI!6U$-b$S
zT?*$GQuj4jA4}NK)x2|D;!IyMYYE3AJwG5^hYJ2a;ZAfe|D)bpr1EVZ)nPgM9(URX
zkAhW-FA?W6$yq7MXXwGLj-G00wywvR|0%VWAb&q0@4Y&`o=fI&cxugqcaYW7$a@GS
z>|Med#PczR*(HFBsG+`8{6_`1Ihq$^)<)npx89@}lZr*ge+Z}<RJII*zrBb95uL|L
zEydPrsP{gtIM+PO#+wYo!7aaw1hDu%*OmPrl6o9f;tPgZTa5}gG{MpR&CQ=1u;uTl
zSfuh>I($D~WlQyHt!ZY~a!`KfQ}03e`w8J!h~yL8d^_y3mFd0F*V^+8PeeA%BzF})
z0@&`Nu+blB`2pGW6R&W+x~<IIcvLVb4mNiLO}=$ms}cEjCST)bPtkIFyq5*!UG7P#
zy~x+%i_-#99bb1|;L_S8t!QU9MxrQ9BFA~?T7DzL1}XZL?mQ^&_dJsKd_C3H6x=HN
zeqkqmsdV^`oZo0soJ*LibGw@Uo6ra>q5hXWZP3LI<Ti9Nr%8Sv<>4=yeMrjBP{Tcv
zHjn5{Ikc7zG{BJ~A%i^bfIR+*GAA^-wVBP+4m}Nyk`9Y0wFaL@tkqh9XtJJS5Spq#
zsNe&Q?{3acK-apAUb+5;1oKrf{r^kqE+pMl!bXU^-w40O+5f{BOVqi&O<9(&ne9x)
z?Ra&-5!~d5nwxAK6J0H<V<);%&v@qhZi!z_-(SIlbCx!~b2QO|wqW-i9ZkK=G*5Q4
zYJlO<_&T|i>~G<G?;&jH>8ZZPG0D|~uHlb-O|5VEVMpV_YOo23wt~LiC26bZ$x57;
zbwO#~hGKL2q?XskUIL#wA)~G{ZDV{r*u(G?l!G<Y=E<mh-f3ga9cX8e>#7&lypMfN
zY;1CmU|;8(nKI1?@;xxq+0m4`#&XKh1~(WU>uXGJ!&5PwmvHZ|db)Fjk@H+F4EJ~x
zot#Y+Z@Ze`#8@76G#zCja!;GZ-O9b6>uK?5<G2|vUTydeM~lM*|K8CfL4gZ=?1DCU
zE$y$x#~y1bS9uasPHMWRg`-T#?bv@<8ISpTwx!XxpnAlaD|=*@&=ntZ^K2?P-_@9O
zW0<B<Id-16_?m(=j}(m`98G|Zh*Ot2nxA9z$*#t=F#L(H$Kp-RR;@<qiR}I{sZgTV
z^h}=V9_MT6aFd&k0$EBkhh04ts{0Ywb`jJC=g?JR@1>6Ov_q(4imN$bi1_y@zHe<H
zyc?H;;u0b6b+op<;cfWfV3Sl4K7K#IySYxIN19Lhj>b$k=4@Y+E;jrV=xu-lN4lZE
zETir^$YrbG(XOUWGw!LtVY+|j>yb`I-|lNwqTzkG?wN*j5aDAC&p>8&01hlAA%HHi
z)BIVIxAE3qNBg>w_TO<e0ZJlge1}$EYP<Lx;oH^p?RWIR<%V}4qjyuXk*BHSjeMu0
zWpfRWN6%%OTjy$N;7L$sesOeXXW+oA%TX<D?kh%n`zSdEds;QexTm?A5^x8SU-;@J
zn~UXI5?0j5<>+?a<~iDbf%$!_uL+Y(ZYCb1LaK;ywYIw%?~cF=tNv-=`Nlro)y#04
zU!oLUW%MUdNctGwi4wZR@NIa%rW&4wM|~R)@m<NdkEi?wzIj;F-PqHtumIH}GqIh>
zLG-}4ru!&YqTPB~tk>wt#bGqT@&0DyNk?-~StD0<ubg?1n_sQj%Z+)0uZ1&=c{W1q
z3GxonqgNWouPCc1y^(C_DMk0w(Yokj?UT+0t|l%s6*F8t9+t4<*zC1t`zftSH+}aZ
z0cRWg90d4kW0@$YO?S1cS*gbHo1;nB00$v(1zKDSq(h#Th9&GPUmFw|`<)OSX83-z
z8x`En`C2i=%s-9DTx%SY;Nd*Ob1`H*!kaHer;PC`h@&+a(w`+9>S+OLRm78Ch=D=o
z_wO2emtDe4?Vo05zD7w3>-qx-#_P?@Gl+~uh6_+<N)6|tC_YSQ>q+Gr9&!`Bbir<d
z%_lorIM|r~Ko$=*^WW&Gb!L8+o*ZT7D^PyIa{nL>JiMQIcy8`7$vla&Zz@MH{p{l|
zt1u8$(vN7(&M<X<V!y#|0!LCX(pr>=R$p(nPiXFXW1fxo;%Tb5OVc(P^>$RDo6Y|N
z2<LI;#Y1xFAfs}a)`SJ|FGsV2(iGUc67g=%)yHS#Qfh9h@uN-ix4!OH(>%x31Dg#`
z_VxI!hM&dhO)$I*<rs5oaJ}zoc{a2JX0CGd>{#PCgHFfhvKUYIZ!%ZsYVJ6*`5pQ_
z`%3brr?p}Ecn;}yyD8c2ON@oidNeXN)~?0yXmj3hPj`pK@T{Ym6CoIQ(i<<{7E@B-
z>X9jipGU#4DLl%T1S`hPu;V~7*v{WbmdU22k0ZMeko-O-<+lhgz}Fp{?%tA;N`~16
zByI5g1jhTK`G>*C>HH(ruaM(zbghS}Ap`yXcEaZ9wO@)1k1xE$Z(1MVH&7exns}PB
z$`s9)lT}powkNw^r}RAtx;F{e;ZQ!L%}iNxFIiilkA0Qv4Sn6e#`d@X?|^Ce5Wkbz
z_|g=g&1~d7j9K&u<rI~v#N-y@C)8?^OV9_}sCd06N%r|9R^siW%()mRY$p5&L!-?p
z&G2R6V=CB)=_MQ`@vH7fq?TeAUvU>BB<(ToA`ai<%<OrX?TqzfP`@W@bIJXjteY^3
zenwUA;+j4u6trAFll2BEd4jAL;-@QPJ&I#Aw;ExrttD#<Ir%lSs!Wy`S}*&)qIflS
z{U;f3l>P@uY>Bz>YZ8x1@)smF#y4V{YhtDPd#c<l*(bTY0loc?^z(=(aW-I#M5|z5
zEiRI7rzrG^RD46B^YK;SKMKWpa_ThU7MMRx^Y>`CI+kZQ;TyxRWOxsQk9{}!6u&~e
zM(V|Y=0P;-Kz+OI3lXJfscoycf6)cieGN?SDEvff>+j2^Kk3+Ki08K{)JiKG8EZ>S
zqL|o%{EG26)S7{9_<7`C@@~{k(Z-vFH#;0nKEUrI_HE;HiNY6+KtpR+8-$JeMaYG}
zsrUlC7WFJyw(B9^)NS%KGu8}_#`6<p_(M;Rg!9H1NbaN55|2_4vR{k`G8nZ2qfLCx
zYGinatLY64mqBG4!(%*6iZ=X_rwQkoH(yG%g=d1R`!6wSE3Jt#ADiOTn;N-X&onmj
zW>0g%rgJPtg|N5&*wdJ1#$KbFIvRUx%=q8X+cs#fF*HRyZwAjVH13_+zo~I=LFL5k
z7%5UWYfT#?AN4e`rIC+oY?3`q@p9-S1K<*!8-4|8?rVNHGTf^rEltH%PtW!=<F|O4
z*U9iPSPXmXuh3_v7(D?w{|kL>i`L^(vwojO#hb=$o|c9Ed<!&NNyhSt7WFrlHYi>;
z$G6jc-OTO#wWz(p?Hb$GV5~-kjoGL0HSCnX#<hkG=Q#M9X8v7*r1^*bwa1{|%g7J7
zdaR2%vP0cY=13eSg0S)W49^;RjL0>##bx@&eyL{kGxi7ZZlK|hTmwFwgdZTvvE!g+
z3qmj3({xPK5th&OWOyYPYX2K;L+vygp%h{0pw;0-{SXG)D^15vPphsld;(M7V8c1M
z?%}5U3oTDEuUcZd4IlFM$bxVfPsFu_WArXeFky>)FQPO2wD7H~XG4|abr*b$?BYvL
z5A-vu7x`Kcb`_U;dJNedalWHgWZ6D;Yx1=Q?^8G2(s!;Fj5Ow3wPdX6uE7VTL8kj+
zoPVz24xS!F=tt~#g6r9aAI8Wr#PI!y(6F&QiL?p(tJ{!dp^wM$<s>|@Rwy%fm~0|G
z2uw2kh^sqW8}96CQl`22fX0Rm<tYT%ZN@SI$8o3Oj<}o*!>!S1<{AD9&;L}zkK(l3
z8}5QCa+Bc)aeO(3zjw7N?3^Z|7R@z!Cj?N)ACFQq&FEiy8W+wjd*E_MqhE$7zs2xF
zsK()O{(#dDdYm9AC*gP&8tx2R;E!Bkf}Wmf_x6oe&NBFzrXeLGf?eT!cnG^Z%@5D=
zN2LBNQ<#h5S!fEoXzT<NZR2ZRfw7$M)C=)mTw562-QfFV6Wy)V1tyw@R{+Nyaq%bZ
zw!+AlA#g$mE<sR+JNg#szrZZ*b9Hw(lP2K?^G(geTC>p9+>R<T+sHrb^dcj7Mc9Pr
z+t$}&Y$<XC-{J0;7~YR;x!Oc8*ABBy^bs8UQe&A6C+8c>FM1M#QbbEP6qGr}($3ei
z6^2hDnwA@W95pITjP6K)c}9N}LBG=Q6hy&dQ-4~sOYO>%^eFa$|0dKv#V$M3Q;0P<
z60zRi*Yt1(+k@*0%Uln{$ZFFzRZkb1wpvZzV18eYT5*?Yc@j~5x8d(WhaVB`m*NB1
zGSl*yZpt*#o~{;yJ#ve8sJqgX|Ee_`jiWn?RoJaQg^(8G{y{638cPQZtgFn<UW7%K
z;VTe1A^SAlRc!3Pp;l}*mLBLC)*F5r)is;~f7I&GmqbllV{YwJHym|(;j@yOE7LV&
zt?B+9F~8OH^+ZB#G?r&Hw#=0Lq&2IJyCW*wI^*7t&?+;W4~)4iaw^Gsro`C)z?U?z
zM939dw8a$utf%ibj!yWrxWzbTs5`~TDX3%{O!uFdp5b9c$uH`L<7sES58I4<r|!!)
Z-B;?|@FM;~<l%Ul1ht}z@BF{N{{txqTS))_

diff --git a/tests/regression_tests/surface_tally/inputs_true.dat b/tests/regression_tests/surface_tally/inputs_true.dat
index 96639a076..1a8907955 100644
--- a/tests/regression_tests/surface_tally/inputs_true.dat
+++ b/tests/regression_tests/surface_tally/inputs_true.dat
@@ -1,103 +1,102 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="13" material="13" name="fuel" region="-1" universe="9" />
-  <cell id="14" material="14" name="water" region="1 -3 9 -10" universe="9" />
-  <cell fill="9" id="15" name="root cell" region="2 -3 9 -10" universe="0" />
-  <surface coeffs="0 0 1" id="1" name="Fuel OR" type="z-cylinder" />
-  <surface boundary="vacuum" coeffs="-2" id="2" name="left" type="x-plane" />
-  <surface boundary="reflective" coeffs="2" id="3" name="right" type="x-plane" />
-  <surface boundary="reflective" coeffs="-2" id="9" name="bottom" type="y-plane" />
-  <surface boundary="reflective" coeffs="2" id="10" name="top" type="y-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="13" name="UO2 fuel at 2.4% wt enrichment">
-    <density units="g/cc" value="10.0" />
-    <nuclide ao="1.0" name="U238" />
-    <nuclide ao="0.02" name="U235" />
-    <nuclide ao="2.0" name="O16" />
-  </material>
-  <material id="14" name="Borated water">
-    <density units="g/cm3" value="1" />
-    <nuclide ao="0.0001" name="B10" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <inactive>0</inactive>
-  <source strength="1.0">
-    <space type="fission">
-      <parameters>-0.62992 -0.62992 -1 0.62992 0.62992 1</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="5" type="cellfrom">
-    <bins>13</bins>
-  </filter>
-  <filter id="6" type="cell">
-    <bins>14</bins>
-  </filter>
-  <filter id="1" type="energy">
-    <bins>0.0 4000000.0 20000000.0</bins>
-  </filter>
-  <filter id="2" type="polar">
-    <bins>0.0 0.7853981633974483 3.141592653589793</bins>
-  </filter>
-  <filter id="3" type="azimuthal">
-    <bins>0.0 0.7853981633974483 3.141592653589793</bins>
-  </filter>
-  <filter id="4" type="surface">
-    <bins>1</bins>
-  </filter>
-  <filter id="7" type="cellfrom">
-    <bins>14</bins>
-  </filter>
-  <filter id="8" type="cell">
-    <bins>13</bins>
-  </filter>
-  <filter id="10" type="surface">
-    <bins>2</bins>
-  </filter>
-  <filter id="11" type="surface">
-    <bins>3</bins>
-  </filter>
-  <tally id="1" name="fuel_to_water_1">
-    <filters>5 6 1 2 3</filters>
-    <scores>current</scores>
-  </tally>
-  <tally id="2" name="fuel_to_water_2">
-    <filters>5 4 1 2 3</filters>
-    <scores>current</scores>
-  </tally>
-  <tally id="3" name="water_to_fuel_1">
-    <filters>7 8 1 2 3</filters>
-    <scores>current</scores>
-  </tally>
-  <tally id="4" name="water_to_fuel_2">
-    <filters>7 4 1 2 3</filters>
-    <scores>current</scores>
-  </tally>
-  <tally id="5" name="net_cylinder">
-    <filters>4 1 2 3</filters>
-    <scores>current</scores>
-  </tally>
-  <tally id="6" name="leakage_left">
-    <filters>10 1 2 3</filters>
-    <scores>current</scores>
-  </tally>
-  <tally id="7" name="net_right">
-    <filters>11 1</filters>
-    <scores>current</scores>
-  </tally>
-  <tally id="8" name="net_right">
-    <filters>11 1</filters>
-    <scores>current</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UO2 fuel at 2.4% wt enrichment">
+      <density units="g/cc" value="10.0" />
+      <nuclide ao="1.0" name="U238" />
+      <nuclide ao="0.02" name="U235" />
+      <nuclide ao="2.0" name="O16" />
+    </material>
+    <material id="2" name="Borated water">
+      <density units="g/cm3" value="1" />
+      <nuclide ao="0.0001" name="B10" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="fuel" region="-1" universe="1" />
+    <cell id="2" material="2" name="water" region="1 -3 4 -5" universe="1" />
+    <cell fill="1" id="3" name="root cell" region="2 -3 4 -5" universe="0" />
+    <surface coeffs="0 0 1" id="1" name="Fuel OR" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="-2" id="2" name="left" type="x-plane" />
+    <surface boundary="reflective" coeffs="2" id="3" name="right" type="x-plane" />
+    <surface boundary="reflective" coeffs="-2" id="4" name="bottom" type="y-plane" />
+    <surface boundary="reflective" coeffs="2" id="5" name="top" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>0</inactive>
+    <source strength="1.0">
+      <space type="fission">
+        <parameters>-0.62992 -0.62992 -1 0.62992 0.62992 1</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <filter id="5" type="cellfrom">
+      <bins>1</bins>
+    </filter>
+    <filter id="6" type="cell">
+      <bins>2</bins>
+    </filter>
+    <filter id="1" type="energy">
+      <bins>0.0 4000000.0 20000000.0</bins>
+    </filter>
+    <filter id="2" type="polar">
+      <bins>0.0 0.7853981633974483 3.141592653589793</bins>
+    </filter>
+    <filter id="3" type="azimuthal">
+      <bins>0.0 0.7853981633974483 3.141592653589793</bins>
+    </filter>
+    <filter id="4" type="surface">
+      <bins>1</bins>
+    </filter>
+    <filter id="7" type="cellfrom">
+      <bins>2</bins>
+    </filter>
+    <filter id="8" type="cell">
+      <bins>1</bins>
+    </filter>
+    <filter id="10" type="surface">
+      <bins>2</bins>
+    </filter>
+    <filter id="11" type="surface">
+      <bins>3</bins>
+    </filter>
+    <tally id="1" name="fuel_to_water_1">
+      <filters>5 6 1 2 3</filters>
+      <scores>current</scores>
+    </tally>
+    <tally id="2" name="fuel_to_water_2">
+      <filters>5 4 1 2 3</filters>
+      <scores>current</scores>
+    </tally>
+    <tally id="3" name="water_to_fuel_1">
+      <filters>7 8 1 2 3</filters>
+      <scores>current</scores>
+    </tally>
+    <tally id="4" name="water_to_fuel_2">
+      <filters>7 4 1 2 3</filters>
+      <scores>current</scores>
+    </tally>
+    <tally id="5" name="net_cylinder">
+      <filters>4 1 2 3</filters>
+      <scores>current</scores>
+    </tally>
+    <tally id="6" name="leakage_left">
+      <filters>10 1 2 3</filters>
+      <scores>current</scores>
+    </tally>
+    <tally id="7" name="net_right">
+      <filters>11 1</filters>
+      <scores>current</scores>
+    </tally>
+    <tally id="8" name="net_right">
+      <filters>11 1</filters>
+      <scores>current</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/surface_tally/test.py b/tests/regression_tests/surface_tally/test.py
index d21f361e6..001fe6448 100644
--- a/tests/regression_tests/surface_tally/test.py
+++ b/tests/regression_tests/surface_tally/test.py
@@ -6,7 +6,8 @@ from tests.testing_harness import PyAPITestHarness
 
 
 class SurfaceTallyTestHarness(PyAPITestHarness):
-    def _build_inputs(self):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         # Instantiate some Materials and register the appropriate Nuclides
         uo2 = openmc.Material(name='UO2 fuel at 2.4% wt enrichment')
         uo2.set_density('g/cc', 10.0)
@@ -21,8 +22,7 @@ class SurfaceTallyTestHarness(PyAPITestHarness):
         borated_water.add_nuclide('O16', 1.0)
 
         # Instantiate a Materials collection and export to XML
-        materials_file = openmc.Materials([uo2, borated_water])
-        materials_file.export_to_xml()
+        self._model.materials = openmc.Materials([uo2, borated_water])
 
         # Instantiate ZCylinder surfaces
         fuel_or = openmc.ZCylinder(surface_id=1, x0=0, y0=0, r=1,
@@ -61,8 +61,7 @@ class SurfaceTallyTestHarness(PyAPITestHarness):
         root_univ.add_cell(root_cell)
 
         # Instantiate a Geometry, register the root Universe
-        geometry = openmc.Geometry(root_univ)
-        geometry.export_to_xml()
+        self._model.geometry = openmc.Geometry(root_univ)
 
         # Instantiate a Settings object, set all runtime parameters
         settings_file = openmc.Settings()
@@ -76,7 +75,7 @@ class SurfaceTallyTestHarness(PyAPITestHarness):
         uniform_dist = openmc.stats.Box(bounds[:3], bounds[3:],\
              only_fissionable=True)
         settings_file.source = openmc.source.Source(space=uniform_dist)
-        settings_file.export_to_xml()
+        self._model.settings = settings_file
 
         # Tallies file
         tallies_file = openmc.Tallies()
@@ -156,7 +155,7 @@ class SurfaceTallyTestHarness(PyAPITestHarness):
         surf_tally3.scores = ['current']
         tallies_file.append(surf_tally3)
 
-        tallies_file.export_to_xml()
+        self._model.tallies = tallies_file
 
     def _get_results(self):
         """Digest info in the statepoint and return as a string."""
@@ -174,5 +173,5 @@ class SurfaceTallyTestHarness(PyAPITestHarness):
 
 
 def test_surface_tally():
-    harness = SurfaceTallyTestHarness('statepoint.10.h5')
+    harness = SurfaceTallyTestHarness('statepoint.10.h5', model=openmc.Model())
     harness.main()
diff --git a/tests/regression_tests/tallies/inputs_true.dat b/tests/regression_tests/tallies/inputs_true.dat
index 61daba0d4..e6725024a 100644
--- a/tests/regression_tests/tallies/inputs_true.dat
+++ b/tests/regression_tests/tallies/inputs_true.dat
@@ -1,38 +1,187 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell fill="200" id="1" region="-6 34 -35" universe="0" />
-  <cell fill="201" id="2" region="-6 35 -36" universe="0" />
-  <cell id="3" material="8" region="-7 31 -32" universe="0" />
-  <cell id="4" material="9" region="-5 32 -33" universe="0" />
-  <cell id="5" material="12" region="-5 33 -34" universe="0" />
-  <cell id="6" material="11" region="-5 36 -37" universe="0" />
-  <cell id="7" material="10" region="-5 37 -38" universe="0" />
-  <cell id="8" material="7" region="-7 38 -39" universe="0" />
-  <cell id="9" material="9" region="6 -7 32 -38" universe="0" />
-  <cell id="10" material="5" region="7 -8 31 -39" universe="0" />
-  <cell id="11" material="6" region="5 -6 32 -34" universe="0" />
-  <cell id="12" material="7" region="5 -6 36 -38" universe="0" />
-  <cell id="21" material="1" region="-1" universe="1" />
-  <cell id="22" material="2" region="1 -2" universe="1" />
-  <cell id="23" material="3" region="2" universe="1" />
-  <cell id="24" material="3" region="-3" universe="2" />
-  <cell id="25" material="2" region="3 -4" universe="2" />
-  <cell id="26" material="3" region="4" universe="2" />
-  <cell id="27" material="1" region="-1" universe="3" />
-  <cell id="28" material="2" region="1 -2" universe="3" />
-  <cell id="29" material="4" region="2" universe="3" />
-  <cell id="30" material="4" region="-3" universe="4" />
-  <cell id="31" material="2" region="3 -4" universe="4" />
-  <cell id="32" material="4" region="4" universe="4" />
-  <cell id="50" material="3" region="34 -35" universe="5" />
-  <cell fill="100" id="60" region="34 -35" universe="6" />
-  <cell id="70" material="4" region="35 -36" universe="7" />
-  <cell fill="101" id="80" region="35 -36" universe="8" />
-  <lattice id="100" name="Fuel assembly (lower half)">
-    <pitch>1.26 1.26</pitch>
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <universes>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UOX fuel">
+      <density units="g/cm3" value="10.062" />
+      <nuclide ao="4.9476e-06" name="U234" />
+      <nuclide ao="0.00048218" name="U235" />
+      <nuclide ao="0.021504" name="U238" />
+      <nuclide ao="1.0801e-08" name="Xe135" />
+      <nuclide ao="0.045737" name="O16" />
+    </material>
+    <material id="2" name="Zircaloy">
+      <density units="g/cm3" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="Cold borated water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <nuclide ao="0.000649" name="B10" />
+      <nuclide ao="0.002689" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="4" name="Hot borated water">
+      <density units="atom/b-cm" value="0.06614" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <nuclide ao="0.000649" name="B10" />
+      <nuclide ao="0.002689" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="5" name="Reactor pressure vessel steel">
+      <density units="g/cm3" value="7.9" />
+      <nuclide name="Fe54" wo="0.05437098" />
+      <nuclide name="Fe56" wo="0.88500663" />
+      <nuclide name="Fe57" wo="0.0208008" />
+      <nuclide name="Fe58" wo="0.00282159" />
+      <nuclide name="Ni58" wo="0.0067198" />
+      <nuclide name="Ni60" wo="0.0026776" />
+      <nuclide name="Mn55" wo="0.01" />
+      <nuclide name="Cr52" wo="0.002092475" />
+      <nuclide name="C0" wo="0.0025" />
+      <nuclide name="Cu63" wo="0.0013696" />
+    </material>
+    <material id="6" name="Lower radial reflector">
+      <density units="g/cm3" value="4.32" />
+      <nuclide name="H1" wo="0.0095661" />
+      <nuclide name="O16" wo="0.0759107" />
+      <nuclide name="B10" wo="3.08409e-05" />
+      <nuclide name="B11" wo="0.000140499" />
+      <nuclide name="Fe54" wo="0.035620772088" />
+      <nuclide name="Fe56" wo="0.579805982228" />
+      <nuclide name="Fe57" wo="0.01362750048" />
+      <nuclide name="Fe58" wo="0.001848545204" />
+      <nuclide name="Ni58" wo="0.055298376566" />
+      <nuclide name="Mn55" wo="0.018287" />
+      <nuclide name="Cr52" wo="0.145407678031" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="7" name="Upper radial reflector / Top plate region">
+      <density units="g/cm3" value="4.28" />
+      <nuclide name="H1" wo="0.0086117" />
+      <nuclide name="O16" wo="0.0683369" />
+      <nuclide name="B10" wo="2.77638e-05" />
+      <nuclide name="B11" wo="0.000126481" />
+      <nuclide name="Fe54" wo="0.035953677186" />
+      <nuclide name="Fe56" wo="0.585224740891" />
+      <nuclide name="Fe57" wo="0.01375486056" />
+      <nuclide name="Fe58" wo="0.001865821363" />
+      <nuclide name="Ni58" wo="0.055815129186" />
+      <nuclide name="Mn55" wo="0.0184579" />
+      <nuclide name="Cr52" wo="0.146766614995" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="8" name="Bottom plate region">
+      <density units="g/cm3" value="7.184" />
+      <nuclide name="H1" wo="0.0011505" />
+      <nuclide name="O16" wo="0.0091296" />
+      <nuclide name="B10" wo="3.70915e-06" />
+      <nuclide name="B11" wo="1.68974e-05" />
+      <nuclide name="Fe54" wo="0.03855611055" />
+      <nuclide name="Fe56" wo="0.627585036425" />
+      <nuclide name="Fe57" wo="0.014750478" />
+      <nuclide name="Fe58" wo="0.002000875025" />
+      <nuclide name="Ni58" wo="0.059855207342" />
+      <nuclide name="Mn55" wo="0.019794" />
+      <nuclide name="Cr52" wo="0.157390026871" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="9" name="Bottom nozzle region">
+      <density units="g/cm3" value="2.53" />
+      <nuclide name="H1" wo="0.0245014" />
+      <nuclide name="O16" wo="0.1944274" />
+      <nuclide name="B10" wo="7.89917e-05" />
+      <nuclide name="B11" wo="0.000359854" />
+      <nuclide name="Fe54" wo="0.030411411144" />
+      <nuclide name="Fe56" wo="0.495012237964" />
+      <nuclide name="Fe57" wo="0.01163454624" />
+      <nuclide name="Fe58" wo="0.001578204652" />
+      <nuclide name="Ni58" wo="0.047211231662" />
+      <nuclide name="Mn55" wo="0.0156126" />
+      <nuclide name="Cr52" wo="0.124142524198" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="10" name="Top nozzle region">
+      <density units="g/cm3" value="1.746" />
+      <nuclide name="H1" wo="0.035887" />
+      <nuclide name="O16" wo="0.2847761" />
+      <nuclide name="B10" wo="0.000115699" />
+      <nuclide name="B11" wo="0.000527075" />
+      <nuclide name="Fe54" wo="0.02644016154" />
+      <nuclide name="Fe56" wo="0.43037146399" />
+      <nuclide name="Fe57" wo="0.0101152584" />
+      <nuclide name="Fe58" wo="0.00137211607" />
+      <nuclide name="Ni58" wo="0.04104621835" />
+      <nuclide name="Mn55" wo="0.0135739" />
+      <nuclide name="Cr52" wo="0.107931450781" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="11" name="Top of fuel assemblies">
+      <density units="g/cm3" value="3.044" />
+      <nuclide name="H1" wo="0.0162913" />
+      <nuclide name="O16" wo="0.1292776" />
+      <nuclide name="B10" wo="5.25228e-05" />
+      <nuclide name="B11" wo="0.000239272" />
+      <nuclide name="Zr90" wo="0.43313403903" />
+      <nuclide name="Zr91" wo="0.09549277374" />
+      <nuclide name="Zr92" wo="0.14759527104" />
+      <nuclide name="Zr94" wo="0.15280552077" />
+      <nuclide name="Zr96" wo="0.02511169542" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="12" name="Bottom of fuel assemblies">
+      <density units="g/cm3" value="1.762" />
+      <nuclide name="H1" wo="0.0292856" />
+      <nuclide name="O16" wo="0.2323919" />
+      <nuclide name="B10" wo="9.44159e-05" />
+      <nuclide name="B11" wo="0.00043012" />
+      <nuclide name="Zr90" wo="0.3741373658" />
+      <nuclide name="Zr91" wo="0.0824858164" />
+      <nuclide name="Zr92" wo="0.1274914944" />
+      <nuclide name="Zr94" wo="0.1319920622" />
+      <nuclide name="Zr96" wo="0.0216912612" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell fill="200" id="1" region="-6 34 -35" universe="0" />
+    <cell fill="201" id="2" region="-6 35 -36" universe="0" />
+    <cell id="3" material="8" region="-7 31 -32" universe="0" />
+    <cell id="4" material="9" region="-5 32 -33" universe="0" />
+    <cell id="5" material="12" region="-5 33 -34" universe="0" />
+    <cell id="6" material="11" region="-5 36 -37" universe="0" />
+    <cell id="7" material="10" region="-5 37 -38" universe="0" />
+    <cell id="8" material="7" region="-7 38 -39" universe="0" />
+    <cell id="9" material="9" region="6 -7 32 -38" universe="0" />
+    <cell id="10" material="5" region="7 -8 31 -39" universe="0" />
+    <cell id="11" material="6" region="5 -6 32 -34" universe="0" />
+    <cell id="12" material="7" region="5 -6 36 -38" universe="0" />
+    <cell id="21" material="1" region="-1" universe="1" />
+    <cell id="22" material="2" region="1 -2" universe="1" />
+    <cell id="23" material="3" region="2" universe="1" />
+    <cell id="24" material="3" region="-3" universe="2" />
+    <cell id="25" material="2" region="3 -4" universe="2" />
+    <cell id="26" material="3" region="4" universe="2" />
+    <cell id="27" material="1" region="-1" universe="3" />
+    <cell id="28" material="2" region="1 -2" universe="3" />
+    <cell id="29" material="4" region="2" universe="3" />
+    <cell id="30" material="4" region="-3" universe="4" />
+    <cell id="31" material="2" region="3 -4" universe="4" />
+    <cell id="32" material="4" region="4" universe="4" />
+    <cell id="50" material="3" region="34 -35" universe="5" />
+    <cell fill="100" id="60" region="34 -35" universe="6" />
+    <cell id="70" material="4" region="35 -36" universe="7" />
+    <cell fill="101" id="80" region="35 -36" universe="8" />
+    <lattice id="100" name="Fuel assembly (lower half)">
+      <pitch>1.26 1.26</pitch>
+      <dimension>17 17</dimension>
+      <lower_left>-10.71 -10.71</lower_left>
+      <universes>
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 
@@ -50,12 +199,12 @@
 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 </universes>
-  </lattice>
-  <lattice id="101" name="Fuel assembly (upper half)">
-    <pitch>1.26 1.26</pitch>
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <universes>
+    </lattice>
+    <lattice id="101" name="Fuel assembly (upper half)">
+      <pitch>1.26 1.26</pitch>
+      <dimension>17 17</dimension>
+      <lower_left>-10.71 -10.71</lower_left>
+      <universes>
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 
@@ -73,12 +222,12 @@
 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
-  </lattice>
-  <lattice id="200" name="Core lattice (lower half)">
-    <pitch>21.42 21.42</pitch>
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <universes>
+    </lattice>
+    <lattice id="200" name="Core lattice (lower half)">
+      <pitch>21.42 21.42</pitch>
+      <dimension>21 21</dimension>
+      <lower_left>-224.91 -224.91</lower_left>
+      <universes>
 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 
@@ -100,12 +249,12 @@
 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 
 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 </universes>
-  </lattice>
-  <lattice id="201" name="Core lattice (lower half)">
-    <pitch>21.42 21.42</pitch>
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <universes>
+    </lattice>
+    <lattice id="201" name="Core lattice (lower half)">
+      <pitch>21.42 21.42</pitch>
+      <dimension>21 21</dimension>
+      <lower_left>-224.91 -224.91</lower_left>
+      <universes>
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 
@@ -127,378 +276,228 @@
 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 </universes>
-  </lattice>
-  <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder" />
-  <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane" />
-  <surface coeffs="-199.0" id="32" type="z-plane" />
-  <surface coeffs="-193.0" id="33" type="z-plane" />
-  <surface coeffs="-183.0" id="34" type="z-plane" />
-  <surface coeffs="0.0" id="35" type="z-plane" />
-  <surface coeffs="183.0" id="36" type="z-plane" />
-  <surface coeffs="203.0" id="37" type="z-plane" />
-  <surface coeffs="215.0" id="38" type="z-plane" />
-  <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="UOX fuel">
-    <density units="g/cm3" value="10.062" />
-    <nuclide ao="4.9476e-06" name="U234" />
-    <nuclide ao="0.00048218" name="U235" />
-    <nuclide ao="0.021504" name="U238" />
-    <nuclide ao="1.0801e-08" name="Xe135" />
-    <nuclide ao="0.045737" name="O16" />
-  </material>
-  <material id="2" name="Zircaloy">
-    <density units="g/cm3" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="Cold borated water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <nuclide ao="0.000649" name="B10" />
-    <nuclide ao="0.002689" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="4" name="Hot borated water">
-    <density units="atom/b-cm" value="0.06614" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <nuclide ao="0.000649" name="B10" />
-    <nuclide ao="0.002689" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="5" name="Reactor pressure vessel steel">
-    <density units="g/cm3" value="7.9" />
-    <nuclide name="Fe54" wo="0.05437098" />
-    <nuclide name="Fe56" wo="0.88500663" />
-    <nuclide name="Fe57" wo="0.0208008" />
-    <nuclide name="Fe58" wo="0.00282159" />
-    <nuclide name="Ni58" wo="0.0067198" />
-    <nuclide name="Ni60" wo="0.0026776" />
-    <nuclide name="Mn55" wo="0.01" />
-    <nuclide name="Cr52" wo="0.002092475" />
-    <nuclide name="C0" wo="0.0025" />
-    <nuclide name="Cu63" wo="0.0013696" />
-  </material>
-  <material id="6" name="Lower radial reflector">
-    <density units="g/cm3" value="4.32" />
-    <nuclide name="H1" wo="0.0095661" />
-    <nuclide name="O16" wo="0.0759107" />
-    <nuclide name="B10" wo="3.08409e-05" />
-    <nuclide name="B11" wo="0.000140499" />
-    <nuclide name="Fe54" wo="0.035620772088" />
-    <nuclide name="Fe56" wo="0.579805982228" />
-    <nuclide name="Fe57" wo="0.01362750048" />
-    <nuclide name="Fe58" wo="0.001848545204" />
-    <nuclide name="Ni58" wo="0.055298376566" />
-    <nuclide name="Mn55" wo="0.018287" />
-    <nuclide name="Cr52" wo="0.145407678031" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="7" name="Upper radial reflector / Top plate region">
-    <density units="g/cm3" value="4.28" />
-    <nuclide name="H1" wo="0.0086117" />
-    <nuclide name="O16" wo="0.0683369" />
-    <nuclide name="B10" wo="2.77638e-05" />
-    <nuclide name="B11" wo="0.000126481" />
-    <nuclide name="Fe54" wo="0.035953677186" />
-    <nuclide name="Fe56" wo="0.585224740891" />
-    <nuclide name="Fe57" wo="0.01375486056" />
-    <nuclide name="Fe58" wo="0.001865821363" />
-    <nuclide name="Ni58" wo="0.055815129186" />
-    <nuclide name="Mn55" wo="0.0184579" />
-    <nuclide name="Cr52" wo="0.146766614995" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="8" name="Bottom plate region">
-    <density units="g/cm3" value="7.184" />
-    <nuclide name="H1" wo="0.0011505" />
-    <nuclide name="O16" wo="0.0091296" />
-    <nuclide name="B10" wo="3.70915e-06" />
-    <nuclide name="B11" wo="1.68974e-05" />
-    <nuclide name="Fe54" wo="0.03855611055" />
-    <nuclide name="Fe56" wo="0.627585036425" />
-    <nuclide name="Fe57" wo="0.014750478" />
-    <nuclide name="Fe58" wo="0.002000875025" />
-    <nuclide name="Ni58" wo="0.059855207342" />
-    <nuclide name="Mn55" wo="0.019794" />
-    <nuclide name="Cr52" wo="0.157390026871" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="9" name="Bottom nozzle region">
-    <density units="g/cm3" value="2.53" />
-    <nuclide name="H1" wo="0.0245014" />
-    <nuclide name="O16" wo="0.1944274" />
-    <nuclide name="B10" wo="7.89917e-05" />
-    <nuclide name="B11" wo="0.000359854" />
-    <nuclide name="Fe54" wo="0.030411411144" />
-    <nuclide name="Fe56" wo="0.495012237964" />
-    <nuclide name="Fe57" wo="0.01163454624" />
-    <nuclide name="Fe58" wo="0.001578204652" />
-    <nuclide name="Ni58" wo="0.047211231662" />
-    <nuclide name="Mn55" wo="0.0156126" />
-    <nuclide name="Cr52" wo="0.124142524198" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="10" name="Top nozzle region">
-    <density units="g/cm3" value="1.746" />
-    <nuclide name="H1" wo="0.035887" />
-    <nuclide name="O16" wo="0.2847761" />
-    <nuclide name="B10" wo="0.000115699" />
-    <nuclide name="B11" wo="0.000527075" />
-    <nuclide name="Fe54" wo="0.02644016154" />
-    <nuclide name="Fe56" wo="0.43037146399" />
-    <nuclide name="Fe57" wo="0.0101152584" />
-    <nuclide name="Fe58" wo="0.00137211607" />
-    <nuclide name="Ni58" wo="0.04104621835" />
-    <nuclide name="Mn55" wo="0.0135739" />
-    <nuclide name="Cr52" wo="0.107931450781" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="11" name="Top of fuel assemblies">
-    <density units="g/cm3" value="3.044" />
-    <nuclide name="H1" wo="0.0162913" />
-    <nuclide name="O16" wo="0.1292776" />
-    <nuclide name="B10" wo="5.25228e-05" />
-    <nuclide name="B11" wo="0.000239272" />
-    <nuclide name="Zr90" wo="0.43313403903" />
-    <nuclide name="Zr91" wo="0.09549277374" />
-    <nuclide name="Zr92" wo="0.14759527104" />
-    <nuclide name="Zr94" wo="0.15280552077" />
-    <nuclide name="Zr96" wo="0.02511169542" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="12" name="Bottom of fuel assemblies">
-    <density units="g/cm3" value="1.762" />
-    <nuclide name="H1" wo="0.0292856" />
-    <nuclide name="O16" wo="0.2323919" />
-    <nuclide name="B10" wo="9.44159e-05" />
-    <nuclide name="B11" wo="0.00043012" />
-    <nuclide name="Zr90" wo="0.3741373658" />
-    <nuclide name="Zr91" wo="0.0824858164" />
-    <nuclide name="Zr92" wo="0.1274914944" />
-    <nuclide name="Zr94" wo="0.1319920622" />
-    <nuclide name="Zr96" wo="0.0216912612" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>400</particles>
-  <batches>5</batches>
-  <inactive>0</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-160 -160 -183 160 160 183</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>2 2</dimension>
-    <lower_left>-182.07 -182.07</lower_left>
-    <upper_right>182.07 182.07</upper_right>
-  </mesh>
-  <filter id="1" type="azimuthal">
-    <bins>-3.14159 -1.885 -0.6283 0.6283 1.885 3.14159</bins>
-  </filter>
-  <filter id="2" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="3" type="cellborn">
-    <bins>10 21 22 23</bins>
-  </filter>
-  <filter id="4" type="delayedgroup">
-    <bins>1 2 3 4 5 6</bins>
-  </filter>
-  <filter id="5" type="energy">
-    <bins>0.0 0.253 1000.0 1000000.0 20000000.0</bins>
-  </filter>
-  <filter id="6" type="energyout">
-    <bins>0.0 0.253 1000.0 1000000.0 20000000.0</bins>
-  </filter>
-  <filter id="7" type="material">
-    <bins>1 2 3 4</bins>
-  </filter>
-  <filter id="8" type="mu">
-    <bins>-1.0 -0.5 0.0 0.5 1.0</bins>
-  </filter>
-  <filter id="9" type="polar">
-    <bins>0.0 0.6283 1.2566 1.885 2.5132 3.14159</bins>
-  </filter>
-  <filter id="10" type="legendre">
-    <order>4</order>
-  </filter>
-  <filter cosine="particle" id="11" type="sphericalharmonics">
-    <order>4</order>
-  </filter>
-  <filter id="12" type="universe">
-    <bins>1 2 3 4 6 8</bins>
-  </filter>
-  <filter id="15" type="collision">
-    <bins>1 2 5 3 6</bins>
-  </filter>
-  <filter id="13" type="cell">
-    <bins>10 21 22 23 60</bins>
-  </filter>
-  <filter id="14" type="cell">
-    <bins>21 22 23 27 28 29 60</bins>
-  </filter>
-  <tally id="1">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="2">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="3">
-    <filters>1 2</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="4">
-    <filters>3</filters>
-    <scores>total</scores>
-  </tally>
-  <tally id="5">
-    <filters>4</filters>
-    <nuclides>U235 O16 total</nuclides>
-    <scores>delayed-nu-fission decay-rate</scores>
-  </tally>
-  <tally id="6">
-    <filters>5</filters>
-    <scores>total</scores>
-  </tally>
-  <tally id="7">
-    <filters>6</filters>
-    <scores>scatter</scores>
-  </tally>
-  <tally id="8">
-    <filters>5 6</filters>
-    <scores>scatter nu-fission</scores>
-  </tally>
-  <tally id="9">
-    <filters>7</filters>
-    <scores>total</scores>
-  </tally>
-  <tally id="10">
-    <filters>8</filters>
-    <scores>scatter nu-scatter</scores>
-  </tally>
-  <tally id="11">
-    <filters>8 2</filters>
-    <scores>scatter nu-scatter</scores>
-  </tally>
-  <tally id="12">
-    <filters>9</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="13">
-    <filters>9</filters>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="14">
-    <filters>9 2</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="15">
-    <filters>10</filters>
-    <scores>scatter nu-scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="16">
-    <filters>11</filters>
-    <scores>scatter nu-scatter flux total</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="17">
-    <filters>11</filters>
-    <scores>flux total</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="18">
-    <filters>11</filters>
-    <scores>flux total</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="19">
-    <filters>12</filters>
-    <scores>total</scores>
-  </tally>
-  <tally id="30">
-    <filters>15</filters>
-    <scores>scatter</scores>
-  </tally>
-  <tally id="20">
-    <filters>13</filters>
-    <scores>absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="21">
-    <filters>13</filters>
-    <nuclides>U235 O16 total</nuclides>
-    <scores>absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="22">
-    <filters>13</filters>
-    <scores>absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="23">
-    <filters>13</filters>
-    <nuclides>U235 O16 total</nuclides>
-    <scores>absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="24">
-    <filters>13</filters>
-    <scores>absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="25">
-    <filters>13</filters>
-    <nuclides>U235 O16 total</nuclides>
-    <scores>absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="26">
-    <filters>14</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="27">
-    <filters>14</filters>
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-  <tally id="28">
-    <filters>14</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="29">
-    <scores>H1-production H2-production H3-production He3-production He4-production heating damage-energy</scores>
-  </tally>
-</tallies>
+    </lattice>
+    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane" />
+    <surface coeffs="-199.0" id="32" type="z-plane" />
+    <surface coeffs="-193.0" id="33" type="z-plane" />
+    <surface coeffs="-183.0" id="34" type="z-plane" />
+    <surface coeffs="0.0" id="35" type="z-plane" />
+    <surface coeffs="183.0" id="36" type="z-plane" />
+    <surface coeffs="203.0" id="37" type="z-plane" />
+    <surface coeffs="215.0" id="38" type="z-plane" />
+    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>400</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-160 -160 -183 160 160 183</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>2 2</dimension>
+      <lower_left>-182.07 -182.07</lower_left>
+      <upper_right>182.07 182.07</upper_right>
+    </mesh>
+    <filter id="1" type="azimuthal">
+      <bins>-3.14159 -1.885 -0.6283 0.6283 1.885 3.14159</bins>
+    </filter>
+    <filter id="2" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="3" type="cellborn">
+      <bins>10 21 22 23</bins>
+    </filter>
+    <filter id="4" type="delayedgroup">
+      <bins>1 2 3 4 5 6</bins>
+    </filter>
+    <filter id="5" type="energy">
+      <bins>0.0 0.253 1000.0 1000000.0 20000000.0</bins>
+    </filter>
+    <filter id="6" type="energyout">
+      <bins>0.0 0.253 1000.0 1000000.0 20000000.0</bins>
+    </filter>
+    <filter id="7" type="material">
+      <bins>1 2 3 4</bins>
+    </filter>
+    <filter id="8" type="mu">
+      <bins>-1.0 -0.5 0.0 0.5 1.0</bins>
+    </filter>
+    <filter id="9" type="polar">
+      <bins>0.0 0.6283 1.2566 1.885 2.5132 3.14159</bins>
+    </filter>
+    <filter id="10" type="legendre">
+      <order>4</order>
+    </filter>
+    <filter cosine="particle" id="11" type="sphericalharmonics">
+      <order>4</order>
+    </filter>
+    <filter id="12" type="universe">
+      <bins>1 2 3 4 6 8</bins>
+    </filter>
+    <filter id="15" type="collision">
+      <bins>1 2 5 3 6</bins>
+    </filter>
+    <filter id="13" type="cell">
+      <bins>10 21 22 23 60</bins>
+    </filter>
+    <filter id="14" type="cell">
+      <bins>21 22 23 27 28 29 60</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="2">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="3">
+      <filters>1 2</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="4">
+      <filters>3</filters>
+      <scores>total</scores>
+    </tally>
+    <tally id="5">
+      <filters>4</filters>
+      <nuclides>U235 O16 total</nuclides>
+      <scores>delayed-nu-fission decay-rate</scores>
+    </tally>
+    <tally id="6">
+      <filters>5</filters>
+      <scores>total</scores>
+    </tally>
+    <tally id="7">
+      <filters>6</filters>
+      <scores>scatter</scores>
+    </tally>
+    <tally id="8">
+      <filters>5 6</filters>
+      <scores>scatter nu-fission</scores>
+    </tally>
+    <tally id="9">
+      <filters>7</filters>
+      <scores>total</scores>
+    </tally>
+    <tally id="10">
+      <filters>8</filters>
+      <scores>scatter nu-scatter</scores>
+    </tally>
+    <tally id="11">
+      <filters>8 2</filters>
+      <scores>scatter nu-scatter</scores>
+    </tally>
+    <tally id="12">
+      <filters>9</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="13">
+      <filters>9</filters>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="14">
+      <filters>9 2</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="15">
+      <filters>10</filters>
+      <scores>scatter nu-scatter</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="16">
+      <filters>11</filters>
+      <scores>scatter nu-scatter flux total</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="17">
+      <filters>11</filters>
+      <scores>flux total</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="18">
+      <filters>11</filters>
+      <scores>flux total</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="19">
+      <filters>12</filters>
+      <scores>total</scores>
+    </tally>
+    <tally id="30">
+      <filters>15</filters>
+      <scores>scatter</scores>
+    </tally>
+    <tally id="20">
+      <filters>13</filters>
+      <scores>absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="21">
+      <filters>13</filters>
+      <nuclides>U235 O16 total</nuclides>
+      <scores>absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="22">
+      <filters>13</filters>
+      <scores>absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="23">
+      <filters>13</filters>
+      <nuclides>U235 O16 total</nuclides>
+      <scores>absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="24">
+      <filters>13</filters>
+      <scores>absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="25">
+      <filters>13</filters>
+      <nuclides>U235 O16 total</nuclides>
+      <scores>absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="26">
+      <filters>14</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="27">
+      <filters>14</filters>
+      <scores>flux</scores>
+      <estimator>analog</estimator>
+    </tally>
+    <tally id="28">
+      <filters>14</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="29">
+      <scores>H1-production H2-production H3-production He3-production He4-production heating damage-energy</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/tally_aggregation/inputs_true.dat b/tests/regression_tests/tally_aggregation/inputs_true.dat
index 80356f711..bb2dcddc5 100644
--- a/tests/regression_tests/tally_aggregation/inputs_true.dat
+++ b/tests/regression_tests/tally_aggregation/inputs_true.dat
@@ -1,57 +1,56 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <cell id="2" material="2" region="1" universe="1" />
-  <cell fill="2" id="3" region="2 -3 4 -5" universe="3" />
-  <lattice id="2">
-    <pitch>1.2 1.2</pitch>
-    <outer>1</outer>
-    <dimension>2 2</dimension>
-    <lower_left>-1.2 -1.2</lower_left>
-    <universes>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UO2">
+      <density units="g/cm3" value="10.29769" />
+      <nuclide ao="4.4843e-06" name="U234" />
+      <nuclide ao="0.00055815" name="U235" />
+      <nuclide ao="0.022408" name="U238" />
+      <nuclide ao="0.045829" name="O16" />
+    </material>
+    <material id="2" name="light water">
+      <density units="g/cm3" value="1.0" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <cell id="2" material="2" region="1" universe="1" />
+    <cell fill="2" id="3" region="2 -3 4 -5" universe="3" />
+    <lattice id="2">
+      <pitch>1.2 1.2</pitch>
+      <outer>1</outer>
+      <dimension>2 2</dimension>
+      <lower_left>-1.2 -1.2</lower_left>
+      <universes>
 1 1 
 1 1 </universes>
-  </lattice>
-  <surface coeffs="0.0 0.0 0.4" id="1" type="z-cylinder" />
-  <surface boundary="reflective" coeffs="-1.2" id="2" name="minimum x" type="x-plane" />
-  <surface boundary="reflective" coeffs="1.2" id="3" name="maximum x" type="x-plane" />
-  <surface boundary="reflective" coeffs="-1.2" id="4" name="minimum y" type="y-plane" />
-  <surface boundary="reflective" coeffs="1.2" id="5" name="maximum y" type="y-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="UO2">
-    <density units="g/cm3" value="10.29769" />
-    <nuclide ao="4.4843e-06" name="U234" />
-    <nuclide ao="0.00055815" name="U235" />
-    <nuclide ao="0.022408" name="U238" />
-    <nuclide ao="0.045829" name="O16" />
-  </material>
-  <material id="2" name="light water">
-    <density units="g/cm3" value="1.0" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="energy">
-    <bins>0.0 0.253 1000.0 1000000.0 20000000.0</bins>
-  </filter>
-  <filter id="2" type="distribcell">
-    <bins>1</bins>
-  </filter>
-  <tally id="1" name="distribcell tally">
-    <filters>1 2</filters>
-    <nuclides>U234 U235 U238</nuclides>
-    <scores>nu-fission total</scores>
-  </tally>
-</tallies>
+    </lattice>
+    <surface coeffs="0.0 0.0 0.4" id="1" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-1.2" id="2" name="minimum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="1.2" id="3" name="maximum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="-1.2" id="4" name="minimum y" type="y-plane" />
+    <surface boundary="reflective" coeffs="1.2" id="5" name="maximum y" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+  </settings>
+  <tallies>
+    <filter id="1" type="energy">
+      <bins>0.0 0.253 1000.0 1000000.0 20000000.0</bins>
+    </filter>
+    <filter id="2" type="distribcell">
+      <bins>1</bins>
+    </filter>
+    <tally id="1" name="distribcell tally">
+      <filters>1 2</filters>
+      <nuclides>U234 U235 U238</nuclides>
+      <scores>nu-fission total</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/tally_arithmetic/inputs_true.dat b/tests/regression_tests/tally_arithmetic/inputs_true.dat
index fbbf94fa9..41760f3cf 100644
--- a/tests/regression_tests/tally_arithmetic/inputs_true.dat
+++ b/tests/regression_tests/tally_arithmetic/inputs_true.dat
@@ -1,56 +1,55 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <cell id="2" material="2" region="1 -2" universe="1" />
-  <surface coeffs="0.0 0.0 5.0" id="1" type="z-cylinder" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 10.0" id="2" type="z-cylinder" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cm3" value="10.0" />
-    <nuclide ao="1.0" name="U234" />
-    <nuclide ao="4.0" name="U235" />
-    <nuclide ao="95.0" name="U238" />
-  </material>
-  <material id="2" name="light water">
-    <density units="g/cm3" value="1.0" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>5</batches>
-  <inactive>0</inactive>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>2 2</dimension>
-    <lower_left>-10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0</upper_right>
-  </mesh>
-  <filter id="2" type="material">
-    <bins>1 2</bins>
-  </filter>
-  <filter id="1" type="energy">
-    <bins>0.0 10.0 20000000.0</bins>
-  </filter>
-  <filter id="3" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <tally id="1" name="tally 1">
-    <filters>2 1</filters>
-    <nuclides>U234 U235</nuclides>
-    <scores>nu-fission total</scores>
-  </tally>
-  <tally id="2" name="tally 2">
-    <filters>1 3</filters>
-    <nuclides>U238 U235</nuclides>
-    <scores>total fission</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cm3" value="10.0" />
+      <nuclide ao="1.0" name="U234" />
+      <nuclide ao="4.0" name="U235" />
+      <nuclide ao="95.0" name="U238" />
+    </material>
+    <material id="2" name="light water">
+      <density units="g/cm3" value="1.0" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <cell id="2" material="2" region="1 -2" universe="1" />
+    <surface coeffs="0.0 0.0 5.0" id="1" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 10.0" id="2" type="z-cylinder" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>2 2</dimension>
+      <lower_left>-10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0</upper_right>
+    </mesh>
+    <filter id="2" type="material">
+      <bins>1 2</bins>
+    </filter>
+    <filter id="1" type="energy">
+      <bins>0.0 10.0 20000000.0</bins>
+    </filter>
+    <filter id="3" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <tally id="1" name="tally 1">
+      <filters>2 1</filters>
+      <nuclides>U234 U235</nuclides>
+      <scores>nu-fission total</scores>
+    </tally>
+    <tally id="2" name="tally 2">
+      <filters>1 3</filters>
+      <nuclides>U238 U235</nuclides>
+      <scores>total fission</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/tally_slice_merge/inputs_true.dat b/tests/regression_tests/tally_slice_merge/inputs_true.dat
index 6f421b1d9..5b5731efb 100644
--- a/tests/regression_tests/tally_slice_merge/inputs_true.dat
+++ b/tests/regression_tests/tally_slice_merge/inputs_true.dat
@@ -1,38 +1,187 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell fill="200" id="1" region="-6 34 -35" universe="0" />
-  <cell fill="201" id="2" region="-6 35 -36" universe="0" />
-  <cell id="3" material="8" region="-7 31 -32" universe="0" />
-  <cell id="4" material="9" region="-5 32 -33" universe="0" />
-  <cell id="5" material="12" region="-5 33 -34" universe="0" />
-  <cell id="6" material="11" region="-5 36 -37" universe="0" />
-  <cell id="7" material="10" region="-5 37 -38" universe="0" />
-  <cell id="8" material="7" region="-7 38 -39" universe="0" />
-  <cell id="9" material="9" region="6 -7 32 -38" universe="0" />
-  <cell id="10" material="5" region="7 -8 31 -39" universe="0" />
-  <cell id="11" material="6" region="5 -6 32 -34" universe="0" />
-  <cell id="12" material="7" region="5 -6 36 -38" universe="0" />
-  <cell id="21" material="1" region="-1" universe="1" />
-  <cell id="22" material="2" region="1 -2" universe="1" />
-  <cell id="23" material="3" region="2" universe="1" />
-  <cell id="24" material="3" region="-3" universe="2" />
-  <cell id="25" material="2" region="3 -4" universe="2" />
-  <cell id="26" material="3" region="4" universe="2" />
-  <cell id="27" material="1" region="-1" universe="3" />
-  <cell id="28" material="2" region="1 -2" universe="3" />
-  <cell id="29" material="4" region="2" universe="3" />
-  <cell id="30" material="4" region="-3" universe="4" />
-  <cell id="31" material="2" region="3 -4" universe="4" />
-  <cell id="32" material="4" region="4" universe="4" />
-  <cell id="50" material="3" region="34 -35" universe="5" />
-  <cell fill="100" id="60" region="34 -35" universe="6" />
-  <cell id="70" material="4" region="35 -36" universe="7" />
-  <cell fill="101" id="80" region="35 -36" universe="8" />
-  <lattice id="100" name="Fuel assembly (lower half)">
-    <pitch>1.26 1.26</pitch>
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <universes>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UOX fuel">
+      <density units="g/cm3" value="10.062" />
+      <nuclide ao="4.9476e-06" name="U234" />
+      <nuclide ao="0.00048218" name="U235" />
+      <nuclide ao="0.021504" name="U238" />
+      <nuclide ao="1.0801e-08" name="Xe135" />
+      <nuclide ao="0.045737" name="O16" />
+    </material>
+    <material id="2" name="Zircaloy">
+      <density units="g/cm3" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="Cold borated water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <nuclide ao="0.000649" name="B10" />
+      <nuclide ao="0.002689" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="4" name="Hot borated water">
+      <density units="atom/b-cm" value="0.06614" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <nuclide ao="0.000649" name="B10" />
+      <nuclide ao="0.002689" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="5" name="Reactor pressure vessel steel">
+      <density units="g/cm3" value="7.9" />
+      <nuclide name="Fe54" wo="0.05437098" />
+      <nuclide name="Fe56" wo="0.88500663" />
+      <nuclide name="Fe57" wo="0.0208008" />
+      <nuclide name="Fe58" wo="0.00282159" />
+      <nuclide name="Ni58" wo="0.0067198" />
+      <nuclide name="Ni60" wo="0.0026776" />
+      <nuclide name="Mn55" wo="0.01" />
+      <nuclide name="Cr52" wo="0.002092475" />
+      <nuclide name="C0" wo="0.0025" />
+      <nuclide name="Cu63" wo="0.0013696" />
+    </material>
+    <material id="6" name="Lower radial reflector">
+      <density units="g/cm3" value="4.32" />
+      <nuclide name="H1" wo="0.0095661" />
+      <nuclide name="O16" wo="0.0759107" />
+      <nuclide name="B10" wo="3.08409e-05" />
+      <nuclide name="B11" wo="0.000140499" />
+      <nuclide name="Fe54" wo="0.035620772088" />
+      <nuclide name="Fe56" wo="0.579805982228" />
+      <nuclide name="Fe57" wo="0.01362750048" />
+      <nuclide name="Fe58" wo="0.001848545204" />
+      <nuclide name="Ni58" wo="0.055298376566" />
+      <nuclide name="Mn55" wo="0.018287" />
+      <nuclide name="Cr52" wo="0.145407678031" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="7" name="Upper radial reflector / Top plate region">
+      <density units="g/cm3" value="4.28" />
+      <nuclide name="H1" wo="0.0086117" />
+      <nuclide name="O16" wo="0.0683369" />
+      <nuclide name="B10" wo="2.77638e-05" />
+      <nuclide name="B11" wo="0.000126481" />
+      <nuclide name="Fe54" wo="0.035953677186" />
+      <nuclide name="Fe56" wo="0.585224740891" />
+      <nuclide name="Fe57" wo="0.01375486056" />
+      <nuclide name="Fe58" wo="0.001865821363" />
+      <nuclide name="Ni58" wo="0.055815129186" />
+      <nuclide name="Mn55" wo="0.0184579" />
+      <nuclide name="Cr52" wo="0.146766614995" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="8" name="Bottom plate region">
+      <density units="g/cm3" value="7.184" />
+      <nuclide name="H1" wo="0.0011505" />
+      <nuclide name="O16" wo="0.0091296" />
+      <nuclide name="B10" wo="3.70915e-06" />
+      <nuclide name="B11" wo="1.68974e-05" />
+      <nuclide name="Fe54" wo="0.03855611055" />
+      <nuclide name="Fe56" wo="0.627585036425" />
+      <nuclide name="Fe57" wo="0.014750478" />
+      <nuclide name="Fe58" wo="0.002000875025" />
+      <nuclide name="Ni58" wo="0.059855207342" />
+      <nuclide name="Mn55" wo="0.019794" />
+      <nuclide name="Cr52" wo="0.157390026871" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="9" name="Bottom nozzle region">
+      <density units="g/cm3" value="2.53" />
+      <nuclide name="H1" wo="0.0245014" />
+      <nuclide name="O16" wo="0.1944274" />
+      <nuclide name="B10" wo="7.89917e-05" />
+      <nuclide name="B11" wo="0.000359854" />
+      <nuclide name="Fe54" wo="0.030411411144" />
+      <nuclide name="Fe56" wo="0.495012237964" />
+      <nuclide name="Fe57" wo="0.01163454624" />
+      <nuclide name="Fe58" wo="0.001578204652" />
+      <nuclide name="Ni58" wo="0.047211231662" />
+      <nuclide name="Mn55" wo="0.0156126" />
+      <nuclide name="Cr52" wo="0.124142524198" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="10" name="Top nozzle region">
+      <density units="g/cm3" value="1.746" />
+      <nuclide name="H1" wo="0.035887" />
+      <nuclide name="O16" wo="0.2847761" />
+      <nuclide name="B10" wo="0.000115699" />
+      <nuclide name="B11" wo="0.000527075" />
+      <nuclide name="Fe54" wo="0.02644016154" />
+      <nuclide name="Fe56" wo="0.43037146399" />
+      <nuclide name="Fe57" wo="0.0101152584" />
+      <nuclide name="Fe58" wo="0.00137211607" />
+      <nuclide name="Ni58" wo="0.04104621835" />
+      <nuclide name="Mn55" wo="0.0135739" />
+      <nuclide name="Cr52" wo="0.107931450781" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="11" name="Top of fuel assemblies">
+      <density units="g/cm3" value="3.044" />
+      <nuclide name="H1" wo="0.0162913" />
+      <nuclide name="O16" wo="0.1292776" />
+      <nuclide name="B10" wo="5.25228e-05" />
+      <nuclide name="B11" wo="0.000239272" />
+      <nuclide name="Zr90" wo="0.43313403903" />
+      <nuclide name="Zr91" wo="0.09549277374" />
+      <nuclide name="Zr92" wo="0.14759527104" />
+      <nuclide name="Zr94" wo="0.15280552077" />
+      <nuclide name="Zr96" wo="0.02511169542" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="12" name="Bottom of fuel assemblies">
+      <density units="g/cm3" value="1.762" />
+      <nuclide name="H1" wo="0.0292856" />
+      <nuclide name="O16" wo="0.2323919" />
+      <nuclide name="B10" wo="9.44159e-05" />
+      <nuclide name="B11" wo="0.00043012" />
+      <nuclide name="Zr90" wo="0.3741373658" />
+      <nuclide name="Zr91" wo="0.0824858164" />
+      <nuclide name="Zr92" wo="0.1274914944" />
+      <nuclide name="Zr94" wo="0.1319920622" />
+      <nuclide name="Zr96" wo="0.0216912612" />
+      <sab name="c_H_in_H2O" />
+    </material>
+  </materials>
+  <geometry>
+    <cell fill="200" id="1" region="-6 34 -35" universe="0" />
+    <cell fill="201" id="2" region="-6 35 -36" universe="0" />
+    <cell id="3" material="8" region="-7 31 -32" universe="0" />
+    <cell id="4" material="9" region="-5 32 -33" universe="0" />
+    <cell id="5" material="12" region="-5 33 -34" universe="0" />
+    <cell id="6" material="11" region="-5 36 -37" universe="0" />
+    <cell id="7" material="10" region="-5 37 -38" universe="0" />
+    <cell id="8" material="7" region="-7 38 -39" universe="0" />
+    <cell id="9" material="9" region="6 -7 32 -38" universe="0" />
+    <cell id="10" material="5" region="7 -8 31 -39" universe="0" />
+    <cell id="11" material="6" region="5 -6 32 -34" universe="0" />
+    <cell id="12" material="7" region="5 -6 36 -38" universe="0" />
+    <cell id="21" material="1" region="-1" universe="1" />
+    <cell id="22" material="2" region="1 -2" universe="1" />
+    <cell id="23" material="3" region="2" universe="1" />
+    <cell id="24" material="3" region="-3" universe="2" />
+    <cell id="25" material="2" region="3 -4" universe="2" />
+    <cell id="26" material="3" region="4" universe="2" />
+    <cell id="27" material="1" region="-1" universe="3" />
+    <cell id="28" material="2" region="1 -2" universe="3" />
+    <cell id="29" material="4" region="2" universe="3" />
+    <cell id="30" material="4" region="-3" universe="4" />
+    <cell id="31" material="2" region="3 -4" universe="4" />
+    <cell id="32" material="4" region="4" universe="4" />
+    <cell id="50" material="3" region="34 -35" universe="5" />
+    <cell fill="100" id="60" region="34 -35" universe="6" />
+    <cell id="70" material="4" region="35 -36" universe="7" />
+    <cell fill="101" id="80" region="35 -36" universe="8" />
+    <lattice id="100" name="Fuel assembly (lower half)">
+      <pitch>1.26 1.26</pitch>
+      <dimension>17 17</dimension>
+      <lower_left>-10.71 -10.71</lower_left>
+      <universes>
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 
@@ -50,12 +199,12 @@
 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 </universes>
-  </lattice>
-  <lattice id="101" name="Fuel assembly (upper half)">
-    <pitch>1.26 1.26</pitch>
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <universes>
+    </lattice>
+    <lattice id="101" name="Fuel assembly (upper half)">
+      <pitch>1.26 1.26</pitch>
+      <dimension>17 17</dimension>
+      <lower_left>-10.71 -10.71</lower_left>
+      <universes>
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 
@@ -73,12 +222,12 @@
 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
-  </lattice>
-  <lattice id="200" name="Core lattice (lower half)">
-    <pitch>21.42 21.42</pitch>
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <universes>
+    </lattice>
+    <lattice id="200" name="Core lattice (lower half)">
+      <pitch>21.42 21.42</pitch>
+      <dimension>21 21</dimension>
+      <lower_left>-224.91 -224.91</lower_left>
+      <universes>
 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 
@@ -100,12 +249,12 @@
 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 
 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 </universes>
-  </lattice>
-  <lattice id="201" name="Core lattice (lower half)">
-    <pitch>21.42 21.42</pitch>
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <universes>
+    </lattice>
+    <lattice id="201" name="Core lattice (lower half)">
+      <pitch>21.42 21.42</pitch>
+      <dimension>21 21</dimension>
+      <lower_left>-224.91 -224.91</lower_left>
+      <universes>
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 
@@ -127,222 +276,72 @@
 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 </universes>
-  </lattice>
-  <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder" />
-  <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder" />
-  <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane" />
-  <surface coeffs="-199.0" id="32" type="z-plane" />
-  <surface coeffs="-193.0" id="33" type="z-plane" />
-  <surface coeffs="-183.0" id="34" type="z-plane" />
-  <surface coeffs="0.0" id="35" type="z-plane" />
-  <surface coeffs="183.0" id="36" type="z-plane" />
-  <surface coeffs="203.0" id="37" type="z-plane" />
-  <surface coeffs="215.0" id="38" type="z-plane" />
-  <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="UOX fuel">
-    <density units="g/cm3" value="10.062" />
-    <nuclide ao="4.9476e-06" name="U234" />
-    <nuclide ao="0.00048218" name="U235" />
-    <nuclide ao="0.021504" name="U238" />
-    <nuclide ao="1.0801e-08" name="Xe135" />
-    <nuclide ao="0.045737" name="O16" />
-  </material>
-  <material id="2" name="Zircaloy">
-    <density units="g/cm3" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="Cold borated water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <nuclide ao="0.000649" name="B10" />
-    <nuclide ao="0.002689" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="4" name="Hot borated water">
-    <density units="atom/b-cm" value="0.06614" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <nuclide ao="0.000649" name="B10" />
-    <nuclide ao="0.002689" name="B11" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="5" name="Reactor pressure vessel steel">
-    <density units="g/cm3" value="7.9" />
-    <nuclide name="Fe54" wo="0.05437098" />
-    <nuclide name="Fe56" wo="0.88500663" />
-    <nuclide name="Fe57" wo="0.0208008" />
-    <nuclide name="Fe58" wo="0.00282159" />
-    <nuclide name="Ni58" wo="0.0067198" />
-    <nuclide name="Ni60" wo="0.0026776" />
-    <nuclide name="Mn55" wo="0.01" />
-    <nuclide name="Cr52" wo="0.002092475" />
-    <nuclide name="C0" wo="0.0025" />
-    <nuclide name="Cu63" wo="0.0013696" />
-  </material>
-  <material id="6" name="Lower radial reflector">
-    <density units="g/cm3" value="4.32" />
-    <nuclide name="H1" wo="0.0095661" />
-    <nuclide name="O16" wo="0.0759107" />
-    <nuclide name="B10" wo="3.08409e-05" />
-    <nuclide name="B11" wo="0.000140499" />
-    <nuclide name="Fe54" wo="0.035620772088" />
-    <nuclide name="Fe56" wo="0.579805982228" />
-    <nuclide name="Fe57" wo="0.01362750048" />
-    <nuclide name="Fe58" wo="0.001848545204" />
-    <nuclide name="Ni58" wo="0.055298376566" />
-    <nuclide name="Mn55" wo="0.018287" />
-    <nuclide name="Cr52" wo="0.145407678031" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="7" name="Upper radial reflector / Top plate region">
-    <density units="g/cm3" value="4.28" />
-    <nuclide name="H1" wo="0.0086117" />
-    <nuclide name="O16" wo="0.0683369" />
-    <nuclide name="B10" wo="2.77638e-05" />
-    <nuclide name="B11" wo="0.000126481" />
-    <nuclide name="Fe54" wo="0.035953677186" />
-    <nuclide name="Fe56" wo="0.585224740891" />
-    <nuclide name="Fe57" wo="0.01375486056" />
-    <nuclide name="Fe58" wo="0.001865821363" />
-    <nuclide name="Ni58" wo="0.055815129186" />
-    <nuclide name="Mn55" wo="0.0184579" />
-    <nuclide name="Cr52" wo="0.146766614995" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="8" name="Bottom plate region">
-    <density units="g/cm3" value="7.184" />
-    <nuclide name="H1" wo="0.0011505" />
-    <nuclide name="O16" wo="0.0091296" />
-    <nuclide name="B10" wo="3.70915e-06" />
-    <nuclide name="B11" wo="1.68974e-05" />
-    <nuclide name="Fe54" wo="0.03855611055" />
-    <nuclide name="Fe56" wo="0.627585036425" />
-    <nuclide name="Fe57" wo="0.014750478" />
-    <nuclide name="Fe58" wo="0.002000875025" />
-    <nuclide name="Ni58" wo="0.059855207342" />
-    <nuclide name="Mn55" wo="0.019794" />
-    <nuclide name="Cr52" wo="0.157390026871" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="9" name="Bottom nozzle region">
-    <density units="g/cm3" value="2.53" />
-    <nuclide name="H1" wo="0.0245014" />
-    <nuclide name="O16" wo="0.1944274" />
-    <nuclide name="B10" wo="7.89917e-05" />
-    <nuclide name="B11" wo="0.000359854" />
-    <nuclide name="Fe54" wo="0.030411411144" />
-    <nuclide name="Fe56" wo="0.495012237964" />
-    <nuclide name="Fe57" wo="0.01163454624" />
-    <nuclide name="Fe58" wo="0.001578204652" />
-    <nuclide name="Ni58" wo="0.047211231662" />
-    <nuclide name="Mn55" wo="0.0156126" />
-    <nuclide name="Cr52" wo="0.124142524198" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="10" name="Top nozzle region">
-    <density units="g/cm3" value="1.746" />
-    <nuclide name="H1" wo="0.035887" />
-    <nuclide name="O16" wo="0.2847761" />
-    <nuclide name="B10" wo="0.000115699" />
-    <nuclide name="B11" wo="0.000527075" />
-    <nuclide name="Fe54" wo="0.02644016154" />
-    <nuclide name="Fe56" wo="0.43037146399" />
-    <nuclide name="Fe57" wo="0.0101152584" />
-    <nuclide name="Fe58" wo="0.00137211607" />
-    <nuclide name="Ni58" wo="0.04104621835" />
-    <nuclide name="Mn55" wo="0.0135739" />
-    <nuclide name="Cr52" wo="0.107931450781" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="11" name="Top of fuel assemblies">
-    <density units="g/cm3" value="3.044" />
-    <nuclide name="H1" wo="0.0162913" />
-    <nuclide name="O16" wo="0.1292776" />
-    <nuclide name="B10" wo="5.25228e-05" />
-    <nuclide name="B11" wo="0.000239272" />
-    <nuclide name="Zr90" wo="0.43313403903" />
-    <nuclide name="Zr91" wo="0.09549277374" />
-    <nuclide name="Zr92" wo="0.14759527104" />
-    <nuclide name="Zr94" wo="0.15280552077" />
-    <nuclide name="Zr96" wo="0.02511169542" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material id="12" name="Bottom of fuel assemblies">
-    <density units="g/cm3" value="1.762" />
-    <nuclide name="H1" wo="0.0292856" />
-    <nuclide name="O16" wo="0.2323919" />
-    <nuclide name="B10" wo="9.44159e-05" />
-    <nuclide name="B11" wo="0.00043012" />
-    <nuclide name="Zr90" wo="0.3741373658" />
-    <nuclide name="Zr91" wo="0.0824858164" />
-    <nuclide name="Zr92" wo="0.1274914944" />
-    <nuclide name="Zr94" wo="0.1319920622" />
-    <nuclide name="Zr96" wo="0.0216912612" />
-    <sab name="c_H_in_H2O" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <source strength="1.0">
-    <space type="box">
-      <parameters>-160 -160 -183 160 160 183</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <!--mesh-->
-  <mesh id="1">
-    <dimension>2 2</dimension>
-    <lower_left>-50.0 -50.0</lower_left>
-    <upper_right>50.0 50.0</upper_right>
-  </mesh>
-  <filter id="16" type="cell">
-    <bins>21 27</bins>
-  </filter>
-  <filter id="8" type="energy">
-    <bins>0.0 0.625 20000000.0</bins>
-  </filter>
-  <filter id="6" type="distribcell">
-    <bins>21</bins>
-  </filter>
-  <filter id="7" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <tally id="31" name="cell tally">
-    <filters>16 8</filters>
-    <nuclides>U235 U238</nuclides>
-    <scores>fission nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="32" name="distribcell tally">
-    <filters>6 8</filters>
-    <nuclides>U235 U238</nuclides>
-    <scores>fission nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="33" name="mesh tally">
-    <filters>7 8</filters>
-    <nuclides>U235 U238</nuclides>
-    <scores>fission nu-fission</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-</tallies>
+    </lattice>
+    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane" />
+    <surface coeffs="-199.0" id="32" type="z-plane" />
+    <surface coeffs="-193.0" id="33" type="z-plane" />
+    <surface coeffs="-183.0" id="34" type="z-plane" />
+    <surface coeffs="0.0" id="35" type="z-plane" />
+    <surface coeffs="183.0" id="36" type="z-plane" />
+    <surface coeffs="203.0" id="37" type="z-plane" />
+    <surface coeffs="215.0" id="38" type="z-plane" />
+    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-160 -160 -183 160 160 183</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <!--mesh-->
+    <mesh id="1">
+      <dimension>2 2</dimension>
+      <lower_left>-50.0 -50.0</lower_left>
+      <upper_right>50.0 50.0</upper_right>
+    </mesh>
+    <filter id="16" type="cell">
+      <bins>21 27</bins>
+    </filter>
+    <filter id="8" type="energy">
+      <bins>0.0 0.625 20000000.0</bins>
+    </filter>
+    <filter id="6" type="distribcell">
+      <bins>21</bins>
+    </filter>
+    <filter id="7" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <tally id="31" name="cell tally">
+      <filters>16 8</filters>
+      <nuclides>U235 U238</nuclides>
+      <scores>fission nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="32" name="distribcell tally">
+      <filters>6 8</filters>
+      <nuclides>U235 U238</nuclides>
+      <scores>fission nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="33" name="mesh tally">
+      <filters>7 8</filters>
+      <nuclides>U235 U238</nuclides>
+      <scores>fission nu-fission</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/torus/inputs_true.dat b/tests/regression_tests/torus/inputs_true.dat
index 0ccbda400..c4aa2072a 100644
--- a/tests/regression_tests/torus/inputs_true.dat
+++ b/tests/regression_tests/torus/inputs_true.dat
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-2" universe="1" />
-  <cell id="2" material="1" region="-3" universe="1" />
-  <cell id="3" material="1" region="-1" universe="1" />
-  <cell id="4" material="2" region="-5 4 -7 6 -9 8 2 3 1" universe="1" />
-  <surface coeffs="0.0 0.0 0.0 3 1.5 1" id="1" type="z-torus" />
-  <surface coeffs="6 0.0 0.0 3 1.5 1" id="2" type="x-torus" />
-  <surface coeffs="6 0.0 0.0 6 1 0.75" id="3" type="y-torus" />
-  <surface boundary="vacuum" coeffs="-5" id="4" type="x-plane" />
-  <surface boundary="vacuum" coeffs="14" id="5" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-5" id="6" type="y-plane" />
-  <surface boundary="vacuum" coeffs="5" id="7" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-8" id="8" type="z-plane" />
-  <surface boundary="vacuum" coeffs="8" id="9" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cm3" value="12.0" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2">
-    <density units="g/cm3" value="1.0" />
-    <nuclide ao="1.0" name="H1" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <inactive>5</inactive>
-</settings>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cm3" value="12.0" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2">
+      <density units="g/cm3" value="1.0" />
+      <nuclide ao="1.0" name="H1" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-2" universe="1" />
+    <cell id="2" material="1" region="-3" universe="1" />
+    <cell id="3" material="1" region="-1" universe="1" />
+    <cell id="4" material="2" region="-5 4 -7 6 -9 8 2 3 1" universe="1" />
+    <surface coeffs="0.0 0.0 0.0 3 1.5 1" id="1" type="z-torus" />
+    <surface coeffs="6 0.0 0.0 3 1.5 1" id="2" type="x-torus" />
+    <surface coeffs="6 0.0 0.0 6 1 0.75" id="3" type="y-torus" />
+    <surface boundary="vacuum" coeffs="-5" id="4" type="x-plane" />
+    <surface boundary="vacuum" coeffs="14" id="5" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-5" id="6" type="y-plane" />
+    <surface boundary="vacuum" coeffs="5" id="7" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-8" id="8" type="z-plane" />
+    <surface boundary="vacuum" coeffs="8" id="9" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/torus/large_major/inputs_true.dat b/tests/regression_tests/torus/large_major/inputs_true.dat
index ae3f72d0f..8e3c9a9e3 100644
--- a/tests/regression_tests/torus/large_major/inputs_true.dat
+++ b/tests/regression_tests/torus/large_major/inputs_true.dat
@@ -1,37 +1,36 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="void" region="-1" universe="1" />
-  <cell id="2" material="1" region="1 -2" universe="1" />
-  <cell id="3" material="2" region="2 -3" universe="1" />
-  <surface coeffs="0.0 0.0 0.0 1000.0 30.0 30.0" id="1" type="z-torus" />
-  <surface coeffs="0.0 0.0 0.0 1000.0 35.0 35.0" id="2" type="z-torus" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 0.0 1000.0 40.0 40.0" id="3" type="z-torus" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material id="1">
-    <density units="g/cm3" value="1.0" />
-    <nuclide ao="1.0" name="W184" />
-  </material>
-  <material id="2">
-    <density units="g/cm3" value="5.0" />
-    <nuclide ao="1.0" name="Fe56" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space type="point">
-      <parameters>-1000.0 0 0</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <tally id="1">
-    <scores>flux</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material id="1">
+      <density units="g/cm3" value="1.0" />
+      <nuclide ao="1.0" name="W184" />
+    </material>
+    <material id="2">
+      <density units="g/cm3" value="5.0" />
+      <nuclide ao="1.0" name="Fe56" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="void" region="-1" universe="1" />
+    <cell id="2" material="1" region="1 -2" universe="1" />
+    <cell id="3" material="2" region="2 -3" universe="1" />
+    <surface coeffs="0.0 0.0 0.0 1000.0 30.0 30.0" id="1" type="z-torus" />
+    <surface coeffs="0.0 0.0 0.0 1000.0 35.0 35.0" id="2" type="z-torus" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 1000.0 40.0 40.0" id="3" type="z-torus" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space type="point">
+        <parameters>-1000.0 0 0</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <tally id="1">
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/trigger_statepoint_restart/inputs_true.dat b/tests/regression_tests/trigger_statepoint_restart/inputs_true.dat
index 2c422697b..d30f24fc0 100644
--- a/tests/regression_tests/trigger_statepoint_restart/inputs_true.dat
+++ b/tests/regression_tests/trigger_statepoint_restart/inputs_true.dat
@@ -1,35 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1">
-    <density units="g/cm3" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>400</particles>
-  <batches>15</batches>
-  <inactive>10</inactive>
-  <keff_trigger>
-    <threshold>0.003</threshold>
-    <type>std_dev</type>
-  </keff_trigger>
-  <trigger>
-    <active>true</active>
-    <max_batches>1000</max_batches>
-    <batch_interval>1</batch_interval>
-  </trigger>
-  <verbosity>1</verbosity>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <tally id="1">
-    <scores>flux</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cm3" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>400</particles>
+    <batches>15</batches>
+    <inactive>10</inactive>
+    <keff_trigger>
+      <threshold>0.003</threshold>
+      <type>std_dev</type>
+    </keff_trigger>
+    <trigger>
+      <active>true</active>
+      <max_batches>1000</max_batches>
+      <batch_interval>1</batch_interval>
+    </trigger>
+    <verbosity>1</verbosity>
+  </settings>
+  <tallies>
+    <tally id="1">
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/triso/inputs_true.dat b/tests/regression_tests/triso/inputs_true.dat
index 2ea049465..c43483884 100644
--- a/tests/regression_tests/triso/inputs_true.dat
+++ b/tests/regression_tests/triso/inputs_true.dat
@@ -1,442 +1,442 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="13" material="13" region="-9" universe="9" />
-  <cell id="14" material="14" region="9 -10" universe="9" />
-  <cell id="15" material="15" region="10 -11" universe="9" />
-  <cell id="16" material="16" region="11 -12" universe="9" />
-  <cell id="17" material="17" region="12" universe="9" />
-  <cell fill="10" id="18" region="13 -14 15 -16 17 -18" universe="0" />
-  <cell fill="9" id="135" region="-128" translation="-0.0014062011817633224 -0.015257747167296776 -0.09184766966024316" universe="35" />
-  <cell fill="9" id="136" region="-129" translation="0.10909902639777394 -0.004179177767328068 -0.046240930185910245" universe="23" />
-  <cell fill="9" id="137" region="-130" translation="0.13878336652768952 -0.06900710536877097 -0.03848821497485455" universe="18" />
-  <cell fill="9" id="138" region="-131" translation="-0.19454996680564374 -0.06900710536877097 -0.03848821497485455" universe="19" />
-  <cell fill="9" id="139" region="-132" translation="-0.09846455191076986 -0.02594038069469251 -0.06155174933292362" universe="26" />
-  <cell fill="9" id="140" region="-133" translation="-0.09321591784308736 -0.12248857482372477 -0.04999802384282931" universe="22" />
-  <cell fill="9" id="141" region="-134" translation="0.2028198996079864 0.08501514690643278 0.07431198844628262" universe="30" />
-  <cell fill="9" id="142" region="-135" translation="-0.13051343372534685 0.08501514690643278 0.07431198844628262" universe="31" />
-  <cell fill="9" id="143" region="-136" translation="0.03417350410997999 -0.09641153719944834 -0.10112098092715327" universe="13" />
-  <cell fill="9" id="144" region="-137" translation="0.037913118842446136 0.06870772519039314 -0.10875752039644154" universe="27" />
-  <cell fill="9" id="145" region="-138" translation="0.07388008140640989 -0.07130227505402231 -0.09782982564187503" universe="14" />
-  <cell fill="9" id="146" region="-139" translation="0.08897214754414112 0.08694165211410448 0.07587737301598729" universe="11" />
-  <cell fill="9" id="147" region="-140" translation="-0.03698302711710488 0.1408784014909229 -0.10474284149572705" universe="12" />
-  <cell fill="9" id="148" region="-141" translation="-0.03698302711710488 -0.19245493184241047 -0.10474284149572705" universe="15" />
-  <cell fill="9" id="149" region="-142" translation="-0.02428069661424781 0.05168393238830282 0.1302704892646539" universe="25" />
-  <cell fill="9" id="150" region="-143" translation="-0.02428069661424781 0.05168393238830282 -0.20306284406867936" universe="34" />
-  <cell fill="9" id="151" region="-144" translation="0.04578051975994746 0.1175901605138544 -0.0038022862212453434" universe="35" />
-  <cell fill="9" id="152" region="-145" translation="-0.013741908464450836 0.18016577553053154 0.20276897514248216" universe="20" />
-  <cell fill="9" id="153" region="-146" translation="-0.013741908464450836 -0.15316755780280183 0.20276897514248216" universe="23" />
-  <cell fill="9" id="154" region="-147" translation="-0.013741908464450836 0.18016577553053154 -0.1305643581908511" universe="29" />
-  <cell fill="9" id="155" region="-148" translation="-0.013741908464450836 -0.15316755780280183 -0.1305643581908511" universe="32" />
-  <cell fill="9" id="156" region="-149" translation="0.19334606515602848 0.066228023881572 -0.07131104153532436" universe="27" />
-  <cell fill="9" id="157" region="-150" translation="-0.13998726817730478 0.066228023881572 -0.07131104153532436" universe="28" />
-  <cell fill="9" id="158" region="-151" translation="-0.031185656140686913 0.155914746052082 0.15331720509241947" universe="16" />
-  <cell fill="9" id="159" region="-152" translation="-0.031185656140686913 -0.17741858728125126 0.15331720509241947" universe="19" />
-  <cell fill="9" id="160" region="-153" translation="-0.031185656140686913 0.155914746052082 -0.1800161282409139" universe="25" />
-  <cell fill="9" id="161" region="-154" translation="-0.031185656140686913 -0.17741858728125126 -0.1800161282409139" universe="28" />
-  <cell fill="9" id="162" region="-155" translation="0.08018004492442865 0.016826191928232426 -0.016389596762212966" universe="36" />
-  <cell fill="9" id="163" region="-156" translation="0.00483733774062417 0.08148156718302602 -0.09280826916311341" universe="15" />
-  <cell fill="9" id="164" region="-157" translation="0.0978117791120118 -0.06105974469736897 -0.07844553364014112" universe="26" />
-  <cell fill="9" id="165" region="-158" translation="0.0339716094789545 0.044675266050854034 0.18588381767108564" universe="23" />
-  <cell fill="9" id="166" region="-159" translation="0.0339716094789545 0.044675266050854034 -0.14744951566224762" universe="32" />
-  <cell fill="9" id="167" region="-160" translation="0.15974177782488064 -0.11470938473074832 -0.055880627694202434" universe="24" />
-  <cell fill="9" id="168" region="-161" translation="-0.17359155550845262 -0.11470938473074832 -0.055880627694202434" universe="25" />
-  <cell fill="9" id="169" region="-162" translation="0.007714449992858363 -0.07841911930069978 0.019169121324834393" universe="27" />
-  <cell fill="9" id="170" region="-163" translation="-0.09772496056025104 -0.009435582016802613 -0.0973407871549632" universe="15" />
-  <cell fill="9" id="171" region="-164" translation="-0.08460405234526575 0.18619630211681182 0.10902502186367324" universe="32" />
-  <cell fill="9" id="172" region="-165" translation="-0.08460405234526575 -0.14713703121652144 0.10902502186367324" universe="35" />
-  <cell fill="9" id="173" region="-166" translation="0.08530970516294267 -0.09740948712101977 0.031538023054709596" universe="15" />
-  <cell fill="9" id="174" region="-167" translation="0.002049400245853761 0.10800782833319489 -0.08566939881823532" universe="36" />
-  <cell fill="9" id="175" region="-168" translation="0.036269774055772475 -0.0034880407315701634 0.08814057857502322" universe="18" />
-  <cell fill="9" id="176" region="-169" translation="0.012607957648281654 0.08090056062626749 0.0712211465420014" universe="27" />
-  <cell fill="9" id="177" region="-170" translation="-0.03741489943578313 0.1221086949309545 0.0439406213163509" universe="21" />
-  <cell fill="9" id="178" region="-171" translation="0.0851566223435044 -0.1191899586548319 -0.07364696787394387" universe="31" />
-  <cell fill="9" id="179" region="-172" translation="-0.03992848096555457 0.020214072912877246 -0.11315245980004196" universe="37" />
-  <cell fill="9" id="180" region="-173" translation="-0.050315754084578224 0.017099968565308377 0.056173125204605934" universe="25" />
-  <cell fill="9" id="181" region="-174" translation="-0.06766398274549851 -0.07303578778642877 0.005410963730880458" universe="30" />
-  <cell fill="9" id="182" region="-175" translation="0.06408439016382617 0.05853632250550789 0.00432158793112436" universe="21" />
-  <cell fill="9" id="183" region="-176" translation="-0.013801059755509382 0.20222454587424032 0.19241766819445416" universe="12" />
-  <cell fill="9" id="184" region="-177" translation="-0.013801059755509382 -0.13110878745909305 0.19241766819445416" universe="15" />
-  <cell fill="9" id="185" region="-178" translation="-0.013801059755509382 0.20222454587424032 -0.1409156651388792" universe="21" />
-  <cell fill="9" id="186" region="-179" translation="-0.013801059755509382 -0.13110878745909305 -0.1409156651388792" universe="24" />
-  <cell fill="9" id="187" region="-180" translation="0.03522733749799645 0.11305459403611595 0.10295023150858529" universe="24" />
-  <cell fill="9" id="188" region="-181" translation="-0.03831660450870228 -0.09880556873790897 0.08578673946744877" universe="12" />
-  <cell fill="9" id="189" region="-182" translation="0.03782024089160585 0.07732392719766301 -0.002829721222114334" universe="32" />
-  <cell fill="9" id="190" region="-183" translation="-0.060112483234699754 -0.06134051474053648 -0.04363492058502072" universe="37" />
-  <cell fill="9" id="191" region="-184" translation="0.10930502703326198 -0.020465939386398402 0.15848543253913627" universe="26" />
-  <cell fill="9" id="192" region="-185" translation="0.10930502703326198 -0.020465939386398402 -0.174847900794197" universe="35" />
-  <cell fill="9" id="193" region="-186" translation="-0.04821581350719811 -0.10913639479587178 -0.11108700962300094" universe="11" />
-  <cell fill="9" id="194" region="-187" translation="-0.09934364058994583 0.10405480441904197 -0.0241798283786806" universe="13" />
-  <cell fill="9" id="195" region="-188" translation="0.11425630804159204 0.19090246541367445 -0.06077533762167586" universe="12" />
-  <cell fill="9" id="196" region="-189" translation="0.11425630804159204 -0.14243086791965892 -0.06077533762167586" universe="15" />
-  <cell fill="9" id="197" region="-190" translation="0.0217205011905508 0.02506675532845576 0.029520031599966412" universe="14" />
-  <cell fill="9" id="198" region="-191" translation="0.12543650024083502 0.19371057833811733 -0.04147065769319469" universe="23" />
-  <cell fill="9" id="199" region="-192" translation="-0.20789683309249835 0.19371057833811733 -0.04147065769319469" universe="24" />
-  <cell fill="9" id="200" region="-193" translation="0.12543650024083502 -0.13962275499521593 -0.04147065769319469" universe="26" />
-  <cell fill="9" id="201" region="-194" translation="-0.20789683309249835 -0.13962275499521593 -0.04147065769319469" universe="27" />
-  <cell fill="9" id="202" region="-195" translation="-0.10385697059087434 -0.07239894918409101 0.047733316833160344" universe="15" />
-  <cell fill="9" id="203" region="-196" translation="-0.02484533723289073 0.03270050374260325 0.009261180540203251" universe="26" />
-  <cell fill="9" id="204" region="-197" translation="-0.10535768832641407 -0.10806169784882003 0.009669056668934639" universe="11" />
-  <cell fill="9" id="205" region="-198" translation="0.20034387531341857 0.02227169438582799 0.18731645229850835" universe="21" />
-  <cell fill="9" id="206" region="-199" translation="-0.13298945801991469 0.02227169438582799 0.18731645229850835" universe="22" />
-  <cell fill="9" id="207" region="-200" translation="0.20034387531341857 0.02227169438582799 -0.1460168810348249" universe="30" />
-  <cell fill="9" id="208" region="-201" translation="-0.13298945801991469 0.02227169438582799 -0.1460168810348249" universe="31" />
-  <cell fill="9" id="209" region="-202" translation="0.1631199405760454 0.04092483075648701 0.07754240264809376" universe="15" />
-  <cell fill="9" id="210" region="-203" translation="-0.17021339275728786 0.04092483075648701 0.07754240264809376" universe="16" />
-  <cell fill="9" id="211" region="-204" translation="0.102073447728939 -0.060687493103351975 0.01519685776716928" universe="28" />
-  <cell fill="9" id="212" region="-205" translation="0.07991907014916044 0.13595762576986914 -0.09622087197472673" universe="23" />
-  <cell fill="9" id="213" region="-206" translation="0.07991907014916044 -0.19737570756346412 -0.09622087197472673" universe="26" />
-  <cell fill="9" id="214" region="-207" translation="0.06943697893246592 0.16968387178879557 0.11988276699391809" universe="21" />
-  <cell fill="9" id="215" region="-208" translation="0.06943697893246592 -0.1636494615445378 0.11988276699391809" universe="24" />
-  <cell fill="9" id="216" region="-209" translation="-0.07059889277962383 0.1489570802132021 0.09503214710980579" universe="29" />
-  <cell fill="9" id="217" region="-210" translation="-0.07059889277962383 -0.18437625312013128 0.09503214710980579" universe="32" />
-  <cell fill="9" id="218" region="-211" translation="0.010468267263955 0.15608028424842002 -0.00511339431390323" universe="31" />
-  <cell fill="9" id="219" region="-212" translation="0.010468267263955 -0.17725304908491335 -0.00511339431390323" universe="34" />
-  <cell fill="9" id="220" region="-213" translation="0.15972123417512762 0.06883522628651784 -0.11009587369358387" universe="35" />
-  <cell fill="9" id="221" region="-214" translation="-0.17361209915820575 0.06883522628651784 -0.11009587369358387" universe="36" />
-  <cell fill="9" id="222" region="-215" translation="0.08981179676970563 0.06434186205946246 0.032607233968534766" universe="16" />
-  <cell fill="9" id="223" region="-216" translation="0.0033702311569031584 0.10040789537086448 0.1867831868031803" universe="28" />
-  <cell fill="9" id="224" region="-217" translation="0.0033702311569031584 0.10040789537086448 -0.14655014653015297" universe="37" />
-  <cell fill="9" id="225" region="-218" translation="0.05329895281727448 -0.02881629065525937 0.15193411713913396" universe="20" />
-  <cell fill="9" id="226" region="-219" translation="0.05329895281727448 -0.02881629065525937 -0.1813992161941993" universe="29" />
-  <cell fill="9" id="227" region="-220" translation="0.14663786554095865 -0.0001831711922081758 0.173437280372308" universe="14" />
-  <cell fill="9" id="228" region="-221" translation="-0.18669546779237473 -0.0001831711922081758 0.173437280372308" universe="15" />
-  <cell fill="9" id="229" region="-222" translation="0.14663786554095865 -0.0001831711922081758 -0.15989605296102538" universe="23" />
-  <cell fill="9" id="230" region="-223" translation="-0.18669546779237473 -0.0001831711922081758 -0.15989605296102538" universe="24" />
-  <cell fill="9" id="231" region="-224" translation="0.006886156712931468 0.0325721225173089 -0.10785254014381473" universe="19" />
-  <cell fill="9" id="232" region="-225" translation="0.05946426530734861 0.17562994884896627 0.11256068342977466" universe="29" />
-  <cell fill="9" id="233" region="-226" translation="0.05946426530734861 -0.1577033844843671 0.11256068342977466" universe="32" />
-  <cell fill="9" id="234" region="-227" translation="-0.0745211393530899 0.18602539894086317 0.07061211191996841" universe="13" />
-  <cell fill="9" id="235" region="-228" translation="-0.0745211393530899 -0.1473079343924702 0.07061211191996841" universe="16" />
-  <cell fill="9" id="236" region="-229" translation="0.15971361633210523 -0.02416800360737892 0.062334297185282495" universe="36" />
-  <cell fill="9" id="237" region="-230" translation="-0.17361971700122802 -0.02416800360737892 0.062334297185282495" universe="37" />
-  <cell fill="9" id="238" region="-231" translation="-0.014191419448261688 0.11114945107218455 0.0903966514577691" universe="18" />
-  <cell fill="9" id="239" region="-232" translation="0.20641337800388493 -0.04689191572037532 0.03093832014609521" universe="12" />
-  <cell fill="9" id="240" region="-233" translation="-0.12691995532944833 -0.04689191572037532 0.03093832014609521" universe="13" />
-  <cell fill="9" id="241" region="-234" translation="0.042925982468302815 0.0705557158479822 -0.09611246805643225" universe="31" />
-  <cell fill="9" id="242" region="-235" translation="0.09174118398607445 -0.02102680816462299 -0.12074712654412828" universe="27" />
-  <cell fill="9" id="243" region="-236" translation="0.1871144659776534 0.14219092895822716 0.0030395151604761805" universe="29" />
-  <cell fill="9" id="244" region="-237" translation="-0.14621886735567996 0.14219092895822716 0.0030395151604761805" universe="30" />
-  <cell fill="9" id="245" region="-238" translation="0.1871144659776534 -0.1911424043751062 0.0030395151604761805" universe="32" />
-  <cell fill="9" id="246" region="-239" translation="-0.14621886735567996 -0.1911424043751062 0.0030395151604761805" universe="33" />
-  <cell fill="9" id="247" region="-240" translation="-0.08858601205119498 -0.05740809172565153 0.0018937978357634888" universe="29" />
-  <cell fill="9" id="248" region="-241" translation="-0.06956272452538859 -0.03258611645335985 0.1876749617320655" universe="19" />
-  <cell fill="9" id="249" region="-242" translation="-0.06956272452538859 -0.03258611645335985 -0.14565837160126788" universe="28" />
-  <cell fill="9" id="250" region="-243" translation="0.06480048668590577 0.08039356693483157 -0.0495807099830502" universe="12" />
-  <cell fill="9" id="251" region="-244" translation="0.11976882848311299 0.024414887718198774 0.059001075831400684" universe="26" />
-  <cell fill="9" id="252" region="-245" translation="0.055815690196973966 -0.03866224334773988 0.12934415570493119" universe="16" />
-  <cell fill="9" id="253" region="-246" translation="0.055815690196973966 -0.03866224334773988 -0.20398917762840219" universe="25" />
-  <cell fill="9" id="254" region="-247" translation="-0.07057140884385227 -0.033261585924167725 -0.11308117958912334" universe="19" />
-  <cell fill="9" id="255" region="-248" translation="0.0191891610992464 -0.08777511864372084 0.09496767886953814" universe="13" />
-  <cell fill="9" id="256" region="-249" translation="0.11357577214048964 -0.07231206070759028 -0.01862315233444045" universe="16" />
-  <cell fill="9" id="257" region="-250" translation="0.028822870329182626 0.09660360434040871 -0.10994545899370212" universe="29" />
-  <cell fill="9" id="258" region="-251" translation="-0.030272006016200004 0.04272149160139638 -0.11143715881676097" universe="26" />
-  <cell fill="9" id="259" region="-252" translation="0.09719339210824351 0.04131007428864286 0.14476192535372884" universe="19" />
-  <cell fill="9" id="260" region="-253" translation="0.09719339210824351 0.04131007428864286 -0.18857140797960453" universe="28" />
-  <cell fill="9" id="261" region="-254" translation="0.1075803128789849 -0.02104725713738881 -0.03274843538002781" universe="14" />
-  <cell fill="9" id="262" region="-255" translation="0.1392019576325615 -0.08814436128642017 -0.11479828495132216" universe="12" />
-  <cell fill="9" id="263" region="-256" translation="-0.19413137570077177 -0.08814436128642017 -0.11479828495132216" universe="13" />
-  <cell fill="9" id="264" region="-257" translation="0.10847197677361597 0.1461592302081176 0.08841042383901798" universe="22" />
-  <cell fill="9" id="265" region="-258" translation="0.10847197677361597 -0.18717410312521576 0.08841042383901798" universe="25" />
-  <cell fill="9" id="266" region="-259" translation="0.045127058382085194 0.0967807216119615 0.0967653665331849" universe="37" />
-  <cell fill="9" id="267" region="-260" translation="-0.022464471745497094 0.07259277205138148 0.10785219865057927" universe="20" />
-  <cell fill="9" id="268" region="-261" translation="0.10606353369903221 0.03928703229725711 0.17228776926768086" universe="25" />
-  <cell fill="9" id="269" region="-262" translation="0.10606353369903221 0.03928703229725711 -0.1610455640656524" universe="34" />
-  <cell fill="9" id="270" region="-263" translation="0.14815941963538226 0.11277655887534538 0.03808687169681996" universe="21" />
-  <cell fill="9" id="271" region="-264" translation="-0.185173913697951 0.11277655887534538 0.03808687169681996" universe="22" />
-  <cell fill="9" id="272" region="-265" translation="0.15693581669068946 0.10114531834923532 -0.04992356195780889" universe="11" />
-  <cell fill="9" id="273" region="-266" translation="-0.17639751664264391 0.10114531834923532 -0.04992356195780889" universe="12" />
-  <cell fill="9" id="274" region="-267" translation="0.13264357875679378 0.10919805128102966 -0.04769549879176793" universe="26" />
-  <cell fill="9" id="275" region="-268" translation="-0.2006897545765396 0.10919805128102966 -0.04769549879176793" universe="27" />
-  <cell fill="9" id="276" region="-269" translation="0.13916564434634993 0.13134319648704007 0.07015912178562622" universe="33" />
-  <cell fill="9" id="277" region="-270" translation="-0.19416768898698333 0.13134319648704007 0.07015912178562622" universe="34" />
-  <cell fill="9" id="278" region="-271" translation="0.13916564434634993 -0.2019901368462932 0.07015912178562622" universe="36" />
-  <cell fill="9" id="279" region="-272" translation="-0.19416768898698333 -0.2019901368462932 0.07015912178562622" universe="37" />
-  <cell fill="9" id="280" region="-273" translation="-0.10026688643231585 0.1564443552698941 0.1751728484794038" universe="12" />
-  <cell fill="9" id="281" region="-274" translation="-0.10026688643231585 -0.17688897806343928 0.1751728484794038" universe="15" />
-  <cell fill="9" id="282" region="-275" translation="-0.10026688643231585 0.1564443552698941 -0.15816048485392958" universe="21" />
-  <cell fill="9" id="283" region="-276" translation="-0.10026688643231585 -0.17688897806343928 -0.15816048485392958" universe="24" />
-  <cell fill="9" id="284" region="-277" translation="0.16555436030710213 -0.015531455219433332 0.02691614144169241" universe="35" />
-  <cell fill="9" id="285" region="-278" translation="-0.16777897302623124 -0.015531455219433332 0.02691614144169241" universe="36" />
-  <cell fill="9" id="286" region="-279" translation="0.152805274648522 0.18166556620660584 0.040488366683789634" universe="20" />
-  <cell fill="9" id="287" region="-280" translation="-0.18052805868481137 0.18166556620660584 0.040488366683789634" universe="21" />
-  <cell fill="9" id="288" region="-281" translation="0.152805274648522 -0.15166776712672753 0.040488366683789634" universe="23" />
-  <cell fill="9" id="289" region="-282" translation="-0.18052805868481137 -0.15166776712672753 0.040488366683789634" universe="24" />
-  <cell fill="9" id="290" region="-283" translation="0.07231116694829032 0.08785370537091952 0.09997055589943346" universe="15" />
-  <cell fill="9" id="291" region="-284" translation="-0.10576424362412257 0.09874497232579027 -0.05820080940738992" universe="11" />
-  <cell fill="9" id="292" region="-285" translation="0.046877953125145755 -0.059492732184222796 -0.055635341857650844" universe="12" />
-  <cell fill="9" id="293" region="-286" translation="0.1239423066569788 0.14183046274229005 -0.06583818749209458" universe="30" />
-  <cell fill="9" id="294" region="-287" translation="0.1239423066569788 -0.19150287059104332 -0.06583818749209458" universe="33" />
-  <cell fill="9" id="295" region="-288" translation="0.0013087859341976982 -0.06327594480884835 -0.05382522074205143" universe="18" />
-  <cell fill="9" id="296" region="-289" translation="0.11058883669906516 -0.038954175820645864 0.16834558789033005" universe="19" />
-  <cell fill="9" id="297" region="-290" translation="0.11058883669906516 -0.038954175820645864 -0.16498774544300332" universe="28" />
-  <cell fill="9" id="298" region="-291" translation="-0.02657010065724863 0.013144978841080679 0.050587944514051575" universe="32" />
-  <cell id="299" material="18" region="139 186 197 265 284" universe="11" />
-  <cell id="300" material="18" region="140 176 181 188 232 243 255 266 273 285" universe="12" />
-  <cell id="301" material="18" region="136 187 227 233 248 256" universe="13" />
-  <cell id="302" material="18" region="138 190 220 254" universe="14" />
-  <cell id="303" material="18" region="141 156 163 166 177 189 195 202 221 274 283" universe="15" />
-  <cell id="304" material="18" region="151 203 215 228 245 249" universe="16" />
-  <cell id="305" material="18" universe="17" />
-  <cell id="306" material="18" region="130 168 231 288" universe="18" />
-  <cell id="307" material="18" region="131 152 224 241 247 252 289" universe="19" />
-  <cell id="308" material="18" region="145 218 260 279" universe="20" />
-  <cell id="309" material="18" region="170 175 178 198 207 263 275 280" universe="21" />
-  <cell id="310" material="18" region="133 199 257 264" universe="22" />
-  <cell id="311" material="18" region="129 146 158 191 205 222 281" universe="23" />
-  <cell id="312" material="18" region="160 179 180 192 208 223 276 282" universe="24" />
-  <cell id="313" material="18" region="142 153 161 173 246 258 261" universe="25" />
-  <cell id="314" material="18" region="132 157 184 193 196 206 244 251 267" universe="26" />
-  <cell id="315" material="18" region="137 149 162 169 194 235 268" universe="27" />
-  <cell id="316" material="18" region="150 154 204 216 242 253 290" universe="28" />
-  <cell id="317" material="18" region="147 209 219 225 236 240 250" universe="29" />
-  <cell id="318" material="18" region="134 174 200 237 286" universe="30" />
-  <cell id="319" material="18" region="135 171 201 211 234" universe="31" />
-  <cell id="320" material="18" region="148 159 164 182 210 226 238 291" universe="32" />
-  <cell id="321" material="18" region="239 269 287" universe="33" />
-  <cell id="322" material="18" region="143 212 262 270" universe="34" />
-  <cell id="323" material="18" region="128 144 165 185 213 277" universe="35" />
-  <cell id="324" material="18" region="155 167 214 229 271 278" universe="36" />
-  <cell id="325" material="18" region="172 183 217 230 259 272" universe="37" />
-  <cell id="326" material="18" universe="38" />
-  <lattice id="10">
-    <pitch>0.3333333333333333 0.3333333333333333 0.3333333333333333</pitch>
-    <outer>38</outer>
-    <dimension>3 3 3</dimension>
-    <lower_left>-0.5 -0.5 -0.5</lower_left>
-    <universes>
-17 18 19 
-14 15 16 
-11 12 13 
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cm3" value="10.5" />
+      <nuclide ao="0.14154" name="U235" />
+      <nuclide ao="0.85846" name="U238" />
+      <nuclide ao="0.5" name="C0" />
+      <nuclide ao="1.5" name="O16" />
+    </material>
+    <material id="2">
+      <density units="g/cm3" value="1.0" />
+      <nuclide ao="1.0" name="C0" />
+      <sab name="c_Graphite" />
+    </material>
+    <material id="3">
+      <density units="g/cm3" value="1.9" />
+      <nuclide ao="1.0" name="C0" />
+      <sab name="c_Graphite" />
+    </material>
+    <material id="4">
+      <density units="g/cm3" value="3.2" />
+      <nuclide ao="1.0" name="C0" />
+      <nuclide ao="0.9222968" name="Si28" />
+      <nuclide ao="0.0468316" name="Si29" />
+      <nuclide ao="0.0308716" name="Si30" />
+    </material>
+    <material id="5">
+      <density units="g/cm3" value="1.87" />
+      <nuclide ao="1.0" name="C0" />
+      <sab name="c_Graphite" />
+    </material>
+    <material id="6">
+      <density units="g/cm3" value="1.1995" />
+      <nuclide ao="1.0" name="C0" />
+      <sab name="c_Graphite" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <cell id="2" material="2" region="1 -2" universe="1" />
+    <cell id="3" material="3" region="2 -3" universe="1" />
+    <cell id="4" material="4" region="3 -4" universe="1" />
+    <cell id="5" material="5" region="4" universe="1" />
+    <cell fill="2" id="6" region="5 -6 7 -8 9 -10" universe="0" />
+    <cell fill="1" id="107" region="-111" translation="-0.0014062011817633224 -0.015257747167296776 -0.09184766966024316" universe="27" />
+    <cell fill="1" id="108" region="-112" translation="0.10909902639777394 -0.004179177767328068 -0.046240930185910245" universe="15" />
+    <cell fill="1" id="109" region="-113" translation="0.13878336652768952 -0.06900710536877097 -0.03848821497485455" universe="10" />
+    <cell fill="1" id="110" region="-114" translation="-0.19454996680564374 -0.06900710536877097 -0.03848821497485455" universe="11" />
+    <cell fill="1" id="111" region="-115" translation="-0.09846455191076986 -0.02594038069469251 -0.06155174933292362" universe="18" />
+    <cell fill="1" id="112" region="-116" translation="-0.09321591784308736 -0.12248857482372477 -0.04999802384282931" universe="14" />
+    <cell fill="1" id="113" region="-117" translation="0.2028198996079864 0.08501514690643278 0.07431198844628262" universe="22" />
+    <cell fill="1" id="114" region="-118" translation="-0.13051343372534685 0.08501514690643278 0.07431198844628262" universe="23" />
+    <cell fill="1" id="115" region="-119" translation="0.03417350410997999 -0.09641153719944834 -0.10112098092715327" universe="5" />
+    <cell fill="1" id="116" region="-120" translation="0.037913118842446136 0.06870772519039314 -0.10875752039644154" universe="19" />
+    <cell fill="1" id="117" region="-121" translation="0.07388008140640989 -0.07130227505402231 -0.09782982564187503" universe="6" />
+    <cell fill="1" id="118" region="-122" translation="0.08897214754414112 0.08694165211410448 0.07587737301598729" universe="3" />
+    <cell fill="1" id="119" region="-123" translation="-0.03698302711710488 0.1408784014909229 -0.10474284149572705" universe="4" />
+    <cell fill="1" id="120" region="-124" translation="-0.03698302711710488 -0.19245493184241047 -0.10474284149572705" universe="7" />
+    <cell fill="1" id="121" region="-125" translation="-0.02428069661424781 0.05168393238830282 0.1302704892646539" universe="17" />
+    <cell fill="1" id="122" region="-126" translation="-0.02428069661424781 0.05168393238830282 -0.20306284406867936" universe="26" />
+    <cell fill="1" id="123" region="-127" translation="0.04578051975994746 0.1175901605138544 -0.0038022862212453434" universe="27" />
+    <cell fill="1" id="124" region="-128" translation="-0.013741908464450836 0.18016577553053154 0.20276897514248216" universe="12" />
+    <cell fill="1" id="125" region="-129" translation="-0.013741908464450836 -0.15316755780280183 0.20276897514248216" universe="15" />
+    <cell fill="1" id="126" region="-130" translation="-0.013741908464450836 0.18016577553053154 -0.1305643581908511" universe="21" />
+    <cell fill="1" id="127" region="-131" translation="-0.013741908464450836 -0.15316755780280183 -0.1305643581908511" universe="24" />
+    <cell fill="1" id="128" region="-132" translation="0.19334606515602848 0.066228023881572 -0.07131104153532436" universe="19" />
+    <cell fill="1" id="129" region="-133" translation="-0.13998726817730478 0.066228023881572 -0.07131104153532436" universe="20" />
+    <cell fill="1" id="130" region="-134" translation="-0.031185656140686913 0.155914746052082 0.15331720509241947" universe="8" />
+    <cell fill="1" id="131" region="-135" translation="-0.031185656140686913 -0.17741858728125126 0.15331720509241947" universe="11" />
+    <cell fill="1" id="132" region="-136" translation="-0.031185656140686913 0.155914746052082 -0.1800161282409139" universe="17" />
+    <cell fill="1" id="133" region="-137" translation="-0.031185656140686913 -0.17741858728125126 -0.1800161282409139" universe="20" />
+    <cell fill="1" id="134" region="-138" translation="0.08018004492442865 0.016826191928232426 -0.016389596762212966" universe="28" />
+    <cell fill="1" id="135" region="-139" translation="0.00483733774062417 0.08148156718302602 -0.09280826916311341" universe="7" />
+    <cell fill="1" id="136" region="-140" translation="0.0978117791120118 -0.06105974469736897 -0.07844553364014112" universe="18" />
+    <cell fill="1" id="137" region="-141" translation="0.0339716094789545 0.044675266050854034 0.18588381767108564" universe="15" />
+    <cell fill="1" id="138" region="-142" translation="0.0339716094789545 0.044675266050854034 -0.14744951566224762" universe="24" />
+    <cell fill="1" id="139" region="-143" translation="0.15974177782488064 -0.11470938473074832 -0.055880627694202434" universe="16" />
+    <cell fill="1" id="140" region="-144" translation="-0.17359155550845262 -0.11470938473074832 -0.055880627694202434" universe="17" />
+    <cell fill="1" id="141" region="-145" translation="0.007714449992858363 -0.07841911930069978 0.019169121324834393" universe="19" />
+    <cell fill="1" id="142" region="-146" translation="-0.09772496056025104 -0.009435582016802613 -0.0973407871549632" universe="7" />
+    <cell fill="1" id="143" region="-147" translation="-0.08460405234526575 0.18619630211681182 0.10902502186367324" universe="24" />
+    <cell fill="1" id="144" region="-148" translation="-0.08460405234526575 -0.14713703121652144 0.10902502186367324" universe="27" />
+    <cell fill="1" id="145" region="-149" translation="0.08530970516294267 -0.09740948712101977 0.031538023054709596" universe="7" />
+    <cell fill="1" id="146" region="-150" translation="0.002049400245853761 0.10800782833319489 -0.08566939881823532" universe="28" />
+    <cell fill="1" id="147" region="-151" translation="0.036269774055772475 -0.0034880407315701634 0.08814057857502322" universe="10" />
+    <cell fill="1" id="148" region="-152" translation="0.012607957648281654 0.08090056062626749 0.0712211465420014" universe="19" />
+    <cell fill="1" id="149" region="-153" translation="-0.03741489943578313 0.1221086949309545 0.0439406213163509" universe="13" />
+    <cell fill="1" id="150" region="-154" translation="0.0851566223435044 -0.1191899586548319 -0.07364696787394387" universe="23" />
+    <cell fill="1" id="151" region="-155" translation="-0.03992848096555457 0.020214072912877246 -0.11315245980004196" universe="29" />
+    <cell fill="1" id="152" region="-156" translation="-0.050315754084578224 0.017099968565308377 0.056173125204605934" universe="17" />
+    <cell fill="1" id="153" region="-157" translation="-0.06766398274549851 -0.07303578778642877 0.005410963730880458" universe="22" />
+    <cell fill="1" id="154" region="-158" translation="0.06408439016382617 0.05853632250550789 0.00432158793112436" universe="13" />
+    <cell fill="1" id="155" region="-159" translation="-0.013801059755509382 0.20222454587424032 0.19241766819445416" universe="4" />
+    <cell fill="1" id="156" region="-160" translation="-0.013801059755509382 -0.13110878745909305 0.19241766819445416" universe="7" />
+    <cell fill="1" id="157" region="-161" translation="-0.013801059755509382 0.20222454587424032 -0.1409156651388792" universe="13" />
+    <cell fill="1" id="158" region="-162" translation="-0.013801059755509382 -0.13110878745909305 -0.1409156651388792" universe="16" />
+    <cell fill="1" id="159" region="-163" translation="0.03522733749799645 0.11305459403611595 0.10295023150858529" universe="16" />
+    <cell fill="1" id="160" region="-164" translation="-0.03831660450870228 -0.09880556873790897 0.08578673946744877" universe="4" />
+    <cell fill="1" id="161" region="-165" translation="0.03782024089160585 0.07732392719766301 -0.002829721222114334" universe="24" />
+    <cell fill="1" id="162" region="-166" translation="-0.060112483234699754 -0.06134051474053648 -0.04363492058502072" universe="29" />
+    <cell fill="1" id="163" region="-167" translation="0.10930502703326198 -0.020465939386398402 0.15848543253913627" universe="18" />
+    <cell fill="1" id="164" region="-168" translation="0.10930502703326198 -0.020465939386398402 -0.174847900794197" universe="27" />
+    <cell fill="1" id="165" region="-169" translation="-0.04821581350719811 -0.10913639479587178 -0.11108700962300094" universe="3" />
+    <cell fill="1" id="166" region="-170" translation="-0.09934364058994583 0.10405480441904197 -0.0241798283786806" universe="5" />
+    <cell fill="1" id="167" region="-171" translation="0.11425630804159204 0.19090246541367445 -0.06077533762167586" universe="4" />
+    <cell fill="1" id="168" region="-172" translation="0.11425630804159204 -0.14243086791965892 -0.06077533762167586" universe="7" />
+    <cell fill="1" id="169" region="-173" translation="0.0217205011905508 0.02506675532845576 0.029520031599966412" universe="6" />
+    <cell fill="1" id="170" region="-174" translation="0.12543650024083502 0.19371057833811733 -0.04147065769319469" universe="15" />
+    <cell fill="1" id="171" region="-175" translation="-0.20789683309249835 0.19371057833811733 -0.04147065769319469" universe="16" />
+    <cell fill="1" id="172" region="-176" translation="0.12543650024083502 -0.13962275499521593 -0.04147065769319469" universe="18" />
+    <cell fill="1" id="173" region="-177" translation="-0.20789683309249835 -0.13962275499521593 -0.04147065769319469" universe="19" />
+    <cell fill="1" id="174" region="-178" translation="-0.10385697059087434 -0.07239894918409101 0.047733316833160344" universe="7" />
+    <cell fill="1" id="175" region="-179" translation="-0.02484533723289073 0.03270050374260325 0.009261180540203251" universe="18" />
+    <cell fill="1" id="176" region="-180" translation="-0.10535768832641407 -0.10806169784882003 0.009669056668934639" universe="3" />
+    <cell fill="1" id="177" region="-181" translation="0.20034387531341857 0.02227169438582799 0.18731645229850835" universe="13" />
+    <cell fill="1" id="178" region="-182" translation="-0.13298945801991469 0.02227169438582799 0.18731645229850835" universe="14" />
+    <cell fill="1" id="179" region="-183" translation="0.20034387531341857 0.02227169438582799 -0.1460168810348249" universe="22" />
+    <cell fill="1" id="180" region="-184" translation="-0.13298945801991469 0.02227169438582799 -0.1460168810348249" universe="23" />
+    <cell fill="1" id="181" region="-185" translation="0.1631199405760454 0.04092483075648701 0.07754240264809376" universe="7" />
+    <cell fill="1" id="182" region="-186" translation="-0.17021339275728786 0.04092483075648701 0.07754240264809376" universe="8" />
+    <cell fill="1" id="183" region="-187" translation="0.102073447728939 -0.060687493103351975 0.01519685776716928" universe="20" />
+    <cell fill="1" id="184" region="-188" translation="0.07991907014916044 0.13595762576986914 -0.09622087197472673" universe="15" />
+    <cell fill="1" id="185" region="-189" translation="0.07991907014916044 -0.19737570756346412 -0.09622087197472673" universe="18" />
+    <cell fill="1" id="186" region="-190" translation="0.06943697893246592 0.16968387178879557 0.11988276699391809" universe="13" />
+    <cell fill="1" id="187" region="-191" translation="0.06943697893246592 -0.1636494615445378 0.11988276699391809" universe="16" />
+    <cell fill="1" id="188" region="-192" translation="-0.07059889277962383 0.1489570802132021 0.09503214710980579" universe="21" />
+    <cell fill="1" id="189" region="-193" translation="-0.07059889277962383 -0.18437625312013128 0.09503214710980579" universe="24" />
+    <cell fill="1" id="190" region="-194" translation="0.010468267263955 0.15608028424842002 -0.00511339431390323" universe="23" />
+    <cell fill="1" id="191" region="-195" translation="0.010468267263955 -0.17725304908491335 -0.00511339431390323" universe="26" />
+    <cell fill="1" id="192" region="-196" translation="0.15972123417512762 0.06883522628651784 -0.11009587369358387" universe="27" />
+    <cell fill="1" id="193" region="-197" translation="-0.17361209915820575 0.06883522628651784 -0.11009587369358387" universe="28" />
+    <cell fill="1" id="194" region="-198" translation="0.08981179676970563 0.06434186205946246 0.032607233968534766" universe="8" />
+    <cell fill="1" id="195" region="-199" translation="0.0033702311569031584 0.10040789537086448 0.1867831868031803" universe="20" />
+    <cell fill="1" id="196" region="-200" translation="0.0033702311569031584 0.10040789537086448 -0.14655014653015297" universe="29" />
+    <cell fill="1" id="197" region="-201" translation="0.05329895281727448 -0.02881629065525937 0.15193411713913396" universe="12" />
+    <cell fill="1" id="198" region="-202" translation="0.05329895281727448 -0.02881629065525937 -0.1813992161941993" universe="21" />
+    <cell fill="1" id="199" region="-203" translation="0.14663786554095865 -0.0001831711922081758 0.173437280372308" universe="6" />
+    <cell fill="1" id="200" region="-204" translation="-0.18669546779237473 -0.0001831711922081758 0.173437280372308" universe="7" />
+    <cell fill="1" id="201" region="-205" translation="0.14663786554095865 -0.0001831711922081758 -0.15989605296102538" universe="15" />
+    <cell fill="1" id="202" region="-206" translation="-0.18669546779237473 -0.0001831711922081758 -0.15989605296102538" universe="16" />
+    <cell fill="1" id="203" region="-207" translation="0.006886156712931468 0.0325721225173089 -0.10785254014381473" universe="11" />
+    <cell fill="1" id="204" region="-208" translation="0.05946426530734861 0.17562994884896627 0.11256068342977466" universe="21" />
+    <cell fill="1" id="205" region="-209" translation="0.05946426530734861 -0.1577033844843671 0.11256068342977466" universe="24" />
+    <cell fill="1" id="206" region="-210" translation="-0.0745211393530899 0.18602539894086317 0.07061211191996841" universe="5" />
+    <cell fill="1" id="207" region="-211" translation="-0.0745211393530899 -0.1473079343924702 0.07061211191996841" universe="8" />
+    <cell fill="1" id="208" region="-212" translation="0.15971361633210523 -0.02416800360737892 0.062334297185282495" universe="28" />
+    <cell fill="1" id="209" region="-213" translation="-0.17361971700122802 -0.02416800360737892 0.062334297185282495" universe="29" />
+    <cell fill="1" id="210" region="-214" translation="-0.014191419448261688 0.11114945107218455 0.0903966514577691" universe="10" />
+    <cell fill="1" id="211" region="-215" translation="0.20641337800388493 -0.04689191572037532 0.03093832014609521" universe="4" />
+    <cell fill="1" id="212" region="-216" translation="-0.12691995532944833 -0.04689191572037532 0.03093832014609521" universe="5" />
+    <cell fill="1" id="213" region="-217" translation="0.042925982468302815 0.0705557158479822 -0.09611246805643225" universe="23" />
+    <cell fill="1" id="214" region="-218" translation="0.09174118398607445 -0.02102680816462299 -0.12074712654412828" universe="19" />
+    <cell fill="1" id="215" region="-219" translation="0.1871144659776534 0.14219092895822716 0.0030395151604761805" universe="21" />
+    <cell fill="1" id="216" region="-220" translation="-0.14621886735567996 0.14219092895822716 0.0030395151604761805" universe="22" />
+    <cell fill="1" id="217" region="-221" translation="0.1871144659776534 -0.1911424043751062 0.0030395151604761805" universe="24" />
+    <cell fill="1" id="218" region="-222" translation="-0.14621886735567996 -0.1911424043751062 0.0030395151604761805" universe="25" />
+    <cell fill="1" id="219" region="-223" translation="-0.08858601205119498 -0.05740809172565153 0.0018937978357634888" universe="21" />
+    <cell fill="1" id="220" region="-224" translation="-0.06956272452538859 -0.03258611645335985 0.1876749617320655" universe="11" />
+    <cell fill="1" id="221" region="-225" translation="-0.06956272452538859 -0.03258611645335985 -0.14565837160126788" universe="20" />
+    <cell fill="1" id="222" region="-226" translation="0.06480048668590577 0.08039356693483157 -0.0495807099830502" universe="4" />
+    <cell fill="1" id="223" region="-227" translation="0.11976882848311299 0.024414887718198774 0.059001075831400684" universe="18" />
+    <cell fill="1" id="224" region="-228" translation="0.055815690196973966 -0.03866224334773988 0.12934415570493119" universe="8" />
+    <cell fill="1" id="225" region="-229" translation="0.055815690196973966 -0.03866224334773988 -0.20398917762840219" universe="17" />
+    <cell fill="1" id="226" region="-230" translation="-0.07057140884385227 -0.033261585924167725 -0.11308117958912334" universe="11" />
+    <cell fill="1" id="227" region="-231" translation="0.0191891610992464 -0.08777511864372084 0.09496767886953814" universe="5" />
+    <cell fill="1" id="228" region="-232" translation="0.11357577214048964 -0.07231206070759028 -0.01862315233444045" universe="8" />
+    <cell fill="1" id="229" region="-233" translation="0.028822870329182626 0.09660360434040871 -0.10994545899370212" universe="21" />
+    <cell fill="1" id="230" region="-234" translation="-0.030272006016200004 0.04272149160139638 -0.11143715881676097" universe="18" />
+    <cell fill="1" id="231" region="-235" translation="0.09719339210824351 0.04131007428864286 0.14476192535372884" universe="11" />
+    <cell fill="1" id="232" region="-236" translation="0.09719339210824351 0.04131007428864286 -0.18857140797960453" universe="20" />
+    <cell fill="1" id="233" region="-237" translation="0.1075803128789849 -0.02104725713738881 -0.03274843538002781" universe="6" />
+    <cell fill="1" id="234" region="-238" translation="0.1392019576325615 -0.08814436128642017 -0.11479828495132216" universe="4" />
+    <cell fill="1" id="235" region="-239" translation="-0.19413137570077177 -0.08814436128642017 -0.11479828495132216" universe="5" />
+    <cell fill="1" id="236" region="-240" translation="0.10847197677361597 0.1461592302081176 0.08841042383901798" universe="14" />
+    <cell fill="1" id="237" region="-241" translation="0.10847197677361597 -0.18717410312521576 0.08841042383901798" universe="17" />
+    <cell fill="1" id="238" region="-242" translation="0.045127058382085194 0.0967807216119615 0.0967653665331849" universe="29" />
+    <cell fill="1" id="239" region="-243" translation="-0.022464471745497094 0.07259277205138148 0.10785219865057927" universe="12" />
+    <cell fill="1" id="240" region="-244" translation="0.10606353369903221 0.03928703229725711 0.17228776926768086" universe="17" />
+    <cell fill="1" id="241" region="-245" translation="0.10606353369903221 0.03928703229725711 -0.1610455640656524" universe="26" />
+    <cell fill="1" id="242" region="-246" translation="0.14815941963538226 0.11277655887534538 0.03808687169681996" universe="13" />
+    <cell fill="1" id="243" region="-247" translation="-0.185173913697951 0.11277655887534538 0.03808687169681996" universe="14" />
+    <cell fill="1" id="244" region="-248" translation="0.15693581669068946 0.10114531834923532 -0.04992356195780889" universe="3" />
+    <cell fill="1" id="245" region="-249" translation="-0.17639751664264391 0.10114531834923532 -0.04992356195780889" universe="4" />
+    <cell fill="1" id="246" region="-250" translation="0.13264357875679378 0.10919805128102966 -0.04769549879176793" universe="18" />
+    <cell fill="1" id="247" region="-251" translation="-0.2006897545765396 0.10919805128102966 -0.04769549879176793" universe="19" />
+    <cell fill="1" id="248" region="-252" translation="0.13916564434634993 0.13134319648704007 0.07015912178562622" universe="25" />
+    <cell fill="1" id="249" region="-253" translation="-0.19416768898698333 0.13134319648704007 0.07015912178562622" universe="26" />
+    <cell fill="1" id="250" region="-254" translation="0.13916564434634993 -0.2019901368462932 0.07015912178562622" universe="28" />
+    <cell fill="1" id="251" region="-255" translation="-0.19416768898698333 -0.2019901368462932 0.07015912178562622" universe="29" />
+    <cell fill="1" id="252" region="-256" translation="-0.10026688643231585 0.1564443552698941 0.1751728484794038" universe="4" />
+    <cell fill="1" id="253" region="-257" translation="-0.10026688643231585 -0.17688897806343928 0.1751728484794038" universe="7" />
+    <cell fill="1" id="254" region="-258" translation="-0.10026688643231585 0.1564443552698941 -0.15816048485392958" universe="13" />
+    <cell fill="1" id="255" region="-259" translation="-0.10026688643231585 -0.17688897806343928 -0.15816048485392958" universe="16" />
+    <cell fill="1" id="256" region="-260" translation="0.16555436030710213 -0.015531455219433332 0.02691614144169241" universe="27" />
+    <cell fill="1" id="257" region="-261" translation="-0.16777897302623124 -0.015531455219433332 0.02691614144169241" universe="28" />
+    <cell fill="1" id="258" region="-262" translation="0.152805274648522 0.18166556620660584 0.040488366683789634" universe="12" />
+    <cell fill="1" id="259" region="-263" translation="-0.18052805868481137 0.18166556620660584 0.040488366683789634" universe="13" />
+    <cell fill="1" id="260" region="-264" translation="0.152805274648522 -0.15166776712672753 0.040488366683789634" universe="15" />
+    <cell fill="1" id="261" region="-265" translation="-0.18052805868481137 -0.15166776712672753 0.040488366683789634" universe="16" />
+    <cell fill="1" id="262" region="-266" translation="0.07231116694829032 0.08785370537091952 0.09997055589943346" universe="7" />
+    <cell fill="1" id="263" region="-267" translation="-0.10576424362412257 0.09874497232579027 -0.05820080940738992" universe="3" />
+    <cell fill="1" id="264" region="-268" translation="0.046877953125145755 -0.059492732184222796 -0.055635341857650844" universe="4" />
+    <cell fill="1" id="265" region="-269" translation="0.1239423066569788 0.14183046274229005 -0.06583818749209458" universe="22" />
+    <cell fill="1" id="266" region="-270" translation="0.1239423066569788 -0.19150287059104332 -0.06583818749209458" universe="25" />
+    <cell fill="1" id="267" region="-271" translation="0.0013087859341976982 -0.06327594480884835 -0.05382522074205143" universe="10" />
+    <cell fill="1" id="268" region="-272" translation="0.11058883669906516 -0.038954175820645864 0.16834558789033005" universe="11" />
+    <cell fill="1" id="269" region="-273" translation="0.11058883669906516 -0.038954175820645864 -0.16498774544300332" universe="20" />
+    <cell fill="1" id="270" region="-274" translation="-0.02657010065724863 0.013144978841080679 0.050587944514051575" universe="24" />
+    <cell id="271" material="6" region="122 169 180 248 267" universe="3" />
+    <cell id="272" material="6" region="123 159 164 171 215 226 238 249 256 268" universe="4" />
+    <cell id="273" material="6" region="119 170 210 216 231 239" universe="5" />
+    <cell id="274" material="6" region="121 173 203 237" universe="6" />
+    <cell id="275" material="6" region="124 139 146 149 160 172 178 185 204 257 266" universe="7" />
+    <cell id="276" material="6" region="134 186 198 211 228 232" universe="8" />
+    <cell id="277" material="6" universe="9" />
+    <cell id="278" material="6" region="113 151 214 271" universe="10" />
+    <cell id="279" material="6" region="114 135 207 224 230 235 272" universe="11" />
+    <cell id="280" material="6" region="128 201 243 262" universe="12" />
+    <cell id="281" material="6" region="153 158 161 181 190 246 258 263" universe="13" />
+    <cell id="282" material="6" region="116 182 240 247" universe="14" />
+    <cell id="283" material="6" region="112 129 141 174 188 205 264" universe="15" />
+    <cell id="284" material="6" region="143 162 163 175 191 206 259 265" universe="16" />
+    <cell id="285" material="6" region="125 136 144 156 229 241 244" universe="17" />
+    <cell id="286" material="6" region="115 140 167 176 179 189 227 234 250" universe="18" />
+    <cell id="287" material="6" region="120 132 145 152 177 218 251" universe="19" />
+    <cell id="288" material="6" region="133 137 187 199 225 236 273" universe="20" />
+    <cell id="289" material="6" region="130 192 202 208 219 223 233" universe="21" />
+    <cell id="290" material="6" region="117 157 183 220 269" universe="22" />
+    <cell id="291" material="6" region="118 154 184 194 217" universe="23" />
+    <cell id="292" material="6" region="131 142 147 165 193 209 221 274" universe="24" />
+    <cell id="293" material="6" region="222 252 270" universe="25" />
+    <cell id="294" material="6" region="126 195 245 253" universe="26" />
+    <cell id="295" material="6" region="111 127 148 168 196 260" universe="27" />
+    <cell id="296" material="6" region="138 150 197 212 254 261" universe="28" />
+    <cell id="297" material="6" region="155 166 200 213 242 255" universe="29" />
+    <cell id="298" material="6" universe="30" />
+    <lattice id="2">
+      <pitch>0.3333333333333333 0.3333333333333333 0.3333333333333333</pitch>
+      <outer>30</outer>
+      <dimension>3 3 3</dimension>
+      <lower_left>-0.5 -0.5 -0.5</lower_left>
+      <universes>
+9 10 11 
+6 7 8 
+3 4 5 
 
-26 27 28 
-23 24 25 
-20 21 22 
+18 19 20 
+15 16 17 
+12 13 14 
 
-35 36 37 
-32 33 34 
-29 30 31 </universes>
-  </lattice>
-  <surface coeffs="0.0 0.0 0.0 0.02125" id="9" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 0.03125" id="10" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 0.03475" id="11" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 0.03825" id="12" type="sphere" />
-  <surface boundary="reflective" coeffs="-0.5" id="13" type="x-plane" />
-  <surface boundary="reflective" coeffs="0.5" id="14" type="x-plane" />
-  <surface boundary="reflective" coeffs="-0.5" id="15" type="y-plane" />
-  <surface boundary="reflective" coeffs="0.5" id="16" type="y-plane" />
-  <surface boundary="reflective" coeffs="-0.5" id="17" type="z-plane" />
-  <surface boundary="reflective" coeffs="0.5" id="18" type="z-plane" />
-  <surface coeffs="-0.0014062011817633224 -0.015257747167296776 -0.09184766966024316 0.04225" id="128" type="sphere" />
-  <surface coeffs="0.10909902639777394 -0.004179177767328068 -0.046240930185910245 0.04225" id="129" type="sphere" />
-  <surface coeffs="0.13878336652768952 -0.06900710536877097 -0.03848821497485455 0.04225" id="130" type="sphere" />
-  <surface coeffs="-0.19454996680564374 -0.06900710536877097 -0.03848821497485455 0.04225" id="131" type="sphere" />
-  <surface coeffs="-0.09846455191076986 -0.02594038069469251 -0.06155174933292362 0.04225" id="132" type="sphere" />
-  <surface coeffs="-0.09321591784308736 -0.12248857482372477 -0.04999802384282931 0.04225" id="133" type="sphere" />
-  <surface coeffs="0.2028198996079864 0.08501514690643278 0.07431198844628262 0.04225" id="134" type="sphere" />
-  <surface coeffs="-0.13051343372534685 0.08501514690643278 0.07431198844628262 0.04225" id="135" type="sphere" />
-  <surface coeffs="0.03417350410997999 -0.09641153719944834 -0.10112098092715327 0.04225" id="136" type="sphere" />
-  <surface coeffs="0.037913118842446136 0.06870772519039314 -0.10875752039644154 0.04225" id="137" type="sphere" />
-  <surface coeffs="0.07388008140640989 -0.07130227505402231 -0.09782982564187503 0.04225" id="138" type="sphere" />
-  <surface coeffs="0.08897214754414112 0.08694165211410448 0.07587737301598729 0.04225" id="139" type="sphere" />
-  <surface coeffs="-0.03698302711710488 0.1408784014909229 -0.10474284149572705 0.04225" id="140" type="sphere" />
-  <surface coeffs="-0.03698302711710488 -0.19245493184241047 -0.10474284149572705 0.04225" id="141" type="sphere" />
-  <surface coeffs="-0.02428069661424781 0.05168393238830282 0.1302704892646539 0.04225" id="142" type="sphere" />
-  <surface coeffs="-0.02428069661424781 0.05168393238830282 -0.20306284406867936 0.04225" id="143" type="sphere" />
-  <surface coeffs="0.04578051975994746 0.1175901605138544 -0.0038022862212453434 0.04225" id="144" type="sphere" />
-  <surface coeffs="-0.013741908464450836 0.18016577553053154 0.20276897514248216 0.04225" id="145" type="sphere" />
-  <surface coeffs="-0.013741908464450836 -0.15316755780280183 0.20276897514248216 0.04225" id="146" type="sphere" />
-  <surface coeffs="-0.013741908464450836 0.18016577553053154 -0.1305643581908511 0.04225" id="147" type="sphere" />
-  <surface coeffs="-0.013741908464450836 -0.15316755780280183 -0.1305643581908511 0.04225" id="148" type="sphere" />
-  <surface coeffs="0.19334606515602848 0.066228023881572 -0.07131104153532436 0.04225" id="149" type="sphere" />
-  <surface coeffs="-0.13998726817730478 0.066228023881572 -0.07131104153532436 0.04225" id="150" type="sphere" />
-  <surface coeffs="-0.031185656140686913 0.155914746052082 0.15331720509241947 0.04225" id="151" type="sphere" />
-  <surface coeffs="-0.031185656140686913 -0.17741858728125126 0.15331720509241947 0.04225" id="152" type="sphere" />
-  <surface coeffs="-0.031185656140686913 0.155914746052082 -0.1800161282409139 0.04225" id="153" type="sphere" />
-  <surface coeffs="-0.031185656140686913 -0.17741858728125126 -0.1800161282409139 0.04225" id="154" type="sphere" />
-  <surface coeffs="0.08018004492442865 0.016826191928232426 -0.016389596762212966 0.04225" id="155" type="sphere" />
-  <surface coeffs="0.00483733774062417 0.08148156718302602 -0.09280826916311341 0.04225" id="156" type="sphere" />
-  <surface coeffs="0.0978117791120118 -0.06105974469736897 -0.07844553364014112 0.04225" id="157" type="sphere" />
-  <surface coeffs="0.0339716094789545 0.044675266050854034 0.18588381767108564 0.04225" id="158" type="sphere" />
-  <surface coeffs="0.0339716094789545 0.044675266050854034 -0.14744951566224762 0.04225" id="159" type="sphere" />
-  <surface coeffs="0.15974177782488064 -0.11470938473074832 -0.055880627694202434 0.04225" id="160" type="sphere" />
-  <surface coeffs="-0.17359155550845262 -0.11470938473074832 -0.055880627694202434 0.04225" id="161" type="sphere" />
-  <surface coeffs="0.007714449992858363 -0.07841911930069978 0.019169121324834393 0.04225" id="162" type="sphere" />
-  <surface coeffs="-0.09772496056025104 -0.009435582016802613 -0.0973407871549632 0.04225" id="163" type="sphere" />
-  <surface coeffs="-0.08460405234526575 0.18619630211681182 0.10902502186367324 0.04225" id="164" type="sphere" />
-  <surface coeffs="-0.08460405234526575 -0.14713703121652144 0.10902502186367324 0.04225" id="165" type="sphere" />
-  <surface coeffs="0.08530970516294267 -0.09740948712101977 0.031538023054709596 0.04225" id="166" type="sphere" />
-  <surface coeffs="0.002049400245853761 0.10800782833319489 -0.08566939881823532 0.04225" id="167" type="sphere" />
-  <surface coeffs="0.036269774055772475 -0.0034880407315701634 0.08814057857502322 0.04225" id="168" type="sphere" />
-  <surface coeffs="0.012607957648281654 0.08090056062626749 0.0712211465420014 0.04225" id="169" type="sphere" />
-  <surface coeffs="-0.03741489943578313 0.1221086949309545 0.0439406213163509 0.04225" id="170" type="sphere" />
-  <surface coeffs="0.0851566223435044 -0.1191899586548319 -0.07364696787394387 0.04225" id="171" type="sphere" />
-  <surface coeffs="-0.03992848096555457 0.020214072912877246 -0.11315245980004196 0.04225" id="172" type="sphere" />
-  <surface coeffs="-0.050315754084578224 0.017099968565308377 0.056173125204605934 0.04225" id="173" type="sphere" />
-  <surface coeffs="-0.06766398274549851 -0.07303578778642877 0.005410963730880458 0.04225" id="174" type="sphere" />
-  <surface coeffs="0.06408439016382617 0.05853632250550789 0.00432158793112436 0.04225" id="175" type="sphere" />
-  <surface coeffs="-0.013801059755509382 0.20222454587424032 0.19241766819445416 0.04225" id="176" type="sphere" />
-  <surface coeffs="-0.013801059755509382 -0.13110878745909305 0.19241766819445416 0.04225" id="177" type="sphere" />
-  <surface coeffs="-0.013801059755509382 0.20222454587424032 -0.1409156651388792 0.04225" id="178" type="sphere" />
-  <surface coeffs="-0.013801059755509382 -0.13110878745909305 -0.1409156651388792 0.04225" id="179" type="sphere" />
-  <surface coeffs="0.03522733749799645 0.11305459403611595 0.10295023150858529 0.04225" id="180" type="sphere" />
-  <surface coeffs="-0.03831660450870228 -0.09880556873790897 0.08578673946744877 0.04225" id="181" type="sphere" />
-  <surface coeffs="0.03782024089160585 0.07732392719766301 -0.002829721222114334 0.04225" id="182" type="sphere" />
-  <surface coeffs="-0.060112483234699754 -0.06134051474053648 -0.04363492058502072 0.04225" id="183" type="sphere" />
-  <surface coeffs="0.10930502703326198 -0.020465939386398402 0.15848543253913627 0.04225" id="184" type="sphere" />
-  <surface coeffs="0.10930502703326198 -0.020465939386398402 -0.174847900794197 0.04225" id="185" type="sphere" />
-  <surface coeffs="-0.04821581350719811 -0.10913639479587178 -0.11108700962300094 0.04225" id="186" type="sphere" />
-  <surface coeffs="-0.09934364058994583 0.10405480441904197 -0.0241798283786806 0.04225" id="187" type="sphere" />
-  <surface coeffs="0.11425630804159204 0.19090246541367445 -0.06077533762167586 0.04225" id="188" type="sphere" />
-  <surface coeffs="0.11425630804159204 -0.14243086791965892 -0.06077533762167586 0.04225" id="189" type="sphere" />
-  <surface coeffs="0.0217205011905508 0.02506675532845576 0.029520031599966412 0.04225" id="190" type="sphere" />
-  <surface coeffs="0.12543650024083502 0.19371057833811733 -0.04147065769319469 0.04225" id="191" type="sphere" />
-  <surface coeffs="-0.20789683309249835 0.19371057833811733 -0.04147065769319469 0.04225" id="192" type="sphere" />
-  <surface coeffs="0.12543650024083502 -0.13962275499521593 -0.04147065769319469 0.04225" id="193" type="sphere" />
-  <surface coeffs="-0.20789683309249835 -0.13962275499521593 -0.04147065769319469 0.04225" id="194" type="sphere" />
-  <surface coeffs="-0.10385697059087434 -0.07239894918409101 0.047733316833160344 0.04225" id="195" type="sphere" />
-  <surface coeffs="-0.02484533723289073 0.03270050374260325 0.009261180540203251 0.04225" id="196" type="sphere" />
-  <surface coeffs="-0.10535768832641407 -0.10806169784882003 0.009669056668934639 0.04225" id="197" type="sphere" />
-  <surface coeffs="0.20034387531341857 0.02227169438582799 0.18731645229850835 0.04225" id="198" type="sphere" />
-  <surface coeffs="-0.13298945801991469 0.02227169438582799 0.18731645229850835 0.04225" id="199" type="sphere" />
-  <surface coeffs="0.20034387531341857 0.02227169438582799 -0.1460168810348249 0.04225" id="200" type="sphere" />
-  <surface coeffs="-0.13298945801991469 0.02227169438582799 -0.1460168810348249 0.04225" id="201" type="sphere" />
-  <surface coeffs="0.1631199405760454 0.04092483075648701 0.07754240264809376 0.04225" id="202" type="sphere" />
-  <surface coeffs="-0.17021339275728786 0.04092483075648701 0.07754240264809376 0.04225" id="203" type="sphere" />
-  <surface coeffs="0.102073447728939 -0.060687493103351975 0.01519685776716928 0.04225" id="204" type="sphere" />
-  <surface coeffs="0.07991907014916044 0.13595762576986914 -0.09622087197472673 0.04225" id="205" type="sphere" />
-  <surface coeffs="0.07991907014916044 -0.19737570756346412 -0.09622087197472673 0.04225" id="206" type="sphere" />
-  <surface coeffs="0.06943697893246592 0.16968387178879557 0.11988276699391809 0.04225" id="207" type="sphere" />
-  <surface coeffs="0.06943697893246592 -0.1636494615445378 0.11988276699391809 0.04225" id="208" type="sphere" />
-  <surface coeffs="-0.07059889277962383 0.1489570802132021 0.09503214710980579 0.04225" id="209" type="sphere" />
-  <surface coeffs="-0.07059889277962383 -0.18437625312013128 0.09503214710980579 0.04225" id="210" type="sphere" />
-  <surface coeffs="0.010468267263955 0.15608028424842002 -0.00511339431390323 0.04225" id="211" type="sphere" />
-  <surface coeffs="0.010468267263955 -0.17725304908491335 -0.00511339431390323 0.04225" id="212" type="sphere" />
-  <surface coeffs="0.15972123417512762 0.06883522628651784 -0.11009587369358387 0.04225" id="213" type="sphere" />
-  <surface coeffs="-0.17361209915820575 0.06883522628651784 -0.11009587369358387 0.04225" id="214" type="sphere" />
-  <surface coeffs="0.08981179676970563 0.06434186205946246 0.032607233968534766 0.04225" id="215" type="sphere" />
-  <surface coeffs="0.0033702311569031584 0.10040789537086448 0.1867831868031803 0.04225" id="216" type="sphere" />
-  <surface coeffs="0.0033702311569031584 0.10040789537086448 -0.14655014653015297 0.04225" id="217" type="sphere" />
-  <surface coeffs="0.05329895281727448 -0.02881629065525937 0.15193411713913396 0.04225" id="218" type="sphere" />
-  <surface coeffs="0.05329895281727448 -0.02881629065525937 -0.1813992161941993 0.04225" id="219" type="sphere" />
-  <surface coeffs="0.14663786554095865 -0.0001831711922081758 0.173437280372308 0.04225" id="220" type="sphere" />
-  <surface coeffs="-0.18669546779237473 -0.0001831711922081758 0.173437280372308 0.04225" id="221" type="sphere" />
-  <surface coeffs="0.14663786554095865 -0.0001831711922081758 -0.15989605296102538 0.04225" id="222" type="sphere" />
-  <surface coeffs="-0.18669546779237473 -0.0001831711922081758 -0.15989605296102538 0.04225" id="223" type="sphere" />
-  <surface coeffs="0.006886156712931468 0.0325721225173089 -0.10785254014381473 0.04225" id="224" type="sphere" />
-  <surface coeffs="0.05946426530734861 0.17562994884896627 0.11256068342977466 0.04225" id="225" type="sphere" />
-  <surface coeffs="0.05946426530734861 -0.1577033844843671 0.11256068342977466 0.04225" id="226" type="sphere" />
-  <surface coeffs="-0.0745211393530899 0.18602539894086317 0.07061211191996841 0.04225" id="227" type="sphere" />
-  <surface coeffs="-0.0745211393530899 -0.1473079343924702 0.07061211191996841 0.04225" id="228" type="sphere" />
-  <surface coeffs="0.15971361633210523 -0.02416800360737892 0.062334297185282495 0.04225" id="229" type="sphere" />
-  <surface coeffs="-0.17361971700122802 -0.02416800360737892 0.062334297185282495 0.04225" id="230" type="sphere" />
-  <surface coeffs="-0.014191419448261688 0.11114945107218455 0.0903966514577691 0.04225" id="231" type="sphere" />
-  <surface coeffs="0.20641337800388493 -0.04689191572037532 0.03093832014609521 0.04225" id="232" type="sphere" />
-  <surface coeffs="-0.12691995532944833 -0.04689191572037532 0.03093832014609521 0.04225" id="233" type="sphere" />
-  <surface coeffs="0.042925982468302815 0.0705557158479822 -0.09611246805643225 0.04225" id="234" type="sphere" />
-  <surface coeffs="0.09174118398607445 -0.02102680816462299 -0.12074712654412828 0.04225" id="235" type="sphere" />
-  <surface coeffs="0.1871144659776534 0.14219092895822716 0.0030395151604761805 0.04225" id="236" type="sphere" />
-  <surface coeffs="-0.14621886735567996 0.14219092895822716 0.0030395151604761805 0.04225" id="237" type="sphere" />
-  <surface coeffs="0.1871144659776534 -0.1911424043751062 0.0030395151604761805 0.04225" id="238" type="sphere" />
-  <surface coeffs="-0.14621886735567996 -0.1911424043751062 0.0030395151604761805 0.04225" id="239" type="sphere" />
-  <surface coeffs="-0.08858601205119498 -0.05740809172565153 0.0018937978357634888 0.04225" id="240" type="sphere" />
-  <surface coeffs="-0.06956272452538859 -0.03258611645335985 0.1876749617320655 0.04225" id="241" type="sphere" />
-  <surface coeffs="-0.06956272452538859 -0.03258611645335985 -0.14565837160126788 0.04225" id="242" type="sphere" />
-  <surface coeffs="0.06480048668590577 0.08039356693483157 -0.0495807099830502 0.04225" id="243" type="sphere" />
-  <surface coeffs="0.11976882848311299 0.024414887718198774 0.059001075831400684 0.04225" id="244" type="sphere" />
-  <surface coeffs="0.055815690196973966 -0.03866224334773988 0.12934415570493119 0.04225" id="245" type="sphere" />
-  <surface coeffs="0.055815690196973966 -0.03866224334773988 -0.20398917762840219 0.04225" id="246" type="sphere" />
-  <surface coeffs="-0.07057140884385227 -0.033261585924167725 -0.11308117958912334 0.04225" id="247" type="sphere" />
-  <surface coeffs="0.0191891610992464 -0.08777511864372084 0.09496767886953814 0.04225" id="248" type="sphere" />
-  <surface coeffs="0.11357577214048964 -0.07231206070759028 -0.01862315233444045 0.04225" id="249" type="sphere" />
-  <surface coeffs="0.028822870329182626 0.09660360434040871 -0.10994545899370212 0.04225" id="250" type="sphere" />
-  <surface coeffs="-0.030272006016200004 0.04272149160139638 -0.11143715881676097 0.04225" id="251" type="sphere" />
-  <surface coeffs="0.09719339210824351 0.04131007428864286 0.14476192535372884 0.04225" id="252" type="sphere" />
-  <surface coeffs="0.09719339210824351 0.04131007428864286 -0.18857140797960453 0.04225" id="253" type="sphere" />
-  <surface coeffs="0.1075803128789849 -0.02104725713738881 -0.03274843538002781 0.04225" id="254" type="sphere" />
-  <surface coeffs="0.1392019576325615 -0.08814436128642017 -0.11479828495132216 0.04225" id="255" type="sphere" />
-  <surface coeffs="-0.19413137570077177 -0.08814436128642017 -0.11479828495132216 0.04225" id="256" type="sphere" />
-  <surface coeffs="0.10847197677361597 0.1461592302081176 0.08841042383901798 0.04225" id="257" type="sphere" />
-  <surface coeffs="0.10847197677361597 -0.18717410312521576 0.08841042383901798 0.04225" id="258" type="sphere" />
-  <surface coeffs="0.045127058382085194 0.0967807216119615 0.0967653665331849 0.04225" id="259" type="sphere" />
-  <surface coeffs="-0.022464471745497094 0.07259277205138148 0.10785219865057927 0.04225" id="260" type="sphere" />
-  <surface coeffs="0.10606353369903221 0.03928703229725711 0.17228776926768086 0.04225" id="261" type="sphere" />
-  <surface coeffs="0.10606353369903221 0.03928703229725711 -0.1610455640656524 0.04225" id="262" type="sphere" />
-  <surface coeffs="0.14815941963538226 0.11277655887534538 0.03808687169681996 0.04225" id="263" type="sphere" />
-  <surface coeffs="-0.185173913697951 0.11277655887534538 0.03808687169681996 0.04225" id="264" type="sphere" />
-  <surface coeffs="0.15693581669068946 0.10114531834923532 -0.04992356195780889 0.04225" id="265" type="sphere" />
-  <surface coeffs="-0.17639751664264391 0.10114531834923532 -0.04992356195780889 0.04225" id="266" type="sphere" />
-  <surface coeffs="0.13264357875679378 0.10919805128102966 -0.04769549879176793 0.04225" id="267" type="sphere" />
-  <surface coeffs="-0.2006897545765396 0.10919805128102966 -0.04769549879176793 0.04225" id="268" type="sphere" />
-  <surface coeffs="0.13916564434634993 0.13134319648704007 0.07015912178562622 0.04225" id="269" type="sphere" />
-  <surface coeffs="-0.19416768898698333 0.13134319648704007 0.07015912178562622 0.04225" id="270" type="sphere" />
-  <surface coeffs="0.13916564434634993 -0.2019901368462932 0.07015912178562622 0.04225" id="271" type="sphere" />
-  <surface coeffs="-0.19416768898698333 -0.2019901368462932 0.07015912178562622 0.04225" id="272" type="sphere" />
-  <surface coeffs="-0.10026688643231585 0.1564443552698941 0.1751728484794038 0.04225" id="273" type="sphere" />
-  <surface coeffs="-0.10026688643231585 -0.17688897806343928 0.1751728484794038 0.04225" id="274" type="sphere" />
-  <surface coeffs="-0.10026688643231585 0.1564443552698941 -0.15816048485392958 0.04225" id="275" type="sphere" />
-  <surface coeffs="-0.10026688643231585 -0.17688897806343928 -0.15816048485392958 0.04225" id="276" type="sphere" />
-  <surface coeffs="0.16555436030710213 -0.015531455219433332 0.02691614144169241 0.04225" id="277" type="sphere" />
-  <surface coeffs="-0.16777897302623124 -0.015531455219433332 0.02691614144169241 0.04225" id="278" type="sphere" />
-  <surface coeffs="0.152805274648522 0.18166556620660584 0.040488366683789634 0.04225" id="279" type="sphere" />
-  <surface coeffs="-0.18052805868481137 0.18166556620660584 0.040488366683789634 0.04225" id="280" type="sphere" />
-  <surface coeffs="0.152805274648522 -0.15166776712672753 0.040488366683789634 0.04225" id="281" type="sphere" />
-  <surface coeffs="-0.18052805868481137 -0.15166776712672753 0.040488366683789634 0.04225" id="282" type="sphere" />
-  <surface coeffs="0.07231116694829032 0.08785370537091952 0.09997055589943346 0.04225" id="283" type="sphere" />
-  <surface coeffs="-0.10576424362412257 0.09874497232579027 -0.05820080940738992 0.04225" id="284" type="sphere" />
-  <surface coeffs="0.046877953125145755 -0.059492732184222796 -0.055635341857650844 0.04225" id="285" type="sphere" />
-  <surface coeffs="0.1239423066569788 0.14183046274229005 -0.06583818749209458 0.04225" id="286" type="sphere" />
-  <surface coeffs="0.1239423066569788 -0.19150287059104332 -0.06583818749209458 0.04225" id="287" type="sphere" />
-  <surface coeffs="0.0013087859341976982 -0.06327594480884835 -0.05382522074205143 0.04225" id="288" type="sphere" />
-  <surface coeffs="0.11058883669906516 -0.038954175820645864 0.16834558789033005 0.04225" id="289" type="sphere" />
-  <surface coeffs="0.11058883669906516 -0.038954175820645864 -0.16498774544300332 0.04225" id="290" type="sphere" />
-  <surface coeffs="-0.02657010065724863 0.013144978841080679 0.050587944514051575 0.04225" id="291" type="sphere" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="13">
-    <density units="g/cm3" value="10.5" />
-    <nuclide ao="0.14154" name="U235" />
-    <nuclide ao="0.85846" name="U238" />
-    <nuclide ao="0.5" name="C0" />
-    <nuclide ao="1.5" name="O16" />
-  </material>
-  <material id="14">
-    <density units="g/cm3" value="1.0" />
-    <nuclide ao="1.0" name="C0" />
-    <sab name="c_Graphite" />
-  </material>
-  <material id="15">
-    <density units="g/cm3" value="1.9" />
-    <nuclide ao="1.0" name="C0" />
-    <sab name="c_Graphite" />
-  </material>
-  <material id="16">
-    <density units="g/cm3" value="3.2" />
-    <nuclide ao="1.0" name="C0" />
-    <nuclide ao="0.9222968" name="Si28" />
-    <nuclide ao="0.0468316" name="Si29" />
-    <nuclide ao="0.0308716" name="Si30" />
-  </material>
-  <material id="17">
-    <density units="g/cm3" value="1.87" />
-    <nuclide ao="1.0" name="C0" />
-    <sab name="c_Graphite" />
-  </material>
-  <material id="18">
-    <density units="g/cm3" value="1.1995" />
-    <nuclide ao="1.0" name="C0" />
-    <sab name="c_Graphite" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>100</particles>
-  <batches>4</batches>
-  <inactive>0</inactive>
-  <source strength="1.0">
-    <space type="point">
-      <parameters>0.0 0.0 0.0</parameters>
-    </space>
-  </source>
-</settings>
+27 28 29 
+24 25 26 
+21 22 23 </universes>
+    </lattice>
+    <surface coeffs="0.0 0.0 0.0 0.02125" id="1" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 0.03125" id="2" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 0.03475" id="3" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 0.03825" id="4" type="sphere" />
+    <surface boundary="reflective" coeffs="-0.5" id="5" type="x-plane" />
+    <surface boundary="reflective" coeffs="0.5" id="6" type="x-plane" />
+    <surface boundary="reflective" coeffs="-0.5" id="7" type="y-plane" />
+    <surface boundary="reflective" coeffs="0.5" id="8" type="y-plane" />
+    <surface boundary="reflective" coeffs="-0.5" id="9" type="z-plane" />
+    <surface boundary="reflective" coeffs="0.5" id="10" type="z-plane" />
+    <surface coeffs="-0.0014062011817633224 -0.015257747167296776 -0.09184766966024316 0.04225" id="111" type="sphere" />
+    <surface coeffs="0.10909902639777394 -0.004179177767328068 -0.046240930185910245 0.04225" id="112" type="sphere" />
+    <surface coeffs="0.13878336652768952 -0.06900710536877097 -0.03848821497485455 0.04225" id="113" type="sphere" />
+    <surface coeffs="-0.19454996680564374 -0.06900710536877097 -0.03848821497485455 0.04225" id="114" type="sphere" />
+    <surface coeffs="-0.09846455191076986 -0.02594038069469251 -0.06155174933292362 0.04225" id="115" type="sphere" />
+    <surface coeffs="-0.09321591784308736 -0.12248857482372477 -0.04999802384282931 0.04225" id="116" type="sphere" />
+    <surface coeffs="0.2028198996079864 0.08501514690643278 0.07431198844628262 0.04225" id="117" type="sphere" />
+    <surface coeffs="-0.13051343372534685 0.08501514690643278 0.07431198844628262 0.04225" id="118" type="sphere" />
+    <surface coeffs="0.03417350410997999 -0.09641153719944834 -0.10112098092715327 0.04225" id="119" type="sphere" />
+    <surface coeffs="0.037913118842446136 0.06870772519039314 -0.10875752039644154 0.04225" id="120" type="sphere" />
+    <surface coeffs="0.07388008140640989 -0.07130227505402231 -0.09782982564187503 0.04225" id="121" type="sphere" />
+    <surface coeffs="0.08897214754414112 0.08694165211410448 0.07587737301598729 0.04225" id="122" type="sphere" />
+    <surface coeffs="-0.03698302711710488 0.1408784014909229 -0.10474284149572705 0.04225" id="123" type="sphere" />
+    <surface coeffs="-0.03698302711710488 -0.19245493184241047 -0.10474284149572705 0.04225" id="124" type="sphere" />
+    <surface coeffs="-0.02428069661424781 0.05168393238830282 0.1302704892646539 0.04225" id="125" type="sphere" />
+    <surface coeffs="-0.02428069661424781 0.05168393238830282 -0.20306284406867936 0.04225" id="126" type="sphere" />
+    <surface coeffs="0.04578051975994746 0.1175901605138544 -0.0038022862212453434 0.04225" id="127" type="sphere" />
+    <surface coeffs="-0.013741908464450836 0.18016577553053154 0.20276897514248216 0.04225" id="128" type="sphere" />
+    <surface coeffs="-0.013741908464450836 -0.15316755780280183 0.20276897514248216 0.04225" id="129" type="sphere" />
+    <surface coeffs="-0.013741908464450836 0.18016577553053154 -0.1305643581908511 0.04225" id="130" type="sphere" />
+    <surface coeffs="-0.013741908464450836 -0.15316755780280183 -0.1305643581908511 0.04225" id="131" type="sphere" />
+    <surface coeffs="0.19334606515602848 0.066228023881572 -0.07131104153532436 0.04225" id="132" type="sphere" />
+    <surface coeffs="-0.13998726817730478 0.066228023881572 -0.07131104153532436 0.04225" id="133" type="sphere" />
+    <surface coeffs="-0.031185656140686913 0.155914746052082 0.15331720509241947 0.04225" id="134" type="sphere" />
+    <surface coeffs="-0.031185656140686913 -0.17741858728125126 0.15331720509241947 0.04225" id="135" type="sphere" />
+    <surface coeffs="-0.031185656140686913 0.155914746052082 -0.1800161282409139 0.04225" id="136" type="sphere" />
+    <surface coeffs="-0.031185656140686913 -0.17741858728125126 -0.1800161282409139 0.04225" id="137" type="sphere" />
+    <surface coeffs="0.08018004492442865 0.016826191928232426 -0.016389596762212966 0.04225" id="138" type="sphere" />
+    <surface coeffs="0.00483733774062417 0.08148156718302602 -0.09280826916311341 0.04225" id="139" type="sphere" />
+    <surface coeffs="0.0978117791120118 -0.06105974469736897 -0.07844553364014112 0.04225" id="140" type="sphere" />
+    <surface coeffs="0.0339716094789545 0.044675266050854034 0.18588381767108564 0.04225" id="141" type="sphere" />
+    <surface coeffs="0.0339716094789545 0.044675266050854034 -0.14744951566224762 0.04225" id="142" type="sphere" />
+    <surface coeffs="0.15974177782488064 -0.11470938473074832 -0.055880627694202434 0.04225" id="143" type="sphere" />
+    <surface coeffs="-0.17359155550845262 -0.11470938473074832 -0.055880627694202434 0.04225" id="144" type="sphere" />
+    <surface coeffs="0.007714449992858363 -0.07841911930069978 0.019169121324834393 0.04225" id="145" type="sphere" />
+    <surface coeffs="-0.09772496056025104 -0.009435582016802613 -0.0973407871549632 0.04225" id="146" type="sphere" />
+    <surface coeffs="-0.08460405234526575 0.18619630211681182 0.10902502186367324 0.04225" id="147" type="sphere" />
+    <surface coeffs="-0.08460405234526575 -0.14713703121652144 0.10902502186367324 0.04225" id="148" type="sphere" />
+    <surface coeffs="0.08530970516294267 -0.09740948712101977 0.031538023054709596 0.04225" id="149" type="sphere" />
+    <surface coeffs="0.002049400245853761 0.10800782833319489 -0.08566939881823532 0.04225" id="150" type="sphere" />
+    <surface coeffs="0.036269774055772475 -0.0034880407315701634 0.08814057857502322 0.04225" id="151" type="sphere" />
+    <surface coeffs="0.012607957648281654 0.08090056062626749 0.0712211465420014 0.04225" id="152" type="sphere" />
+    <surface coeffs="-0.03741489943578313 0.1221086949309545 0.0439406213163509 0.04225" id="153" type="sphere" />
+    <surface coeffs="0.0851566223435044 -0.1191899586548319 -0.07364696787394387 0.04225" id="154" type="sphere" />
+    <surface coeffs="-0.03992848096555457 0.020214072912877246 -0.11315245980004196 0.04225" id="155" type="sphere" />
+    <surface coeffs="-0.050315754084578224 0.017099968565308377 0.056173125204605934 0.04225" id="156" type="sphere" />
+    <surface coeffs="-0.06766398274549851 -0.07303578778642877 0.005410963730880458 0.04225" id="157" type="sphere" />
+    <surface coeffs="0.06408439016382617 0.05853632250550789 0.00432158793112436 0.04225" id="158" type="sphere" />
+    <surface coeffs="-0.013801059755509382 0.20222454587424032 0.19241766819445416 0.04225" id="159" type="sphere" />
+    <surface coeffs="-0.013801059755509382 -0.13110878745909305 0.19241766819445416 0.04225" id="160" type="sphere" />
+    <surface coeffs="-0.013801059755509382 0.20222454587424032 -0.1409156651388792 0.04225" id="161" type="sphere" />
+    <surface coeffs="-0.013801059755509382 -0.13110878745909305 -0.1409156651388792 0.04225" id="162" type="sphere" />
+    <surface coeffs="0.03522733749799645 0.11305459403611595 0.10295023150858529 0.04225" id="163" type="sphere" />
+    <surface coeffs="-0.03831660450870228 -0.09880556873790897 0.08578673946744877 0.04225" id="164" type="sphere" />
+    <surface coeffs="0.03782024089160585 0.07732392719766301 -0.002829721222114334 0.04225" id="165" type="sphere" />
+    <surface coeffs="-0.060112483234699754 -0.06134051474053648 -0.04363492058502072 0.04225" id="166" type="sphere" />
+    <surface coeffs="0.10930502703326198 -0.020465939386398402 0.15848543253913627 0.04225" id="167" type="sphere" />
+    <surface coeffs="0.10930502703326198 -0.020465939386398402 -0.174847900794197 0.04225" id="168" type="sphere" />
+    <surface coeffs="-0.04821581350719811 -0.10913639479587178 -0.11108700962300094 0.04225" id="169" type="sphere" />
+    <surface coeffs="-0.09934364058994583 0.10405480441904197 -0.0241798283786806 0.04225" id="170" type="sphere" />
+    <surface coeffs="0.11425630804159204 0.19090246541367445 -0.06077533762167586 0.04225" id="171" type="sphere" />
+    <surface coeffs="0.11425630804159204 -0.14243086791965892 -0.06077533762167586 0.04225" id="172" type="sphere" />
+    <surface coeffs="0.0217205011905508 0.02506675532845576 0.029520031599966412 0.04225" id="173" type="sphere" />
+    <surface coeffs="0.12543650024083502 0.19371057833811733 -0.04147065769319469 0.04225" id="174" type="sphere" />
+    <surface coeffs="-0.20789683309249835 0.19371057833811733 -0.04147065769319469 0.04225" id="175" type="sphere" />
+    <surface coeffs="0.12543650024083502 -0.13962275499521593 -0.04147065769319469 0.04225" id="176" type="sphere" />
+    <surface coeffs="-0.20789683309249835 -0.13962275499521593 -0.04147065769319469 0.04225" id="177" type="sphere" />
+    <surface coeffs="-0.10385697059087434 -0.07239894918409101 0.047733316833160344 0.04225" id="178" type="sphere" />
+    <surface coeffs="-0.02484533723289073 0.03270050374260325 0.009261180540203251 0.04225" id="179" type="sphere" />
+    <surface coeffs="-0.10535768832641407 -0.10806169784882003 0.009669056668934639 0.04225" id="180" type="sphere" />
+    <surface coeffs="0.20034387531341857 0.02227169438582799 0.18731645229850835 0.04225" id="181" type="sphere" />
+    <surface coeffs="-0.13298945801991469 0.02227169438582799 0.18731645229850835 0.04225" id="182" type="sphere" />
+    <surface coeffs="0.20034387531341857 0.02227169438582799 -0.1460168810348249 0.04225" id="183" type="sphere" />
+    <surface coeffs="-0.13298945801991469 0.02227169438582799 -0.1460168810348249 0.04225" id="184" type="sphere" />
+    <surface coeffs="0.1631199405760454 0.04092483075648701 0.07754240264809376 0.04225" id="185" type="sphere" />
+    <surface coeffs="-0.17021339275728786 0.04092483075648701 0.07754240264809376 0.04225" id="186" type="sphere" />
+    <surface coeffs="0.102073447728939 -0.060687493103351975 0.01519685776716928 0.04225" id="187" type="sphere" />
+    <surface coeffs="0.07991907014916044 0.13595762576986914 -0.09622087197472673 0.04225" id="188" type="sphere" />
+    <surface coeffs="0.07991907014916044 -0.19737570756346412 -0.09622087197472673 0.04225" id="189" type="sphere" />
+    <surface coeffs="0.06943697893246592 0.16968387178879557 0.11988276699391809 0.04225" id="190" type="sphere" />
+    <surface coeffs="0.06943697893246592 -0.1636494615445378 0.11988276699391809 0.04225" id="191" type="sphere" />
+    <surface coeffs="-0.07059889277962383 0.1489570802132021 0.09503214710980579 0.04225" id="192" type="sphere" />
+    <surface coeffs="-0.07059889277962383 -0.18437625312013128 0.09503214710980579 0.04225" id="193" type="sphere" />
+    <surface coeffs="0.010468267263955 0.15608028424842002 -0.00511339431390323 0.04225" id="194" type="sphere" />
+    <surface coeffs="0.010468267263955 -0.17725304908491335 -0.00511339431390323 0.04225" id="195" type="sphere" />
+    <surface coeffs="0.15972123417512762 0.06883522628651784 -0.11009587369358387 0.04225" id="196" type="sphere" />
+    <surface coeffs="-0.17361209915820575 0.06883522628651784 -0.11009587369358387 0.04225" id="197" type="sphere" />
+    <surface coeffs="0.08981179676970563 0.06434186205946246 0.032607233968534766 0.04225" id="198" type="sphere" />
+    <surface coeffs="0.0033702311569031584 0.10040789537086448 0.1867831868031803 0.04225" id="199" type="sphere" />
+    <surface coeffs="0.0033702311569031584 0.10040789537086448 -0.14655014653015297 0.04225" id="200" type="sphere" />
+    <surface coeffs="0.05329895281727448 -0.02881629065525937 0.15193411713913396 0.04225" id="201" type="sphere" />
+    <surface coeffs="0.05329895281727448 -0.02881629065525937 -0.1813992161941993 0.04225" id="202" type="sphere" />
+    <surface coeffs="0.14663786554095865 -0.0001831711922081758 0.173437280372308 0.04225" id="203" type="sphere" />
+    <surface coeffs="-0.18669546779237473 -0.0001831711922081758 0.173437280372308 0.04225" id="204" type="sphere" />
+    <surface coeffs="0.14663786554095865 -0.0001831711922081758 -0.15989605296102538 0.04225" id="205" type="sphere" />
+    <surface coeffs="-0.18669546779237473 -0.0001831711922081758 -0.15989605296102538 0.04225" id="206" type="sphere" />
+    <surface coeffs="0.006886156712931468 0.0325721225173089 -0.10785254014381473 0.04225" id="207" type="sphere" />
+    <surface coeffs="0.05946426530734861 0.17562994884896627 0.11256068342977466 0.04225" id="208" type="sphere" />
+    <surface coeffs="0.05946426530734861 -0.1577033844843671 0.11256068342977466 0.04225" id="209" type="sphere" />
+    <surface coeffs="-0.0745211393530899 0.18602539894086317 0.07061211191996841 0.04225" id="210" type="sphere" />
+    <surface coeffs="-0.0745211393530899 -0.1473079343924702 0.07061211191996841 0.04225" id="211" type="sphere" />
+    <surface coeffs="0.15971361633210523 -0.02416800360737892 0.062334297185282495 0.04225" id="212" type="sphere" />
+    <surface coeffs="-0.17361971700122802 -0.02416800360737892 0.062334297185282495 0.04225" id="213" type="sphere" />
+    <surface coeffs="-0.014191419448261688 0.11114945107218455 0.0903966514577691 0.04225" id="214" type="sphere" />
+    <surface coeffs="0.20641337800388493 -0.04689191572037532 0.03093832014609521 0.04225" id="215" type="sphere" />
+    <surface coeffs="-0.12691995532944833 -0.04689191572037532 0.03093832014609521 0.04225" id="216" type="sphere" />
+    <surface coeffs="0.042925982468302815 0.0705557158479822 -0.09611246805643225 0.04225" id="217" type="sphere" />
+    <surface coeffs="0.09174118398607445 -0.02102680816462299 -0.12074712654412828 0.04225" id="218" type="sphere" />
+    <surface coeffs="0.1871144659776534 0.14219092895822716 0.0030395151604761805 0.04225" id="219" type="sphere" />
+    <surface coeffs="-0.14621886735567996 0.14219092895822716 0.0030395151604761805 0.04225" id="220" type="sphere" />
+    <surface coeffs="0.1871144659776534 -0.1911424043751062 0.0030395151604761805 0.04225" id="221" type="sphere" />
+    <surface coeffs="-0.14621886735567996 -0.1911424043751062 0.0030395151604761805 0.04225" id="222" type="sphere" />
+    <surface coeffs="-0.08858601205119498 -0.05740809172565153 0.0018937978357634888 0.04225" id="223" type="sphere" />
+    <surface coeffs="-0.06956272452538859 -0.03258611645335985 0.1876749617320655 0.04225" id="224" type="sphere" />
+    <surface coeffs="-0.06956272452538859 -0.03258611645335985 -0.14565837160126788 0.04225" id="225" type="sphere" />
+    <surface coeffs="0.06480048668590577 0.08039356693483157 -0.0495807099830502 0.04225" id="226" type="sphere" />
+    <surface coeffs="0.11976882848311299 0.024414887718198774 0.059001075831400684 0.04225" id="227" type="sphere" />
+    <surface coeffs="0.055815690196973966 -0.03866224334773988 0.12934415570493119 0.04225" id="228" type="sphere" />
+    <surface coeffs="0.055815690196973966 -0.03866224334773988 -0.20398917762840219 0.04225" id="229" type="sphere" />
+    <surface coeffs="-0.07057140884385227 -0.033261585924167725 -0.11308117958912334 0.04225" id="230" type="sphere" />
+    <surface coeffs="0.0191891610992464 -0.08777511864372084 0.09496767886953814 0.04225" id="231" type="sphere" />
+    <surface coeffs="0.11357577214048964 -0.07231206070759028 -0.01862315233444045 0.04225" id="232" type="sphere" />
+    <surface coeffs="0.028822870329182626 0.09660360434040871 -0.10994545899370212 0.04225" id="233" type="sphere" />
+    <surface coeffs="-0.030272006016200004 0.04272149160139638 -0.11143715881676097 0.04225" id="234" type="sphere" />
+    <surface coeffs="0.09719339210824351 0.04131007428864286 0.14476192535372884 0.04225" id="235" type="sphere" />
+    <surface coeffs="0.09719339210824351 0.04131007428864286 -0.18857140797960453 0.04225" id="236" type="sphere" />
+    <surface coeffs="0.1075803128789849 -0.02104725713738881 -0.03274843538002781 0.04225" id="237" type="sphere" />
+    <surface coeffs="0.1392019576325615 -0.08814436128642017 -0.11479828495132216 0.04225" id="238" type="sphere" />
+    <surface coeffs="-0.19413137570077177 -0.08814436128642017 -0.11479828495132216 0.04225" id="239" type="sphere" />
+    <surface coeffs="0.10847197677361597 0.1461592302081176 0.08841042383901798 0.04225" id="240" type="sphere" />
+    <surface coeffs="0.10847197677361597 -0.18717410312521576 0.08841042383901798 0.04225" id="241" type="sphere" />
+    <surface coeffs="0.045127058382085194 0.0967807216119615 0.0967653665331849 0.04225" id="242" type="sphere" />
+    <surface coeffs="-0.022464471745497094 0.07259277205138148 0.10785219865057927 0.04225" id="243" type="sphere" />
+    <surface coeffs="0.10606353369903221 0.03928703229725711 0.17228776926768086 0.04225" id="244" type="sphere" />
+    <surface coeffs="0.10606353369903221 0.03928703229725711 -0.1610455640656524 0.04225" id="245" type="sphere" />
+    <surface coeffs="0.14815941963538226 0.11277655887534538 0.03808687169681996 0.04225" id="246" type="sphere" />
+    <surface coeffs="-0.185173913697951 0.11277655887534538 0.03808687169681996 0.04225" id="247" type="sphere" />
+    <surface coeffs="0.15693581669068946 0.10114531834923532 -0.04992356195780889 0.04225" id="248" type="sphere" />
+    <surface coeffs="-0.17639751664264391 0.10114531834923532 -0.04992356195780889 0.04225" id="249" type="sphere" />
+    <surface coeffs="0.13264357875679378 0.10919805128102966 -0.04769549879176793 0.04225" id="250" type="sphere" />
+    <surface coeffs="-0.2006897545765396 0.10919805128102966 -0.04769549879176793 0.04225" id="251" type="sphere" />
+    <surface coeffs="0.13916564434634993 0.13134319648704007 0.07015912178562622 0.04225" id="252" type="sphere" />
+    <surface coeffs="-0.19416768898698333 0.13134319648704007 0.07015912178562622 0.04225" id="253" type="sphere" />
+    <surface coeffs="0.13916564434634993 -0.2019901368462932 0.07015912178562622 0.04225" id="254" type="sphere" />
+    <surface coeffs="-0.19416768898698333 -0.2019901368462932 0.07015912178562622 0.04225" id="255" type="sphere" />
+    <surface coeffs="-0.10026688643231585 0.1564443552698941 0.1751728484794038 0.04225" id="256" type="sphere" />
+    <surface coeffs="-0.10026688643231585 -0.17688897806343928 0.1751728484794038 0.04225" id="257" type="sphere" />
+    <surface coeffs="-0.10026688643231585 0.1564443552698941 -0.15816048485392958 0.04225" id="258" type="sphere" />
+    <surface coeffs="-0.10026688643231585 -0.17688897806343928 -0.15816048485392958 0.04225" id="259" type="sphere" />
+    <surface coeffs="0.16555436030710213 -0.015531455219433332 0.02691614144169241 0.04225" id="260" type="sphere" />
+    <surface coeffs="-0.16777897302623124 -0.015531455219433332 0.02691614144169241 0.04225" id="261" type="sphere" />
+    <surface coeffs="0.152805274648522 0.18166556620660584 0.040488366683789634 0.04225" id="262" type="sphere" />
+    <surface coeffs="-0.18052805868481137 0.18166556620660584 0.040488366683789634 0.04225" id="263" type="sphere" />
+    <surface coeffs="0.152805274648522 -0.15166776712672753 0.040488366683789634 0.04225" id="264" type="sphere" />
+    <surface coeffs="-0.18052805868481137 -0.15166776712672753 0.040488366683789634 0.04225" id="265" type="sphere" />
+    <surface coeffs="0.07231116694829032 0.08785370537091952 0.09997055589943346 0.04225" id="266" type="sphere" />
+    <surface coeffs="-0.10576424362412257 0.09874497232579027 -0.05820080940738992 0.04225" id="267" type="sphere" />
+    <surface coeffs="0.046877953125145755 -0.059492732184222796 -0.055635341857650844 0.04225" id="268" type="sphere" />
+    <surface coeffs="0.1239423066569788 0.14183046274229005 -0.06583818749209458 0.04225" id="269" type="sphere" />
+    <surface coeffs="0.1239423066569788 -0.19150287059104332 -0.06583818749209458 0.04225" id="270" type="sphere" />
+    <surface coeffs="0.0013087859341976982 -0.06327594480884835 -0.05382522074205143 0.04225" id="271" type="sphere" />
+    <surface coeffs="0.11058883669906516 -0.038954175820645864 0.16834558789033005 0.04225" id="272" type="sphere" />
+    <surface coeffs="0.11058883669906516 -0.038954175820645864 -0.16498774544300332 0.04225" id="273" type="sphere" />
+    <surface coeffs="-0.02657010065724863 0.013144978841080679 0.050587944514051575 0.04225" id="274" type="sphere" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>4</batches>
+    <inactive>0</inactive>
+    <source strength="1.0">
+      <space type="point">
+        <parameters>0.0 0.0 0.0</parameters>
+      </space>
+    </source>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/triso/test.py b/tests/regression_tests/triso/test.py
index c44715691..248724cc2 100644
--- a/tests/regression_tests/triso/test.py
+++ b/tests/regression_tests/triso/test.py
@@ -9,7 +9,8 @@ from tests.testing_harness import PyAPITestHarness
 
 
 class TRISOTestHarness(PyAPITestHarness):
-    def _build_inputs(self):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         # Define TRISO matrials
         fuel = openmc.Material()
         fuel.set_density('g/cm3', 10.5)
@@ -78,20 +79,19 @@ class TRISOTestHarness(PyAPITestHarness):
         box.fill = lattice
 
         root = openmc.Universe(0, cells=[box])
-        geom = openmc.Geometry(root)
-        geom.export_to_xml()
+        self._model.geometry = openmc.Geometry(root)
 
         settings = openmc.Settings()
         settings.batches = 4
         settings.inactive = 0
         settings.particles = 100
         settings.source = openmc.Source(space=openmc.stats.Point())
-        settings.export_to_xml()
+        self._model.settings = settings
 
-        mats = openmc.Materials([fuel, porous_carbon, ipyc, sic, opyc, graphite])
-        mats.export_to_xml()
+        self._model.materials = openmc.Materials([fuel, porous_carbon, ipyc,
+                                                  sic, opyc, graphite])
 
 
 def test_triso():
-    harness = TRISOTestHarness('statepoint.4.h5')
+    harness = TRISOTestHarness('statepoint.4.h5', model=openmc.Model())
     harness.main()
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true.dat b/tests/regression_tests/unstructured_mesh/inputs_true.dat
index e556782ad..dba721d7e 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true.dat
@@ -1,91 +1,90 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-  <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-  <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space origin="0.0 0.0 0.0" type="spherical">
-      <r parameters="0.0 0.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>1.0 1.0</parameters>
-      </cos_theta>
-      <phi type="discrete">
-        <parameters>0.0 1.0</parameters>
-      </phi>
-    </space>
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>10 10 10</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <mesh id="2" library="libmesh" type="unstructured">
-    <filename>test_mesh_hexes.e</filename>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="mesh">
-    <bins>2</bins>
-  </filter>
-  <tally id="1" name="regular mesh tally">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="2" name="unstructured mesh tally">
-    <filters>2</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space origin="0.0 0.0 0.0" type="spherical">
+        <r parameters="0.0 0.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>1.0 1.0</parameters>
+        </cos_theta>
+        <phi type="discrete">
+          <parameters>0.0 1.0</parameters>
+        </phi>
+      </space>
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 10 10</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <mesh id="2" library="libmesh" type="unstructured">
+      <filename>test_mesh_hexes.e</filename>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
+    </filter>
+    <tally id="1" name="regular mesh tally">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="2" name="unstructured mesh tally">
+      <filters>2</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true0.dat b/tests/regression_tests/unstructured_mesh/inputs_true0.dat
index 2e2594cde..7c3b5a53a 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true0.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true0.dat
@@ -1,91 +1,90 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-  <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-  <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space origin="0.0 0.0 0.0" type="spherical">
-      <r parameters="0.0 0.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>1.0 1.0</parameters>
-      </cos_theta>
-      <phi type="discrete">
-        <parameters>0.0 1.0</parameters>
-      </phi>
-    </space>
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>10 10 10</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <mesh id="2" library="libmesh" type="unstructured">
-    <filename>test_mesh_tets_w_holes.e</filename>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="mesh">
-    <bins>2</bins>
-  </filter>
-  <tally id="1" name="regular mesh tally">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="2" name="unstructured mesh tally">
-    <filters>2</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space origin="0.0 0.0 0.0" type="spherical">
+        <r parameters="0.0 0.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>1.0 1.0</parameters>
+        </cos_theta>
+        <phi type="discrete">
+          <parameters>0.0 1.0</parameters>
+        </phi>
+      </space>
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 10 10</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <mesh id="2" library="libmesh" type="unstructured">
+      <filename>test_mesh_tets_w_holes.e</filename>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
+    </filter>
+    <tally id="1" name="regular mesh tally">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="2" name="unstructured mesh tally">
+      <filters>2</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true1.dat b/tests/regression_tests/unstructured_mesh/inputs_true1.dat
index 84a3b186b..2a0ca5168 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true1.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true1.dat
@@ -1,91 +1,90 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-  <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-  <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space origin="0.0 0.0 0.0" type="spherical">
-      <r parameters="0.0 0.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>1.0 1.0</parameters>
-      </cos_theta>
-      <phi type="discrete">
-        <parameters>0.0 1.0</parameters>
-      </phi>
-    </space>
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>10 10 10</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <mesh id="2" library="libmesh" type="unstructured">
-    <filename>test_mesh_tets.e</filename>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="mesh">
-    <bins>2</bins>
-  </filter>
-  <tally id="1" name="regular mesh tally">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="2" name="unstructured mesh tally">
-    <filters>2</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space origin="0.0 0.0 0.0" type="spherical">
+        <r parameters="0.0 0.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>1.0 1.0</parameters>
+        </cos_theta>
+        <phi type="discrete">
+          <parameters>0.0 1.0</parameters>
+        </phi>
+      </space>
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 10 10</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <mesh id="2" library="libmesh" type="unstructured">
+      <filename>test_mesh_tets.e</filename>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
+    </filter>
+    <tally id="1" name="regular mesh tally">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="2" name="unstructured mesh tally">
+      <filters>2</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true10.dat b/tests/regression_tests/unstructured_mesh/inputs_true10.dat
index e9272a333..1290a9835 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true10.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true10.dat
@@ -1,91 +1,90 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-  <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-  <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space origin="0.0 0.0 0.0" type="spherical">
-      <r parameters="0.0 0.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>1.0 1.0</parameters>
-      </cos_theta>
-      <phi type="discrete">
-        <parameters>0.0 1.0</parameters>
-      </phi>
-    </space>
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>10 10 10</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <mesh id="2" library="moab" type="unstructured">
-    <filename>test_mesh_tets_w_holes.e</filename>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="mesh">
-    <bins>2</bins>
-  </filter>
-  <tally id="1" name="regular mesh tally">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="2" name="unstructured mesh tally">
-    <filters>2</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space origin="0.0 0.0 0.0" type="spherical">
+        <r parameters="0.0 0.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>1.0 1.0</parameters>
+        </cos_theta>
+        <phi type="discrete">
+          <parameters>0.0 1.0</parameters>
+        </phi>
+      </space>
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 10 10</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <mesh id="2" library="moab" type="unstructured">
+      <filename>test_mesh_tets_w_holes.e</filename>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
+    </filter>
+    <tally id="1" name="regular mesh tally">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="2" name="unstructured mesh tally">
+      <filters>2</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true11.dat b/tests/regression_tests/unstructured_mesh/inputs_true11.dat
index 0b89d280c..5edb5cf0f 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true11.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true11.dat
@@ -1,91 +1,90 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-  <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-  <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space origin="0.0 0.0 0.0" type="spherical">
-      <r parameters="0.0 0.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>1.0 1.0</parameters>
-      </cos_theta>
-      <phi type="discrete">
-        <parameters>0.0 1.0</parameters>
-      </phi>
-    </space>
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>10 10 10</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <mesh id="2" library="moab" type="unstructured">
-    <filename>test_mesh_tets.e</filename>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="mesh">
-    <bins>2</bins>
-  </filter>
-  <tally id="1" name="regular mesh tally">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="2" name="unstructured mesh tally">
-    <filters>2</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space origin="0.0 0.0 0.0" type="spherical">
+        <r parameters="0.0 0.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>1.0 1.0</parameters>
+        </cos_theta>
+        <phi type="discrete">
+          <parameters>0.0 1.0</parameters>
+        </phi>
+      </space>
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 10 10</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <mesh id="2" library="moab" type="unstructured">
+      <filename>test_mesh_tets.e</filename>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
+    </filter>
+    <tally id="1" name="regular mesh tally">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="2" name="unstructured mesh tally">
+      <filters>2</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true12.dat b/tests/regression_tests/unstructured_mesh/inputs_true12.dat
index b3673a254..d8def3b5b 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true12.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true12.dat
@@ -1,91 +1,90 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-  <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-  <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space origin="0.0 0.0 0.0" type="spherical">
-      <r parameters="0.0 0.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>1.0 1.0</parameters>
-      </cos_theta>
-      <phi type="discrete">
-        <parameters>0.0 1.0</parameters>
-      </phi>
-    </space>
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>10 10 10</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <mesh id="2" library="moab" type="unstructured">
-    <filename>test_mesh_tets_w_holes.e</filename>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="mesh">
-    <bins>2</bins>
-  </filter>
-  <tally id="1" name="regular mesh tally">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="2" name="unstructured mesh tally">
-    <filters>2</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space origin="0.0 0.0 0.0" type="spherical">
+        <r parameters="0.0 0.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>1.0 1.0</parameters>
+        </cos_theta>
+        <phi type="discrete">
+          <parameters>0.0 1.0</parameters>
+        </phi>
+      </space>
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 10 10</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <mesh id="2" library="moab" type="unstructured">
+      <filename>test_mesh_tets_w_holes.e</filename>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
+    </filter>
+    <tally id="1" name="regular mesh tally">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="2" name="unstructured mesh tally">
+      <filters>2</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true13.dat b/tests/regression_tests/unstructured_mesh/inputs_true13.dat
index c466396b6..3afb0ce50 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true13.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true13.dat
@@ -1,91 +1,90 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-  <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-  <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space origin="0.0 0.0 0.0" type="spherical">
-      <r parameters="0.0 0.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>1.0 1.0</parameters>
-      </cos_theta>
-      <phi type="discrete">
-        <parameters>0.0 1.0</parameters>
-      </phi>
-    </space>
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>10 10 10</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <mesh id="2" library="moab" type="unstructured">
-    <filename>test_mesh_tets.e</filename>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="mesh">
-    <bins>2</bins>
-  </filter>
-  <tally id="1" name="regular mesh tally">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="2" name="unstructured mesh tally">
-    <filters>2</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space origin="0.0 0.0 0.0" type="spherical">
+        <r parameters="0.0 0.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>1.0 1.0</parameters>
+        </cos_theta>
+        <phi type="discrete">
+          <parameters>0.0 1.0</parameters>
+        </phi>
+      </space>
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 10 10</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <mesh id="2" library="moab" type="unstructured">
+      <filename>test_mesh_tets.e</filename>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
+    </filter>
+    <tally id="1" name="regular mesh tally">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="2" name="unstructured mesh tally">
+      <filters>2</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true14.dat b/tests/regression_tests/unstructured_mesh/inputs_true14.dat
index 8c6a5120a..b7de468ea 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true14.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true14.dat
@@ -1,91 +1,90 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-  <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-  <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space origin="0.0 0.0 0.0" type="spherical">
-      <r parameters="0.0 0.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>1.0 1.0</parameters>
-      </cos_theta>
-      <phi type="discrete">
-        <parameters>0.0 1.0</parameters>
-      </phi>
-    </space>
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>10 10 10</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <mesh id="2" library="moab" type="unstructured">
-    <filename>test_mesh_tets_w_holes.e</filename>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="mesh">
-    <bins>2</bins>
-  </filter>
-  <tally id="1" name="regular mesh tally">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="2" name="unstructured mesh tally">
-    <filters>2</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space origin="0.0 0.0 0.0" type="spherical">
+        <r parameters="0.0 0.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>1.0 1.0</parameters>
+        </cos_theta>
+        <phi type="discrete">
+          <parameters>0.0 1.0</parameters>
+        </phi>
+      </space>
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 10 10</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <mesh id="2" library="moab" type="unstructured">
+      <filename>test_mesh_tets_w_holes.e</filename>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
+    </filter>
+    <tally id="1" name="regular mesh tally">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="2" name="unstructured mesh tally">
+      <filters>2</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true15.dat b/tests/regression_tests/unstructured_mesh/inputs_true15.dat
index 1b9abbd83..bdb1dd037 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true15.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true15.dat
@@ -1,91 +1,90 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-  <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-  <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space origin="0.0 0.0 0.0" type="spherical">
-      <r parameters="0.0 0.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>1.0 1.0</parameters>
-      </cos_theta>
-      <phi type="discrete">
-        <parameters>0.0 1.0</parameters>
-      </phi>
-    </space>
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>10 10 10</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <mesh id="2" library="moab" type="unstructured">
-    <filename>test_mesh_tets.e</filename>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="mesh">
-    <bins>2</bins>
-  </filter>
-  <tally id="1" name="regular mesh tally">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="2" name="unstructured mesh tally">
-    <filters>2</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space origin="0.0 0.0 0.0" type="spherical">
+        <r parameters="0.0 0.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>1.0 1.0</parameters>
+        </cos_theta>
+        <phi type="discrete">
+          <parameters>0.0 1.0</parameters>
+        </phi>
+      </space>
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 10 10</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <mesh id="2" library="moab" type="unstructured">
+      <filename>test_mesh_tets.e</filename>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
+    </filter>
+    <tally id="1" name="regular mesh tally">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="2" name="unstructured mesh tally">
+      <filters>2</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true2.dat b/tests/regression_tests/unstructured_mesh/inputs_true2.dat
index 7136d485a..b2a998786 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true2.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true2.dat
@@ -1,91 +1,90 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-  <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-  <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space origin="0.0 0.0 0.0" type="spherical">
-      <r parameters="0.0 0.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>1.0 1.0</parameters>
-      </cos_theta>
-      <phi type="discrete">
-        <parameters>0.0 1.0</parameters>
-      </phi>
-    </space>
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>10 10 10</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <mesh id="2" library="libmesh" type="unstructured">
-    <filename>test_mesh_tets_w_holes.e</filename>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="mesh">
-    <bins>2</bins>
-  </filter>
-  <tally id="1" name="regular mesh tally">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="2" name="unstructured mesh tally">
-    <filters>2</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space origin="0.0 0.0 0.0" type="spherical">
+        <r parameters="0.0 0.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>1.0 1.0</parameters>
+        </cos_theta>
+        <phi type="discrete">
+          <parameters>0.0 1.0</parameters>
+        </phi>
+      </space>
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 10 10</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <mesh id="2" library="libmesh" type="unstructured">
+      <filename>test_mesh_tets_w_holes.e</filename>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
+    </filter>
+    <tally id="1" name="regular mesh tally">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="2" name="unstructured mesh tally">
+      <filters>2</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true3.dat b/tests/regression_tests/unstructured_mesh/inputs_true3.dat
index 23900a060..4a66dc2a6 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true3.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true3.dat
@@ -1,91 +1,90 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-  <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-  <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space origin="0.0 0.0 0.0" type="spherical">
-      <r parameters="0.0 0.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>1.0 1.0</parameters>
-      </cos_theta>
-      <phi type="discrete">
-        <parameters>0.0 1.0</parameters>
-      </phi>
-    </space>
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>10 10 10</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <mesh id="2" library="libmesh" type="unstructured">
-    <filename>test_mesh_tets.e</filename>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="mesh">
-    <bins>2</bins>
-  </filter>
-  <tally id="1" name="regular mesh tally">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="2" name="unstructured mesh tally">
-    <filters>2</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space origin="0.0 0.0 0.0" type="spherical">
+        <r parameters="0.0 0.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>1.0 1.0</parameters>
+        </cos_theta>
+        <phi type="discrete">
+          <parameters>0.0 1.0</parameters>
+        </phi>
+      </space>
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 10 10</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <mesh id="2" library="libmesh" type="unstructured">
+      <filename>test_mesh_tets.e</filename>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
+    </filter>
+    <tally id="1" name="regular mesh tally">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="2" name="unstructured mesh tally">
+      <filters>2</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true4.dat b/tests/regression_tests/unstructured_mesh/inputs_true4.dat
index 995a1828f..7006c0f41 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true4.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true4.dat
@@ -1,92 +1,91 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="13" material="13" name="fuel" region="73 -74 75 -76 77 -78" universe="5" />
-  <cell id="14" material="14" name="clad" region="(-73 | 74 | -75 | 76 | -77 | 78) (79 -80 81 -82 83 -84)" universe="5" />
-  <cell id="15" material="15" name="water" region="(-79 | 80 | -81 | 82 | -83 | 84) (85 -86 87 -88 89 -90)" universe="5" />
-  <surface coeffs="-5.0" id="73" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="74" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="75" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="76" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="77" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="78" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="79" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="80" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="81" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="82" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="83" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="84" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-15" id="85" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="15" id="86" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-15" id="87" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="15" id="88" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-15" id="89" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="15" id="90" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="13" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="14" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="15" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space origin="0.0 0.0 0.0" type="spherical">
-      <r parameters="0.0 0.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>1.0 1.0</parameters>
-      </cos_theta>
-      <phi type="discrete">
-        <parameters>0.0 1.0</parameters>
-      </phi>
-    </space>
-    <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional" />
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="9">
-    <dimension>10 10 10</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <mesh id="10" library="moab" type="unstructured">
-    <filename>test_mesh_tets_w_holes.exo</filename>
-  </mesh>
-  <filter id="9" type="mesh">
-    <bins>9</bins>
-  </filter>
-  <filter id="10" type="mesh">
-    <bins>10</bins>
-  </filter>
-  <tally id="9" name="regular mesh tally">
-    <filters>9</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="10" name="unstructured mesh tally">
-    <filters>10</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="13" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="14" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="15" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="13" material="13" name="fuel" region="73 -74 75 -76 77 -78" universe="5" />
+    <cell id="14" material="14" name="clad" region="(-73 | 74 | -75 | 76 | -77 | 78) (79 -80 81 -82 83 -84)" universe="5" />
+    <cell id="15" material="15" name="water" region="(-79 | 80 | -81 | 82 | -83 | 84) (85 -86 87 -88 89 -90)" universe="5" />
+    <surface coeffs="-5.0" id="73" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="74" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="75" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="76" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="77" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="78" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="79" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="80" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="81" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="82" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="83" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="84" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-15" id="85" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="15" id="86" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-15" id="87" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="15" id="88" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-15" id="89" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="15" id="90" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space origin="0.0 0.0 0.0" type="spherical">
+        <r parameters="0.0 0.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>1.0 1.0</parameters>
+        </cos_theta>
+        <phi type="discrete">
+          <parameters>0.0 1.0</parameters>
+        </phi>
+      </space>
+      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional" />
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="9">
+      <dimension>10 10 10</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <mesh id="10" library="moab" type="unstructured">
+      <filename>test_mesh_tets_w_holes.exo</filename>
+    </mesh>
+    <filter id="9" type="mesh">
+      <bins>9</bins>
+    </filter>
+    <filter id="10" type="mesh">
+      <bins>10</bins>
+    </filter>
+    <tally id="9" name="regular mesh tally">
+      <filters>9</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="10" name="unstructured mesh tally">
+      <filters>10</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true5.dat b/tests/regression_tests/unstructured_mesh/inputs_true5.dat
index 60229e5e5..6c20900fa 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true5.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true5.dat
@@ -1,92 +1,91 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="16" material="16" name="fuel" region="91 -92 93 -94 95 -96" universe="6" />
-  <cell id="17" material="17" name="clad" region="(-91 | 92 | -93 | 94 | -95 | 96) (97 -98 99 -100 101 -102)" universe="6" />
-  <cell id="18" material="18" name="water" region="(-97 | 98 | -99 | 100 | -101 | 102) (103 -104 105 -106 107 -108)" universe="6" />
-  <surface coeffs="-5.0" id="91" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="92" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="93" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="94" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="95" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="96" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="97" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="98" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="99" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="100" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="101" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="102" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-15" id="103" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="15" id="104" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-15" id="105" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="15" id="106" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-15" id="107" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="15" id="108" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="16" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="17" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="18" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space origin="0.0 0.0 0.0" type="spherical">
-      <r parameters="0.0 0.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>1.0 1.0</parameters>
-      </cos_theta>
-      <phi type="discrete">
-        <parameters>0.0 1.0</parameters>
-      </phi>
-    </space>
-    <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional" />
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="11">
-    <dimension>10 10 10</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <mesh id="12" library="moab" type="unstructured">
-    <filename>test_mesh_tets.exo</filename>
-  </mesh>
-  <filter id="11" type="mesh">
-    <bins>11</bins>
-  </filter>
-  <filter id="12" type="mesh">
-    <bins>12</bins>
-  </filter>
-  <tally id="11" name="regular mesh tally">
-    <filters>11</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="12" name="unstructured mesh tally">
-    <filters>12</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="16" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="17" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="18" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="16" material="16" name="fuel" region="91 -92 93 -94 95 -96" universe="6" />
+    <cell id="17" material="17" name="clad" region="(-91 | 92 | -93 | 94 | -95 | 96) (97 -98 99 -100 101 -102)" universe="6" />
+    <cell id="18" material="18" name="water" region="(-97 | 98 | -99 | 100 | -101 | 102) (103 -104 105 -106 107 -108)" universe="6" />
+    <surface coeffs="-5.0" id="91" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="92" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="93" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="94" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="95" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="96" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="97" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="98" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="99" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="100" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="101" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="102" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-15" id="103" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="15" id="104" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-15" id="105" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="15" id="106" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-15" id="107" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="15" id="108" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space origin="0.0 0.0 0.0" type="spherical">
+        <r parameters="0.0 0.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>1.0 1.0</parameters>
+        </cos_theta>
+        <phi type="discrete">
+          <parameters>0.0 1.0</parameters>
+        </phi>
+      </space>
+      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional" />
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="11">
+      <dimension>10 10 10</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <mesh id="12" library="moab" type="unstructured">
+      <filename>test_mesh_tets.exo</filename>
+    </mesh>
+    <filter id="11" type="mesh">
+      <bins>11</bins>
+    </filter>
+    <filter id="12" type="mesh">
+      <bins>12</bins>
+    </filter>
+    <tally id="11" name="regular mesh tally">
+      <filters>11</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="12" name="unstructured mesh tally">
+      <filters>12</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true6.dat b/tests/regression_tests/unstructured_mesh/inputs_true6.dat
index 7a9257cb7..e0be90360 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true6.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true6.dat
@@ -1,92 +1,91 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="19" material="19" name="fuel" region="109 -110 111 -112 113 -114" universe="7" />
-  <cell id="20" material="20" name="clad" region="(-109 | 110 | -111 | 112 | -113 | 114) (115 -116 117 -118 119 -120)" universe="7" />
-  <cell id="21" material="21" name="water" region="(-115 | 116 | -117 | 118 | -119 | 120) (121 -122 123 -124 125 -126)" universe="7" />
-  <surface coeffs="-5.0" id="109" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="110" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="111" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="112" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="113" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="114" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="115" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="116" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="117" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="118" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="119" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="120" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-10" id="121" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="10" id="122" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-10" id="123" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="10" id="124" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-10" id="125" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="10" id="126" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="19" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="20" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="21" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space origin="0.0 0.0 0.0" type="spherical">
-      <r parameters="0.0 0.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>1.0 1.0</parameters>
-      </cos_theta>
-      <phi type="discrete">
-        <parameters>0.0 1.0</parameters>
-      </phi>
-    </space>
-    <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional" />
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="13">
-    <dimension>10 10 10</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <mesh id="14" library="moab" type="unstructured">
-    <filename>test_mesh_tets_w_holes.exo</filename>
-  </mesh>
-  <filter id="13" type="mesh">
-    <bins>13</bins>
-  </filter>
-  <filter id="14" type="mesh">
-    <bins>14</bins>
-  </filter>
-  <tally id="13" name="regular mesh tally">
-    <filters>13</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="14" name="unstructured mesh tally">
-    <filters>14</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="19" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="20" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="21" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="19" material="19" name="fuel" region="109 -110 111 -112 113 -114" universe="7" />
+    <cell id="20" material="20" name="clad" region="(-109 | 110 | -111 | 112 | -113 | 114) (115 -116 117 -118 119 -120)" universe="7" />
+    <cell id="21" material="21" name="water" region="(-115 | 116 | -117 | 118 | -119 | 120) (121 -122 123 -124 125 -126)" universe="7" />
+    <surface coeffs="-5.0" id="109" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="110" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="111" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="112" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="113" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="114" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="115" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="116" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="117" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="118" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="119" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="120" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-10" id="121" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="10" id="122" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10" id="123" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="10" id="124" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-10" id="125" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="10" id="126" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space origin="0.0 0.0 0.0" type="spherical">
+        <r parameters="0.0 0.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>1.0 1.0</parameters>
+        </cos_theta>
+        <phi type="discrete">
+          <parameters>0.0 1.0</parameters>
+        </phi>
+      </space>
+      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional" />
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="13">
+      <dimension>10 10 10</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <mesh id="14" library="moab" type="unstructured">
+      <filename>test_mesh_tets_w_holes.exo</filename>
+    </mesh>
+    <filter id="13" type="mesh">
+      <bins>13</bins>
+    </filter>
+    <filter id="14" type="mesh">
+      <bins>14</bins>
+    </filter>
+    <tally id="13" name="regular mesh tally">
+      <filters>13</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="14" name="unstructured mesh tally">
+      <filters>14</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true7.dat b/tests/regression_tests/unstructured_mesh/inputs_true7.dat
index 52802febf..3a4cc1b83 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true7.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true7.dat
@@ -1,92 +1,91 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="22" material="22" name="fuel" region="127 -128 129 -130 131 -132" universe="8" />
-  <cell id="23" material="23" name="clad" region="(-127 | 128 | -129 | 130 | -131 | 132) (133 -134 135 -136 137 -138)" universe="8" />
-  <cell id="24" material="24" name="water" region="(-133 | 134 | -135 | 136 | -137 | 138) (139 -140 141 -142 143 -144)" universe="8" />
-  <surface coeffs="-5.0" id="127" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="128" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="129" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="130" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="131" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="132" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="133" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="134" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="135" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="136" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="137" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="138" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-10" id="139" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="10" id="140" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-10" id="141" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="10" id="142" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-10" id="143" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="10" id="144" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="22" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="23" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="24" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>100</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space origin="0.0 0.0 0.0" type="spherical">
-      <r parameters="0.0 0.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>1.0 1.0</parameters>
-      </cos_theta>
-      <phi type="discrete">
-        <parameters>0.0 1.0</parameters>
-      </phi>
-    </space>
-    <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional" />
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="15">
-    <dimension>10 10 10</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <mesh id="16" library="moab" type="unstructured">
-    <filename>test_mesh_tets.exo</filename>
-  </mesh>
-  <filter id="15" type="mesh">
-    <bins>15</bins>
-  </filter>
-  <filter id="16" type="mesh">
-    <bins>16</bins>
-  </filter>
-  <tally id="15" name="regular mesh tally">
-    <filters>15</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-  <tally id="16" name="unstructured mesh tally">
-    <filters>16</filters>
-    <scores>flux</scores>
-    <estimator>tracklength</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="22" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="23" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="24" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="22" material="22" name="fuel" region="127 -128 129 -130 131 -132" universe="8" />
+    <cell id="23" material="23" name="clad" region="(-127 | 128 | -129 | 130 | -131 | 132) (133 -134 135 -136 137 -138)" universe="8" />
+    <cell id="24" material="24" name="water" region="(-133 | 134 | -135 | 136 | -137 | 138) (139 -140 141 -142 143 -144)" universe="8" />
+    <surface coeffs="-5.0" id="127" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="128" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="129" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="130" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="131" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="132" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="133" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="134" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="135" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="136" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="137" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="138" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-10" id="139" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="10" id="140" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10" id="141" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="10" id="142" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-10" id="143" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="10" id="144" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space origin="0.0 0.0 0.0" type="spherical">
+        <r parameters="0.0 0.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>1.0 1.0</parameters>
+        </cos_theta>
+        <phi type="discrete">
+          <parameters>0.0 1.0</parameters>
+        </phi>
+      </space>
+      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional" />
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="15">
+      <dimension>10 10 10</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <mesh id="16" library="moab" type="unstructured">
+      <filename>test_mesh_tets.exo</filename>
+    </mesh>
+    <filter id="15" type="mesh">
+      <bins>15</bins>
+    </filter>
+    <filter id="16" type="mesh">
+      <bins>16</bins>
+    </filter>
+    <tally id="15" name="regular mesh tally">
+      <filters>15</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="16" name="unstructured mesh tally">
+      <filters>16</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true8.dat b/tests/regression_tests/unstructured_mesh/inputs_true8.dat
index a0cbbcae7..bd19a95ae 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true8.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true8.dat
@@ -1,91 +1,90 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-  <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-  <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space origin="0.0 0.0 0.0" type="spherical">
-      <r parameters="0.0 0.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>1.0 1.0</parameters>
-      </cos_theta>
-      <phi type="discrete">
-        <parameters>0.0 1.0</parameters>
-      </phi>
-    </space>
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>10 10 10</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <mesh id="2" library="moab" type="unstructured">
-    <filename>test_mesh_tets_w_holes.e</filename>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="mesh">
-    <bins>2</bins>
-  </filter>
-  <tally id="1" name="regular mesh tally">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="2" name="unstructured mesh tally">
-    <filters>2</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space origin="0.0 0.0 0.0" type="spherical">
+        <r parameters="0.0 0.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>1.0 1.0</parameters>
+        </cos_theta>
+        <phi type="discrete">
+          <parameters>0.0 1.0</parameters>
+        </phi>
+      </space>
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 10 10</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <mesh id="2" library="moab" type="unstructured">
+      <filename>test_mesh_tets_w_holes.e</filename>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
+    </filter>
+    <tally id="1" name="regular mesh tally">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="2" name="unstructured mesh tally">
+      <filters>2</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true9.dat b/tests/regression_tests/unstructured_mesh/inputs_true9.dat
index 930bd8579..2e595a96c 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true9.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true9.dat
@@ -1,91 +1,90 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-  <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-  <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-  <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-  <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-  <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-  <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-  <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-  <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-  <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-  <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-  <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-  <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-  <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-  <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
-  <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
-  <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material depletable="true" id="1" name="fuel">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-  </material>
-  <material id="2" name="zircaloy">
-    <density units="g/cc" value="5.77" />
-    <nuclide ao="0.5145" name="Zr90" />
-    <nuclide ao="0.1122" name="Zr91" />
-    <nuclide ao="0.1715" name="Zr92" />
-    <nuclide ao="0.1738" name="Zr94" />
-    <nuclide ao="0.028" name="Zr96" />
-  </material>
-  <material id="3" name="water">
-    <density units="atom/b-cm" value="0.07416" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>10</batches>
-  <source strength="1.0">
-    <space origin="0.0 0.0 0.0" type="spherical">
-      <r parameters="0.0 0.0" type="uniform" />
-      <cos_theta type="discrete">
-        <parameters>1.0 1.0</parameters>
-      </cos_theta>
-      <phi type="discrete">
-        <parameters>0.0 1.0</parameters>
-      </phi>
-    </space>
-    <energy type="discrete">
-      <parameters>15000000.0 1.0</parameters>
-    </energy>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>10 10 10</dimension>
-    <lower_left>-10.0 -10.0 -10.0</lower_left>
-    <upper_right>10.0 10.0 10.0</upper_right>
-  </mesh>
-  <mesh id="2" library="moab" type="unstructured">
-    <filename>test_mesh_tets.e</filename>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="mesh">
-    <bins>2</bins>
-  </filter>
-  <tally id="1" name="regular mesh tally">
-    <filters>1</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-  <tally id="2" name="unstructured mesh tally">
-    <filters>2</filters>
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="fuel">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material id="2" name="zircaloy">
+      <density units="g/cc" value="5.77" />
+      <nuclide ao="0.5145" name="Zr90" />
+      <nuclide ao="0.1122" name="Zr91" />
+      <nuclide ao="0.1715" name="Zr92" />
+      <nuclide ao="0.1738" name="Zr94" />
+      <nuclide ao="0.028" name="Zr96" />
+    </material>
+    <material id="3" name="water">
+      <density units="atom/b-cm" value="0.07416" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
+    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <source strength="1.0">
+      <space origin="0.0 0.0 0.0" type="spherical">
+        <r parameters="0.0 0.0" type="uniform" />
+        <cos_theta type="discrete">
+          <parameters>1.0 1.0</parameters>
+        </cos_theta>
+        <phi type="discrete">
+          <parameters>0.0 1.0</parameters>
+        </phi>
+      </space>
+      <energy type="discrete">
+        <parameters>15000000.0 1.0</parameters>
+      </energy>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 10 10</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+    <mesh id="2" library="moab" type="unstructured">
+      <filename>test_mesh_tets.e</filename>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
+    </filter>
+    <tally id="1" name="regular mesh tally">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+    <tally id="2" name="unstructured mesh tally">
+      <filters>2</filters>
+      <scores>flux</scores>
+      <estimator>collision</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/void/inputs_true.dat b/tests/regression_tests/void/inputs_true.dat
index 644952097..443c168bd 100644
--- a/tests/regression_tests/void/inputs_true.dat
+++ b/tests/regression_tests/void/inputs_true.dat
@@ -1,132 +1,131 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <cell id="2" material="void" region="1 -2" universe="1" />
-  <cell id="3" material="1" region="2 -3" universe="1" />
-  <cell id="4" material="void" region="3 -4" universe="1" />
-  <cell id="5" material="1" region="4 -5" universe="1" />
-  <cell id="6" material="void" region="5 -6" universe="1" />
-  <cell id="7" material="1" region="6 -7" universe="1" />
-  <cell id="8" material="void" region="7 -8" universe="1" />
-  <cell id="9" material="1" region="8 -9" universe="1" />
-  <cell id="10" material="void" region="9 -10" universe="1" />
-  <cell id="11" material="1" region="10 -11" universe="1" />
-  <cell id="12" material="void" region="11 -12" universe="1" />
-  <cell id="13" material="1" region="12 -13" universe="1" />
-  <cell id="14" material="void" region="13 -14" universe="1" />
-  <cell id="15" material="1" region="14 -15" universe="1" />
-  <cell id="16" material="void" region="15 -16" universe="1" />
-  <cell id="17" material="1" region="16 -17" universe="1" />
-  <cell id="18" material="void" region="17 -18" universe="1" />
-  <cell id="19" material="1" region="18 -19" universe="1" />
-  <cell id="20" material="void" region="19 -20" universe="1" />
-  <cell id="21" material="1" region="20 -21" universe="1" />
-  <cell id="22" material="void" region="21 -22" universe="1" />
-  <cell id="23" material="1" region="22 -23" universe="1" />
-  <cell id="24" material="void" region="23 -24" universe="1" />
-  <cell id="25" material="1" region="24 -25" universe="1" />
-  <cell id="26" material="void" region="25 -26" universe="1" />
-  <cell id="27" material="1" region="26 -27" universe="1" />
-  <cell id="28" material="void" region="27 -28" universe="1" />
-  <cell id="29" material="1" region="28 -29" universe="1" />
-  <cell id="30" material="void" region="29 -30" universe="1" />
-  <cell id="31" material="1" region="30 -31" universe="1" />
-  <cell id="32" material="void" region="31 -32" universe="1" />
-  <cell id="33" material="1" region="32 -33" universe="1" />
-  <cell id="34" material="void" region="33 -34" universe="1" />
-  <cell id="35" material="1" region="34 -35" universe="1" />
-  <cell id="36" material="void" region="35 -36" universe="1" />
-  <cell id="37" material="1" region="36 -37" universe="1" />
-  <cell id="38" material="void" region="37 -38" universe="1" />
-  <cell id="39" material="1" region="38 -39" universe="1" />
-  <cell id="40" material="void" region="39 -40" universe="1" />
-  <cell id="41" material="1" region="40 -41" universe="1" />
-  <cell id="42" material="void" region="41 -42" universe="1" />
-  <cell id="43" material="1" region="42 -43" universe="1" />
-  <cell id="44" material="void" region="43 -44" universe="1" />
-  <cell id="45" material="1" region="44 -45" universe="1" />
-  <cell id="46" material="void" region="45 -46" universe="1" />
-  <cell id="47" material="1" region="46 -47" universe="1" />
-  <cell id="48" material="void" region="47 -48" universe="1" />
-  <cell id="49" material="1" region="48 -49" universe="1" />
-  <cell id="50" material="void" region="49 -50" universe="1" />
-  <cell id="51" material="1" region="50" universe="1" />
-  <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 3.020408163265306" id="2" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 5.040816326530612" id="3" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 7.061224489795918" id="4" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 9.081632653061224" id="5" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 11.102040816326529" id="6" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 13.122448979591836" id="7" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 15.142857142857142" id="8" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 17.163265306122447" id="9" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 19.183673469387752" id="10" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 21.204081632653057" id="11" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 23.224489795918366" id="12" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 25.24489795918367" id="13" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 27.265306122448976" id="14" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 29.285714285714285" id="15" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 31.30612244897959" id="16" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 33.326530612244895" id="17" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 35.3469387755102" id="18" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 37.367346938775505" id="19" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 39.38775510204081" id="20" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 41.408163265306115" id="21" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 43.42857142857142" id="22" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 45.44897959183673" id="23" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 47.469387755102034" id="24" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 49.48979591836734" id="25" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 51.51020408163265" id="26" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 53.53061224489795" id="27" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 55.55102040816326" id="28" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 57.57142857142857" id="29" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 59.59183673469387" id="30" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 61.61224489795918" id="31" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 63.63265306122448" id="32" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 65.65306122448979" id="33" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 67.67346938775509" id="34" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 69.6938775510204" id="35" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 71.71428571428571" id="36" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 73.73469387755101" id="37" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 75.75510204081633" id="38" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 77.77551020408163" id="39" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 79.79591836734693" id="40" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 81.81632653061223" id="41" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 83.83673469387755" id="42" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 85.85714285714285" id="43" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 87.87755102040815" id="44" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 89.89795918367346" id="45" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 91.91836734693877" id="46" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 93.93877551020407" id="47" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 95.95918367346938" id="48" type="sphere" />
-  <surface coeffs="0.0 0.0 0.0 97.97959183673468" id="49" type="sphere" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100.0" id="50" type="sphere" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material id="1">
-    <density units="g/cm3" value="7.14" />
-    <nuclide ao="1.0" name="Zn64" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>1000</particles>
-  <batches>3</batches>
-  <source strength="1.0">
-    <space type="point">
-      <parameters>0.0 0.0 0.0</parameters>
-    </space>
-  </source>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <filter id="1" type="cell">
-    <bins>1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51</bins>
-  </filter>
-  <tally id="1">
-    <filters>1</filters>
-    <scores>total</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material id="1">
+      <density units="g/cm3" value="7.14" />
+      <nuclide ao="1.0" name="Zn64" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <cell id="2" material="void" region="1 -2" universe="1" />
+    <cell id="3" material="1" region="2 -3" universe="1" />
+    <cell id="4" material="void" region="3 -4" universe="1" />
+    <cell id="5" material="1" region="4 -5" universe="1" />
+    <cell id="6" material="void" region="5 -6" universe="1" />
+    <cell id="7" material="1" region="6 -7" universe="1" />
+    <cell id="8" material="void" region="7 -8" universe="1" />
+    <cell id="9" material="1" region="8 -9" universe="1" />
+    <cell id="10" material="void" region="9 -10" universe="1" />
+    <cell id="11" material="1" region="10 -11" universe="1" />
+    <cell id="12" material="void" region="11 -12" universe="1" />
+    <cell id="13" material="1" region="12 -13" universe="1" />
+    <cell id="14" material="void" region="13 -14" universe="1" />
+    <cell id="15" material="1" region="14 -15" universe="1" />
+    <cell id="16" material="void" region="15 -16" universe="1" />
+    <cell id="17" material="1" region="16 -17" universe="1" />
+    <cell id="18" material="void" region="17 -18" universe="1" />
+    <cell id="19" material="1" region="18 -19" universe="1" />
+    <cell id="20" material="void" region="19 -20" universe="1" />
+    <cell id="21" material="1" region="20 -21" universe="1" />
+    <cell id="22" material="void" region="21 -22" universe="1" />
+    <cell id="23" material="1" region="22 -23" universe="1" />
+    <cell id="24" material="void" region="23 -24" universe="1" />
+    <cell id="25" material="1" region="24 -25" universe="1" />
+    <cell id="26" material="void" region="25 -26" universe="1" />
+    <cell id="27" material="1" region="26 -27" universe="1" />
+    <cell id="28" material="void" region="27 -28" universe="1" />
+    <cell id="29" material="1" region="28 -29" universe="1" />
+    <cell id="30" material="void" region="29 -30" universe="1" />
+    <cell id="31" material="1" region="30 -31" universe="1" />
+    <cell id="32" material="void" region="31 -32" universe="1" />
+    <cell id="33" material="1" region="32 -33" universe="1" />
+    <cell id="34" material="void" region="33 -34" universe="1" />
+    <cell id="35" material="1" region="34 -35" universe="1" />
+    <cell id="36" material="void" region="35 -36" universe="1" />
+    <cell id="37" material="1" region="36 -37" universe="1" />
+    <cell id="38" material="void" region="37 -38" universe="1" />
+    <cell id="39" material="1" region="38 -39" universe="1" />
+    <cell id="40" material="void" region="39 -40" universe="1" />
+    <cell id="41" material="1" region="40 -41" universe="1" />
+    <cell id="42" material="void" region="41 -42" universe="1" />
+    <cell id="43" material="1" region="42 -43" universe="1" />
+    <cell id="44" material="void" region="43 -44" universe="1" />
+    <cell id="45" material="1" region="44 -45" universe="1" />
+    <cell id="46" material="void" region="45 -46" universe="1" />
+    <cell id="47" material="1" region="46 -47" universe="1" />
+    <cell id="48" material="void" region="47 -48" universe="1" />
+    <cell id="49" material="1" region="48 -49" universe="1" />
+    <cell id="50" material="void" region="49 -50" universe="1" />
+    <cell id="51" material="1" region="50" universe="1" />
+    <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 3.020408163265306" id="2" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 5.040816326530612" id="3" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 7.061224489795918" id="4" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 9.081632653061224" id="5" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 11.102040816326529" id="6" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 13.122448979591836" id="7" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 15.142857142857142" id="8" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 17.163265306122447" id="9" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 19.183673469387752" id="10" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 21.204081632653057" id="11" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 23.224489795918366" id="12" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 25.24489795918367" id="13" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 27.265306122448976" id="14" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 29.285714285714285" id="15" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 31.30612244897959" id="16" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 33.326530612244895" id="17" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 35.3469387755102" id="18" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 37.367346938775505" id="19" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 39.38775510204081" id="20" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 41.408163265306115" id="21" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 43.42857142857142" id="22" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 45.44897959183673" id="23" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 47.469387755102034" id="24" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 49.48979591836734" id="25" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 51.51020408163265" id="26" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 53.53061224489795" id="27" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 55.55102040816326" id="28" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 57.57142857142857" id="29" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 59.59183673469387" id="30" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 61.61224489795918" id="31" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 63.63265306122448" id="32" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 65.65306122448979" id="33" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 67.67346938775509" id="34" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 69.6938775510204" id="35" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 71.71428571428571" id="36" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 73.73469387755101" id="37" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 75.75510204081633" id="38" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 77.77551020408163" id="39" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 79.79591836734693" id="40" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 81.81632653061223" id="41" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 83.83673469387755" id="42" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 85.85714285714285" id="43" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 87.87755102040815" id="44" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 89.89795918367346" id="45" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 91.91836734693877" id="46" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 93.93877551020407" id="47" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 95.95918367346938" id="48" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 97.97959183673468" id="49" type="sphere" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100.0" id="50" type="sphere" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>3</batches>
+    <source strength="1.0">
+      <space type="point">
+        <parameters>0.0 0.0 0.0</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <filter id="1" type="cell">
+      <bins>1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>total</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/volume_calc/inputs_true.dat b/tests/regression_tests/volume_calc/inputs_true.dat
index aaf6d8b00..879e05b8f 100644
--- a/tests/regression_tests/volume_calc/inputs_true.dat
+++ b/tests/regression_tests/volume_calc/inputs_true.dat
@@ -1,75 +1,75 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="2" region="-1 -3 5" universe="0" />
-  <cell id="2" material="1" region="-2 3" universe="0" />
-  <cell id="3" material="1" region="-4 -3" universe="0" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="z-cylinder" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 5.0 1.0" id="2" type="sphere" />
-  <surface coeffs="5.0" id="3" type="z-plane" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 -5.0 1.0" id="4" type="sphere" />
-  <surface coeffs="-5.0" id="5" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material id="1">
-    <density units="g/cc" value="1.0" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <nuclide ao="0.0001" name="B10" />
-    <sab name="c_H_in_H2O" />
-  </material>
-  <material depletable="true" id="2">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-    <nuclide ao="0.1" name="Mo99" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>volume</run_mode>
-  <volume_calc>
-    <domain_type>cell</domain_type>
-    <domain_ids>1 2 3</domain_ids>
-    <samples>100000</samples>
-    <lower_left>-1.0 -1.0 -6.0</lower_left>
-    <upper_right>1.0 1.0 6.0</upper_right>
-  </volume_calc>
-  <volume_calc>
-    <domain_type>material</domain_type>
-    <domain_ids>1 2</domain_ids>
-    <samples>100000</samples>
-    <lower_left>-1.0 -1.0 -6.0</lower_left>
-    <upper_right>1.0 1.0 6.0</upper_right>
-  </volume_calc>
-  <volume_calc>
-    <domain_type>universe</domain_type>
-    <domain_ids>0</domain_ids>
-    <samples>100000</samples>
-    <lower_left>-1.0 -1.0 -6.0</lower_left>
-    <upper_right>1.0 1.0 6.0</upper_right>
-  </volume_calc>
-  <volume_calc>
-    <domain_type>cell</domain_type>
-    <domain_ids>1 2 3</domain_ids>
-    <samples>100</samples>
-    <lower_left>-1.0 -1.0 -6.0</lower_left>
-    <upper_right>1.0 1.0 6.0</upper_right>
-    <threshold threshold="0.1" type="std_dev" />
-  </volume_calc>
-  <volume_calc>
-    <domain_type>material</domain_type>
-    <domain_ids>1 2</domain_ids>
-    <samples>100</samples>
-    <lower_left>-1.0 -1.0 -6.0</lower_left>
-    <upper_right>1.0 1.0 6.0</upper_right>
-    <threshold threshold="0.1" type="rel_err" />
-  </volume_calc>
-  <volume_calc>
-    <domain_type>cell</domain_type>
-    <domain_ids>1 2 3</domain_ids>
-    <samples>100</samples>
-    <lower_left>-1.0 -1.0 -6.0</lower_left>
-    <upper_right>1.0 1.0 6.0</upper_right>
-    <threshold threshold="0.05" type="variance" />
-  </volume_calc>
-</settings>
+<model>
+  <materials>
+    <material id="1">
+      <density units="g/cc" value="1.0" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <nuclide ao="0.0001" name="B10" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material depletable="true" id="2">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+      <nuclide ao="0.1" name="Mo99" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="2" region="-1 -3 5" universe="0" />
+    <cell id="2" material="1" region="-2 3" universe="0" />
+    <cell id="3" material="1" region="-4 -3" universe="0" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 5.0 1.0" id="2" type="sphere" />
+    <surface coeffs="5.0" id="3" type="z-plane" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 -5.0 1.0" id="4" type="sphere" />
+    <surface coeffs="-5.0" id="5" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>volume</run_mode>
+    <volume_calc>
+      <domain_type>cell</domain_type>
+      <domain_ids>1 2 3</domain_ids>
+      <samples>100000</samples>
+      <lower_left>-1.0 -1.0 -6.0</lower_left>
+      <upper_right>1.0 1.0 6.0</upper_right>
+    </volume_calc>
+    <volume_calc>
+      <domain_type>material</domain_type>
+      <domain_ids>1 2</domain_ids>
+      <samples>100000</samples>
+      <lower_left>-1.0 -1.0 -6.0</lower_left>
+      <upper_right>1.0 1.0 6.0</upper_right>
+    </volume_calc>
+    <volume_calc>
+      <domain_type>universe</domain_type>
+      <domain_ids>0</domain_ids>
+      <samples>100000</samples>
+      <lower_left>-1.0 -1.0 -6.0</lower_left>
+      <upper_right>1.0 1.0 6.0</upper_right>
+    </volume_calc>
+    <volume_calc>
+      <domain_type>cell</domain_type>
+      <domain_ids>1 2 3</domain_ids>
+      <samples>100</samples>
+      <lower_left>-1.0 -1.0 -6.0</lower_left>
+      <upper_right>1.0 1.0 6.0</upper_right>
+      <threshold threshold="0.1" type="std_dev" />
+    </volume_calc>
+    <volume_calc>
+      <domain_type>material</domain_type>
+      <domain_ids>1 2</domain_ids>
+      <samples>100</samples>
+      <lower_left>-1.0 -1.0 -6.0</lower_left>
+      <upper_right>1.0 1.0 6.0</upper_right>
+      <threshold threshold="0.1" type="rel_err" />
+    </volume_calc>
+    <volume_calc>
+      <domain_type>cell</domain_type>
+      <domain_ids>1 2 3</domain_ids>
+      <samples>100</samples>
+      <lower_left>-1.0 -1.0 -6.0</lower_left>
+      <upper_right>1.0 1.0 6.0</upper_right>
+      <threshold threshold="0.05" type="variance" />
+    </volume_calc>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/volume_calc/inputs_true_mg.dat b/tests/regression_tests/volume_calc/inputs_true_mg.dat
index 21c2a9834..f114bd8c2 100644
--- a/tests/regression_tests/volume_calc/inputs_true_mg.dat
+++ b/tests/regression_tests/volume_calc/inputs_true_mg.dat
@@ -1,76 +1,76 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="2" region="-1 -3 5" universe="0" />
-  <cell id="2" material="1" region="-2 3" universe="0" />
-  <cell id="3" material="1" region="-4 -3" universe="0" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="z-cylinder" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 5.0 1.0" id="2" type="sphere" />
-  <surface coeffs="5.0" id="3" type="z-plane" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 -5.0 1.0" id="4" type="sphere" />
-  <surface coeffs="-5.0" id="5" type="z-plane" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <cross_sections>mg_lib.h5</cross_sections>
-  <material id="1">
-    <density units="g/cc" value="1.0" />
-    <nuclide ao="2.0" name="H1" />
-    <nuclide ao="1.0" name="O16" />
-    <nuclide ao="0.0001" name="B10" />
-  </material>
-  <material depletable="true" id="2">
-    <density units="g/cc" value="4.5" />
-    <nuclide ao="1.0" name="U235" />
-    <nuclide ao="0.1" name="Mo99" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>volume</run_mode>
-  <energy_mode>multi-group</energy_mode>
-  <volume_calc>
-    <domain_type>cell</domain_type>
-    <domain_ids>1 2 3</domain_ids>
-    <samples>100000</samples>
-    <lower_left>-1.0 -1.0 -6.0</lower_left>
-    <upper_right>1.0 1.0 6.0</upper_right>
-  </volume_calc>
-  <volume_calc>
-    <domain_type>material</domain_type>
-    <domain_ids>1 2</domain_ids>
-    <samples>100000</samples>
-    <lower_left>-1.0 -1.0 -6.0</lower_left>
-    <upper_right>1.0 1.0 6.0</upper_right>
-  </volume_calc>
-  <volume_calc>
-    <domain_type>universe</domain_type>
-    <domain_ids>0</domain_ids>
-    <samples>100000</samples>
-    <lower_left>-1.0 -1.0 -6.0</lower_left>
-    <upper_right>1.0 1.0 6.0</upper_right>
-  </volume_calc>
-  <volume_calc>
-    <domain_type>cell</domain_type>
-    <domain_ids>1 2 3</domain_ids>
-    <samples>100</samples>
-    <lower_left>-1.0 -1.0 -6.0</lower_left>
-    <upper_right>1.0 1.0 6.0</upper_right>
-    <threshold threshold="0.1" type="std_dev" />
-  </volume_calc>
-  <volume_calc>
-    <domain_type>material</domain_type>
-    <domain_ids>1 2</domain_ids>
-    <samples>100</samples>
-    <lower_left>-1.0 -1.0 -6.0</lower_left>
-    <upper_right>1.0 1.0 6.0</upper_right>
-    <threshold threshold="0.1" type="rel_err" />
-  </volume_calc>
-  <volume_calc>
-    <domain_type>cell</domain_type>
-    <domain_ids>1 2 3</domain_ids>
-    <samples>100</samples>
-    <lower_left>-1.0 -1.0 -6.0</lower_left>
-    <upper_right>1.0 1.0 6.0</upper_right>
-    <threshold threshold="0.05" type="variance" />
-  </volume_calc>
-</settings>
+<model>
+  <materials>
+    <cross_sections>mg_lib.h5</cross_sections>
+    <material id="1">
+      <density units="g/cc" value="1.0" />
+      <nuclide ao="2.0" name="H1" />
+      <nuclide ao="1.0" name="O16" />
+      <nuclide ao="0.0001" name="B10" />
+    </material>
+    <material depletable="true" id="2">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+      <nuclide ao="0.1" name="Mo99" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="2" region="-1 -3 5" universe="0" />
+    <cell id="2" material="1" region="-2 3" universe="0" />
+    <cell id="3" material="1" region="-4 -3" universe="0" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 5.0 1.0" id="2" type="sphere" />
+    <surface coeffs="5.0" id="3" type="z-plane" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 -5.0 1.0" id="4" type="sphere" />
+    <surface coeffs="-5.0" id="5" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>volume</run_mode>
+    <energy_mode>multi-group</energy_mode>
+    <volume_calc>
+      <domain_type>cell</domain_type>
+      <domain_ids>1 2 3</domain_ids>
+      <samples>100000</samples>
+      <lower_left>-1.0 -1.0 -6.0</lower_left>
+      <upper_right>1.0 1.0 6.0</upper_right>
+    </volume_calc>
+    <volume_calc>
+      <domain_type>material</domain_type>
+      <domain_ids>1 2</domain_ids>
+      <samples>100000</samples>
+      <lower_left>-1.0 -1.0 -6.0</lower_left>
+      <upper_right>1.0 1.0 6.0</upper_right>
+    </volume_calc>
+    <volume_calc>
+      <domain_type>universe</domain_type>
+      <domain_ids>0</domain_ids>
+      <samples>100000</samples>
+      <lower_left>-1.0 -1.0 -6.0</lower_left>
+      <upper_right>1.0 1.0 6.0</upper_right>
+    </volume_calc>
+    <volume_calc>
+      <domain_type>cell</domain_type>
+      <domain_ids>1 2 3</domain_ids>
+      <samples>100</samples>
+      <lower_left>-1.0 -1.0 -6.0</lower_left>
+      <upper_right>1.0 1.0 6.0</upper_right>
+      <threshold threshold="0.1" type="std_dev" />
+    </volume_calc>
+    <volume_calc>
+      <domain_type>material</domain_type>
+      <domain_ids>1 2</domain_ids>
+      <samples>100</samples>
+      <lower_left>-1.0 -1.0 -6.0</lower_left>
+      <upper_right>1.0 1.0 6.0</upper_right>
+      <threshold threshold="0.1" type="rel_err" />
+    </volume_calc>
+    <volume_calc>
+      <domain_type>cell</domain_type>
+      <domain_ids>1 2 3</domain_ids>
+      <samples>100</samples>
+      <lower_left>-1.0 -1.0 -6.0</lower_left>
+      <upper_right>1.0 1.0 6.0</upper_right>
+      <threshold threshold="0.05" type="variance" />
+    </volume_calc>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/volume_calc/test.py b/tests/regression_tests/volume_calc/test.py
index e04eac7ff..c94d16c79 100644
--- a/tests/regression_tests/volume_calc/test.py
+++ b/tests/regression_tests/volume_calc/test.py
@@ -21,7 +21,6 @@ class VolumeTest(PyAPITestHarness):
         if not is_ce:
             self.inputs_true = 'inputs_true_mg.dat'
 
-    def _build_inputs(self):
         # Define materials
         water = openmc.Material(1)
         water.add_nuclide('H1', 2.0)
@@ -39,7 +38,7 @@ class VolumeTest(PyAPITestHarness):
         materials = openmc.Materials((water, fuel))
         if not self.is_ce:
             materials.cross_sections = 'mg_lib.h5'
-        materials.export_to_xml()
+        self._model.materials = materials
 
         cyl = openmc.ZCylinder(surface_id=1, r=1.0, boundary_type='vacuum')
         top_sphere = openmc.Sphere(surface_id=2, z0=5., r=1., boundary_type='vacuum')
@@ -53,8 +52,7 @@ class VolumeTest(PyAPITestHarness):
         bottom_hemisphere = openmc.Cell(3, fill=water, region=-bottom_sphere & -top_plane)
         root = openmc.Universe(0, cells=(inside_cyl, top_hemisphere, bottom_hemisphere))
 
-        geometry = openmc.Geometry(root)
-        geometry.export_to_xml()
+        self._model.geometry = openmc.Geometry(root)
 
         # Set up stochastic volume calculation
         ll, ur = root.bounding_box
@@ -79,7 +77,7 @@ class VolumeTest(PyAPITestHarness):
         if not self.is_ce:
             settings.energy_mode = 'multi-group'
         settings.volume_calculations = vol_calcs
-        settings.export_to_xml()
+        self._model.settings = settings
 
         # Create the MGXS file if necessary
         if not self.is_ce:
@@ -170,5 +168,5 @@ class VolumeTest(PyAPITestHarness):
 
 @pytest.mark.parametrize('is_ce', [True, False])
 def test_volume_calc(is_ce):
-    harness = VolumeTest(is_ce, '')
+    harness = VolumeTest(is_ce, '', model=openmc.Model())
     harness.main()
diff --git a/tests/regression_tests/weightwindows/inputs_true.dat b/tests/regression_tests/weightwindows/inputs_true.dat
index eb42baddf..16f03a4a0 100644
--- a/tests/regression_tests/weightwindows/inputs_true.dat
+++ b/tests/regression_tests/weightwindows/inputs_true.dat
@@ -1,96 +1,95 @@
 <?xml version='1.0' encoding='utf-8'?>
-<geometry>
-  <cell id="1" material="1" region="-1" universe="1" />
-  <cell id="2" material="void" region="1 -2" universe="1" />
-  <surface coeffs="0.0 0.0 0.0 240" id="1" type="sphere" />
-  <surface boundary="vacuum" coeffs="0.0 0.0 0.0 250" id="2" type="sphere" />
-</geometry>
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-  <material id="1">
-    <density units="g/cc" value="2.3" />
-    <nuclide ao="0.168018676" name="H1" />
-    <nuclide ao="1.93244e-05" name="H2" />
-    <nuclide ao="0.561814465" name="O16" />
-    <nuclide ao="0.00021401" name="O17" />
-    <nuclide ao="0.021365" name="Na23" />
-    <nuclide ao="0.021343" name="Al27" />
-    <nuclide ao="0.187439342" name="Si28" />
-    <nuclide ao="0.009517714" name="Si29" />
-    <nuclide ao="0.006273944" name="Si30" />
-    <nuclide ao="0.018026179" name="Ca40" />
-    <nuclide ao="0.00012031" name="Ca42" />
-    <nuclide ao="2.51033e-05" name="Ca43" />
-    <nuclide ao="0.000387892" name="Ca44" />
-    <nuclide ao="7.438e-07" name="Ca46" />
-    <nuclide ao="3.47727e-05" name="Ca48" />
-    <nuclide ao="0.000248179" name="Fe54" />
-    <nuclide ao="0.003895875" name="Fe56" />
-    <nuclide ao="8.99727e-05" name="Fe57" />
-    <nuclide ao="1.19737e-05" name="Fe58" />
-  </material>
-</materials>
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>fixed source</run_mode>
-  <particles>200</particles>
-  <batches>2</batches>
-  <source strength="1.0">
-    <space type="point">
-      <parameters>0.001 0.001 0.001</parameters>
-    </space>
-    <energy type="discrete">
-      <parameters>14000000.0 1.0</parameters>
-    </energy>
-  </source>
-  <photon_transport>true</photon_transport>
-  <weight_windows id="1">
-    <mesh>2</mesh>
-    <particle_type>neutron</particle_type>
-    <energy_bounds>0.0 0.5 20000000.0</energy_bounds>
-    <lower_ww_bounds>-1.0 0.007673145137236567 6.542700644645627e-07 0.0017541380096893788 0.0007245451610090619 7.476545089278482e-06 2.253382683081525e-06 2.1040609012865134e-05 0.08285899874014539 -1.0 1.0262431550731535e-13 3.3164825349503764e-16 0.0064803314120165335 3.5981031766416143e-06 -1.0 1.6205064883026195e-11 1.7770136411255912e-05 0.0001670700632870335 4.323138781337963e-05 -1.0 -1.0 6.922231352729155e-05 0.06550426960512012 -1.0 2.5639656866250453e-06 1.4508262073256659e-13 -1.0 -1.0 0.0009127050763987511 3.8523247550378815e-12 -1.0 0.0008175033526488423 -1.0 0.015148978428271613 2.5157355790201773e-07 2.1612150425221703e-06 1.3181562352445092e-10 2.9282097947816224e-05 2.762955748645507e-05 2.936268747135548e-14 1.6859219614058024e-19 3.937160538176268e-07 2.6011787393916806e-06 0.001570829313580841 -1.0 1.7041669224797384e-09 1.6421491993751715e-11 0.4899999304038166 6.948292975998466e-07 -1.0 -1.0 0.08657573566388353 0.006639379668946672 1.681305446488884e-11 2.2487617828938326e-05 4.109066205029878e-05 0.08288806458368345 -1.0 0.007385384405891666 -1.0 -1.0 1.008394964750947e-06 6.655926357459275e-08 0.0016279794552427574 1.4825219199133353e-12 -1.0 1.93847081892941e-05 1.284759166582202e-05 5.1161740516205715e-05 2.5447281241730366e-07 3.853097455417877e-06 -1.0 8.887234042637684e-05 0.01621821782442112 -1.0 1.8747824667478637e-14 5.97653814110781e-06 -1.0 -1.0 1.2296747260635405e-06 -1.0 -1.0 7.754700849337902e-06 7.091263906557291e-05 3.2799045883372075e-06 0.00020573181450240786 5.6949597066784976e-05 1.271128669411295e-07 0.0010019432401508087 -1.0 -1.0 6.848642863465585e-07 5.783974359937857e-06 2.380955631371226e-06 4.756872959630257e-05 2.1360401784344975e-18 0.00046029617115127556 1.0092905083158804e-11 0.08095280568305474 3.89841667138598e-08 4.354946981329799e-05 -1.0 0.5 0.0015447823995470042 -1.0 -1.0 0.001959411999677113 0.48573842213878143 -1.0 7.962899789920809e-06 5.619835883512353e-14 0.0835648710074336 2.7207433165796702e-11 0.00027464244062887683 4.076762579823379e-17 2.124999182004655e-05 8.037131813528501e-07 8.846493399850663e-06 1.080711295768551e-05 -1.0 -1.0 0.0010737081832502356 2.679340942769232e-06 2.1648918040467363e-05 0.0002668579837809081 1.3455341306162382e-05 2.5629068330446215e-05 1.3228013765525015e-05 -1.0 -1.0 7.002861620919232e-08 1.5172912057312398e-14 -1.0 7.989579285134734e-06 2.639268952045579e-10 -1.0 0.013330619853379314 0.00021534568699157805 2.4469456008493614e-09 8.211982683649991e-09 1.951356547084204e-15 0.00016419031150495913 5.985108617124989e-06 1.28584557092134e-05 1.5476769237571295e-14 5.5379154134462336e-08 0.0016637126543321873 2.499931357628383e-07 8.020767115181574e-07 2.7697233171399416e-13 -1.0 0.007197662162700777 -1.0 0.0833931797381589 2.8226276944532696e-05 3.353295403842037e-05 5.504813693036933e-12 0.007136750029575816 0.08636569925236791 -1.0 -1.0 6.315154082213375e-07 0.4877856021170283 -1.0 3.7051518220083886e-06 -1.0 0.0017950613169359904 7.84289689494925e-06 9.041149893307806e-07 -1.0 8.48176145671274e-10 9.03108551826469e-05 3.634644995026692e-05 2.0295213621716706e-09 1.0305672698745657e-11 1.5550455959178486e-06 0.01664109232689093 8.533030345699353e-17 0.0009252532821720597 -1.0 7.695031155172816e-14 0.0007151459162818186 -1.0 -1.0 5.182269672663266e-10 3.0160758454323657e-07 -1.0 0.06539005235506369 3.452537179033895e-05 -1.0 -1.0 3.855884234344845e-06 0.00017699858357744463 2.594951085377588e-06 1.1333627604823673e-09 -1.0 2.4306375693722205e-06 0.0063790654507599135 2.2060992580622125e-11 -1.0 -1.0 0.0848872967381878 3.932389299316285e-06 1.2911827198500372e-08 1.957092814065688e-05 0.0007213722022489493 0.0018327593437608 1.6699254277734109e-06 0.007188410694198128 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0</lower_ww_bounds>
-    <upper_ww_bounds>-10.0 0.07673145137236567 6.5427006446456266e-06 0.017541380096893787 0.0072454516100906195 7.476545089278483e-05 2.253382683081525e-05 0.00021040609012865135 0.828589987401454 -10.0 1.0262431550731535e-12 3.3164825349503764e-15 0.06480331412016534 3.5981031766416144e-05 -10.0 1.6205064883026195e-10 0.0001777013641125591 0.001670700632870335 0.0004323138781337963 -10.0 -10.0 0.0006922231352729155 0.6550426960512012 -10.0 2.5639656866250452e-05 1.4508262073256658e-12 -10.0 -10.0 0.009127050763987512 3.852324755037882e-11 -10.0 0.008175033526488424 -10.0 0.15148978428271614 2.515735579020177e-06 2.1612150425221703e-05 1.3181562352445092e-09 0.00029282097947816227 0.0002762955748645507 2.9362687471355483e-13 1.6859219614058023e-18 3.937160538176268e-06 2.6011787393916804e-05 0.015708293135808408 -10.0 1.7041669224797384e-08 1.6421491993751715e-10 4.899999304038166 6.948292975998466e-06 -10.0 -10.0 0.8657573566388354 0.06639379668946672 1.681305446488884e-10 0.00022487617828938325 0.0004109066205029878 0.8288806458368345 -10.0 0.07385384405891665 -10.0 -10.0 1.0083949647509469e-05 6.655926357459275e-07 0.016279794552427576 1.4825219199133352e-11 -10.0 0.000193847081892941 0.0001284759166582202 0.0005116174051620571 2.5447281241730365e-06 3.853097455417877e-05 -10.0 0.0008887234042637684 0.16218217824421122 -10.0 1.8747824667478637e-13 5.97653814110781e-05 -10.0 -10.0 1.2296747260635405e-05 -10.0 -10.0 7.754700849337902e-05 0.0007091263906557291 3.2799045883372076e-05 0.0020573181450240785 0.0005694959706678497 1.271128669411295e-06 0.010019432401508087 -10.0 -10.0 6.848642863465585e-06 5.7839743599378564e-05 2.380955631371226e-05 0.0004756872959630257 2.1360401784344976e-17 0.004602961711512756 1.0092905083158804e-10 0.8095280568305474 3.89841667138598e-07 0.00043549469813297995 -10.0 5.0 0.015447823995470043 -10.0 -10.0 0.01959411999677113 4.8573842213878144 -10.0 7.96289978992081e-05 5.619835883512353e-13 0.8356487100743359 2.7207433165796704e-10 0.002746424406288768 4.076762579823379e-16 0.00021249991820046548 8.037131813528501e-06 8.846493399850663e-05 0.0001080711295768551 -10.0 -10.0 0.010737081832502356 2.679340942769232e-05 0.00021648918040467362 0.0026685798378090807 0.00013455341306162382 0.00025629068330446217 0.00013228013765525016 -10.0 -10.0 7.002861620919232e-07 1.51729120573124e-13 -10.0 7.989579285134734e-05 2.639268952045579e-09 -10.0 0.13330619853379314 0.0021534568699157807 2.4469456008493615e-08 8.211982683649991e-08 1.951356547084204e-14 0.0016419031150495913 5.985108617124989e-05 0.000128584557092134 1.5476769237571296e-13 5.537915413446234e-07 0.016637126543321872 2.499931357628383e-06 8.020767115181574e-06 2.7697233171399415e-12 -10.0 0.07197662162700777 -10.0 0.8339317973815891 0.000282262769445327 0.00033532954038420373 5.504813693036933e-11 0.07136750029575815 0.8636569925236791 -10.0 -10.0 6.3151540822133754e-06 4.877856021170283 -10.0 3.7051518220083885e-05 -10.0 0.017950613169359905 7.84289689494925e-05 9.041149893307805e-06 -10.0 8.48176145671274e-09 0.000903108551826469 0.0003634644995026692 2.0295213621716707e-08 1.0305672698745658e-10 1.5550455959178486e-05 0.1664109232689093 8.533030345699353e-16 0.009252532821720597 -10.0 7.695031155172816e-13 0.007151459162818186 -10.0 -10.0 5.182269672663266e-09 3.0160758454323656e-06 -10.0 0.6539005235506369 0.0003452537179033895 -10.0 -10.0 3.855884234344845e-05 0.0017699858357744464 2.594951085377588e-05 1.1333627604823672e-08 -10.0 2.4306375693722206e-05 0.06379065450759913 2.2060992580622125e-10 -10.0 -10.0 0.848872967381878 3.9323892993162844e-05 1.2911827198500372e-07 0.0001957092814065688 0.0072137220224894934 0.018327593437608 1.669925427773411e-05 0.07188410694198127 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0</upper_ww_bounds>
-    <survival_ratio>3</survival_ratio>
-    <max_lower_bound_ratio>1.5</max_lower_bound_ratio>
-    <max_split>10</max_split>
-    <weight_cutoff>1e-38</weight_cutoff>
-  </weight_windows>
-  <mesh id="2">
-    <dimension>5 6 7</dimension>
-    <lower_left>-240 -240 -240</lower_left>
-    <upper_right>240 240 240</upper_right>
-  </mesh>
-  <weight_windows id="2">
-    <mesh>2</mesh>
-    <particle_type>neutron</particle_type>
-    <energy_bounds>0.0 0.5 20000000.0</energy_bounds>
-    <lower_ww_bounds>-1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 0.06827568359008944 0.00017329528628152923 0.018541112907970003 0.011113024641218336 8.76041935303527e-05 8.168081568291806e-05 0.00046693784586018913 0.4952432605379829 2.2512327083641865e-10 4.6258592060517866e-07 2.7044817176109556e-05 0.054902816619122045 0.00014126153603265097 8.304845400451923e-08 2.2950716170641463e-05 0.0001335621430311088 0.003432919201293737 0.0005197081842709918 5.726152701849347e-16 -1.0 0.0013332554437480327 0.4346984808472855 7.691527781829036e-17 0.00011042047857307253 3.0571050855707084e-06 -1.0 4.986698316296507e-06 0.011128424196387618 1.3106335518133802e-05 5.447493368067179e-10 0.011440381012864086 4.670673837764874e-08 0.12364069326350118 0.00012558879474108074 3.136829920007009e-05 2.34750482787598e-05 0.001537590300149361 0.0017693279949094218 6.717625881826167e-05 4.587143797469485e-08 2.6211239246796104e-05 0.00030002326388383244 0.01729816946709781 4.5757238372058234e-11 6.92296299242814e-05 3.792209399652396e-06 -1.0 9.256616392487858e-05 8.541606727879512e-07 -1.0 0.49317081643076643 0.05500108683629957 1.298062961617927e-05 0.0006870228272606287 0.0008231482263927564 0.5 3.419181071650816e-06 0.06433819434431046 6.574706543646946e-16 4.0404626147344e-13 0.0003782322077390033 0.00012637534695610975 0.017602971074583987 1.0044390728858277e-05 -1.0 0.0008787411098754915 0.00023686818807101741 0.0009304497896205121 6.949587369646497e-05 0.00012918433677593975 2.0707648529746894e-06 0.0023295401596005313 0.11819165666519223 -1.0 2.1606550732170693e-05 0.00022057970761624768 -1.0 1.0325207105027347e-08 0.0002029396545382813 2.1234980618763222e-13 -1.0 0.00024175998138228048 0.001178616843705956 0.0001399807456616496 0.0038811025614225057 0.0011076796092102186 0.00010814452764860558 0.010955637485319249 -1.0 9.382800796426366e-17 5.098747893974248e-05 0.00027052054298385255 0.00021305826462238593 0.000808100901275472 4.233410073487772e-06 0.0051513292132259495 8.616027294555462e-07 0.4873897581604287 2.9093345975075226e-05 0.000469589568463265 -1.0 -1.0 0.017802624844035688 1.3116807133030035e-15 2.617878055106949e-16 0.01884234453311008 -1.0 2.027381220364608e-16 0.0004299195570308035 1.4628847959717225e-05 0.4899952354672477 2.774067049392004e-07 0.004441328419270369 4.279460329782799e-09 0.0012297303081805393 0.0002792896409558745 0.0006934466049804711 8.370896020975689e-05 3.8270536025799805e-15 -1.0 0.01208261392046878 0.0001497958445994315 0.0015016500045374082 0.005384625561469684 0.00025519632243117644 0.0011028020390507682 0.0002362355168421952 -1.0 -1.0 8.862760180332873e-05 1.3806577785135177e-06 -1.0 0.0001319677450153934 2.6866894852481906e-05 -1.0 0.11510120013926417 0.002672923773363389 1.2257360246712472e-05 8.544159282151438e-05 2.777791741571174e-05 0.0014957033281168012 0.0003257646134837451 0.0008919466185572302 1.2907171695294846e-13 4.6842350882367666e-05 0.01721806295736377 0.00025106741008066317 0.00022234471595443313 2.101790478097517e-09 5.752120832330886e-11 0.06428782790571179 3.2478301680021854e-08 0.4903495510314233 0.001146714816952061 0.0004777967757842694 1.0882011018684852e-06 0.05708498338352203 0.4981497862127628 -1.0 3.2790914744011534e-06 0.00010077009726691265 -1.0 2.210707325798542e-07 4.3166052799897375e-05 -1.0 0.01825795827020865 0.0003182108781955478 3.8561696337086434e-05 1.0995322456277382e-06 9.53380658669839e-06 0.001550036616828061 0.0012648333883989995 5.272021975060514e-06 1.9257248009114363e-05 0.00016757997590048827 0.11891251244906934 5.515522196186723e-06 0.01102706140784316 9.904481358675478e-13 3.520674728719278e-05 0.011294708566804167 7.239087311622819e-08 -1.0 3.5740607788414942e-06 0.00035983547999740665 1.0588257623722672e-07 0.42372713683725016 0.0011273340972061078 8.582011716859219e-15 1.1514579117272292e-10 0.00043130977711323417 0.0027847329307350423 0.00017287873387910357 6.401055165502384e-06 1.722191123879782e-08 0.00020848309220162036 0.05639071613735579 1.8064550990294753e-05 1.289814511028015e-06 1.078687446476881e-14 0.4897735047310072 0.0002981891705231209 0.00016079768514218546 9.332371598523186e-05 0.011724714376848187 0.019040707071165303 0.00014242053195529864 0.06684484191345574 -1.0</lower_ww_bounds>
-    <upper_ww_bounds>-10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 0.6827568359008944 0.0017329528628152924 0.18541112907970003 0.11113024641218336 0.0008760419353035269 0.0008168081568291806 0.004669378458601891 4.952432605379829 2.2512327083641864e-09 4.625859206051786e-06 0.00027044817176109554 0.5490281661912204 0.0014126153603265096 8.304845400451923e-07 0.00022950716170641464 0.001335621430311088 0.03432919201293737 0.0051970818427099184 5.726152701849347e-15 -10.0 0.013332554437480326 4.346984808472855 7.6915277818290365e-16 0.0011042047857307254 3.0571050855707086e-05 -10.0 4.986698316296507e-05 0.11128424196387618 0.000131063355181338 5.447493368067179e-09 0.11440381012864086 4.670673837764874e-07 1.2364069326350118 0.0012558879474108074 0.0003136829920007009 0.000234750482787598 0.01537590300149361 0.01769327994909422 0.0006717625881826168 4.587143797469485e-07 0.000262112392467961 0.0030002326388383245 0.1729816946709781 4.5757238372058235e-10 0.0006922962992428139 3.792209399652396e-05 -10.0 0.0009256616392487858 8.541606727879512e-06 -10.0 4.931708164307665 0.5500108683629957 0.00012980629616179268 0.006870228272606287 0.008231482263927564 5.0 3.419181071650816e-05 0.6433819434431045 6.574706543646946e-15 4.0404626147344005e-12 0.003782322077390033 0.0012637534695610975 0.17602971074583987 0.00010044390728858278 -10.0 0.008787411098754914 0.002368681880710174 0.00930449789620512 0.0006949587369646498 0.0012918433677593976 2.0707648529746893e-05 0.023295401596005315 1.1819165666519222 -10.0 0.00021606550732170693 0.0022057970761624767 -10.0 1.0325207105027347e-07 0.0020293965453828133 2.123498061876322e-12 -10.0 0.0024175998138228046 0.01178616843705956 0.0013998074566164962 0.03881102561422506 0.011076796092102187 0.0010814452764860557 0.10955637485319249 -10.0 9.382800796426367e-16 0.0005098747893974248 0.0027052054298385255 0.0021305826462238594 0.00808100901275472 4.233410073487772e-05 0.0515132921322595 8.61602729455546e-06 4.873897581604287 0.0002909334597507523 0.0046958956846326495 -10.0 -10.0 0.1780262484403569 1.3116807133030034e-14 2.6178780551069492e-15 0.1884234453311008 -10.0 2.027381220364608e-15 0.004299195570308035 0.00014628847959717226 4.899952354672477 2.774067049392004e-06 0.04441328419270369 4.279460329782799e-08 0.012297303081805393 0.002792896409558745 0.006934466049804711 0.0008370896020975689 3.8270536025799805e-14 -10.0 0.1208261392046878 0.001497958445994315 0.015016500045374082 0.05384625561469684 0.0025519632243117644 0.011028020390507681 0.002362355168421952 -10.0 -10.0 0.0008862760180332873 1.3806577785135176e-05 -10.0 0.001319677450153934 0.00026866894852481903 -10.0 1.1510120013926417 0.026729237733633893 0.00012257360246712473 0.0008544159282151438 0.0002777791741571174 0.014957033281168012 0.0032576461348374514 0.008919466185572301 1.2907171695294846e-12 0.00046842350882367664 0.17218062957363772 0.0025106741008066318 0.0022234471595443312 2.101790478097517e-08 5.752120832330886e-10 0.6428782790571179 3.2478301680021856e-07 4.903495510314233 0.01146714816952061 0.004777967757842694 1.0882011018684853e-05 0.5708498338352204 4.981497862127628 -10.0 3.279091474401153e-05 0.0010077009726691265 -10.0 2.210707325798542e-06 0.00043166052799897375 -10.0 0.1825795827020865 0.0031821087819554777 0.00038561696337086434 1.0995322456277382e-05 9.53380658669839e-05 0.01550036616828061 0.012648333883989995 5.272021975060514e-05 0.00019257248009114364 0.0016757997590048828 1.1891251244906933 5.515522196186723e-05 0.1102706140784316 9.904481358675478e-12 0.0003520674728719278 0.11294708566804167 7.239087311622819e-07 -10.0 3.574060778841494e-05 0.0035983547999740664 1.0588257623722672e-06 4.237271368372502 0.011273340972061077 8.582011716859219e-14 1.151457911727229e-09 0.004313097771132342 0.027847329307350423 0.0017287873387910357 6.401055165502385e-05 1.722191123879782e-07 0.0020848309220162036 0.5639071613735579 0.00018064550990294753 1.289814511028015e-05 1.078687446476881e-13 4.897735047310072 0.002981891705231209 0.0016079768514218546 0.0009332371598523186 0.11724714376848187 0.19040707071165303 0.0014242053195529865 0.6684484191345574 -10.0</upper_ww_bounds>
-    <survival_ratio>3</survival_ratio>
-    <max_lower_bound_ratio>1.5</max_lower_bound_ratio>
-    <max_split>10</max_split>
-    <weight_cutoff>1e-38</weight_cutoff>
-  </weight_windows>
-  <max_splits>200</max_splits>
-</settings>
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-  <mesh id="1">
-    <dimension>5 10 15</dimension>
-    <lower_left>-240 -240 -240</lower_left>
-    <upper_right>240 240 240</upper_right>
-  </mesh>
-  <filter id="1" type="mesh">
-    <bins>1</bins>
-  </filter>
-  <filter id="2" type="energy">
-    <bins>0.0 0.5 20000000.0</bins>
-  </filter>
-  <filter id="3" type="particle">
-    <bins>neutron photon</bins>
-  </filter>
-  <tally id="1">
-    <filters>1 2 3</filters>
-    <scores>flux</scores>
-  </tally>
-</tallies>
+<model>
+  <materials>
+    <material id="1">
+      <density units="g/cc" value="2.3" />
+      <nuclide ao="0.168018676" name="H1" />
+      <nuclide ao="1.93244e-05" name="H2" />
+      <nuclide ao="0.561814465" name="O16" />
+      <nuclide ao="0.00021401" name="O17" />
+      <nuclide ao="0.021365" name="Na23" />
+      <nuclide ao="0.021343" name="Al27" />
+      <nuclide ao="0.187439342" name="Si28" />
+      <nuclide ao="0.009517714" name="Si29" />
+      <nuclide ao="0.006273944" name="Si30" />
+      <nuclide ao="0.018026179" name="Ca40" />
+      <nuclide ao="0.00012031" name="Ca42" />
+      <nuclide ao="2.51033e-05" name="Ca43" />
+      <nuclide ao="0.000387892" name="Ca44" />
+      <nuclide ao="7.438e-07" name="Ca46" />
+      <nuclide ao="3.47727e-05" name="Ca48" />
+      <nuclide ao="0.000248179" name="Fe54" />
+      <nuclide ao="0.003895875" name="Fe56" />
+      <nuclide ao="8.99727e-05" name="Fe57" />
+      <nuclide ao="1.19737e-05" name="Fe58" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1" />
+    <cell id="2" material="void" region="1 -2" universe="1" />
+    <surface coeffs="0.0 0.0 0.0 240" id="1" type="sphere" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 250" id="2" type="sphere" />
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>200</particles>
+    <batches>2</batches>
+    <source strength="1.0">
+      <space type="point">
+        <parameters>0.001 0.001 0.001</parameters>
+      </space>
+      <energy type="discrete">
+        <parameters>14000000.0 1.0</parameters>
+      </energy>
+    </source>
+    <photon_transport>true</photon_transport>
+    <weight_windows id="1">
+      <mesh>2</mesh>
+      <particle_type>neutron</particle_type>
+      <energy_bounds>0.0 0.5 20000000.0</energy_bounds>
+      <lower_ww_bounds>-1.0 0.007673145137236567 6.542700644645627e-07 0.0017541380096893788 0.0007245451610090619 7.476545089278482e-06 2.253382683081525e-06 2.1040609012865134e-05 0.08285899874014539 -1.0 1.0262431550731535e-13 3.3164825349503764e-16 0.0064803314120165335 3.5981031766416143e-06 -1.0 1.6205064883026195e-11 1.7770136411255912e-05 0.0001670700632870335 4.323138781337963e-05 -1.0 -1.0 6.922231352729155e-05 0.06550426960512012 -1.0 2.5639656866250453e-06 1.4508262073256659e-13 -1.0 -1.0 0.0009127050763987511 3.8523247550378815e-12 -1.0 0.0008175033526488423 -1.0 0.015148978428271613 2.5157355790201773e-07 2.1612150425221703e-06 1.3181562352445092e-10 2.9282097947816224e-05 2.762955748645507e-05 2.936268747135548e-14 1.6859219614058024e-19 3.937160538176268e-07 2.6011787393916806e-06 0.001570829313580841 -1.0 1.7041669224797384e-09 1.6421491993751715e-11 0.4899999304038166 6.948292975998466e-07 -1.0 -1.0 0.08657573566388353 0.006639379668946672 1.681305446488884e-11 2.2487617828938326e-05 4.109066205029878e-05 0.08288806458368345 -1.0 0.007385384405891666 -1.0 -1.0 1.008394964750947e-06 6.655926357459275e-08 0.0016279794552427574 1.4825219199133353e-12 -1.0 1.93847081892941e-05 1.284759166582202e-05 5.1161740516205715e-05 2.5447281241730366e-07 3.853097455417877e-06 -1.0 8.887234042637684e-05 0.01621821782442112 -1.0 1.8747824667478637e-14 5.97653814110781e-06 -1.0 -1.0 1.2296747260635405e-06 -1.0 -1.0 7.754700849337902e-06 7.091263906557291e-05 3.2799045883372075e-06 0.00020573181450240786 5.6949597066784976e-05 1.271128669411295e-07 0.0010019432401508087 -1.0 -1.0 6.848642863465585e-07 5.783974359937857e-06 2.380955631371226e-06 4.756872959630257e-05 2.1360401784344975e-18 0.00046029617115127556 1.0092905083158804e-11 0.08095280568305474 3.89841667138598e-08 4.354946981329799e-05 -1.0 0.5 0.0015447823995470042 -1.0 -1.0 0.001959411999677113 0.48573842213878143 -1.0 7.962899789920809e-06 5.619835883512353e-14 0.0835648710074336 2.7207433165796702e-11 0.00027464244062887683 4.076762579823379e-17 2.124999182004655e-05 8.037131813528501e-07 8.846493399850663e-06 1.080711295768551e-05 -1.0 -1.0 0.0010737081832502356 2.679340942769232e-06 2.1648918040467363e-05 0.0002668579837809081 1.3455341306162382e-05 2.5629068330446215e-05 1.3228013765525015e-05 -1.0 -1.0 7.002861620919232e-08 1.5172912057312398e-14 -1.0 7.989579285134734e-06 2.639268952045579e-10 -1.0 0.013330619853379314 0.00021534568699157805 2.4469456008493614e-09 8.211982683649991e-09 1.951356547084204e-15 0.00016419031150495913 5.985108617124989e-06 1.28584557092134e-05 1.5476769237571295e-14 5.5379154134462336e-08 0.0016637126543321873 2.499931357628383e-07 8.020767115181574e-07 2.7697233171399416e-13 -1.0 0.007197662162700777 -1.0 0.0833931797381589 2.8226276944532696e-05 3.353295403842037e-05 5.504813693036933e-12 0.007136750029575816 0.08636569925236791 -1.0 -1.0 6.315154082213375e-07 0.4877856021170283 -1.0 3.7051518220083886e-06 -1.0 0.0017950613169359904 7.84289689494925e-06 9.041149893307806e-07 -1.0 8.48176145671274e-10 9.03108551826469e-05 3.634644995026692e-05 2.0295213621716706e-09 1.0305672698745657e-11 1.5550455959178486e-06 0.01664109232689093 8.533030345699353e-17 0.0009252532821720597 -1.0 7.695031155172816e-14 0.0007151459162818186 -1.0 -1.0 5.182269672663266e-10 3.0160758454323657e-07 -1.0 0.06539005235506369 3.452537179033895e-05 -1.0 -1.0 3.855884234344845e-06 0.00017699858357744463 2.594951085377588e-06 1.1333627604823673e-09 -1.0 2.4306375693722205e-06 0.0063790654507599135 2.2060992580622125e-11 -1.0 -1.0 0.0848872967381878 3.932389299316285e-06 1.2911827198500372e-08 1.957092814065688e-05 0.0007213722022489493 0.0018327593437608 1.6699254277734109e-06 0.007188410694198128 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0</lower_ww_bounds>
+      <upper_ww_bounds>-10.0 0.07673145137236567 6.5427006446456266e-06 0.017541380096893787 0.0072454516100906195 7.476545089278483e-05 2.253382683081525e-05 0.00021040609012865135 0.828589987401454 -10.0 1.0262431550731535e-12 3.3164825349503764e-15 0.06480331412016534 3.5981031766416144e-05 -10.0 1.6205064883026195e-10 0.0001777013641125591 0.001670700632870335 0.0004323138781337963 -10.0 -10.0 0.0006922231352729155 0.6550426960512012 -10.0 2.5639656866250452e-05 1.4508262073256658e-12 -10.0 -10.0 0.009127050763987512 3.852324755037882e-11 -10.0 0.008175033526488424 -10.0 0.15148978428271614 2.515735579020177e-06 2.1612150425221703e-05 1.3181562352445092e-09 0.00029282097947816227 0.0002762955748645507 2.9362687471355483e-13 1.6859219614058023e-18 3.937160538176268e-06 2.6011787393916804e-05 0.015708293135808408 -10.0 1.7041669224797384e-08 1.6421491993751715e-10 4.899999304038166 6.948292975998466e-06 -10.0 -10.0 0.8657573566388354 0.06639379668946672 1.681305446488884e-10 0.00022487617828938325 0.0004109066205029878 0.8288806458368345 -10.0 0.07385384405891665 -10.0 -10.0 1.0083949647509469e-05 6.655926357459275e-07 0.016279794552427576 1.4825219199133352e-11 -10.0 0.000193847081892941 0.0001284759166582202 0.0005116174051620571 2.5447281241730365e-06 3.853097455417877e-05 -10.0 0.0008887234042637684 0.16218217824421122 -10.0 1.8747824667478637e-13 5.97653814110781e-05 -10.0 -10.0 1.2296747260635405e-05 -10.0 -10.0 7.754700849337902e-05 0.0007091263906557291 3.2799045883372076e-05 0.0020573181450240785 0.0005694959706678497 1.271128669411295e-06 0.010019432401508087 -10.0 -10.0 6.848642863465585e-06 5.7839743599378564e-05 2.380955631371226e-05 0.0004756872959630257 2.1360401784344976e-17 0.004602961711512756 1.0092905083158804e-10 0.8095280568305474 3.89841667138598e-07 0.00043549469813297995 -10.0 5.0 0.015447823995470043 -10.0 -10.0 0.01959411999677113 4.8573842213878144 -10.0 7.96289978992081e-05 5.619835883512353e-13 0.8356487100743359 2.7207433165796704e-10 0.002746424406288768 4.076762579823379e-16 0.00021249991820046548 8.037131813528501e-06 8.846493399850663e-05 0.0001080711295768551 -10.0 -10.0 0.010737081832502356 2.679340942769232e-05 0.00021648918040467362 0.0026685798378090807 0.00013455341306162382 0.00025629068330446217 0.00013228013765525016 -10.0 -10.0 7.002861620919232e-07 1.51729120573124e-13 -10.0 7.989579285134734e-05 2.639268952045579e-09 -10.0 0.13330619853379314 0.0021534568699157807 2.4469456008493615e-08 8.211982683649991e-08 1.951356547084204e-14 0.0016419031150495913 5.985108617124989e-05 0.000128584557092134 1.5476769237571296e-13 5.537915413446234e-07 0.016637126543321872 2.499931357628383e-06 8.020767115181574e-06 2.7697233171399415e-12 -10.0 0.07197662162700777 -10.0 0.8339317973815891 0.000282262769445327 0.00033532954038420373 5.504813693036933e-11 0.07136750029575815 0.8636569925236791 -10.0 -10.0 6.3151540822133754e-06 4.877856021170283 -10.0 3.7051518220083885e-05 -10.0 0.017950613169359905 7.84289689494925e-05 9.041149893307805e-06 -10.0 8.48176145671274e-09 0.000903108551826469 0.0003634644995026692 2.0295213621716707e-08 1.0305672698745658e-10 1.5550455959178486e-05 0.1664109232689093 8.533030345699353e-16 0.009252532821720597 -10.0 7.695031155172816e-13 0.007151459162818186 -10.0 -10.0 5.182269672663266e-09 3.0160758454323656e-06 -10.0 0.6539005235506369 0.0003452537179033895 -10.0 -10.0 3.855884234344845e-05 0.0017699858357744464 2.594951085377588e-05 1.1333627604823672e-08 -10.0 2.4306375693722206e-05 0.06379065450759913 2.2060992580622125e-10 -10.0 -10.0 0.848872967381878 3.9323892993162844e-05 1.2911827198500372e-07 0.0001957092814065688 0.0072137220224894934 0.018327593437608 1.669925427773411e-05 0.07188410694198127 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0</upper_ww_bounds>
+      <survival_ratio>3</survival_ratio>
+      <max_lower_bound_ratio>1.5</max_lower_bound_ratio>
+      <max_split>10</max_split>
+      <weight_cutoff>1e-38</weight_cutoff>
+    </weight_windows>
+    <mesh id="2">
+      <dimension>5 6 7</dimension>
+      <lower_left>-240 -240 -240</lower_left>
+      <upper_right>240 240 240</upper_right>
+    </mesh>
+    <weight_windows id="2">
+      <mesh>2</mesh>
+      <particle_type>neutron</particle_type>
+      <energy_bounds>0.0 0.5 20000000.0</energy_bounds>
+      <lower_ww_bounds>-1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 0.06827568359008944 0.00017329528628152923 0.018541112907970003 0.011113024641218336 8.76041935303527e-05 8.168081568291806e-05 0.00046693784586018913 0.4952432605379829 2.2512327083641865e-10 4.6258592060517866e-07 2.7044817176109556e-05 0.054902816619122045 0.00014126153603265097 8.304845400451923e-08 2.2950716170641463e-05 0.0001335621430311088 0.003432919201293737 0.0005197081842709918 5.726152701849347e-16 -1.0 0.0013332554437480327 0.4346984808472855 7.691527781829036e-17 0.00011042047857307253 3.0571050855707084e-06 -1.0 4.986698316296507e-06 0.011128424196387618 1.3106335518133802e-05 5.447493368067179e-10 0.011440381012864086 4.670673837764874e-08 0.12364069326350118 0.00012558879474108074 3.136829920007009e-05 2.34750482787598e-05 0.001537590300149361 0.0017693279949094218 6.717625881826167e-05 4.587143797469485e-08 2.6211239246796104e-05 0.00030002326388383244 0.01729816946709781 4.5757238372058234e-11 6.92296299242814e-05 3.792209399652396e-06 -1.0 9.256616392487858e-05 8.541606727879512e-07 -1.0 0.49317081643076643 0.05500108683629957 1.298062961617927e-05 0.0006870228272606287 0.0008231482263927564 0.5 3.419181071650816e-06 0.06433819434431046 6.574706543646946e-16 4.0404626147344e-13 0.0003782322077390033 0.00012637534695610975 0.017602971074583987 1.0044390728858277e-05 -1.0 0.0008787411098754915 0.00023686818807101741 0.0009304497896205121 6.949587369646497e-05 0.00012918433677593975 2.0707648529746894e-06 0.0023295401596005313 0.11819165666519223 -1.0 2.1606550732170693e-05 0.00022057970761624768 -1.0 1.0325207105027347e-08 0.0002029396545382813 2.1234980618763222e-13 -1.0 0.00024175998138228048 0.001178616843705956 0.0001399807456616496 0.0038811025614225057 0.0011076796092102186 0.00010814452764860558 0.010955637485319249 -1.0 9.382800796426366e-17 5.098747893974248e-05 0.00027052054298385255 0.00021305826462238593 0.000808100901275472 4.233410073487772e-06 0.0051513292132259495 8.616027294555462e-07 0.4873897581604287 2.9093345975075226e-05 0.000469589568463265 -1.0 -1.0 0.017802624844035688 1.3116807133030035e-15 2.617878055106949e-16 0.01884234453311008 -1.0 2.027381220364608e-16 0.0004299195570308035 1.4628847959717225e-05 0.4899952354672477 2.774067049392004e-07 0.004441328419270369 4.279460329782799e-09 0.0012297303081805393 0.0002792896409558745 0.0006934466049804711 8.370896020975689e-05 3.8270536025799805e-15 -1.0 0.01208261392046878 0.0001497958445994315 0.0015016500045374082 0.005384625561469684 0.00025519632243117644 0.0011028020390507682 0.0002362355168421952 -1.0 -1.0 8.862760180332873e-05 1.3806577785135177e-06 -1.0 0.0001319677450153934 2.6866894852481906e-05 -1.0 0.11510120013926417 0.002672923773363389 1.2257360246712472e-05 8.544159282151438e-05 2.777791741571174e-05 0.0014957033281168012 0.0003257646134837451 0.0008919466185572302 1.2907171695294846e-13 4.6842350882367666e-05 0.01721806295736377 0.00025106741008066317 0.00022234471595443313 2.101790478097517e-09 5.752120832330886e-11 0.06428782790571179 3.2478301680021854e-08 0.4903495510314233 0.001146714816952061 0.0004777967757842694 1.0882011018684852e-06 0.05708498338352203 0.4981497862127628 -1.0 3.2790914744011534e-06 0.00010077009726691265 -1.0 2.210707325798542e-07 4.3166052799897375e-05 -1.0 0.01825795827020865 0.0003182108781955478 3.8561696337086434e-05 1.0995322456277382e-06 9.53380658669839e-06 0.001550036616828061 0.0012648333883989995 5.272021975060514e-06 1.9257248009114363e-05 0.00016757997590048827 0.11891251244906934 5.515522196186723e-06 0.01102706140784316 9.904481358675478e-13 3.520674728719278e-05 0.011294708566804167 7.239087311622819e-08 -1.0 3.5740607788414942e-06 0.00035983547999740665 1.0588257623722672e-07 0.42372713683725016 0.0011273340972061078 8.582011716859219e-15 1.1514579117272292e-10 0.00043130977711323417 0.0027847329307350423 0.00017287873387910357 6.401055165502384e-06 1.722191123879782e-08 0.00020848309220162036 0.05639071613735579 1.8064550990294753e-05 1.289814511028015e-06 1.078687446476881e-14 0.4897735047310072 0.0002981891705231209 0.00016079768514218546 9.332371598523186e-05 0.011724714376848187 0.019040707071165303 0.00014242053195529864 0.06684484191345574 -1.0</lower_ww_bounds>
+      <upper_ww_bounds>-10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 0.6827568359008944 0.0017329528628152924 0.18541112907970003 0.11113024641218336 0.0008760419353035269 0.0008168081568291806 0.004669378458601891 4.952432605379829 2.2512327083641864e-09 4.625859206051786e-06 0.00027044817176109554 0.5490281661912204 0.0014126153603265096 8.304845400451923e-07 0.00022950716170641464 0.001335621430311088 0.03432919201293737 0.0051970818427099184 5.726152701849347e-15 -10.0 0.013332554437480326 4.346984808472855 7.6915277818290365e-16 0.0011042047857307254 3.0571050855707086e-05 -10.0 4.986698316296507e-05 0.11128424196387618 0.000131063355181338 5.447493368067179e-09 0.11440381012864086 4.670673837764874e-07 1.2364069326350118 0.0012558879474108074 0.0003136829920007009 0.000234750482787598 0.01537590300149361 0.01769327994909422 0.0006717625881826168 4.587143797469485e-07 0.000262112392467961 0.0030002326388383245 0.1729816946709781 4.5757238372058235e-10 0.0006922962992428139 3.792209399652396e-05 -10.0 0.0009256616392487858 8.541606727879512e-06 -10.0 4.931708164307665 0.5500108683629957 0.00012980629616179268 0.006870228272606287 0.008231482263927564 5.0 3.419181071650816e-05 0.6433819434431045 6.574706543646946e-15 4.0404626147344005e-12 0.003782322077390033 0.0012637534695610975 0.17602971074583987 0.00010044390728858278 -10.0 0.008787411098754914 0.002368681880710174 0.00930449789620512 0.0006949587369646498 0.0012918433677593976 2.0707648529746893e-05 0.023295401596005315 1.1819165666519222 -10.0 0.00021606550732170693 0.0022057970761624767 -10.0 1.0325207105027347e-07 0.0020293965453828133 2.123498061876322e-12 -10.0 0.0024175998138228046 0.01178616843705956 0.0013998074566164962 0.03881102561422506 0.011076796092102187 0.0010814452764860557 0.10955637485319249 -10.0 9.382800796426367e-16 0.0005098747893974248 0.0027052054298385255 0.0021305826462238594 0.00808100901275472 4.233410073487772e-05 0.0515132921322595 8.61602729455546e-06 4.873897581604287 0.0002909334597507523 0.0046958956846326495 -10.0 -10.0 0.1780262484403569 1.3116807133030034e-14 2.6178780551069492e-15 0.1884234453311008 -10.0 2.027381220364608e-15 0.004299195570308035 0.00014628847959717226 4.899952354672477 2.774067049392004e-06 0.04441328419270369 4.279460329782799e-08 0.012297303081805393 0.002792896409558745 0.006934466049804711 0.0008370896020975689 3.8270536025799805e-14 -10.0 0.1208261392046878 0.001497958445994315 0.015016500045374082 0.05384625561469684 0.0025519632243117644 0.011028020390507681 0.002362355168421952 -10.0 -10.0 0.0008862760180332873 1.3806577785135176e-05 -10.0 0.001319677450153934 0.00026866894852481903 -10.0 1.1510120013926417 0.026729237733633893 0.00012257360246712473 0.0008544159282151438 0.0002777791741571174 0.014957033281168012 0.0032576461348374514 0.008919466185572301 1.2907171695294846e-12 0.00046842350882367664 0.17218062957363772 0.0025106741008066318 0.0022234471595443312 2.101790478097517e-08 5.752120832330886e-10 0.6428782790571179 3.2478301680021856e-07 4.903495510314233 0.01146714816952061 0.004777967757842694 1.0882011018684853e-05 0.5708498338352204 4.981497862127628 -10.0 3.279091474401153e-05 0.0010077009726691265 -10.0 2.210707325798542e-06 0.00043166052799897375 -10.0 0.1825795827020865 0.0031821087819554777 0.00038561696337086434 1.0995322456277382e-05 9.53380658669839e-05 0.01550036616828061 0.012648333883989995 5.272021975060514e-05 0.00019257248009114364 0.0016757997590048828 1.1891251244906933 5.515522196186723e-05 0.1102706140784316 9.904481358675478e-12 0.0003520674728719278 0.11294708566804167 7.239087311622819e-07 -10.0 3.574060778841494e-05 0.0035983547999740664 1.0588257623722672e-06 4.237271368372502 0.011273340972061077 8.582011716859219e-14 1.151457911727229e-09 0.004313097771132342 0.027847329307350423 0.0017287873387910357 6.401055165502385e-05 1.722191123879782e-07 0.0020848309220162036 0.5639071613735579 0.00018064550990294753 1.289814511028015e-05 1.078687446476881e-13 4.897735047310072 0.002981891705231209 0.0016079768514218546 0.0009332371598523186 0.11724714376848187 0.19040707071165303 0.0014242053195529865 0.6684484191345574 -10.0</upper_ww_bounds>
+      <survival_ratio>3</survival_ratio>
+      <max_lower_bound_ratio>1.5</max_lower_bound_ratio>
+      <max_split>10</max_split>
+      <weight_cutoff>1e-38</weight_cutoff>
+    </weight_windows>
+    <max_splits>200</max_splits>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>5 10 15</dimension>
+      <lower_left>-240 -240 -240</lower_left>
+      <upper_right>240 240 240</upper_right>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="energy">
+      <bins>0.0 0.5 20000000.0</bins>
+    </filter>
+    <filter id="3" type="particle">
+      <bins>neutron photon</bins>
+    </filter>
+    <tally id="1">
+      <filters>1 2 3</filters>
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/testing_harness.py b/tests/testing_harness.py
index 0525dd476..157f6e640 100644
--- a/tests/testing_harness.py
+++ b/tests/testing_harness.py
@@ -336,12 +336,11 @@ class PyAPITestHarness(TestHarness):
 
     def _build_inputs(self):
         """Write input XML files."""
-        self._model.export_to_xml()
+        self._model.export_to_model_xml()
 
     def _get_inputs(self):
         """Return a hash digest of the input XML files."""
-        xmls = ['geometry.xml', 'materials.xml', 'settings.xml',
-                'tallies.xml', 'plots.xml']
+        xmls = ['model.xml', 'plots.xml']
         return ''.join([open(fname).read() for fname in xmls
                         if os.path.exists(fname)])
 
@@ -371,7 +370,7 @@ class PyAPITestHarness(TestHarness):
         """Delete XMLs, statepoints, tally, and test files."""
         super()._cleanup()
         output = ['materials.xml', 'geometry.xml', 'settings.xml',
-                  'tallies.xml', 'plots.xml', 'inputs_test.dat']
+                  'tallies.xml', 'plots.xml', 'inputs_test.dat', 'model.xml']
         for f in output:
             if os.path.exists(f):
                 os.remove(f)