From 04806858cafa75b287a6fe32778286a41efb8e95 Mon Sep 17 00:00:00 2001
From: Ethan Peterson <ethan.peterson@mit.edu>
Date: Thu, 23 Mar 2023 14:59:37 -0400
Subject: [PATCH] update old tests to use new model.xml

---
 openmc/plots.py                               |   6 +-
 tests/regression_tests/cmfd_feed/geometry.xml |  43 --
 .../regression_tests/cmfd_feed/materials.xml  |  12 -
 tests/regression_tests/cmfd_feed/model.xml    |  51 ++
 tests/regression_tests/cmfd_feed/settings.xml |  26 -
 tests/regression_tests/cmfd_feed/tallies.xml  |  21 -
 .../cmfd_feed_expanding_window/geometry.xml   |  43 --
 .../cmfd_feed_expanding_window/materials.xml  |  12 -
 .../cmfd_feed_expanding_window/model.xml      |  51 ++
 .../cmfd_feed_expanding_window/settings.xml   |  26 -
 .../cmfd_feed_expanding_window/tallies.xml    |  21 -
 .../cmfd_feed_rectlin/geometry.xml            |  43 --
 .../cmfd_feed_rectlin/materials.xml           |  12 -
 .../cmfd_feed_rectlin/model.xml               |  51 ++
 .../cmfd_feed_rectlin/settings.xml            |  26 -
 .../cmfd_feed_rectlin/tallies.xml             |  21 -
 .../cmfd_feed_ref_d/geometry.xml              |  43 --
 .../cmfd_feed_ref_d/materials.xml             |  12 -
 .../cmfd_feed_ref_d/model.xml                 |  51 ++
 .../cmfd_feed_ref_d/settings.xml              |  26 -
 .../cmfd_feed_ref_d/tallies.xml               |  21 -
 .../cmfd_feed_rolling_window/geometry.xml     |  43 --
 .../cmfd_feed_rolling_window/materials.xml    |  12 -
 .../cmfd_feed_rolling_window/model.xml        |  51 ++
 .../cmfd_feed_rolling_window/settings.xml     |  26 -
 .../cmfd_feed_rolling_window/tallies.xml      |  21 -
 .../regression_tests/cmfd_nofeed/geometry.xml |  43 --
 .../cmfd_nofeed/materials.xml                 |  12 -
 tests/regression_tests/cmfd_nofeed/model.xml  |  51 ++
 .../regression_tests/cmfd_nofeed/settings.xml |  26 -
 .../regression_tests/cmfd_nofeed/tallies.xml  |  21 -
 .../cmfd_restart/geometry.xml                 |  43 --
 .../cmfd_restart/materials.xml                |  12 -
 tests/regression_tests/cmfd_restart/model.xml |  54 ++
 .../cmfd_restart/settings.xml                 |  28 -
 .../regression_tests/cmfd_restart/tallies.xml |  21 -
 .../filter_distribcell/case-4/geometry.xml    |  23 -
 .../filter_distribcell/case-4/materials.xml   |  19 -
 .../filter_distribcell/case-4/model.xml       |  61 ++
 .../filter_distribcell/case-4/settings.xml    |  12 -
 .../filter_distribcell/case-4/tallies.xml     |  14 -
 .../infinite_cell/geometry.xml                |  17 -
 .../infinite_cell/materials.xml               |  14 -
 .../regression_tests/infinite_cell/model.xml  |  39 ++
 .../infinite_cell/settings.xml                |  15 -
 .../mg_temperature/build_2g.py                | 593 +++++++++---------
 tests/regression_tests/plot/geometry.xml      |  13 -
 tests/regression_tests/plot/materials.xml     |  19 -
 tests/regression_tests/plot/model.xml         |  76 +++
 tests/regression_tests/plot/plots.xml         |  33 -
 tests/regression_tests/plot/settings.xml      |  13 -
 tests/regression_tests/plot/tallies.xml       |  20 -
 .../plot_overlaps/geometry.xml                |  14 -
 .../plot_overlaps/materials.xml               |  19 -
 .../regression_tests/plot_overlaps/model.xml  |  65 ++
 .../regression_tests/plot_overlaps/plots.xml  |  35 --
 .../plot_overlaps/settings.xml                |  13 -
 .../regression_tests/plot_voxel/geometry.xml  |  13 -
 .../regression_tests/plot_voxel/materials.xml |  19 -
 tests/regression_tests/plot_voxel/model.xml   |  42 ++
 tests/regression_tests/plot_voxel/plots.xml   |  10 -
 .../regression_tests/plot_voxel/settings.xml  |  13 -
 .../track_output/geometry.xml                 | 305 ---------
 .../track_output/materials.xml                |  95 ---
 tests/regression_tests/track_output/model.xml | 299 +++++++++
 .../track_output/settings.xml                 |  23 -
 66 files changed, 1241 insertions(+), 1787 deletions(-)
 delete mode 100644 tests/regression_tests/cmfd_feed/geometry.xml
 delete mode 100644 tests/regression_tests/cmfd_feed/materials.xml
 create mode 100644 tests/regression_tests/cmfd_feed/model.xml
 delete mode 100644 tests/regression_tests/cmfd_feed/settings.xml
 delete mode 100644 tests/regression_tests/cmfd_feed/tallies.xml
 delete mode 100644 tests/regression_tests/cmfd_feed_expanding_window/geometry.xml
 delete mode 100644 tests/regression_tests/cmfd_feed_expanding_window/materials.xml
 create mode 100644 tests/regression_tests/cmfd_feed_expanding_window/model.xml
 delete mode 100644 tests/regression_tests/cmfd_feed_expanding_window/settings.xml
 delete mode 100644 tests/regression_tests/cmfd_feed_expanding_window/tallies.xml
 delete mode 100644 tests/regression_tests/cmfd_feed_rectlin/geometry.xml
 delete mode 100644 tests/regression_tests/cmfd_feed_rectlin/materials.xml
 create mode 100644 tests/regression_tests/cmfd_feed_rectlin/model.xml
 delete mode 100644 tests/regression_tests/cmfd_feed_rectlin/settings.xml
 delete mode 100644 tests/regression_tests/cmfd_feed_rectlin/tallies.xml
 delete mode 100644 tests/regression_tests/cmfd_feed_ref_d/geometry.xml
 delete mode 100644 tests/regression_tests/cmfd_feed_ref_d/materials.xml
 create mode 100644 tests/regression_tests/cmfd_feed_ref_d/model.xml
 delete mode 100644 tests/regression_tests/cmfd_feed_ref_d/settings.xml
 delete mode 100644 tests/regression_tests/cmfd_feed_ref_d/tallies.xml
 delete mode 100644 tests/regression_tests/cmfd_feed_rolling_window/geometry.xml
 delete mode 100644 tests/regression_tests/cmfd_feed_rolling_window/materials.xml
 create mode 100644 tests/regression_tests/cmfd_feed_rolling_window/model.xml
 delete mode 100644 tests/regression_tests/cmfd_feed_rolling_window/settings.xml
 delete mode 100644 tests/regression_tests/cmfd_feed_rolling_window/tallies.xml
 delete mode 100644 tests/regression_tests/cmfd_nofeed/geometry.xml
 delete mode 100644 tests/regression_tests/cmfd_nofeed/materials.xml
 create mode 100644 tests/regression_tests/cmfd_nofeed/model.xml
 delete mode 100644 tests/regression_tests/cmfd_nofeed/settings.xml
 delete mode 100644 tests/regression_tests/cmfd_nofeed/tallies.xml
 delete mode 100644 tests/regression_tests/cmfd_restart/geometry.xml
 delete mode 100644 tests/regression_tests/cmfd_restart/materials.xml
 create mode 100644 tests/regression_tests/cmfd_restart/model.xml
 delete mode 100644 tests/regression_tests/cmfd_restart/settings.xml
 delete mode 100644 tests/regression_tests/cmfd_restart/tallies.xml
 delete mode 100644 tests/regression_tests/filter_distribcell/case-4/geometry.xml
 delete mode 100644 tests/regression_tests/filter_distribcell/case-4/materials.xml
 create mode 100644 tests/regression_tests/filter_distribcell/case-4/model.xml
 delete mode 100644 tests/regression_tests/filter_distribcell/case-4/settings.xml
 delete mode 100644 tests/regression_tests/filter_distribcell/case-4/tallies.xml
 delete mode 100644 tests/regression_tests/infinite_cell/geometry.xml
 delete mode 100644 tests/regression_tests/infinite_cell/materials.xml
 create mode 100644 tests/regression_tests/infinite_cell/model.xml
 delete mode 100644 tests/regression_tests/infinite_cell/settings.xml
 delete mode 100644 tests/regression_tests/plot/geometry.xml
 delete mode 100644 tests/regression_tests/plot/materials.xml
 create mode 100644 tests/regression_tests/plot/model.xml
 delete mode 100644 tests/regression_tests/plot/plots.xml
 delete mode 100644 tests/regression_tests/plot/settings.xml
 delete mode 100644 tests/regression_tests/plot/tallies.xml
 delete mode 100644 tests/regression_tests/plot_overlaps/geometry.xml
 delete mode 100644 tests/regression_tests/plot_overlaps/materials.xml
 create mode 100644 tests/regression_tests/plot_overlaps/model.xml
 delete mode 100644 tests/regression_tests/plot_overlaps/plots.xml
 delete mode 100644 tests/regression_tests/plot_overlaps/settings.xml
 delete mode 100644 tests/regression_tests/plot_voxel/geometry.xml
 delete mode 100644 tests/regression_tests/plot_voxel/materials.xml
 create mode 100644 tests/regression_tests/plot_voxel/model.xml
 delete mode 100644 tests/regression_tests/plot_voxel/plots.xml
 delete mode 100644 tests/regression_tests/plot_voxel/settings.xml
 delete mode 100644 tests/regression_tests/track_output/geometry.xml
 delete mode 100644 tests/regression_tests/track_output/materials.xml
 create mode 100644 tests/regression_tests/track_output/model.xml
 delete mode 100644 tests/regression_tests/track_output/settings.xml

diff --git a/openmc/plots.py b/openmc/plots.py
index 0a04516259..4b7d58e3bd 100644
--- a/openmc/plots.py
+++ b/openmc/plots.py
@@ -683,11 +683,11 @@ class Plot(IDManagerMixin):
         if self._meshlines is not None:
             subelement = ET.SubElement(element, "meshlines")
             subelement.set("meshtype", self._meshlines['type'])
-            if self._meshlines['id'] is not None:
+            if 'id' in self._meshlines:
                 subelement.set("id", str(self._meshlines['id']))
-            if self._meshlines['linewidth'] is not None:
+            if 'linewidth' in self._meshlines:
                 subelement.set("linewidth", str(self._meshlines['linewidth']))
-            if self._meshlines['color'] is not None:
+            if 'color' in self._meshlines:
                 subelement.set("color", ' '.join(map(
                     str, self._meshlines['color'])))
 
diff --git a/tests/regression_tests/cmfd_feed/geometry.xml b/tests/regression_tests/cmfd_feed/geometry.xml
deleted file mode 100644
index 73ea679c4c..0000000000
--- a/tests/regression_tests/cmfd_feed/geometry.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<geometry>
-
-<!-- Definition of Cells -->
-  <cell id="1">
-    <universe>0</universe>
-    <region>-1 2 -3 4 -5 6</region>
-    <material>1</material>
-  </cell>
-
-<!-- Defition of Surfaces -->
-  <surface id="1">
-    <type>x-plane</type>
-    <coeffs>10</coeffs>
-    <boundary> vacuum </boundary>
-  </surface>
-  <surface id="2">
-    <type>x-plane</type>
-    <coeffs>-10</coeffs>
-    <boundary> vacuum </boundary>
-  </surface>
-  <surface id="3">
-    <type>y-plane</type>
-    <coeffs>1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="4">
-    <type>y-plane</type>
-    <coeffs>-1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="5">
-    <type>z-plane</type>
-    <coeffs>1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="6">
-    <type>z-plane</type>
-    <coeffs>-1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-
-</geometry>
diff --git a/tests/regression_tests/cmfd_feed/materials.xml b/tests/regression_tests/cmfd_feed/materials.xml
deleted file mode 100644
index 70580e3a8d..0000000000
--- a/tests/regression_tests/cmfd_feed/materials.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <!-- Definition of materials -->
-  <material id="1">
-    <density value="19" units="g/cc" />
-    <nuclide name="U235" wo="0.21" />
-    <nuclide name="U238" wo="0.68" />
-    <nuclide name="O16" wo="0.11" />
-  </material>
-
-</materials>
diff --git a/tests/regression_tests/cmfd_feed/model.xml b/tests/regression_tests/cmfd_feed/model.xml
new file mode 100644
index 0000000000..b3fe853b26
--- /dev/null
+++ b/tests/regression_tests/cmfd_feed/model.xml
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="19.0" />
+      <nuclide name="U235" wo="0.21" />
+      <nuclide name="U238" wo="0.68" />
+      <nuclide name="O16" wo="0.11" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1 2 -3 4 -5 6" universe="0" />
+    <surface boundary="vacuum" coeffs="10.0" id="1" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="2" type="x-plane" />
+    <surface boundary="reflective" coeffs="1.0" id="3" type="y-plane" />
+    <surface boundary="reflective" coeffs="-1.0" id="4" type="y-plane" />
+    <surface boundary="reflective" coeffs="1.0" id="5" type="z-plane" />
+    <surface boundary="reflective" coeffs="-1.0" id="6" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>20</batches>
+    <inactive>10</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-10.0 -1.0 -1.0 10.0 1.0 1.0</parameters>
+      </space>
+    </source>
+    <entropy_mesh>10</entropy_mesh>
+    <mesh id="10">
+      <dimension>10 1 1</dimension>
+      <lower_left>-10.0 -1.0 -1.0</lower_left>
+      <upper_right>10.0 1.0 1.0</upper_right>
+    </mesh>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 1 1</dimension>
+      <lower_left>-10.0 -1.0 -1.0</lower_left>
+      <upper_right>10.0 1.0 1.0</upper_right>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/cmfd_feed/settings.xml b/tests/regression_tests/cmfd_feed/settings.xml
deleted file mode 100644
index 24b0b6ab50..0000000000
--- a/tests/regression_tests/cmfd_feed/settings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings>
-
-  <!-- Parameters for criticality calculation -->
-  <run_mode>eigenvalue</run_mode>
-  <batches>20</batches>
-  <inactive>10</inactive>
-  <particles>1000</particles>
-
-  <!-- Starting source -->
-  <source>
-    <space>
-      <type>box</type>
-      <parameters>-10 -1 -1 10 1 1</parameters>
-    </space>
-  </source>
-
-  <!-- Shannon Entropy -->
-  <mesh id="10">
-    <dimension> 10 1 1 </dimension>
-    <lower_left> -10.0 -1.0 -1.0 </lower_left>
-    <upper_right> 10.0  1.0  1.0 </upper_right>
-  </mesh>
-  <entropy_mesh>10</entropy_mesh>
-
-</settings>
diff --git a/tests/regression_tests/cmfd_feed/tallies.xml b/tests/regression_tests/cmfd_feed/tallies.xml
deleted file mode 100644
index c869711147..0000000000
--- a/tests/regression_tests/cmfd_feed/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <mesh id="1">
-    <type>regular</type>
-    <lower_left>-10 -1 -1 </lower_left>
-    <upper_right>10 1 1</upper_right>
-    <dimension>10 1 1</dimension>
-  </mesh>
-
-  <filter id="1">
-    <type>mesh</type>
-    <bins>1</bins>
-  </filter>
-
-  <tally id="1">
-    <filters>1</filters>
-    <scores>flux</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/regression_tests/cmfd_feed_expanding_window/geometry.xml b/tests/regression_tests/cmfd_feed_expanding_window/geometry.xml
deleted file mode 100644
index 73ea679c4c..0000000000
--- a/tests/regression_tests/cmfd_feed_expanding_window/geometry.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<geometry>
-
-<!-- Definition of Cells -->
-  <cell id="1">
-    <universe>0</universe>
-    <region>-1 2 -3 4 -5 6</region>
-    <material>1</material>
-  </cell>
-
-<!-- Defition of Surfaces -->
-  <surface id="1">
-    <type>x-plane</type>
-    <coeffs>10</coeffs>
-    <boundary> vacuum </boundary>
-  </surface>
-  <surface id="2">
-    <type>x-plane</type>
-    <coeffs>-10</coeffs>
-    <boundary> vacuum </boundary>
-  </surface>
-  <surface id="3">
-    <type>y-plane</type>
-    <coeffs>1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="4">
-    <type>y-plane</type>
-    <coeffs>-1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="5">
-    <type>z-plane</type>
-    <coeffs>1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="6">
-    <type>z-plane</type>
-    <coeffs>-1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-
-</geometry>
diff --git a/tests/regression_tests/cmfd_feed_expanding_window/materials.xml b/tests/regression_tests/cmfd_feed_expanding_window/materials.xml
deleted file mode 100644
index 70580e3a8d..0000000000
--- a/tests/regression_tests/cmfd_feed_expanding_window/materials.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <!-- Definition of materials -->
-  <material id="1">
-    <density value="19" units="g/cc" />
-    <nuclide name="U235" wo="0.21" />
-    <nuclide name="U238" wo="0.68" />
-    <nuclide name="O16" wo="0.11" />
-  </material>
-
-</materials>
diff --git a/tests/regression_tests/cmfd_feed_expanding_window/model.xml b/tests/regression_tests/cmfd_feed_expanding_window/model.xml
new file mode 100644
index 0000000000..b3fe853b26
--- /dev/null
+++ b/tests/regression_tests/cmfd_feed_expanding_window/model.xml
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="19.0" />
+      <nuclide name="U235" wo="0.21" />
+      <nuclide name="U238" wo="0.68" />
+      <nuclide name="O16" wo="0.11" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1 2 -3 4 -5 6" universe="0" />
+    <surface boundary="vacuum" coeffs="10.0" id="1" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="2" type="x-plane" />
+    <surface boundary="reflective" coeffs="1.0" id="3" type="y-plane" />
+    <surface boundary="reflective" coeffs="-1.0" id="4" type="y-plane" />
+    <surface boundary="reflective" coeffs="1.0" id="5" type="z-plane" />
+    <surface boundary="reflective" coeffs="-1.0" id="6" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>20</batches>
+    <inactive>10</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-10.0 -1.0 -1.0 10.0 1.0 1.0</parameters>
+      </space>
+    </source>
+    <entropy_mesh>10</entropy_mesh>
+    <mesh id="10">
+      <dimension>10 1 1</dimension>
+      <lower_left>-10.0 -1.0 -1.0</lower_left>
+      <upper_right>10.0 1.0 1.0</upper_right>
+    </mesh>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 1 1</dimension>
+      <lower_left>-10.0 -1.0 -1.0</lower_left>
+      <upper_right>10.0 1.0 1.0</upper_right>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/cmfd_feed_expanding_window/settings.xml b/tests/regression_tests/cmfd_feed_expanding_window/settings.xml
deleted file mode 100644
index 24b0b6ab50..0000000000
--- a/tests/regression_tests/cmfd_feed_expanding_window/settings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings>
-
-  <!-- Parameters for criticality calculation -->
-  <run_mode>eigenvalue</run_mode>
-  <batches>20</batches>
-  <inactive>10</inactive>
-  <particles>1000</particles>
-
-  <!-- Starting source -->
-  <source>
-    <space>
-      <type>box</type>
-      <parameters>-10 -1 -1 10 1 1</parameters>
-    </space>
-  </source>
-
-  <!-- Shannon Entropy -->
-  <mesh id="10">
-    <dimension> 10 1 1 </dimension>
-    <lower_left> -10.0 -1.0 -1.0 </lower_left>
-    <upper_right> 10.0  1.0  1.0 </upper_right>
-  </mesh>
-  <entropy_mesh>10</entropy_mesh>
-
-</settings>
diff --git a/tests/regression_tests/cmfd_feed_expanding_window/tallies.xml b/tests/regression_tests/cmfd_feed_expanding_window/tallies.xml
deleted file mode 100644
index c869711147..0000000000
--- a/tests/regression_tests/cmfd_feed_expanding_window/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <mesh id="1">
-    <type>regular</type>
-    <lower_left>-10 -1 -1 </lower_left>
-    <upper_right>10 1 1</upper_right>
-    <dimension>10 1 1</dimension>
-  </mesh>
-
-  <filter id="1">
-    <type>mesh</type>
-    <bins>1</bins>
-  </filter>
-
-  <tally id="1">
-    <filters>1</filters>
-    <scores>flux</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/regression_tests/cmfd_feed_rectlin/geometry.xml b/tests/regression_tests/cmfd_feed_rectlin/geometry.xml
deleted file mode 100644
index 73ea679c4c..0000000000
--- a/tests/regression_tests/cmfd_feed_rectlin/geometry.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<geometry>
-
-<!-- Definition of Cells -->
-  <cell id="1">
-    <universe>0</universe>
-    <region>-1 2 -3 4 -5 6</region>
-    <material>1</material>
-  </cell>
-
-<!-- Defition of Surfaces -->
-  <surface id="1">
-    <type>x-plane</type>
-    <coeffs>10</coeffs>
-    <boundary> vacuum </boundary>
-  </surface>
-  <surface id="2">
-    <type>x-plane</type>
-    <coeffs>-10</coeffs>
-    <boundary> vacuum </boundary>
-  </surface>
-  <surface id="3">
-    <type>y-plane</type>
-    <coeffs>1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="4">
-    <type>y-plane</type>
-    <coeffs>-1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="5">
-    <type>z-plane</type>
-    <coeffs>1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="6">
-    <type>z-plane</type>
-    <coeffs>-1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-
-</geometry>
diff --git a/tests/regression_tests/cmfd_feed_rectlin/materials.xml b/tests/regression_tests/cmfd_feed_rectlin/materials.xml
deleted file mode 100644
index 70580e3a8d..0000000000
--- a/tests/regression_tests/cmfd_feed_rectlin/materials.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <!-- Definition of materials -->
-  <material id="1">
-    <density value="19" units="g/cc" />
-    <nuclide name="U235" wo="0.21" />
-    <nuclide name="U238" wo="0.68" />
-    <nuclide name="O16" wo="0.11" />
-  </material>
-
-</materials>
diff --git a/tests/regression_tests/cmfd_feed_rectlin/model.xml b/tests/regression_tests/cmfd_feed_rectlin/model.xml
new file mode 100644
index 0000000000..b3fe853b26
--- /dev/null
+++ b/tests/regression_tests/cmfd_feed_rectlin/model.xml
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="19.0" />
+      <nuclide name="U235" wo="0.21" />
+      <nuclide name="U238" wo="0.68" />
+      <nuclide name="O16" wo="0.11" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1 2 -3 4 -5 6" universe="0" />
+    <surface boundary="vacuum" coeffs="10.0" id="1" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="2" type="x-plane" />
+    <surface boundary="reflective" coeffs="1.0" id="3" type="y-plane" />
+    <surface boundary="reflective" coeffs="-1.0" id="4" type="y-plane" />
+    <surface boundary="reflective" coeffs="1.0" id="5" type="z-plane" />
+    <surface boundary="reflective" coeffs="-1.0" id="6" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>20</batches>
+    <inactive>10</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-10.0 -1.0 -1.0 10.0 1.0 1.0</parameters>
+      </space>
+    </source>
+    <entropy_mesh>10</entropy_mesh>
+    <mesh id="10">
+      <dimension>10 1 1</dimension>
+      <lower_left>-10.0 -1.0 -1.0</lower_left>
+      <upper_right>10.0 1.0 1.0</upper_right>
+    </mesh>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 1 1</dimension>
+      <lower_left>-10.0 -1.0 -1.0</lower_left>
+      <upper_right>10.0 1.0 1.0</upper_right>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/cmfd_feed_rectlin/settings.xml b/tests/regression_tests/cmfd_feed_rectlin/settings.xml
deleted file mode 100644
index 24b0b6ab50..0000000000
--- a/tests/regression_tests/cmfd_feed_rectlin/settings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings>
-
-  <!-- Parameters for criticality calculation -->
-  <run_mode>eigenvalue</run_mode>
-  <batches>20</batches>
-  <inactive>10</inactive>
-  <particles>1000</particles>
-
-  <!-- Starting source -->
-  <source>
-    <space>
-      <type>box</type>
-      <parameters>-10 -1 -1 10 1 1</parameters>
-    </space>
-  </source>
-
-  <!-- Shannon Entropy -->
-  <mesh id="10">
-    <dimension> 10 1 1 </dimension>
-    <lower_left> -10.0 -1.0 -1.0 </lower_left>
-    <upper_right> 10.0  1.0  1.0 </upper_right>
-  </mesh>
-  <entropy_mesh>10</entropy_mesh>
-
-</settings>
diff --git a/tests/regression_tests/cmfd_feed_rectlin/tallies.xml b/tests/regression_tests/cmfd_feed_rectlin/tallies.xml
deleted file mode 100644
index c869711147..0000000000
--- a/tests/regression_tests/cmfd_feed_rectlin/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <mesh id="1">
-    <type>regular</type>
-    <lower_left>-10 -1 -1 </lower_left>
-    <upper_right>10 1 1</upper_right>
-    <dimension>10 1 1</dimension>
-  </mesh>
-
-  <filter id="1">
-    <type>mesh</type>
-    <bins>1</bins>
-  </filter>
-
-  <tally id="1">
-    <filters>1</filters>
-    <scores>flux</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/regression_tests/cmfd_feed_ref_d/geometry.xml b/tests/regression_tests/cmfd_feed_ref_d/geometry.xml
deleted file mode 100644
index 73ea679c4c..0000000000
--- a/tests/regression_tests/cmfd_feed_ref_d/geometry.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<geometry>
-
-<!-- Definition of Cells -->
-  <cell id="1">
-    <universe>0</universe>
-    <region>-1 2 -3 4 -5 6</region>
-    <material>1</material>
-  </cell>
-
-<!-- Defition of Surfaces -->
-  <surface id="1">
-    <type>x-plane</type>
-    <coeffs>10</coeffs>
-    <boundary> vacuum </boundary>
-  </surface>
-  <surface id="2">
-    <type>x-plane</type>
-    <coeffs>-10</coeffs>
-    <boundary> vacuum </boundary>
-  </surface>
-  <surface id="3">
-    <type>y-plane</type>
-    <coeffs>1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="4">
-    <type>y-plane</type>
-    <coeffs>-1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="5">
-    <type>z-plane</type>
-    <coeffs>1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="6">
-    <type>z-plane</type>
-    <coeffs>-1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-
-</geometry>
diff --git a/tests/regression_tests/cmfd_feed_ref_d/materials.xml b/tests/regression_tests/cmfd_feed_ref_d/materials.xml
deleted file mode 100644
index 70580e3a8d..0000000000
--- a/tests/regression_tests/cmfd_feed_ref_d/materials.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <!-- Definition of materials -->
-  <material id="1">
-    <density value="19" units="g/cc" />
-    <nuclide name="U235" wo="0.21" />
-    <nuclide name="U238" wo="0.68" />
-    <nuclide name="O16" wo="0.11" />
-  </material>
-
-</materials>
diff --git a/tests/regression_tests/cmfd_feed_ref_d/model.xml b/tests/regression_tests/cmfd_feed_ref_d/model.xml
new file mode 100644
index 0000000000..b3fe853b26
--- /dev/null
+++ b/tests/regression_tests/cmfd_feed_ref_d/model.xml
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="19.0" />
+      <nuclide name="U235" wo="0.21" />
+      <nuclide name="U238" wo="0.68" />
+      <nuclide name="O16" wo="0.11" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1 2 -3 4 -5 6" universe="0" />
+    <surface boundary="vacuum" coeffs="10.0" id="1" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="2" type="x-plane" />
+    <surface boundary="reflective" coeffs="1.0" id="3" type="y-plane" />
+    <surface boundary="reflective" coeffs="-1.0" id="4" type="y-plane" />
+    <surface boundary="reflective" coeffs="1.0" id="5" type="z-plane" />
+    <surface boundary="reflective" coeffs="-1.0" id="6" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>20</batches>
+    <inactive>10</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-10.0 -1.0 -1.0 10.0 1.0 1.0</parameters>
+      </space>
+    </source>
+    <entropy_mesh>10</entropy_mesh>
+    <mesh id="10">
+      <dimension>10 1 1</dimension>
+      <lower_left>-10.0 -1.0 -1.0</lower_left>
+      <upper_right>10.0 1.0 1.0</upper_right>
+    </mesh>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 1 1</dimension>
+      <lower_left>-10.0 -1.0 -1.0</lower_left>
+      <upper_right>10.0 1.0 1.0</upper_right>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/cmfd_feed_ref_d/settings.xml b/tests/regression_tests/cmfd_feed_ref_d/settings.xml
deleted file mode 100644
index 24b0b6ab50..0000000000
--- a/tests/regression_tests/cmfd_feed_ref_d/settings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings>
-
-  <!-- Parameters for criticality calculation -->
-  <run_mode>eigenvalue</run_mode>
-  <batches>20</batches>
-  <inactive>10</inactive>
-  <particles>1000</particles>
-
-  <!-- Starting source -->
-  <source>
-    <space>
-      <type>box</type>
-      <parameters>-10 -1 -1 10 1 1</parameters>
-    </space>
-  </source>
-
-  <!-- Shannon Entropy -->
-  <mesh id="10">
-    <dimension> 10 1 1 </dimension>
-    <lower_left> -10.0 -1.0 -1.0 </lower_left>
-    <upper_right> 10.0  1.0  1.0 </upper_right>
-  </mesh>
-  <entropy_mesh>10</entropy_mesh>
-
-</settings>
diff --git a/tests/regression_tests/cmfd_feed_ref_d/tallies.xml b/tests/regression_tests/cmfd_feed_ref_d/tallies.xml
deleted file mode 100644
index c869711147..0000000000
--- a/tests/regression_tests/cmfd_feed_ref_d/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <mesh id="1">
-    <type>regular</type>
-    <lower_left>-10 -1 -1 </lower_left>
-    <upper_right>10 1 1</upper_right>
-    <dimension>10 1 1</dimension>
-  </mesh>
-
-  <filter id="1">
-    <type>mesh</type>
-    <bins>1</bins>
-  </filter>
-
-  <tally id="1">
-    <filters>1</filters>
-    <scores>flux</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/regression_tests/cmfd_feed_rolling_window/geometry.xml b/tests/regression_tests/cmfd_feed_rolling_window/geometry.xml
deleted file mode 100644
index 73ea679c4c..0000000000
--- a/tests/regression_tests/cmfd_feed_rolling_window/geometry.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<geometry>
-
-<!-- Definition of Cells -->
-  <cell id="1">
-    <universe>0</universe>
-    <region>-1 2 -3 4 -5 6</region>
-    <material>1</material>
-  </cell>
-
-<!-- Defition of Surfaces -->
-  <surface id="1">
-    <type>x-plane</type>
-    <coeffs>10</coeffs>
-    <boundary> vacuum </boundary>
-  </surface>
-  <surface id="2">
-    <type>x-plane</type>
-    <coeffs>-10</coeffs>
-    <boundary> vacuum </boundary>
-  </surface>
-  <surface id="3">
-    <type>y-plane</type>
-    <coeffs>1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="4">
-    <type>y-plane</type>
-    <coeffs>-1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="5">
-    <type>z-plane</type>
-    <coeffs>1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="6">
-    <type>z-plane</type>
-    <coeffs>-1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-
-</geometry>
diff --git a/tests/regression_tests/cmfd_feed_rolling_window/materials.xml b/tests/regression_tests/cmfd_feed_rolling_window/materials.xml
deleted file mode 100644
index 70580e3a8d..0000000000
--- a/tests/regression_tests/cmfd_feed_rolling_window/materials.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <!-- Definition of materials -->
-  <material id="1">
-    <density value="19" units="g/cc" />
-    <nuclide name="U235" wo="0.21" />
-    <nuclide name="U238" wo="0.68" />
-    <nuclide name="O16" wo="0.11" />
-  </material>
-
-</materials>
diff --git a/tests/regression_tests/cmfd_feed_rolling_window/model.xml b/tests/regression_tests/cmfd_feed_rolling_window/model.xml
new file mode 100644
index 0000000000..b3fe853b26
--- /dev/null
+++ b/tests/regression_tests/cmfd_feed_rolling_window/model.xml
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="19.0" />
+      <nuclide name="U235" wo="0.21" />
+      <nuclide name="U238" wo="0.68" />
+      <nuclide name="O16" wo="0.11" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1 2 -3 4 -5 6" universe="0" />
+    <surface boundary="vacuum" coeffs="10.0" id="1" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="2" type="x-plane" />
+    <surface boundary="reflective" coeffs="1.0" id="3" type="y-plane" />
+    <surface boundary="reflective" coeffs="-1.0" id="4" type="y-plane" />
+    <surface boundary="reflective" coeffs="1.0" id="5" type="z-plane" />
+    <surface boundary="reflective" coeffs="-1.0" id="6" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>20</batches>
+    <inactive>10</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-10.0 -1.0 -1.0 10.0 1.0 1.0</parameters>
+      </space>
+    </source>
+    <entropy_mesh>10</entropy_mesh>
+    <mesh id="10">
+      <dimension>10 1 1</dimension>
+      <lower_left>-10.0 -1.0 -1.0</lower_left>
+      <upper_right>10.0 1.0 1.0</upper_right>
+    </mesh>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 1 1</dimension>
+      <lower_left>-10.0 -1.0 -1.0</lower_left>
+      <upper_right>10.0 1.0 1.0</upper_right>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/cmfd_feed_rolling_window/settings.xml b/tests/regression_tests/cmfd_feed_rolling_window/settings.xml
deleted file mode 100644
index 24b0b6ab50..0000000000
--- a/tests/regression_tests/cmfd_feed_rolling_window/settings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings>
-
-  <!-- Parameters for criticality calculation -->
-  <run_mode>eigenvalue</run_mode>
-  <batches>20</batches>
-  <inactive>10</inactive>
-  <particles>1000</particles>
-
-  <!-- Starting source -->
-  <source>
-    <space>
-      <type>box</type>
-      <parameters>-10 -1 -1 10 1 1</parameters>
-    </space>
-  </source>
-
-  <!-- Shannon Entropy -->
-  <mesh id="10">
-    <dimension> 10 1 1 </dimension>
-    <lower_left> -10.0 -1.0 -1.0 </lower_left>
-    <upper_right> 10.0  1.0  1.0 </upper_right>
-  </mesh>
-  <entropy_mesh>10</entropy_mesh>
-
-</settings>
diff --git a/tests/regression_tests/cmfd_feed_rolling_window/tallies.xml b/tests/regression_tests/cmfd_feed_rolling_window/tallies.xml
deleted file mode 100644
index c869711147..0000000000
--- a/tests/regression_tests/cmfd_feed_rolling_window/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <mesh id="1">
-    <type>regular</type>
-    <lower_left>-10 -1 -1 </lower_left>
-    <upper_right>10 1 1</upper_right>
-    <dimension>10 1 1</dimension>
-  </mesh>
-
-  <filter id="1">
-    <type>mesh</type>
-    <bins>1</bins>
-  </filter>
-
-  <tally id="1">
-    <filters>1</filters>
-    <scores>flux</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/regression_tests/cmfd_nofeed/geometry.xml b/tests/regression_tests/cmfd_nofeed/geometry.xml
deleted file mode 100644
index 73ea679c4c..0000000000
--- a/tests/regression_tests/cmfd_nofeed/geometry.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<geometry>
-
-<!-- Definition of Cells -->
-  <cell id="1">
-    <universe>0</universe>
-    <region>-1 2 -3 4 -5 6</region>
-    <material>1</material>
-  </cell>
-
-<!-- Defition of Surfaces -->
-  <surface id="1">
-    <type>x-plane</type>
-    <coeffs>10</coeffs>
-    <boundary> vacuum </boundary>
-  </surface>
-  <surface id="2">
-    <type>x-plane</type>
-    <coeffs>-10</coeffs>
-    <boundary> vacuum </boundary>
-  </surface>
-  <surface id="3">
-    <type>y-plane</type>
-    <coeffs>1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="4">
-    <type>y-plane</type>
-    <coeffs>-1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="5">
-    <type>z-plane</type>
-    <coeffs>1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="6">
-    <type>z-plane</type>
-    <coeffs>-1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-
-</geometry>
diff --git a/tests/regression_tests/cmfd_nofeed/materials.xml b/tests/regression_tests/cmfd_nofeed/materials.xml
deleted file mode 100644
index 70580e3a8d..0000000000
--- a/tests/regression_tests/cmfd_nofeed/materials.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <!-- Definition of materials -->
-  <material id="1">
-    <density value="19" units="g/cc" />
-    <nuclide name="U235" wo="0.21" />
-    <nuclide name="U238" wo="0.68" />
-    <nuclide name="O16" wo="0.11" />
-  </material>
-
-</materials>
diff --git a/tests/regression_tests/cmfd_nofeed/model.xml b/tests/regression_tests/cmfd_nofeed/model.xml
new file mode 100644
index 0000000000..b3fe853b26
--- /dev/null
+++ b/tests/regression_tests/cmfd_nofeed/model.xml
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="19.0" />
+      <nuclide name="U235" wo="0.21" />
+      <nuclide name="U238" wo="0.68" />
+      <nuclide name="O16" wo="0.11" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1 2 -3 4 -5 6" universe="0" />
+    <surface boundary="vacuum" coeffs="10.0" id="1" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="2" type="x-plane" />
+    <surface boundary="reflective" coeffs="1.0" id="3" type="y-plane" />
+    <surface boundary="reflective" coeffs="-1.0" id="4" type="y-plane" />
+    <surface boundary="reflective" coeffs="1.0" id="5" type="z-plane" />
+    <surface boundary="reflective" coeffs="-1.0" id="6" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>20</batches>
+    <inactive>10</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-10.0 -1.0 -1.0 10.0 1.0 1.0</parameters>
+      </space>
+    </source>
+    <entropy_mesh>10</entropy_mesh>
+    <mesh id="10">
+      <dimension>10 1 1</dimension>
+      <lower_left>-10.0 -1.0 -1.0</lower_left>
+      <upper_right>10.0 1.0 1.0</upper_right>
+    </mesh>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 1 1</dimension>
+      <lower_left>-10.0 -1.0 -1.0</lower_left>
+      <upper_right>10.0 1.0 1.0</upper_right>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/cmfd_nofeed/settings.xml b/tests/regression_tests/cmfd_nofeed/settings.xml
deleted file mode 100644
index 24b0b6ab50..0000000000
--- a/tests/regression_tests/cmfd_nofeed/settings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings>
-
-  <!-- Parameters for criticality calculation -->
-  <run_mode>eigenvalue</run_mode>
-  <batches>20</batches>
-  <inactive>10</inactive>
-  <particles>1000</particles>
-
-  <!-- Starting source -->
-  <source>
-    <space>
-      <type>box</type>
-      <parameters>-10 -1 -1 10 1 1</parameters>
-    </space>
-  </source>
-
-  <!-- Shannon Entropy -->
-  <mesh id="10">
-    <dimension> 10 1 1 </dimension>
-    <lower_left> -10.0 -1.0 -1.0 </lower_left>
-    <upper_right> 10.0  1.0  1.0 </upper_right>
-  </mesh>
-  <entropy_mesh>10</entropy_mesh>
-
-</settings>
diff --git a/tests/regression_tests/cmfd_nofeed/tallies.xml b/tests/regression_tests/cmfd_nofeed/tallies.xml
deleted file mode 100644
index c869711147..0000000000
--- a/tests/regression_tests/cmfd_nofeed/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <mesh id="1">
-    <type>regular</type>
-    <lower_left>-10 -1 -1 </lower_left>
-    <upper_right>10 1 1</upper_right>
-    <dimension>10 1 1</dimension>
-  </mesh>
-
-  <filter id="1">
-    <type>mesh</type>
-    <bins>1</bins>
-  </filter>
-
-  <tally id="1">
-    <filters>1</filters>
-    <scores>flux</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/regression_tests/cmfd_restart/geometry.xml b/tests/regression_tests/cmfd_restart/geometry.xml
deleted file mode 100644
index 73ea679c4c..0000000000
--- a/tests/regression_tests/cmfd_restart/geometry.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<geometry>
-
-<!-- Definition of Cells -->
-  <cell id="1">
-    <universe>0</universe>
-    <region>-1 2 -3 4 -5 6</region>
-    <material>1</material>
-  </cell>
-
-<!-- Defition of Surfaces -->
-  <surface id="1">
-    <type>x-plane</type>
-    <coeffs>10</coeffs>
-    <boundary> vacuum </boundary>
-  </surface>
-  <surface id="2">
-    <type>x-plane</type>
-    <coeffs>-10</coeffs>
-    <boundary> vacuum </boundary>
-  </surface>
-  <surface id="3">
-    <type>y-plane</type>
-    <coeffs>1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="4">
-    <type>y-plane</type>
-    <coeffs>-1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="5">
-    <type>z-plane</type>
-    <coeffs>1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-  <surface id="6">
-    <type>z-plane</type>
-    <coeffs>-1</coeffs>
-    <boundary>reflective</boundary>
-  </surface>
-
-</geometry>
diff --git a/tests/regression_tests/cmfd_restart/materials.xml b/tests/regression_tests/cmfd_restart/materials.xml
deleted file mode 100644
index 70580e3a8d..0000000000
--- a/tests/regression_tests/cmfd_restart/materials.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <!-- Definition of materials -->
-  <material id="1">
-    <density value="19" units="g/cc" />
-    <nuclide name="U235" wo="0.21" />
-    <nuclide name="U238" wo="0.68" />
-    <nuclide name="O16" wo="0.11" />
-  </material>
-
-</materials>
diff --git a/tests/regression_tests/cmfd_restart/model.xml b/tests/regression_tests/cmfd_restart/model.xml
new file mode 100644
index 0000000000..487e9b66dd
--- /dev/null
+++ b/tests/regression_tests/cmfd_restart/model.xml
@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="19.0" />
+      <nuclide name="U235" wo="0.21" />
+      <nuclide name="U238" wo="0.68" />
+      <nuclide name="O16" wo="0.11" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1 2 -3 4 -5 6" universe="0" />
+    <surface boundary="vacuum" coeffs="10.0" id="1" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10.0" id="2" type="x-plane" />
+    <surface boundary="reflective" coeffs="1.0" id="3" type="y-plane" />
+    <surface boundary="reflective" coeffs="-1.0" id="4" type="y-plane" />
+    <surface boundary="reflective" coeffs="1.0" id="5" type="z-plane" />
+    <surface boundary="reflective" coeffs="-1.0" id="6" type="z-plane" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>20</batches>
+    <inactive>10</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-10.0 -1.0 -1.0 10.0 1.0 1.0</parameters>
+      </space>
+    </source>
+    <state_point>
+      <batches>15 20</batches>
+    </state_point>
+    <entropy_mesh>10</entropy_mesh>
+    <mesh id="10">
+      <dimension>10 1 1</dimension>
+      <lower_left>-10.0 -1.0 -1.0</lower_left>
+      <upper_right>10.0 1.0 1.0</upper_right>
+    </mesh>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 1 1</dimension>
+      <lower_left>-10.0 -1.0 -1.0</lower_left>
+      <upper_right>10.0 1.0 1.0</upper_right>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/cmfd_restart/settings.xml b/tests/regression_tests/cmfd_restart/settings.xml
deleted file mode 100644
index ba5495911f..0000000000
--- a/tests/regression_tests/cmfd_restart/settings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings>
-
-  <!-- Parameters for criticality calculation -->
-  <run_mode>eigenvalue</run_mode>
-  <batches>20</batches>
-  <inactive>10</inactive>
-  <particles>1000</particles>
-
-  <!-- Starting source -->
-  <source>
-    <space>
-      <type>box</type>
-      <parameters>-10 -1 -1 10 1 1</parameters>
-    </space>
-  </source>
-
-  <!-- Shannon Entropy -->
-  <mesh id="10">
-    <dimension> 10 1 1 </dimension>
-    <lower_left> -10.0 -1.0 -1.0 </lower_left>
-    <upper_right> 10.0  1.0  1.0 </upper_right>
-  </mesh>
-  <entropy_mesh>10</entropy_mesh>
-
-  <state_point batches="15 20" />
-
-</settings>
diff --git a/tests/regression_tests/cmfd_restart/tallies.xml b/tests/regression_tests/cmfd_restart/tallies.xml
deleted file mode 100644
index c869711147..0000000000
--- a/tests/regression_tests/cmfd_restart/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <mesh id="1">
-    <type>regular</type>
-    <lower_left>-10 -1 -1 </lower_left>
-    <upper_right>10 1 1</upper_right>
-    <dimension>10 1 1</dimension>
-  </mesh>
-
-  <filter id="1">
-    <type>mesh</type>
-    <bins>1</bins>
-  </filter>
-
-  <tally id="1">
-    <filters>1</filters>
-    <scores>flux</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/regression_tests/filter_distribcell/case-4/geometry.xml b/tests/regression_tests/filter_distribcell/case-4/geometry.xml
deleted file mode 100644
index c835218bc0..0000000000
--- a/tests/regression_tests/filter_distribcell/case-4/geometry.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<geometry>
-    <cell fill="5" id="1" name="Cell 1" region="1 -2 3 -4" universe="0" />
-<cell id="101" material="1" name="cell 2" region="-5" universe="1" />
-<cell id="102" material="2" name="cell 3" region="5" universe="1" />
-<cell id="500" material="2" name="cell 4" region="" universe="3" />
-<hex_lattice id="5" n_rings="2">
-        <pitch>1.0</pitch>
-    <outer>3</outer>
-    <center>0.0 0.0</center>
-    <universes>
- 1
-1 1
- 1
-1 1
- 1</universes>
-    </hex_lattice>
-<surface boundary="vacuum" coeffs="-3" id="1" name="left" type="x-plane" />
-<surface boundary="vacuum" coeffs="3" id="2" name="right" type="x-plane" />
-<surface boundary="vacuum" coeffs="-4" id="3" name="bottom" type="y-plane" />
-<surface boundary="vacuum" coeffs="4" id="4" name="top" type="y-plane" />
-<surface boundary="transmission" coeffs="0 0 0.4" id="5" type="z-cylinder" />
-</geometry>
diff --git a/tests/regression_tests/filter_distribcell/case-4/materials.xml b/tests/regression_tests/filter_distribcell/case-4/materials.xml
deleted file mode 100644
index 2eb744fe64..0000000000
--- a/tests/regression_tests/filter_distribcell/case-4/materials.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-    <material id="1" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
-    </material>
-
-    <material id="2" name="moderator">
-      <density units="g/cc" value="1.0" />
-      <nuclide ao="1.0" name="O16" />
-      <nuclide ao="2.0" name="H1" />
-      <sab name="c_H_in_H2O" />
-    </material>
-
-    <material id="3" name="iron">
-      <density units="g/cc" value="7.9" />
-      <nuclide ao="1.0" name="Fe56" />
-    </material>
-</materials>
diff --git a/tests/regression_tests/filter_distribcell/case-4/model.xml b/tests/regression_tests/filter_distribcell/case-4/model.xml
new file mode 100644
index 0000000000..8694219194
--- /dev/null
+++ b/tests/regression_tests/filter_distribcell/case-4/model.xml
@@ -0,0 +1,61 @@
+<?xml version='1.0' encoding='utf-8'?>
+<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="moderator">
+      <density units="g/cc" value="1.0" />
+      <nuclide ao="1.0" name="O16" />
+      <nuclide ao="2.0" name="H1" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material id="3" name="iron">
+      <density units="g/cc" value="7.9" />
+      <nuclide ao="1.0" name="Fe56" />
+    </material>
+  </materials>
+  <geometry>
+    <cell fill="5" id="1" name="Cell 1" region="1 -2 3 -4" universe="0" />
+    <cell id="101" material="1" name="cell 2" region="-5" universe="1" />
+    <cell id="102" material="2" name="cell 3" region="5" universe="1" />
+    <cell id="500" material="2" name="cell 4" universe="3" />
+    <hex_lattice id="5" n_rings="2">
+      <pitch>1.0</pitch>
+      <outer>3</outer>
+      <center>0.0 0.0</center>
+      <universes>
+ 1
+1 1
+ 1
+1 1
+ 1</universes>
+    </hex_lattice>
+    <surface boundary="vacuum" coeffs="-3.0" id="1" name="left" type="x-plane" />
+    <surface boundary="vacuum" coeffs="3.0" id="2" name="right" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-4.0" id="3" name="bottom" type="y-plane" />
+    <surface boundary="vacuum" coeffs="4.0" id="4" name="top" type="y-plane" />
+    <surface coeffs="0.0 0.0 0.4" id="5" type="z-cylinder" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>1</batches>
+    <inactive>0</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-1.0 -1.0 -1.0 1.0 1.0 1.0</parameters>
+      </space>
+    </source>
+  </settings>
+  <tallies>
+    <filter id="1" type="distribcell">
+      <bins>101</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>total</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/filter_distribcell/case-4/settings.xml b/tests/regression_tests/filter_distribcell/case-4/settings.xml
deleted file mode 100644
index f3f0779bc9..0000000000
--- a/tests/regression_tests/filter_distribcell/case-4/settings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-  <run_mode>eigenvalue</run_mode>
-  <particles>1000</particles>
-  <batches>1</batches>
-  <inactive>0</inactive>
-  <source>
-    <space type="box">
-      <parameters>-1 -1 -1 1 1 1</parameters>
-    </space>
-  </source>
-</settings>
diff --git a/tests/regression_tests/filter_distribcell/case-4/tallies.xml b/tests/regression_tests/filter_distribcell/case-4/tallies.xml
deleted file mode 100644
index b923c030b8..0000000000
--- a/tests/regression_tests/filter_distribcell/case-4/tallies.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-
-  <filter id="1">
-    <type>distribcell</type>
-    <bins>101</bins>
-  </filter>
-
-  <tally id="1">
-    <filters>1</filters>
-    <scores>total</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/regression_tests/infinite_cell/geometry.xml b/tests/regression_tests/infinite_cell/geometry.xml
deleted file mode 100644
index 90bd2233be..0000000000
--- a/tests/regression_tests/infinite_cell/geometry.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-  <cell id="11" universe="11" material="1"/>
-  <cell id="12" universe="12" material="2" region=""/>
-
-  <lattice id="21" dimension="2 2" lower_left="-2.0 -2.0"
-    pitch="2.0 2.0" outer="12">
-    <universes>
-      11 12
-      12 11
-    </universes>
-  </lattice>
-
-
-  <surface id="101" type="z-cylinder" coeffs="0.0 0.0 5.0" boundary="vacuum"/>
-  <cell id="101" universe="0" fill="21" region="-101"/>
-</geometry>
diff --git a/tests/regression_tests/infinite_cell/materials.xml b/tests/regression_tests/infinite_cell/materials.xml
deleted file mode 100644
index 6acd8df74b..0000000000
--- a/tests/regression_tests/infinite_cell/materials.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <material id="1">
-    <density value="4.5" units="g/cc" />
-    <nuclide name="U235" ao="1.0" />
-  </material>
-
-  <material id="2">
-    <density value="4.5" units="g/cc" />
-    <nuclide name="U238" ao="1.0" />
-  </material>
-
-</materials>
diff --git a/tests/regression_tests/infinite_cell/model.xml b/tests/regression_tests/infinite_cell/model.xml
new file mode 100644
index 0000000000..0f741a86d9
--- /dev/null
+++ b/tests/regression_tests/infinite_cell/model.xml
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+    <material depletable="true" id="2">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U238" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="11" material="1" universe="11" />
+    <cell id="12" material="2" universe="12" />
+    <cell fill="21" id="101" region="-101" universe="0" />
+    <lattice id="21">
+      <pitch>2.0 2.0</pitch>
+      <outer>12</outer>
+      <dimension>2 2</dimension>
+      <lower_left>-2.0 -2.0</lower_left>
+      <universes>
+11 12 
+12 11 </universes>
+    </lattice>
+    <surface boundary="vacuum" coeffs="0.0 0.0 5.0" id="101" type="z-cylinder" />
+  </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.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
+      </space>
+    </source>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/infinite_cell/settings.xml b/tests/regression_tests/infinite_cell/settings.xml
deleted file mode 100644
index 70b4e802f8..0000000000
--- a/tests/regression_tests/infinite_cell/settings.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <run_mode>eigenvalue</run_mode>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <particles>1000</particles>
-
-  <source>
-    <space type="box">
-      <parameters>-4 -4 -4  4  4  4</parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/regression_tests/mg_temperature/build_2g.py b/tests/regression_tests/mg_temperature/build_2g.py
index 1256ca0f7f..42f948be1e 100644
--- a/tests/regression_tests/mg_temperature/build_2g.py
+++ b/tests/regression_tests/mg_temperature/build_2g.py
@@ -1,297 +1,296 @@
-import openmc
-import numpy as np
-
-names = ['H', 'O', 'Zr', 'U235', 'U238']
-
-
-def build_openmc_xs_lib(name, groups, temperatures, xsdict, micro=True):
-    """Build an Openm XSdata based on dictionary values"""
-    xsdata = openmc.XSdata(name, groups, temperatures=temperatures)
-    xsdata.order = 0
-    for tt in temperatures:
-        xsdata.set_absorption(xsdict[tt]['absorption'][name], temperature=tt)
-        xsdata.set_scatter_matrix(xsdict[tt]['scatter'][name], temperature=tt)
-        xsdata.set_total(xsdict[tt]['total'][name], temperature=tt)
-        if (name in xsdict[tt]['nu-fission'].keys()):
-            xsdata.set_nu_fission(xsdict[tt]['nu-fission'][name],
-                                  temperature=tt)
-            xsdata.set_chi(np.array([1., 0.]), temperature=tt)
-    return xsdata
-
-
-def create_micro_xs_dict():
-    """Returns micro xs library"""
-    xs_micro = {}
-    reactions = ['absorption', 'total', 'scatter', 'nu-fission']
-    # chi is unnecessary  when energy bound is in thermal region
-    # Temperature 300K
-    # absorption
-    xs_micro[300] = {r: {} for r in reactions}
-    xs_micro[300]['absorption']['H'] = np.array([1.0285E-4, 0.0057])
-    xs_micro[300]['absorption']['O'] = np.array([7.1654E-5, 3.0283E-6])
-    xs_micro[300]['absorption']['Zr'] = np.array([4.5918E-5, 3.6303E-5])
-    xs_micro[300]['absorption']['U235'] = np.array([0.0035, 0.1040])
-    xs_micro[300]['absorption']['U238'] = np.array([0.0056, 0.0094])
-    # nu-scatter matrix
-    xs_micro[300]['scatter']['H'] = np.array([[[0.0910, 0.01469],
-                                               [0.0, 0.3316]]])
-    xs_micro[300]['scatter']['O'] = np.array([[[0.0814, 3.3235E-4],
-                                               [0.0, 0.0960]]])
-    xs_micro[300]['scatter']['Zr'] = np.array([[[0.0311, 2.6373E-5],
-                                                [0.0, 0.0315]]])
-    xs_micro[300]['scatter']['U235'] = np.array([[[0.0311, 2.6373E-5],
-                                                  [0.0, 0.0315]]])
-    xs_micro[300]['scatter']['U238'] = np.array([[[0.0551, 2.2341E-5],
-                                                  [0.0, 0.0526]]])
-    # nu-fission
-    xs_micro[300]['nu-fission']['U235'] = np.array([0.0059, 0.2160])
-    xs_micro[300]['nu-fission']['U238'] = np.array([0.0019, 1.4627E-7])
-    # total
-    xs_micro[300]['total']['H'] = xs_micro[300]['absorption']['H'] + \
-                                  np.sum(xs_micro[300]['scatter']['H'][0], 1)
-    xs_micro[300]['total']['O'] = xs_micro[300]['absorption']['O'] + \
-                                  np.sum(xs_micro[300]['scatter']['O'][0], 1)
-
-    xs_micro[300]['total']['Zr'] = xs_micro[300]['absorption']['Zr'] + \
-                                   np.sum(xs_micro[300]['scatter']['Zr'][0], 1)
-
-    xs_micro[300]['total']['U235'] = xs_micro[300]['absorption']['U235'] + \
-                                     np.sum(xs_micro[300]['scatter']['U235'][0], 1)
-
-    xs_micro[300]['total']['U238'] = xs_micro[300]['absorption']['U238'] + \
-                                     np.sum(xs_micro[300]['scatter']['U238'][0], 1)
-
-    # Temperature 600K
-    xs_micro[600] = {r: {} for r in reactions}
-    # absorption
-    xs_micro[600]['absorption']['H'] = np.array([1.0356E-4, 0.0046])
-    xs_micro[600]['absorption']['O'] = np.array([7.2678E-5, 2.4963E-6])
-    xs_micro[600]['absorption']['Zr'] = np.array([4.7256E-5, 2.9757E-5])
-    xs_micro[600]['absorption']['U235'] = np.array([0.0035, 0.0853])
-    xs_micro[600]['absorption']['U238'] = np.array([0.0058, 0.0079])
-    # nu-scatter matrix
-    xs_micro[600]['scatter']['H'] = np.array([[[0.0910, 0.0138],
-                                               [0.0, 0.3316]]])
-    xs_micro[600]['scatter']['O'] = np.array([[[0.0814, 3.5367E-4],
-                                               [0.0, 0.0959]]])
-    xs_micro[600]['scatter']['Zr'] = np.array([[[0.0311, 3.2293E-5],
-                                                [0.0, 0.0314]]])
-    xs_micro[600]['scatter']['U235'] = np.array([[[0.0022, 1.9763E-6],
-                                                  [9.1634E-8, 0.0039]]])
-    xs_micro[600]['scatter']['U238'] = np.array([[[0.0556, 2.8803E-5],
-                                                  [0.0, 0.0536]]])
-    # nu-fission
-    xs_micro[600]['nu-fission']['U235'] = np.array([0.0059, 0.1767])
-    xs_micro[600]['nu-fission']['U238'] = np.array([0.0019, 1.2405E-7])
-    # total
-    xs_micro[600]['total']['H'] = xs_micro[600]['absorption']['H'] + \
-                                  np.sum(xs_micro[600]['scatter']['H'][0], 1)
-    xs_micro[600]['total']['O'] = xs_micro[600]['absorption']['O'] + \
-                                  np.sum(xs_micro[600]['scatter']['O'][0], 1)
-
-    xs_micro[600]['total']['Zr'] = xs_micro[600]['absorption']['Zr'] + \
-                                   np.sum(xs_micro[600]['scatter']['Zr'][0], 1)
-
-    xs_micro[600]['total']['U235'] = xs_micro[600]['absorption']['U235'] + \
-                                     np.sum(xs_micro[600]['scatter']['U235'][0], 1)
-
-    xs_micro[600]['total']['U238'] = xs_micro[600]['absorption']['U238'] + \
-                                     np.sum(xs_micro[600]['scatter']['U238'][0], 1)
-
-    # Temperature 900K
-    xs_micro[900] = {r: {} for r in reactions}
-    # absorption
-    xs_micro[900]['absorption']['H'] = np.array([1.0529E-4, 0.0040])
-    xs_micro[900]['absorption']['O'] = np.array([7.3055E-5, 2.1850E-6])
-    xs_micro[900]['absorption']['Zr'] = np.array([4.7141E-5, 2.5941E-5])
-    xs_micro[900]['absorption']['U235'] = np.array([0.0035, 0.0749])
-    xs_micro[900]['absorption']['U238'] = np.array([0.0060, 0.0071])
-    # total
-    xs_micro[900]['total']['H'] = np.array([0.2982, 0.7332])
-    xs_micro[900]['total']['O'] = np.array([0.0885, 0.1004])
-    xs_micro[900]['total']['Zr'] = np.array([0.0370, 0.0317])
-    xs_micro[900]['total']['U235'] = np.array([0.0061, 0.0789])
-    xs_micro[900]['total']['U238'] = np.array([0.0707, 0.0613])
-    # nu-scatter matrix
-    xs_micro[900]['scatter']['H'] = np.array([[[0.0913, 0.0147],
-                                               [0.0, 0.4020]]])
-    xs_micro[900]['scatter']['O'] = np.array([[[0.0812, 4.0413E-4],
-                                               [0.0, 0.0965]]])
-    xs_micro[900]['scatter']['Zr'] = np.array([[[0.0311, 3.6735E-5],
-                                                [0.0, 0.0314]]])
-    xs_micro[900]['scatter']['U235'] = np.array([[[0.0022, 2.9034E-6],
-                                                  [1.3117E-8, 0.0039]]])
-    xs_micro[900]['scatter']['U238'] = np.array([[[0.0560, 3.7619E-5],
-                                                  [0.0, 0.0538]]])
-    # nu-fission
-    xs_micro[900]['nu-fission']['U235'] = np.array([0.0059, 0.1545])
-    xs_micro[900]['nu-fission']['U238'] = np.array([0.0019, 1.1017E-7])
-    # total
-    xs_micro[900]['total']['H'] = xs_micro[900]['absorption']['H'] + \
-                                  np.sum(xs_micro[900]['scatter']['H'][0], 1)
-    xs_micro[900]['total']['O'] = xs_micro[900]['absorption']['O'] + \
-                                  np.sum(xs_micro[900]['scatter']['O'][0], 1)
-
-    xs_micro[900]['total']['Zr'] = xs_micro[900]['absorption']['Zr'] + \
-                                   np.sum(xs_micro[900]['scatter']['Zr'][0], 1)
-
-    xs_micro[900]['total']['U235'] = xs_micro[900]['absorption']['U235'] + \
-                                     np.sum(xs_micro[900]['scatter']['U235'][0], 1)
-
-    xs_micro[900]['total']['U238'] = xs_micro[900]['absorption']['U238'] + \
-                                     np.sum(xs_micro[900]['scatter']['U238'][0], 1)
-
-    # roll axis for scatter matrix
-    for t in xs_micro:
-        for n in xs_micro[t]['scatter']:
-            xs_micro[t]['scatter'][n] = np.rollaxis(xs_micro[t]['scatter'][n],
-                                                    0, 3)
-    return xs_micro
-
-
-def create_macro_dict(xs_micro):
-    """Create a dictionary with two group cross-section"""
-    xs_macro = {}
-    for t, d1 in xs_micro.items():
-        xs_macro[t] = {}
-        for r, d2 in d1.items():
-            temp = []
-            xs_macro[t][r] = {}
-            for n, v in d2.items():
-                temp.append(d2[n])
-            # The name 'macro' is needed to store data at the same level
-            # of a xs_macro dictionary as for xs_micro and use it in
-            # function build_openmc_xs_lib
-            xs_macro[t][r]['macro'] = sum(temp)
-    return xs_macro
-
-
-def create_openmc_2mg_libs(names):
-    """Built a micro/macro two group openmc MGXS libraries"""
-    # Initialized library params
-    group_edges = [0.0, 0.625, 20.0e6]
-    groups = openmc.mgxs.EnergyGroups(group_edges=group_edges)
-    mg_cross_sections_file_micro = openmc.MGXSLibrary(groups)
-    mg_cross_sections_file_macro = openmc.MGXSLibrary(groups)
-    # Building a micro mg library
-    micro_cs = create_micro_xs_dict()
-    for name in names:
-        mg_cross_sections_file_micro.add_xsdata(build_openmc_xs_lib(name,
-                                                                    groups,
-                                                                    [t for t in
-                                                                     micro_cs],
-                                                                    micro_cs))
-    # Building a macro mg library
-    macro_xs = create_macro_dict(micro_cs)
-    mg_cross_sections_file_macro.add_xsdata(build_openmc_xs_lib('macro',
-                                                                groups,
-                                                                [t for t in
-                                                                 macro_xs],
-                                                                macro_xs))
-    # Exporting library to hdf5 files
-    mg_cross_sections_file_micro.export_to_hdf5('micro_2g.h5')
-    mg_cross_sections_file_macro.export_to_hdf5('macro_2g.h5')
-    # Returning the macro_xs dict is needed for analytical solution
-    return macro_xs
-
-
-def analytical_solution_2g_therm(xsmin, xsmax=None, wgt=1.0):
-    """ Calculate eigenvalue based on analytical solution for eq Lf = (1/k)Qf
-    in two group for infinity dilution media in assumption of group
-    boundary in thermal spectra < 1.e+3 Ev
-    Parameters:
-    ----------
-    xsmin : dict
-        macro cross-sections dictionary with minimum range temperature
-    xsmax : dict
-        macro cross-sections dictionary with maximum range temperature
-        by default: None not used for standalone temperature
-    wgt : float
-        weight for interpolation by default 1.0
-    Returns:
-    -------
-    keff : np.float64
-       analytical eigenvalue of critical eq matrix
-    """
-    if xsmax is None:
-        sa = xsmin['absorption']['macro']
-        ss12 = xsmin['scatter']['macro'][0][1][0]
-        nsf = xsmin['nu-fission']['macro']
-    else:
-        sa = xsmin['absorption']['macro'] * wgt + \
-             xsmax['absorption']['macro'] * (1 - wgt)
-        ss12 = xsmin['scatter']['macro'][0][1][0] * wgt + \
-               xsmax['scatter']['macro'][0][1][0] * (1 - wgt)
-        nsf = xsmin['nu-fission']['macro'] * wgt + \
-              xsmax['nu-fission']['macro'] * (1 - wgt)
-    L = np.array([sa[0] + ss12, 0.0, -ss12, sa[1]]).reshape(2, 2)
-    Q = np.array([nsf[0], nsf[1], 0.0, 0.0]).reshape(2, 2)
-    arr = np.linalg.inv(L).dot(Q)
-    return np.amax(np.linalg.eigvals(arr))
-
-
-def build_inf_model(xsnames, xslibname, temperature, tempmethod='nearest'):
-    """ Building an infinite medium for openmc multi-group testing
-    Parameters:
-    ----------
-    xsnames : list of str()
-        list with xs names
-    xslibname:
-        name of hdf5 file with cross-section library
-    temperature : float
-        value of a current temperature in K
-    tempmethod : {'nearest', 'interpolation'}
-        by default 'nearest'
-    """
-    inf_medium = openmc.Material(name='test material', material_id=1)
-    inf_medium.set_density("sum")
-    for xs in xsnames:
-        inf_medium.add_nuclide(xs, 1)
-    INF = 11.1
-    # Instantiate a Materials collection and export to XML
-    materials_file = openmc.Materials([inf_medium])
-    materials_file.cross_sections = xslibname
-    materials_file.export_to_xml()
-
-    # Instantiate boundary Planes
-    min_x = openmc.XPlane(boundary_type='reflective', x0=-INF)
-    max_x = openmc.XPlane(boundary_type='reflective', x0=INF)
-    min_y = openmc.YPlane(boundary_type='reflective', y0=-INF)
-    max_y = openmc.YPlane(boundary_type='reflective', y0=INF)
-
-    # Instantiate a Cell
-    cell = openmc.Cell(cell_id=1, name='cell')
-    cell.temperature = temperature
-    # Register bounding Surfaces with the Cell
-    cell.region = +min_x & -max_x & +min_y & -max_y
-
-    # Fill the Cell with the Material
-    cell.fill = inf_medium
-
-    # Create root universe
-    root_universe = openmc.Universe(name='root universe', cells=[cell])
-
-    # Create Geometry and set root Universe
-    openmc_geometry = openmc.Geometry(root_universe)
-
-    # Export to "geometry.xml"
-    openmc_geometry.export_to_xml()
-
-    # OpenMC simulation parameters
-    batches = 200
-    inactive = 5
-    particles = 5000
-
-    # Instantiate a Settings object
-    settings_file = openmc.Settings()
-    settings_file.batches = batches
-    settings_file.inactive = inactive
-    settings_file.particles = particles
-    settings_file.energy_mode = 'multi-group'
-    settings_file.output = {'summary': False}
-    # Create an initial uniform spatial source distribution over fissionable zones
-    bounds = [-INF, -INF, -INF, INF, INF, INF]
-    uniform_dist = openmc.stats.Box(bounds[:3], bounds[3:], only_fissionable=True)
-    settings_file.temperature = {'method': tempmethod}
-    settings_file.source = openmc.Source(space=uniform_dist)
-    settings_file.export_to_xml()
+import openmc
+import numpy as np
+
+names = ['H', 'O', 'Zr', 'U235', 'U238']
+
+
+def build_openmc_xs_lib(name, groups, temperatures, xsdict, micro=True):
+    """Build an Openm XSdata based on dictionary values"""
+    xsdata = openmc.XSdata(name, groups, temperatures=temperatures)
+    xsdata.order = 0
+    for tt in temperatures:
+        xsdata.set_absorption(xsdict[tt]['absorption'][name], temperature=tt)
+        xsdata.set_scatter_matrix(xsdict[tt]['scatter'][name], temperature=tt)
+        xsdata.set_total(xsdict[tt]['total'][name], temperature=tt)
+        if (name in xsdict[tt]['nu-fission'].keys()):
+            xsdata.set_nu_fission(xsdict[tt]['nu-fission'][name],
+                                  temperature=tt)
+            xsdata.set_chi(np.array([1., 0.]), temperature=tt)
+    return xsdata
+
+
+def create_micro_xs_dict():
+    """Returns micro xs library"""
+    xs_micro = {}
+    reactions = ['absorption', 'total', 'scatter', 'nu-fission']
+    # chi is unnecessary  when energy bound is in thermal region
+    # Temperature 300K
+    # absorption
+    xs_micro[300] = {r: {} for r in reactions}
+    xs_micro[300]['absorption']['H'] = np.array([1.0285E-4, 0.0057])
+    xs_micro[300]['absorption']['O'] = np.array([7.1654E-5, 3.0283E-6])
+    xs_micro[300]['absorption']['Zr'] = np.array([4.5918E-5, 3.6303E-5])
+    xs_micro[300]['absorption']['U235'] = np.array([0.0035, 0.1040])
+    xs_micro[300]['absorption']['U238'] = np.array([0.0056, 0.0094])
+    # nu-scatter matrix
+    xs_micro[300]['scatter']['H'] = np.array([[[0.0910, 0.01469],
+                                               [0.0, 0.3316]]])
+    xs_micro[300]['scatter']['O'] = np.array([[[0.0814, 3.3235E-4],
+                                               [0.0, 0.0960]]])
+    xs_micro[300]['scatter']['Zr'] = np.array([[[0.0311, 2.6373E-5],
+                                                [0.0, 0.0315]]])
+    xs_micro[300]['scatter']['U235'] = np.array([[[0.0311, 2.6373E-5],
+                                                  [0.0, 0.0315]]])
+    xs_micro[300]['scatter']['U238'] = np.array([[[0.0551, 2.2341E-5],
+                                                  [0.0, 0.0526]]])
+    # nu-fission
+    xs_micro[300]['nu-fission']['U235'] = np.array([0.0059, 0.2160])
+    xs_micro[300]['nu-fission']['U238'] = np.array([0.0019, 1.4627E-7])
+    # total
+    xs_micro[300]['total']['H'] = xs_micro[300]['absorption']['H'] + \
+                                  np.sum(xs_micro[300]['scatter']['H'][0], 1)
+    xs_micro[300]['total']['O'] = xs_micro[300]['absorption']['O'] + \
+                                  np.sum(xs_micro[300]['scatter']['O'][0], 1)
+
+    xs_micro[300]['total']['Zr'] = xs_micro[300]['absorption']['Zr'] + \
+                                   np.sum(xs_micro[300]['scatter']['Zr'][0], 1)
+
+    xs_micro[300]['total']['U235'] = xs_micro[300]['absorption']['U235'] + \
+                                     np.sum(xs_micro[300]['scatter']['U235'][0], 1)
+
+    xs_micro[300]['total']['U238'] = xs_micro[300]['absorption']['U238'] + \
+                                     np.sum(xs_micro[300]['scatter']['U238'][0], 1)
+
+    # Temperature 600K
+    xs_micro[600] = {r: {} for r in reactions}
+    # absorption
+    xs_micro[600]['absorption']['H'] = np.array([1.0356E-4, 0.0046])
+    xs_micro[600]['absorption']['O'] = np.array([7.2678E-5, 2.4963E-6])
+    xs_micro[600]['absorption']['Zr'] = np.array([4.7256E-5, 2.9757E-5])
+    xs_micro[600]['absorption']['U235'] = np.array([0.0035, 0.0853])
+    xs_micro[600]['absorption']['U238'] = np.array([0.0058, 0.0079])
+    # nu-scatter matrix
+    xs_micro[600]['scatter']['H'] = np.array([[[0.0910, 0.0138],
+                                               [0.0, 0.3316]]])
+    xs_micro[600]['scatter']['O'] = np.array([[[0.0814, 3.5367E-4],
+                                               [0.0, 0.0959]]])
+    xs_micro[600]['scatter']['Zr'] = np.array([[[0.0311, 3.2293E-5],
+                                                [0.0, 0.0314]]])
+    xs_micro[600]['scatter']['U235'] = np.array([[[0.0022, 1.9763E-6],
+                                                  [9.1634E-8, 0.0039]]])
+    xs_micro[600]['scatter']['U238'] = np.array([[[0.0556, 2.8803E-5],
+                                                  [0.0, 0.0536]]])
+    # nu-fission
+    xs_micro[600]['nu-fission']['U235'] = np.array([0.0059, 0.1767])
+    xs_micro[600]['nu-fission']['U238'] = np.array([0.0019, 1.2405E-7])
+    # total
+    xs_micro[600]['total']['H'] = xs_micro[600]['absorption']['H'] + \
+                                  np.sum(xs_micro[600]['scatter']['H'][0], 1)
+    xs_micro[600]['total']['O'] = xs_micro[600]['absorption']['O'] + \
+                                  np.sum(xs_micro[600]['scatter']['O'][0], 1)
+
+    xs_micro[600]['total']['Zr'] = xs_micro[600]['absorption']['Zr'] + \
+                                   np.sum(xs_micro[600]['scatter']['Zr'][0], 1)
+
+    xs_micro[600]['total']['U235'] = xs_micro[600]['absorption']['U235'] + \
+                                     np.sum(xs_micro[600]['scatter']['U235'][0], 1)
+
+    xs_micro[600]['total']['U238'] = xs_micro[600]['absorption']['U238'] + \
+                                     np.sum(xs_micro[600]['scatter']['U238'][0], 1)
+
+    # Temperature 900K
+    xs_micro[900] = {r: {} for r in reactions}
+    # absorption
+    xs_micro[900]['absorption']['H'] = np.array([1.0529E-4, 0.0040])
+    xs_micro[900]['absorption']['O'] = np.array([7.3055E-5, 2.1850E-6])
+    xs_micro[900]['absorption']['Zr'] = np.array([4.7141E-5, 2.5941E-5])
+    xs_micro[900]['absorption']['U235'] = np.array([0.0035, 0.0749])
+    xs_micro[900]['absorption']['U238'] = np.array([0.0060, 0.0071])
+    # total
+    xs_micro[900]['total']['H'] = np.array([0.2982, 0.7332])
+    xs_micro[900]['total']['O'] = np.array([0.0885, 0.1004])
+    xs_micro[900]['total']['Zr'] = np.array([0.0370, 0.0317])
+    xs_micro[900]['total']['U235'] = np.array([0.0061, 0.0789])
+    xs_micro[900]['total']['U238'] = np.array([0.0707, 0.0613])
+    # nu-scatter matrix
+    xs_micro[900]['scatter']['H'] = np.array([[[0.0913, 0.0147],
+                                               [0.0, 0.4020]]])
+    xs_micro[900]['scatter']['O'] = np.array([[[0.0812, 4.0413E-4],
+                                               [0.0, 0.0965]]])
+    xs_micro[900]['scatter']['Zr'] = np.array([[[0.0311, 3.6735E-5],
+                                                [0.0, 0.0314]]])
+    xs_micro[900]['scatter']['U235'] = np.array([[[0.0022, 2.9034E-6],
+                                                  [1.3117E-8, 0.0039]]])
+    xs_micro[900]['scatter']['U238'] = np.array([[[0.0560, 3.7619E-5],
+                                                  [0.0, 0.0538]]])
+    # nu-fission
+    xs_micro[900]['nu-fission']['U235'] = np.array([0.0059, 0.1545])
+    xs_micro[900]['nu-fission']['U238'] = np.array([0.0019, 1.1017E-7])
+    # total
+    xs_micro[900]['total']['H'] = xs_micro[900]['absorption']['H'] + \
+                                  np.sum(xs_micro[900]['scatter']['H'][0], 1)
+    xs_micro[900]['total']['O'] = xs_micro[900]['absorption']['O'] + \
+                                  np.sum(xs_micro[900]['scatter']['O'][0], 1)
+
+    xs_micro[900]['total']['Zr'] = xs_micro[900]['absorption']['Zr'] + \
+                                   np.sum(xs_micro[900]['scatter']['Zr'][0], 1)
+
+    xs_micro[900]['total']['U235'] = xs_micro[900]['absorption']['U235'] + \
+                                     np.sum(xs_micro[900]['scatter']['U235'][0], 1)
+
+    xs_micro[900]['total']['U238'] = xs_micro[900]['absorption']['U238'] + \
+                                     np.sum(xs_micro[900]['scatter']['U238'][0], 1)
+
+    # roll axis for scatter matrix
+    for t in xs_micro:
+        for n in xs_micro[t]['scatter']:
+            xs_micro[t]['scatter'][n] = np.rollaxis(xs_micro[t]['scatter'][n],
+                                                    0, 3)
+    return xs_micro
+
+
+def create_macro_dict(xs_micro):
+    """Create a dictionary with two group cross-section"""
+    xs_macro = {}
+    for t, d1 in xs_micro.items():
+        xs_macro[t] = {}
+        for r, d2 in d1.items():
+            temp = []
+            xs_macro[t][r] = {}
+            for n, v in d2.items():
+                temp.append(d2[n])
+            # The name 'macro' is needed to store data at the same level
+            # of a xs_macro dictionary as for xs_micro and use it in
+            # function build_openmc_xs_lib
+            xs_macro[t][r]['macro'] = sum(temp)
+    return xs_macro
+
+
+def create_openmc_2mg_libs(names):
+    """Built a micro/macro two group openmc MGXS libraries"""
+    # Initialized library params
+    group_edges = [0.0, 0.625, 20.0e6]
+    groups = openmc.mgxs.EnergyGroups(group_edges=group_edges)
+    mg_cross_sections_file_micro = openmc.MGXSLibrary(groups)
+    mg_cross_sections_file_macro = openmc.MGXSLibrary(groups)
+    # Building a micro mg library
+    micro_cs = create_micro_xs_dict()
+    for name in names:
+        mg_cross_sections_file_micro.add_xsdata(build_openmc_xs_lib(name,
+                                                                    groups,
+                                                                    [t for t in
+                                                                     micro_cs],
+                                                                    micro_cs))
+    # Building a macro mg library
+    macro_xs = create_macro_dict(micro_cs)
+    mg_cross_sections_file_macro.add_xsdata(build_openmc_xs_lib('macro',
+                                                                groups,
+                                                                [t for t in
+                                                                 macro_xs],
+                                                                macro_xs))
+    # Exporting library to hdf5 files
+    mg_cross_sections_file_micro.export_to_hdf5('micro_2g.h5')
+    mg_cross_sections_file_macro.export_to_hdf5('macro_2g.h5')
+    # Returning the macro_xs dict is needed for analytical solution
+    return macro_xs
+
+
+def analytical_solution_2g_therm(xsmin, xsmax=None, wgt=1.0):
+    """ Calculate eigenvalue based on analytical solution for eq Lf = (1/k)Qf
+    in two group for infinity dilution media in assumption of group
+    boundary in thermal spectra < 1.e+3 Ev
+    Parameters:
+    ----------
+    xsmin : dict
+        macro cross-sections dictionary with minimum range temperature
+    xsmax : dict
+        macro cross-sections dictionary with maximum range temperature
+        by default: None not used for standalone temperature
+    wgt : float
+        weight for interpolation by default 1.0
+    Returns:
+    -------
+    keff : np.float64
+       analytical eigenvalue of critical eq matrix
+    """
+    if xsmax is None:
+        sa = xsmin['absorption']['macro']
+        ss12 = xsmin['scatter']['macro'][0][1][0]
+        nsf = xsmin['nu-fission']['macro']
+    else:
+        sa = xsmin['absorption']['macro'] * wgt + \
+             xsmax['absorption']['macro'] * (1 - wgt)
+        ss12 = xsmin['scatter']['macro'][0][1][0] * wgt + \
+               xsmax['scatter']['macro'][0][1][0] * (1 - wgt)
+        nsf = xsmin['nu-fission']['macro'] * wgt + \
+              xsmax['nu-fission']['macro'] * (1 - wgt)
+    L = np.array([sa[0] + ss12, 0.0, -ss12, sa[1]]).reshape(2, 2)
+    Q = np.array([nsf[0], nsf[1], 0.0, 0.0]).reshape(2, 2)
+    arr = np.linalg.inv(L).dot(Q)
+    return np.amax(np.linalg.eigvals(arr))
+
+
+def build_inf_model(xsnames, xslibname, temperature, tempmethod='nearest'):
+    """ Building an infinite medium for openmc multi-group testing
+    Parameters:
+    ----------
+    xsnames : list of str()
+        list with xs names
+    xslibname:
+        name of hdf5 file with cross-section library
+    temperature : float
+        value of a current temperature in K
+    tempmethod : {'nearest', 'interpolation'}
+        by default 'nearest'
+    """
+    model = openmc.Model()
+    inf_medium = openmc.Material(name='test material', material_id=1)
+    inf_medium.set_density("sum")
+    for xs in xsnames:
+        inf_medium.add_nuclide(xs, 1)
+    INF = 11.1
+    # Instantiate a Materials collection and export to XML
+    materials_file = openmc.Materials([inf_medium])
+    materials_file.cross_sections = xslibname
+    model.materials = materials_file
+
+    # Instantiate boundary Planes
+    min_x = openmc.XPlane(boundary_type='reflective', x0=-INF)
+    max_x = openmc.XPlane(boundary_type='reflective', x0=INF)
+    min_y = openmc.YPlane(boundary_type='reflective', y0=-INF)
+    max_y = openmc.YPlane(boundary_type='reflective', y0=INF)
+
+    # Instantiate a Cell
+    cell = openmc.Cell(cell_id=1, name='cell')
+    cell.temperature = temperature
+    # Register bounding Surfaces with the Cell
+    cell.region = +min_x & -max_x & +min_y & -max_y
+
+    # Fill the Cell with the Material
+    cell.fill = inf_medium
+
+    # Create root universe
+    root_universe = openmc.Universe(name='root universe', cells=[cell])
+
+    # Create Geometry and set root Universe
+    model.geometry = openmc.Geometry(root_universe)
+
+    # OpenMC simulation parameters
+    batches = 200
+    inactive = 5
+    particles = 5000
+
+    # Instantiate a Settings object
+    settings_file = openmc.Settings()
+    settings_file.batches = batches
+    settings_file.inactive = inactive
+    settings_file.particles = particles
+    settings_file.energy_mode = 'multi-group'
+    settings_file.output = {'summary': False}
+    # Create an initial uniform spatial source distribution over fissionable zones
+    bounds = [-INF, -INF, -INF, INF, INF, INF]
+    uniform_dist = openmc.stats.Box(bounds[:3], bounds[3:], only_fissionable=True)
+    settings_file.temperature = {'method': tempmethod}
+    settings_file.source = openmc.Source(space=uniform_dist)
+    model.settings = settings_file
+    model.export_to_model_xml()
diff --git a/tests/regression_tests/plot/geometry.xml b/tests/regression_tests/plot/geometry.xml
deleted file mode 100644
index 83619d9f78..0000000000
--- a/tests/regression_tests/plot/geometry.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0 0 2" />
-  <surface id="2" type="z-cylinder" coeffs="0 0 5" />
-  <surface id="3" type="z-cylinder" coeffs="0 0 10" boundary="vacuum" />
-  <surface id="4" type="y-plane" coeffs="5" boundary="vacuum" />
-
-  <cell id="1" material="1" region="  -1 -4" />
-  <cell id="2" material="3" region="1 -2 -4" />
-  <cell id="3" material="2" region="2 -3 -4" />
-
-</geometry>
diff --git a/tests/regression_tests/plot/materials.xml b/tests/regression_tests/plot/materials.xml
deleted file mode 100644
index 90b3542675..0000000000
--- a/tests/regression_tests/plot/materials.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <material id="1">
-    <density value="4.5" units="g/cc" />
-    <nuclide name="U235" ao="1.0" />
-  </material>
-
-  <material id="2">
-    <density value="4.5" units="g/cc" />
-    <nuclide name="U235" ao="1.0" />
-  </material>
-
-  <material id="3">
-    <density value="4.5" units="g/cc" />
-    <nuclide name="U235" ao="1.0" />
-  </material>
-
-</materials>
diff --git a/tests/regression_tests/plot/model.xml b/tests/regression_tests/plot/model.xml
new file mode 100644
index 0000000000..a63ff95daa
--- /dev/null
+++ b/tests/regression_tests/plot/model.xml
@@ -0,0 +1,76 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </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="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1 -4" universe="0" />
+    <cell id="2" material="3" region="1 -2 -4" universe="0" />
+    <cell id="3" material="2" region="2 -3 -4" universe="0" />
+    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 5.0" id="2" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 10.0" id="3" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="5.0" id="4" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>plot</run_mode>
+    <entropy_mesh>1</entropy_mesh>
+    <mesh id="1">
+      <dimension>5 4 3</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+  </settings>
+  <tallies>
+    <mesh id="2" type="rectilinear">
+      <x_grid>-10.0 10.0</x_grid>
+      <y_grid>-10.0 10.0</y_grid>
+      <z_grid>-10.0 0.0 5.0 7.5 8.75 10.0</z_grid>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>2</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>total</scores>
+    </tally>
+  </tallies>
+  <plots>
+    <plot basis="xy" color_by="cell" id="1" type="slice">
+      <origin>0.0 0.0 0.0</origin>
+      <width>25.0 25.0</width>
+      <pixels>200 200</pixels>
+      <color id="1" rgb="255 0 0" />
+      <meshlines linewidth="0" meshtype="entropy" />
+    </plot>
+    <plot basis="xz" color_by="cell" id="2" type="slice">
+      <origin>0.0 0.0 0.0</origin>
+      <width>25.0 25.0</width>
+      <pixels>200 200</pixels>
+      <mask background="255 255 255" components="1 3" />
+      <meshlines id="2" linewidth="0" meshtype="tally" />
+    </plot>
+    <plot basis="yz" color_by="material" id="3" type="slice">
+      <origin>0.0 0.0 0.0</origin>
+      <width>25.0 25.0</width>
+      <pixels>200 200</pixels>
+      <background>0 0 0</background>
+    </plot>
+    <plot color_by="cell" id="4" type="voxel">
+      <origin>0.0 0.0 0.0</origin>
+      <width>20.0 20.0 10.0</width>
+      <pixels>100 100 10</pixels>
+    </plot>
+  </plots>
+</model>
diff --git a/tests/regression_tests/plot/plots.xml b/tests/regression_tests/plot/plots.xml
deleted file mode 100644
index ce63da1442..0000000000
--- a/tests/regression_tests/plot/plots.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<plots>
-
-  <plot id="1" basis="xy">
-    <origin>0. 0. 0.</origin>
-    <width>25 25</width>
-    <pixels>200 200</pixels>
-    <color id="1" rgb="255 0 0" /> <!-- Red -->
-    <meshlines meshtype="entropy" linewidth="0" />
-  </plot>
-
-  <plot id="2" basis="xz">
-    <origin>0. 0. 0.</origin>
-    <width>25 25</width>
-    <pixels>200 200</pixels>
-    <mask components="1 3" background="255 255 255" />
-    <meshlines meshtype="tally" id="2" linewidth="0" />
-  </plot>
-
-  <plot id="3" basis="yz" color_by="material">
-    <origin>0. 0. 0.</origin>
-    <width>25 25</width>
-    <pixels>200 200</pixels>
-    <background>0 0 0</background>
-  </plot>
-
-  <plot id="4" type="voxel">
-    <pixels>100 100 10</pixels>
-    <origin>0. 0. 0.</origin>
-    <width>20 20 10</width>
-  </plot>
-
-</plots>
diff --git a/tests/regression_tests/plot/settings.xml b/tests/regression_tests/plot/settings.xml
deleted file mode 100644
index adf256d2d4..0000000000
--- a/tests/regression_tests/plot/settings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <run_mode>plot</run_mode>
-
-  <mesh id="1">
-    <dimension>5 4 3</dimension>
-    <lower_left>-10 -10 -10</lower_left>
-    <upper_right>10 10 10</upper_right>
-  </mesh>
-  <entropy_mesh>1</entropy_mesh>
-
-</settings>
diff --git a/tests/regression_tests/plot/tallies.xml b/tests/regression_tests/plot/tallies.xml
deleted file mode 100644
index b7e678ca0f..0000000000
--- a/tests/regression_tests/plot/tallies.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <mesh id="2" type="rectilinear">
-    <x_grid>-10 10</x_grid>
-    <y_grid>-10 10</y_grid>
-    <z_grid>-10 0 5 7.5 8.75 10</z_grid>
-  </mesh>
-
-  <filter id="1">
-    <type>mesh</type>
-    <bins>2</bins>
-  </filter>
-
-  <tally id="1">
-    <filters>1</filters>
-    <scores>total</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/regression_tests/plot_overlaps/geometry.xml b/tests/regression_tests/plot_overlaps/geometry.xml
deleted file mode 100644
index 7a9f1fb41f..0000000000
--- a/tests/regression_tests/plot_overlaps/geometry.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0 0 2" />
-  <surface id="20" type="z-cylinder" coeffs="0 0 5.5" />
-  <surface id="2" type="z-cylinder" coeffs="0 0 5" />
-  <surface id="3" type="z-cylinder" coeffs="0 0 10" boundary="vacuum" />
-  <surface id="4" type="y-plane" coeffs="5" boundary="vacuum" />
-
-  <cell id="1" material="1" region="  -1 -4" />
-  <cell id="2" material="3" region="1 -20 -4" />
-  <cell id="3" material="2" region="2 -3 -4" />
-
-</geometry>
diff --git a/tests/regression_tests/plot_overlaps/materials.xml b/tests/regression_tests/plot_overlaps/materials.xml
deleted file mode 100644
index 90b3542675..0000000000
--- a/tests/regression_tests/plot_overlaps/materials.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <material id="1">
-    <density value="4.5" units="g/cc" />
-    <nuclide name="U235" ao="1.0" />
-  </material>
-
-  <material id="2">
-    <density value="4.5" units="g/cc" />
-    <nuclide name="U235" ao="1.0" />
-  </material>
-
-  <material id="3">
-    <density value="4.5" units="g/cc" />
-    <nuclide name="U235" ao="1.0" />
-  </material>
-
-</materials>
diff --git a/tests/regression_tests/plot_overlaps/model.xml b/tests/regression_tests/plot_overlaps/model.xml
new file mode 100644
index 0000000000..e3b65d45d4
--- /dev/null
+++ b/tests/regression_tests/plot_overlaps/model.xml
@@ -0,0 +1,65 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </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="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1 -4" universe="0" />
+    <cell id="2" material="3" region="1 -20 -4" universe="0" />
+    <cell id="3" material="2" region="2 -3 -4" universe="0" />
+    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 5.0" id="2" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 10.0" id="3" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="5.0" id="4" type="y-plane" />
+    <surface coeffs="0.0 0.0 5.5" id="20" type="z-cylinder" />
+  </geometry>
+  <settings>
+    <run_mode>plot</run_mode>
+    <entropy_mesh>1</entropy_mesh>
+    <mesh id="1">
+      <dimension>5 4 3</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+  </settings>
+  <plots>
+    <plot basis="xy" color_by="cell" id="1" type="slice">
+      <origin>0.0 0.0 0.0</origin>
+      <width>25.0 25.0</width>
+      <pixels>200 200</pixels>
+      <color id="1" rgb="255 0 0" />
+      <show_overlaps>true</show_overlaps>
+      <meshlines id="1" linewidth="0" meshtype="entropy" />
+    </plot>
+    <plot basis="xz" color_by="cell" id="2" type="slice">
+      <origin>0.0 0.0 0.0</origin>
+      <width>25.0 25.0</width>
+      <pixels>200 200</pixels>
+      <mask background="255 255 255" components="1 3" />
+      <show_overlaps>true</show_overlaps>
+      <overlap_color>255 211 0</overlap_color>
+    </plot>
+    <plot basis="yz" color_by="material" id="3" type="slice">
+      <origin>0.0 0.0 0.0</origin>
+      <width>25.0 25.0</width>
+      <pixels>200 200</pixels>
+      <background>0 0 0</background>
+    </plot>
+    <plot color_by="cell" id="4" type="voxel">
+      <origin>0.0 0.0 0.0</origin>
+      <width>20.0 20.0 10.0</width>
+      <pixels>100 100 10</pixels>
+    </plot>
+  </plots>
+</model>
diff --git a/tests/regression_tests/plot_overlaps/plots.xml b/tests/regression_tests/plot_overlaps/plots.xml
deleted file mode 100644
index 28064f58fb..0000000000
--- a/tests/regression_tests/plot_overlaps/plots.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<plots>
-
-  <plot id="1" basis="xy">
-    <origin>0. 0. 0.</origin>
-    <width>25 25</width>
-    <pixels>200 200</pixels>
-    <color id="1" rgb="255 0 0" /> <!-- Red -->
-    <meshlines meshtype="entropy" linewidth="0" />
-    <show_overlaps>true</show_overlaps>
-  </plot>
-
-  <plot id="2" basis="xz">
-    <origin>0. 0. 0.</origin>
-    <width>25 25</width>
-    <pixels>200 200</pixels>
-    <mask components="1 3" background="255 255 255" />
-    <show_overlaps>true</show_overlaps>
-    <overlap_color>255 211 0</overlap_color>
-  </plot>
-
-  <plot id="3" basis="yz" color_by="material">
-    <origin>0. 0. 0.</origin>
-    <width>25 25</width>
-    <pixels>200 200</pixels>
-    <background>0 0 0</background>
-  </plot>
-
-  <plot id="4" type="voxel">
-    <pixels>100 100 10</pixels>
-    <origin>0. 0. 0.</origin>
-    <width>20 20 10</width>
-  </plot>
-
-</plots>
diff --git a/tests/regression_tests/plot_overlaps/settings.xml b/tests/regression_tests/plot_overlaps/settings.xml
deleted file mode 100644
index adf256d2d4..0000000000
--- a/tests/regression_tests/plot_overlaps/settings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <run_mode>plot</run_mode>
-
-  <mesh id="1">
-    <dimension>5 4 3</dimension>
-    <lower_left>-10 -10 -10</lower_left>
-    <upper_right>10 10 10</upper_right>
-  </mesh>
-  <entropy_mesh>1</entropy_mesh>
-
-</settings>
diff --git a/tests/regression_tests/plot_voxel/geometry.xml b/tests/regression_tests/plot_voxel/geometry.xml
deleted file mode 100644
index 83619d9f78..0000000000
--- a/tests/regression_tests/plot_voxel/geometry.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0 0 2" />
-  <surface id="2" type="z-cylinder" coeffs="0 0 5" />
-  <surface id="3" type="z-cylinder" coeffs="0 0 10" boundary="vacuum" />
-  <surface id="4" type="y-plane" coeffs="5" boundary="vacuum" />
-
-  <cell id="1" material="1" region="  -1 -4" />
-  <cell id="2" material="3" region="1 -2 -4" />
-  <cell id="3" material="2" region="2 -3 -4" />
-
-</geometry>
diff --git a/tests/regression_tests/plot_voxel/materials.xml b/tests/regression_tests/plot_voxel/materials.xml
deleted file mode 100644
index 90b3542675..0000000000
--- a/tests/regression_tests/plot_voxel/materials.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <material id="1">
-    <density value="4.5" units="g/cc" />
-    <nuclide name="U235" ao="1.0" />
-  </material>
-
-  <material id="2">
-    <density value="4.5" units="g/cc" />
-    <nuclide name="U235" ao="1.0" />
-  </material>
-
-  <material id="3">
-    <density value="4.5" units="g/cc" />
-    <nuclide name="U235" ao="1.0" />
-  </material>
-
-</materials>
diff --git a/tests/regression_tests/plot_voxel/model.xml b/tests/regression_tests/plot_voxel/model.xml
new file mode 100644
index 0000000000..7b0e854c57
--- /dev/null
+++ b/tests/regression_tests/plot_voxel/model.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material depletable="true" id="1">
+      <density units="g/cc" value="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </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="4.5" />
+      <nuclide ao="1.0" name="U235" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1 -4" universe="0" />
+    <cell id="2" material="3" region="1 -2 -4" universe="0" />
+    <cell id="3" material="2" region="2 -3 -4" universe="0" />
+    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 5.0" id="2" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 10.0" id="3" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="5.0" id="4" type="y-plane" />
+  </geometry>
+  <settings>
+    <run_mode>plot</run_mode>
+    <entropy_mesh>1</entropy_mesh>
+    <mesh id="1">
+      <dimension>5 4 3</dimension>
+      <lower_left>-10.0 -10.0 -10.0</lower_left>
+      <upper_right>10.0 10.0 10.0</upper_right>
+    </mesh>
+  </settings>
+  <plots>
+    <plot color_by="cell" id="4" type="voxel">
+      <origin>0.0 0.0 0.0</origin>
+      <width>20.0 20.0 10.0</width>
+      <pixels>50 50 10</pixels>
+    </plot>
+  </plots>
+</model>
diff --git a/tests/regression_tests/plot_voxel/plots.xml b/tests/regression_tests/plot_voxel/plots.xml
deleted file mode 100644
index 833329b427..0000000000
--- a/tests/regression_tests/plot_voxel/plots.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<plots>
-
-  <plot id="4" type="voxel">
-    <pixels>50 50 10</pixels>
-    <origin>0. 0. 0.</origin>
-    <width>20 20 10</width>
-  </plot>
-
-</plots>
diff --git a/tests/regression_tests/plot_voxel/settings.xml b/tests/regression_tests/plot_voxel/settings.xml
deleted file mode 100644
index adf256d2d4..0000000000
--- a/tests/regression_tests/plot_voxel/settings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <run_mode>plot</run_mode>
-
-  <mesh id="1">
-    <dimension>5 4 3</dimension>
-    <lower_left>-10 -10 -10</lower_left>
-    <upper_right>10 10 10</upper_right>
-  </mesh>
-  <entropy_mesh>1</entropy_mesh>
-
-</settings>
diff --git a/tests/regression_tests/track_output/geometry.xml b/tests/regression_tests/track_output/geometry.xml
deleted file mode 100644
index 5b16fe26cd..0000000000
--- a/tests/regression_tests/track_output/geometry.xml
+++ /dev/null
@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<geometry>
-
-<!-- Based on ISCBEP model for leu-comp-therm-008 benchmarks (see LA-UR-10-06230) -->
-
-    <!-- pin-cell surfaces -->
-
-      <surface id="1"  type="z-cylinder" coeffs="0.0 0.0 0.514858"/>       <!-- fuel OR       -->
-      <surface id="2"  type="z-cylinder" coeffs="0.0 0.0 0.602996"/>       <!-- fuel clad OR  -->
-
-      <surface id="3"  type="z-cylinder" coeffs="0.0 0.0 0.585000"/>       <!-- pyrex OR      -->
-
-      <surface id="99" type="sphere"     coeffs="0.0 0.0 0.0 400.0"/>      <!-- dummy outer boundary -->
-
-    <!-- pin-cell construction -->
-
-      <!-- Water pin-cell -->
-      <cell id="11" universe="1" material="1" region="-99"/>
-      <cell id="12" universe="1" material="1" region=" 99"/>
-
-      <!-- Fuel Rod -->
-      <cell id="21" universe="2" material="2" region="  -1"/>  <!-- fuel  -->
-      <cell id="22" universe="2" material="3" region="1 -2"/>  <!-- clad  -->
-      <cell id="23" universe="2" material="1" region="   2"/>  <!-- water -->
-
-      <!-- Pyrex Rod -->
-      <cell id="31" universe="3" material="4" region="  -3"/>  <!-- pyrex -->
-      <cell id="32" universe="3" material="1" region="   3"/>  <!-- water -->
-
-  <!-- Assembly construction -->
-
-    <!-- Dummy Water Assembly Universe -->
-      <cell id="99" universe="999" fill="1" region="-99"/>
-
-    <!-- Central Fuel Assemblies -->
-
-      <!-- Central Fuel Assembly -->      
-      <lattice id="11" dimension="15 15">
-        <lower_left> -12.2682 -12.2682 </lower_left>
-        <pitch>    1.63576 1.63576 </pitch>
-        <universes>
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 1 2 2 2 1 2 2 2 2 2
-          2 2 2 3 2 2 2 2 2 2 2 3 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 1 2 2 1 2 2 2 1 2 2 1 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 1 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 1 2 2 1 2 2 2 1 2 2 1 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 3 2 2 2 2 2 2 2 3 2 2 2
-          2 2 2 2 2 1 2 2 2 1 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-        </universes>
-      </lattice>
-      <cell id="111" universe="111" fill="11" region=""/>
-      
-      <!-- North Fuel Assembly -->      
-      <lattice id="22" dimension="15 15">
-        <lower_left> -12.2682 -12.2682 </lower_left>
-        <pitch>    1.63576 1.63576 </pitch>
-        <universes>
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 1 2 2 2 1 2 2 2 2 2
-          2 2 2 1 2 2 2 2 2 2 2 1 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 1 2 2 1 2 2 2 1 2 2 1 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 1 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 1 2 2 1 2 2 2 1 2 2 1 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 3 2 2 2 2 2 2 2 3 2 2 2
-          2 2 2 2 2 1 2 2 2 1 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-        </universes>
-      </lattice>
-      <cell id="222" universe="222" fill="22" region=""/>                     <!-- north -->
-      <cell id="444" universe="444" fill="222" region="" rotation="0 0 90"/>  <!-- west  -->
-      <cell id="555" universe="555" fill="222" region="" rotation="0 0 180"/> <!-- south -->
-      <cell id="666" universe="666" fill="222" region="" rotation="0 0 270"/> <!-- east  -->
-      
-      <!-- Northeast Fuel Assembly -->      
-      <lattice id="33" dimension="15 15">
-        <lower_left> -12.2682 -12.2682 </lower_left>
-        <pitch>    1.63576 1.63576 </pitch>
-        <universes>
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 1 2 2 2 1 2 2 2 2 2
-          2 2 2 1 2 2 2 2 2 2 2 1 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 1 2 2 1 2 2 2 1 2 2 1 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 1 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 1 2 2 1 2 2 2 1 2 2 1 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 3 2 2 2 2 2 2 2 1 2 2 2
-          2 2 2 2 2 1 2 2 2 1 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-        </universes>
-      </lattice>
-      <cell id="333" universe="333" fill="33" region=""/>                     <!-- northeast -->
-      <cell id="777" universe="777" fill="333" region="" rotation="0 0 90"/>  <!-- northwest -->
-      <cell id="888" universe="888" fill="333" region="" rotation="0 0 180"/> <!-- southwest -->
-      <cell id="998" universe="998" fill="333" region="" rotation="0 0 270"/> <!-- southeast -->
-
-    <!-- Surrounding Driver Assemblies -->
-
-      <!-- Full Driver Assembly -->
-      <lattice id="24" dimension="15 15">
-        <lower_left> -12.2682 -12.2682 </lower_left>
-        <pitch>    1.63576 1.63576 </pitch>
-        <universes>
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-        </universes>
-      </lattice>
-      <cell id="240" universe="240" fill="24" region="-99"/>
-
-      <!-- North Edge -->
-      <lattice id="14" dimension="15 15">
-        <lower_left> -12.2682 -12.2682 </lower_left>
-        <pitch>    1.63576 1.63576 </pitch>
-        <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 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 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 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 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 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-        </universes>
-      </lattice>
-      <cell id="140" universe="140" fill="14" region=""/>                     <!-- north -->
-      <cell id="410" universe="410" fill="140" region="" rotation="0 0 90"/>  <!-- east  -->
-      <cell id="740" universe="740" fill="140" region="" rotation="0 0 180"/> <!-- south -->
-      <cell id="470" universe="470" fill="140" region="" rotation="0 0 270"/> <!-- west  -->
-
-      <!-- Northeast Edge Corner -->
-      <lattice id="15" dimension="15 15">
-        <lower_left> -12.2682 -12.2682 </lower_left>
-        <pitch>    1.63576 1.63576 </pitch>
-        <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 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 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 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 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 2 2 1 1 1 1 1 1 1 1 1 1 1 1
-          2 2 2 1 1 1 1 1 1 1 1 1 1 1 1
-          2 2 2 1 1 1 1 1 1 1 1 1 1 1 1
-        </universes>
-      </lattice>
-      <cell id="150" universe="150" fill="15" region=""/>                     <!-- northeast -->
-      <cell id="130" universe="130" fill="150" region="" rotation="0 0 90"/>  <!-- northwest -->
-      <cell id="510" universe="510" fill="150" region="" rotation="0 0 180"/> <!-- southwest -->
-      <cell id="570" universe="570" fill="150" region="" rotation="0 0 270"/> <!-- southeast -->
-
-      <!-- Northeast Top Steps -->
-      <lattice id="25" dimension="15 15">
-        <lower_left> -12.2682 -12.2682 </lower_left>
-        <pitch>    1.63576 1.63576 </pitch>
-        <universes>
-          2 2 2 1 1 1 1 1 1 1 1 1 1 1 1
-          2 2 2 1 1 1 1 1 1 1 1 1 1 1 1
-          2 2 2 2 2 2 2 2 2 2 2 2 2 1 1
-          2 2 2 2 2 2 2 2 2 2 2 2 2 1 1
-          2 2 2 2 2 2 2 2 2 2 2 2 2 1 1
-          2 2 2 2 2 2 2 2 2 2 2 2 2 1 1
-          2 2 2 2 2 2 2 2 2 2 2 2 2 1 1
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-        </universes>
-      </lattice>
-      <cell id="250" universe="250" fill="25" region=""/>                     <!-- northeast -->
-      <cell id="320" universe="320" fill="250" region="" rotation="0 0 90"/>  <!-- northwest -->
-      <cell id="630" universe="630" fill="250" region="" rotation="0 0 180"/> <!-- southwest -->
-      <cell id="560" universe="560" fill="250" region="" rotation="0 0 270"/> <!-- southeast -->
-
-
-      <!-- Northeast Middle Corner -->
-      <lattice id="26" dimension="15 15">
-        <lower_left> -12.2682 -12.2682 </lower_left>
-        <pitch>    1.63576 1.63576 </pitch>
-        <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 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 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 2 2 2 2 2 2 2 1 1 1 1 1 1 1
-          2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 
-          2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 
-          2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 
-          2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 
-          2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 
-          2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 
-          2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 
-        </universes>
-      </lattice>
-      <cell id="260" universe="260" fill="26" region=""/>                     <!-- northeast -->
-      <cell id="220" universe="220" fill="260" region="" rotation="0 0 90"/>  <!-- southeast -->
-      <cell id="620" universe="620" fill="260" region="" rotation="0 0 180"/> <!-- southwest -->
-      <cell id="660" universe="660" fill="260" region="" rotation="0 0 270"/> <!-- northwest -->
-
-      <!-- Northeast Bottom Steps -->
-      <lattice id="36" dimension="15 15">
-        <lower_left> -12.2682 -12.2682 </lower_left>
-        <pitch>    1.63576 1.63576 </pitch>
-        <universes>
-          2 2 2 2 2 2 2 2 1 1 1 1 1 1 1
-          2 2 2 2 2 2 2 2 1 1 1 1 1 1 1
-          2 2 2 2 2 2 2 2 2 2 2 2 2 1 1
-          2 2 2 2 2 2 2 2 2 2 2 2 2 1 1
-          2 2 2 2 2 2 2 2 2 2 2 2 2 1 1
-          2 2 2 2 2 2 2 2 2 2 2 2 2 1 1
-          2 2 2 2 2 2 2 2 2 2 2 2 2 1 1
-          2 2 2 2 2 2 2 2 2 2 2 2 2 1 1
-          2 2 2 2 2 2 2 2 2 2 2 2 2 1 1
-          2 2 2 2 2 2 2 2 2 2 2 2 2 1 1
-          2 2 2 2 2 2 2 2 2 2 2 2 2 1 1
-          2 2 2 2 2 2 2 2 2 2 2 2 2 1 1
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-          2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
-        </universes>
-      </lattice>
-      <cell id="360" universe="360" fill="36" region=""/>                     <!-- northeast -->
-      <cell id="230" universe="230" fill="360" region="" rotation="0 0 90"/>  <!-- southeast -->
-      <cell id="520" universe="520" fill="360" region="" rotation="0 0 180"/> <!-- southwest -->
-      <cell id="650" universe="650" fill="360" region="" rotation="0 0 270"/> <!-- northwest -->
-
-
-  <!-- Core construction -->
-
-    <!-- Core Surfaces -->
-    <surface id="10" type="z-plane"    coeffs="       -81.662" boundary="vacuum"/>
-    <surface id="20" type="z-plane"    coeffs="        81.662" boundary="vacuum"/>
-    <surface id="30" type="z-cylinder" coeffs="0.0 0.0 76.200" />
-    <surface id="40" type="z-cylinder" coeffs="0.0 0.0 77.470" boundary="vacuum"/>
-
-    <!-- Core lattice -->
-    <lattice id="99" dimension="7 7">
-      <lower_left> -85.8774 -85.8774 </lower_left>
-      <pitch>   24.5364  24.5364 </pitch>
-      <universes>
-          999 999 130 140 150 999 999
-          999 220 230 240 250 260 999
-          130 320 777 222 333 360 150
-          410 240 444 111 666 240 470
-          510 520 888 555 998 560 570
-          999 620 630 240 650 660 999
-          999 999 510 740 570 999 999
-      </universes>
-    </lattice>
-
-    <!-- Core Bounding Cell -->
-    <cell id="1111" universe="0" fill="99"   region="10 -20 -30"/>
-    <cell id="1112" universe="0" material="3" region="10 -20 30 -40"/>
-
-</geometry>
diff --git a/tests/regression_tests/track_output/materials.xml b/tests/regression_tests/track_output/materials.xml
deleted file mode 100644
index 5dc9a64755..0000000000
--- a/tests/regression_tests/track_output/materials.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-<!-- material 1: Water with 1511 PPM -->
-  <material id="1">
-    <density value="0.99823" units="g/cc" />
-    <nuclide name="H1"  ao="6.6737E-002" />
-    <nuclide name="O16" ao="3.3369E-002" />
-    <nuclide name="B10" ao="1.6769E-005" />
-    <nuclide name="B11" ao="6.7497E-005" />
-    <sab name="c_H_in_H2O" />
-  </material>
-
-<!-- material 2: Fuel (2.459 w/o with B-10 for impurities) -->
-  <material id="2">
-    <density value="10.24" units="g/cc" />
-    <nuclide name="U235" ao="5.6868E-004" />
-<!--    <nuclide name="U234" ao="4.5689E-006" />  -->
-    <nuclide name="U238" ao="2.2268E-002" />
-    <nuclide name="O16"  ao="4.5683E-002" />
-    <nuclide name="B10"  ao="2.6055E-007" />
-  </material>
-
-  <!--               Zircaloy-4               -->
-  <material id="3">
-    <density value="  6.55" units="g/cc" />
-    <nuclide name="O16"  ao="3.0743e-04" />
-<!--    <nuclide name="O17"  ao="7.4887e-07" />-->
-<!--    <nuclide name="Cr50"  ao="3.2962e-06" />-->
-<!--    <nuclide name="Cr52"  ao="6.3564e-05" />-->
-<!--    <nuclide name="Cr53"  ao="7.2076e-06" />-->
-<!--    <nuclide name="Cr54"  ao="1.7941e-06" />-->
-<!--    <nuclide name="Fe54"  ao="8.6699e-06" />-->
-<!--    <nuclide name="Fe56"  ao="1.3610e-04" />-->
-<!--    <nuclide name="Fe57"  ao="3.1431e-06" />-->
-<!--    <nuclide name="Fe58"  ao="4.1829e-07" />-->
-    <nuclide name="Zr90"  ao="2.1827e-02" />
-    <nuclide name="Zr91"  ao="4.7600e-03" />
-    <nuclide name="Zr92"  ao="7.2758e-03" />
-    <nuclide name="Zr94"  ao="7.3734e-03" />
-    <nuclide name="Zr96"  ao="1.1879e-03" />
-<!--    <nuclide name="Sn112"  ao="4.6735e-06" />-->
-<!--    <nuclide name="Sn114"  ao="3.1799e-06" />-->
-<!--    <nuclide name="Sn115"  ao="1.6381e-06" />-->
-<!--    <nuclide name="Sn116"  ao="7.0055e-05" />-->
-<!--    <nuclide name="Sn117"  ao="3.7003e-05" />-->
-<!--    <nuclide name="Sn118"  ao="1.1669e-04" />-->
-<!--    <nuclide name="Sn119"  ao="4.1387e-05" />-->
-<!--    <nuclide name="Sn120"  ao="1.5697e-04" />-->
-<!--    <nuclide name="Sn122"  ao="2.2308e-05" />-->
-<!--    <nuclide name="Sn124"  ao="2.7897e-05" />-->
-  </material>
-
-<!-- material 3: Fuel Aluminum 6061 cladding -->
-<!--  <material id="3">-->
-<!--    <density value="2.5052" units="g/cc" />-->
-<!--    <nuclide name="Al27" ao="5.3985e-02" />-->
-<!--    <nuclide name="Mn55" ao="4.1191e-05" />-->
-<!--    <nuclide name="Mg24" ao="4.9031e-04" />-->
-<!--    <nuclide name="Mg25" ao="6.2072e-05" />-->
-<!--    <nuclide name="Mg26" ao="6.8341e-05" />-->
-<!--    <nuclide name="Si28" ao="2.9726e-04" />-->
-<!--    <nuclide name="Si29" ao="1.5094e-05" />-->
-<!--    <nuclide name="Si30" ao="9.9499e-06" />-->
-<!--    <nuclide name="Cr50" ao="2.5214e-06" />-->
-<!--    <nuclide name="Cr52" ao="4.8622e-05" />-->
-<!--    <nuclide name="Cr53" ao="5.5133e-06" />-->
-<!--    <nuclide name="Cr54" ao="1.3724e-06" />-->
-<!--    <nuclide name="Fe54" ao="1.1053e-05" />-->
-<!--    <nuclide name="Fe56" ao="1.7351e-04" />-->
-<!--    <nuclide name="Fe57" ao="4.0070e-06" />-->
-<!--    <nuclide name="Fe58" ao="5.3326e-07" />-->
-<!--    <nuclide name="Ti46" ao="3.8992e-06" />-->
-<!--    <nuclide name="Ti47" ao="3.5164e-06" />-->
-<!--    <nuclide name="Ti48" ao="3.4842e-05" />-->
-<!--    <nuclide name="Ti49" ao="2.5569e-06" />-->
-<!--    <nuclide name="Ti50" ao="2.4482e-06" />-->
-<!--    <nuclide name="Cu63" ao="4.1054e-05" />-->
-<!--    <nuclide name="Cu65" ao="1.8299e-05" />-->
-<!--  </material>-->
-
-<!-- material 4: Control Rod Material -->
-  <material id="4">
-    <density value="2.2442" units="g/cc" />
-    <nuclide name="B10"  ao="9.7491e-4" />
-    <nuclide name="B11"  ao="3.9241e-3" />
-    <nuclide name="O16"  ao="4.4829e-2" />
-<!--    <nuclide name="Na23" ao="1.7444e-3" />-->
-<!--    <nuclide name="Al27" ao="1.0018e-3" />-->
-<!--    <nuclide name="Si28" ao="1.6884e-02" />-->
-<!--    <nuclide name="Si29" ao="8.5730e-04" />-->
-<!--    <nuclide name="Si30" ao="5.6513e-04" />-->
-  </material>
-
-</materials>
diff --git a/tests/regression_tests/track_output/model.xml b/tests/regression_tests/track_output/model.xml
new file mode 100644
index 0000000000..36ccb2b468
--- /dev/null
+++ b/tests/regression_tests/track_output/model.xml
@@ -0,0 +1,299 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="1">
+      <density units="g/cc" value="0.99823" />
+      <nuclide ao="0.066737" name="H1" />
+      <nuclide ao="0.033369" name="O16" />
+      <nuclide ao="1.6769e-05" name="B10" />
+      <nuclide ao="6.7497e-05" name="B11" />
+      <sab name="c_H_in_H2O" />
+    </material>
+    <material depletable="true" id="2">
+      <density units="g/cc" value="10.24" />
+      <nuclide ao="0.00056868" name="U235" />
+      <nuclide ao="0.022268" name="U238" />
+      <nuclide ao="0.045683" name="O16" />
+      <nuclide ao="2.6055e-07" name="B10" />
+    </material>
+    <material id="3">
+      <density units="g/cc" value="6.55" />
+      <nuclide ao="0.00030743" name="O16" />
+      <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="4">
+      <density units="g/cc" value="2.2442" />
+      <nuclide ao="0.00097491" name="B10" />
+      <nuclide ao="0.0039241" name="B11" />
+      <nuclide ao="0.044829" name="O16" />
+    </material>
+  </materials>
+  <geometry>
+    <cell id="11" material="1" region="-99" universe="1" />
+    <cell id="12" material="1" region="99" universe="1" />
+    <cell id="21" material="2" region="-1" universe="2" />
+    <cell id="22" material="3" region="1 -2" universe="2" />
+    <cell id="23" material="1" region="2" universe="2" />
+    <cell id="31" material="4" region="-3" universe="3" />
+    <cell id="32" material="1" region="3" universe="3" />
+    <cell fill="1" id="99" region="-99" universe="999" />
+    <cell fill="11" id="111" universe="111" />
+    <cell fill="150" id="130" rotation="0.0 0.0 90.0" universe="130" />
+    <cell fill="14" id="140" universe="140" />
+    <cell fill="15" id="150" universe="150" />
+    <cell fill="260" id="220" rotation="0.0 0.0 90.0" universe="220" />
+    <cell fill="22" id="222" universe="222" />
+    <cell fill="360" id="230" rotation="0.0 0.0 90.0" universe="230" />
+    <cell fill="24" id="240" region="-99" universe="240" />
+    <cell fill="25" id="250" universe="250" />
+    <cell fill="26" id="260" universe="260" />
+    <cell fill="250" id="320" rotation="0.0 0.0 90.0" universe="320" />
+    <cell fill="33" id="333" universe="333" />
+    <cell fill="36" id="360" universe="360" />
+    <cell fill="140" id="410" rotation="0.0 0.0 90.0" universe="410" />
+    <cell fill="222" id="444" rotation="0.0 0.0 90.0" universe="444" />
+    <cell fill="140" id="470" rotation="0.0 0.0 270.0" universe="470" />
+    <cell fill="150" id="510" rotation="0.0 0.0 180.0" universe="510" />
+    <cell fill="360" id="520" rotation="0.0 0.0 180.0" universe="520" />
+    <cell fill="222" id="555" rotation="0.0 0.0 180.0" universe="555" />
+    <cell fill="250" id="560" rotation="0.0 0.0 270.0" universe="560" />
+    <cell fill="150" id="570" rotation="0.0 0.0 270.0" universe="570" />
+    <cell fill="260" id="620" rotation="0.0 0.0 180.0" universe="620" />
+    <cell fill="250" id="630" rotation="0.0 0.0 180.0" universe="630" />
+    <cell fill="360" id="650" rotation="0.0 0.0 270.0" universe="650" />
+    <cell fill="260" id="660" rotation="0.0 0.0 270.0" universe="660" />
+    <cell fill="222" id="666" rotation="0.0 0.0 270.0" universe="666" />
+    <cell fill="140" id="740" rotation="0.0 0.0 180.0" universe="740" />
+    <cell fill="333" id="777" rotation="0.0 0.0 90.0" universe="777" />
+    <cell fill="333" id="888" rotation="0.0 0.0 180.0" universe="888" />
+    <cell fill="333" id="998" rotation="0.0 0.0 270.0" universe="998" />
+    <cell fill="99" id="1111" region="10 -20 -30" universe="0" />
+    <cell id="1112" material="3" region="10 -20 30 -40" universe="0" />
+    <lattice id="11">
+      <pitch>1.63576 1.63576</pitch>
+      <dimension>15 15</dimension>
+      <lower_left>-12.2682 -12.2682</lower_left>
+      <universes>
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 1 2 2 2 1 2 2 2 2 2 
+2 2 2 3 2 2 2 2 2 2 2 3 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 1 2 2 1 2 2 2 1 2 2 1 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 1 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 1 2 2 1 2 2 2 1 2 2 1 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 3 2 2 2 2 2 2 2 3 2 2 2 
+2 2 2 2 2 1 2 2 2 1 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 </universes>
+    </lattice>
+    <lattice id="14">
+      <pitch>1.63576 1.63576</pitch>
+      <dimension>15 15</dimension>
+      <lower_left>-12.2682 -12.2682</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 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 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 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 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 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 </universes>
+    </lattice>
+    <lattice id="15">
+      <pitch>1.63576 1.63576</pitch>
+      <dimension>15 15</dimension>
+      <lower_left>-12.2682 -12.2682</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 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 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 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 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 2 2 1 1 1 1 1 1 1 1 1 1 1 1 
+2 2 2 1 1 1 1 1 1 1 1 1 1 1 1 
+2 2 2 1 1 1 1 1 1 1 1 1 1 1 1 </universes>
+    </lattice>
+    <lattice id="22">
+      <pitch>1.63576 1.63576</pitch>
+      <dimension>15 15</dimension>
+      <lower_left>-12.2682 -12.2682</lower_left>
+      <universes>
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 1 2 2 2 1 2 2 2 2 2 
+2 2 2 1 2 2 2 2 2 2 2 1 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 1 2 2 1 2 2 2 1 2 2 1 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 1 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 1 2 2 1 2 2 2 1 2 2 1 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 3 2 2 2 2 2 2 2 3 2 2 2 
+2 2 2 2 2 1 2 2 2 1 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 </universes>
+    </lattice>
+    <lattice id="24">
+      <pitch>1.63576 1.63576</pitch>
+      <dimension>15 15</dimension>
+      <lower_left>-12.2682 -12.2682</lower_left>
+      <universes>
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 </universes>
+    </lattice>
+    <lattice id="25">
+      <pitch>1.63576 1.63576</pitch>
+      <dimension>15 15</dimension>
+      <lower_left>-12.2682 -12.2682</lower_left>
+      <universes>
+2 2 2 1 1 1 1 1 1 1 1 1 1 1 1 
+2 2 2 1 1 1 1 1 1 1 1 1 1 1 1 
+2 2 2 2 2 2 2 2 2 2 2 2 2 1 1 
+2 2 2 2 2 2 2 2 2 2 2 2 2 1 1 
+2 2 2 2 2 2 2 2 2 2 2 2 2 1 1 
+2 2 2 2 2 2 2 2 2 2 2 2 2 1 1 
+2 2 2 2 2 2 2 2 2 2 2 2 2 1 1 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 </universes>
+    </lattice>
+    <lattice id="26">
+      <pitch>1.63576 1.63576</pitch>
+      <dimension>15 15</dimension>
+      <lower_left>-12.2682 -12.2682</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 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 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 2 2 2 2 2 2 2 1 1 1 1 1 1 1 
+2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 
+2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 
+2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 
+2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 
+2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 
+2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 
+2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 </universes>
+    </lattice>
+    <lattice id="33">
+      <pitch>1.63576 1.63576</pitch>
+      <dimension>15 15</dimension>
+      <lower_left>-12.2682 -12.2682</lower_left>
+      <universes>
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 1 2 2 2 1 2 2 2 2 2 
+2 2 2 1 2 2 2 2 2 2 2 1 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 1 2 2 1 2 2 2 1 2 2 1 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 1 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 1 2 2 1 2 2 2 1 2 2 1 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 3 2 2 2 2 2 2 2 1 2 2 2 
+2 2 2 2 2 1 2 2 2 1 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 </universes>
+    </lattice>
+    <lattice id="36">
+      <pitch>1.63576 1.63576</pitch>
+      <dimension>15 15</dimension>
+      <lower_left>-12.2682 -12.2682</lower_left>
+      <universes>
+2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 
+2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 
+2 2 2 2 2 2 2 2 2 2 2 2 2 1 1 
+2 2 2 2 2 2 2 2 2 2 2 2 2 1 1 
+2 2 2 2 2 2 2 2 2 2 2 2 2 1 1 
+2 2 2 2 2 2 2 2 2 2 2 2 2 1 1 
+2 2 2 2 2 2 2 2 2 2 2 2 2 1 1 
+2 2 2 2 2 2 2 2 2 2 2 2 2 1 1 
+2 2 2 2 2 2 2 2 2 2 2 2 2 1 1 
+2 2 2 2 2 2 2 2 2 2 2 2 2 1 1 
+2 2 2 2 2 2 2 2 2 2 2 2 2 1 1 
+2 2 2 2 2 2 2 2 2 2 2 2 2 1 1 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 </universes>
+    </lattice>
+    <lattice id="99">
+      <pitch>24.5364 24.5364</pitch>
+      <dimension>7 7</dimension>
+      <lower_left>-85.8774 -85.8774</lower_left>
+      <universes>
+999 999 130 140 150 999 999 
+999 220 230 240 250 260 999 
+130 320 777 222 333 360 150 
+410 240 444 111 666 240 470 
+510 520 888 555 998 560 570 
+999 620 630 240 650 660 999 
+999 999 510 740 570 999 999 </universes>
+    </lattice>
+    <surface coeffs="0.0 0.0 0.514858" id="1" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.602996" id="2" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.585" id="3" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="-81.662" id="10" type="z-plane" />
+    <surface boundary="vacuum" coeffs="81.662" id="20" type="z-plane" />
+    <surface coeffs="0.0 0.0 76.2" id="30" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 77.47" id="40" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.0 400.0" id="99" type="sphere" />
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>2</batches>
+    <inactive>0</inactive>
+    <source strength="1.0">
+      <space type="box">
+        <parameters>-1.0 -1.0 -1.0 1.0 1.0 1.0</parameters>
+      </space>
+    </source>
+    <track>1 1 1 1 1 30 2 1 60</track>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/track_output/settings.xml b/tests/regression_tests/track_output/settings.xml
deleted file mode 100644
index dcfa118c85..0000000000
--- a/tests/regression_tests/track_output/settings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings>
-
-  <!-- Parameters for criticality calculation -->
-  <run_mode>eigenvalue</run_mode>
-  <batches>2</batches>
-  <inactive>0</inactive>
-  <particles>100</particles>
-
-  <!-- Starting source -->
-  <source>
-    <space type="box">
-      <parameters>-1 -1 -1  1  1  1</parameters>
-    </space>
-  </source>
-
-  <track>
-    1 1 1
-    1 1 30
-    2 1 60
-  </track>
-
-</settings>