From 1cb22075efdb90570f233a3d26151f7b763f8529 Mon Sep 17 00:00:00 2001
From: Patrick Myers <90068356+myerspat@users.noreply.github.com>
Date: Tue, 9 May 2023 11:41:04 -0400
Subject: [PATCH] Changed xml to lxml (#2489)

---
 docs/requirements-rtd.txt                     |    1 +
 openmc/_xml.py                                |    6 +-
 openmc/cell.py                                |    6 +-
 openmc/data/library.py                        |    2 +-
 openmc/deplete/chain.py                       |   16 +-
 openmc/deplete/nuclide.py                     |   25 +-
 openmc/element.py                             |    2 +-
 openmc/filter.py                              |   14 +-
 openmc/filter_expansion.py                    |   10 +-
 openmc/geometry.py                            |    4 +-
 openmc/lattice.py                             |    8 +-
 openmc/material.py                            |   12 +-
 openmc/mesh.py                                |   28 +-
 openmc/model/model.py                         |   10 +-
 openmc/plots.py                               |   16 +-
 openmc/settings.py                            |    4 +-
 openmc/source.py                              |    6 +-
 openmc/stats/multivariate.py                  |   38 +-
 openmc/stats/univariate.py                    |   34 +-
 openmc/surface.py                             |   12 +-
 openmc/tallies.py                             |    8 +-
 openmc/tally_derivative.py                    |    6 +-
 openmc/trigger.py                             |    6 +-
 openmc/universe.py                            |    6 +-
 openmc/volume.py                              |    6 +-
 openmc/weight_windows.py                      |    8 +-
 .../adj_cell_rotation/inputs_true.dat         |   32 +-
 .../asymmetric_lattice/inputs_true.dat        |  286 +--
 .../cpp_driver/inputs_true.dat                |   36 +-
 .../create_fission_neutrons/inputs_true.dat   |   22 +-
 .../dagmc/external/inputs_true.dat            |   14 +-
 .../dagmc/legacy/inputs_true.dat              |   14 +-
 .../dagmc/refl/inputs_true.dat                |    2 +-
 .../dagmc/universes/inputs_true.dat           |   50 +-
 .../dagmc/uwuw/inputs_true.dat                |    2 +-
 .../last_step_reference_materials.xml         | 1804 ++++++++---------
 .../diff_tally/inputs_true.dat                |  344 ++--
 .../distribmat/inputs_true.dat                |   32 +-
 .../eigenvalue_genperbatch/inputs_true.dat    |    8 +-
 .../energy_cutoff/inputs_true.dat             |   20 +-
 .../energy_laws/inputs_true.dat               |   16 +-
 .../external_moab/inputs_true.dat             |   66 +-
 .../filter_cellinstance/inputs_true.dat       |   32 +-
 .../filter_energyfun/inputs_true.dat          |    8 +-
 .../filter_mesh/inputs_true.dat               |   32 +-
 .../filter_translations/inputs_true.dat       |   32 +-
 .../fixed_source/inputs_true.dat              |   10 +-
 .../iso_in_lab/inputs_true.dat                |  334 +--
 .../lattice_hex_coincident/inputs_true.dat    |   76 +-
 .../lattice_hex_x/inputs_true.dat             |   96 +-
 .../lattice_multiple/inputs_true.dat          |   38 +-
 .../lattice_rotated/inputs_true.dat           |   42 +-
 .../regression_tests/mg_basic/inputs_true.dat |   52 +-
 .../mg_basic_delayed/inputs_true.dat          |   50 +-
 .../mg_convert/inputs_true.dat                |   14 +-
 .../mg_legendre/inputs_true.dat               |   10 +-
 .../mg_max_order/inputs_true.dat              |   10 +-
 .../mg_survival_biasing/inputs_true.dat       |   10 +-
 .../mg_tallies/inputs_true.dat                |   10 +-
 .../mgxs_library_ce_to_mg/inputs_true.dat     |   52 +-
 .../inputs_true.dat                           |   52 +-
 .../mgxs_library_condense/inputs_true.dat     |   52 +-
 .../mgxs_library_correction/inputs_true.dat   |   52 +-
 .../mgxs_library_distribcell/inputs_true.dat  |   60 +-
 .../mgxs_library_hdf5/inputs_true.dat         |   52 +-
 .../mgxs_library_histogram/inputs_true.dat    |   52 +-
 .../mgxs_library_mesh/inputs_true.dat         |   32 +-
 .../mgxs_library_no_nuclides/inputs_true.dat  |   52 +-
 .../mgxs_library_nuclides/inputs_true.dat     |   52 +-
 .../inputs_true.dat                           |   52 +-
 .../adj_cell_rotation_inputs_true.dat         |   32 +-
 .../model_xml/energy_laws_inputs_true.dat     |   16 +-
 .../model_xml/inputs_true.dat                 |   20 +-
 .../lattice_multiple_inputs_true.dat          |   38 +-
 .../photon_production_inputs_true.dat         |   20 +-
 .../multipole/inputs_true.dat                 |   30 +-
 .../regression_tests/ncrystal/inputs_true.dat |   14 +-
 .../regression_tests/periodic/inputs_true.dat |   30 +-
 .../periodic_6fold/inputs_true.dat            |   24 +-
 .../periodic_hex/inputs_true.dat              |   18 +-
 .../photon_production/inputs_true.dat         |   20 +-
 .../photon_production_fission/inputs_true.dat |    8 +-
 .../photon_source/inputs_true.dat             |   16 +-
 .../resonance_scattering/inputs_true.dat      |   14 +-
 .../salphabeta/inputs_true.dat                |   68 +-
 .../score_current/inputs_true.dat             |   32 +-
 tests/regression_tests/source/inputs_true.dat |   66 +-
 .../source_dlopen/inputs_true.dat             |   16 +-
 .../inputs_true.dat                           |   16 +-
 .../surface_source/inputs_true_read.dat       |   16 +-
 .../surface_source/inputs_true_write.dat      |   16 +-
 .../surface_tally/inputs_true.dat             |   32 +-
 .../regression_tests/tallies/inputs_true.dat  |  334 +--
 .../tally_aggregation/inputs_true.dat         |   34 +-
 .../tally_arithmetic/inputs_true.dat          |   24 +-
 .../tally_slice_merge/inputs_true.dat         |  334 +--
 tests/regression_tests/torus/inputs_true.dat  |   34 +-
 .../torus/large_major/inputs_true.dat         |   20 +-
 .../inputs_true.dat                           |    8 +-
 tests/regression_tests/triso/inputs_true.dat  |  788 +++----
 .../unstructured_mesh/inputs_true.dat         |   66 +-
 .../unstructured_mesh/inputs_true0.dat        |   66 +-
 .../unstructured_mesh/inputs_true1.dat        |   66 +-
 .../unstructured_mesh/inputs_true10.dat       |   66 +-
 .../unstructured_mesh/inputs_true11.dat       |   66 +-
 .../unstructured_mesh/inputs_true12.dat       |   66 +-
 .../unstructured_mesh/inputs_true13.dat       |   66 +-
 .../unstructured_mesh/inputs_true14.dat       |   66 +-
 .../unstructured_mesh/inputs_true15.dat       |   66 +-
 .../unstructured_mesh/inputs_true2.dat        |   66 +-
 .../unstructured_mesh/inputs_true3.dat        |   66 +-
 .../unstructured_mesh/inputs_true4.dat        |   68 +-
 .../unstructured_mesh/inputs_true5.dat        |   68 +-
 .../unstructured_mesh/inputs_true6.dat        |   68 +-
 .../unstructured_mesh/inputs_true7.dat        |   68 +-
 .../unstructured_mesh/inputs_true8.dat        |   66 +-
 .../unstructured_mesh/inputs_true9.dat        |   66 +-
 tests/regression_tests/void/inputs_true.dat   |  206 +-
 .../volume_calc/inputs_true.dat               |   38 +-
 .../volume_calc/inputs_true_mg.dat            |   36 +-
 .../weightwindows/inputs_true.dat             |   48 +-
 tests/unit_tests/test_cell.py                 |    2 +-
 tests/unit_tests/test_deplete_nuclide.py      |    4 +-
 tests/unit_tests/test_geometry.py             |    2 +-
 tests/unit_tests/test_lattice.py              |    2 +-
 tests/unit_tests/test_universe.py             |    2 +-
 126 files changed, 4023 insertions(+), 4043 deletions(-)

diff --git a/docs/requirements-rtd.txt b/docs/requirements-rtd.txt
index 9591d482f6..df03335170 100644
--- a/docs/requirements-rtd.txt
+++ b/docs/requirements-rtd.txt
@@ -10,3 +10,4 @@ h5py
 pandas
 uncertainties
 matplotlib
+lxml
diff --git a/openmc/_xml.py b/openmc/_xml.py
index 78bcbc264f..b40ecb258a 100644
--- a/openmc/_xml.py
+++ b/openmc/_xml.py
@@ -43,7 +43,7 @@ def get_text(elem, name, default=None):
 
     Parameters
     ----------
-    elem : xml.etree.ElementTree.Element
+    elem : lxml.etree._Element
         Element from which to search
     name : str
         Name of attribute/subelement
@@ -68,7 +68,7 @@ def reorder_attributes(root):
 
     Parameters
     ----------
-    root : xml.etree.ElementTree.Element
+    root : lxml.etree._Element
         Root element
 
     """
@@ -86,7 +86,7 @@ def get_elem_tuple(elem, name, dtype=int):
 
     Parameters
     ----------
-    elem : xml.etree.ElementTree.Element
+    elem : lxml.etree._Element
         XML element that should contain a tuple
     name : str
         Name of the subelement to obtain tuple from
diff --git a/openmc/cell.py b/openmc/cell.py
index 67735ef5e9..5797bc0f62 100644
--- a/openmc/cell.py
+++ b/openmc/cell.py
@@ -2,7 +2,7 @@ from collections import OrderedDict
 from collections.abc import Iterable
 from math import cos, sin, pi
 from numbers import Real
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 
 import numpy as np
 from uncertainties import UFloat
@@ -565,7 +565,7 @@ class Cell(IDManagerMixin):
 
         Parameters
         ----------
-        xml_element : xml.etree.ElementTree.Element
+        xml_element : lxml.etree._Element
             XML element to be added to
 
         memo : set or None
@@ -653,7 +653,7 @@ class Cell(IDManagerMixin):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             `<cell>` element
         surfaces : dict
             Dictionary mapping surface IDs to :class:`openmc.Surface` instances
diff --git a/openmc/data/library.py b/openmc/data/library.py
index 5cafd19617..210270749a 100644
--- a/openmc/data/library.py
+++ b/openmc/data/library.py
@@ -1,5 +1,5 @@
 import os
-import xml.etree.ElementTree as ET
+import lxml.etree as ET
 import pathlib
 
 import h5py
diff --git a/openmc/deplete/chain.py b/openmc/deplete/chain.py
index 5e3157f904..d23cf374cd 100644
--- a/openmc/deplete/chain.py
+++ b/openmc/deplete/chain.py
@@ -19,15 +19,7 @@ from openmc.data import gnds_name, zam, DataLibrary
 from openmc.exceptions import DataError
 from .nuclide import FissionYieldDistribution
 
-# Try to use lxml if it is available. It preserves the order of attributes and
-# provides a pretty-printer by default. If not available,
-# use OpenMC function to pretty print.
-try:
-    import lxml.etree as ET
-    _have_lxml = True
-except ImportError:
-    import xml.etree.ElementTree as ET
-    _have_lxml = False
+import lxml.etree as ET
 import scipy.sparse as sp
 
 import openmc.data
@@ -565,11 +557,7 @@ class Chain:
             root_elem.append(nuclide.to_xml_element())
 
         tree = ET.ElementTree(root_elem)
-        if _have_lxml:
-            tree.write(str(filename), encoding='utf-8', pretty_print=True)
-        else:
-            clean_indentation(root_elem)
-            tree.write(str(filename), encoding='utf-8')
+        tree.write(str(filename), encoding='utf-8', pretty_print=True)
 
     def get_default_fission_yields(self):
         """Return fission yields at lowest incident neutron energy
diff --git a/openmc/deplete/nuclide.py b/openmc/deplete/nuclide.py
index 2e9673d5f7..e2067a8e35 100644
--- a/openmc/deplete/nuclide.py
+++ b/openmc/deplete/nuclide.py
@@ -1,4 +1,4 @@
-"""Nuclide module.
+"""Nuclide module.xml.etree.Ele
 
 Contains the per-nuclide components of a depletion chain.
 """
@@ -8,10 +8,7 @@ from collections.abc import Mapping
 from collections import namedtuple, defaultdict
 from warnings import warn
 from numbers import Real
-try:
-    import lxml.etree as ET
-except ImportError:
-    import xml.etree.ElementTree as ET
+import lxml.etree as ET
 
 import numpy as np
 
@@ -212,9 +209,9 @@ class Nuclide:
 
         Parameters
         ----------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element to read nuclide data from
-        root : xml.etree.ElementTree.Element, optional
+        root : lxml.etree._Element, optional
             Root XML element for chain file (only used when fission product
             yields are borrowed from another parent)
         fission_q : None or float
@@ -297,7 +294,7 @@ class Nuclide:
 
         Returns
         -------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element to write nuclide data to
 
         """
@@ -318,13 +315,7 @@ class Nuclide:
         # Write decay sources
         if self.sources:
             for particle, source in self.sources.items():
-                # TODO: Ugly hack to deal with the fact that
-                # 'source.to_xml_element' will return an xml.etree object
-                # whereas here lxml is being used preferentially. We should just
-                # switch to use lxml everywhere
-                import xml.etree.ElementTree as etree
-                src_elem_xmletree = source.to_xml_element('source')
-                src_elem = ET.fromstring(etree.tostring(src_elem_xmletree))
+                src_elem = source.to_xml_element('source')
                 src_elem.set('particle', particle)
                 elem.append(src_elem)
 
@@ -529,7 +520,7 @@ class FissionYieldDistribution(Mapping):
 
         Parameters
         ----------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element to pull fission yield data from
 
         Returns
@@ -551,7 +542,7 @@ class FissionYieldDistribution(Mapping):
 
         Parameters
         ----------
-        root : xml.etree.ElementTree.Element
+        root : lxml.etree._Element
             Element to write distribution data to
         """
         for energy, yield_obj in self.items():
diff --git a/openmc/element.py b/openmc/element.py
index f1a5d31d3e..bc3195aea4 100644
--- a/openmc/element.py
+++ b/openmc/element.py
@@ -1,6 +1,6 @@
 from collections import OrderedDict
 import re
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 
 import openmc.checkvalue as cv
 import openmc
diff --git a/openmc/filter.py b/openmc/filter.py
index 5233908c8d..1ad2892783 100644
--- a/openmc/filter.py
+++ b/openmc/filter.py
@@ -4,8 +4,8 @@ from collections.abc import Iterable
 import hashlib
 from itertools import product
 from numbers import Real, Integral
+import lxml.etree as ET
 import warnings
-from xml.etree import ElementTree as ET
 
 import numpy as np
 import pandas as pd
@@ -229,7 +229,7 @@ class Filter(IDManagerMixin, metaclass=FilterMeta):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing filter data
 
         """
@@ -247,7 +247,7 @@ class Filter(IDManagerMixin, metaclass=FilterMeta):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
         **kwargs
             Keyword arguments (e.g., mesh information)
@@ -662,7 +662,7 @@ class CellInstanceFilter(Filter):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing filter data
 
         """
@@ -938,7 +938,7 @@ class MeshFilter(Filter):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing filter data
 
         """
@@ -1284,7 +1284,7 @@ class RealFilter(Filter):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing filter data
 
         """
@@ -2120,7 +2120,7 @@ class EnergyFunctionFilter(Filter):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing filter data
 
         """
diff --git a/openmc/filter_expansion.py b/openmc/filter_expansion.py
index 1c07f58b71..f05f39fe9b 100644
--- a/openmc/filter_expansion.py
+++ b/openmc/filter_expansion.py
@@ -1,5 +1,5 @@
 from numbers import Integral, Real
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 
 import openmc.checkvalue as cv
 from . import Filter
@@ -33,7 +33,7 @@ class ExpansionFilter(Filter):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing Legendre filter data
 
         """
@@ -218,7 +218,7 @@ class SpatialLegendreFilter(ExpansionFilter):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing Legendre filter data
 
         """
@@ -323,7 +323,7 @@ class SphericalHarmonicsFilter(ExpansionFilter):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing spherical harmonics filter data
 
         """
@@ -473,7 +473,7 @@ class ZernikeFilter(ExpansionFilter):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing Zernike filter data
 
         """
diff --git a/openmc/geometry.py b/openmc/geometry.py
index dbfce731fc..9038895b84 100644
--- a/openmc/geometry.py
+++ b/openmc/geometry.py
@@ -6,7 +6,7 @@ from copy import deepcopy
 from collections.abc import Iterable
 from pathlib import Path
 import warnings
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 
 import numpy as np
 
@@ -172,7 +172,7 @@ class Geometry:
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
         materials : openmc.Materials or None
             Materials used to assign to cells. If None, an attempt is made to
diff --git a/openmc/lattice.py b/openmc/lattice.py
index b067b47a3d..37faaf00fc 100644
--- a/openmc/lattice.py
+++ b/openmc/lattice.py
@@ -5,7 +5,7 @@ from copy import deepcopy
 from math import sqrt, floor
 from numbers import Real
 import types
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 
 import numpy as np
 
@@ -833,7 +833,7 @@ class RectLattice(Lattice):
 
         Parameters
         ----------
-        xml_element : xml.etree.ElementTree.Element
+        xml_element : lxml.etree._Element
             XML element to be added to
 
         memo : set or None
@@ -932,7 +932,7 @@ class RectLattice(Lattice):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             `<lattice>` element
         get_universe : function
             Function returning universe (defined in
@@ -1502,7 +1502,7 @@ class HexLattice(Lattice):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             `<hex_lattice>` element
         get_universe : function
             Function returning universe (defined in
diff --git a/openmc/material.py b/openmc/material.py
index c84ff8c276..20041aa53c 100644
--- a/openmc/material.py
+++ b/openmc/material.py
@@ -8,7 +8,7 @@ import re
 import typing  # imported separately as py3.8 requires typing.Iterable
 import warnings
 from typing import Optional, List, Union, Dict
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 
 import numpy as np
 import h5py
@@ -1274,7 +1274,7 @@ class Material(IDManagerMixin):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing material data
 
         """
@@ -1442,7 +1442,7 @@ class Material(IDManagerMixin):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -1598,7 +1598,7 @@ class Materials(cv.CheckedList):
             element.tail = element.tail.strip(' ')
             file.write((level+1)*spaces_per_level*' ')
             reorder_attributes(element)  # TODO: Remove when support is Python 3.8+
-            ET.ElementTree(element).write(file, encoding='unicode')
+            file.write(ET.tostring(element, encoding="unicode"))
 
         # Write the <material> elements.
         for material in sorted(self, key=lambda x: x.id):
@@ -1607,7 +1607,7 @@ class Materials(cv.CheckedList):
             element.tail = element.tail.strip(' ')
             file.write((level+1)*spaces_per_level*' ')
             reorder_attributes(element)  # TODO: Remove when support is Python 3.8+
-            ET.ElementTree(element).write(file, encoding='unicode')
+            file.write(ET.tostring(element, encoding="unicode"))
 
         # Write the closing tag for the root element.
         file.write(indentation+'</materials>\n')
@@ -1644,7 +1644,7 @@ class Materials(cv.CheckedList):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
diff --git a/openmc/mesh.py b/openmc/mesh.py
index f606b85261..c4f7443792 100644
--- a/openmc/mesh.py
+++ b/openmc/mesh.py
@@ -5,7 +5,7 @@ from math import pi
 from numbers import Real, Integral
 from pathlib import Path
 import warnings
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 
 import numpy as np
 
@@ -103,7 +103,7 @@ class MeshBase(IDManagerMixin, ABC):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -568,7 +568,7 @@ class RegularMesh(StructuredMesh):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing mesh data
 
         """
@@ -598,7 +598,7 @@ class RegularMesh(StructuredMesh):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -949,7 +949,7 @@ class RectilinearMesh(StructuredMesh):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -971,7 +971,7 @@ class RectilinearMesh(StructuredMesh):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing mesh data
 
         """
@@ -1239,7 +1239,7 @@ class CylindricalMesh(StructuredMesh):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing mesh data
 
         """
@@ -1268,7 +1268,7 @@ class CylindricalMesh(StructuredMesh):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -1488,7 +1488,7 @@ class SphericalMesh(StructuredMesh):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing mesh data
 
         """
@@ -1517,7 +1517,7 @@ class SphericalMesh(StructuredMesh):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -1940,7 +1940,7 @@ class UnstructuredMesh(MeshBase):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing mesh data
 
         """
@@ -1963,7 +1963,7 @@ class UnstructuredMesh(MeshBase):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -1984,7 +1984,7 @@ def _read_meshes(elem):
 
     Parameters
     ----------
-    elem : xml.etree.ElementTree.Element
+    elem : lxml.etree._Element
         XML element
 
     Returns
@@ -1998,4 +1998,4 @@ def _read_meshes(elem):
         mesh = MeshBase.from_xml_element(mesh_elem)
         out[mesh.id] = mesh
 
-    return out
\ No newline at end of file
+    return out
diff --git a/openmc/model/model.py b/openmc/model/model.py
index 933e1172e4..ede21c64e0 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -7,7 +7,7 @@ from pathlib import Path
 from numbers import Integral
 from tempfile import NamedTemporaryFile
 import warnings
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 from typing import Optional, Dict
 
 import h5py
@@ -527,17 +527,17 @@ class Model:
             # This will write the XML header also
             materials._write_xml(fh, False, level=1)
             # Write remaining elements as a tree
-            ET.ElementTree(geometry_element).write(fh, encoding='unicode')
-            ET.ElementTree(settings_element).write(fh, encoding='unicode')
+            fh.write(ET.tostring(geometry_element, encoding="unicode"))
+            fh.write(ET.tostring(settings_element, encoding="unicode"))
 
             if self.tallies:
                 tallies_element = self.tallies.to_xml_element(mesh_memo)
                 xml.clean_indentation(tallies_element, level=1, trailing_indent=self.plots)
-                ET.ElementTree(tallies_element).write(fh, encoding='unicode')
+                fh.write(ET.tostring(tallies_element, encoding="unicode"))
             if self.plots:
                 plots_element = self.plots.to_xml_element()
                 xml.clean_indentation(plots_element, level=1, trailing_indent=False)
-                ET.ElementTree(plots_element).write(fh, encoding='unicode')
+                fh.write(ET.tostring(plots_element, encoding="unicode"))
             fh.write("</model>\n")
 
     def import_properties(self, filename):
diff --git a/openmc/plots.py b/openmc/plots.py
index 67b65440a2..5d8cf9ba40 100644
--- a/openmc/plots.py
+++ b/openmc/plots.py
@@ -1,8 +1,8 @@
 from collections.abc import Iterable, Mapping
 from numbers import Integral, Real
 from pathlib import Path
+import lxml.etree as ET
 from typing import Optional
-from xml.etree import ElementTree as ET
 
 import h5py
 import numpy as np
@@ -476,7 +476,7 @@ class PlotBase(IDManagerMixin):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing plot data
 
         """
@@ -776,7 +776,7 @@ class Plot(PlotBase):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing plot data
 
         """
@@ -833,7 +833,7 @@ class Plot(PlotBase):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -1170,7 +1170,7 @@ class ProjectionPlot(PlotBase):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing plot data
 
         """
@@ -1254,7 +1254,7 @@ class ProjectionPlot(PlotBase):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -1428,7 +1428,7 @@ class Plots(cv.CheckedList):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing all plot elements
 
         """
@@ -1469,7 +1469,7 @@ class Plots(cv.CheckedList):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
diff --git a/openmc/settings.py b/openmc/settings.py
index aa4276cd52..12703fbfd3 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -8,7 +8,7 @@ from numbers import Integral, Real
 from pathlib import Path
 import typing  # required to prevent typing.Union namespace overwriting Union
 from typing import Optional
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 
 import openmc.checkvalue as cv
 from openmc.stats.multivariate import MeshSpatial
@@ -1706,7 +1706,7 @@ class Settings:
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
         meshes : dict or None
             A dictionary with mesh IDs as keys and mesh instances as values that
diff --git a/openmc/source.py b/openmc/source.py
index 7f88bcd527..9851ea59d3 100644
--- a/openmc/source.py
+++ b/openmc/source.py
@@ -5,7 +5,7 @@ import warnings
 import typing  # imported separately as py3.8 requires typing.Iterable
 # also required to prevent typing.Union namespace overwriting Union
 from typing import Optional, Sequence
-from xml.etree import ElementTree as ET
+import lxml.etree as ET 
 
 import numpy as np
 import h5py
@@ -228,7 +228,7 @@ class Source:
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing source data
 
         """
@@ -263,7 +263,7 @@ class Source:
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
         meshes : dict
             Dictionary with mesh IDs as keys and openmc.MeshBase instaces as
diff --git a/openmc/stats/multivariate.py b/openmc/stats/multivariate.py
index 7372020b01..190dfd64d0 100644
--- a/openmc/stats/multivariate.py
+++ b/openmc/stats/multivariate.py
@@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
 from collections.abc import Iterable
 from math import pi, cos
 from numbers import Real
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 
 import numpy as np
 
@@ -121,7 +121,7 @@ class PolarAzimuthal(UnitSphere):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing angular distribution data
 
         """
@@ -139,7 +139,7 @@ class PolarAzimuthal(UnitSphere):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -168,7 +168,7 @@ class Isotropic(UnitSphere):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing isotropic distribution data
 
         """
@@ -182,7 +182,7 @@ class Isotropic(UnitSphere):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -217,7 +217,7 @@ class Monodirectional(UnitSphere):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing monodirectional distribution data
 
         """
@@ -233,7 +233,7 @@ class Monodirectional(UnitSphere):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -341,7 +341,7 @@ class CartesianIndependent(Spatial):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing spatial distribution data
 
         """
@@ -358,7 +358,7 @@ class CartesianIndependent(Spatial):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -464,7 +464,7 @@ class SphericalIndependent(Spatial):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing spatial distribution data
 
         """
@@ -482,7 +482,7 @@ class SphericalIndependent(Spatial):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -586,7 +586,7 @@ class CylindricalIndependent(Spatial):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing spatial distribution data
 
         """
@@ -604,7 +604,7 @@ class CylindricalIndependent(Spatial):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -698,7 +698,7 @@ class MeshSpatial(Spatial):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing spatial distribution data
 
         """
@@ -719,7 +719,7 @@ class MeshSpatial(Spatial):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
         meshes : dict
             A dictionary with mesh IDs as keys and openmc.MeshBase instances as
@@ -811,7 +811,7 @@ class Box(Spatial):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing box distribution data
 
         """
@@ -831,7 +831,7 @@ class Box(Spatial):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -883,7 +883,7 @@ class Point(Spatial):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing point distribution location
 
         """
@@ -899,7 +899,7 @@ class Point(Spatial):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
diff --git a/openmc/stats/univariate.py b/openmc/stats/univariate.py
index 240f13d143..b98b87d6f4 100644
--- a/openmc/stats/univariate.py
+++ b/openmc/stats/univariate.py
@@ -5,7 +5,7 @@ from copy import deepcopy
 import math
 from numbers import Real
 from warnings import warn
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 
 import numpy as np
 
@@ -173,7 +173,7 @@ class Discrete(Univariate):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing discrete distribution data
 
         """
@@ -191,7 +191,7 @@ class Discrete(Univariate):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -316,7 +316,7 @@ class Uniform(Univariate):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing uniform distribution data
 
         """
@@ -331,7 +331,7 @@ class Uniform(Univariate):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -425,7 +425,7 @@ class PowerLaw(Univariate):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing distribution data
 
         """
@@ -440,7 +440,7 @@ class PowerLaw(Univariate):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -508,7 +508,7 @@ class Maxwell(Univariate):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing Maxwellian distribution data
 
         """
@@ -523,7 +523,7 @@ class Maxwell(Univariate):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -603,7 +603,7 @@ class Watt(Univariate):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing Watt distribution data
 
         """
@@ -618,7 +618,7 @@ class Watt(Univariate):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -693,7 +693,7 @@ class Normal(Univariate):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing Watt distribution data
 
         """
@@ -708,7 +708,7 @@ class Normal(Univariate):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -957,7 +957,7 @@ class Tabular(Univariate):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing tabular distribution data
 
         """
@@ -976,7 +976,7 @@ class Tabular(Univariate):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -1152,7 +1152,7 @@ class Mixture(Univariate):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing mixture distribution data
 
         """
@@ -1174,7 +1174,7 @@ class Mixture(Univariate):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
diff --git a/openmc/surface.py b/openmc/surface.py
index 5d13b39ff0..b195c0af2b 100644
--- a/openmc/surface.py
+++ b/openmc/surface.py
@@ -4,7 +4,7 @@ from collections.abc import Iterable
 from copy import deepcopy
 import math
 from numbers import Real
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 from warnings import warn, catch_warnings, simplefilter
 
 import numpy as np
@@ -393,7 +393,7 @@ class Surface(IDManagerMixin, ABC):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing source data
 
         """
@@ -417,7 +417,7 @@ class Surface(IDManagerMixin, ABC):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -624,7 +624,7 @@ class PlaneMixin:
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing source data
 
         """
@@ -1280,7 +1280,7 @@ class Cylinder(QuadricMixin, Surface):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing source data
 
         """
@@ -1802,7 +1802,7 @@ class Cone(QuadricMixin, Surface):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing source data
 
         """
diff --git a/openmc/tallies.py b/openmc/tallies.py
index 1a27e1bd49..492336f7e1 100644
--- a/openmc/tallies.py
+++ b/openmc/tallies.py
@@ -5,7 +5,7 @@ from itertools import product
 from numbers import Integral, Real
 import operator
 from pathlib import Path
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 
 import h5py
 import numpy as np
@@ -815,7 +815,7 @@ class Tally(IDManagerMixin):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing tally data
 
         """
@@ -872,7 +872,7 @@ class Tally(IDManagerMixin):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
@@ -3226,7 +3226,7 @@ class Tallies(cv.CheckedList):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
         meshes : dict or None
             A dictionary with mesh IDs as keys and mesh instances as values that
diff --git a/openmc/tally_derivative.py b/openmc/tally_derivative.py
index 05a27681d5..d8e165e8be 100644
--- a/openmc/tally_derivative.py
+++ b/openmc/tally_derivative.py
@@ -1,5 +1,5 @@
 from numbers import Integral
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 
 import openmc.checkvalue as cv
 from .mixin import EqualityMixin, IDManagerMixin
@@ -93,7 +93,7 @@ class TallyDerivative(EqualityMixin, IDManagerMixin):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing derivative data
 
         """
@@ -112,7 +112,7 @@ class TallyDerivative(EqualityMixin, IDManagerMixin):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
diff --git a/openmc/trigger.py b/openmc/trigger.py
index c5151aa7e0..3f7d8d7d07 100644
--- a/openmc/trigger.py
+++ b/openmc/trigger.py
@@ -1,6 +1,6 @@
 from collections.abc import Iterable
 from numbers import Real
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 
 import openmc.checkvalue as cv
 from .mixin import EqualityMixin
@@ -79,7 +79,7 @@ class Trigger(EqualityMixin):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing trigger data
 
         """
@@ -97,7 +97,7 @@ class Trigger(EqualityMixin):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
diff --git a/openmc/universe.py b/openmc/universe.py
index afe360094e..dc88bdb040 100644
--- a/openmc/universe.py
+++ b/openmc/universe.py
@@ -6,7 +6,7 @@ from copy import deepcopy
 from numbers import Integral, Real
 from pathlib import Path
 from tempfile import TemporaryDirectory
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 from warnings import warn
 
 import h5py
@@ -117,7 +117,7 @@ class UniverseBase(ABC, IDManagerMixin):
 
         Parameters
         ----------
-        xml_element : xml.etree.ElementTree.Element
+        xml_element : lxml.etree._Element
             XML element to be added to
 
         memo : set or None
@@ -1048,7 +1048,7 @@ class DAGMCUniverse(UniverseBase):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             `<dagmc_universe>` element
 
         Returns
diff --git a/openmc/volume.py b/openmc/volume.py
index 5411b3c1d6..363b108c9f 100644
--- a/openmc/volume.py
+++ b/openmc/volume.py
@@ -1,7 +1,7 @@
 from collections import OrderedDict
 from collections.abc import Iterable, Mapping
 from numbers import Real, Integral
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 import warnings
 
 import numpy as np
@@ -333,7 +333,7 @@ class VolumeCalculation:
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing volume calculation data
 
         """
@@ -362,7 +362,7 @@ class VolumeCalculation:
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
 
         Returns
diff --git a/openmc/weight_windows.py b/openmc/weight_windows.py
index 2993db089e..c09e1e862b 100644
--- a/openmc/weight_windows.py
+++ b/openmc/weight_windows.py
@@ -5,7 +5,7 @@ import pathlib
 import typing
 from typing import Iterable, List, Optional, Union, Dict
 
-from xml.etree import ElementTree as ET
+import lxml.etree as ET
 import numpy as np
 import h5py
 
@@ -313,7 +313,7 @@ class WeightWindows(IDManagerMixin):
 
         Returns
         -------
-        element : xml.etree.ElementTree.Element
+        element : lxml.etree._Element
             XML element containing the weight window information
         """
         element = ET.Element('weight_windows')
@@ -356,9 +356,9 @@ class WeightWindows(IDManagerMixin):
 
         Parameters
         ----------
-        elem : xml.etree.ElementTree.Element
+        elem : lxml.etree._Element
             XML element
-        root : xml.etree.ElementTree.Element
+        root : lxml.etree._Element
             Root element for the file where meshes can be found
 
         Returns
diff --git a/tests/regression_tests/adj_cell_rotation/inputs_true.dat b/tests/regression_tests/adj_cell_rotation/inputs_true.dat
index 1c4516f42d..48774bb020 100644
--- a/tests/regression_tests/adj_cell_rotation/inputs_true.dat
+++ b/tests/regression_tests/adj_cell_rotation/inputs_true.dat
@@ -2,27 +2,27 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cc" value="10.0" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="10.0"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2">
-      <density units="g/cc" value="0.1" />
-      <nuclide ao="0.1" name="H1" />
+      <density units="g/cc" value="0.1"/>
+      <nuclide ao="0.1" name="H1"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <cell id="2" material="2" region="1" universe="1" />
-    <cell fill="1" id="3" region="2 -3 4 -5 6 -8" rotation="10 20 30" universe="2" />
-    <cell fill="1" id="4" region="2 -3 4 -5 8 -7" translation="0 0 15" universe="2" />
-    <surface coeffs="1.0 0.0 0.0 5.0" id="1" type="sphere" />
-    <surface boundary="vacuum" coeffs="-7.5" id="2" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="7.5" id="3" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-7.5" id="4" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="7.5" id="5" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-7.5" id="6" type="z-plane" />
-    <surface boundary="vacuum" coeffs="22.5" id="7" type="z-plane" />
-    <surface coeffs="7.5" id="8" type="z-plane" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <cell id="2" material="2" region="1" universe="1"/>
+    <cell fill="1" id="3" region="2 -3 4 -5 6 -8" rotation="10 20 30" universe="2"/>
+    <cell fill="1" id="4" region="2 -3 4 -5 8 -7" translation="0 0 15" universe="2"/>
+    <surface coeffs="1.0 0.0 0.0 5.0" id="1" type="sphere"/>
+    <surface boundary="vacuum" coeffs="-7.5" id="2" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="7.5" id="3" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-7.5" id="4" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="7.5" id="5" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-7.5" id="6" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="22.5" id="7" type="z-plane"/>
+    <surface coeffs="7.5" id="8" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/asymmetric_lattice/inputs_true.dat b/tests/regression_tests/asymmetric_lattice/inputs_true.dat
index b247412e51..6a09b10a32 100644
--- a/tests/regression_tests/asymmetric_lattice/inputs_true.dat
+++ b/tests/regression_tests/asymmetric_lattice/inputs_true.dat
@@ -2,162 +2,162 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UOX fuel">
-      <density units="g/cm3" value="10.062" />
-      <nuclide ao="4.9476e-06" name="U234" />
-      <nuclide ao="0.00048218" name="U235" />
-      <nuclide ao="0.021504" name="U238" />
-      <nuclide ao="1.0801e-08" name="Xe135" />
-      <nuclide ao="0.045737" name="O16" />
+      <density units="g/cm3" value="10.062"/>
+      <nuclide ao="4.9476e-06" name="U234"/>
+      <nuclide ao="0.00048218" name="U235"/>
+      <nuclide ao="0.021504" name="U238"/>
+      <nuclide ao="1.0801e-08" name="Xe135"/>
+      <nuclide ao="0.045737" name="O16"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cm3" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="Cold borated water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <nuclide ao="0.000649" name="B10" />
-      <nuclide ao="0.002689" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <nuclide ao="0.000649" name="B10"/>
+      <nuclide ao="0.002689" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="4" name="Hot borated water">
-      <density units="atom/b-cm" value="0.06614" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <nuclide ao="0.000649" name="B10" />
-      <nuclide ao="0.002689" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="atom/b-cm" value="0.06614"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <nuclide ao="0.000649" name="B10"/>
+      <nuclide ao="0.002689" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="5" name="Reactor pressure vessel steel">
-      <density units="g/cm3" value="7.9" />
-      <nuclide name="Fe54" wo="0.05437098" />
-      <nuclide name="Fe56" wo="0.88500663" />
-      <nuclide name="Fe57" wo="0.0208008" />
-      <nuclide name="Fe58" wo="0.00282159" />
-      <nuclide name="Ni58" wo="0.0067198" />
-      <nuclide name="Ni60" wo="0.0026776" />
-      <nuclide name="Mn55" wo="0.01" />
-      <nuclide name="Cr52" wo="0.002092475" />
-      <nuclide name="C0" wo="0.0025" />
-      <nuclide name="Cu63" wo="0.0013696" />
+      <density units="g/cm3" value="7.9"/>
+      <nuclide name="Fe54" wo="0.05437098"/>
+      <nuclide name="Fe56" wo="0.88500663"/>
+      <nuclide name="Fe57" wo="0.0208008"/>
+      <nuclide name="Fe58" wo="0.00282159"/>
+      <nuclide name="Ni58" wo="0.0067198"/>
+      <nuclide name="Ni60" wo="0.0026776"/>
+      <nuclide name="Mn55" wo="0.01"/>
+      <nuclide name="Cr52" wo="0.002092475"/>
+      <nuclide name="C0" wo="0.0025"/>
+      <nuclide name="Cu63" wo="0.0013696"/>
     </material>
     <material id="6" name="Lower radial reflector">
-      <density units="g/cm3" value="4.32" />
-      <nuclide name="H1" wo="0.0095661" />
-      <nuclide name="O16" wo="0.0759107" />
-      <nuclide name="B10" wo="3.08409e-05" />
-      <nuclide name="B11" wo="0.000140499" />
-      <nuclide name="Fe54" wo="0.035620772088" />
-      <nuclide name="Fe56" wo="0.579805982228" />
-      <nuclide name="Fe57" wo="0.01362750048" />
-      <nuclide name="Fe58" wo="0.001848545204" />
-      <nuclide name="Ni58" wo="0.055298376566" />
-      <nuclide name="Mn55" wo="0.018287" />
-      <nuclide name="Cr52" wo="0.145407678031" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="4.32"/>
+      <nuclide name="H1" wo="0.0095661"/>
+      <nuclide name="O16" wo="0.0759107"/>
+      <nuclide name="B10" wo="3.08409e-05"/>
+      <nuclide name="B11" wo="0.000140499"/>
+      <nuclide name="Fe54" wo="0.035620772088"/>
+      <nuclide name="Fe56" wo="0.579805982228"/>
+      <nuclide name="Fe57" wo="0.01362750048"/>
+      <nuclide name="Fe58" wo="0.001848545204"/>
+      <nuclide name="Ni58" wo="0.055298376566"/>
+      <nuclide name="Mn55" wo="0.018287"/>
+      <nuclide name="Cr52" wo="0.145407678031"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="7" name="Upper radial reflector / Top plate region">
-      <density units="g/cm3" value="4.28" />
-      <nuclide name="H1" wo="0.0086117" />
-      <nuclide name="O16" wo="0.0683369" />
-      <nuclide name="B10" wo="2.77638e-05" />
-      <nuclide name="B11" wo="0.000126481" />
-      <nuclide name="Fe54" wo="0.035953677186" />
-      <nuclide name="Fe56" wo="0.585224740891" />
-      <nuclide name="Fe57" wo="0.01375486056" />
-      <nuclide name="Fe58" wo="0.001865821363" />
-      <nuclide name="Ni58" wo="0.055815129186" />
-      <nuclide name="Mn55" wo="0.0184579" />
-      <nuclide name="Cr52" wo="0.146766614995" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="4.28"/>
+      <nuclide name="H1" wo="0.0086117"/>
+      <nuclide name="O16" wo="0.0683369"/>
+      <nuclide name="B10" wo="2.77638e-05"/>
+      <nuclide name="B11" wo="0.000126481"/>
+      <nuclide name="Fe54" wo="0.035953677186"/>
+      <nuclide name="Fe56" wo="0.585224740891"/>
+      <nuclide name="Fe57" wo="0.01375486056"/>
+      <nuclide name="Fe58" wo="0.001865821363"/>
+      <nuclide name="Ni58" wo="0.055815129186"/>
+      <nuclide name="Mn55" wo="0.0184579"/>
+      <nuclide name="Cr52" wo="0.146766614995"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="8" name="Bottom plate region">
-      <density units="g/cm3" value="7.184" />
-      <nuclide name="H1" wo="0.0011505" />
-      <nuclide name="O16" wo="0.0091296" />
-      <nuclide name="B10" wo="3.70915e-06" />
-      <nuclide name="B11" wo="1.68974e-05" />
-      <nuclide name="Fe54" wo="0.03855611055" />
-      <nuclide name="Fe56" wo="0.627585036425" />
-      <nuclide name="Fe57" wo="0.014750478" />
-      <nuclide name="Fe58" wo="0.002000875025" />
-      <nuclide name="Ni58" wo="0.059855207342" />
-      <nuclide name="Mn55" wo="0.019794" />
-      <nuclide name="Cr52" wo="0.157390026871" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="7.184"/>
+      <nuclide name="H1" wo="0.0011505"/>
+      <nuclide name="O16" wo="0.0091296"/>
+      <nuclide name="B10" wo="3.70915e-06"/>
+      <nuclide name="B11" wo="1.68974e-05"/>
+      <nuclide name="Fe54" wo="0.03855611055"/>
+      <nuclide name="Fe56" wo="0.627585036425"/>
+      <nuclide name="Fe57" wo="0.014750478"/>
+      <nuclide name="Fe58" wo="0.002000875025"/>
+      <nuclide name="Ni58" wo="0.059855207342"/>
+      <nuclide name="Mn55" wo="0.019794"/>
+      <nuclide name="Cr52" wo="0.157390026871"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="9" name="Bottom nozzle region">
-      <density units="g/cm3" value="2.53" />
-      <nuclide name="H1" wo="0.0245014" />
-      <nuclide name="O16" wo="0.1944274" />
-      <nuclide name="B10" wo="7.89917e-05" />
-      <nuclide name="B11" wo="0.000359854" />
-      <nuclide name="Fe54" wo="0.030411411144" />
-      <nuclide name="Fe56" wo="0.495012237964" />
-      <nuclide name="Fe57" wo="0.01163454624" />
-      <nuclide name="Fe58" wo="0.001578204652" />
-      <nuclide name="Ni58" wo="0.047211231662" />
-      <nuclide name="Mn55" wo="0.0156126" />
-      <nuclide name="Cr52" wo="0.124142524198" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="2.53"/>
+      <nuclide name="H1" wo="0.0245014"/>
+      <nuclide name="O16" wo="0.1944274"/>
+      <nuclide name="B10" wo="7.89917e-05"/>
+      <nuclide name="B11" wo="0.000359854"/>
+      <nuclide name="Fe54" wo="0.030411411144"/>
+      <nuclide name="Fe56" wo="0.495012237964"/>
+      <nuclide name="Fe57" wo="0.01163454624"/>
+      <nuclide name="Fe58" wo="0.001578204652"/>
+      <nuclide name="Ni58" wo="0.047211231662"/>
+      <nuclide name="Mn55" wo="0.0156126"/>
+      <nuclide name="Cr52" wo="0.124142524198"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="10" name="Top nozzle region">
-      <density units="g/cm3" value="1.746" />
-      <nuclide name="H1" wo="0.035887" />
-      <nuclide name="O16" wo="0.2847761" />
-      <nuclide name="B10" wo="0.000115699" />
-      <nuclide name="B11" wo="0.000527075" />
-      <nuclide name="Fe54" wo="0.02644016154" />
-      <nuclide name="Fe56" wo="0.43037146399" />
-      <nuclide name="Fe57" wo="0.0101152584" />
-      <nuclide name="Fe58" wo="0.00137211607" />
-      <nuclide name="Ni58" wo="0.04104621835" />
-      <nuclide name="Mn55" wo="0.0135739" />
-      <nuclide name="Cr52" wo="0.107931450781" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="1.746"/>
+      <nuclide name="H1" wo="0.035887"/>
+      <nuclide name="O16" wo="0.2847761"/>
+      <nuclide name="B10" wo="0.000115699"/>
+      <nuclide name="B11" wo="0.000527075"/>
+      <nuclide name="Fe54" wo="0.02644016154"/>
+      <nuclide name="Fe56" wo="0.43037146399"/>
+      <nuclide name="Fe57" wo="0.0101152584"/>
+      <nuclide name="Fe58" wo="0.00137211607"/>
+      <nuclide name="Ni58" wo="0.04104621835"/>
+      <nuclide name="Mn55" wo="0.0135739"/>
+      <nuclide name="Cr52" wo="0.107931450781"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="11" name="Top of fuel assemblies">
-      <density units="g/cm3" value="3.044" />
-      <nuclide name="H1" wo="0.0162913" />
-      <nuclide name="O16" wo="0.1292776" />
-      <nuclide name="B10" wo="5.25228e-05" />
-      <nuclide name="B11" wo="0.000239272" />
-      <nuclide name="Zr90" wo="0.43313403903" />
-      <nuclide name="Zr91" wo="0.09549277374" />
-      <nuclide name="Zr92" wo="0.14759527104" />
-      <nuclide name="Zr94" wo="0.15280552077" />
-      <nuclide name="Zr96" wo="0.02511169542" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="3.044"/>
+      <nuclide name="H1" wo="0.0162913"/>
+      <nuclide name="O16" wo="0.1292776"/>
+      <nuclide name="B10" wo="5.25228e-05"/>
+      <nuclide name="B11" wo="0.000239272"/>
+      <nuclide name="Zr90" wo="0.43313403903"/>
+      <nuclide name="Zr91" wo="0.09549277374"/>
+      <nuclide name="Zr92" wo="0.14759527104"/>
+      <nuclide name="Zr94" wo="0.15280552077"/>
+      <nuclide name="Zr96" wo="0.02511169542"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="12" name="Bottom of fuel assemblies">
-      <density units="g/cm3" value="1.762" />
-      <nuclide name="H1" wo="0.0292856" />
-      <nuclide name="O16" wo="0.2323919" />
-      <nuclide name="B10" wo="9.44159e-05" />
-      <nuclide name="B11" wo="0.00043012" />
-      <nuclide name="Zr90" wo="0.3741373658" />
-      <nuclide name="Zr91" wo="0.0824858164" />
-      <nuclide name="Zr92" wo="0.1274914944" />
-      <nuclide name="Zr94" wo="0.1319920622" />
-      <nuclide name="Zr96" wo="0.0216912612" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="1.762"/>
+      <nuclide name="H1" wo="0.0292856"/>
+      <nuclide name="O16" wo="0.2323919"/>
+      <nuclide name="B10" wo="9.44159e-05"/>
+      <nuclide name="B11" wo="0.00043012"/>
+      <nuclide name="Zr90" wo="0.3741373658"/>
+      <nuclide name="Zr91" wo="0.0824858164"/>
+      <nuclide name="Zr92" wo="0.1274914944"/>
+      <nuclide name="Zr94" wo="0.1319920622"/>
+      <nuclide name="Zr96" wo="0.0216912612"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell fill="202" id="1" region="9 -10 11 -12 13 -14" universe="0" />
-    <cell id="27" material="1" region="-1" universe="3" />
-    <cell id="28" material="2" region="1 -2" universe="3" />
-    <cell id="29" material="4" region="2" universe="3" />
-    <cell id="30" material="4" region="-3" universe="4" />
-    <cell id="31" material="2" region="3 -4" universe="4" />
-    <cell id="32" material="4" region="4" universe="4" />
-    <cell id="70" material="4" region="35 -36" universe="7" />
-    <cell fill="101" id="80" region="35 -36" universe="8" />
+    <cell fill="202" id="1" region="9 -10 11 -12 13 -14" universe="0"/>
+    <cell id="27" material="1" region="-1" universe="3"/>
+    <cell id="28" material="2" region="1 -2" universe="3"/>
+    <cell id="29" material="4" region="2" universe="3"/>
+    <cell id="30" material="4" region="-3" universe="4"/>
+    <cell id="31" material="2" region="3 -4" universe="4"/>
+    <cell id="32" material="4" region="4" universe="4"/>
+    <cell id="70" material="4" region="35 -36" universe="7"/>
+    <cell fill="101" id="80" region="35 -36" universe="8"/>
     <lattice id="101" name="Fuel assembly (upper half)">
       <pitch>1.26 1.26</pitch>
       <dimension>17 17</dimension>
@@ -190,18 +190,18 @@
 8 8 8 
 7 7 7 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-32.13" id="9" type="x-plane" />
-    <surface boundary="reflective" coeffs="32.13" id="10" type="x-plane" />
-    <surface boundary="reflective" coeffs="-32.13" id="11" type="y-plane" />
-    <surface boundary="reflective" coeffs="32.13" id="12" type="y-plane" />
-    <surface boundary="reflective" coeffs="0" id="13" type="z-plane" />
-    <surface boundary="reflective" coeffs="32.13" id="14" type="z-plane" />
-    <surface coeffs="0.0" id="35" type="z-plane" />
-    <surface coeffs="183.0" id="36" type="z-plane" />
+    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-32.13" id="9" type="x-plane"/>
+    <surface boundary="reflective" coeffs="32.13" id="10" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-32.13" id="11" type="y-plane"/>
+    <surface boundary="reflective" coeffs="32.13" id="12" type="y-plane"/>
+    <surface boundary="reflective" coeffs="0" id="13" type="z-plane"/>
+    <surface boundary="reflective" coeffs="32.13" id="14" type="z-plane"/>
+    <surface coeffs="0.0" id="35" type="z-plane"/>
+    <surface coeffs="183.0" id="36" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/cpp_driver/inputs_true.dat b/tests/regression_tests/cpp_driver/inputs_true.dat
index cdace34f05..5d067cb685 100644
--- a/tests/regression_tests/cpp_driver/inputs_true.dat
+++ b/tests/regression_tests/cpp_driver/inputs_true.dat
@@ -2,25 +2,25 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="11" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="11"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2" name="cladding">
-      <density units="g/cc" value="6.44" />
-      <nuclide ao="1.0" name="Zr90" />
+      <density units="g/cc" value="6.44"/>
+      <nuclide ao="1.0" name="Zr90"/>
     </material>
     <material id="3" name="water">
-      <density units="g/cc" value="1.0" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="g/cc" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <cell id="2" material="2" region="1 -2" universe="1" />
-    <cell id="3" material="3" region="2" universe="1" />
-    <cell fill="1" id="4" universe="2" />
-    <cell fill="3" id="5" region="3 -4 5 -6" universe="4" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <cell id="2" material="2" region="1 -2" universe="1"/>
+    <cell id="3" material="3" region="2" universe="1"/>
+    <cell fill="1" id="4" universe="2"/>
+    <cell fill="3" id="5" region="3 -4 5 -6" universe="4"/>
     <lattice id="3">
       <pitch>4.0 4.0</pitch>
       <dimension>2 2</dimension>
@@ -29,12 +29,12 @@
 2 2 
 2 2 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 1.5" id="1" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 1.7" id="2" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-4.0" id="3" name="minimum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="4.0" id="4" name="maximum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="-4.0" id="5" name="minimum y" type="y-plane" />
-    <surface boundary="reflective" coeffs="4.0" id="6" name="maximum y" type="y-plane" />
+    <surface coeffs="0.0 0.0 1.5" id="1" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 1.7" id="2" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-4.0" id="3" name="minimum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="4.0" id="4" name="maximum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-4.0" id="5" name="minimum y" type="y-plane"/>
+    <surface boundary="reflective" coeffs="4.0" id="6" name="maximum y" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/create_fission_neutrons/inputs_true.dat b/tests/regression_tests/create_fission_neutrons/inputs_true.dat
index f79ba379c4..8ee6f8b64f 100644
--- a/tests/regression_tests/create_fission_neutrons/inputs_true.dat
+++ b/tests/regression_tests/create_fission_neutrons/inputs_true.dat
@@ -2,19 +2,19 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="mat">
-      <density units="atom/b-cm" value="0.069335" />
-      <nuclide ao="40.0" name="H1" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="atom/b-cm" value="0.069335"/>
+      <nuclide ao="40.0" name="H1"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="box" region="1 -2 3 -4 5 -6" universe="0" />
-    <surface boundary="reflective" coeffs="-1" id="1" type="x-plane" />
-    <surface boundary="reflective" coeffs="1" id="2" type="x-plane" />
-    <surface boundary="reflective" coeffs="-1" id="3" type="y-plane" />
-    <surface boundary="reflective" coeffs="1" id="4" type="y-plane" />
-    <surface boundary="reflective" coeffs="-1" id="5" type="z-plane" />
-    <surface boundary="reflective" coeffs="1" id="6" type="z-plane" />
+    <cell id="1" material="1" name="box" region="1 -2 3 -4 5 -6" universe="0"/>
+    <surface boundary="reflective" coeffs="-1" id="1" type="x-plane"/>
+    <surface boundary="reflective" coeffs="1" id="2" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-1" id="3" type="y-plane"/>
+    <surface boundary="reflective" coeffs="1" id="4" type="y-plane"/>
+    <surface boundary="reflective" coeffs="-1" id="5" type="z-plane"/>
+    <surface boundary="reflective" coeffs="1" id="6" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -24,7 +24,7 @@
       <space type="box">
         <parameters>-1 -1 -1 1 1 1</parameters>
       </space>
-      <energy parameters="988000.0 2.249e-06" type="watt" />
+      <energy parameters="988000.0 2.249e-06" type="watt"/>
     </source>
     <create_fission_neutrons>false</create_fission_neutrons>
   </settings>
diff --git a/tests/regression_tests/dagmc/external/inputs_true.dat b/tests/regression_tests/dagmc/external/inputs_true.dat
index 5547f333cf..7237f4d463 100644
--- a/tests/regression_tests/dagmc/external/inputs_true.dat
+++ b/tests/regression_tests/dagmc/external/inputs_true.dat
@@ -2,18 +2,18 @@
 <model>
   <materials>
     <material depletable="true" id="40" name="no-void fuel">
-      <density units="g/cc" value="11" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="11"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="41" name="water">
-      <density units="g/cc" value="1.0" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cc" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <dagmc_universe filename="dagmc.h5m" id="1" />
+    <dagmc_universe filename="dagmc.h5m" id="1"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/dagmc/legacy/inputs_true.dat b/tests/regression_tests/dagmc/legacy/inputs_true.dat
index 89d458a2b8..b6e5133a4f 100644
--- a/tests/regression_tests/dagmc/legacy/inputs_true.dat
+++ b/tests/regression_tests/dagmc/legacy/inputs_true.dat
@@ -2,18 +2,18 @@
 <model>
   <materials>
     <material depletable="true" id="40" name="no-void fuel">
-      <density units="g/cc" value="11" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="11"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="41" name="water">
-      <density units="g/cc" value="1.0" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cc" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <dagmc_universe filename="dagmc.h5m" id="1" />
+    <dagmc_universe filename="dagmc.h5m" id="1"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/dagmc/refl/inputs_true.dat b/tests/regression_tests/dagmc/refl/inputs_true.dat
index 894d501049..126702e388 100644
--- a/tests/regression_tests/dagmc/refl/inputs_true.dat
+++ b/tests/regression_tests/dagmc/refl/inputs_true.dat
@@ -3,7 +3,7 @@
   <materials>
   </materials>
   <geometry>
-    <dagmc_universe auto_geom_ids="true" filename="dagmc.h5m" id="1" />
+    <dagmc_universe auto_geom_ids="true" filename="dagmc.h5m" id="1"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/dagmc/universes/inputs_true.dat b/tests/regression_tests/dagmc/universes/inputs_true.dat
index b88e83df40..babf43ff1d 100644
--- a/tests/regression_tests/dagmc/universes/inputs_true.dat
+++ b/tests/regression_tests/dagmc/universes/inputs_true.dat
@@ -2,32 +2,32 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="no-void fuel">
-      <density units="g/cc" value="10.29769" />
-      <nuclide ao="0.93120485" name="U234" />
-      <nuclide ao="0.00055815" name="U235" />
-      <nuclide ao="0.022408" name="U238" />
-      <nuclide ao="0.045829" name="O16" />
+      <density units="g/cc" value="10.29769"/>
+      <nuclide ao="0.93120485" name="U234"/>
+      <nuclide ao="0.00055815" name="U235"/>
+      <nuclide ao="0.022408" name="U238"/>
+      <nuclide ao="0.045829" name="O16"/>
     </material>
     <material id="2" name="clad">
-      <density units="g/cc" value="6.55" />
-      <nuclide ao="0.021827" name="Zr90" />
-      <nuclide ao="0.00476" name="Zr91" />
-      <nuclide ao="0.0072758" name="Zr92" />
-      <nuclide ao="0.0073734" name="Zr94" />
-      <nuclide ao="0.0011879" name="Zr96" />
+      <density units="g/cc" value="6.55"/>
+      <nuclide ao="0.021827" name="Zr90"/>
+      <nuclide ao="0.00476" name="Zr91"/>
+      <nuclide ao="0.0072758" name="Zr92"/>
+      <nuclide ao="0.0073734" name="Zr94"/>
+      <nuclide ao="0.0011879" name="Zr96"/>
     </material>
     <material id="3" name="water">
-      <density units="g/cc" value="0.740582" />
-      <nuclide ao="0.049457" name="H1" />
-      <nuclide ao="0.024672" name="O16" />
-      <nuclide ao="8.0042e-06" name="B10" />
-      <nuclide ao="3.2218e-05" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cc" value="0.740582"/>
+      <nuclide ao="0.049457" name="H1"/>
+      <nuclide ao="0.024672" name="O16"/>
+      <nuclide ao="8.0042e-06" name="B10"/>
+      <nuclide ao="3.2218e-05" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell fill="4" id="1" region="1 -2 3 -4 5 -6" universe="5" />
-    <dagmc_universe auto_geom_ids="true" filename="dagmc.h5m" id="1" />
+    <cell fill="4" id="1" region="1 -2 3 -4 5 -6" universe="5"/>
+    <dagmc_universe auto_geom_ids="true" filename="dagmc.h5m" id="1"/>
     <lattice id="4">
       <pitch>24.0 24.0</pitch>
       <dimension>2 2</dimension>
@@ -36,12 +36,12 @@
 1 1 
 1 1 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="-24.0" id="1" name="left" type="x-plane" />
-    <surface boundary="reflective" coeffs="24.0" id="2" name="right" type="x-plane" />
-    <surface boundary="reflective" coeffs="-24.0" id="3" name="front" type="y-plane" />
-    <surface boundary="reflective" coeffs="24.0" id="4" name="back" type="y-plane" />
-    <surface boundary="reflective" coeffs="-10.0" id="5" name="bottom" type="z-plane" />
-    <surface boundary="reflective" coeffs="10.0" id="6" name="top" type="z-plane" />
+    <surface boundary="reflective" coeffs="-24.0" id="1" name="left" type="x-plane"/>
+    <surface boundary="reflective" coeffs="24.0" id="2" name="right" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-24.0" id="3" name="front" type="y-plane"/>
+    <surface boundary="reflective" coeffs="24.0" id="4" name="back" type="y-plane"/>
+    <surface boundary="reflective" coeffs="-10.0" id="5" name="bottom" type="z-plane"/>
+    <surface boundary="reflective" coeffs="10.0" id="6" name="top" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/dagmc/uwuw/inputs_true.dat b/tests/regression_tests/dagmc/uwuw/inputs_true.dat
index 07384b6252..e6537a30e0 100644
--- a/tests/regression_tests/dagmc/uwuw/inputs_true.dat
+++ b/tests/regression_tests/dagmc/uwuw/inputs_true.dat
@@ -3,7 +3,7 @@
   <materials>
   </materials>
   <geometry>
-    <dagmc_universe filename="dagmc.h5m" id="1" />
+    <dagmc_universe filename="dagmc.h5m" id="1"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/deplete_with_transport/last_step_reference_materials.xml b/tests/regression_tests/deplete_with_transport/last_step_reference_materials.xml
index d38e8f96f1..fc0b87eb05 100644
--- a/tests/regression_tests/deplete_with_transport/last_step_reference_materials.xml
+++ b/tests/regression_tests/deplete_with_transport/last_step_reference_materials.xml
@@ -1,1057 +1,1057 @@
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
   <material depletable="true" id="1" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.418048979824424e-07" name="Cs135" />
-    <nuclide ao="7.25497932072497e-09" name="Gd156" />
-    <nuclide ao="4.6150717323028846e-10" name="Gd157" />
-    <nuclide ao="8.610759132296853e-09" name="I135" />
-    <nuclide ao="1.0044759509631791e-05" name="U234" />
-    <nuclide ao="0.0010213199681434208" name="U235" />
-    <nuclide ao="0.022134492490418312" name="U238" />
-    <nuclide ao="4.8988835309280406e-09" name="Xe135" />
-    <nuclide ao="1.5016036273208697e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.418048979824424e-07" name="Cs135"/>
+    <nuclide ao="7.25497932072497e-09" name="Gd156"/>
+    <nuclide ao="4.6150717323028846e-10" name="Gd157"/>
+    <nuclide ao="8.610759132296853e-09" name="I135"/>
+    <nuclide ao="1.0044759509631791e-05" name="U234"/>
+    <nuclide ao="0.0010213199681434208" name="U235"/>
+    <nuclide ao="0.022134492490418312" name="U238"/>
+    <nuclide ao="4.8988835309280406e-09" name="Xe135"/>
+    <nuclide ao="1.5016036273208697e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="2" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.7109992148358017e-07" name="Cs135" />
-    <nuclide ao="7.042063886012849e-09" name="Gd156" />
-    <nuclide ao="6.027071902372695e-10" name="Gd157" />
-    <nuclide ao="7.95412959144086e-09" name="I135" />
-    <nuclide ao="1.0044351820092838e-05" name="U234" />
-    <nuclide ao="0.001024086327318598" name="U235" />
-    <nuclide ao="0.0221342327478446" name="U238" />
-    <nuclide ao="4.9730371223377224e-09" name="Xe135" />
-    <nuclide ao="1.3283930207935904e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.7109992148358017e-07" name="Cs135"/>
+    <nuclide ao="7.042063886012849e-09" name="Gd156"/>
+    <nuclide ao="6.027071902372695e-10" name="Gd157"/>
+    <nuclide ao="7.95412959144086e-09" name="I135"/>
+    <nuclide ao="1.0044351820092838e-05" name="U234"/>
+    <nuclide ao="0.001024086327318598" name="U235"/>
+    <nuclide ao="0.0221342327478446" name="U238"/>
+    <nuclide ao="4.9730371223377224e-09" name="Xe135"/>
+    <nuclide ao="1.3283930207935904e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="3" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.519688238646543e-07" name="Cs135" />
-    <nuclide ao="7.390520655992046e-09" name="Gd156" />
-    <nuclide ao="6.113962449652282e-10" name="Gd157" />
-    <nuclide ao="7.33942627716833e-09" name="I135" />
-    <nuclide ao="1.0044458911828105e-05" name="U234" />
-    <nuclide ao="0.0010213846057514214" name="U235" />
-    <nuclide ao="0.022134283218172325" name="U238" />
-    <nuclide ao="5.052047258832601e-09" name="Xe135" />
-    <nuclide ao="1.4925022858546866e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.519688238646543e-07" name="Cs135"/>
+    <nuclide ao="7.390520655992046e-09" name="Gd156"/>
+    <nuclide ao="6.113962449652282e-10" name="Gd157"/>
+    <nuclide ao="7.33942627716833e-09" name="I135"/>
+    <nuclide ao="1.0044458911828105e-05" name="U234"/>
+    <nuclide ao="0.0010213846057514214" name="U235"/>
+    <nuclide ao="0.022134283218172325" name="U238"/>
+    <nuclide ao="5.052047258832601e-09" name="Xe135"/>
+    <nuclide ao="1.4925022858546866e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="4" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.6103855622977077e-07" name="Cs135" />
-    <nuclide ao="7.2542350965307454e-09" name="Gd156" />
-    <nuclide ao="4.694384498726491e-10" name="Gd157" />
-    <nuclide ao="8.999632513597842e-09" name="I135" />
-    <nuclide ao="1.0044557857513163e-05" name="U234" />
-    <nuclide ao="0.0010213889405602502" name="U235" />
-    <nuclide ao="0.022134477440113057" name="U238" />
-    <nuclide ao="5.198618333967504e-09" name="Xe135" />
-    <nuclide ao="1.4782292624287545e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.6103855622977077e-07" name="Cs135"/>
+    <nuclide ao="7.2542350965307454e-09" name="Gd156"/>
+    <nuclide ao="4.694384498726491e-10" name="Gd157"/>
+    <nuclide ao="8.999632513597842e-09" name="I135"/>
+    <nuclide ao="1.0044557857513163e-05" name="U234"/>
+    <nuclide ao="0.0010213889405602502" name="U235"/>
+    <nuclide ao="0.022134477440113057" name="U238"/>
+    <nuclide ao="5.198618333967504e-09" name="Xe135"/>
+    <nuclide ao="1.4782292624287545e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="5" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.0464035" name="O16" />
-    <nuclide ao="4.606890661382998e-07" name="Cs135" />
-    <nuclide ao="4.453011839512314e-09" name="Gd156" />
-    <nuclide ao="6.452882105106179e-05" name="Gd157" />
-    <nuclide ao="5.350905357185787e-09" name="I135" />
-    <nuclide ao="9.99407627854616e-22" name="U234" />
-    <nuclide ao="0.0010186933910475504" name="U235" />
-    <nuclide ao="0.021691769738241762" name="U238" />
-    <nuclide ao="6.032753974421699e-09" name="Xe135" />
-    <nuclide ao="4.883342566123616e-07" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.0464035" name="O16"/>
+    <nuclide ao="4.606890661382998e-07" name="Cs135"/>
+    <nuclide ao="4.453011839512314e-09" name="Gd156"/>
+    <nuclide ao="6.452882105106179e-05" name="Gd157"/>
+    <nuclide ao="5.350905357185787e-09" name="I135"/>
+    <nuclide ao="9.99407627854616e-22" name="U234"/>
+    <nuclide ao="0.0010186933910475504" name="U235"/>
+    <nuclide ao="0.021691769738241762" name="U238"/>
+    <nuclide ao="6.032753974421699e-09" name="Xe135"/>
+    <nuclide ao="4.883342566123616e-07" name="Xe136"/>
   </material>
   <material depletable="true" id="6" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.5448917833325217e-07" name="Cs135" />
-    <nuclide ao="7.987183366220764e-09" name="Gd156" />
-    <nuclide ao="4.865379811569636e-10" name="Gd157" />
-    <nuclide ao="8.523326230817669e-09" name="I135" />
-    <nuclide ao="1.0044496776626355e-05" name="U234" />
-    <nuclide ao="0.001017579906635896" name="U235" />
-    <nuclide ao="0.022134265683938482" name="U238" />
-    <nuclide ao="4.869820762518204e-09" name="Xe135" />
-    <nuclide ao="1.6938385668838631e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.5448917833325217e-07" name="Cs135"/>
+    <nuclide ao="7.987183366220764e-09" name="Gd156"/>
+    <nuclide ao="4.865379811569636e-10" name="Gd157"/>
+    <nuclide ao="8.523326230817669e-09" name="I135"/>
+    <nuclide ao="1.0044496776626355e-05" name="U234"/>
+    <nuclide ao="0.001017579906635896" name="U235"/>
+    <nuclide ao="0.022134265683938482" name="U238"/>
+    <nuclide ao="4.869820762518204e-09" name="Xe135"/>
+    <nuclide ao="1.6938385668838631e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="7" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.365851592857002e-07" name="Cs135" />
-    <nuclide ao="7.885461636096879e-09" name="Gd156" />
-    <nuclide ao="3.606387104885962e-10" name="Gd157" />
-    <nuclide ao="1.1369672407585595e-08" name="I135" />
-    <nuclide ao="1.0044357533457873e-05" name="U234" />
-    <nuclide ao="0.0010176281979778817" name="U235" />
-    <nuclide ao="0.022134386603591637" name="U238" />
-    <nuclide ao="5.3728946681073756e-09" name="Xe135" />
-    <nuclide ao="1.7038388307541218e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.365851592857002e-07" name="Cs135"/>
+    <nuclide ao="7.885461636096879e-09" name="Gd156"/>
+    <nuclide ao="3.606387104885962e-10" name="Gd157"/>
+    <nuclide ao="1.1369672407585595e-08" name="I135"/>
+    <nuclide ao="1.0044357533457873e-05" name="U234"/>
+    <nuclide ao="0.0010176281979778817" name="U235"/>
+    <nuclide ao="0.022134386603591637" name="U238"/>
+    <nuclide ao="5.3728946681073756e-09" name="Xe135"/>
+    <nuclide ao="1.7038388307541218e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="8" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.5625540277027385e-07" name="Cs135" />
-    <nuclide ao="7.771490175889865e-09" name="Gd156" />
-    <nuclide ao="4.146823035582645e-10" name="Gd157" />
-    <nuclide ao="9.209488361778163e-09" name="I135" />
-    <nuclide ao="1.0044402337267959e-05" name="U234" />
-    <nuclide ao="0.0010186458655779957" name="U235" />
-    <nuclide ao="0.02213433904931746" name="U238" />
-    <nuclide ao="5.497659471352132e-09" name="Xe135" />
-    <nuclide ao="1.6322553904837763e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.5625540277027385e-07" name="Cs135"/>
+    <nuclide ao="7.771490175889865e-09" name="Gd156"/>
+    <nuclide ao="4.146823035582645e-10" name="Gd157"/>
+    <nuclide ao="9.209488361778163e-09" name="I135"/>
+    <nuclide ao="1.0044402337267959e-05" name="U234"/>
+    <nuclide ao="0.0010186458655779957" name="U235"/>
+    <nuclide ao="0.02213433904931746" name="U238"/>
+    <nuclide ao="5.497659471352132e-09" name="Xe135"/>
+    <nuclide ao="1.6322553904837763e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="9" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.484904722890753e-07" name="Cs135" />
-    <nuclide ao="7.0469830796840196e-09" name="Gd156" />
-    <nuclide ao="4.957093623825932e-10" name="Gd157" />
-    <nuclide ao="1.028391148740737e-08" name="I135" />
-    <nuclide ao="1.0044263707901807e-05" name="U234" />
-    <nuclide ao="0.0010240145184318148" name="U235" />
-    <nuclide ao="0.022134243871098407" name="U238" />
-    <nuclide ao="5.102740935827761e-09" name="Xe135" />
-    <nuclide ao="1.3522284041351177e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.484904722890753e-07" name="Cs135"/>
+    <nuclide ao="7.0469830796840196e-09" name="Gd156"/>
+    <nuclide ao="4.957093623825932e-10" name="Gd157"/>
+    <nuclide ao="1.028391148740737e-08" name="I135"/>
+    <nuclide ao="1.0044263707901807e-05" name="U234"/>
+    <nuclide ao="0.0010240145184318148" name="U235"/>
+    <nuclide ao="0.022134243871098407" name="U238"/>
+    <nuclide ao="5.102740935827761e-09" name="Xe135"/>
+    <nuclide ao="1.3522284041351177e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="10" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.5464933085449977e-07" name="Cs135" />
-    <nuclide ao="8.140359772958148e-09" name="Gd156" />
-    <nuclide ao="5.697645609968091e-10" name="Gd157" />
-    <nuclide ao="7.546283008483177e-09" name="I135" />
-    <nuclide ao="1.0044621491327945e-05" name="U234" />
-    <nuclide ao="0.0010168499066684708" name="U235" />
-    <nuclide ao="0.022134202939750873" name="U238" />
-    <nuclide ao="5.110958358170558e-09" name="Xe135" />
-    <nuclide ao="1.7346785904970471e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.5464933085449977e-07" name="Cs135"/>
+    <nuclide ao="8.140359772958148e-09" name="Gd156"/>
+    <nuclide ao="5.697645609968091e-10" name="Gd157"/>
+    <nuclide ao="7.546283008483177e-09" name="I135"/>
+    <nuclide ao="1.0044621491327945e-05" name="U234"/>
+    <nuclide ao="0.0010168499066684708" name="U235"/>
+    <nuclide ao="0.022134202939750873" name="U238"/>
+    <nuclide ao="5.110958358170558e-09" name="Xe135"/>
+    <nuclide ao="1.7346785904970471e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="11" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.35632809214313e-07" name="Cs135" />
-    <nuclide ao="7.482536566368326e-09" name="Gd156" />
-    <nuclide ao="4.256220743973794e-10" name="Gd157" />
-    <nuclide ao="9.63388948617791e-09" name="I135" />
-    <nuclide ao="1.0044260492865682e-05" name="U234" />
-    <nuclide ao="0.0010215775522373586" name="U235" />
-    <nuclide ao="0.0221341383920082" name="U238" />
-    <nuclide ao="4.87569430544928e-09" name="Xe135" />
-    <nuclide ao="1.4987118060021686e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.35632809214313e-07" name="Cs135"/>
+    <nuclide ao="7.482536566368326e-09" name="Gd156"/>
+    <nuclide ao="4.256220743973794e-10" name="Gd157"/>
+    <nuclide ao="9.63388948617791e-09" name="I135"/>
+    <nuclide ao="1.0044260492865682e-05" name="U234"/>
+    <nuclide ao="0.0010215775522373586" name="U235"/>
+    <nuclide ao="0.0221341383920082" name="U238"/>
+    <nuclide ao="4.87569430544928e-09" name="Xe135"/>
+    <nuclide ao="1.4987118060021686e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="12" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.549917200204523e-07" name="Cs135" />
-    <nuclide ao="7.90039271903119e-09" name="Gd156" />
-    <nuclide ao="5.043357298714665e-10" name="Gd157" />
-    <nuclide ao="9.71779424904834e-09" name="I135" />
-    <nuclide ao="1.0044246640043986e-05" name="U234" />
-    <nuclide ao="0.0010189554800375798" name="U235" />
-    <nuclide ao="0.02213409311061493" name="U238" />
-    <nuclide ao="5.099520091521692e-09" name="Xe135" />
-    <nuclide ao="1.620768762118272e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.549917200204523e-07" name="Cs135"/>
+    <nuclide ao="7.90039271903119e-09" name="Gd156"/>
+    <nuclide ao="5.043357298714665e-10" name="Gd157"/>
+    <nuclide ao="9.71779424904834e-09" name="I135"/>
+    <nuclide ao="1.0044246640043986e-05" name="U234"/>
+    <nuclide ao="0.0010189554800375798" name="U235"/>
+    <nuclide ao="0.02213409311061493" name="U238"/>
+    <nuclide ao="5.099520091521692e-09" name="Xe135"/>
+    <nuclide ao="1.620768762118272e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="13" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.208591229572268e-07" name="Cs135" />
-    <nuclide ao="7.387033004202649e-09" name="Gd156" />
-    <nuclide ao="4.5363776068082005e-10" name="Gd157" />
-    <nuclide ao="9.623102637763487e-09" name="I135" />
-    <nuclide ao="1.0044648049703185e-05" name="U234" />
-    <nuclide ao="0.0010212601077745085" name="U235" />
-    <nuclide ao="0.02213433520392284" name="U238" />
-    <nuclide ao="4.8698368932420685e-09" name="Xe135" />
-    <nuclide ao="1.5273484209892704e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.208591229572268e-07" name="Cs135"/>
+    <nuclide ao="7.387033004202649e-09" name="Gd156"/>
+    <nuclide ao="4.5363776068082005e-10" name="Gd157"/>
+    <nuclide ao="9.623102637763487e-09" name="I135"/>
+    <nuclide ao="1.0044648049703185e-05" name="U234"/>
+    <nuclide ao="0.0010212601077745085" name="U235"/>
+    <nuclide ao="0.02213433520392284" name="U238"/>
+    <nuclide ao="4.8698368932420685e-09" name="Xe135"/>
+    <nuclide ao="1.5273484209892704e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="14" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.0464035" name="O16" />
-    <nuclide ao="4.224227511911306e-07" name="Cs135" />
-    <nuclide ao="4.046777216925317e-09" name="Gd156" />
-    <nuclide ao="7.771902377737551e-05" name="Gd157" />
-    <nuclide ao="4.244203307286123e-09" name="I135" />
-    <nuclide ao="9.994483645140393e-22" name="U234" />
-    <nuclide ao="0.0010210841865960422" name="U235" />
-    <nuclide ao="0.021691840576108404" name="U238" />
-    <nuclide ao="5.204749891954403e-09" name="Xe135" />
-    <nuclide ao="3.988325462577649e-07" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.0464035" name="O16"/>
+    <nuclide ao="4.224227511911306e-07" name="Cs135"/>
+    <nuclide ao="4.046777216925317e-09" name="Gd156"/>
+    <nuclide ao="7.771902377737551e-05" name="Gd157"/>
+    <nuclide ao="4.244203307286123e-09" name="I135"/>
+    <nuclide ao="9.994483645140393e-22" name="U234"/>
+    <nuclide ao="0.0010210841865960422" name="U235"/>
+    <nuclide ao="0.021691840576108404" name="U238"/>
+    <nuclide ao="5.204749891954403e-09" name="Xe135"/>
+    <nuclide ao="3.988325462577649e-07" name="Xe136"/>
   </material>
   <material depletable="true" id="15" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.629769519760265e-07" name="Cs135" />
-    <nuclide ao="8.043395693322505e-09" name="Gd156" />
-    <nuclide ao="4.5962909816448753e-10" name="Gd157" />
-    <nuclide ao="9.794597604057606e-09" name="I135" />
-    <nuclide ao="1.004427598260891e-05" name="U234" />
-    <nuclide ao="0.001017355319845844" name="U235" />
-    <nuclide ao="0.022134228674556795" name="U238" />
-    <nuclide ao="5.337501811912239e-09" name="Xe135" />
-    <nuclide ao="1.6963023019327414e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.629769519760265e-07" name="Cs135"/>
+    <nuclide ao="8.043395693322505e-09" name="Gd156"/>
+    <nuclide ao="4.5962909816448753e-10" name="Gd157"/>
+    <nuclide ao="9.794597604057606e-09" name="I135"/>
+    <nuclide ao="1.004427598260891e-05" name="U234"/>
+    <nuclide ao="0.001017355319845844" name="U235"/>
+    <nuclide ao="0.022134228674556795" name="U238"/>
+    <nuclide ao="5.337501811912239e-09" name="Xe135"/>
+    <nuclide ao="1.6963023019327414e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="16" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.24399236223423e-07" name="Cs135" />
-    <nuclide ao="7.519930974540491e-09" name="Gd156" />
-    <nuclide ao="3.800605944979945e-10" name="Gd157" />
-    <nuclide ao="1.07678650681071e-08" name="I135" />
-    <nuclide ao="1.0044208116422574e-05" name="U234" />
-    <nuclide ao="0.0010205777539140858" name="U235" />
-    <nuclide ao="0.022134290624024555" name="U238" />
-    <nuclide ao="5.11800262889223e-09" name="Xe135" />
-    <nuclide ao="1.559855497045594e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.24399236223423e-07" name="Cs135"/>
+    <nuclide ao="7.519930974540491e-09" name="Gd156"/>
+    <nuclide ao="3.800605944979945e-10" name="Gd157"/>
+    <nuclide ao="1.07678650681071e-08" name="I135"/>
+    <nuclide ao="1.0044208116422574e-05" name="U234"/>
+    <nuclide ao="0.0010205777539140858" name="U235"/>
+    <nuclide ao="0.022134290624024555" name="U238"/>
+    <nuclide ao="5.11800262889223e-09" name="Xe135"/>
+    <nuclide ao="1.559855497045594e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="17" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.7122492306377446e-07" name="Cs135" />
-    <nuclide ao="8.124392262514587e-09" name="Gd156" />
-    <nuclide ao="3.9184015605272095e-10" name="Gd157" />
-    <nuclide ao="1.1100808170610603e-08" name="I135" />
-    <nuclide ao="1.004444860785596e-05" name="U234" />
-    <nuclide ao="0.0010153255336913295" name="U235" />
-    <nuclide ao="0.022134518675911666" name="U238" />
-    <nuclide ao="6.1628209338332855e-09" name="Xe135" />
-    <nuclide ao="1.7903377661909026e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.7122492306377446e-07" name="Cs135"/>
+    <nuclide ao="8.124392262514587e-09" name="Gd156"/>
+    <nuclide ao="3.9184015605272095e-10" name="Gd157"/>
+    <nuclide ao="1.1100808170610603e-08" name="I135"/>
+    <nuclide ao="1.004444860785596e-05" name="U234"/>
+    <nuclide ao="0.0010153255336913295" name="U235"/>
+    <nuclide ao="0.022134518675911666" name="U238"/>
+    <nuclide ao="6.1628209338332855e-09" name="Xe135"/>
+    <nuclide ao="1.7903377661909026e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="18" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.531153593260841e-07" name="Cs135" />
-    <nuclide ao="7.502808413641523e-09" name="Gd156" />
-    <nuclide ao="3.8778800467994497e-10" name="Gd157" />
-    <nuclide ao="1.0507636626605825e-08" name="I135" />
-    <nuclide ao="1.0044253708473014e-05" name="U234" />
-    <nuclide ao="0.0010201327804656836" name="U235" />
-    <nuclide ao="0.022134395452386605" name="U238" />
-    <nuclide ao="5.396277265979977e-09" name="Xe135" />
-    <nuclide ao="1.5533402150529418e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.531153593260841e-07" name="Cs135"/>
+    <nuclide ao="7.502808413641523e-09" name="Gd156"/>
+    <nuclide ao="3.8778800467994497e-10" name="Gd157"/>
+    <nuclide ao="1.0507636626605825e-08" name="I135"/>
+    <nuclide ao="1.0044253708473014e-05" name="U234"/>
+    <nuclide ao="0.0010201327804656836" name="U235"/>
+    <nuclide ao="0.022134395452386605" name="U238"/>
+    <nuclide ao="5.396277265979977e-09" name="Xe135"/>
+    <nuclide ao="1.5533402150529418e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="19" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.2805824438158725e-07" name="Cs135" />
-    <nuclide ao="6.8950633798128766e-09" name="Gd156" />
-    <nuclide ao="4.725046341630102e-10" name="Gd157" />
-    <nuclide ao="8.971078444161184e-09" name="I135" />
-    <nuclide ao="1.004443484433487e-05" name="U234" />
-    <nuclide ao="0.0010246197578851622" name="U235" />
-    <nuclide ao="0.022134292112283824" name="U238" />
-    <nuclide ao="4.989035409350659e-09" name="Xe135" />
-    <nuclide ao="1.340749638565073e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.2805824438158725e-07" name="Cs135"/>
+    <nuclide ao="6.8950633798128766e-09" name="Gd156"/>
+    <nuclide ao="4.725046341630102e-10" name="Gd157"/>
+    <nuclide ao="8.971078444161184e-09" name="I135"/>
+    <nuclide ao="1.004443484433487e-05" name="U234"/>
+    <nuclide ao="0.0010246197578851622" name="U235"/>
+    <nuclide ao="0.022134292112283824" name="U238"/>
+    <nuclide ao="4.989035409350659e-09" name="Xe135"/>
+    <nuclide ao="1.340749638565073e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="20" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.5723196293943963e-07" name="Cs135" />
-    <nuclide ao="7.169872284889269e-09" name="Gd156" />
-    <nuclide ao="4.5318180171996677e-10" name="Gd157" />
-    <nuclide ao="9.303299184590141e-09" name="I135" />
-    <nuclide ao="1.0044424717878968e-05" name="U234" />
-    <nuclide ao="0.0010230394117502694" name="U235" />
-    <nuclide ao="0.02213426448388902" name="U238" />
-    <nuclide ao="5.090119250724128e-09" name="Xe135" />
-    <nuclide ao="1.396566263961237e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.5723196293943963e-07" name="Cs135"/>
+    <nuclide ao="7.169872284889269e-09" name="Gd156"/>
+    <nuclide ao="4.5318180171996677e-10" name="Gd157"/>
+    <nuclide ao="9.303299184590141e-09" name="I135"/>
+    <nuclide ao="1.0044424717878968e-05" name="U234"/>
+    <nuclide ao="0.0010230394117502694" name="U235"/>
+    <nuclide ao="0.02213426448388902" name="U238"/>
+    <nuclide ao="5.090119250724128e-09" name="Xe135"/>
+    <nuclide ao="1.396566263961237e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="21" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.4506483504263366e-07" name="Cs135" />
-    <nuclide ao="7.791231868738042e-09" name="Gd156" />
-    <nuclide ao="4.801783351996417e-10" name="Gd157" />
-    <nuclide ao="1.0146797269957928e-08" name="I135" />
-    <nuclide ao="1.0044386120450931e-05" name="U234" />
-    <nuclide ao="0.0010197543471521624" name="U235" />
-    <nuclide ao="0.022134079246874012" name="U238" />
-    <nuclide ao="5.115335235862365e-09" name="Xe135" />
-    <nuclide ao="1.5875136505393508e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.4506483504263366e-07" name="Cs135"/>
+    <nuclide ao="7.791231868738042e-09" name="Gd156"/>
+    <nuclide ao="4.801783351996417e-10" name="Gd157"/>
+    <nuclide ao="1.0146797269957928e-08" name="I135"/>
+    <nuclide ao="1.0044386120450931e-05" name="U234"/>
+    <nuclide ao="0.0010197543471521624" name="U235"/>
+    <nuclide ao="0.022134079246874012" name="U238"/>
+    <nuclide ao="5.115335235862365e-09" name="Xe135"/>
+    <nuclide ao="1.5875136505393508e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="22" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.445115363487018e-07" name="Cs135" />
-    <nuclide ao="7.610438508787705e-09" name="Gd156" />
-    <nuclide ao="5.481423361689139e-10" name="Gd157" />
-    <nuclide ao="7.563161643933706e-09" name="I135" />
-    <nuclide ao="1.004471426132263e-05" name="U234" />
-    <nuclide ao="0.0010191890431134679" name="U235" />
-    <nuclide ao="0.022134442627521806" name="U238" />
-    <nuclide ao="5.0492922597524734e-09" name="Xe135" />
-    <nuclide ao="1.6151855304166513e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.445115363487018e-07" name="Cs135"/>
+    <nuclide ao="7.610438508787705e-09" name="Gd156"/>
+    <nuclide ao="5.481423361689139e-10" name="Gd157"/>
+    <nuclide ao="7.563161643933706e-09" name="I135"/>
+    <nuclide ao="1.004471426132263e-05" name="U234"/>
+    <nuclide ao="0.0010191890431134679" name="U235"/>
+    <nuclide ao="0.022134442627521806" name="U238"/>
+    <nuclide ao="5.0492922597524734e-09" name="Xe135"/>
+    <nuclide ao="1.6151855304166513e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="23" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.0464035" name="O16" />
-    <nuclide ao="4.0076878375590357e-07" name="Cs135" />
-    <nuclide ao="4.155639263491298e-09" name="Gd156" />
-    <nuclide ao="6.0841963930731014e-05" name="Gd157" />
-    <nuclide ao="4.565764354330031e-09" name="I135" />
-    <nuclide ao="9.994210724477521e-22" name="U234" />
-    <nuclide ao="0.0010209146372540062" name="U235" />
-    <nuclide ao="0.021691729016807694" name="U238" />
-    <nuclide ao="4.9812486511800616e-09" name="Xe135" />
-    <nuclide ao="4.313186998695365e-07" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.0464035" name="O16"/>
+    <nuclide ao="4.0076878375590357e-07" name="Cs135"/>
+    <nuclide ao="4.155639263491298e-09" name="Gd156"/>
+    <nuclide ao="6.0841963930731014e-05" name="Gd157"/>
+    <nuclide ao="4.565764354330031e-09" name="I135"/>
+    <nuclide ao="9.994210724477521e-22" name="U234"/>
+    <nuclide ao="0.0010209146372540062" name="U235"/>
+    <nuclide ao="0.021691729016807694" name="U238"/>
+    <nuclide ao="4.9812486511800616e-09" name="Xe135"/>
+    <nuclide ao="4.313186998695365e-07" name="Xe136"/>
   </material>
   <material depletable="true" id="24" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.6723472150690375e-07" name="Cs135" />
-    <nuclide ao="7.510614511964497e-09" name="Gd156" />
-    <nuclide ao="3.8800984385260523e-10" name="Gd157" />
-    <nuclide ao="1.0221972064234465e-08" name="I135" />
-    <nuclide ao="1.0044436788942838e-05" name="U234" />
-    <nuclide ao="0.0010201891925496122" name="U235" />
-    <nuclide ao="0.02213434071792172" name="U238" />
-    <nuclide ao="5.448196055502847e-09" name="Xe135" />
-    <nuclide ao="1.5373005201476741e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.6723472150690375e-07" name="Cs135"/>
+    <nuclide ao="7.510614511964497e-09" name="Gd156"/>
+    <nuclide ao="3.8800984385260523e-10" name="Gd157"/>
+    <nuclide ao="1.0221972064234465e-08" name="I135"/>
+    <nuclide ao="1.0044436788942838e-05" name="U234"/>
+    <nuclide ao="0.0010201891925496122" name="U235"/>
+    <nuclide ao="0.02213434071792172" name="U238"/>
+    <nuclide ao="5.448196055502847e-09" name="Xe135"/>
+    <nuclide ao="1.5373005201476741e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="25" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.2114439608566884e-07" name="Cs135" />
-    <nuclide ao="7.581311244244146e-09" name="Gd156" />
-    <nuclide ao="4.035443338226939e-10" name="Gd157" />
-    <nuclide ao="1.0963506620124425e-08" name="I135" />
-    <nuclide ao="1.0044361025787887e-05" name="U234" />
-    <nuclide ao="0.0010200126803995644" name="U235" />
-    <nuclide ao="0.022134322371965227" name="U238" />
-    <nuclide ao="4.931675406424788e-09" name="Xe135" />
-    <nuclide ao="1.59295944243621e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.2114439608566884e-07" name="Cs135"/>
+    <nuclide ao="7.581311244244146e-09" name="Gd156"/>
+    <nuclide ao="4.035443338226939e-10" name="Gd157"/>
+    <nuclide ao="1.0963506620124425e-08" name="I135"/>
+    <nuclide ao="1.0044361025787887e-05" name="U234"/>
+    <nuclide ao="0.0010200126803995644" name="U235"/>
+    <nuclide ao="0.022134322371965227" name="U238"/>
+    <nuclide ao="4.931675406424788e-09" name="Xe135"/>
+    <nuclide ao="1.59295944243621e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="26" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.6367556425737116e-07" name="Cs135" />
-    <nuclide ao="8.098562238981794e-09" name="Gd156" />
-    <nuclide ao="4.2570401130461723e-10" name="Gd157" />
-    <nuclide ao="1.1873408914512877e-08" name="I135" />
-    <nuclide ao="1.0044164596270737e-05" name="U234" />
-    <nuclide ao="0.0010164664223844837" name="U235" />
-    <nuclide ao="0.02213432992062043" name="U238" />
-    <nuclide ao="6.092133991228434e-09" name="Xe135" />
-    <nuclide ao="1.7389259817044588e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.6367556425737116e-07" name="Cs135"/>
+    <nuclide ao="8.098562238981794e-09" name="Gd156"/>
+    <nuclide ao="4.2570401130461723e-10" name="Gd157"/>
+    <nuclide ao="1.1873408914512877e-08" name="I135"/>
+    <nuclide ao="1.0044164596270737e-05" name="U234"/>
+    <nuclide ao="0.0010164664223844837" name="U235"/>
+    <nuclide ao="0.02213432992062043" name="U238"/>
+    <nuclide ao="6.092133991228434e-09" name="Xe135"/>
+    <nuclide ao="1.7389259817044588e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="27" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.523424316410202e-07" name="Cs135" />
-    <nuclide ao="6.748382642460562e-09" name="Gd156" />
-    <nuclide ao="4.1066179911030807e-10" name="Gd157" />
-    <nuclide ao="9.692240117370807e-09" name="I135" />
-    <nuclide ao="1.0044564874258945e-05" name="U234" />
-    <nuclide ao="0.0010247727656393796" name="U235" />
-    <nuclide ao="0.022134463655447897" name="U238" />
-    <nuclide ao="5.465219857002608e-09" name="Xe135" />
-    <nuclide ao="1.3042444628724211e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.523424316410202e-07" name="Cs135"/>
+    <nuclide ao="6.748382642460562e-09" name="Gd156"/>
+    <nuclide ao="4.1066179911030807e-10" name="Gd157"/>
+    <nuclide ao="9.692240117370807e-09" name="I135"/>
+    <nuclide ao="1.0044564874258945e-05" name="U234"/>
+    <nuclide ao="0.0010247727656393796" name="U235"/>
+    <nuclide ao="0.022134463655447897" name="U238"/>
+    <nuclide ao="5.465219857002608e-09" name="Xe135"/>
+    <nuclide ao="1.3042444628724211e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="28" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.466675177481358e-07" name="Cs135" />
-    <nuclide ao="7.191858522843576e-09" name="Gd156" />
-    <nuclide ao="4.638430624956303e-10" name="Gd157" />
-    <nuclide ao="8.708423422315297e-09" name="I135" />
-    <nuclide ao="1.0044367208940878e-05" name="U234" />
-    <nuclide ao="0.0010227318972167215" name="U235" />
-    <nuclide ao="0.02213430292852769" name="U238" />
-    <nuclide ao="5.1906248571226276e-09" name="Xe135" />
-    <nuclide ao="1.4235382125659283e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.466675177481358e-07" name="Cs135"/>
+    <nuclide ao="7.191858522843576e-09" name="Gd156"/>
+    <nuclide ao="4.638430624956303e-10" name="Gd157"/>
+    <nuclide ao="8.708423422315297e-09" name="I135"/>
+    <nuclide ao="1.0044367208940878e-05" name="U234"/>
+    <nuclide ao="0.0010227318972167215" name="U235"/>
+    <nuclide ao="0.02213430292852769" name="U238"/>
+    <nuclide ao="5.1906248571226276e-09" name="Xe135"/>
+    <nuclide ao="1.4235382125659283e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="29" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.564848171022408e-07" name="Cs135" />
-    <nuclide ao="7.0469501548017595e-09" name="Gd156" />
-    <nuclide ao="5.361052671495466e-10" name="Gd157" />
-    <nuclide ao="8.542724956367744e-09" name="I135" />
-    <nuclide ao="1.0044597566946237e-05" name="U234" />
-    <nuclide ao="0.001023153091701961" name="U235" />
-    <nuclide ao="0.02213440168079113" name="U238" />
-    <nuclide ao="4.7586693353905456e-09" name="Xe135" />
-    <nuclide ao="1.3900523064080963e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.564848171022408e-07" name="Cs135"/>
+    <nuclide ao="7.0469501548017595e-09" name="Gd156"/>
+    <nuclide ao="5.361052671495466e-10" name="Gd157"/>
+    <nuclide ao="8.542724956367744e-09" name="I135"/>
+    <nuclide ao="1.0044597566946237e-05" name="U234"/>
+    <nuclide ao="0.001023153091701961" name="U235"/>
+    <nuclide ao="0.02213440168079113" name="U238"/>
+    <nuclide ao="4.7586693353905456e-09" name="Xe135"/>
+    <nuclide ao="1.3900523064080963e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="30" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.4370676059063824e-07" name="Cs135" />
-    <nuclide ao="7.136389134960373e-09" name="Gd156" />
-    <nuclide ao="5.566402242811059e-10" name="Gd157" />
-    <nuclide ao="8.587230467777767e-09" name="I135" />
-    <nuclide ao="1.004480884128657e-05" name="U234" />
-    <nuclide ao="0.001022687665436856" name="U235" />
-    <nuclide ao="0.022134380741743516" name="U238" />
-    <nuclide ao="5.4683261190383735e-09" name="Xe135" />
-    <nuclide ao="1.4274298358512255e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.4370676059063824e-07" name="Cs135"/>
+    <nuclide ao="7.136389134960373e-09" name="Gd156"/>
+    <nuclide ao="5.566402242811059e-10" name="Gd157"/>
+    <nuclide ao="8.587230467777767e-09" name="I135"/>
+    <nuclide ao="1.004480884128657e-05" name="U234"/>
+    <nuclide ao="0.001022687665436856" name="U235"/>
+    <nuclide ao="0.022134380741743516" name="U238"/>
+    <nuclide ao="5.4683261190383735e-09" name="Xe135"/>
+    <nuclide ao="1.4274298358512255e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="31" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.6639275835797485e-07" name="Cs135" />
-    <nuclide ao="7.445447082910731e-09" name="Gd156" />
-    <nuclide ao="3.884396959516564e-10" name="Gd157" />
-    <nuclide ao="9.880795036460556e-09" name="I135" />
-    <nuclide ao="1.0045110543062359e-05" name="U234" />
-    <nuclide ao="0.0010185051659663275" name="U235" />
-    <nuclide ao="0.02213479305012656" name="U238" />
-    <nuclide ao="5.6289307703612226e-09" name="Xe135" />
-    <nuclide ao="1.6214581970283184e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.6639275835797485e-07" name="Cs135"/>
+    <nuclide ao="7.445447082910731e-09" name="Gd156"/>
+    <nuclide ao="3.884396959516564e-10" name="Gd157"/>
+    <nuclide ao="9.880795036460556e-09" name="I135"/>
+    <nuclide ao="1.0045110543062359e-05" name="U234"/>
+    <nuclide ao="0.0010185051659663275" name="U235"/>
+    <nuclide ao="0.02213479305012656" name="U238"/>
+    <nuclide ao="5.6289307703612226e-09" name="Xe135"/>
+    <nuclide ao="1.6214581970283184e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="32" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.0464035" name="O16" />
-    <nuclide ao="4.1246893831031e-07" name="Cs135" />
-    <nuclide ao="4.2356001938581945e-09" name="Gd156" />
-    <nuclide ao="6.270357334495073e-05" name="Gd157" />
-    <nuclide ao="4.485549947931294e-09" name="I135" />
-    <nuclide ao="9.994246618985458e-22" name="U234" />
-    <nuclide ao="0.0010204963418477316" name="U235" />
-    <nuclide ao="0.0216917059287179" name="U238" />
-    <nuclide ao="5.1714358484516846e-09" name="Xe135" />
-    <nuclide ao="4.423753270444331e-07" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.0464035" name="O16"/>
+    <nuclide ao="4.1246893831031e-07" name="Cs135"/>
+    <nuclide ao="4.2356001938581945e-09" name="Gd156"/>
+    <nuclide ao="6.270357334495073e-05" name="Gd157"/>
+    <nuclide ao="4.485549947931294e-09" name="I135"/>
+    <nuclide ao="9.994246618985458e-22" name="U234"/>
+    <nuclide ao="0.0010204963418477316" name="U235"/>
+    <nuclide ao="0.0216917059287179" name="U238"/>
+    <nuclide ao="5.1714358484516846e-09" name="Xe135"/>
+    <nuclide ao="4.423753270444331e-07" name="Xe136"/>
   </material>
   <material depletable="true" id="33" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.6395364031690874e-07" name="Cs135" />
-    <nuclide ao="8.265991611496596e-09" name="Gd156" />
-    <nuclide ao="4.444390026580043e-10" name="Gd157" />
-    <nuclide ao="1.0063162185596583e-08" name="I135" />
-    <nuclide ao="1.0044147628029468e-05" name="U234" />
-    <nuclide ao="0.001016362691556219" name="U235" />
-    <nuclide ao="0.02213412426349629" name="U238" />
-    <nuclide ao="5.3815776956540436e-09" name="Xe135" />
-    <nuclide ao="1.7500907760661859e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.6395364031690874e-07" name="Cs135"/>
+    <nuclide ao="8.265991611496596e-09" name="Gd156"/>
+    <nuclide ao="4.444390026580043e-10" name="Gd157"/>
+    <nuclide ao="1.0063162185596583e-08" name="I135"/>
+    <nuclide ao="1.0044147628029468e-05" name="U234"/>
+    <nuclide ao="0.001016362691556219" name="U235"/>
+    <nuclide ao="0.02213412426349629" name="U238"/>
+    <nuclide ao="5.3815776956540436e-09" name="Xe135"/>
+    <nuclide ao="1.7500907760661859e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="34" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.559453976949576e-07" name="Cs135" />
-    <nuclide ao="8.064845612779484e-09" name="Gd156" />
-    <nuclide ao="4.2591362641629125e-10" name="Gd157" />
-    <nuclide ao="1.1089121002142455e-08" name="I135" />
-    <nuclide ao="1.0043946351156483e-05" name="U234" />
-    <nuclide ao="0.0010171808521742564" name="U235" />
-    <nuclide ao="0.022134239348941216" name="U238" />
-    <nuclide ao="5.356605982804754e-09" name="Xe135" />
-    <nuclide ao="1.7112469594232207e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.559453976949576e-07" name="Cs135"/>
+    <nuclide ao="8.064845612779484e-09" name="Gd156"/>
+    <nuclide ao="4.2591362641629125e-10" name="Gd157"/>
+    <nuclide ao="1.1089121002142455e-08" name="I135"/>
+    <nuclide ao="1.0043946351156483e-05" name="U234"/>
+    <nuclide ao="0.0010171808521742564" name="U235"/>
+    <nuclide ao="0.022134239348941216" name="U238"/>
+    <nuclide ao="5.356605982804754e-09" name="Xe135"/>
+    <nuclide ao="1.7112469594232207e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="35" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.783500141526413e-07" name="Cs135" />
-    <nuclide ao="8.278905214387035e-09" name="Gd156" />
-    <nuclide ao="4.327862004041665e-10" name="Gd157" />
-    <nuclide ao="1.0123582664408e-08" name="I135" />
-    <nuclide ao="1.0044298863413593e-05" name="U234" />
-    <nuclide ao="0.0010159230256249906" name="U235" />
-    <nuclide ao="0.022134198514065777" name="U238" />
-    <nuclide ao="5.871093697807924e-09" name="Xe135" />
-    <nuclide ao="1.7575689196142653e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.783500141526413e-07" name="Cs135"/>
+    <nuclide ao="8.278905214387035e-09" name="Gd156"/>
+    <nuclide ao="4.327862004041665e-10" name="Gd157"/>
+    <nuclide ao="1.0123582664408e-08" name="I135"/>
+    <nuclide ao="1.0044298863413593e-05" name="U234"/>
+    <nuclide ao="0.0010159230256249906" name="U235"/>
+    <nuclide ao="0.022134198514065777" name="U238"/>
+    <nuclide ao="5.871093697807924e-09" name="Xe135"/>
+    <nuclide ao="1.7575689196142653e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="36" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.7585244184207434e-07" name="Cs135" />
-    <nuclide ao="7.047102467834928e-09" name="Gd156" />
-    <nuclide ao="4.2900777068355455e-10" name="Gd157" />
-    <nuclide ao="9.106329247419147e-09" name="I135" />
-    <nuclide ao="1.0044907451842084e-05" name="U234" />
-    <nuclide ao="0.0010221233979713707" name="U235" />
-    <nuclide ao="0.022134597059777338" name="U238" />
-    <nuclide ao="4.972382286487818e-09" name="Xe135" />
-    <nuclide ao="1.4220785328559911e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.7585244184207434e-07" name="Cs135"/>
+    <nuclide ao="7.047102467834928e-09" name="Gd156"/>
+    <nuclide ao="4.2900777068355455e-10" name="Gd157"/>
+    <nuclide ao="9.106329247419147e-09" name="I135"/>
+    <nuclide ao="1.0044907451842084e-05" name="U234"/>
+    <nuclide ao="0.0010221233979713707" name="U235"/>
+    <nuclide ao="0.022134597059777338" name="U238"/>
+    <nuclide ao="4.972382286487818e-09" name="Xe135"/>
+    <nuclide ao="1.4220785328559911e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="37" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.6746885888193566e-07" name="Cs135" />
-    <nuclide ao="7.970289836851542e-09" name="Gd156" />
-    <nuclide ao="5.153997413859329e-10" name="Gd157" />
-    <nuclide ao="8.539123247052006e-09" name="I135" />
-    <nuclide ao="1.0044902591760214e-05" name="U234" />
-    <nuclide ao="0.0010166972454707368" name="U235" />
-    <nuclide ao="0.022134448586767958" name="U238" />
-    <nuclide ao="5.1645329989195485e-09" name="Xe135" />
-    <nuclide ao="1.7250109497896075e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.6746885888193566e-07" name="Cs135"/>
+    <nuclide ao="7.970289836851542e-09" name="Gd156"/>
+    <nuclide ao="5.153997413859329e-10" name="Gd157"/>
+    <nuclide ao="8.539123247052006e-09" name="I135"/>
+    <nuclide ao="1.0044902591760214e-05" name="U234"/>
+    <nuclide ao="0.0010166972454707368" name="U235"/>
+    <nuclide ao="0.022134448586767958" name="U238"/>
+    <nuclide ao="5.1645329989195485e-09" name="Xe135"/>
+    <nuclide ao="1.7250109497896075e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="38" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.6202331434862606e-07" name="Cs135" />
-    <nuclide ao="7.2903313484098115e-09" name="Gd156" />
-    <nuclide ao="5.153301245025632e-10" name="Gd157" />
-    <nuclide ao="7.966294204975086e-09" name="I135" />
-    <nuclide ao="1.0044264900657969e-05" name="U234" />
-    <nuclide ao="0.0010228069221266546" name="U235" />
-    <nuclide ao="0.022134157888978104" name="U238" />
-    <nuclide ao="5.177831754047586e-09" name="Xe135" />
-    <nuclide ao="1.407267340930604e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.6202331434862606e-07" name="Cs135"/>
+    <nuclide ao="7.2903313484098115e-09" name="Gd156"/>
+    <nuclide ao="5.153301245025632e-10" name="Gd157"/>
+    <nuclide ao="7.966294204975086e-09" name="I135"/>
+    <nuclide ao="1.0044264900657969e-05" name="U234"/>
+    <nuclide ao="0.0010228069221266546" name="U235"/>
+    <nuclide ao="0.022134157888978104" name="U238"/>
+    <nuclide ao="5.177831754047586e-09" name="Xe135"/>
+    <nuclide ao="1.407267340930604e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="39" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.3174845981583567e-07" name="Cs135" />
-    <nuclide ao="7.496333194161782e-09" name="Gd156" />
-    <nuclide ao="5.231502667413383e-10" name="Gd157" />
-    <nuclide ao="7.935273968506899e-09" name="I135" />
-    <nuclide ao="1.0044382650809202e-05" name="U234" />
-    <nuclide ao="0.001021658744884272" name="U235" />
-    <nuclide ao="0.022134102890115945" name="U238" />
-    <nuclide ao="4.9858113864830096e-09" name="Xe135" />
-    <nuclide ao="1.5003890300187458e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.3174845981583567e-07" name="Cs135"/>
+    <nuclide ao="7.496333194161782e-09" name="Gd156"/>
+    <nuclide ao="5.231502667413383e-10" name="Gd157"/>
+    <nuclide ao="7.935273968506899e-09" name="I135"/>
+    <nuclide ao="1.0044382650809202e-05" name="U234"/>
+    <nuclide ao="0.001021658744884272" name="U235"/>
+    <nuclide ao="0.022134102890115945" name="U238"/>
+    <nuclide ao="4.9858113864830096e-09" name="Xe135"/>
+    <nuclide ao="1.5003890300187458e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="40" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.5506601898731904e-07" name="Cs135" />
-    <nuclide ao="7.934623602610665e-09" name="Gd156" />
-    <nuclide ao="4.0376687645766805e-10" name="Gd157" />
-    <nuclide ao="1.0501733384373198e-08" name="I135" />
-    <nuclide ao="1.004473883959339e-05" name="U234" />
-    <nuclide ao="0.0010172584673731474" name="U235" />
-    <nuclide ao="0.022134388757146226" name="U238" />
-    <nuclide ao="5.42606805303822e-09" name="Xe135" />
-    <nuclide ao="1.70599550698538e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.5506601898731904e-07" name="Cs135"/>
+    <nuclide ao="7.934623602610665e-09" name="Gd156"/>
+    <nuclide ao="4.0376687645766805e-10" name="Gd157"/>
+    <nuclide ao="1.0501733384373198e-08" name="I135"/>
+    <nuclide ao="1.004473883959339e-05" name="U234"/>
+    <nuclide ao="0.0010172584673731474" name="U235"/>
+    <nuclide ao="0.022134388757146226" name="U238"/>
+    <nuclide ao="5.42606805303822e-09" name="Xe135"/>
+    <nuclide ao="1.70599550698538e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="41" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.0464035" name="O16" />
-    <nuclide ao="4.737331144463212e-07" name="Cs135" />
-    <nuclide ao="5.521575321063195e-09" name="Gd156" />
-    <nuclide ao="1.4494880150318664e-05" name="Gd157" />
-    <nuclide ao="7.1529015348137205e-09" name="I135" />
-    <nuclide ao="9.993878198706258e-22" name="U234" />
-    <nuclide ao="0.0010124255342132352" name="U235" />
-    <nuclide ao="0.021691587202735074" name="U238" />
-    <nuclide ao="6.145213313797255e-09" name="Xe135" />
-    <nuclide ao="8.133607625712522e-07" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.0464035" name="O16"/>
+    <nuclide ao="4.737331144463212e-07" name="Cs135"/>
+    <nuclide ao="5.521575321063195e-09" name="Gd156"/>
+    <nuclide ao="1.4494880150318664e-05" name="Gd157"/>
+    <nuclide ao="7.1529015348137205e-09" name="I135"/>
+    <nuclide ao="9.993878198706258e-22" name="U234"/>
+    <nuclide ao="0.0010124255342132352" name="U235"/>
+    <nuclide ao="0.021691587202735074" name="U238"/>
+    <nuclide ao="6.145213313797255e-09" name="Xe135"/>
+    <nuclide ao="8.133607625712522e-07" name="Xe136"/>
   </material>
   <material depletable="true" id="42" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.5524894179606457e-07" name="Cs135" />
-    <nuclide ao="8.417844469434808e-09" name="Gd156" />
-    <nuclide ao="3.2982393991609036e-10" name="Gd157" />
-    <nuclide ao="1.1627214885829156e-08" name="I135" />
-    <nuclide ao="1.0044467618124855e-05" name="U234" />
-    <nuclide ao="0.001013212200812725" name="U235" />
-    <nuclide ao="0.022134533704798967" name="U238" />
-    <nuclide ao="5.244119519563587e-09" name="Xe135" />
-    <nuclide ao="1.920092713575291e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.5524894179606457e-07" name="Cs135"/>
+    <nuclide ao="8.417844469434808e-09" name="Gd156"/>
+    <nuclide ao="3.2982393991609036e-10" name="Gd157"/>
+    <nuclide ao="1.1627214885829156e-08" name="I135"/>
+    <nuclide ao="1.0044467618124855e-05" name="U234"/>
+    <nuclide ao="0.001013212200812725" name="U235"/>
+    <nuclide ao="0.022134533704798967" name="U238"/>
+    <nuclide ao="5.244119519563587e-09" name="Xe135"/>
+    <nuclide ao="1.920092713575291e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="43" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.662108851072235e-07" name="Cs135" />
-    <nuclide ao="8.4032878753235e-09" name="Gd156" />
-    <nuclide ao="3.6691667384122996e-10" name="Gd157" />
-    <nuclide ao="1.0403690938587568e-08" name="I135" />
-    <nuclide ao="1.0044333944171827e-05" name="U234" />
-    <nuclide ao="0.0010143215164573993" name="U235" />
-    <nuclide ao="0.0221343495298156" name="U238" />
-    <nuclide ao="5.451035294220852e-09" name="Xe135" />
-    <nuclide ao="1.8535025389268127e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.662108851072235e-07" name="Cs135"/>
+    <nuclide ao="8.4032878753235e-09" name="Gd156"/>
+    <nuclide ao="3.6691667384122996e-10" name="Gd157"/>
+    <nuclide ao="1.0403690938587568e-08" name="I135"/>
+    <nuclide ao="1.0044333944171827e-05" name="U234"/>
+    <nuclide ao="0.0010143215164573993" name="U235"/>
+    <nuclide ao="0.0221343495298156" name="U238"/>
+    <nuclide ao="5.451035294220852e-09" name="Xe135"/>
+    <nuclide ao="1.8535025389268127e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="44" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.73864904604842e-07" name="Cs135" />
-    <nuclide ao="8.268522737275302e-09" name="Gd156" />
-    <nuclide ao="3.776944583625921e-10" name="Gd157" />
-    <nuclide ao="1.0842502905104421e-08" name="I135" />
-    <nuclide ao="1.0044550501204825e-05" name="U234" />
-    <nuclide ao="0.001015006255955966" name="U235" />
-    <nuclide ao="0.022134385320255762" name="U238" />
-    <nuclide ao="5.72299676663446e-09" name="Xe135" />
-    <nuclide ao="1.807725328156755e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.73864904604842e-07" name="Cs135"/>
+    <nuclide ao="8.268522737275302e-09" name="Gd156"/>
+    <nuclide ao="3.776944583625921e-10" name="Gd157"/>
+    <nuclide ao="1.0842502905104421e-08" name="I135"/>
+    <nuclide ao="1.0044550501204825e-05" name="U234"/>
+    <nuclide ao="0.001015006255955966" name="U235"/>
+    <nuclide ao="0.022134385320255762" name="U238"/>
+    <nuclide ao="5.72299676663446e-09" name="Xe135"/>
+    <nuclide ao="1.807725328156755e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="45" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.407652399955457e-07" name="Cs135" />
-    <nuclide ao="7.32781041571759e-09" name="Gd156" />
-    <nuclide ao="3.7455808972457266e-10" name="Gd157" />
-    <nuclide ao="1.1729593275224901e-08" name="I135" />
-    <nuclide ao="1.0044575831769826e-05" name="U234" />
-    <nuclide ao="0.0010207810611697816" name="U235" />
-    <nuclide ao="0.022134501621274148" name="U238" />
-    <nuclide ao="5.314959900128034e-09" name="Xe135" />
-    <nuclide ao="1.527947250045079e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.407652399955457e-07" name="Cs135"/>
+    <nuclide ao="7.32781041571759e-09" name="Gd156"/>
+    <nuclide ao="3.7455808972457266e-10" name="Gd157"/>
+    <nuclide ao="1.1729593275224901e-08" name="I135"/>
+    <nuclide ao="1.0044575831769826e-05" name="U234"/>
+    <nuclide ao="0.0010207810611697816" name="U235"/>
+    <nuclide ao="0.022134501621274148" name="U238"/>
+    <nuclide ao="5.314959900128034e-09" name="Xe135"/>
+    <nuclide ao="1.527947250045079e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="46" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.7039361195778916e-07" name="Cs135" />
-    <nuclide ao="7.557495659750535e-09" name="Gd156" />
-    <nuclide ao="4.707485791513479e-10" name="Gd157" />
-    <nuclide ao="1.0634554123977019e-08" name="I135" />
-    <nuclide ao="1.0044530555931302e-05" name="U234" />
-    <nuclide ao="0.0010209326507848344" name="U235" />
-    <nuclide ao="0.022134175302170087" name="U238" />
-    <nuclide ao="6.353270381663897e-09" name="Xe135" />
-    <nuclide ao="1.4955326784303866e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.7039361195778916e-07" name="Cs135"/>
+    <nuclide ao="7.557495659750535e-09" name="Gd156"/>
+    <nuclide ao="4.707485791513479e-10" name="Gd157"/>
+    <nuclide ao="1.0634554123977019e-08" name="I135"/>
+    <nuclide ao="1.0044530555931302e-05" name="U234"/>
+    <nuclide ao="0.0010209326507848344" name="U235"/>
+    <nuclide ao="0.022134175302170087" name="U238"/>
+    <nuclide ao="6.353270381663897e-09" name="Xe135"/>
+    <nuclide ao="1.4955326784303866e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="47" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.6360346132066926e-07" name="Cs135" />
-    <nuclide ao="7.495433106089146e-09" name="Gd156" />
-    <nuclide ao="4.3637453858129423e-10" name="Gd157" />
-    <nuclide ao="8.674778431147437e-09" name="I135" />
-    <nuclide ao="1.0044596524273944e-05" name="U234" />
-    <nuclide ao="0.0010204096990337349" name="U235" />
-    <nuclide ao="0.02213435327581158" name="U238" />
-    <nuclide ao="4.628778761065688e-09" name="Xe135" />
-    <nuclide ao="1.5312284289518895e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.6360346132066926e-07" name="Cs135"/>
+    <nuclide ao="7.495433106089146e-09" name="Gd156"/>
+    <nuclide ao="4.3637453858129423e-10" name="Gd157"/>
+    <nuclide ao="8.674778431147437e-09" name="I135"/>
+    <nuclide ao="1.0044596524273944e-05" name="U234"/>
+    <nuclide ao="0.0010204096990337349" name="U235"/>
+    <nuclide ao="0.02213435327581158" name="U238"/>
+    <nuclide ao="4.628778761065688e-09" name="Xe135"/>
+    <nuclide ao="1.5312284289518895e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="48" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.4387693520401374e-07" name="Cs135" />
-    <nuclide ao="7.976308032527657e-09" name="Gd156" />
-    <nuclide ao="3.969215104139622e-10" name="Gd157" />
-    <nuclide ao="9.776870277207879e-09" name="I135" />
-    <nuclide ao="1.0044607832816454e-05" name="U234" />
-    <nuclide ao="0.0010166668072008913" name="U235" />
-    <nuclide ao="0.022134444636866948" name="U238" />
-    <nuclide ao="4.958127909933565e-09" name="Xe135" />
-    <nuclide ao="1.7492896422147333e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.4387693520401374e-07" name="Cs135"/>
+    <nuclide ao="7.976308032527657e-09" name="Gd156"/>
+    <nuclide ao="3.969215104139622e-10" name="Gd157"/>
+    <nuclide ao="9.776870277207879e-09" name="I135"/>
+    <nuclide ao="1.0044607832816454e-05" name="U234"/>
+    <nuclide ao="0.0010166668072008913" name="U235"/>
+    <nuclide ao="0.022134444636866948" name="U238"/>
+    <nuclide ao="4.958127909933565e-09" name="Xe135"/>
+    <nuclide ao="1.7492896422147333e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="49" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.4551858041363977e-07" name="Cs135" />
-    <nuclide ao="7.337855347151208e-09" name="Gd156" />
-    <nuclide ao="5.288107900964448e-10" name="Gd157" />
-    <nuclide ao="8.958762339194064e-09" name="I135" />
-    <nuclide ao="1.0044618229862554e-05" name="U234" />
-    <nuclide ao="0.0010217889366471206" name="U235" />
-    <nuclide ao="0.02213429359938387" name="U238" />
-    <nuclide ao="5.4164245896036235e-09" name="Xe135" />
-    <nuclide ao="1.475050183048513e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.4551858041363977e-07" name="Cs135"/>
+    <nuclide ao="7.337855347151208e-09" name="Gd156"/>
+    <nuclide ao="5.288107900964448e-10" name="Gd157"/>
+    <nuclide ao="8.958762339194064e-09" name="I135"/>
+    <nuclide ao="1.0044618229862554e-05" name="U234"/>
+    <nuclide ao="0.0010217889366471206" name="U235"/>
+    <nuclide ao="0.02213429359938387" name="U238"/>
+    <nuclide ao="5.4164245896036235e-09" name="Xe135"/>
+    <nuclide ao="1.475050183048513e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="50" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.0464035" name="O16" />
-    <nuclide ao="4.517900947687999e-07" name="Cs135" />
-    <nuclide ao="5.045016113702969e-09" name="Gd156" />
-    <nuclide ao="1.813498498717964e-05" name="Gd157" />
-    <nuclide ao="6.482226184849989e-09" name="I135" />
-    <nuclide ao="9.994244901709577e-22" name="U234" />
-    <nuclide ao="0.001014762917637335" name="U235" />
-    <nuclide ao="0.021691761128727224" name="U238" />
-    <nuclide ao="5.763098994148905e-09" name="Xe135" />
-    <nuclide ao="7.078497676930973e-07" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.0464035" name="O16"/>
+    <nuclide ao="4.517900947687999e-07" name="Cs135"/>
+    <nuclide ao="5.045016113702969e-09" name="Gd156"/>
+    <nuclide ao="1.813498498717964e-05" name="Gd157"/>
+    <nuclide ao="6.482226184849989e-09" name="I135"/>
+    <nuclide ao="9.994244901709577e-22" name="U234"/>
+    <nuclide ao="0.001014762917637335" name="U235"/>
+    <nuclide ao="0.021691761128727224" name="U238"/>
+    <nuclide ao="5.763098994148905e-09" name="Xe135"/>
+    <nuclide ao="7.078497676930973e-07" name="Xe136"/>
   </material>
   <material depletable="true" id="51" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.659699942932865e-07" name="Cs135" />
-    <nuclide ao="8.02507497292664e-09" name="Gd156" />
-    <nuclide ao="4.0944569581885273e-10" name="Gd157" />
-    <nuclide ao="1.0945335150967568e-08" name="I135" />
-    <nuclide ao="1.004458115419737e-05" name="U234" />
-    <nuclide ao="0.0010164858220409118" name="U235" />
-    <nuclide ao="0.02213442218863816" name="U238" />
-    <nuclide ao="5.551411017452958e-09" name="Xe135" />
-    <nuclide ao="1.7355327771291413e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.659699942932865e-07" name="Cs135"/>
+    <nuclide ao="8.02507497292664e-09" name="Gd156"/>
+    <nuclide ao="4.0944569581885273e-10" name="Gd157"/>
+    <nuclide ao="1.0945335150967568e-08" name="I135"/>
+    <nuclide ao="1.004458115419737e-05" name="U234"/>
+    <nuclide ao="0.0010164858220409118" name="U235"/>
+    <nuclide ao="0.02213442218863816" name="U238"/>
+    <nuclide ao="5.551411017452958e-09" name="Xe135"/>
+    <nuclide ao="1.7355327771291413e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="52" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.681457048612913e-07" name="Cs135" />
-    <nuclide ao="8.713618667219466e-09" name="Gd156" />
-    <nuclide ao="3.1747017437854447e-10" name="Gd157" />
-    <nuclide ao="1.4020730741334374e-08" name="I135" />
-    <nuclide ao="1.0044099278018026e-05" name="U234" />
-    <nuclide ao="0.0010126690055618196" name="U235" />
-    <nuclide ao="0.022134261447381134" name="U238" />
-    <nuclide ao="5.639935953135477e-09" name="Xe135" />
-    <nuclide ao="1.938061665097604e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.681457048612913e-07" name="Cs135"/>
+    <nuclide ao="8.713618667219466e-09" name="Gd156"/>
+    <nuclide ao="3.1747017437854447e-10" name="Gd157"/>
+    <nuclide ao="1.4020730741334374e-08" name="I135"/>
+    <nuclide ao="1.0044099278018026e-05" name="U234"/>
+    <nuclide ao="0.0010126690055618196" name="U235"/>
+    <nuclide ao="0.022134261447381134" name="U238"/>
+    <nuclide ao="5.639935953135477e-09" name="Xe135"/>
+    <nuclide ao="1.938061665097604e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="53" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.544946945520625e-07" name="Cs135" />
-    <nuclide ao="8.33610026141816e-09" name="Gd156" />
-    <nuclide ao="3.3496936805090855e-10" name="Gd157" />
-    <nuclide ao="1.3007299470813329e-08" name="I135" />
-    <nuclide ao="1.004436661207803e-05" name="U234" />
-    <nuclide ao="0.0010141681489754964" name="U235" />
-    <nuclide ao="0.02213446084819779" name="U238" />
-    <nuclide ao="5.8346169894847925e-09" name="Xe135" />
-    <nuclide ao="1.868666262571162e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.544946945520625e-07" name="Cs135"/>
+    <nuclide ao="8.33610026141816e-09" name="Gd156"/>
+    <nuclide ao="3.3496936805090855e-10" name="Gd157"/>
+    <nuclide ao="1.3007299470813329e-08" name="I135"/>
+    <nuclide ao="1.004436661207803e-05" name="U234"/>
+    <nuclide ao="0.0010141681489754964" name="U235"/>
+    <nuclide ao="0.02213446084819779" name="U238"/>
+    <nuclide ao="5.8346169894847925e-09" name="Xe135"/>
+    <nuclide ao="1.868666262571162e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="54" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.5766121529176187e-07" name="Cs135" />
-    <nuclide ao="8.65642621418432e-09" name="Gd156" />
-    <nuclide ao="3.509450645755269e-10" name="Gd157" />
-    <nuclide ao="1.3877107353756e-08" name="I135" />
-    <nuclide ao="1.00441629560905e-05" name="U234" />
-    <nuclide ao="0.001014024385363442" name="U235" />
-    <nuclide ao="0.022134042904508544" name="U238" />
-    <nuclide ao="5.594497787363874e-09" name="Xe135" />
-    <nuclide ao="1.8794069132112366e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.5766121529176187e-07" name="Cs135"/>
+    <nuclide ao="8.65642621418432e-09" name="Gd156"/>
+    <nuclide ao="3.509450645755269e-10" name="Gd157"/>
+    <nuclide ao="1.3877107353756e-08" name="I135"/>
+    <nuclide ao="1.00441629560905e-05" name="U234"/>
+    <nuclide ao="0.001014024385363442" name="U235"/>
+    <nuclide ao="0.022134042904508544" name="U238"/>
+    <nuclide ao="5.594497787363874e-09" name="Xe135"/>
+    <nuclide ao="1.8794069132112366e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="55" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.507004502439453e-07" name="Cs135" />
-    <nuclide ao="8.3071667938887e-09" name="Gd156" />
-    <nuclide ao="4.852995076158137e-10" name="Gd157" />
-    <nuclide ao="8.430068168419455e-09" name="I135" />
-    <nuclide ao="1.0044124057323991e-05" name="U234" />
-    <nuclide ao="0.0010154726348100564" name="U235" />
-    <nuclide ao="0.022134186511126582" name="U238" />
-    <nuclide ao="4.949152618028197e-09" name="Xe135" />
-    <nuclide ao="1.8122564473713137e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.507004502439453e-07" name="Cs135"/>
+    <nuclide ao="8.3071667938887e-09" name="Gd156"/>
+    <nuclide ao="4.852995076158137e-10" name="Gd157"/>
+    <nuclide ao="8.430068168419455e-09" name="I135"/>
+    <nuclide ao="1.0044124057323991e-05" name="U234"/>
+    <nuclide ao="0.0010154726348100564" name="U235"/>
+    <nuclide ao="0.022134186511126582" name="U238"/>
+    <nuclide ao="4.949152618028197e-09" name="Xe135"/>
+    <nuclide ao="1.8122564473713137e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="56" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.836978539441927e-07" name="Cs135" />
-    <nuclide ao="7.537362094305878e-09" name="Gd156" />
-    <nuclide ao="4.512607647539804e-10" name="Gd157" />
-    <nuclide ao="9.601996850568601e-09" name="I135" />
-    <nuclide ao="1.0044685059101425e-05" name="U234" />
-    <nuclide ao="0.0010196381990622962" name="U235" />
-    <nuclide ao="0.022134452851824783" name="U238" />
-    <nuclide ao="5.494845510478888e-09" name="Xe135" />
-    <nuclide ao="1.5491995721899703e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.836978539441927e-07" name="Cs135"/>
+    <nuclide ao="7.537362094305878e-09" name="Gd156"/>
+    <nuclide ao="4.512607647539804e-10" name="Gd157"/>
+    <nuclide ao="9.601996850568601e-09" name="I135"/>
+    <nuclide ao="1.0044685059101425e-05" name="U234"/>
+    <nuclide ao="0.0010196381990622962" name="U235"/>
+    <nuclide ao="0.022134452851824783" name="U238"/>
+    <nuclide ao="5.494845510478888e-09" name="Xe135"/>
+    <nuclide ao="1.5491995721899703e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="57" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.418630152060222e-07" name="Cs135" />
-    <nuclide ao="7.826608349555056e-09" name="Gd156" />
-    <nuclide ao="4.0312953137586627e-10" name="Gd157" />
-    <nuclide ao="1.0758074384914874e-08" name="I135" />
-    <nuclide ao="1.0044350307427027e-05" name="U234" />
-    <nuclide ao="0.0010185120240349926" name="U235" />
-    <nuclide ao="0.02213427228310772" name="U238" />
-    <nuclide ao="5.1843671520361885e-09" name="Xe135" />
-    <nuclide ao="1.6536975556021742e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.418630152060222e-07" name="Cs135"/>
+    <nuclide ao="7.826608349555056e-09" name="Gd156"/>
+    <nuclide ao="4.0312953137586627e-10" name="Gd157"/>
+    <nuclide ao="1.0758074384914874e-08" name="I135"/>
+    <nuclide ao="1.0044350307427027e-05" name="U234"/>
+    <nuclide ao="0.0010185120240349926" name="U235"/>
+    <nuclide ao="0.02213427228310772" name="U238"/>
+    <nuclide ao="5.1843671520361885e-09" name="Xe135"/>
+    <nuclide ao="1.6536975556021742e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="58" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.510754768475252e-07" name="Cs135" />
-    <nuclide ao="7.58288861409564e-09" name="Gd156" />
-    <nuclide ao="4.1641609248824293e-10" name="Gd157" />
-    <nuclide ao="9.359811650211432e-09" name="I135" />
-    <nuclide ao="1.0044946416865512e-05" name="U234" />
-    <nuclide ao="0.001018648380338183" name="U235" />
-    <nuclide ao="0.02213458421313239" name="U238" />
-    <nuclide ao="5.298991296454321e-09" name="Xe135" />
-    <nuclide ao="1.6333307459606604e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.510754768475252e-07" name="Cs135"/>
+    <nuclide ao="7.58288861409564e-09" name="Gd156"/>
+    <nuclide ao="4.1641609248824293e-10" name="Gd157"/>
+    <nuclide ao="9.359811650211432e-09" name="I135"/>
+    <nuclide ao="1.0044946416865512e-05" name="U234"/>
+    <nuclide ao="0.001018648380338183" name="U235"/>
+    <nuclide ao="0.02213458421313239" name="U238"/>
+    <nuclide ao="5.298991296454321e-09" name="Xe135"/>
+    <nuclide ao="1.6333307459606604e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="59" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.0464035" name="O16" />
-    <nuclide ao="4.530550451595036e-07" name="Cs135" />
-    <nuclide ao="5.152211039334426e-09" name="Gd156" />
-    <nuclide ao="1.7414078119895758e-05" name="Gd157" />
-    <nuclide ao="5.798373053358886e-09" name="I135" />
-    <nuclide ao="9.99438210898009e-22" name="U234" />
-    <nuclide ao="0.0010142210013128748" name="U235" />
-    <nuclide ao="0.021691726637340897" name="U238" />
-    <nuclide ao="5.2661388263907965e-09" name="Xe135" />
-    <nuclide ao="7.374647711753153e-07" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.0464035" name="O16"/>
+    <nuclide ao="4.530550451595036e-07" name="Cs135"/>
+    <nuclide ao="5.152211039334426e-09" name="Gd156"/>
+    <nuclide ao="1.7414078119895758e-05" name="Gd157"/>
+    <nuclide ao="5.798373053358886e-09" name="I135"/>
+    <nuclide ao="9.99438210898009e-22" name="U234"/>
+    <nuclide ao="0.0010142210013128748" name="U235"/>
+    <nuclide ao="0.021691726637340897" name="U238"/>
+    <nuclide ao="5.2661388263907965e-09" name="Xe135"/>
+    <nuclide ao="7.374647711753153e-07" name="Xe136"/>
   </material>
   <material depletable="true" id="60" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.822049128847211e-07" name="Cs135" />
-    <nuclide ao="8.452589480827824e-09" name="Gd156" />
-    <nuclide ao="3.130624425923337e-10" name="Gd157" />
-    <nuclide ao="1.3923826259504172e-08" name="I135" />
-    <nuclide ao="1.0044676382241205e-05" name="U234" />
-    <nuclide ao="0.001013658455874247" name="U235" />
-    <nuclide ao="0.02213440597547886" name="U238" />
-    <nuclide ao="6.044142084679736e-09" name="Xe135" />
-    <nuclide ao="1.8681097431661907e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.822049128847211e-07" name="Cs135"/>
+    <nuclide ao="8.452589480827824e-09" name="Gd156"/>
+    <nuclide ao="3.130624425923337e-10" name="Gd157"/>
+    <nuclide ao="1.3923826259504172e-08" name="I135"/>
+    <nuclide ao="1.0044676382241205e-05" name="U234"/>
+    <nuclide ao="0.001013658455874247" name="U235"/>
+    <nuclide ao="0.02213440597547886" name="U238"/>
+    <nuclide ao="6.044142084679736e-09" name="Xe135"/>
+    <nuclide ao="1.8681097431661907e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="61" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.469104329635135e-07" name="Cs135" />
-    <nuclide ao="8.012731860037752e-09" name="Gd156" />
-    <nuclide ao="3.687262377579436e-10" name="Gd157" />
-    <nuclide ao="1.1428305583317049e-08" name="I135" />
-    <nuclide ao="1.0044405456912383e-05" name="U234" />
-    <nuclide ao="0.0010164498453548033" name="U235" />
-    <nuclide ao="0.022134450527738974" name="U238" />
-    <nuclide ao="5.061575525561637e-09" name="Xe135" />
-    <nuclide ao="1.756083189258799e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.469104329635135e-07" name="Cs135"/>
+    <nuclide ao="8.012731860037752e-09" name="Gd156"/>
+    <nuclide ao="3.687262377579436e-10" name="Gd157"/>
+    <nuclide ao="1.1428305583317049e-08" name="I135"/>
+    <nuclide ao="1.0044405456912383e-05" name="U234"/>
+    <nuclide ao="0.0010164498453548033" name="U235"/>
+    <nuclide ao="0.022134450527738974" name="U238"/>
+    <nuclide ao="5.061575525561637e-09" name="Xe135"/>
+    <nuclide ao="1.756083189258799e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="62" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.7251741702659313e-07" name="Cs135" />
-    <nuclide ao="8.233538586958797e-09" name="Gd156" />
-    <nuclide ao="4.349887703395141e-10" name="Gd157" />
-    <nuclide ao="1.1406240495004212e-08" name="I135" />
-    <nuclide ao="1.0044307557035553e-05" name="U234" />
-    <nuclide ao="0.0010151392433604388" name="U235" />
-    <nuclide ao="0.022134408556862245" name="U238" />
-    <nuclide ao="6.0266213853574374e-09" name="Xe135" />
-    <nuclide ao="1.800691275089163e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.7251741702659313e-07" name="Cs135"/>
+    <nuclide ao="8.233538586958797e-09" name="Gd156"/>
+    <nuclide ao="4.349887703395141e-10" name="Gd157"/>
+    <nuclide ao="1.1406240495004212e-08" name="I135"/>
+    <nuclide ao="1.0044307557035553e-05" name="U234"/>
+    <nuclide ao="0.0010151392433604388" name="U235"/>
+    <nuclide ao="0.022134408556862245" name="U238"/>
+    <nuclide ao="6.0266213853574374e-09" name="Xe135"/>
+    <nuclide ao="1.800691275089163e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="63" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.797949571938341e-07" name="Cs135" />
-    <nuclide ao="7.497400811811808e-09" name="Gd156" />
-    <nuclide ao="4.088535122765715e-10" name="Gd157" />
-    <nuclide ao="1.0206467883498239e-08" name="I135" />
-    <nuclide ao="1.004435842800189e-05" name="U234" />
-    <nuclide ao="0.0010202817074977542" name="U235" />
-    <nuclide ao="0.022134363783916533" name="U238" />
-    <nuclide ao="5.591910332022569e-09" name="Xe135" />
-    <nuclide ao="1.5192672057181153e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.797949571938341e-07" name="Cs135"/>
+    <nuclide ao="7.497400811811808e-09" name="Gd156"/>
+    <nuclide ao="4.088535122765715e-10" name="Gd157"/>
+    <nuclide ao="1.0206467883498239e-08" name="I135"/>
+    <nuclide ao="1.004435842800189e-05" name="U234"/>
+    <nuclide ao="0.0010202817074977542" name="U235"/>
+    <nuclide ao="0.022134363783916533" name="U238"/>
+    <nuclide ao="5.591910332022569e-09" name="Xe135"/>
+    <nuclide ao="1.5192672057181153e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="64" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.461730955451987e-07" name="Cs135" />
-    <nuclide ao="7.776020868744236e-09" name="Gd156" />
-    <nuclide ao="4.4071868954077136e-10" name="Gd157" />
-    <nuclide ao="9.588810485418303e-09" name="I135" />
-    <nuclide ao="1.004487574471167e-05" name="U234" />
-    <nuclide ao="0.0010174633640910328" name="U235" />
-    <nuclide ao="0.02213456463123289" name="U238" />
-    <nuclide ao="5.074476781994861e-09" name="Xe135" />
-    <nuclide ao="1.7022684623812113e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.461730955451987e-07" name="Cs135"/>
+    <nuclide ao="7.776020868744236e-09" name="Gd156"/>
+    <nuclide ao="4.4071868954077136e-10" name="Gd157"/>
+    <nuclide ao="9.588810485418303e-09" name="I135"/>
+    <nuclide ao="1.004487574471167e-05" name="U234"/>
+    <nuclide ao="0.0010174633640910328" name="U235"/>
+    <nuclide ao="0.02213456463123289" name="U238"/>
+    <nuclide ao="5.074476781994861e-09" name="Xe135"/>
+    <nuclide ao="1.7022684623812113e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="65" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.5021506685497305e-07" name="Cs135" />
-    <nuclide ao="7.941170521897373e-09" name="Gd156" />
-    <nuclide ao="4.879010096131576e-10" name="Gd157" />
-    <nuclide ao="8.335158320388755e-09" name="I135" />
-    <nuclide ao="1.0044464861755598e-05" name="U234" />
-    <nuclide ao="0.0010174211105109195" name="U235" />
-    <nuclide ao="0.022134346963915728" name="U238" />
-    <nuclide ao="5.0451349372152915e-09" name="Xe135" />
-    <nuclide ao="1.7053442909848939e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.5021506685497305e-07" name="Cs135"/>
+    <nuclide ao="7.941170521897373e-09" name="Gd156"/>
+    <nuclide ao="4.879010096131576e-10" name="Gd157"/>
+    <nuclide ao="8.335158320388755e-09" name="I135"/>
+    <nuclide ao="1.0044464861755598e-05" name="U234"/>
+    <nuclide ao="0.0010174211105109195" name="U235"/>
+    <nuclide ao="0.022134346963915728" name="U238"/>
+    <nuclide ao="5.0451349372152915e-09" name="Xe135"/>
+    <nuclide ao="1.7053442909848939e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="66" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.3005307843529157e-07" name="Cs135" />
-    <nuclide ao="8.093213731354938e-09" name="Gd156" />
-    <nuclide ao="5.146053417605058e-10" name="Gd157" />
-    <nuclide ao="9.193679355321394e-09" name="I135" />
-    <nuclide ao="1.0044529408418334e-05" name="U234" />
-    <nuclide ao="0.0010168399944823594" name="U235" />
-    <nuclide ao="0.022134260098909925" name="U238" />
-    <nuclide ao="5.05450783050593e-09" name="Xe135" />
-    <nuclide ao="1.7572929684549761e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.3005307843529157e-07" name="Cs135"/>
+    <nuclide ao="8.093213731354938e-09" name="Gd156"/>
+    <nuclide ao="5.146053417605058e-10" name="Gd157"/>
+    <nuclide ao="9.193679355321394e-09" name="I135"/>
+    <nuclide ao="1.0044529408418334e-05" name="U234"/>
+    <nuclide ao="0.0010168399944823594" name="U235"/>
+    <nuclide ao="0.022134260098909925" name="U238"/>
+    <nuclide ao="5.05450783050593e-09" name="Xe135"/>
+    <nuclide ao="1.7572929684549761e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="67" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.6387578610062286e-07" name="Cs135" />
-    <nuclide ao="7.904303212237503e-09" name="Gd156" />
-    <nuclide ao="3.535144099924123e-10" name="Gd157" />
-    <nuclide ao="1.0913558740692056e-08" name="I135" />
-    <nuclide ao="1.0045224868149788e-05" name="U234" />
-    <nuclide ao="0.001015358496922936" name="U235" />
-    <nuclide ao="0.022134797060124518" name="U238" />
-    <nuclide ao="5.1610662074147125e-09" name="Xe135" />
-    <nuclide ao="1.7925321185986492e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.6387578610062286e-07" name="Cs135"/>
+    <nuclide ao="7.904303212237503e-09" name="Gd156"/>
+    <nuclide ao="3.535144099924123e-10" name="Gd157"/>
+    <nuclide ao="1.0913558740692056e-08" name="I135"/>
+    <nuclide ao="1.0045224868149788e-05" name="U234"/>
+    <nuclide ao="0.001015358496922936" name="U235"/>
+    <nuclide ao="0.022134797060124518" name="U238"/>
+    <nuclide ao="5.1610662074147125e-09" name="Xe135"/>
+    <nuclide ao="1.7925321185986492e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="68" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.0464035" name="O16" />
-    <nuclide ao="4.463981618348249e-07" name="Cs135" />
-    <nuclide ao="5.473484806421357e-09" name="Gd156" />
-    <nuclide ao="7.873961729359943e-06" name="Gd157" />
-    <nuclide ao="7.047514520153705e-09" name="I135" />
-    <nuclide ao="9.994147081867662e-22" name="U234" />
-    <nuclide ao="0.0010125885884198049" name="U235" />
-    <nuclide ao="0.021691621503653214" name="U238" />
-    <nuclide ao="5.588811425534595e-09" name="Xe135" />
-    <nuclide ao="8.320325559538217e-07" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.0464035" name="O16"/>
+    <nuclide ao="4.463981618348249e-07" name="Cs135"/>
+    <nuclide ao="5.473484806421357e-09" name="Gd156"/>
+    <nuclide ao="7.873961729359943e-06" name="Gd157"/>
+    <nuclide ao="7.047514520153705e-09" name="I135"/>
+    <nuclide ao="9.994147081867662e-22" name="U234"/>
+    <nuclide ao="0.0010125885884198049" name="U235"/>
+    <nuclide ao="0.021691621503653214" name="U238"/>
+    <nuclide ao="5.588811425534595e-09" name="Xe135"/>
+    <nuclide ao="8.320325559538217e-07" name="Xe136"/>
   </material>
   <material depletable="true" id="69" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.6223836643047225e-07" name="Cs135" />
-    <nuclide ao="7.953476977467476e-09" name="Gd156" />
-    <nuclide ao="4.1027175102378134e-10" name="Gd157" />
-    <nuclide ao="9.796423510520291e-09" name="I135" />
-    <nuclide ao="1.0044187649332334e-05" name="U234" />
-    <nuclide ao="0.0010170353834330855" name="U235" />
-    <nuclide ao="0.02213437255948415" name="U238" />
-    <nuclide ao="5.099103090678887e-09" name="Xe135" />
-    <nuclide ao="1.7121460729487166e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.6223836643047225e-07" name="Cs135"/>
+    <nuclide ao="7.953476977467476e-09" name="Gd156"/>
+    <nuclide ao="4.1027175102378134e-10" name="Gd157"/>
+    <nuclide ao="9.796423510520291e-09" name="I135"/>
+    <nuclide ao="1.0044187649332334e-05" name="U234"/>
+    <nuclide ao="0.0010170353834330855" name="U235"/>
+    <nuclide ao="0.02213437255948415" name="U238"/>
+    <nuclide ao="5.099103090678887e-09" name="Xe135"/>
+    <nuclide ao="1.7121460729487166e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="70" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.6649971611519487e-07" name="Cs135" />
-    <nuclide ao="9.025781285565924e-09" name="Gd156" />
-    <nuclide ao="3.1907017092468375e-10" name="Gd157" />
-    <nuclide ao="1.4711477971416576e-08" name="I135" />
-    <nuclide ao="1.0043737061582427e-05" name="U234" />
-    <nuclide ao="0.0010106766372541289" name="U235" />
-    <nuclide ao="0.022134240991070177" name="U238" />
-    <nuclide ao="5.458886765350308e-09" name="Xe135" />
-    <nuclide ao="2.046679694527426e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.6649971611519487e-07" name="Cs135"/>
+    <nuclide ao="9.025781285565924e-09" name="Gd156"/>
+    <nuclide ao="3.1907017092468375e-10" name="Gd157"/>
+    <nuclide ao="1.4711477971416576e-08" name="I135"/>
+    <nuclide ao="1.0043737061582427e-05" name="U234"/>
+    <nuclide ao="0.0010106766372541289" name="U235"/>
+    <nuclide ao="0.022134240991070177" name="U238"/>
+    <nuclide ao="5.458886765350308e-09" name="Xe135"/>
+    <nuclide ao="2.046679694527426e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="71" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.6163611951434233e-07" name="Cs135" />
-    <nuclide ao="8.092676349588978e-09" name="Gd156" />
-    <nuclide ao="4.0155978971538995e-10" name="Gd157" />
-    <nuclide ao="1.1255710238096574e-08" name="I135" />
-    <nuclide ao="1.004408015645573e-05" name="U234" />
-    <nuclide ao="0.0010160767932069026" name="U235" />
-    <nuclide ao="0.02213440485813173" name="U238" />
-    <nuclide ao="6.106545578915884e-09" name="Xe135" />
-    <nuclide ao="1.7613053602979686e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.6163611951434233e-07" name="Cs135"/>
+    <nuclide ao="8.092676349588978e-09" name="Gd156"/>
+    <nuclide ao="4.0155978971538995e-10" name="Gd157"/>
+    <nuclide ao="1.1255710238096574e-08" name="I135"/>
+    <nuclide ao="1.004408015645573e-05" name="U234"/>
+    <nuclide ao="0.0010160767932069026" name="U235"/>
+    <nuclide ao="0.02213440485813173" name="U238"/>
+    <nuclide ao="6.106545578915884e-09" name="Xe135"/>
+    <nuclide ao="1.7613053602979686e-06" name="Xe136"/>
   </material>
   <material depletable="true" id="72" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum" />
-    <nuclide ao="0.046295399999999994" name="O16" />
-    <nuclide ao="0.00011276839999999999" name="O17" />
-    <nuclide ao="4.5571123667085124e-07" name="Cs135" />
-    <nuclide ao="6.92888783217973e-09" name="Gd156" />
-    <nuclide ao="4.375317133467861e-10" name="Gd157" />
-    <nuclide ao="8.93489066848444e-09" name="I135" />
-    <nuclide ao="1.004461017444276e-05" name="U234" />
-    <nuclide ao="0.0010236806449050182" name="U235" />
-    <nuclide ao="0.02213444447231895" name="U238" />
-    <nuclide ao="5.2257746760182805e-09" name="Xe135" />
-    <nuclide ao="1.360904087177153e-06" name="Xe136" />
+    <density units="sum"/>
+    <nuclide ao="0.046295399999999994" name="O16"/>
+    <nuclide ao="0.00011276839999999999" name="O17"/>
+    <nuclide ao="4.5571123667085124e-07" name="Cs135"/>
+    <nuclide ao="6.92888783217973e-09" name="Gd156"/>
+    <nuclide ao="4.375317133467861e-10" name="Gd157"/>
+    <nuclide ao="8.93489066848444e-09" name="I135"/>
+    <nuclide ao="1.004461017444276e-05" name="U234"/>
+    <nuclide ao="0.0010236806449050182" name="U235"/>
+    <nuclide ao="0.02213444447231895" name="U238"/>
+    <nuclide ao="5.2257746760182805e-09" name="Xe135"/>
+    <nuclide ao="1.360904087177153e-06" name="Xe136"/>
   </material>
   <material id="73" temperature="293.6" volume="0.017528298008244847">
-    <density units="sum" />
-    <nuclide ao="3.3864599999999994e-05" name="N14" />
-    <nuclide ao="1.23717e-07" name="N15" />
-    <nuclide ao="7.86548e-06" name="O16" />
-    <nuclide ao="2.9954799999999997e-09" name="O17" />
+    <density units="sum"/>
+    <nuclide ao="3.3864599999999994e-05" name="N14"/>
+    <nuclide ao="1.23717e-07" name="N15"/>
+    <nuclide ao="7.86548e-06" name="O16"/>
+    <nuclide ao="2.9954799999999997e-09" name="O17"/>
   </material>
   <material id="74" temperature="293.6" volume="0.16066450553933276">
-    <density units="sum" />
-    <nuclide ao="3.2962e-06" name="Cr50" />
-    <nuclide ao="6.35639e-05" name="Cr52" />
-    <nuclide ao="7.20763e-06" name="Cr53" />
-    <nuclide ao="1.7941299999999999e-06" name="Cr54" />
-    <nuclide ao="5.573499999999999e-06" name="Fe54" />
-    <nuclide ao="8.749209999999999e-05" name="Fe56" />
-    <nuclide ao="2.0205699999999998e-06" name="Fe57" />
-    <nuclide ao="2.6890099999999995e-07" name="Fe58" />
-    <nuclide ao="2.51631e-05" name="Ni58" />
-    <nuclide ao="9.69278e-06" name="Ni60" />
-    <nuclide ao="4.21338e-07" name="Ni61" />
-    <nuclide ao="1.34341e-06" name="Ni62" />
-    <nuclide ao="3.43127e-07" name="Ni64" />
-    <nuclide ao="0.000307427" name="O16" />
-    <nuclide ao="7.488679999999999e-07" name="O17" />
-    <nuclide ao="4.67352e-06" name="Sn112" />
-    <nuclide ao="3.17992e-06" name="Sn114" />
-    <nuclide ao="1.6381399999999999e-06" name="Sn115" />
-    <nuclide ao="7.005459999999999e-05" name="Sn116" />
-    <nuclide ao="3.70027e-05" name="Sn117" />
-    <nuclide ao="0.00011669399999999999" name="Sn118" />
-    <nuclide ao="4.1387199999999996e-05" name="Sn119" />
-    <nuclide ao="0.00015697299999999998" name="Sn120" />
-    <nuclide ao="2.23076e-05" name="Sn122" />
-    <nuclide ao="2.7896599999999996e-05" name="Sn124" />
-    <nuclide ao="0.021831999999999997" name="Zr90" />
-    <nuclide ao="0.004761039999999999" name="Zr91" />
-    <nuclide ao="0.007277339999999999" name="Zr92" />
-    <nuclide ao="0.007374939999999999" name="Zr94" />
-    <nuclide ao="0.00118814" name="Zr96" />
+    <density units="sum"/>
+    <nuclide ao="3.2962e-06" name="Cr50"/>
+    <nuclide ao="6.35639e-05" name="Cr52"/>
+    <nuclide ao="7.20763e-06" name="Cr53"/>
+    <nuclide ao="1.7941299999999999e-06" name="Cr54"/>
+    <nuclide ao="5.573499999999999e-06" name="Fe54"/>
+    <nuclide ao="8.749209999999999e-05" name="Fe56"/>
+    <nuclide ao="2.0205699999999998e-06" name="Fe57"/>
+    <nuclide ao="2.6890099999999995e-07" name="Fe58"/>
+    <nuclide ao="2.51631e-05" name="Ni58"/>
+    <nuclide ao="9.69278e-06" name="Ni60"/>
+    <nuclide ao="4.21338e-07" name="Ni61"/>
+    <nuclide ao="1.34341e-06" name="Ni62"/>
+    <nuclide ao="3.43127e-07" name="Ni64"/>
+    <nuclide ao="0.000307427" name="O16"/>
+    <nuclide ao="7.488679999999999e-07" name="O17"/>
+    <nuclide ao="4.67352e-06" name="Sn112"/>
+    <nuclide ao="3.17992e-06" name="Sn114"/>
+    <nuclide ao="1.6381399999999999e-06" name="Sn115"/>
+    <nuclide ao="7.005459999999999e-05" name="Sn116"/>
+    <nuclide ao="3.70027e-05" name="Sn117"/>
+    <nuclide ao="0.00011669399999999999" name="Sn118"/>
+    <nuclide ao="4.1387199999999996e-05" name="Sn119"/>
+    <nuclide ao="0.00015697299999999998" name="Sn120"/>
+    <nuclide ao="2.23076e-05" name="Sn122"/>
+    <nuclide ao="2.7896599999999996e-05" name="Sn124"/>
+    <nuclide ao="0.021831999999999997" name="Zr90"/>
+    <nuclide ao="0.004761039999999999" name="Zr91"/>
+    <nuclide ao="0.007277339999999999" name="Zr92"/>
+    <nuclide ao="0.007374939999999999" name="Zr94"/>
+    <nuclide ao="0.00118814" name="Zr96"/>
   </material>
   <material id="75" temperature="293.6" volume="0.8803968514832288">
-    <density units="sum" />
-    <nuclide ao="0.046806299999999995" name="H1" />
-    <nuclide ao="0.023342699999999997" name="O16" />
-    <nuclide ao="8.890859999999999e-06" name="O17" />
-    <sab name="c_H_in_H2O" />
+    <density units="sum"/>
+    <nuclide ao="0.046806299999999995" name="H1"/>
+    <nuclide ao="0.023342699999999997" name="O16"/>
+    <nuclide ao="8.890859999999999e-06" name="O17"/>
+    <sab name="c_H_in_H2O"/>
   </material>
   <material id="76" temperature="293.6" volume="0.8803968514832288">
-    <density units="sum" />
-    <nuclide ao="0.046806299999999995" name="H1" />
-    <nuclide ao="0.023342699999999997" name="O16" />
-    <nuclide ao="8.890859999999999e-06" name="O17" />
-    <sab name="c_H_in_H2O" />
+    <density units="sum"/>
+    <nuclide ao="0.046806299999999995" name="H1"/>
+    <nuclide ao="0.023342699999999997" name="O16"/>
+    <nuclide ao="8.890859999999999e-06" name="O17"/>
+    <sab name="c_H_in_H2O"/>
   </material>
 </materials>
diff --git a/tests/regression_tests/diff_tally/inputs_true.dat b/tests/regression_tests/diff_tally/inputs_true.dat
index 99697a1e9a..5fad7175d8 100644
--- a/tests/regression_tests/diff_tally/inputs_true.dat
+++ b/tests/regression_tests/diff_tally/inputs_true.dat
@@ -2,181 +2,181 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UOX fuel">
-      <density units="g/cm3" value="10.062" />
-      <nuclide ao="4.9476e-06" name="U234" />
-      <nuclide ao="0.00048218" name="U235" />
-      <nuclide ao="0.021504" name="U238" />
-      <nuclide ao="1.0801e-08" name="Xe135" />
-      <nuclide ao="0.045737" name="O16" />
+      <density units="g/cm3" value="10.062"/>
+      <nuclide ao="4.9476e-06" name="U234"/>
+      <nuclide ao="0.00048218" name="U235"/>
+      <nuclide ao="0.021504" name="U238"/>
+      <nuclide ao="1.0801e-08" name="Xe135"/>
+      <nuclide ao="0.045737" name="O16"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cm3" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="Cold borated water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <nuclide ao="0.000649" name="B10" />
-      <nuclide ao="0.002689" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <nuclide ao="0.000649" name="B10"/>
+      <nuclide ao="0.002689" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="4" name="Hot borated water">
-      <density units="atom/b-cm" value="0.06614" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <nuclide ao="0.000649" name="B10" />
-      <nuclide ao="0.002689" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="atom/b-cm" value="0.06614"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <nuclide ao="0.000649" name="B10"/>
+      <nuclide ao="0.002689" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="5" name="Reactor pressure vessel steel">
-      <density units="g/cm3" value="7.9" />
-      <nuclide name="Fe54" wo="0.05437098" />
-      <nuclide name="Fe56" wo="0.88500663" />
-      <nuclide name="Fe57" wo="0.0208008" />
-      <nuclide name="Fe58" wo="0.00282159" />
-      <nuclide name="Ni58" wo="0.0067198" />
-      <nuclide name="Ni60" wo="0.0026776" />
-      <nuclide name="Mn55" wo="0.01" />
-      <nuclide name="Cr52" wo="0.002092475" />
-      <nuclide name="C0" wo="0.0025" />
-      <nuclide name="Cu63" wo="0.0013696" />
+      <density units="g/cm3" value="7.9"/>
+      <nuclide name="Fe54" wo="0.05437098"/>
+      <nuclide name="Fe56" wo="0.88500663"/>
+      <nuclide name="Fe57" wo="0.0208008"/>
+      <nuclide name="Fe58" wo="0.00282159"/>
+      <nuclide name="Ni58" wo="0.0067198"/>
+      <nuclide name="Ni60" wo="0.0026776"/>
+      <nuclide name="Mn55" wo="0.01"/>
+      <nuclide name="Cr52" wo="0.002092475"/>
+      <nuclide name="C0" wo="0.0025"/>
+      <nuclide name="Cu63" wo="0.0013696"/>
     </material>
     <material id="6" name="Lower radial reflector">
-      <density units="g/cm3" value="4.32" />
-      <nuclide name="H1" wo="0.0095661" />
-      <nuclide name="O16" wo="0.0759107" />
-      <nuclide name="B10" wo="3.08409e-05" />
-      <nuclide name="B11" wo="0.000140499" />
-      <nuclide name="Fe54" wo="0.035620772088" />
-      <nuclide name="Fe56" wo="0.579805982228" />
-      <nuclide name="Fe57" wo="0.01362750048" />
-      <nuclide name="Fe58" wo="0.001848545204" />
-      <nuclide name="Ni58" wo="0.055298376566" />
-      <nuclide name="Mn55" wo="0.018287" />
-      <nuclide name="Cr52" wo="0.145407678031" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="4.32"/>
+      <nuclide name="H1" wo="0.0095661"/>
+      <nuclide name="O16" wo="0.0759107"/>
+      <nuclide name="B10" wo="3.08409e-05"/>
+      <nuclide name="B11" wo="0.000140499"/>
+      <nuclide name="Fe54" wo="0.035620772088"/>
+      <nuclide name="Fe56" wo="0.579805982228"/>
+      <nuclide name="Fe57" wo="0.01362750048"/>
+      <nuclide name="Fe58" wo="0.001848545204"/>
+      <nuclide name="Ni58" wo="0.055298376566"/>
+      <nuclide name="Mn55" wo="0.018287"/>
+      <nuclide name="Cr52" wo="0.145407678031"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="7" name="Upper radial reflector / Top plate region">
-      <density units="g/cm3" value="4.28" />
-      <nuclide name="H1" wo="0.0086117" />
-      <nuclide name="O16" wo="0.0683369" />
-      <nuclide name="B10" wo="2.77638e-05" />
-      <nuclide name="B11" wo="0.000126481" />
-      <nuclide name="Fe54" wo="0.035953677186" />
-      <nuclide name="Fe56" wo="0.585224740891" />
-      <nuclide name="Fe57" wo="0.01375486056" />
-      <nuclide name="Fe58" wo="0.001865821363" />
-      <nuclide name="Ni58" wo="0.055815129186" />
-      <nuclide name="Mn55" wo="0.0184579" />
-      <nuclide name="Cr52" wo="0.146766614995" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="4.28"/>
+      <nuclide name="H1" wo="0.0086117"/>
+      <nuclide name="O16" wo="0.0683369"/>
+      <nuclide name="B10" wo="2.77638e-05"/>
+      <nuclide name="B11" wo="0.000126481"/>
+      <nuclide name="Fe54" wo="0.035953677186"/>
+      <nuclide name="Fe56" wo="0.585224740891"/>
+      <nuclide name="Fe57" wo="0.01375486056"/>
+      <nuclide name="Fe58" wo="0.001865821363"/>
+      <nuclide name="Ni58" wo="0.055815129186"/>
+      <nuclide name="Mn55" wo="0.0184579"/>
+      <nuclide name="Cr52" wo="0.146766614995"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="8" name="Bottom plate region">
-      <density units="g/cm3" value="7.184" />
-      <nuclide name="H1" wo="0.0011505" />
-      <nuclide name="O16" wo="0.0091296" />
-      <nuclide name="B10" wo="3.70915e-06" />
-      <nuclide name="B11" wo="1.68974e-05" />
-      <nuclide name="Fe54" wo="0.03855611055" />
-      <nuclide name="Fe56" wo="0.627585036425" />
-      <nuclide name="Fe57" wo="0.014750478" />
-      <nuclide name="Fe58" wo="0.002000875025" />
-      <nuclide name="Ni58" wo="0.059855207342" />
-      <nuclide name="Mn55" wo="0.019794" />
-      <nuclide name="Cr52" wo="0.157390026871" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="7.184"/>
+      <nuclide name="H1" wo="0.0011505"/>
+      <nuclide name="O16" wo="0.0091296"/>
+      <nuclide name="B10" wo="3.70915e-06"/>
+      <nuclide name="B11" wo="1.68974e-05"/>
+      <nuclide name="Fe54" wo="0.03855611055"/>
+      <nuclide name="Fe56" wo="0.627585036425"/>
+      <nuclide name="Fe57" wo="0.014750478"/>
+      <nuclide name="Fe58" wo="0.002000875025"/>
+      <nuclide name="Ni58" wo="0.059855207342"/>
+      <nuclide name="Mn55" wo="0.019794"/>
+      <nuclide name="Cr52" wo="0.157390026871"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="9" name="Bottom nozzle region">
-      <density units="g/cm3" value="2.53" />
-      <nuclide name="H1" wo="0.0245014" />
-      <nuclide name="O16" wo="0.1944274" />
-      <nuclide name="B10" wo="7.89917e-05" />
-      <nuclide name="B11" wo="0.000359854" />
-      <nuclide name="Fe54" wo="0.030411411144" />
-      <nuclide name="Fe56" wo="0.495012237964" />
-      <nuclide name="Fe57" wo="0.01163454624" />
-      <nuclide name="Fe58" wo="0.001578204652" />
-      <nuclide name="Ni58" wo="0.047211231662" />
-      <nuclide name="Mn55" wo="0.0156126" />
-      <nuclide name="Cr52" wo="0.124142524198" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="2.53"/>
+      <nuclide name="H1" wo="0.0245014"/>
+      <nuclide name="O16" wo="0.1944274"/>
+      <nuclide name="B10" wo="7.89917e-05"/>
+      <nuclide name="B11" wo="0.000359854"/>
+      <nuclide name="Fe54" wo="0.030411411144"/>
+      <nuclide name="Fe56" wo="0.495012237964"/>
+      <nuclide name="Fe57" wo="0.01163454624"/>
+      <nuclide name="Fe58" wo="0.001578204652"/>
+      <nuclide name="Ni58" wo="0.047211231662"/>
+      <nuclide name="Mn55" wo="0.0156126"/>
+      <nuclide name="Cr52" wo="0.124142524198"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="10" name="Top nozzle region">
-      <density units="g/cm3" value="1.746" />
-      <nuclide name="H1" wo="0.035887" />
-      <nuclide name="O16" wo="0.2847761" />
-      <nuclide name="B10" wo="0.000115699" />
-      <nuclide name="B11" wo="0.000527075" />
-      <nuclide name="Fe54" wo="0.02644016154" />
-      <nuclide name="Fe56" wo="0.43037146399" />
-      <nuclide name="Fe57" wo="0.0101152584" />
-      <nuclide name="Fe58" wo="0.00137211607" />
-      <nuclide name="Ni58" wo="0.04104621835" />
-      <nuclide name="Mn55" wo="0.0135739" />
-      <nuclide name="Cr52" wo="0.107931450781" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="1.746"/>
+      <nuclide name="H1" wo="0.035887"/>
+      <nuclide name="O16" wo="0.2847761"/>
+      <nuclide name="B10" wo="0.000115699"/>
+      <nuclide name="B11" wo="0.000527075"/>
+      <nuclide name="Fe54" wo="0.02644016154"/>
+      <nuclide name="Fe56" wo="0.43037146399"/>
+      <nuclide name="Fe57" wo="0.0101152584"/>
+      <nuclide name="Fe58" wo="0.00137211607"/>
+      <nuclide name="Ni58" wo="0.04104621835"/>
+      <nuclide name="Mn55" wo="0.0135739"/>
+      <nuclide name="Cr52" wo="0.107931450781"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="11" name="Top of fuel assemblies">
-      <density units="g/cm3" value="3.044" />
-      <nuclide name="H1" wo="0.0162913" />
-      <nuclide name="O16" wo="0.1292776" />
-      <nuclide name="B10" wo="5.25228e-05" />
-      <nuclide name="B11" wo="0.000239272" />
-      <nuclide name="Zr90" wo="0.43313403903" />
-      <nuclide name="Zr91" wo="0.09549277374" />
-      <nuclide name="Zr92" wo="0.14759527104" />
-      <nuclide name="Zr94" wo="0.15280552077" />
-      <nuclide name="Zr96" wo="0.02511169542" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="3.044"/>
+      <nuclide name="H1" wo="0.0162913"/>
+      <nuclide name="O16" wo="0.1292776"/>
+      <nuclide name="B10" wo="5.25228e-05"/>
+      <nuclide name="B11" wo="0.000239272"/>
+      <nuclide name="Zr90" wo="0.43313403903"/>
+      <nuclide name="Zr91" wo="0.09549277374"/>
+      <nuclide name="Zr92" wo="0.14759527104"/>
+      <nuclide name="Zr94" wo="0.15280552077"/>
+      <nuclide name="Zr96" wo="0.02511169542"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="12" name="Bottom of fuel assemblies">
-      <density units="g/cm3" value="1.762" />
-      <nuclide name="H1" wo="0.0292856" />
-      <nuclide name="O16" wo="0.2323919" />
-      <nuclide name="B10" wo="9.44159e-05" />
-      <nuclide name="B11" wo="0.00043012" />
-      <nuclide name="Zr90" wo="0.3741373658" />
-      <nuclide name="Zr91" wo="0.0824858164" />
-      <nuclide name="Zr92" wo="0.1274914944" />
-      <nuclide name="Zr94" wo="0.1319920622" />
-      <nuclide name="Zr96" wo="0.0216912612" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="1.762"/>
+      <nuclide name="H1" wo="0.0292856"/>
+      <nuclide name="O16" wo="0.2323919"/>
+      <nuclide name="B10" wo="9.44159e-05"/>
+      <nuclide name="B11" wo="0.00043012"/>
+      <nuclide name="Zr90" wo="0.3741373658"/>
+      <nuclide name="Zr91" wo="0.0824858164"/>
+      <nuclide name="Zr92" wo="0.1274914944"/>
+      <nuclide name="Zr94" wo="0.1319920622"/>
+      <nuclide name="Zr96" wo="0.0216912612"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell fill="200" id="1" region="-6 34 -35" universe="0" />
-    <cell fill="201" id="2" region="-6 35 -36" universe="0" />
-    <cell id="3" material="8" region="-7 31 -32" universe="0" />
-    <cell id="4" material="9" region="-5 32 -33" universe="0" />
-    <cell id="5" material="12" region="-5 33 -34" universe="0" />
-    <cell id="6" material="11" region="-5 36 -37" universe="0" />
-    <cell id="7" material="10" region="-5 37 -38" universe="0" />
-    <cell id="8" material="7" region="-7 38 -39" universe="0" />
-    <cell id="9" material="9" region="6 -7 32 -38" universe="0" />
-    <cell id="10" material="5" region="7 -8 31 -39" universe="0" />
-    <cell id="11" material="6" region="5 -6 32 -34" universe="0" />
-    <cell id="12" material="7" region="5 -6 36 -38" universe="0" />
-    <cell id="21" material="1" region="-1" universe="1" />
-    <cell id="22" material="2" region="1 -2" universe="1" />
-    <cell id="23" material="3" region="2" universe="1" />
-    <cell id="24" material="3" region="-3" universe="2" />
-    <cell id="25" material="2" region="3 -4" universe="2" />
-    <cell id="26" material="3" region="4" universe="2" />
-    <cell id="27" material="1" region="-1" universe="3" />
-    <cell id="28" material="2" region="1 -2" universe="3" />
-    <cell id="29" material="4" region="2" universe="3" />
-    <cell id="30" material="4" region="-3" universe="4" />
-    <cell id="31" material="2" region="3 -4" universe="4" />
-    <cell id="32" material="4" region="4" universe="4" />
-    <cell id="50" material="3" region="34 -35" universe="5" />
-    <cell fill="100" id="60" region="34 -35" universe="6" />
-    <cell id="70" material="4" region="35 -36" universe="7" />
-    <cell fill="101" id="80" region="35 -36" universe="8" />
+    <cell fill="200" id="1" region="-6 34 -35" universe="0"/>
+    <cell fill="201" id="2" region="-6 35 -36" universe="0"/>
+    <cell id="3" material="8" region="-7 31 -32" universe="0"/>
+    <cell id="4" material="9" region="-5 32 -33" universe="0"/>
+    <cell id="5" material="12" region="-5 33 -34" universe="0"/>
+    <cell id="6" material="11" region="-5 36 -37" universe="0"/>
+    <cell id="7" material="10" region="-5 37 -38" universe="0"/>
+    <cell id="8" material="7" region="-7 38 -39" universe="0"/>
+    <cell id="9" material="9" region="6 -7 32 -38" universe="0"/>
+    <cell id="10" material="5" region="7 -8 31 -39" universe="0"/>
+    <cell id="11" material="6" region="5 -6 32 -34" universe="0"/>
+    <cell id="12" material="7" region="5 -6 36 -38" universe="0"/>
+    <cell id="21" material="1" region="-1" universe="1"/>
+    <cell id="22" material="2" region="1 -2" universe="1"/>
+    <cell id="23" material="3" region="2" universe="1"/>
+    <cell id="24" material="3" region="-3" universe="2"/>
+    <cell id="25" material="2" region="3 -4" universe="2"/>
+    <cell id="26" material="3" region="4" universe="2"/>
+    <cell id="27" material="1" region="-1" universe="3"/>
+    <cell id="28" material="2" region="1 -2" universe="3"/>
+    <cell id="29" material="4" region="2" universe="3"/>
+    <cell id="30" material="4" region="-3" universe="4"/>
+    <cell id="31" material="2" region="3 -4" universe="4"/>
+    <cell id="32" material="4" region="4" universe="4"/>
+    <cell id="50" material="3" region="34 -35" universe="5"/>
+    <cell fill="100" id="60" region="34 -35" universe="6"/>
+    <cell id="70" material="4" region="35 -36" universe="7"/>
+    <cell fill="101" id="80" region="35 -36" universe="8"/>
     <lattice id="100" name="Fuel assembly (lower half)">
       <pitch>1.26 1.26</pitch>
       <dimension>17 17</dimension>
@@ -277,23 +277,23 @@
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder" />
-    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane" />
-    <surface coeffs="-199.0" id="32" type="z-plane" />
-    <surface coeffs="-193.0" id="33" type="z-plane" />
-    <surface coeffs="-183.0" id="34" type="z-plane" />
-    <surface coeffs="0.0" id="35" type="z-plane" />
-    <surface coeffs="183.0" id="36" type="z-plane" />
-    <surface coeffs="203.0" id="37" type="z-plane" />
-    <surface coeffs="215.0" id="38" type="z-plane" />
-    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane" />
+    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder"/>
+    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane"/>
+    <surface coeffs="-199.0" id="32" type="z-plane"/>
+    <surface coeffs="-193.0" id="33" type="z-plane"/>
+    <surface coeffs="-183.0" id="34" type="z-plane"/>
+    <surface coeffs="0.0" id="35" type="z-plane"/>
+    <surface coeffs="183.0" id="36" type="z-plane"/>
+    <surface coeffs="203.0" id="37" type="z-plane"/>
+    <surface coeffs="215.0" id="38" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
@@ -429,10 +429,10 @@
       <scores>nu-fission scatter</scores>
       <derivative>5</derivative>
     </tally>
-    <derivative id="1" material="3" variable="density" />
-    <derivative id="2" material="1" variable="density" />
-    <derivative id="3" material="1" nuclide="O16" variable="nuclide_density" />
-    <derivative id="4" material="1" nuclide="U235" variable="nuclide_density" />
-    <derivative id="5" material="1" variable="temperature" />
+    <derivative id="1" material="3" variable="density"/>
+    <derivative id="2" material="1" variable="density"/>
+    <derivative id="3" material="1" nuclide="O16" variable="nuclide_density"/>
+    <derivative id="4" material="1" nuclide="U235" variable="nuclide_density"/>
+    <derivative id="5" material="1" variable="temperature"/>
   </tallies>
 </model>
diff --git a/tests/regression_tests/distribmat/inputs_true.dat b/tests/regression_tests/distribmat/inputs_true.dat
index adc9bf3fbe..d002f0beb5 100644
--- a/tests/regression_tests/distribmat/inputs_true.dat
+++ b/tests/regression_tests/distribmat/inputs_true.dat
@@ -2,24 +2,24 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cc" value="1.0" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="g/cc" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
     <material depletable="true" id="2">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material depletable="true" id="3">
-      <density units="g/cc" value="2.0" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="2.0"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" universe="1" />
-    <cell id="11" material="2 void 3 2" region="-1" universe="11" />
-    <cell id="12" material="1" region="1" universe="11" />
-    <cell fill="101" id="101" region="2 -3 4 -5" universe="0" />
+    <cell id="1" material="1" universe="1"/>
+    <cell id="11" material="2 void 3 2" region="-1" universe="11"/>
+    <cell id="12" material="1" region="1" universe="11"/>
+    <cell fill="101" id="101" region="2 -3 4 -5" universe="0"/>
     <lattice id="101">
       <pitch>2.0 2.0</pitch>
       <outer>1</outer>
@@ -29,11 +29,11 @@
 11 11 
 11 11 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.3" id="1" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-3.0" id="2" type="x-plane" />
-    <surface boundary="reflective" coeffs="3.0" id="3" type="x-plane" />
-    <surface boundary="reflective" coeffs="-3.0" id="4" type="y-plane" />
-    <surface boundary="reflective" coeffs="3.0" id="5" type="y-plane" />
+    <surface coeffs="0.0 0.0 0.3" id="1" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-3.0" id="2" type="x-plane"/>
+    <surface boundary="reflective" coeffs="3.0" id="3" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-3.0" id="4" type="y-plane"/>
+    <surface boundary="reflective" coeffs="3.0" id="5" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat b/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat
index 225b23ffa6..690cd14e35 100644
--- a/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat
+++ b/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat
@@ -2,13 +2,13 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cm3" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cm3" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/energy_cutoff/inputs_true.dat b/tests/regression_tests/energy_cutoff/inputs_true.dat
index e874a0c7a5..c24164dd8b 100644
--- a/tests/regression_tests/energy_cutoff/inputs_true.dat
+++ b/tests/regression_tests/energy_cutoff/inputs_true.dat
@@ -2,18 +2,18 @@
 <model>
   <materials>
     <material id="1" name="mat">
-      <density units="atom/b-cm" value="0.069335" />
-      <nuclide ao="40.0" name="H1" />
+      <density units="atom/b-cm" value="0.069335"/>
+      <nuclide ao="40.0" name="H1"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="box" region="1 -2 3 -4 5 -6" universe="0" />
-    <surface boundary="reflective" coeffs="-1" id="1" type="x-plane" />
-    <surface boundary="reflective" coeffs="1" id="2" type="x-plane" />
-    <surface boundary="reflective" coeffs="-1" id="3" type="y-plane" />
-    <surface boundary="reflective" coeffs="1" id="4" type="y-plane" />
-    <surface boundary="reflective" coeffs="-1" id="5" type="z-plane" />
-    <surface boundary="reflective" coeffs="1" id="6" type="z-plane" />
+    <cell id="1" material="1" name="box" region="1 -2 3 -4 5 -6" universe="0"/>
+    <surface boundary="reflective" coeffs="-1" id="1" type="x-plane"/>
+    <surface boundary="reflective" coeffs="1" id="2" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-1" id="3" type="y-plane"/>
+    <surface boundary="reflective" coeffs="1" id="4" type="y-plane"/>
+    <surface boundary="reflective" coeffs="-1" id="5" type="z-plane"/>
+    <surface boundary="reflective" coeffs="1" id="6" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -23,7 +23,7 @@
       <space type="box">
         <parameters>-1 -1 -1 1 1 1</parameters>
       </space>
-      <energy parameters="988000.0 2.249e-06" type="watt" />
+      <energy parameters="988000.0 2.249e-06" type="watt"/>
     </source>
     <cutoff>
       <energy_neutron>4.0</energy_neutron>
diff --git a/tests/regression_tests/energy_laws/inputs_true.dat b/tests/regression_tests/energy_laws/inputs_true.dat
index c89ccc97ee..4d8e825d1b 100644
--- a/tests/regression_tests/energy_laws/inputs_true.dat
+++ b/tests/regression_tests/energy_laws/inputs_true.dat
@@ -2,17 +2,17 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cm3" value="20.0" />
-      <nuclide ao="1.0" name="U233" />
-      <nuclide ao="1.0" name="Am244" />
-      <nuclide ao="1.0" name="H2" />
-      <nuclide ao="1.0" name="Na23" />
-      <nuclide ao="1.0" name="Ta181" />
+      <density units="g/cm3" value="20.0"/>
+      <nuclide ao="1.0" name="U233"/>
+      <nuclide ao="1.0" name="Am244"/>
+      <nuclide ao="1.0" name="H2"/>
+      <nuclide ao="1.0" name="Na23"/>
+      <nuclide ao="1.0" name="Ta181"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <surface boundary="reflective" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <surface boundary="reflective" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/external_moab/inputs_true.dat b/tests/regression_tests/external_moab/inputs_true.dat
index 2bcbad0df2..d54f5db0ef 100644
--- a/tests/regression_tests/external_moab/inputs_true.dat
+++ b/tests/regression_tests/external_moab/inputs_true.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-10" id="13" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="10" id="14" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-10" id="15" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="10" id="16" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-10" id="17" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="10" id="18" name="maximum z" type="z-plane" />
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-10" id="13" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="10" id="14" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-10" id="15" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="10" id="16" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-10" id="17" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="10" id="18" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -50,7 +50,7 @@
       <space type="point">
         <parameters>0.0 0.0 0.0</parameters>
       </space>
-      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional" />
+      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional"/>
       <energy type="discrete">
         <parameters>15000000.0 1.0</parameters>
       </energy>
diff --git a/tests/regression_tests/filter_cellinstance/inputs_true.dat b/tests/regression_tests/filter_cellinstance/inputs_true.dat
index d00aae75d2..d3e0937ec0 100644
--- a/tests/regression_tests/filter_cellinstance/inputs_true.dat
+++ b/tests/regression_tests/filter_cellinstance/inputs_true.dat
@@ -2,21 +2,21 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2">
-      <density units="g/cc" value="1.0" />
-      <nuclide ao="1.0" name="H1" />
+      <density units="g/cc" value="1.0"/>
+      <nuclide ao="1.0" name="H1"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="2" />
-    <cell id="2" material="2" region="1" universe="1" />
-    <cell fill="1" id="3" universe="2" />
-    <cell id="4" material="1" region="-2" universe="3" />
-    <cell id="5" material="2" region="2" universe="3" />
-    <cell fill="4" id="6" region="3 -4 5 -6" universe="5" />
+    <cell id="1" material="1" region="-1" universe="2"/>
+    <cell id="2" material="2" region="1" universe="1"/>
+    <cell fill="1" id="3" universe="2"/>
+    <cell id="4" material="1" region="-2" universe="3"/>
+    <cell id="5" material="2" region="2" universe="3"/>
+    <cell fill="4" id="6" region="3 -4 5 -6" universe="5"/>
     <lattice id="4">
       <pitch>2 2</pitch>
       <dimension>4 4</dimension>
@@ -27,12 +27,12 @@
 3 3 2 3 
 3 3 3 2 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.7" id="1" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-4.0" id="3" name="minimum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="4.0" id="4" name="maximum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="-4.0" id="5" name="minimum y" type="y-plane" />
-    <surface boundary="reflective" coeffs="4.0" id="6" name="maximum y" type="y-plane" />
+    <surface coeffs="0.0 0.0 0.7" id="1" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-4.0" id="3" name="minimum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="4.0" id="4" name="maximum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-4.0" id="5" name="minimum y" type="y-plane"/>
+    <surface boundary="reflective" coeffs="4.0" id="6" name="maximum y" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/filter_energyfun/inputs_true.dat b/tests/regression_tests/filter_energyfun/inputs_true.dat
index 706c70e34f..4b7b74d28e 100644
--- a/tests/regression_tests/filter_energyfun/inputs_true.dat
+++ b/tests/regression_tests/filter_energyfun/inputs_true.dat
@@ -2,13 +2,13 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cm3" value="10.0" />
-      <nuclide ao="1.0" name="Am241" />
+      <density units="g/cm3" value="10.0"/>
+      <nuclide ao="1.0" name="Am241"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/filter_mesh/inputs_true.dat b/tests/regression_tests/filter_mesh/inputs_true.dat
index d0b617903f..a58d58bab9 100644
--- a/tests/regression_tests/filter_mesh/inputs_true.dat
+++ b/tests/regression_tests/filter_mesh/inputs_true.dat
@@ -2,27 +2,27 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cm3" value="10.0" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cm3" value="10.0"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0" />
-      <nuclide ao="1.0" name="Zr90" />
+      <density units="g/cm3" value="1.0"/>
+      <nuclide ao="1.0" name="Zr90"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1" />
-    <cell id="2" material="2" region="~(1 -2 3 -4) (5 -6 7 -8) 10 -9" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane" />
-    <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane" />
+    <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1"/>
+    <cell id="2" material="2" region="~(1 -2 3 -4) (5 -6 7 -8) 10 -9" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane"/>
+    <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/filter_translations/inputs_true.dat b/tests/regression_tests/filter_translations/inputs_true.dat
index 8ed705413e..a80ccd8767 100644
--- a/tests/regression_tests/filter_translations/inputs_true.dat
+++ b/tests/regression_tests/filter_translations/inputs_true.dat
@@ -2,27 +2,27 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cm3" value="10.0" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cm3" value="10.0"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0" />
-      <nuclide ao="1.0" name="Zr90" />
+      <density units="g/cm3" value="1.0"/>
+      <nuclide ao="1.0" name="Zr90"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1" />
-    <cell id="2" material="2" region="~(1 -2 3 -4) (5 -6 7 -8) 10 -9" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane" />
-    <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane" />
+    <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1"/>
+    <cell id="2" material="2" region="~(1 -2 3 -4) (5 -6 7 -8) 10 -9" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane"/>
+    <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/fixed_source/inputs_true.dat b/tests/regression_tests/fixed_source/inputs_true.dat
index 57dcdb7248..60043f20c9 100644
--- a/tests/regression_tests/fixed_source/inputs_true.dat
+++ b/tests/regression_tests/fixed_source/inputs_true.dat
@@ -2,14 +2,14 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cc" value="7.5" />
-      <nuclide ao="1.0" name="O16" />
-      <nuclide ao="0.0001" name="U238" />
+      <density units="g/cc" value="7.5"/>
+      <nuclide ao="1.0" name="O16"/>
+      <nuclide ao="0.0001" name="U238"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
diff --git a/tests/regression_tests/iso_in_lab/inputs_true.dat b/tests/regression_tests/iso_in_lab/inputs_true.dat
index 6dd8578fff..2bb81da6dc 100644
--- a/tests/regression_tests/iso_in_lab/inputs_true.dat
+++ b/tests/regression_tests/iso_in_lab/inputs_true.dat
@@ -2,193 +2,193 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UOX fuel">
-      <density units="g/cm3" value="10.062" />
-      <nuclide ao="4.9476e-06" name="U234" />
-      <nuclide ao="0.00048218" name="U235" />
-      <nuclide ao="0.021504" name="U238" />
-      <nuclide ao="1.0801e-08" name="Xe135" />
-      <nuclide ao="0.045737" name="O16" />
+      <density units="g/cm3" value="10.062"/>
+      <nuclide ao="4.9476e-06" name="U234"/>
+      <nuclide ao="0.00048218" name="U235"/>
+      <nuclide ao="0.021504" name="U238"/>
+      <nuclide ao="1.0801e-08" name="Xe135"/>
+      <nuclide ao="0.045737" name="O16"/>
       <isotropic>U234 U235 U238 Xe135 O16</isotropic>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cm3" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
       <isotropic>Zr90 Zr91 Zr92 Zr94 Zr96</isotropic>
     </material>
     <material id="3" name="Cold borated water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <nuclide ao="0.000649" name="B10" />
-      <nuclide ao="0.002689" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <nuclide ao="0.000649" name="B10"/>
+      <nuclide ao="0.002689" name="B11"/>
+      <sab name="c_H_in_H2O"/>
       <isotropic>H1 O16 B10 B11</isotropic>
     </material>
     <material id="4" name="Hot borated water">
-      <density units="atom/b-cm" value="0.06614" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <nuclide ao="0.000649" name="B10" />
-      <nuclide ao="0.002689" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="atom/b-cm" value="0.06614"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <nuclide ao="0.000649" name="B10"/>
+      <nuclide ao="0.002689" name="B11"/>
+      <sab name="c_H_in_H2O"/>
       <isotropic>H1 O16 B10 B11</isotropic>
     </material>
     <material id="5" name="Reactor pressure vessel steel">
-      <density units="g/cm3" value="7.9" />
-      <nuclide name="Fe54" wo="0.05437098" />
-      <nuclide name="Fe56" wo="0.88500663" />
-      <nuclide name="Fe57" wo="0.0208008" />
-      <nuclide name="Fe58" wo="0.00282159" />
-      <nuclide name="Ni58" wo="0.0067198" />
-      <nuclide name="Ni60" wo="0.0026776" />
-      <nuclide name="Mn55" wo="0.01" />
-      <nuclide name="Cr52" wo="0.002092475" />
-      <nuclide name="C0" wo="0.0025" />
-      <nuclide name="Cu63" wo="0.0013696" />
+      <density units="g/cm3" value="7.9"/>
+      <nuclide name="Fe54" wo="0.05437098"/>
+      <nuclide name="Fe56" wo="0.88500663"/>
+      <nuclide name="Fe57" wo="0.0208008"/>
+      <nuclide name="Fe58" wo="0.00282159"/>
+      <nuclide name="Ni58" wo="0.0067198"/>
+      <nuclide name="Ni60" wo="0.0026776"/>
+      <nuclide name="Mn55" wo="0.01"/>
+      <nuclide name="Cr52" wo="0.002092475"/>
+      <nuclide name="C0" wo="0.0025"/>
+      <nuclide name="Cu63" wo="0.0013696"/>
       <isotropic>Fe54 Fe56 Fe57 Fe58 Ni58 Ni60 Mn55 Cr52 C0 Cu63</isotropic>
     </material>
     <material id="6" name="Lower radial reflector">
-      <density units="g/cm3" value="4.32" />
-      <nuclide name="H1" wo="0.0095661" />
-      <nuclide name="O16" wo="0.0759107" />
-      <nuclide name="B10" wo="3.08409e-05" />
-      <nuclide name="B11" wo="0.000140499" />
-      <nuclide name="Fe54" wo="0.035620772088" />
-      <nuclide name="Fe56" wo="0.579805982228" />
-      <nuclide name="Fe57" wo="0.01362750048" />
-      <nuclide name="Fe58" wo="0.001848545204" />
-      <nuclide name="Ni58" wo="0.055298376566" />
-      <nuclide name="Mn55" wo="0.018287" />
-      <nuclide name="Cr52" wo="0.145407678031" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="4.32"/>
+      <nuclide name="H1" wo="0.0095661"/>
+      <nuclide name="O16" wo="0.0759107"/>
+      <nuclide name="B10" wo="3.08409e-05"/>
+      <nuclide name="B11" wo="0.000140499"/>
+      <nuclide name="Fe54" wo="0.035620772088"/>
+      <nuclide name="Fe56" wo="0.579805982228"/>
+      <nuclide name="Fe57" wo="0.01362750048"/>
+      <nuclide name="Fe58" wo="0.001848545204"/>
+      <nuclide name="Ni58" wo="0.055298376566"/>
+      <nuclide name="Mn55" wo="0.018287"/>
+      <nuclide name="Cr52" wo="0.145407678031"/>
+      <sab name="c_H_in_H2O"/>
       <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
     </material>
     <material id="7" name="Upper radial reflector / Top plate region">
-      <density units="g/cm3" value="4.28" />
-      <nuclide name="H1" wo="0.0086117" />
-      <nuclide name="O16" wo="0.0683369" />
-      <nuclide name="B10" wo="2.77638e-05" />
-      <nuclide name="B11" wo="0.000126481" />
-      <nuclide name="Fe54" wo="0.035953677186" />
-      <nuclide name="Fe56" wo="0.585224740891" />
-      <nuclide name="Fe57" wo="0.01375486056" />
-      <nuclide name="Fe58" wo="0.001865821363" />
-      <nuclide name="Ni58" wo="0.055815129186" />
-      <nuclide name="Mn55" wo="0.0184579" />
-      <nuclide name="Cr52" wo="0.146766614995" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="4.28"/>
+      <nuclide name="H1" wo="0.0086117"/>
+      <nuclide name="O16" wo="0.0683369"/>
+      <nuclide name="B10" wo="2.77638e-05"/>
+      <nuclide name="B11" wo="0.000126481"/>
+      <nuclide name="Fe54" wo="0.035953677186"/>
+      <nuclide name="Fe56" wo="0.585224740891"/>
+      <nuclide name="Fe57" wo="0.01375486056"/>
+      <nuclide name="Fe58" wo="0.001865821363"/>
+      <nuclide name="Ni58" wo="0.055815129186"/>
+      <nuclide name="Mn55" wo="0.0184579"/>
+      <nuclide name="Cr52" wo="0.146766614995"/>
+      <sab name="c_H_in_H2O"/>
       <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
     </material>
     <material id="8" name="Bottom plate region">
-      <density units="g/cm3" value="7.184" />
-      <nuclide name="H1" wo="0.0011505" />
-      <nuclide name="O16" wo="0.0091296" />
-      <nuclide name="B10" wo="3.70915e-06" />
-      <nuclide name="B11" wo="1.68974e-05" />
-      <nuclide name="Fe54" wo="0.03855611055" />
-      <nuclide name="Fe56" wo="0.627585036425" />
-      <nuclide name="Fe57" wo="0.014750478" />
-      <nuclide name="Fe58" wo="0.002000875025" />
-      <nuclide name="Ni58" wo="0.059855207342" />
-      <nuclide name="Mn55" wo="0.019794" />
-      <nuclide name="Cr52" wo="0.157390026871" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="7.184"/>
+      <nuclide name="H1" wo="0.0011505"/>
+      <nuclide name="O16" wo="0.0091296"/>
+      <nuclide name="B10" wo="3.70915e-06"/>
+      <nuclide name="B11" wo="1.68974e-05"/>
+      <nuclide name="Fe54" wo="0.03855611055"/>
+      <nuclide name="Fe56" wo="0.627585036425"/>
+      <nuclide name="Fe57" wo="0.014750478"/>
+      <nuclide name="Fe58" wo="0.002000875025"/>
+      <nuclide name="Ni58" wo="0.059855207342"/>
+      <nuclide name="Mn55" wo="0.019794"/>
+      <nuclide name="Cr52" wo="0.157390026871"/>
+      <sab name="c_H_in_H2O"/>
       <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
     </material>
     <material id="9" name="Bottom nozzle region">
-      <density units="g/cm3" value="2.53" />
-      <nuclide name="H1" wo="0.0245014" />
-      <nuclide name="O16" wo="0.1944274" />
-      <nuclide name="B10" wo="7.89917e-05" />
-      <nuclide name="B11" wo="0.000359854" />
-      <nuclide name="Fe54" wo="0.030411411144" />
-      <nuclide name="Fe56" wo="0.495012237964" />
-      <nuclide name="Fe57" wo="0.01163454624" />
-      <nuclide name="Fe58" wo="0.001578204652" />
-      <nuclide name="Ni58" wo="0.047211231662" />
-      <nuclide name="Mn55" wo="0.0156126" />
-      <nuclide name="Cr52" wo="0.124142524198" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="2.53"/>
+      <nuclide name="H1" wo="0.0245014"/>
+      <nuclide name="O16" wo="0.1944274"/>
+      <nuclide name="B10" wo="7.89917e-05"/>
+      <nuclide name="B11" wo="0.000359854"/>
+      <nuclide name="Fe54" wo="0.030411411144"/>
+      <nuclide name="Fe56" wo="0.495012237964"/>
+      <nuclide name="Fe57" wo="0.01163454624"/>
+      <nuclide name="Fe58" wo="0.001578204652"/>
+      <nuclide name="Ni58" wo="0.047211231662"/>
+      <nuclide name="Mn55" wo="0.0156126"/>
+      <nuclide name="Cr52" wo="0.124142524198"/>
+      <sab name="c_H_in_H2O"/>
       <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
     </material>
     <material id="10" name="Top nozzle region">
-      <density units="g/cm3" value="1.746" />
-      <nuclide name="H1" wo="0.035887" />
-      <nuclide name="O16" wo="0.2847761" />
-      <nuclide name="B10" wo="0.000115699" />
-      <nuclide name="B11" wo="0.000527075" />
-      <nuclide name="Fe54" wo="0.02644016154" />
-      <nuclide name="Fe56" wo="0.43037146399" />
-      <nuclide name="Fe57" wo="0.0101152584" />
-      <nuclide name="Fe58" wo="0.00137211607" />
-      <nuclide name="Ni58" wo="0.04104621835" />
-      <nuclide name="Mn55" wo="0.0135739" />
-      <nuclide name="Cr52" wo="0.107931450781" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="1.746"/>
+      <nuclide name="H1" wo="0.035887"/>
+      <nuclide name="O16" wo="0.2847761"/>
+      <nuclide name="B10" wo="0.000115699"/>
+      <nuclide name="B11" wo="0.000527075"/>
+      <nuclide name="Fe54" wo="0.02644016154"/>
+      <nuclide name="Fe56" wo="0.43037146399"/>
+      <nuclide name="Fe57" wo="0.0101152584"/>
+      <nuclide name="Fe58" wo="0.00137211607"/>
+      <nuclide name="Ni58" wo="0.04104621835"/>
+      <nuclide name="Mn55" wo="0.0135739"/>
+      <nuclide name="Cr52" wo="0.107931450781"/>
+      <sab name="c_H_in_H2O"/>
       <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
     </material>
     <material id="11" name="Top of fuel assemblies">
-      <density units="g/cm3" value="3.044" />
-      <nuclide name="H1" wo="0.0162913" />
-      <nuclide name="O16" wo="0.1292776" />
-      <nuclide name="B10" wo="5.25228e-05" />
-      <nuclide name="B11" wo="0.000239272" />
-      <nuclide name="Zr90" wo="0.43313403903" />
-      <nuclide name="Zr91" wo="0.09549277374" />
-      <nuclide name="Zr92" wo="0.14759527104" />
-      <nuclide name="Zr94" wo="0.15280552077" />
-      <nuclide name="Zr96" wo="0.02511169542" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="3.044"/>
+      <nuclide name="H1" wo="0.0162913"/>
+      <nuclide name="O16" wo="0.1292776"/>
+      <nuclide name="B10" wo="5.25228e-05"/>
+      <nuclide name="B11" wo="0.000239272"/>
+      <nuclide name="Zr90" wo="0.43313403903"/>
+      <nuclide name="Zr91" wo="0.09549277374"/>
+      <nuclide name="Zr92" wo="0.14759527104"/>
+      <nuclide name="Zr94" wo="0.15280552077"/>
+      <nuclide name="Zr96" wo="0.02511169542"/>
+      <sab name="c_H_in_H2O"/>
       <isotropic>H1 O16 B10 B11 Zr90 Zr91 Zr92 Zr94 Zr96</isotropic>
     </material>
     <material id="12" name="Bottom of fuel assemblies">
-      <density units="g/cm3" value="1.762" />
-      <nuclide name="H1" wo="0.0292856" />
-      <nuclide name="O16" wo="0.2323919" />
-      <nuclide name="B10" wo="9.44159e-05" />
-      <nuclide name="B11" wo="0.00043012" />
-      <nuclide name="Zr90" wo="0.3741373658" />
-      <nuclide name="Zr91" wo="0.0824858164" />
-      <nuclide name="Zr92" wo="0.1274914944" />
-      <nuclide name="Zr94" wo="0.1319920622" />
-      <nuclide name="Zr96" wo="0.0216912612" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="1.762"/>
+      <nuclide name="H1" wo="0.0292856"/>
+      <nuclide name="O16" wo="0.2323919"/>
+      <nuclide name="B10" wo="9.44159e-05"/>
+      <nuclide name="B11" wo="0.00043012"/>
+      <nuclide name="Zr90" wo="0.3741373658"/>
+      <nuclide name="Zr91" wo="0.0824858164"/>
+      <nuclide name="Zr92" wo="0.1274914944"/>
+      <nuclide name="Zr94" wo="0.1319920622"/>
+      <nuclide name="Zr96" wo="0.0216912612"/>
+      <sab name="c_H_in_H2O"/>
       <isotropic>H1 O16 B10 B11 Zr90 Zr91 Zr92 Zr94 Zr96</isotropic>
     </material>
   </materials>
   <geometry>
-    <cell fill="200" id="1" region="-6 34 -35" universe="0" />
-    <cell fill="201" id="2" region="-6 35 -36" universe="0" />
-    <cell id="3" material="8" region="-7 31 -32" universe="0" />
-    <cell id="4" material="9" region="-5 32 -33" universe="0" />
-    <cell id="5" material="12" region="-5 33 -34" universe="0" />
-    <cell id="6" material="11" region="-5 36 -37" universe="0" />
-    <cell id="7" material="10" region="-5 37 -38" universe="0" />
-    <cell id="8" material="7" region="-7 38 -39" universe="0" />
-    <cell id="9" material="9" region="6 -7 32 -38" universe="0" />
-    <cell id="10" material="5" region="7 -8 31 -39" universe="0" />
-    <cell id="11" material="6" region="5 -6 32 -34" universe="0" />
-    <cell id="12" material="7" region="5 -6 36 -38" universe="0" />
-    <cell id="21" material="1" region="-1" universe="1" />
-    <cell id="22" material="2" region="1 -2" universe="1" />
-    <cell id="23" material="3" region="2" universe="1" />
-    <cell id="24" material="3" region="-3" universe="2" />
-    <cell id="25" material="2" region="3 -4" universe="2" />
-    <cell id="26" material="3" region="4" universe="2" />
-    <cell id="27" material="1" region="-1" universe="3" />
-    <cell id="28" material="2" region="1 -2" universe="3" />
-    <cell id="29" material="4" region="2" universe="3" />
-    <cell id="30" material="4" region="-3" universe="4" />
-    <cell id="31" material="2" region="3 -4" universe="4" />
-    <cell id="32" material="4" region="4" universe="4" />
-    <cell id="50" material="3" region="34 -35" universe="5" />
-    <cell fill="100" id="60" region="34 -35" universe="6" />
-    <cell id="70" material="4" region="35 -36" universe="7" />
-    <cell fill="101" id="80" region="35 -36" universe="8" />
+    <cell fill="200" id="1" region="-6 34 -35" universe="0"/>
+    <cell fill="201" id="2" region="-6 35 -36" universe="0"/>
+    <cell id="3" material="8" region="-7 31 -32" universe="0"/>
+    <cell id="4" material="9" region="-5 32 -33" universe="0"/>
+    <cell id="5" material="12" region="-5 33 -34" universe="0"/>
+    <cell id="6" material="11" region="-5 36 -37" universe="0"/>
+    <cell id="7" material="10" region="-5 37 -38" universe="0"/>
+    <cell id="8" material="7" region="-7 38 -39" universe="0"/>
+    <cell id="9" material="9" region="6 -7 32 -38" universe="0"/>
+    <cell id="10" material="5" region="7 -8 31 -39" universe="0"/>
+    <cell id="11" material="6" region="5 -6 32 -34" universe="0"/>
+    <cell id="12" material="7" region="5 -6 36 -38" universe="0"/>
+    <cell id="21" material="1" region="-1" universe="1"/>
+    <cell id="22" material="2" region="1 -2" universe="1"/>
+    <cell id="23" material="3" region="2" universe="1"/>
+    <cell id="24" material="3" region="-3" universe="2"/>
+    <cell id="25" material="2" region="3 -4" universe="2"/>
+    <cell id="26" material="3" region="4" universe="2"/>
+    <cell id="27" material="1" region="-1" universe="3"/>
+    <cell id="28" material="2" region="1 -2" universe="3"/>
+    <cell id="29" material="4" region="2" universe="3"/>
+    <cell id="30" material="4" region="-3" universe="4"/>
+    <cell id="31" material="2" region="3 -4" universe="4"/>
+    <cell id="32" material="4" region="4" universe="4"/>
+    <cell id="50" material="3" region="34 -35" universe="5"/>
+    <cell fill="100" id="60" region="34 -35" universe="6"/>
+    <cell id="70" material="4" region="35 -36" universe="7"/>
+    <cell fill="101" id="80" region="35 -36" universe="8"/>
     <lattice id="100" name="Fuel assembly (lower half)">
       <pitch>1.26 1.26</pitch>
       <dimension>17 17</dimension>
@@ -289,23 +289,23 @@
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder" />
-    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane" />
-    <surface coeffs="-199.0" id="32" type="z-plane" />
-    <surface coeffs="-193.0" id="33" type="z-plane" />
-    <surface coeffs="-183.0" id="34" type="z-plane" />
-    <surface coeffs="0.0" id="35" type="z-plane" />
-    <surface coeffs="183.0" id="36" type="z-plane" />
-    <surface coeffs="203.0" id="37" type="z-plane" />
-    <surface coeffs="215.0" id="38" type="z-plane" />
-    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane" />
+    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder"/>
+    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane"/>
+    <surface coeffs="-199.0" id="32" type="z-plane"/>
+    <surface coeffs="-193.0" id="33" type="z-plane"/>
+    <surface coeffs="-183.0" id="34" type="z-plane"/>
+    <surface coeffs="0.0" id="35" type="z-plane"/>
+    <surface coeffs="183.0" id="36" type="z-plane"/>
+    <surface coeffs="203.0" id="37" type="z-plane"/>
+    <surface coeffs="215.0" id="38" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/lattice_hex_coincident/inputs_true.dat b/tests/regression_tests/lattice_hex_coincident/inputs_true.dat
index 639235726c..c51a38c893 100644
--- a/tests/regression_tests/lattice_hex_coincident/inputs_true.dat
+++ b/tests/regression_tests/lattice_hex_coincident/inputs_true.dat
@@ -2,43 +2,43 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="sum" />
-      <nuclide ao="0.0049817" name="U235" />
+      <density units="sum"/>
+      <nuclide ao="0.0049817" name="U235"/>
     </material>
     <material id="2">
-      <density units="atom/b-cm" value="0.017742" />
-      <nuclide ao="1.0" name="C0" />
-      <sab name="c_Graphite" />
+      <density units="atom/b-cm" value="0.017742"/>
+      <nuclide ao="1.0" name="C0"/>
+      <sab name="c_Graphite"/>
     </material>
     <material id="3" name="Lead">
-      <density units="g/cm3" value="10.32" />
-      <nuclide ao="0.014" name="Pb204" />
-      <nuclide ao="0.241" name="Pb206" />
-      <nuclide ao="0.221" name="Pb207" />
-      <nuclide ao="0.524" name="Pb208" />
+      <density units="g/cm3" value="10.32"/>
+      <nuclide ao="0.014" name="Pb204"/>
+      <nuclide ao="0.241" name="Pb206"/>
+      <nuclide ao="0.221" name="Pb207"/>
+      <nuclide ao="0.524" name="Pb208"/>
     </material>
     <material id="4">
-      <density units="atom/b-cm" value="0.00054464" />
-      <nuclide ao="1.0" name="He4" />
+      <density units="atom/b-cm" value="0.00054464"/>
+      <nuclide ao="1.0" name="He4"/>
     </material>
     <material id="5" name="Zirc4">
-      <density units="sum" />
-      <nuclide ao="0.02217" name="Zr90" />
-      <nuclide ao="0.004781" name="Zr91" />
-      <nuclide ao="0.007228" name="Zr92" />
-      <nuclide ao="0.007169" name="Zr94" />
-      <nuclide ao="0.001131" name="Zr96" />
+      <density units="sum"/>
+      <nuclide ao="0.02217" name="Zr90"/>
+      <nuclide ao="0.004781" name="Zr91"/>
+      <nuclide ao="0.007228" name="Zr92"/>
+      <nuclide ao="0.007169" name="Zr94"/>
+      <nuclide ao="0.001131" name="Zr96"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1 2 -3" universe="1" />
-    <cell id="2" material="2" region="1" universe="1" />
-    <cell id="3" material="4" name="coolant" region="-4 2 -3" universe="2" />
-    <cell id="4" material="5" name="zirconium_shell" region="4 -5 2 -3" universe="2" />
-    <cell id="5" material="3" name="lead_shell" region="5 -6 2 -3" universe="2" />
-    <cell id="6" material="2" name="matrix coolant surround" region="6 2 -3" universe="2" />
-    <cell id="7" material="2" universe="3" />
-    <cell fill="4" id="8" name="container cell" region="-7 8 -9 10 11 -12 2 -3" universe="5" />
+    <cell id="1" material="1" region="-1 2 -3" universe="1"/>
+    <cell id="2" material="2" region="1" universe="1"/>
+    <cell id="3" material="4" name="coolant" region="-4 2 -3" universe="2"/>
+    <cell id="4" material="5" name="zirconium_shell" region="4 -5 2 -3" universe="2"/>
+    <cell id="5" material="3" name="lead_shell" region="5 -6 2 -3" universe="2"/>
+    <cell id="6" material="2" name="matrix coolant surround" region="6 2 -3" universe="2"/>
+    <cell id="7" material="2" universe="3"/>
+    <cell fill="4" id="8" name="container cell" region="-7 8 -9 10 11 -12 2 -3" universe="5"/>
     <hex_lattice id="4" n_rings="2" name="regular fuel assembly">
       <pitch>1.4</pitch>
       <outer>3</outer>
@@ -50,18 +50,18 @@
 2 2
  2</universes>
     </hex_lattice>
-    <surface coeffs="0.0 0.0 0.7" id="1" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="0.0" id="2" type="z-plane" />
-    <surface boundary="reflective" coeffs="10.0" id="3" type="z-plane" />
-    <surface coeffs="0.0 0.0 0.293" id="4" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.35" id="5" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.352" id="6" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="1.4" id="7" type="y-plane" />
-    <surface boundary="reflective" coeffs="-1.4" id="8" type="y-plane" />
-    <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 2.8" id="9" type="plane" />
-    <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 -2.8" id="10" type="plane" />
-    <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 -2.8" id="11" type="plane" />
-    <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 2.8" id="12" type="plane" />
+    <surface coeffs="0.0 0.0 0.7" id="1" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="0.0" id="2" type="z-plane"/>
+    <surface boundary="reflective" coeffs="10.0" id="3" type="z-plane"/>
+    <surface coeffs="0.0 0.0 0.293" id="4" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.35" id="5" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.352" id="6" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="1.4" id="7" type="y-plane"/>
+    <surface boundary="reflective" coeffs="-1.4" id="8" type="y-plane"/>
+    <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 2.8" id="9" type="plane"/>
+    <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 -2.8" id="10" type="plane"/>
+    <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 -2.8" id="11" type="plane"/>
+    <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 2.8" id="12" type="plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/lattice_hex_x/inputs_true.dat b/tests/regression_tests/lattice_hex_x/inputs_true.dat
index 2cff10f757..c510120291 100644
--- a/tests/regression_tests/lattice_hex_x/inputs_true.dat
+++ b/tests/regression_tests/lattice_hex_x/inputs_true.dat
@@ -2,47 +2,47 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UO2">
-      <density units="sum" />
-      <nuclide ao="0.0008737" name="U235" />
-      <nuclide ao="0.018744" name="U238" />
-      <nuclide ao="0.039235" name="O16" />
+      <density units="sum"/>
+      <nuclide ao="0.0008737" name="U235"/>
+      <nuclide ao="0.018744" name="U238"/>
+      <nuclide ao="0.039235" name="O16"/>
     </material>
     <material id="2" name="borated H2O">
-      <density units="sum" />
-      <nuclide ao="0.06694" name="H1" />
-      <nuclide ao="0.03347" name="O16" />
-      <nuclide ao="6.6262e-06" name="B10" />
-      <nuclide ao="2.6839e-05" name="B11" />
+      <density units="sum"/>
+      <nuclide ao="0.06694" name="H1"/>
+      <nuclide ao="0.03347" name="O16"/>
+      <nuclide ao="6.6262e-06" name="B10"/>
+      <nuclide ao="2.6839e-05" name="B11"/>
     </material>
     <material id="3" name="pellet B4C">
-      <density units="sum" />
-      <nuclide ao="0.01966" name="C0" />
-      <nuclide ao="4.7344e-06" name="B11" />
-      <nuclide ao="1.9177e-05" name="B10" />
+      <density units="sum"/>
+      <nuclide ao="0.01966" name="C0"/>
+      <nuclide ao="4.7344e-06" name="B11"/>
+      <nuclide ao="1.9177e-05" name="B10"/>
     </material>
     <material id="4" name="Zirc4">
-      <density units="sum" />
-      <nuclide ao="0.021763349999999997" name="Zr90" />
-      <nuclide ao="0.00474606" name="Zr91" />
-      <nuclide ao="0.00725445" name="Zr92" />
-      <nuclide ao="0.00735174" name="Zr94" />
-      <nuclide ao="0.0011844" name="Zr96" />
+      <density units="sum"/>
+      <nuclide ao="0.021763349999999997" name="Zr90"/>
+      <nuclide ao="0.00474606" name="Zr91"/>
+      <nuclide ao="0.00725445" name="Zr92"/>
+      <nuclide ao="0.00735174" name="Zr94"/>
+      <nuclide ao="0.0011844" name="Zr96"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <cell id="2" material="4" region="-2 1" universe="1" />
-    <cell id="3" material="2" region="2" universe="1" />
-    <cell id="4" material="2" region="-3" universe="2" />
-    <cell id="5" material="4" region="-4 3" universe="2" />
-    <cell id="6" material="2" region="4" universe="2" />
-    <cell id="7" material="3" region="-5" universe="3" />
-    <cell id="8" material="4" region="-6 5" universe="3" />
-    <cell id="9" material="2" region="-7 6" universe="3" />
-    <cell id="10" material="4" region="-8 7" universe="3" />
-    <cell id="11" material="2" region="8" universe="3" />
-    <cell id="12" material="2" universe="4" />
-    <cell fill="6" id="13" name="container assembly cell" region="-11 12 -13 14 15 -16 9 -10" universe="5" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <cell id="2" material="4" region="-2 1" universe="1"/>
+    <cell id="3" material="2" region="2" universe="1"/>
+    <cell id="4" material="2" region="-3" universe="2"/>
+    <cell id="5" material="4" region="-4 3" universe="2"/>
+    <cell id="6" material="2" region="4" universe="2"/>
+    <cell id="7" material="3" region="-5" universe="3"/>
+    <cell id="8" material="4" region="-6 5" universe="3"/>
+    <cell id="9" material="2" region="-7 6" universe="3"/>
+    <cell id="10" material="4" region="-8 7" universe="3"/>
+    <cell id="11" material="2" region="8" universe="3"/>
+    <cell id="12" material="2" universe="4"/>
+    <cell fill="6" id="13" name="container assembly cell" region="-11 12 -13 14 15 -16 9 -10" universe="5"/>
     <hex_lattice id="6" n_axial="2" n_rings="11" name="regular fuel assembly" orientation="x">
       <pitch>1.235 5.0</pitch>
       <outer>4</outer>
@@ -91,22 +91,22 @@
          1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1</universes>
     </hex_lattice>
-    <surface coeffs="0.0 0.0 0.386" id="1" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.4582" id="2" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.45" id="3" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.5177" id="4" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.35" id="5" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.41" id="6" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.545" id="7" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.6323" id="8" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="0.0" id="9" type="z-plane" />
-    <surface boundary="reflective" coeffs="10.0" id="10" type="z-plane" />
-    <surface boundary="reflective" coeffs="11.8" id="11" type="y-plane" />
-    <surface boundary="reflective" coeffs="-11.8" id="12" type="y-plane" />
-    <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 23.6" id="13" type="plane" />
-    <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 -23.6" id="14" type="plane" />
-    <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 -23.6" id="15" type="plane" />
-    <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 23.6" id="16" type="plane" />
+    <surface coeffs="0.0 0.0 0.386" id="1" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.4582" id="2" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.45" id="3" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.5177" id="4" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.35" id="5" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.41" id="6" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.545" id="7" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.6323" id="8" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="0.0" id="9" type="z-plane"/>
+    <surface boundary="reflective" coeffs="10.0" id="10" type="z-plane"/>
+    <surface boundary="reflective" coeffs="11.8" id="11" type="y-plane"/>
+    <surface boundary="reflective" coeffs="-11.8" id="12" type="y-plane"/>
+    <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 23.6" id="13" type="plane"/>
+    <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 -23.6" id="14" type="plane"/>
+    <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 -23.6" id="15" type="plane"/>
+    <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 23.6" id="16" type="plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/lattice_multiple/inputs_true.dat b/tests/regression_tests/lattice_multiple/inputs_true.dat
index 0eed3c2015..b249d97c40 100644
--- a/tests/regression_tests/lattice_multiple/inputs_true.dat
+++ b/tests/regression_tests/lattice_multiple/inputs_true.dat
@@ -2,24 +2,24 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UO2">
-      <density units="g/cm3" value="10.0" />
-      <nuclide ao="1.0" name="U235" />
-      <nuclide ao="2.0" name="O16" />
+      <density units="g/cm3" value="10.0"/>
+      <nuclide ao="1.0" name="U235"/>
+      <nuclide ao="2.0" name="O16"/>
     </material>
     <material id="2" name="light water">
-      <density units="g/cm3" value="1.0" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <cell id="2" material="2" region="1" universe="1" />
-    <cell id="3" material="1" region="-2" universe="2" />
-    <cell id="4" material="2" region="2" universe="2" />
-    <cell fill="3" id="5" universe="4" />
-    <cell fill="5" id="6" region="3 -4 5 -6" universe="6" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <cell id="2" material="2" region="1" universe="1"/>
+    <cell id="3" material="1" region="-2" universe="2"/>
+    <cell id="4" material="2" region="2" universe="2"/>
+    <cell fill="3" id="5" universe="4"/>
+    <cell fill="5" id="6" region="3 -4 5 -6" universe="6"/>
     <lattice id="3">
       <pitch>1.2 1.2</pitch>
       <outer>1</outer>
@@ -37,12 +37,12 @@
 4 4 
 4 4 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.4" id="1" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-2.4" id="3" name="minimum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="2.4" id="4" name="maximum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="-2.4" id="5" name="minimum y" type="y-plane" />
-    <surface boundary="reflective" coeffs="2.4" id="6" name="maximum y" type="y-plane" />
+    <surface coeffs="0.0 0.0 0.4" id="1" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-2.4" id="3" name="minimum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="2.4" id="4" name="maximum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-2.4" id="5" name="minimum y" type="y-plane"/>
+    <surface boundary="reflective" coeffs="2.4" id="6" name="maximum y" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/lattice_rotated/inputs_true.dat b/tests/regression_tests/lattice_rotated/inputs_true.dat
index 8e54bdf884..3a8a0784e0 100644
--- a/tests/regression_tests/lattice_rotated/inputs_true.dat
+++ b/tests/regression_tests/lattice_rotated/inputs_true.dat
@@ -2,29 +2,29 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cm3" value="10.0" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cm3" value="10.0"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material depletable="true" id="2">
-      <density units="g/cm3" value="10.0" />
-      <nuclide ao="1.0" name="U238" />
+      <density units="g/cm3" value="10.0"/>
+      <nuclide ao="1.0" name="U238"/>
     </material>
     <material id="3">
-      <density units="g/cm3" value="1.0" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <cell id="2" material="3" region="1" universe="1" />
-    <cell id="3" material="2" region="-2" universe="2" />
-    <cell id="4" material="3" region="2" universe="2" />
-    <cell id="5" material="3" universe="30" />
-    <cell fill="4" id="6" region="-3" rotation="0.0 0.0 45.0" translation="-4.0 0.0 0.0" universe="5" />
-    <cell fill="3" id="7" region="-4" rotation="0.0 0.0 30.0" translation="4.0 0.0 0.0" universe="5" />
-    <cell id="8" material="3" region="-5 3 4" universe="5" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <cell id="2" material="3" region="1" universe="1"/>
+    <cell id="3" material="2" region="-2" universe="2"/>
+    <cell id="4" material="3" region="2" universe="2"/>
+    <cell id="5" material="3" universe="30"/>
+    <cell fill="4" id="6" region="-3" rotation="0.0 0.0 45.0" translation="-4.0 0.0 0.0" universe="5"/>
+    <cell fill="3" id="7" region="-4" rotation="0.0 0.0 30.0" translation="4.0 0.0 0.0" universe="5"/>
+    <cell id="8" material="3" region="-5 3 4" universe="5"/>
     <hex_lattice id="3" n_rings="3">
       <pitch>1.25</pitch>
       <outer>30</outer>
@@ -51,11 +51,11 @@
 1 1 1 1 
 1 1 1 1 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.25" id="1" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder" />
-    <surface coeffs="-4.0 0.0 4.0" id="3" type="z-cylinder" />
-    <surface coeffs="4.0 0.0 4.0" id="4" type="z-cylinder" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 8.0" id="5" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.25" id="1" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder"/>
+    <surface coeffs="-4.0 0.0 4.0" id="3" type="z-cylinder"/>
+    <surface coeffs="4.0 0.0 4.0" id="4" type="z-cylinder"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 8.0" id="5" type="z-cylinder"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mg_basic/inputs_true.dat b/tests/regression_tests/mg_basic/inputs_true.dat
index 06406b5f2c..5ec5ade759 100644
--- a/tests/regression_tests/mg_basic/inputs_true.dat
+++ b/tests/regression_tests/mg_basic/inputs_true.dat
@@ -3,45 +3,45 @@
   <materials>
     <cross_sections>2g.h5</cross_sections>
     <material id="1" name="base leg">
-      <density units="macro" value="1.0" />
-      <macroscopic name="mat_1" />
+      <density units="macro" value="1.0"/>
+      <macroscopic name="mat_1"/>
     </material>
     <material id="2" name="base tab">
-      <density units="macro" value="1.0" />
-      <macroscopic name="mat_2" />
+      <density units="macro" value="1.0"/>
+      <macroscopic name="mat_2"/>
     </material>
     <material id="3" name="base hist">
-      <density units="macro" value="1.0" />
-      <macroscopic name="mat_3" />
+      <density units="macro" value="1.0"/>
+      <macroscopic name="mat_3"/>
     </material>
     <material id="4" name="base matrix">
-      <density units="macro" value="1.0" />
-      <macroscopic name="mat_4" />
+      <density units="macro" value="1.0"/>
+      <macroscopic name="mat_4"/>
     </material>
     <material id="5" name="base ang">
-      <density units="macro" value="1.0" />
-      <macroscopic name="mat_5" />
+      <density units="macro" value="1.0"/>
+      <macroscopic name="mat_5"/>
     </material>
     <material id="6" name="micro">
-      <density units="sum" />
-      <nuclide ao="0.5" name="mat_1" />
-      <nuclide ao="0.5" name="mat_6" />
+      <density units="sum"/>
+      <nuclide ao="0.5" name="mat_1"/>
+      <nuclide ao="0.5" name="mat_6"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="1 -2" universe="0" />
-    <cell id="2" material="2" region="2 -3" universe="0" />
-    <cell id="3" material="3" region="3 -4" universe="0" />
-    <cell id="4" material="4" region="4 -5" universe="0" />
-    <cell id="5" material="5" region="5 -6" universe="0" />
-    <cell id="6" material="6" region="6 -7" universe="0" />
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
-    <surface coeffs="154.90833333333333" id="2" type="x-plane" />
-    <surface coeffs="309.81666666666666" id="3" type="x-plane" />
-    <surface coeffs="464.725" id="4" type="x-plane" />
-    <surface coeffs="619.6333333333333" id="5" type="x-plane" />
-    <surface coeffs="774.5416666666666" id="6" type="x-plane" />
-    <surface boundary="vacuum" coeffs="929.45" id="7" type="x-plane" />
+    <cell id="1" material="1" region="1 -2" universe="0"/>
+    <cell id="2" material="2" region="2 -3" universe="0"/>
+    <cell id="3" material="3" region="3 -4" universe="0"/>
+    <cell id="4" material="4" region="4 -5" universe="0"/>
+    <cell id="5" material="5" region="5 -6" universe="0"/>
+    <cell id="6" material="6" region="6 -7" universe="0"/>
+    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
+    <surface coeffs="154.90833333333333" id="2" type="x-plane"/>
+    <surface coeffs="309.81666666666666" id="3" type="x-plane"/>
+    <surface coeffs="464.725" id="4" type="x-plane"/>
+    <surface coeffs="619.6333333333333" id="5" type="x-plane"/>
+    <surface coeffs="774.5416666666666" id="6" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="929.45" id="7" type="x-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mg_basic_delayed/inputs_true.dat b/tests/regression_tests/mg_basic_delayed/inputs_true.dat
index 05108d87dc..b3f1993d91 100644
--- a/tests/regression_tests/mg_basic_delayed/inputs_true.dat
+++ b/tests/regression_tests/mg_basic_delayed/inputs_true.dat
@@ -3,44 +3,44 @@
   <materials>
     <cross_sections>2g.h5</cross_sections>
     <material id="1" name="vec beta">
-      <density units="macro" value="1.0" />
-      <macroscopic name="mat_1" />
+      <density units="macro" value="1.0"/>
+      <macroscopic name="mat_1"/>
     </material>
     <material id="2" name="vec no beta">
-      <density units="macro" value="1.0" />
-      <macroscopic name="mat_2" />
+      <density units="macro" value="1.0"/>
+      <macroscopic name="mat_2"/>
     </material>
     <material id="3" name="matrix beta">
-      <density units="macro" value="1.0" />
-      <macroscopic name="mat_3" />
+      <density units="macro" value="1.0"/>
+      <macroscopic name="mat_3"/>
     </material>
     <material id="4" name="matrix no beta">
-      <density units="macro" value="1.0" />
-      <macroscopic name="mat_4" />
+      <density units="macro" value="1.0"/>
+      <macroscopic name="mat_4"/>
     </material>
     <material id="5" name="vec group beta">
-      <density units="macro" value="1.0" />
-      <macroscopic name="mat_5" />
+      <density units="macro" value="1.0"/>
+      <macroscopic name="mat_5"/>
     </material>
     <material id="6" name="matrix group beta">
-      <density units="macro" value="1.0" />
-      <macroscopic name="mat_6" />
+      <density units="macro" value="1.0"/>
+      <macroscopic name="mat_6"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="1 -2" universe="0" />
-    <cell id="2" material="2" region="2 -3" universe="0" />
-    <cell id="3" material="3" region="3 -4" universe="0" />
-    <cell id="4" material="4" region="4 -5" universe="0" />
-    <cell id="5" material="5" region="5 -6" universe="0" />
-    <cell id="6" material="6" region="6 -7" universe="0" />
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
-    <surface coeffs="154.90833333333333" id="2" type="x-plane" />
-    <surface coeffs="309.81666666666666" id="3" type="x-plane" />
-    <surface coeffs="464.725" id="4" type="x-plane" />
-    <surface coeffs="619.6333333333333" id="5" type="x-plane" />
-    <surface coeffs="774.5416666666666" id="6" type="x-plane" />
-    <surface boundary="vacuum" coeffs="929.45" id="7" type="x-plane" />
+    <cell id="1" material="1" region="1 -2" universe="0"/>
+    <cell id="2" material="2" region="2 -3" universe="0"/>
+    <cell id="3" material="3" region="3 -4" universe="0"/>
+    <cell id="4" material="4" region="4 -5" universe="0"/>
+    <cell id="5" material="5" region="5 -6" universe="0"/>
+    <cell id="6" material="6" region="6 -7" universe="0"/>
+    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
+    <surface coeffs="154.90833333333333" id="2" type="x-plane"/>
+    <surface coeffs="309.81666666666666" id="3" type="x-plane"/>
+    <surface coeffs="464.725" id="4" type="x-plane"/>
+    <surface coeffs="619.6333333333333" id="5" type="x-plane"/>
+    <surface coeffs="774.5416666666666" id="6" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="929.45" id="7" type="x-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mg_convert/inputs_true.dat b/tests/regression_tests/mg_convert/inputs_true.dat
index 9276a7a7b6..8277ca483a 100644
--- a/tests/regression_tests/mg_convert/inputs_true.dat
+++ b/tests/regression_tests/mg_convert/inputs_true.dat
@@ -3,16 +3,16 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="UO2 fuel">
-      <density units="macro" value="1.1" />
-      <macroscopic name="UO2" />
+      <density units="macro" value="1.1"/>
+      <macroscopic name="UO2"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="cell 1" region="4 -5 6 -7" universe="0" />
-    <surface boundary="reflective" coeffs="-5.0" id="4" name="left" type="x-plane" />
-    <surface boundary="vacuum" coeffs="5.0" id="5" name="right" type="x-plane" />
-    <surface boundary="reflective" coeffs="-5.0" id="6" name="bottom" type="y-plane" />
-    <surface boundary="reflective" coeffs="5.0" id="7" name="top" type="y-plane" />
+    <cell id="1" material="1" name="cell 1" region="4 -5 6 -7" universe="0"/>
+    <surface boundary="reflective" coeffs="-5.0" id="4" name="left" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="5.0" id="5" name="right" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-5.0" id="6" name="bottom" type="y-plane"/>
+    <surface boundary="reflective" coeffs="5.0" id="7" name="top" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mg_legendre/inputs_true.dat b/tests/regression_tests/mg_legendre/inputs_true.dat
index d90dfb8029..4b7293d81a 100644
--- a/tests/regression_tests/mg_legendre/inputs_true.dat
+++ b/tests/regression_tests/mg_legendre/inputs_true.dat
@@ -3,14 +3,14 @@
   <materials>
     <cross_sections>2g.h5</cross_sections>
     <material id="1" name="mat_1">
-      <density units="macro" value="1.0" />
-      <macroscopic name="mat_1" />
+      <density units="macro" value="1.0"/>
+      <macroscopic name="mat_1"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="1 -2" universe="0" />
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
-    <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane" />
+    <cell id="1" material="1" region="1 -2" universe="0"/>
+    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mg_max_order/inputs_true.dat b/tests/regression_tests/mg_max_order/inputs_true.dat
index 9bfcd54dfe..82699d00ec 100644
--- a/tests/regression_tests/mg_max_order/inputs_true.dat
+++ b/tests/regression_tests/mg_max_order/inputs_true.dat
@@ -3,14 +3,14 @@
   <materials>
     <cross_sections>2g.h5</cross_sections>
     <material id="1" name="mat_1">
-      <density units="macro" value="1.0" />
-      <macroscopic name="mat_1" />
+      <density units="macro" value="1.0"/>
+      <macroscopic name="mat_1"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="1 -2" universe="0" />
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
-    <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane" />
+    <cell id="1" material="1" region="1 -2" universe="0"/>
+    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mg_survival_biasing/inputs_true.dat b/tests/regression_tests/mg_survival_biasing/inputs_true.dat
index a3a2a726f2..2b5801e120 100644
--- a/tests/regression_tests/mg_survival_biasing/inputs_true.dat
+++ b/tests/regression_tests/mg_survival_biasing/inputs_true.dat
@@ -3,14 +3,14 @@
   <materials>
     <cross_sections>2g.h5</cross_sections>
     <material id="1" name="mat_1">
-      <density units="macro" value="1.0" />
-      <macroscopic name="mat_1" />
+      <density units="macro" value="1.0"/>
+      <macroscopic name="mat_1"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="1 -2" universe="0" />
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
-    <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane" />
+    <cell id="1" material="1" region="1 -2" universe="0"/>
+    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mg_tallies/inputs_true.dat b/tests/regression_tests/mg_tallies/inputs_true.dat
index bdd41c7f85..b7d362b17e 100644
--- a/tests/regression_tests/mg_tallies/inputs_true.dat
+++ b/tests/regression_tests/mg_tallies/inputs_true.dat
@@ -3,14 +3,14 @@
   <materials>
     <cross_sections>2g.h5</cross_sections>
     <material id="1" name="mat_1">
-      <density units="macro" value="1.0" />
-      <macroscopic name="mat_1" />
+      <density units="macro" value="1.0"/>
+      <macroscopic name="mat_1"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="1 -2" universe="0" />
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane" />
-    <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane" />
+    <cell id="1" material="1" region="1 -2" universe="0"/>
+    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mgxs_library_ce_to_mg/inputs_true.dat b/tests/regression_tests/mgxs_library_ce_to_mg/inputs_true.dat
index 533160577d..74067874ad 100644
--- a/tests/regression_tests/mgxs_library_ce_to_mg/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_ce_to_mg/inputs_true.dat
@@ -2,39 +2,39 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769" />
-      <nuclide ao="4.4843e-06" name="U234" />
-      <nuclide ao="0.00055815" name="U235" />
-      <nuclide ao="0.022408" name="U238" />
-      <nuclide ao="0.045829" name="O16" />
+      <density units="g/cm3" value="10.29769"/>
+      <nuclide ao="4.4843e-06" name="U234"/>
+      <nuclide ao="0.00055815" name="U235"/>
+      <nuclide ao="0.022408" name="U238"/>
+      <nuclide ao="0.045829" name="O16"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55" />
-      <nuclide ao="0.021827" name="Zr90" />
-      <nuclide ao="0.00476" name="Zr91" />
-      <nuclide ao="0.0072758" name="Zr92" />
-      <nuclide ao="0.0073734" name="Zr94" />
-      <nuclide ao="0.0011879" name="Zr96" />
+      <density units="g/cm3" value="6.55"/>
+      <nuclide ao="0.021827" name="Zr90"/>
+      <nuclide ao="0.00476" name="Zr91"/>
+      <nuclide ao="0.0072758" name="Zr92"/>
+      <nuclide ao="0.0073734" name="Zr94"/>
+      <nuclide ao="0.0011879" name="Zr96"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582" />
-      <nuclide ao="0.049457" name="H1" />
-      <nuclide ao="0.024672" name="O16" />
-      <nuclide ao="8.0042e-06" name="B10" />
-      <nuclide ao="3.2218e-05" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="0.740582"/>
+      <nuclide ao="0.049457" name="H1"/>
+      <nuclide ao="0.024672" name="O16"/>
+      <nuclide ao="8.0042e-06" name="B10"/>
+      <nuclide ao="3.2218e-05" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/inputs_true.dat b/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/inputs_true.dat
index fe154a0180..13a6ea6d41 100644
--- a/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/inputs_true.dat
@@ -2,39 +2,39 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769" />
-      <nuclide ao="4.4843e-06" name="U234" />
-      <nuclide ao="0.00055815" name="U235" />
-      <nuclide ao="0.022408" name="U238" />
-      <nuclide ao="0.045829" name="O16" />
+      <density units="g/cm3" value="10.29769"/>
+      <nuclide ao="4.4843e-06" name="U234"/>
+      <nuclide ao="0.00055815" name="U235"/>
+      <nuclide ao="0.022408" name="U238"/>
+      <nuclide ao="0.045829" name="O16"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55" />
-      <nuclide ao="0.021827" name="Zr90" />
-      <nuclide ao="0.00476" name="Zr91" />
-      <nuclide ao="0.0072758" name="Zr92" />
-      <nuclide ao="0.0073734" name="Zr94" />
-      <nuclide ao="0.0011879" name="Zr96" />
+      <density units="g/cm3" value="6.55"/>
+      <nuclide ao="0.021827" name="Zr90"/>
+      <nuclide ao="0.00476" name="Zr91"/>
+      <nuclide ao="0.0072758" name="Zr92"/>
+      <nuclide ao="0.0073734" name="Zr94"/>
+      <nuclide ao="0.0011879" name="Zr96"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582" />
-      <nuclide ao="0.049457" name="H1" />
-      <nuclide ao="0.024672" name="O16" />
-      <nuclide ao="8.0042e-06" name="B10" />
-      <nuclide ao="3.2218e-05" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="0.740582"/>
+      <nuclide ao="0.049457" name="H1"/>
+      <nuclide ao="0.024672" name="O16"/>
+      <nuclide ao="8.0042e-06" name="B10"/>
+      <nuclide ao="3.2218e-05" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mgxs_library_condense/inputs_true.dat b/tests/regression_tests/mgxs_library_condense/inputs_true.dat
index c8f140f808..ce70957659 100644
--- a/tests/regression_tests/mgxs_library_condense/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_condense/inputs_true.dat
@@ -2,39 +2,39 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769" />
-      <nuclide ao="4.4843e-06" name="U234" />
-      <nuclide ao="0.00055815" name="U235" />
-      <nuclide ao="0.022408" name="U238" />
-      <nuclide ao="0.045829" name="O16" />
+      <density units="g/cm3" value="10.29769"/>
+      <nuclide ao="4.4843e-06" name="U234"/>
+      <nuclide ao="0.00055815" name="U235"/>
+      <nuclide ao="0.022408" name="U238"/>
+      <nuclide ao="0.045829" name="O16"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55" />
-      <nuclide ao="0.021827" name="Zr90" />
-      <nuclide ao="0.00476" name="Zr91" />
-      <nuclide ao="0.0072758" name="Zr92" />
-      <nuclide ao="0.0073734" name="Zr94" />
-      <nuclide ao="0.0011879" name="Zr96" />
+      <density units="g/cm3" value="6.55"/>
+      <nuclide ao="0.021827" name="Zr90"/>
+      <nuclide ao="0.00476" name="Zr91"/>
+      <nuclide ao="0.0072758" name="Zr92"/>
+      <nuclide ao="0.0073734" name="Zr94"/>
+      <nuclide ao="0.0011879" name="Zr96"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582" />
-      <nuclide ao="0.049457" name="H1" />
-      <nuclide ao="0.024672" name="O16" />
-      <nuclide ao="8.0042e-06" name="B10" />
-      <nuclide ao="3.2218e-05" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="0.740582"/>
+      <nuclide ao="0.049457" name="H1"/>
+      <nuclide ao="0.024672" name="O16"/>
+      <nuclide ao="8.0042e-06" name="B10"/>
+      <nuclide ao="3.2218e-05" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mgxs_library_correction/inputs_true.dat b/tests/regression_tests/mgxs_library_correction/inputs_true.dat
index a1cc111def..4d9dbecd62 100644
--- a/tests/regression_tests/mgxs_library_correction/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_correction/inputs_true.dat
@@ -2,39 +2,39 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769" />
-      <nuclide ao="4.4843e-06" name="U234" />
-      <nuclide ao="0.00055815" name="U235" />
-      <nuclide ao="0.022408" name="U238" />
-      <nuclide ao="0.045829" name="O16" />
+      <density units="g/cm3" value="10.29769"/>
+      <nuclide ao="4.4843e-06" name="U234"/>
+      <nuclide ao="0.00055815" name="U235"/>
+      <nuclide ao="0.022408" name="U238"/>
+      <nuclide ao="0.045829" name="O16"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55" />
-      <nuclide ao="0.021827" name="Zr90" />
-      <nuclide ao="0.00476" name="Zr91" />
-      <nuclide ao="0.0072758" name="Zr92" />
-      <nuclide ao="0.0073734" name="Zr94" />
-      <nuclide ao="0.0011879" name="Zr96" />
+      <density units="g/cm3" value="6.55"/>
+      <nuclide ao="0.021827" name="Zr90"/>
+      <nuclide ao="0.00476" name="Zr91"/>
+      <nuclide ao="0.0072758" name="Zr92"/>
+      <nuclide ao="0.0073734" name="Zr94"/>
+      <nuclide ao="0.0011879" name="Zr96"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582" />
-      <nuclide ao="0.049457" name="H1" />
-      <nuclide ao="0.024672" name="O16" />
-      <nuclide ao="8.0042e-06" name="B10" />
-      <nuclide ao="3.2218e-05" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="0.740582"/>
+      <nuclide ao="0.049457" name="H1"/>
+      <nuclide ao="0.024672" name="O16"/>
+      <nuclide ao="8.0042e-06" name="B10"/>
+      <nuclide ao="3.2218e-05" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat b/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat
index 895389fb97..893e0b3bf2 100644
--- a/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat
@@ -2,37 +2,37 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="Fuel">
-      <density units="g/cm3" value="10.29769" />
-      <nuclide ao="4.4843e-06" name="U234" />
-      <nuclide ao="0.00055815" name="U235" />
-      <nuclide ao="0.022408" name="U238" />
-      <nuclide ao="0.045829" name="O16" />
+      <density units="g/cm3" value="10.29769"/>
+      <nuclide ao="4.4843e-06" name="U234"/>
+      <nuclide ao="0.00055815" name="U235"/>
+      <nuclide ao="0.022408" name="U238"/>
+      <nuclide ao="0.045829" name="O16"/>
     </material>
     <material id="2" name="Cladding">
-      <density units="g/cm3" value="6.55" />
-      <nuclide ao="0.021827" name="Zr90" />
-      <nuclide ao="0.00476" name="Zr91" />
-      <nuclide ao="0.0072758" name="Zr92" />
-      <nuclide ao="0.0073734" name="Zr94" />
-      <nuclide ao="0.0011879" name="Zr96" />
+      <density units="g/cm3" value="6.55"/>
+      <nuclide ao="0.021827" name="Zr90"/>
+      <nuclide ao="0.00476" name="Zr91"/>
+      <nuclide ao="0.0072758" name="Zr92"/>
+      <nuclide ao="0.0073734" name="Zr94"/>
+      <nuclide ao="0.0011879" name="Zr96"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582" />
-      <nuclide ao="0.049457" name="H1" />
-      <nuclide ao="0.024672" name="O16" />
-      <nuclide ao="8.0042e-06" name="B10" />
-      <nuclide ao="3.2218e-05" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="0.740582"/>
+      <nuclide ao="0.049457" name="H1"/>
+      <nuclide ao="0.024672" name="O16"/>
+      <nuclide ao="8.0042e-06" name="B10"/>
+      <nuclide ao="3.2218e-05" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="-1" universe="1" />
-    <cell id="2" material="2" name="clad" region="1 -2" universe="1" />
-    <cell id="3" material="3" name="hot water" region="2" universe="1" />
-    <cell id="4" material="3" name="guide tube inner water" region="-1" universe="2" />
-    <cell id="5" material="2" name="guide tube clad" region="1 -2" universe="2" />
-    <cell id="6" material="3" name="guide tube outer water" region="2" universe="2" />
-    <cell fill="3" id="7" name="root cell" region="3 -4 5 -6" universe="4" />
+    <cell id="1" material="1" name="fuel" region="-1" universe="1"/>
+    <cell id="2" material="2" name="clad" region="1 -2" universe="1"/>
+    <cell id="3" material="3" name="hot water" region="2" universe="1"/>
+    <cell id="4" material="3" name="guide tube inner water" region="-1" universe="2"/>
+    <cell id="5" material="2" name="guide tube clad" region="1 -2" universe="2"/>
+    <cell id="6" material="3" name="guide tube outer water" region="2" universe="2"/>
+    <cell fill="3" id="7" name="root cell" region="3 -4 5 -6" universe="4"/>
     <lattice id="3" name="Fuel Assembly">
       <pitch>1.26 1.26</pitch>
       <dimension>17 17</dimension>
@@ -56,12 +56,12 @@
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 </universes>
     </lattice>
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-10.71" id="3" type="x-plane" />
-    <surface boundary="reflective" coeffs="10.71" id="4" type="x-plane" />
-    <surface boundary="reflective" coeffs="-10.71" id="5" type="y-plane" />
-    <surface boundary="reflective" coeffs="10.71" id="6" type="y-plane" />
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-10.71" id="3" type="x-plane"/>
+    <surface boundary="reflective" coeffs="10.71" id="4" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-10.71" id="5" type="y-plane"/>
+    <surface boundary="reflective" coeffs="10.71" id="6" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat b/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat
index c8f140f808..ce70957659 100644
--- a/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat
@@ -2,39 +2,39 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769" />
-      <nuclide ao="4.4843e-06" name="U234" />
-      <nuclide ao="0.00055815" name="U235" />
-      <nuclide ao="0.022408" name="U238" />
-      <nuclide ao="0.045829" name="O16" />
+      <density units="g/cm3" value="10.29769"/>
+      <nuclide ao="4.4843e-06" name="U234"/>
+      <nuclide ao="0.00055815" name="U235"/>
+      <nuclide ao="0.022408" name="U238"/>
+      <nuclide ao="0.045829" name="O16"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55" />
-      <nuclide ao="0.021827" name="Zr90" />
-      <nuclide ao="0.00476" name="Zr91" />
-      <nuclide ao="0.0072758" name="Zr92" />
-      <nuclide ao="0.0073734" name="Zr94" />
-      <nuclide ao="0.0011879" name="Zr96" />
+      <density units="g/cm3" value="6.55"/>
+      <nuclide ao="0.021827" name="Zr90"/>
+      <nuclide ao="0.00476" name="Zr91"/>
+      <nuclide ao="0.0072758" name="Zr92"/>
+      <nuclide ao="0.0073734" name="Zr94"/>
+      <nuclide ao="0.0011879" name="Zr96"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582" />
-      <nuclide ao="0.049457" name="H1" />
-      <nuclide ao="0.024672" name="O16" />
-      <nuclide ao="8.0042e-06" name="B10" />
-      <nuclide ao="3.2218e-05" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="0.740582"/>
+      <nuclide ao="0.049457" name="H1"/>
+      <nuclide ao="0.024672" name="O16"/>
+      <nuclide ao="8.0042e-06" name="B10"/>
+      <nuclide ao="3.2218e-05" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mgxs_library_histogram/inputs_true.dat b/tests/regression_tests/mgxs_library_histogram/inputs_true.dat
index 0ea55bb040..f45b7dbf3e 100644
--- a/tests/regression_tests/mgxs_library_histogram/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_histogram/inputs_true.dat
@@ -2,39 +2,39 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769" />
-      <nuclide ao="4.4843e-06" name="U234" />
-      <nuclide ao="0.00055815" name="U235" />
-      <nuclide ao="0.022408" name="U238" />
-      <nuclide ao="0.045829" name="O16" />
+      <density units="g/cm3" value="10.29769"/>
+      <nuclide ao="4.4843e-06" name="U234"/>
+      <nuclide ao="0.00055815" name="U235"/>
+      <nuclide ao="0.022408" name="U238"/>
+      <nuclide ao="0.045829" name="O16"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55" />
-      <nuclide ao="0.021827" name="Zr90" />
-      <nuclide ao="0.00476" name="Zr91" />
-      <nuclide ao="0.0072758" name="Zr92" />
-      <nuclide ao="0.0073734" name="Zr94" />
-      <nuclide ao="0.0011879" name="Zr96" />
+      <density units="g/cm3" value="6.55"/>
+      <nuclide ao="0.021827" name="Zr90"/>
+      <nuclide ao="0.00476" name="Zr91"/>
+      <nuclide ao="0.0072758" name="Zr92"/>
+      <nuclide ao="0.0073734" name="Zr94"/>
+      <nuclide ao="0.0011879" name="Zr96"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582" />
-      <nuclide ao="0.049457" name="H1" />
-      <nuclide ao="0.024672" name="O16" />
-      <nuclide ao="8.0042e-06" name="B10" />
-      <nuclide ao="3.2218e-05" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="0.740582"/>
+      <nuclide ao="0.049457" name="H1"/>
+      <nuclide ao="0.024672" name="O16"/>
+      <nuclide ao="8.0042e-06" name="B10"/>
+      <nuclide ao="3.2218e-05" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mgxs_library_mesh/inputs_true.dat b/tests/regression_tests/mgxs_library_mesh/inputs_true.dat
index b18e9773b1..bb9c99026d 100644
--- a/tests/regression_tests/mgxs_library_mesh/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_mesh/inputs_true.dat
@@ -2,27 +2,27 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cm3" value="10.0" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cm3" value="10.0"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0" />
-      <nuclide ao="1.0" name="Zr90" />
+      <density units="g/cm3" value="1.0"/>
+      <nuclide ao="1.0" name="Zr90"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1" />
-    <cell id="2" material="2" region="~(1 -2 3 -4) (5 -6 7 -8) 10 -9" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane" />
-    <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane" />
+    <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1"/>
+    <cell id="2" material="2" region="~(1 -2 3 -4) (5 -6 7 -8) 10 -9" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane"/>
+    <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat b/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat
index 54d095ac62..0608d6f966 100644
--- a/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat
@@ -2,39 +2,39 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769" />
-      <nuclide ao="4.4843e-06" name="U234" />
-      <nuclide ao="0.00055815" name="U235" />
-      <nuclide ao="0.022408" name="U238" />
-      <nuclide ao="0.045829" name="O16" />
+      <density units="g/cm3" value="10.29769"/>
+      <nuclide ao="4.4843e-06" name="U234"/>
+      <nuclide ao="0.00055815" name="U235"/>
+      <nuclide ao="0.022408" name="U238"/>
+      <nuclide ao="0.045829" name="O16"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55" />
-      <nuclide ao="0.021827" name="Zr90" />
-      <nuclide ao="0.00476" name="Zr91" />
-      <nuclide ao="0.0072758" name="Zr92" />
-      <nuclide ao="0.0073734" name="Zr94" />
-      <nuclide ao="0.0011879" name="Zr96" />
+      <density units="g/cm3" value="6.55"/>
+      <nuclide ao="0.021827" name="Zr90"/>
+      <nuclide ao="0.00476" name="Zr91"/>
+      <nuclide ao="0.0072758" name="Zr92"/>
+      <nuclide ao="0.0073734" name="Zr94"/>
+      <nuclide ao="0.0011879" name="Zr96"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582" />
-      <nuclide ao="0.049457" name="H1" />
-      <nuclide ao="0.024672" name="O16" />
-      <nuclide ao="8.0042e-06" name="B10" />
-      <nuclide ao="3.2218e-05" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="0.740582"/>
+      <nuclide ao="0.049457" name="H1"/>
+      <nuclide ao="0.024672" name="O16"/>
+      <nuclide ao="8.0042e-06" name="B10"/>
+      <nuclide ao="3.2218e-05" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mgxs_library_nuclides/inputs_true.dat b/tests/regression_tests/mgxs_library_nuclides/inputs_true.dat
index 5e9720cedc..215bb7c9fd 100644
--- a/tests/regression_tests/mgxs_library_nuclides/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_nuclides/inputs_true.dat
@@ -2,39 +2,39 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769" />
-      <nuclide ao="4.4843e-06" name="U234" />
-      <nuclide ao="0.00055815" name="U235" />
-      <nuclide ao="0.022408" name="U238" />
-      <nuclide ao="0.045829" name="O16" />
+      <density units="g/cm3" value="10.29769"/>
+      <nuclide ao="4.4843e-06" name="U234"/>
+      <nuclide ao="0.00055815" name="U235"/>
+      <nuclide ao="0.022408" name="U238"/>
+      <nuclide ao="0.045829" name="O16"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55" />
-      <nuclide ao="0.021827" name="Zr90" />
-      <nuclide ao="0.00476" name="Zr91" />
-      <nuclide ao="0.0072758" name="Zr92" />
-      <nuclide ao="0.0073734" name="Zr94" />
-      <nuclide ao="0.0011879" name="Zr96" />
+      <density units="g/cm3" value="6.55"/>
+      <nuclide ao="0.021827" name="Zr90"/>
+      <nuclide ao="0.00476" name="Zr91"/>
+      <nuclide ao="0.0072758" name="Zr92"/>
+      <nuclide ao="0.0073734" name="Zr94"/>
+      <nuclide ao="0.0011879" name="Zr96"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582" />
-      <nuclide ao="0.049457" name="H1" />
-      <nuclide ao="0.024672" name="O16" />
-      <nuclide ao="8.0042e-06" name="B10" />
-      <nuclide ao="3.2218e-05" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="0.740582"/>
+      <nuclide ao="0.049457" name="H1"/>
+      <nuclide ao="0.024672" name="O16"/>
+      <nuclide ao="8.0042e-06" name="B10"/>
+      <nuclide ao="3.2218e-05" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mgxs_library_specific_nuclides/inputs_true.dat b/tests/regression_tests/mgxs_library_specific_nuclides/inputs_true.dat
index 938b1c19d1..907bf43ccc 100644
--- a/tests/regression_tests/mgxs_library_specific_nuclides/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_specific_nuclides/inputs_true.dat
@@ -2,39 +2,39 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769" />
-      <nuclide ao="4.4843e-06" name="U234" />
-      <nuclide ao="0.00055815" name="U235" />
-      <nuclide ao="0.022408" name="U238" />
-      <nuclide ao="0.045829" name="O16" />
+      <density units="g/cm3" value="10.29769"/>
+      <nuclide ao="4.4843e-06" name="U234"/>
+      <nuclide ao="0.00055815" name="U235"/>
+      <nuclide ao="0.022408" name="U238"/>
+      <nuclide ao="0.045829" name="O16"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55" />
-      <nuclide ao="0.021827" name="Zr90" />
-      <nuclide ao="0.00476" name="Zr91" />
-      <nuclide ao="0.0072758" name="Zr92" />
-      <nuclide ao="0.0073734" name="Zr94" />
-      <nuclide ao="0.0011879" name="Zr96" />
+      <density units="g/cm3" value="6.55"/>
+      <nuclide ao="0.021827" name="Zr90"/>
+      <nuclide ao="0.00476" name="Zr91"/>
+      <nuclide ao="0.0072758" name="Zr92"/>
+      <nuclide ao="0.0073734" name="Zr94"/>
+      <nuclide ao="0.0011879" name="Zr96"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582" />
-      <nuclide ao="0.049457" name="H1" />
-      <nuclide ao="0.024672" name="O16" />
-      <nuclide ao="8.0042e-06" name="B10" />
-      <nuclide ao="3.2218e-05" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="0.740582"/>
+      <nuclide ao="0.049457" name="H1"/>
+      <nuclide ao="0.024672" name="O16"/>
+      <nuclide ao="8.0042e-06" name="B10"/>
+      <nuclide ao="3.2218e-05" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0" />
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0" />
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0" />
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder" />
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane" />
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane" />
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane" />
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/model_xml/adj_cell_rotation_inputs_true.dat b/tests/regression_tests/model_xml/adj_cell_rotation_inputs_true.dat
index 1c4516f42d..48774bb020 100644
--- a/tests/regression_tests/model_xml/adj_cell_rotation_inputs_true.dat
+++ b/tests/regression_tests/model_xml/adj_cell_rotation_inputs_true.dat
@@ -2,27 +2,27 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cc" value="10.0" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="10.0"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2">
-      <density units="g/cc" value="0.1" />
-      <nuclide ao="0.1" name="H1" />
+      <density units="g/cc" value="0.1"/>
+      <nuclide ao="0.1" name="H1"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <cell id="2" material="2" region="1" universe="1" />
-    <cell fill="1" id="3" region="2 -3 4 -5 6 -8" rotation="10 20 30" universe="2" />
-    <cell fill="1" id="4" region="2 -3 4 -5 8 -7" translation="0 0 15" universe="2" />
-    <surface coeffs="1.0 0.0 0.0 5.0" id="1" type="sphere" />
-    <surface boundary="vacuum" coeffs="-7.5" id="2" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="7.5" id="3" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-7.5" id="4" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="7.5" id="5" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-7.5" id="6" type="z-plane" />
-    <surface boundary="vacuum" coeffs="22.5" id="7" type="z-plane" />
-    <surface coeffs="7.5" id="8" type="z-plane" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <cell id="2" material="2" region="1" universe="1"/>
+    <cell fill="1" id="3" region="2 -3 4 -5 6 -8" rotation="10 20 30" universe="2"/>
+    <cell fill="1" id="4" region="2 -3 4 -5 8 -7" translation="0 0 15" universe="2"/>
+    <surface coeffs="1.0 0.0 0.0 5.0" id="1" type="sphere"/>
+    <surface boundary="vacuum" coeffs="-7.5" id="2" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="7.5" id="3" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-7.5" id="4" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="7.5" id="5" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-7.5" id="6" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="22.5" id="7" type="z-plane"/>
+    <surface coeffs="7.5" id="8" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/model_xml/energy_laws_inputs_true.dat b/tests/regression_tests/model_xml/energy_laws_inputs_true.dat
index c89ccc97ee..4d8e825d1b 100644
--- a/tests/regression_tests/model_xml/energy_laws_inputs_true.dat
+++ b/tests/regression_tests/model_xml/energy_laws_inputs_true.dat
@@ -2,17 +2,17 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cm3" value="20.0" />
-      <nuclide ao="1.0" name="U233" />
-      <nuclide ao="1.0" name="Am244" />
-      <nuclide ao="1.0" name="H2" />
-      <nuclide ao="1.0" name="Na23" />
-      <nuclide ao="1.0" name="Ta181" />
+      <density units="g/cm3" value="20.0"/>
+      <nuclide ao="1.0" name="U233"/>
+      <nuclide ao="1.0" name="Am244"/>
+      <nuclide ao="1.0" name="H2"/>
+      <nuclide ao="1.0" name="Na23"/>
+      <nuclide ao="1.0" name="Ta181"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <surface boundary="reflective" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <surface boundary="reflective" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/model_xml/inputs_true.dat b/tests/regression_tests/model_xml/inputs_true.dat
index c408026316..c1ef136658 100644
--- a/tests/regression_tests/model_xml/inputs_true.dat
+++ b/tests/regression_tests/model_xml/inputs_true.dat
@@ -2,18 +2,18 @@
 <model>
   <materials>
     <material id="6">
-      <density units="g/cm3" value="2.6989" />
-      <nuclide ao="1.0" name="Al27" />
+      <density units="g/cm3" value="2.6989"/>
+      <nuclide ao="1.0" name="Al27"/>
     </material>
   </materials>
   <geometry>
-    <cell id="12" material="void" region="-16 17 -18" universe="10" />
-    <cell id="13" material="6" region="-16 18 -19" universe="10" />
-    <cell id="14" material="void" region="~(-16 17 -19)" universe="10" />
-    <surface id="16" type="x-cylinder" boundary="vacuum" coeffs="0.0 0.0 1.0" />
-    <surface id="17" type="x-plane" boundary="vacuum" coeffs="-1.0" />
-    <surface id="18" type="x-plane" coeffs="1.0" />
-    <surface id="19" type="x-plane" boundary="vacuum" coeffs="1000000000.0" />
+    <cell id="12" material="void" region="-16 17 -18" universe="10"/>
+    <cell id="13" material="6" region="-16 18 -19" universe="10"/>
+    <cell id="14" material="void" region="~(-16 17 -19)" universe="10"/>
+    <surface id="16" type="x-cylinder" boundary="vacuum" coeffs="0.0 0.0 1.0"/>
+    <surface id="17" type="x-plane" boundary="vacuum" coeffs="-1.0"/>
+    <surface id="18" type="x-plane" coeffs="1.0"/>
+    <surface id="19" type="x-plane" boundary="vacuum" coeffs="1000000000.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -23,7 +23,7 @@
       <space type="point">
         <parameters>0 0 0</parameters>
       </space>
-      <angle type="monodirectional" reference_uvw="1.0 0.0 0.0" />
+      <angle type="monodirectional" reference_uvw="1.0 0.0 0.0"/>
       <energy type="discrete">
         <parameters>14000000.0 1.0</parameters>
       </energy>
diff --git a/tests/regression_tests/model_xml/lattice_multiple_inputs_true.dat b/tests/regression_tests/model_xml/lattice_multiple_inputs_true.dat
index 0eed3c2015..b249d97c40 100644
--- a/tests/regression_tests/model_xml/lattice_multiple_inputs_true.dat
+++ b/tests/regression_tests/model_xml/lattice_multiple_inputs_true.dat
@@ -2,24 +2,24 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UO2">
-      <density units="g/cm3" value="10.0" />
-      <nuclide ao="1.0" name="U235" />
-      <nuclide ao="2.0" name="O16" />
+      <density units="g/cm3" value="10.0"/>
+      <nuclide ao="1.0" name="U235"/>
+      <nuclide ao="2.0" name="O16"/>
     </material>
     <material id="2" name="light water">
-      <density units="g/cm3" value="1.0" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <cell id="2" material="2" region="1" universe="1" />
-    <cell id="3" material="1" region="-2" universe="2" />
-    <cell id="4" material="2" region="2" universe="2" />
-    <cell fill="3" id="5" universe="4" />
-    <cell fill="5" id="6" region="3 -4 5 -6" universe="6" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <cell id="2" material="2" region="1" universe="1"/>
+    <cell id="3" material="1" region="-2" universe="2"/>
+    <cell id="4" material="2" region="2" universe="2"/>
+    <cell fill="3" id="5" universe="4"/>
+    <cell fill="5" id="6" region="3 -4 5 -6" universe="6"/>
     <lattice id="3">
       <pitch>1.2 1.2</pitch>
       <outer>1</outer>
@@ -37,12 +37,12 @@
 4 4 
 4 4 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.4" id="1" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-2.4" id="3" name="minimum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="2.4" id="4" name="maximum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="-2.4" id="5" name="minimum y" type="y-plane" />
-    <surface boundary="reflective" coeffs="2.4" id="6" name="maximum y" type="y-plane" />
+    <surface coeffs="0.0 0.0 0.4" id="1" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-2.4" id="3" name="minimum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="2.4" id="4" name="maximum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-2.4" id="5" name="minimum y" type="y-plane"/>
+    <surface boundary="reflective" coeffs="2.4" id="6" name="maximum y" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/model_xml/photon_production_inputs_true.dat b/tests/regression_tests/model_xml/photon_production_inputs_true.dat
index 0b2b434681..109b54c675 100644
--- a/tests/regression_tests/model_xml/photon_production_inputs_true.dat
+++ b/tests/regression_tests/model_xml/photon_production_inputs_true.dat
@@ -2,18 +2,18 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cm3" value="2.6989" />
-      <nuclide ao="1.0" name="Al27" />
+      <density units="g/cm3" value="2.6989"/>
+      <nuclide ao="1.0" name="Al27"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="void" region="-1 2 -3" universe="1" />
-    <cell id="2" material="1" region="-1 3 -4" universe="1" />
-    <cell id="3" material="void" region="~(-1 2 -4)" universe="1" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="x-cylinder" />
-    <surface boundary="vacuum" coeffs="-1.0" id="2" type="x-plane" />
-    <surface coeffs="1.0" id="3" type="x-plane" />
-    <surface boundary="vacuum" coeffs="1000000000.0" id="4" type="x-plane" />
+    <cell id="1" material="void" region="-1 2 -3" universe="1"/>
+    <cell id="2" material="1" region="-1 3 -4" universe="1"/>
+    <cell id="3" material="void" region="~(-1 2 -4)" universe="1"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="x-cylinder"/>
+    <surface boundary="vacuum" coeffs="-1.0" id="2" type="x-plane"/>
+    <surface coeffs="1.0" id="3" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="1000000000.0" id="4" type="x-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -23,7 +23,7 @@
       <space type="point">
         <parameters>0 0 0</parameters>
       </space>
-      <angle reference_uvw="1.0 0.0 0.0" type="monodirectional" />
+      <angle reference_uvw="1.0 0.0 0.0" type="monodirectional"/>
       <energy type="discrete">
         <parameters>14000000.0 1.0</parameters>
       </energy>
diff --git a/tests/regression_tests/multipole/inputs_true.dat b/tests/regression_tests/multipole/inputs_true.dat
index 3a602b28b8..5c905afb9c 100644
--- a/tests/regression_tests/multipole/inputs_true.dat
+++ b/tests/regression_tests/multipole/inputs_true.dat
@@ -2,21 +2,21 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cc" value="1.0" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cc" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material depletable="true" id="2">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" universe="1" />
-    <cell id="11" material="2" region="-1" temperature="500 700 0 800" universe="11" />
-    <cell id="12" material="1" region="1" universe="11" />
-    <cell fill="101" id="101" region="2 -3 4 -5" universe="0" />
+    <cell id="1" material="1" universe="1"/>
+    <cell id="11" material="2" region="-1" temperature="500 700 0 800" universe="11"/>
+    <cell id="12" material="1" region="1" universe="11"/>
+    <cell fill="101" id="101" region="2 -3 4 -5" universe="0"/>
     <lattice id="101">
       <pitch>2.0 2.0</pitch>
       <outer>1</outer>
@@ -26,11 +26,11 @@
 11 11 
 11 11 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.3" id="1" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-3.0" id="2" type="x-plane" />
-    <surface boundary="reflective" coeffs="3.0" id="3" type="x-plane" />
-    <surface boundary="reflective" coeffs="-3.0" id="4" type="y-plane" />
-    <surface boundary="reflective" coeffs="3.0" id="5" type="y-plane" />
+    <surface coeffs="0.0 0.0 0.3" id="1" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-3.0" id="2" type="x-plane"/>
+    <surface boundary="reflective" coeffs="3.0" id="3" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-3.0" id="4" type="y-plane"/>
+    <surface boundary="reflective" coeffs="3.0" id="5" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/ncrystal/inputs_true.dat b/tests/regression_tests/ncrystal/inputs_true.dat
index a609edcae4..be2336cf08 100644
--- a/tests/regression_tests/ncrystal/inputs_true.dat
+++ b/tests/regression_tests/ncrystal/inputs_true.dat
@@ -2,15 +2,15 @@
 <model>
   <materials>
     <material cfg="Al_sg225.ncmat" id="1" temperature="293.15">
-      <density units="g/cm3" value="2.6986455176922477" />
-      <nuclide ao="1.0" name="Al27" />
+      <density units="g/cm3" value="2.6986455176922477"/>
+      <nuclide ao="1.0" name="Al27"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <cell id="2" material="void" region="1 -2" universe="1" />
-    <surface coeffs="0.0 0.0 0.0 0.1" id="1" type="sphere" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100" id="2" type="sphere" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <cell id="2" material="void" region="1 -2" universe="1"/>
+    <surface coeffs="0.0 0.0 0.0 0.1" id="1" type="sphere"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100" id="2" type="sphere"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -20,7 +20,7 @@
       <space type="point">
         <parameters>0 0 -20</parameters>
       </space>
-      <angle reference_uvw="0.0 0.0 1.0" type="monodirectional" />
+      <angle reference_uvw="0.0 0.0 1.0" type="monodirectional"/>
       <energy type="discrete">
         <parameters>0.012 1.0</parameters>
       </energy>
diff --git a/tests/regression_tests/periodic/inputs_true.dat b/tests/regression_tests/periodic/inputs_true.dat
index 9934e2de04..9d50c2b728 100644
--- a/tests/regression_tests/periodic/inputs_true.dat
+++ b/tests/regression_tests/periodic/inputs_true.dat
@@ -2,26 +2,26 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cc" value="1.0" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cc" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material depletable="true" id="2">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="1 -2 3 -4 5 -6 7" universe="0" />
-    <cell id="2" material="2" region="3 5 -6 -7" universe="0" />
-    <surface boundary="periodic" coeffs="0.0" id="1" periodic_surface_id="3" type="x-plane" />
-    <surface boundary="reflective" coeffs="5.0" id="2" type="x-plane" />
-    <surface boundary="periodic" coeffs="0.0" id="3" periodic_surface_id="1" type="y-plane" />
-    <surface boundary="reflective" coeffs="5.0" id="4" type="y-plane" />
-    <surface boundary="periodic" coeffs="-5.0" id="5" type="z-plane" />
-    <surface boundary="periodic" coeffs="0 0 1 5.0" id="6" type="plane" />
-    <surface coeffs="2.5 0.0 2.0" id="7" type="z-cylinder" />
+    <cell id="1" material="1" region="1 -2 3 -4 5 -6 7" universe="0"/>
+    <cell id="2" material="2" region="3 5 -6 -7" universe="0"/>
+    <surface boundary="periodic" coeffs="0.0" id="1" periodic_surface_id="3" type="x-plane"/>
+    <surface boundary="reflective" coeffs="5.0" id="2" type="x-plane"/>
+    <surface boundary="periodic" coeffs="0.0" id="3" periodic_surface_id="1" type="y-plane"/>
+    <surface boundary="reflective" coeffs="5.0" id="4" type="y-plane"/>
+    <surface boundary="periodic" coeffs="-5.0" id="5" type="z-plane"/>
+    <surface boundary="periodic" coeffs="0 0 1 5.0" id="6" type="plane"/>
+    <surface coeffs="2.5 0.0 2.0" id="7" type="z-cylinder"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/periodic_6fold/inputs_true.dat b/tests/regression_tests/periodic_6fold/inputs_true.dat
index 9c2899417e..795ce818fa 100644
--- a/tests/regression_tests/periodic_6fold/inputs_true.dat
+++ b/tests/regression_tests/periodic_6fold/inputs_true.dat
@@ -2,23 +2,23 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cc" value="1.0" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cc" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material depletable="true" id="2">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="1 2 -3 4" universe="0" />
-    <cell id="2" material="2" region="1 2 -4" universe="0" />
-    <surface boundary="periodic" coeffs="0.4999999999999999 0.8660254037844387 0.0 0.0" id="1" type="plane" />
-    <surface boundary="periodic" coeffs="0.4999999999999999 -0.8660254037844387 0.0 0.0" id="2" type="plane" />
-    <surface boundary="reflective" coeffs="5.0" id="3" type="x-plane" />
-    <surface coeffs="2.598076211353316 1.4999999999999998 2.0" id="4" type="z-cylinder" />
+    <cell id="1" material="1" region="1 2 -3 4" universe="0"/>
+    <cell id="2" material="2" region="1 2 -4" universe="0"/>
+    <surface boundary="periodic" coeffs="0.4999999999999999 0.8660254037844387 0.0 0.0" id="1" type="plane"/>
+    <surface boundary="periodic" coeffs="0.4999999999999999 -0.8660254037844387 0.0 0.0" id="2" type="plane"/>
+    <surface boundary="reflective" coeffs="5.0" id="3" type="x-plane"/>
+    <surface coeffs="2.598076211353316 1.4999999999999998 2.0" id="4" type="z-cylinder"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/periodic_hex/inputs_true.dat b/tests/regression_tests/periodic_hex/inputs_true.dat
index f4869fa58b..188c8dfa93 100644
--- a/tests/regression_tests/periodic_hex/inputs_true.dat
+++ b/tests/regression_tests/periodic_hex/inputs_true.dat
@@ -2,18 +2,18 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1 2 -3 -4 5 6" universe="1" />
-    <surface boundary="periodic" coeffs="8.660254037844386" id="1" periodic_surface_id="2" type="x-plane" />
-    <surface boundary="periodic" coeffs="-8.660254037844386" id="2" periodic_surface_id="1" type="x-plane" />
-    <surface boundary="periodic" coeffs="0.5773502691896257 1.0 0.0 10.0" id="3" periodic_surface_id="6" type="plane" />
-    <surface boundary="periodic" coeffs="-0.5773502691896257 1.0 0.0 10.0" id="4" periodic_surface_id="5" type="plane" />
-    <surface boundary="periodic" coeffs="-0.5773502691896257 1.0 0.0 -10.0" id="5" periodic_surface_id="4" type="plane" />
-    <surface boundary="periodic" coeffs="0.5773502691896257 1.0 0.0 -10.0" id="6" periodic_surface_id="3" type="plane" />
+    <cell id="1" material="1" region="-1 2 -3 -4 5 6" universe="1"/>
+    <surface boundary="periodic" coeffs="8.660254037844386" id="1" periodic_surface_id="2" type="x-plane"/>
+    <surface boundary="periodic" coeffs="-8.660254037844386" id="2" periodic_surface_id="1" type="x-plane"/>
+    <surface boundary="periodic" coeffs="0.5773502691896257 1.0 0.0 10.0" id="3" periodic_surface_id="6" type="plane"/>
+    <surface boundary="periodic" coeffs="-0.5773502691896257 1.0 0.0 10.0" id="4" periodic_surface_id="5" type="plane"/>
+    <surface boundary="periodic" coeffs="-0.5773502691896257 1.0 0.0 -10.0" id="5" periodic_surface_id="4" type="plane"/>
+    <surface boundary="periodic" coeffs="0.5773502691896257 1.0 0.0 -10.0" id="6" periodic_surface_id="3" type="plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/photon_production/inputs_true.dat b/tests/regression_tests/photon_production/inputs_true.dat
index 0b2b434681..109b54c675 100644
--- a/tests/regression_tests/photon_production/inputs_true.dat
+++ b/tests/regression_tests/photon_production/inputs_true.dat
@@ -2,18 +2,18 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cm3" value="2.6989" />
-      <nuclide ao="1.0" name="Al27" />
+      <density units="g/cm3" value="2.6989"/>
+      <nuclide ao="1.0" name="Al27"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="void" region="-1 2 -3" universe="1" />
-    <cell id="2" material="1" region="-1 3 -4" universe="1" />
-    <cell id="3" material="void" region="~(-1 2 -4)" universe="1" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="x-cylinder" />
-    <surface boundary="vacuum" coeffs="-1.0" id="2" type="x-plane" />
-    <surface coeffs="1.0" id="3" type="x-plane" />
-    <surface boundary="vacuum" coeffs="1000000000.0" id="4" type="x-plane" />
+    <cell id="1" material="void" region="-1 2 -3" universe="1"/>
+    <cell id="2" material="1" region="-1 3 -4" universe="1"/>
+    <cell id="3" material="void" region="~(-1 2 -4)" universe="1"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="x-cylinder"/>
+    <surface boundary="vacuum" coeffs="-1.0" id="2" type="x-plane"/>
+    <surface coeffs="1.0" id="3" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="1000000000.0" id="4" type="x-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -23,7 +23,7 @@
       <space type="point">
         <parameters>0 0 0</parameters>
       </space>
-      <angle reference_uvw="1.0 0.0 0.0" type="monodirectional" />
+      <angle reference_uvw="1.0 0.0 0.0" type="monodirectional"/>
       <energy type="discrete">
         <parameters>14000000.0 1.0</parameters>
       </energy>
diff --git a/tests/regression_tests/photon_production_fission/inputs_true.dat b/tests/regression_tests/photon_production_fission/inputs_true.dat
index ea6e9d9ee3..6a102cfdce 100644
--- a/tests/regression_tests/photon_production_fission/inputs_true.dat
+++ b/tests/regression_tests/photon_production_fission/inputs_true.dat
@@ -2,13 +2,13 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cm3" value="10.0" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cm3" value="10.0"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <surface boundary="reflective" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <surface boundary="reflective" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/photon_source/inputs_true.dat b/tests/regression_tests/photon_source/inputs_true.dat
index 4c61b47fca..33ace2c700 100644
--- a/tests/regression_tests/photon_source/inputs_true.dat
+++ b/tests/regression_tests/photon_source/inputs_true.dat
@@ -2,16 +2,16 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cm3" value="0.998207" />
-      <nuclide ao="0.11187657362844" name="H1" />
-      <nuclide ao="1.7426371559999997e-05" name="H2" />
-      <nuclide ao="0.8877694078259999" name="O16" />
-      <nuclide ao="0.000336592174" name="O17" />
+      <density units="g/cm3" value="0.998207"/>
+      <nuclide ao="0.11187657362844" name="H1"/>
+      <nuclide ao="1.7426371559999997e-05" name="H2"/>
+      <nuclide ao="0.8877694078259999" name="O16"/>
+      <nuclide ao="0.000336592174" name="O17"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <surface boundary="reflective" coeffs="0.0 0.0 0.0 1000000000.0" id="1" type="sphere" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <surface boundary="reflective" coeffs="0.0 0.0 0.0 1000000000.0" id="1" type="sphere"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -21,7 +21,7 @@
       <space type="point">
         <parameters>0 0 0</parameters>
       </space>
-      <angle type="isotropic" />
+      <angle type="isotropic"/>
       <energy type="discrete">
         <parameters>10000000.0 1.0</parameters>
       </energy>
diff --git a/tests/regression_tests/resonance_scattering/inputs_true.dat b/tests/regression_tests/resonance_scattering/inputs_true.dat
index 7165fa72b6..6ab82ba245 100644
--- a/tests/regression_tests/resonance_scattering/inputs_true.dat
+++ b/tests/regression_tests/resonance_scattering/inputs_true.dat
@@ -2,16 +2,16 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cc" value="1.0" />
-      <nuclide ao="1.0" name="U238" />
-      <nuclide ao="0.02" name="U235" />
-      <nuclide ao="0.02" name="Pu239" />
-      <nuclide ao="20.0" name="H1" />
+      <density units="g/cc" value="1.0"/>
+      <nuclide ao="1.0" name="U238"/>
+      <nuclide ao="0.02" name="U235"/>
+      <nuclide ao="0.02" name="Pu239"/>
+      <nuclide ao="20.0" name="H1"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="0" />
-    <surface boundary="reflective" coeffs="100" id="1" type="x-plane" />
+    <cell id="1" material="1" region="-1" universe="0"/>
+    <surface boundary="reflective" coeffs="100" id="1" type="x-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/salphabeta/inputs_true.dat b/tests/regression_tests/salphabeta/inputs_true.dat
index 31a81b2c8c..508624b75a 100644
--- a/tests/regression_tests/salphabeta/inputs_true.dat
+++ b/tests/regression_tests/salphabeta/inputs_true.dat
@@ -2,49 +2,49 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
-      <nuclide ao="1.0" name="H1" />
-      <sab fraction="0.5" name="c_H_in_H2O" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
+      <nuclide ao="1.0" name="H1"/>
+      <sab fraction="0.5" name="c_H_in_H2O"/>
     </material>
     <material depletable="true" id="2">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
-      <nuclide ao="1.0" name="C0" />
-      <sab name="c_Graphite" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
+      <nuclide ao="1.0" name="C0"/>
+      <sab name="c_Graphite"/>
     </material>
     <material depletable="true" id="3">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
-      <nuclide ao="1.0" name="Be9" />
-      <nuclide ao="1.0" name="O16" />
-      <sab name="c_Be_in_BeO" />
-      <sab name="c_O_in_BeO" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
+      <nuclide ao="1.0" name="Be9"/>
+      <nuclide ao="1.0" name="O16"/>
+      <sab name="c_Be_in_BeO"/>
+      <sab name="c_O_in_BeO"/>
     </material>
     <material depletable="true" id="4">
-      <density units="g/cm3" value="5.90168" />
-      <nuclide ao="0.3" name="H1" />
-      <nuclide ao="0.15" name="Zr90" />
-      <nuclide ao="0.1" name="Zr91" />
-      <nuclide ao="0.1" name="Zr92" />
-      <nuclide ao="0.05" name="Zr94" />
-      <nuclide ao="0.05" name="Zr96" />
-      <nuclide ao="0.1" name="U235" />
-      <nuclide ao="0.15" name="U238" />
-      <sab name="c_Zr_in_ZrH" />
-      <sab name="c_H_in_ZrH" />
+      <density units="g/cm3" value="5.90168"/>
+      <nuclide ao="0.3" name="H1"/>
+      <nuclide ao="0.15" name="Zr90"/>
+      <nuclide ao="0.1" name="Zr91"/>
+      <nuclide ao="0.1" name="Zr92"/>
+      <nuclide ao="0.05" name="Zr94"/>
+      <nuclide ao="0.05" name="Zr96"/>
+      <nuclide ao="0.1" name="U235"/>
+      <nuclide ao="0.15" name="U238"/>
+      <sab name="c_Zr_in_ZrH"/>
+      <sab name="c_H_in_ZrH"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="1 -2" universe="1" />
-    <cell id="2" material="2" region="2 -3" universe="1" />
-    <cell id="3" material="3" region="3 -4" universe="1" />
-    <cell id="4" material="4" region="4 -5" universe="1" />
-    <surface boundary="vacuum" coeffs="-10" id="1" type="x-plane" />
-    <surface coeffs="-5" id="2" type="x-plane" />
-    <surface coeffs="0" id="3" type="x-plane" />
-    <surface coeffs="5" id="4" type="x-plane" />
-    <surface boundary="vacuum" coeffs="10" id="5" type="x-plane" />
+    <cell id="1" material="1" region="1 -2" universe="1"/>
+    <cell id="2" material="2" region="2 -3" universe="1"/>
+    <cell id="3" material="3" region="3 -4" universe="1"/>
+    <cell id="4" material="4" region="4 -5" universe="1"/>
+    <surface boundary="vacuum" coeffs="-10" id="1" type="x-plane"/>
+    <surface coeffs="-5" id="2" type="x-plane"/>
+    <surface coeffs="0" id="3" type="x-plane"/>
+    <surface coeffs="5" id="4" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="10" id="5" type="x-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/score_current/inputs_true.dat b/tests/regression_tests/score_current/inputs_true.dat
index f9c9ba494d..9ea8e5e4ae 100644
--- a/tests/regression_tests/score_current/inputs_true.dat
+++ b/tests/regression_tests/score_current/inputs_true.dat
@@ -2,27 +2,27 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cm3" value="10.0" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cm3" value="10.0"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0" />
-      <nuclide ao="1.0" name="Zr90" />
+      <density units="g/cm3" value="1.0"/>
+      <nuclide ao="1.0" name="Zr90"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1" />
-    <cell id="2" material="2" region="~(1 -2 3 -4) (5 -6 7 -8) 10 -9" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane" />
-    <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane" />
+    <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1"/>
+    <cell id="2" material="2" region="~(1 -2 3 -4) (5 -6 7 -8) 10 -9" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane"/>
+    <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/source/inputs_true.dat b/tests/regression_tests/source/inputs_true.dat
index adf60c8145..460be7077d 100644
--- a/tests/regression_tests/source/inputs_true.dat
+++ b/tests/regression_tests/source/inputs_true.dat
@@ -2,13 +2,13 @@
 <model>
   <materials>
     <material depletable="true" id="1" temperature="294">
-      <density units="g/cm3" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cm3" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="0" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere" />
+    <cell id="1" material="1" region="-1" universe="0"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
@@ -17,7 +17,7 @@
     <inactive>5</inactive>
     <source strength="0.3">
       <space type="cartesian">
-        <x parameters="-3.0 3.0" type="uniform" />
+        <x parameters="-3.0 3.0" type="uniform"/>
         <y type="discrete">
           <parameters>-4.0 -1.0 3.0 0.2 0.3 0.5</parameters>
         </y>
@@ -29,67 +29,67 @@
         <mu type="discrete">
           <parameters>-1.0 0.0 1.0 0.5 0.25 0.25</parameters>
         </mu>
-        <phi parameters="0.0 6.28318530718" type="uniform" />
+        <phi parameters="0.0 6.28318530718" type="uniform"/>
       </angle>
-      <energy parameters="1289500.0" type="maxwell" />
+      <energy parameters="1289500.0" type="maxwell"/>
     </source>
     <source strength="0.1">
       <space type="box">
         <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
       </space>
-      <angle reference_uvw="0.0 1.0 0.0" type="monodirectional" />
-      <energy parameters="988000.0 2.249e-06" type="watt" />
+      <angle reference_uvw="0.0 1.0 0.0" type="monodirectional"/>
+      <energy parameters="988000.0 2.249e-06" type="watt"/>
     </source>
     <source strength="0.1">
       <space type="point">
         <parameters>1.2 -2.3 0.781</parameters>
       </space>
-      <angle type="isotropic" />
+      <angle type="isotropic"/>
       <energy interpolation="histogram" type="tabular">
         <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
       </energy>
     </source>
     <source strength="0.1">
       <space origin="1.0 1.0 0.0" type="spherical">
-        <r parameters="2.0 3.0" type="uniform" />
+        <r parameters="2.0 3.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>0.7071067811865476 0.0 -0.7071067811865475 0.3 0.4 0.3</parameters>
         </cos_theta>
-        <phi parameters="0.0 6.283185307179586" type="uniform" />
+        <phi parameters="0.0 6.283185307179586" type="uniform"/>
       </space>
-      <angle type="isotropic" />
+      <angle type="isotropic"/>
       <energy interpolation="histogram" type="tabular">
         <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
       </energy>
     </source>
     <source strength="0.1">
       <space origin="1.0 1.0 0.0" type="cylindrical">
-        <r parameters="2.0 3.0" type="uniform" />
-        <phi parameters="0.0 6.283185307179586" type="uniform" />
+        <r parameters="2.0 3.0" type="uniform"/>
+        <phi parameters="0.0 6.283185307179586" type="uniform"/>
         <z interpolation="linear-linear" type="tabular">
           <parameters>-2.0 0.0 2.0 0.2 0.3 0.2</parameters>
         </z>
       </space>
-      <angle type="isotropic" />
+      <angle type="isotropic"/>
       <energy interpolation="histogram" type="tabular">
         <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
       </energy>
     </source>
     <source strength="0.1">
       <space origin="1.0 1.0 0.0" type="cylindrical">
-        <r parameters="2.0 3.0" type="uniform" />
-        <phi parameters="0.0 6.283185307179586" type="uniform" />
+        <r parameters="2.0 3.0" type="uniform"/>
+        <phi parameters="0.0 6.283185307179586" type="uniform"/>
         <z interpolation="linear-linear" type="tabular">
           <parameters>-2.0 0.0 2.0 0.2 0.3 0.2</parameters>
         </z>
       </space>
-      <angle type="isotropic" />
+      <angle type="isotropic"/>
       <energy type="mixture">
         <pair probability="1">
-          <dist parameters="1289500.0" type="maxwell" />
+          <dist parameters="1289500.0" type="maxwell"/>
         </pair>
         <pair probability="2">
-          <dist parameters="988000.0 2.249e-06" type="watt" />
+          <dist parameters="988000.0 2.249e-06" type="watt"/>
         </pair>
         <pair probability="3">
           <dist interpolation="histogram" type="tabular">
@@ -100,19 +100,19 @@
     </source>
     <source strength="0.1">
       <space origin="1.0 1.0 0.0" type="spherical">
-        <r parameters="2.0 3.0 2.0" type="powerlaw" />
+        <r parameters="2.0 3.0 2.0" type="powerlaw"/>
         <cos_theta type="discrete">
           <parameters>0.7071067811865476 0.0 -0.7071067811865475 0.3 0.4 0.3</parameters>
         </cos_theta>
-        <phi parameters="0.0 6.283185307179586" type="uniform" />
+        <phi parameters="0.0 6.283185307179586" type="uniform"/>
       </space>
-      <angle type="isotropic" />
+      <angle type="isotropic"/>
       <energy type="mixture">
         <pair probability="1">
-          <dist parameters="1289500.0" type="maxwell" />
+          <dist parameters="1289500.0" type="maxwell"/>
         </pair>
         <pair probability="2">
-          <dist parameters="988000.0 2.249e-06" type="watt" />
+          <dist parameters="988000.0 2.249e-06" type="watt"/>
         </pair>
         <pair probability="3">
           <dist interpolation="histogram" type="tabular">
@@ -120,23 +120,23 @@
           </dist>
         </pair>
       </energy>
-      <time parameters="2 5" type="uniform" />
+      <time parameters="2 5" type="uniform"/>
     </source>
     <source strength="0.1">
       <space origin="1.0 1.0 0.0" type="cylindrical">
-        <r parameters="2.0 3.0 1.0" type="powerlaw" />
-        <phi parameters="0.0 6.283185307179586" type="uniform" />
+        <r parameters="2.0 3.0 1.0" type="powerlaw"/>
+        <phi parameters="0.0 6.283185307179586" type="uniform"/>
         <z interpolation="linear-linear" type="tabular">
           <parameters>-2.0 0.0 2.0 0.2 0.3 0.2</parameters>
         </z>
       </space>
-      <angle type="isotropic" />
+      <angle type="isotropic"/>
       <energy type="mixture">
         <pair probability="1">
-          <dist parameters="1289500.0" type="maxwell" />
+          <dist parameters="1289500.0" type="maxwell"/>
         </pair>
         <pair probability="2">
-          <dist parameters="988000.0 2.249e-06" type="watt" />
+          <dist parameters="988000.0 2.249e-06" type="watt"/>
         </pair>
         <pair probability="3">
           <dist interpolation="histogram" type="tabular">
@@ -144,7 +144,7 @@
           </dist>
         </pair>
       </energy>
-      <time parameters="2 5" type="uniform" />
+      <time parameters="2 5" type="uniform"/>
     </source>
   </settings>
   </model>
diff --git a/tests/regression_tests/source_dlopen/inputs_true.dat b/tests/regression_tests/source_dlopen/inputs_true.dat
index 1a447ae3d2..9d97164adf 100644
--- a/tests/regression_tests/source_dlopen/inputs_true.dat
+++ b/tests/regression_tests/source_dlopen/inputs_true.dat
@@ -2,22 +2,22 @@
 <model>
   <materials>
     <material id="1" name="natural_lead">
-      <density units="g/cm3" value="11.34" />
-      <nuclide ao="0.014" name="Pb204" />
-      <nuclide ao="0.241" name="Pb206" />
-      <nuclide ao="0.221" name="Pb207" />
-      <nuclide ao="0.524" name="Pb208" />
+      <density units="g/cm3" value="11.34"/>
+      <nuclide ao="0.014" name="Pb204"/>
+      <nuclide ao="0.241" name="Pb206"/>
+      <nuclide ao="0.221" name="Pb207"/>
+      <nuclide ao="0.524" name="Pb208"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100" id="1" type="sphere" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100" id="1" type="sphere"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>0</inactive>
-    <source library="build/libsource.so" strength="1.0" />
+    <source library="build/libsource.so" strength="1.0"/>
   </settings>
   </model>
diff --git a/tests/regression_tests/source_parameterized_dlopen/inputs_true.dat b/tests/regression_tests/source_parameterized_dlopen/inputs_true.dat
index 208030e2e6..6894635935 100644
--- a/tests/regression_tests/source_parameterized_dlopen/inputs_true.dat
+++ b/tests/regression_tests/source_parameterized_dlopen/inputs_true.dat
@@ -2,22 +2,22 @@
 <model>
   <materials>
     <material id="1" name="natural_lead">
-      <density units="g/cm3" value="11.34" />
-      <nuclide ao="0.014" name="Pb204" />
-      <nuclide ao="0.241" name="Pb206" />
-      <nuclide ao="0.221" name="Pb207" />
-      <nuclide ao="0.524" name="Pb208" />
+      <density units="g/cm3" value="11.34"/>
+      <nuclide ao="0.014" name="Pb204"/>
+      <nuclide ao="0.241" name="Pb206"/>
+      <nuclide ao="0.221" name="Pb207"/>
+      <nuclide ao="0.524" name="Pb208"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100" id="1" type="sphere" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100" id="1" type="sphere"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>0</inactive>
-    <source library="build/libsource.so" parameters="1e3" strength="1.0" />
+    <source library="build/libsource.so" parameters="1e3" strength="1.0"/>
   </settings>
   </model>
diff --git a/tests/regression_tests/surface_source/inputs_true_read.dat b/tests/regression_tests/surface_source/inputs_true_read.dat
index fb843a6d19..14a55f0bf0 100644
--- a/tests/regression_tests/surface_source/inputs_true_read.dat
+++ b/tests/regression_tests/surface_source/inputs_true_read.dat
@@ -3,14 +3,14 @@
   <materials>
   </materials>
   <geometry>
-    <cell id="1" material="void" region="-1" universe="1" />
-    <cell id="2" material="void" region="1 -2" universe="1" />
-    <cell id="3" material="void" region="2 -3" universe="1" />
-    <cell id="4" material="void" region="3 -4" universe="1" />
-    <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 2.0" id="2" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 2.5" id="3" type="sphere" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 4.0" id="4" type="sphere" />
+    <cell id="1" material="void" region="-1" universe="1"/>
+    <cell id="2" material="void" region="1 -2" universe="1"/>
+    <cell id="3" material="void" region="2 -3" universe="1"/>
+    <cell id="4" material="void" region="3 -4" universe="1"/>
+    <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 2.0" id="2" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 2.5" id="3" type="sphere"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 4.0" id="4" type="sphere"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
diff --git a/tests/regression_tests/surface_source/inputs_true_write.dat b/tests/regression_tests/surface_source/inputs_true_write.dat
index dbdf22395b..4747fcaf42 100644
--- a/tests/regression_tests/surface_source/inputs_true_write.dat
+++ b/tests/regression_tests/surface_source/inputs_true_write.dat
@@ -3,14 +3,14 @@
   <materials>
   </materials>
   <geometry>
-    <cell id="1" material="void" region="-1" universe="1" />
-    <cell id="2" material="void" region="1 -2" universe="1" />
-    <cell id="3" material="void" region="2 -3" universe="1" />
-    <cell id="4" material="void" region="3 -4" universe="1" />
-    <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 2.0" id="2" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 2.5" id="3" type="sphere" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 4.0" id="4" type="sphere" />
+    <cell id="1" material="void" region="-1" universe="1"/>
+    <cell id="2" material="void" region="1 -2" universe="1"/>
+    <cell id="3" material="void" region="2 -3" universe="1"/>
+    <cell id="4" material="void" region="3 -4" universe="1"/>
+    <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 2.0" id="2" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 2.5" id="3" type="sphere"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 4.0" id="4" type="sphere"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
diff --git a/tests/regression_tests/surface_tally/inputs_true.dat b/tests/regression_tests/surface_tally/inputs_true.dat
index 1a89079557..4be5d4e77a 100644
--- a/tests/regression_tests/surface_tally/inputs_true.dat
+++ b/tests/regression_tests/surface_tally/inputs_true.dat
@@ -2,27 +2,27 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UO2 fuel at 2.4% wt enrichment">
-      <density units="g/cc" value="10.0" />
-      <nuclide ao="1.0" name="U238" />
-      <nuclide ao="0.02" name="U235" />
-      <nuclide ao="2.0" name="O16" />
+      <density units="g/cc" value="10.0"/>
+      <nuclide ao="1.0" name="U238"/>
+      <nuclide ao="0.02" name="U235"/>
+      <nuclide ao="2.0" name="O16"/>
     </material>
     <material id="2" name="Borated water">
-      <density units="g/cm3" value="1" />
-      <nuclide ao="0.0001" name="B10" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="g/cm3" value="1"/>
+      <nuclide ao="0.0001" name="B10"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="-1" universe="1" />
-    <cell id="2" material="2" name="water" region="1 -3 4 -5" universe="1" />
-    <cell fill="1" id="3" name="root cell" region="2 -3 4 -5" universe="0" />
-    <surface coeffs="0 0 1" id="1" name="Fuel OR" type="z-cylinder" />
-    <surface boundary="vacuum" coeffs="-2" id="2" name="left" type="x-plane" />
-    <surface boundary="reflective" coeffs="2" id="3" name="right" type="x-plane" />
-    <surface boundary="reflective" coeffs="-2" id="4" name="bottom" type="y-plane" />
-    <surface boundary="reflective" coeffs="2" id="5" name="top" type="y-plane" />
+    <cell id="1" material="1" name="fuel" region="-1" universe="1"/>
+    <cell id="2" material="2" name="water" region="1 -3 4 -5" universe="1"/>
+    <cell fill="1" id="3" name="root cell" region="2 -3 4 -5" universe="0"/>
+    <surface coeffs="0 0 1" id="1" name="Fuel OR" type="z-cylinder"/>
+    <surface boundary="vacuum" coeffs="-2" id="2" name="left" type="x-plane"/>
+    <surface boundary="reflective" coeffs="2" id="3" name="right" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-2" id="4" name="bottom" type="y-plane"/>
+    <surface boundary="reflective" coeffs="2" id="5" name="top" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/tallies/inputs_true.dat b/tests/regression_tests/tallies/inputs_true.dat
index e6725024ac..8d2e50af8c 100644
--- a/tests/regression_tests/tallies/inputs_true.dat
+++ b/tests/regression_tests/tallies/inputs_true.dat
@@ -2,181 +2,181 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UOX fuel">
-      <density units="g/cm3" value="10.062" />
-      <nuclide ao="4.9476e-06" name="U234" />
-      <nuclide ao="0.00048218" name="U235" />
-      <nuclide ao="0.021504" name="U238" />
-      <nuclide ao="1.0801e-08" name="Xe135" />
-      <nuclide ao="0.045737" name="O16" />
+      <density units="g/cm3" value="10.062"/>
+      <nuclide ao="4.9476e-06" name="U234"/>
+      <nuclide ao="0.00048218" name="U235"/>
+      <nuclide ao="0.021504" name="U238"/>
+      <nuclide ao="1.0801e-08" name="Xe135"/>
+      <nuclide ao="0.045737" name="O16"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cm3" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="Cold borated water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <nuclide ao="0.000649" name="B10" />
-      <nuclide ao="0.002689" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <nuclide ao="0.000649" name="B10"/>
+      <nuclide ao="0.002689" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="4" name="Hot borated water">
-      <density units="atom/b-cm" value="0.06614" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <nuclide ao="0.000649" name="B10" />
-      <nuclide ao="0.002689" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="atom/b-cm" value="0.06614"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <nuclide ao="0.000649" name="B10"/>
+      <nuclide ao="0.002689" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="5" name="Reactor pressure vessel steel">
-      <density units="g/cm3" value="7.9" />
-      <nuclide name="Fe54" wo="0.05437098" />
-      <nuclide name="Fe56" wo="0.88500663" />
-      <nuclide name="Fe57" wo="0.0208008" />
-      <nuclide name="Fe58" wo="0.00282159" />
-      <nuclide name="Ni58" wo="0.0067198" />
-      <nuclide name="Ni60" wo="0.0026776" />
-      <nuclide name="Mn55" wo="0.01" />
-      <nuclide name="Cr52" wo="0.002092475" />
-      <nuclide name="C0" wo="0.0025" />
-      <nuclide name="Cu63" wo="0.0013696" />
+      <density units="g/cm3" value="7.9"/>
+      <nuclide name="Fe54" wo="0.05437098"/>
+      <nuclide name="Fe56" wo="0.88500663"/>
+      <nuclide name="Fe57" wo="0.0208008"/>
+      <nuclide name="Fe58" wo="0.00282159"/>
+      <nuclide name="Ni58" wo="0.0067198"/>
+      <nuclide name="Ni60" wo="0.0026776"/>
+      <nuclide name="Mn55" wo="0.01"/>
+      <nuclide name="Cr52" wo="0.002092475"/>
+      <nuclide name="C0" wo="0.0025"/>
+      <nuclide name="Cu63" wo="0.0013696"/>
     </material>
     <material id="6" name="Lower radial reflector">
-      <density units="g/cm3" value="4.32" />
-      <nuclide name="H1" wo="0.0095661" />
-      <nuclide name="O16" wo="0.0759107" />
-      <nuclide name="B10" wo="3.08409e-05" />
-      <nuclide name="B11" wo="0.000140499" />
-      <nuclide name="Fe54" wo="0.035620772088" />
-      <nuclide name="Fe56" wo="0.579805982228" />
-      <nuclide name="Fe57" wo="0.01362750048" />
-      <nuclide name="Fe58" wo="0.001848545204" />
-      <nuclide name="Ni58" wo="0.055298376566" />
-      <nuclide name="Mn55" wo="0.018287" />
-      <nuclide name="Cr52" wo="0.145407678031" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="4.32"/>
+      <nuclide name="H1" wo="0.0095661"/>
+      <nuclide name="O16" wo="0.0759107"/>
+      <nuclide name="B10" wo="3.08409e-05"/>
+      <nuclide name="B11" wo="0.000140499"/>
+      <nuclide name="Fe54" wo="0.035620772088"/>
+      <nuclide name="Fe56" wo="0.579805982228"/>
+      <nuclide name="Fe57" wo="0.01362750048"/>
+      <nuclide name="Fe58" wo="0.001848545204"/>
+      <nuclide name="Ni58" wo="0.055298376566"/>
+      <nuclide name="Mn55" wo="0.018287"/>
+      <nuclide name="Cr52" wo="0.145407678031"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="7" name="Upper radial reflector / Top plate region">
-      <density units="g/cm3" value="4.28" />
-      <nuclide name="H1" wo="0.0086117" />
-      <nuclide name="O16" wo="0.0683369" />
-      <nuclide name="B10" wo="2.77638e-05" />
-      <nuclide name="B11" wo="0.000126481" />
-      <nuclide name="Fe54" wo="0.035953677186" />
-      <nuclide name="Fe56" wo="0.585224740891" />
-      <nuclide name="Fe57" wo="0.01375486056" />
-      <nuclide name="Fe58" wo="0.001865821363" />
-      <nuclide name="Ni58" wo="0.055815129186" />
-      <nuclide name="Mn55" wo="0.0184579" />
-      <nuclide name="Cr52" wo="0.146766614995" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="4.28"/>
+      <nuclide name="H1" wo="0.0086117"/>
+      <nuclide name="O16" wo="0.0683369"/>
+      <nuclide name="B10" wo="2.77638e-05"/>
+      <nuclide name="B11" wo="0.000126481"/>
+      <nuclide name="Fe54" wo="0.035953677186"/>
+      <nuclide name="Fe56" wo="0.585224740891"/>
+      <nuclide name="Fe57" wo="0.01375486056"/>
+      <nuclide name="Fe58" wo="0.001865821363"/>
+      <nuclide name="Ni58" wo="0.055815129186"/>
+      <nuclide name="Mn55" wo="0.0184579"/>
+      <nuclide name="Cr52" wo="0.146766614995"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="8" name="Bottom plate region">
-      <density units="g/cm3" value="7.184" />
-      <nuclide name="H1" wo="0.0011505" />
-      <nuclide name="O16" wo="0.0091296" />
-      <nuclide name="B10" wo="3.70915e-06" />
-      <nuclide name="B11" wo="1.68974e-05" />
-      <nuclide name="Fe54" wo="0.03855611055" />
-      <nuclide name="Fe56" wo="0.627585036425" />
-      <nuclide name="Fe57" wo="0.014750478" />
-      <nuclide name="Fe58" wo="0.002000875025" />
-      <nuclide name="Ni58" wo="0.059855207342" />
-      <nuclide name="Mn55" wo="0.019794" />
-      <nuclide name="Cr52" wo="0.157390026871" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="7.184"/>
+      <nuclide name="H1" wo="0.0011505"/>
+      <nuclide name="O16" wo="0.0091296"/>
+      <nuclide name="B10" wo="3.70915e-06"/>
+      <nuclide name="B11" wo="1.68974e-05"/>
+      <nuclide name="Fe54" wo="0.03855611055"/>
+      <nuclide name="Fe56" wo="0.627585036425"/>
+      <nuclide name="Fe57" wo="0.014750478"/>
+      <nuclide name="Fe58" wo="0.002000875025"/>
+      <nuclide name="Ni58" wo="0.059855207342"/>
+      <nuclide name="Mn55" wo="0.019794"/>
+      <nuclide name="Cr52" wo="0.157390026871"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="9" name="Bottom nozzle region">
-      <density units="g/cm3" value="2.53" />
-      <nuclide name="H1" wo="0.0245014" />
-      <nuclide name="O16" wo="0.1944274" />
-      <nuclide name="B10" wo="7.89917e-05" />
-      <nuclide name="B11" wo="0.000359854" />
-      <nuclide name="Fe54" wo="0.030411411144" />
-      <nuclide name="Fe56" wo="0.495012237964" />
-      <nuclide name="Fe57" wo="0.01163454624" />
-      <nuclide name="Fe58" wo="0.001578204652" />
-      <nuclide name="Ni58" wo="0.047211231662" />
-      <nuclide name="Mn55" wo="0.0156126" />
-      <nuclide name="Cr52" wo="0.124142524198" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="2.53"/>
+      <nuclide name="H1" wo="0.0245014"/>
+      <nuclide name="O16" wo="0.1944274"/>
+      <nuclide name="B10" wo="7.89917e-05"/>
+      <nuclide name="B11" wo="0.000359854"/>
+      <nuclide name="Fe54" wo="0.030411411144"/>
+      <nuclide name="Fe56" wo="0.495012237964"/>
+      <nuclide name="Fe57" wo="0.01163454624"/>
+      <nuclide name="Fe58" wo="0.001578204652"/>
+      <nuclide name="Ni58" wo="0.047211231662"/>
+      <nuclide name="Mn55" wo="0.0156126"/>
+      <nuclide name="Cr52" wo="0.124142524198"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="10" name="Top nozzle region">
-      <density units="g/cm3" value="1.746" />
-      <nuclide name="H1" wo="0.035887" />
-      <nuclide name="O16" wo="0.2847761" />
-      <nuclide name="B10" wo="0.000115699" />
-      <nuclide name="B11" wo="0.000527075" />
-      <nuclide name="Fe54" wo="0.02644016154" />
-      <nuclide name="Fe56" wo="0.43037146399" />
-      <nuclide name="Fe57" wo="0.0101152584" />
-      <nuclide name="Fe58" wo="0.00137211607" />
-      <nuclide name="Ni58" wo="0.04104621835" />
-      <nuclide name="Mn55" wo="0.0135739" />
-      <nuclide name="Cr52" wo="0.107931450781" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="1.746"/>
+      <nuclide name="H1" wo="0.035887"/>
+      <nuclide name="O16" wo="0.2847761"/>
+      <nuclide name="B10" wo="0.000115699"/>
+      <nuclide name="B11" wo="0.000527075"/>
+      <nuclide name="Fe54" wo="0.02644016154"/>
+      <nuclide name="Fe56" wo="0.43037146399"/>
+      <nuclide name="Fe57" wo="0.0101152584"/>
+      <nuclide name="Fe58" wo="0.00137211607"/>
+      <nuclide name="Ni58" wo="0.04104621835"/>
+      <nuclide name="Mn55" wo="0.0135739"/>
+      <nuclide name="Cr52" wo="0.107931450781"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="11" name="Top of fuel assemblies">
-      <density units="g/cm3" value="3.044" />
-      <nuclide name="H1" wo="0.0162913" />
-      <nuclide name="O16" wo="0.1292776" />
-      <nuclide name="B10" wo="5.25228e-05" />
-      <nuclide name="B11" wo="0.000239272" />
-      <nuclide name="Zr90" wo="0.43313403903" />
-      <nuclide name="Zr91" wo="0.09549277374" />
-      <nuclide name="Zr92" wo="0.14759527104" />
-      <nuclide name="Zr94" wo="0.15280552077" />
-      <nuclide name="Zr96" wo="0.02511169542" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="3.044"/>
+      <nuclide name="H1" wo="0.0162913"/>
+      <nuclide name="O16" wo="0.1292776"/>
+      <nuclide name="B10" wo="5.25228e-05"/>
+      <nuclide name="B11" wo="0.000239272"/>
+      <nuclide name="Zr90" wo="0.43313403903"/>
+      <nuclide name="Zr91" wo="0.09549277374"/>
+      <nuclide name="Zr92" wo="0.14759527104"/>
+      <nuclide name="Zr94" wo="0.15280552077"/>
+      <nuclide name="Zr96" wo="0.02511169542"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="12" name="Bottom of fuel assemblies">
-      <density units="g/cm3" value="1.762" />
-      <nuclide name="H1" wo="0.0292856" />
-      <nuclide name="O16" wo="0.2323919" />
-      <nuclide name="B10" wo="9.44159e-05" />
-      <nuclide name="B11" wo="0.00043012" />
-      <nuclide name="Zr90" wo="0.3741373658" />
-      <nuclide name="Zr91" wo="0.0824858164" />
-      <nuclide name="Zr92" wo="0.1274914944" />
-      <nuclide name="Zr94" wo="0.1319920622" />
-      <nuclide name="Zr96" wo="0.0216912612" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="1.762"/>
+      <nuclide name="H1" wo="0.0292856"/>
+      <nuclide name="O16" wo="0.2323919"/>
+      <nuclide name="B10" wo="9.44159e-05"/>
+      <nuclide name="B11" wo="0.00043012"/>
+      <nuclide name="Zr90" wo="0.3741373658"/>
+      <nuclide name="Zr91" wo="0.0824858164"/>
+      <nuclide name="Zr92" wo="0.1274914944"/>
+      <nuclide name="Zr94" wo="0.1319920622"/>
+      <nuclide name="Zr96" wo="0.0216912612"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell fill="200" id="1" region="-6 34 -35" universe="0" />
-    <cell fill="201" id="2" region="-6 35 -36" universe="0" />
-    <cell id="3" material="8" region="-7 31 -32" universe="0" />
-    <cell id="4" material="9" region="-5 32 -33" universe="0" />
-    <cell id="5" material="12" region="-5 33 -34" universe="0" />
-    <cell id="6" material="11" region="-5 36 -37" universe="0" />
-    <cell id="7" material="10" region="-5 37 -38" universe="0" />
-    <cell id="8" material="7" region="-7 38 -39" universe="0" />
-    <cell id="9" material="9" region="6 -7 32 -38" universe="0" />
-    <cell id="10" material="5" region="7 -8 31 -39" universe="0" />
-    <cell id="11" material="6" region="5 -6 32 -34" universe="0" />
-    <cell id="12" material="7" region="5 -6 36 -38" universe="0" />
-    <cell id="21" material="1" region="-1" universe="1" />
-    <cell id="22" material="2" region="1 -2" universe="1" />
-    <cell id="23" material="3" region="2" universe="1" />
-    <cell id="24" material="3" region="-3" universe="2" />
-    <cell id="25" material="2" region="3 -4" universe="2" />
-    <cell id="26" material="3" region="4" universe="2" />
-    <cell id="27" material="1" region="-1" universe="3" />
-    <cell id="28" material="2" region="1 -2" universe="3" />
-    <cell id="29" material="4" region="2" universe="3" />
-    <cell id="30" material="4" region="-3" universe="4" />
-    <cell id="31" material="2" region="3 -4" universe="4" />
-    <cell id="32" material="4" region="4" universe="4" />
-    <cell id="50" material="3" region="34 -35" universe="5" />
-    <cell fill="100" id="60" region="34 -35" universe="6" />
-    <cell id="70" material="4" region="35 -36" universe="7" />
-    <cell fill="101" id="80" region="35 -36" universe="8" />
+    <cell fill="200" id="1" region="-6 34 -35" universe="0"/>
+    <cell fill="201" id="2" region="-6 35 -36" universe="0"/>
+    <cell id="3" material="8" region="-7 31 -32" universe="0"/>
+    <cell id="4" material="9" region="-5 32 -33" universe="0"/>
+    <cell id="5" material="12" region="-5 33 -34" universe="0"/>
+    <cell id="6" material="11" region="-5 36 -37" universe="0"/>
+    <cell id="7" material="10" region="-5 37 -38" universe="0"/>
+    <cell id="8" material="7" region="-7 38 -39" universe="0"/>
+    <cell id="9" material="9" region="6 -7 32 -38" universe="0"/>
+    <cell id="10" material="5" region="7 -8 31 -39" universe="0"/>
+    <cell id="11" material="6" region="5 -6 32 -34" universe="0"/>
+    <cell id="12" material="7" region="5 -6 36 -38" universe="0"/>
+    <cell id="21" material="1" region="-1" universe="1"/>
+    <cell id="22" material="2" region="1 -2" universe="1"/>
+    <cell id="23" material="3" region="2" universe="1"/>
+    <cell id="24" material="3" region="-3" universe="2"/>
+    <cell id="25" material="2" region="3 -4" universe="2"/>
+    <cell id="26" material="3" region="4" universe="2"/>
+    <cell id="27" material="1" region="-1" universe="3"/>
+    <cell id="28" material="2" region="1 -2" universe="3"/>
+    <cell id="29" material="4" region="2" universe="3"/>
+    <cell id="30" material="4" region="-3" universe="4"/>
+    <cell id="31" material="2" region="3 -4" universe="4"/>
+    <cell id="32" material="4" region="4" universe="4"/>
+    <cell id="50" material="3" region="34 -35" universe="5"/>
+    <cell fill="100" id="60" region="34 -35" universe="6"/>
+    <cell id="70" material="4" region="35 -36" universe="7"/>
+    <cell fill="101" id="80" region="35 -36" universe="8"/>
     <lattice id="100" name="Fuel assembly (lower half)">
       <pitch>1.26 1.26</pitch>
       <dimension>17 17</dimension>
@@ -277,23 +277,23 @@
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder" />
-    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane" />
-    <surface coeffs="-199.0" id="32" type="z-plane" />
-    <surface coeffs="-193.0" id="33" type="z-plane" />
-    <surface coeffs="-183.0" id="34" type="z-plane" />
-    <surface coeffs="0.0" id="35" type="z-plane" />
-    <surface coeffs="183.0" id="36" type="z-plane" />
-    <surface coeffs="203.0" id="37" type="z-plane" />
-    <surface coeffs="215.0" id="38" type="z-plane" />
-    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane" />
+    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder"/>
+    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane"/>
+    <surface coeffs="-199.0" id="32" type="z-plane"/>
+    <surface coeffs="-193.0" id="33" type="z-plane"/>
+    <surface coeffs="-183.0" id="34" type="z-plane"/>
+    <surface coeffs="0.0" id="35" type="z-plane"/>
+    <surface coeffs="183.0" id="36" type="z-plane"/>
+    <surface coeffs="203.0" id="37" type="z-plane"/>
+    <surface coeffs="215.0" id="38" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/tally_aggregation/inputs_true.dat b/tests/regression_tests/tally_aggregation/inputs_true.dat
index bb2dcddc56..9f4f956552 100644
--- a/tests/regression_tests/tally_aggregation/inputs_true.dat
+++ b/tests/regression_tests/tally_aggregation/inputs_true.dat
@@ -2,23 +2,23 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UO2">
-      <density units="g/cm3" value="10.29769" />
-      <nuclide ao="4.4843e-06" name="U234" />
-      <nuclide ao="0.00055815" name="U235" />
-      <nuclide ao="0.022408" name="U238" />
-      <nuclide ao="0.045829" name="O16" />
+      <density units="g/cm3" value="10.29769"/>
+      <nuclide ao="4.4843e-06" name="U234"/>
+      <nuclide ao="0.00055815" name="U235"/>
+      <nuclide ao="0.022408" name="U238"/>
+      <nuclide ao="0.045829" name="O16"/>
     </material>
     <material id="2" name="light water">
-      <density units="g/cm3" value="1.0" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <cell id="2" material="2" region="1" universe="1" />
-    <cell fill="2" id="3" region="2 -3 4 -5" universe="3" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <cell id="2" material="2" region="1" universe="1"/>
+    <cell fill="2" id="3" region="2 -3 4 -5" universe="3"/>
     <lattice id="2">
       <pitch>1.2 1.2</pitch>
       <outer>1</outer>
@@ -28,11 +28,11 @@
 1 1 
 1 1 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.4" id="1" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-1.2" id="2" name="minimum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="1.2" id="3" name="maximum x" type="x-plane" />
-    <surface boundary="reflective" coeffs="-1.2" id="4" name="minimum y" type="y-plane" />
-    <surface boundary="reflective" coeffs="1.2" id="5" name="maximum y" type="y-plane" />
+    <surface coeffs="0.0 0.0 0.4" id="1" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-1.2" id="2" name="minimum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="1.2" id="3" name="maximum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-1.2" id="4" name="minimum y" type="y-plane"/>
+    <surface boundary="reflective" coeffs="1.2" id="5" name="maximum y" type="y-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/tally_arithmetic/inputs_true.dat b/tests/regression_tests/tally_arithmetic/inputs_true.dat
index 41760f3cf4..7669b4d036 100644
--- a/tests/regression_tests/tally_arithmetic/inputs_true.dat
+++ b/tests/regression_tests/tally_arithmetic/inputs_true.dat
@@ -2,23 +2,23 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cm3" value="10.0" />
-      <nuclide ao="1.0" name="U234" />
-      <nuclide ao="4.0" name="U235" />
-      <nuclide ao="95.0" name="U238" />
+      <density units="g/cm3" value="10.0"/>
+      <nuclide ao="1.0" name="U234"/>
+      <nuclide ao="4.0" name="U235"/>
+      <nuclide ao="95.0" name="U238"/>
     </material>
     <material id="2" name="light water">
-      <density units="g/cm3" value="1.0" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <cell id="2" material="2" region="1 -2" universe="1" />
-    <surface coeffs="0.0 0.0 5.0" id="1" type="z-cylinder" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 10.0" id="2" type="z-cylinder" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <cell id="2" material="2" region="1 -2" universe="1"/>
+    <surface coeffs="0.0 0.0 5.0" id="1" type="z-cylinder"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 10.0" id="2" type="z-cylinder"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/tally_slice_merge/inputs_true.dat b/tests/regression_tests/tally_slice_merge/inputs_true.dat
index 5b5731efba..5dff76a684 100644
--- a/tests/regression_tests/tally_slice_merge/inputs_true.dat
+++ b/tests/regression_tests/tally_slice_merge/inputs_true.dat
@@ -2,181 +2,181 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="UOX fuel">
-      <density units="g/cm3" value="10.062" />
-      <nuclide ao="4.9476e-06" name="U234" />
-      <nuclide ao="0.00048218" name="U235" />
-      <nuclide ao="0.021504" name="U238" />
-      <nuclide ao="1.0801e-08" name="Xe135" />
-      <nuclide ao="0.045737" name="O16" />
+      <density units="g/cm3" value="10.062"/>
+      <nuclide ao="4.9476e-06" name="U234"/>
+      <nuclide ao="0.00048218" name="U235"/>
+      <nuclide ao="0.021504" name="U238"/>
+      <nuclide ao="1.0801e-08" name="Xe135"/>
+      <nuclide ao="0.045737" name="O16"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cm3" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="Cold borated water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <nuclide ao="0.000649" name="B10" />
-      <nuclide ao="0.002689" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <nuclide ao="0.000649" name="B10"/>
+      <nuclide ao="0.002689" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="4" name="Hot borated water">
-      <density units="atom/b-cm" value="0.06614" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <nuclide ao="0.000649" name="B10" />
-      <nuclide ao="0.002689" name="B11" />
-      <sab name="c_H_in_H2O" />
+      <density units="atom/b-cm" value="0.06614"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <nuclide ao="0.000649" name="B10"/>
+      <nuclide ao="0.002689" name="B11"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="5" name="Reactor pressure vessel steel">
-      <density units="g/cm3" value="7.9" />
-      <nuclide name="Fe54" wo="0.05437098" />
-      <nuclide name="Fe56" wo="0.88500663" />
-      <nuclide name="Fe57" wo="0.0208008" />
-      <nuclide name="Fe58" wo="0.00282159" />
-      <nuclide name="Ni58" wo="0.0067198" />
-      <nuclide name="Ni60" wo="0.0026776" />
-      <nuclide name="Mn55" wo="0.01" />
-      <nuclide name="Cr52" wo="0.002092475" />
-      <nuclide name="C0" wo="0.0025" />
-      <nuclide name="Cu63" wo="0.0013696" />
+      <density units="g/cm3" value="7.9"/>
+      <nuclide name="Fe54" wo="0.05437098"/>
+      <nuclide name="Fe56" wo="0.88500663"/>
+      <nuclide name="Fe57" wo="0.0208008"/>
+      <nuclide name="Fe58" wo="0.00282159"/>
+      <nuclide name="Ni58" wo="0.0067198"/>
+      <nuclide name="Ni60" wo="0.0026776"/>
+      <nuclide name="Mn55" wo="0.01"/>
+      <nuclide name="Cr52" wo="0.002092475"/>
+      <nuclide name="C0" wo="0.0025"/>
+      <nuclide name="Cu63" wo="0.0013696"/>
     </material>
     <material id="6" name="Lower radial reflector">
-      <density units="g/cm3" value="4.32" />
-      <nuclide name="H1" wo="0.0095661" />
-      <nuclide name="O16" wo="0.0759107" />
-      <nuclide name="B10" wo="3.08409e-05" />
-      <nuclide name="B11" wo="0.000140499" />
-      <nuclide name="Fe54" wo="0.035620772088" />
-      <nuclide name="Fe56" wo="0.579805982228" />
-      <nuclide name="Fe57" wo="0.01362750048" />
-      <nuclide name="Fe58" wo="0.001848545204" />
-      <nuclide name="Ni58" wo="0.055298376566" />
-      <nuclide name="Mn55" wo="0.018287" />
-      <nuclide name="Cr52" wo="0.145407678031" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="4.32"/>
+      <nuclide name="H1" wo="0.0095661"/>
+      <nuclide name="O16" wo="0.0759107"/>
+      <nuclide name="B10" wo="3.08409e-05"/>
+      <nuclide name="B11" wo="0.000140499"/>
+      <nuclide name="Fe54" wo="0.035620772088"/>
+      <nuclide name="Fe56" wo="0.579805982228"/>
+      <nuclide name="Fe57" wo="0.01362750048"/>
+      <nuclide name="Fe58" wo="0.001848545204"/>
+      <nuclide name="Ni58" wo="0.055298376566"/>
+      <nuclide name="Mn55" wo="0.018287"/>
+      <nuclide name="Cr52" wo="0.145407678031"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="7" name="Upper radial reflector / Top plate region">
-      <density units="g/cm3" value="4.28" />
-      <nuclide name="H1" wo="0.0086117" />
-      <nuclide name="O16" wo="0.0683369" />
-      <nuclide name="B10" wo="2.77638e-05" />
-      <nuclide name="B11" wo="0.000126481" />
-      <nuclide name="Fe54" wo="0.035953677186" />
-      <nuclide name="Fe56" wo="0.585224740891" />
-      <nuclide name="Fe57" wo="0.01375486056" />
-      <nuclide name="Fe58" wo="0.001865821363" />
-      <nuclide name="Ni58" wo="0.055815129186" />
-      <nuclide name="Mn55" wo="0.0184579" />
-      <nuclide name="Cr52" wo="0.146766614995" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="4.28"/>
+      <nuclide name="H1" wo="0.0086117"/>
+      <nuclide name="O16" wo="0.0683369"/>
+      <nuclide name="B10" wo="2.77638e-05"/>
+      <nuclide name="B11" wo="0.000126481"/>
+      <nuclide name="Fe54" wo="0.035953677186"/>
+      <nuclide name="Fe56" wo="0.585224740891"/>
+      <nuclide name="Fe57" wo="0.01375486056"/>
+      <nuclide name="Fe58" wo="0.001865821363"/>
+      <nuclide name="Ni58" wo="0.055815129186"/>
+      <nuclide name="Mn55" wo="0.0184579"/>
+      <nuclide name="Cr52" wo="0.146766614995"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="8" name="Bottom plate region">
-      <density units="g/cm3" value="7.184" />
-      <nuclide name="H1" wo="0.0011505" />
-      <nuclide name="O16" wo="0.0091296" />
-      <nuclide name="B10" wo="3.70915e-06" />
-      <nuclide name="B11" wo="1.68974e-05" />
-      <nuclide name="Fe54" wo="0.03855611055" />
-      <nuclide name="Fe56" wo="0.627585036425" />
-      <nuclide name="Fe57" wo="0.014750478" />
-      <nuclide name="Fe58" wo="0.002000875025" />
-      <nuclide name="Ni58" wo="0.059855207342" />
-      <nuclide name="Mn55" wo="0.019794" />
-      <nuclide name="Cr52" wo="0.157390026871" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="7.184"/>
+      <nuclide name="H1" wo="0.0011505"/>
+      <nuclide name="O16" wo="0.0091296"/>
+      <nuclide name="B10" wo="3.70915e-06"/>
+      <nuclide name="B11" wo="1.68974e-05"/>
+      <nuclide name="Fe54" wo="0.03855611055"/>
+      <nuclide name="Fe56" wo="0.627585036425"/>
+      <nuclide name="Fe57" wo="0.014750478"/>
+      <nuclide name="Fe58" wo="0.002000875025"/>
+      <nuclide name="Ni58" wo="0.059855207342"/>
+      <nuclide name="Mn55" wo="0.019794"/>
+      <nuclide name="Cr52" wo="0.157390026871"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="9" name="Bottom nozzle region">
-      <density units="g/cm3" value="2.53" />
-      <nuclide name="H1" wo="0.0245014" />
-      <nuclide name="O16" wo="0.1944274" />
-      <nuclide name="B10" wo="7.89917e-05" />
-      <nuclide name="B11" wo="0.000359854" />
-      <nuclide name="Fe54" wo="0.030411411144" />
-      <nuclide name="Fe56" wo="0.495012237964" />
-      <nuclide name="Fe57" wo="0.01163454624" />
-      <nuclide name="Fe58" wo="0.001578204652" />
-      <nuclide name="Ni58" wo="0.047211231662" />
-      <nuclide name="Mn55" wo="0.0156126" />
-      <nuclide name="Cr52" wo="0.124142524198" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="2.53"/>
+      <nuclide name="H1" wo="0.0245014"/>
+      <nuclide name="O16" wo="0.1944274"/>
+      <nuclide name="B10" wo="7.89917e-05"/>
+      <nuclide name="B11" wo="0.000359854"/>
+      <nuclide name="Fe54" wo="0.030411411144"/>
+      <nuclide name="Fe56" wo="0.495012237964"/>
+      <nuclide name="Fe57" wo="0.01163454624"/>
+      <nuclide name="Fe58" wo="0.001578204652"/>
+      <nuclide name="Ni58" wo="0.047211231662"/>
+      <nuclide name="Mn55" wo="0.0156126"/>
+      <nuclide name="Cr52" wo="0.124142524198"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="10" name="Top nozzle region">
-      <density units="g/cm3" value="1.746" />
-      <nuclide name="H1" wo="0.035887" />
-      <nuclide name="O16" wo="0.2847761" />
-      <nuclide name="B10" wo="0.000115699" />
-      <nuclide name="B11" wo="0.000527075" />
-      <nuclide name="Fe54" wo="0.02644016154" />
-      <nuclide name="Fe56" wo="0.43037146399" />
-      <nuclide name="Fe57" wo="0.0101152584" />
-      <nuclide name="Fe58" wo="0.00137211607" />
-      <nuclide name="Ni58" wo="0.04104621835" />
-      <nuclide name="Mn55" wo="0.0135739" />
-      <nuclide name="Cr52" wo="0.107931450781" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="1.746"/>
+      <nuclide name="H1" wo="0.035887"/>
+      <nuclide name="O16" wo="0.2847761"/>
+      <nuclide name="B10" wo="0.000115699"/>
+      <nuclide name="B11" wo="0.000527075"/>
+      <nuclide name="Fe54" wo="0.02644016154"/>
+      <nuclide name="Fe56" wo="0.43037146399"/>
+      <nuclide name="Fe57" wo="0.0101152584"/>
+      <nuclide name="Fe58" wo="0.00137211607"/>
+      <nuclide name="Ni58" wo="0.04104621835"/>
+      <nuclide name="Mn55" wo="0.0135739"/>
+      <nuclide name="Cr52" wo="0.107931450781"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="11" name="Top of fuel assemblies">
-      <density units="g/cm3" value="3.044" />
-      <nuclide name="H1" wo="0.0162913" />
-      <nuclide name="O16" wo="0.1292776" />
-      <nuclide name="B10" wo="5.25228e-05" />
-      <nuclide name="B11" wo="0.000239272" />
-      <nuclide name="Zr90" wo="0.43313403903" />
-      <nuclide name="Zr91" wo="0.09549277374" />
-      <nuclide name="Zr92" wo="0.14759527104" />
-      <nuclide name="Zr94" wo="0.15280552077" />
-      <nuclide name="Zr96" wo="0.02511169542" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="3.044"/>
+      <nuclide name="H1" wo="0.0162913"/>
+      <nuclide name="O16" wo="0.1292776"/>
+      <nuclide name="B10" wo="5.25228e-05"/>
+      <nuclide name="B11" wo="0.000239272"/>
+      <nuclide name="Zr90" wo="0.43313403903"/>
+      <nuclide name="Zr91" wo="0.09549277374"/>
+      <nuclide name="Zr92" wo="0.14759527104"/>
+      <nuclide name="Zr94" wo="0.15280552077"/>
+      <nuclide name="Zr96" wo="0.02511169542"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material id="12" name="Bottom of fuel assemblies">
-      <density units="g/cm3" value="1.762" />
-      <nuclide name="H1" wo="0.0292856" />
-      <nuclide name="O16" wo="0.2323919" />
-      <nuclide name="B10" wo="9.44159e-05" />
-      <nuclide name="B11" wo="0.00043012" />
-      <nuclide name="Zr90" wo="0.3741373658" />
-      <nuclide name="Zr91" wo="0.0824858164" />
-      <nuclide name="Zr92" wo="0.1274914944" />
-      <nuclide name="Zr94" wo="0.1319920622" />
-      <nuclide name="Zr96" wo="0.0216912612" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cm3" value="1.762"/>
+      <nuclide name="H1" wo="0.0292856"/>
+      <nuclide name="O16" wo="0.2323919"/>
+      <nuclide name="B10" wo="9.44159e-05"/>
+      <nuclide name="B11" wo="0.00043012"/>
+      <nuclide name="Zr90" wo="0.3741373658"/>
+      <nuclide name="Zr91" wo="0.0824858164"/>
+      <nuclide name="Zr92" wo="0.1274914944"/>
+      <nuclide name="Zr94" wo="0.1319920622"/>
+      <nuclide name="Zr96" wo="0.0216912612"/>
+      <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell fill="200" id="1" region="-6 34 -35" universe="0" />
-    <cell fill="201" id="2" region="-6 35 -36" universe="0" />
-    <cell id="3" material="8" region="-7 31 -32" universe="0" />
-    <cell id="4" material="9" region="-5 32 -33" universe="0" />
-    <cell id="5" material="12" region="-5 33 -34" universe="0" />
-    <cell id="6" material="11" region="-5 36 -37" universe="0" />
-    <cell id="7" material="10" region="-5 37 -38" universe="0" />
-    <cell id="8" material="7" region="-7 38 -39" universe="0" />
-    <cell id="9" material="9" region="6 -7 32 -38" universe="0" />
-    <cell id="10" material="5" region="7 -8 31 -39" universe="0" />
-    <cell id="11" material="6" region="5 -6 32 -34" universe="0" />
-    <cell id="12" material="7" region="5 -6 36 -38" universe="0" />
-    <cell id="21" material="1" region="-1" universe="1" />
-    <cell id="22" material="2" region="1 -2" universe="1" />
-    <cell id="23" material="3" region="2" universe="1" />
-    <cell id="24" material="3" region="-3" universe="2" />
-    <cell id="25" material="2" region="3 -4" universe="2" />
-    <cell id="26" material="3" region="4" universe="2" />
-    <cell id="27" material="1" region="-1" universe="3" />
-    <cell id="28" material="2" region="1 -2" universe="3" />
-    <cell id="29" material="4" region="2" universe="3" />
-    <cell id="30" material="4" region="-3" universe="4" />
-    <cell id="31" material="2" region="3 -4" universe="4" />
-    <cell id="32" material="4" region="4" universe="4" />
-    <cell id="50" material="3" region="34 -35" universe="5" />
-    <cell fill="100" id="60" region="34 -35" universe="6" />
-    <cell id="70" material="4" region="35 -36" universe="7" />
-    <cell fill="101" id="80" region="35 -36" universe="8" />
+    <cell fill="200" id="1" region="-6 34 -35" universe="0"/>
+    <cell fill="201" id="2" region="-6 35 -36" universe="0"/>
+    <cell id="3" material="8" region="-7 31 -32" universe="0"/>
+    <cell id="4" material="9" region="-5 32 -33" universe="0"/>
+    <cell id="5" material="12" region="-5 33 -34" universe="0"/>
+    <cell id="6" material="11" region="-5 36 -37" universe="0"/>
+    <cell id="7" material="10" region="-5 37 -38" universe="0"/>
+    <cell id="8" material="7" region="-7 38 -39" universe="0"/>
+    <cell id="9" material="9" region="6 -7 32 -38" universe="0"/>
+    <cell id="10" material="5" region="7 -8 31 -39" universe="0"/>
+    <cell id="11" material="6" region="5 -6 32 -34" universe="0"/>
+    <cell id="12" material="7" region="5 -6 36 -38" universe="0"/>
+    <cell id="21" material="1" region="-1" universe="1"/>
+    <cell id="22" material="2" region="1 -2" universe="1"/>
+    <cell id="23" material="3" region="2" universe="1"/>
+    <cell id="24" material="3" region="-3" universe="2"/>
+    <cell id="25" material="2" region="3 -4" universe="2"/>
+    <cell id="26" material="3" region="4" universe="2"/>
+    <cell id="27" material="1" region="-1" universe="3"/>
+    <cell id="28" material="2" region="1 -2" universe="3"/>
+    <cell id="29" material="4" region="2" universe="3"/>
+    <cell id="30" material="4" region="-3" universe="4"/>
+    <cell id="31" material="2" region="3 -4" universe="4"/>
+    <cell id="32" material="4" region="4" universe="4"/>
+    <cell id="50" material="3" region="34 -35" universe="5"/>
+    <cell fill="100" id="60" region="34 -35" universe="6"/>
+    <cell id="70" material="4" region="35 -36" universe="7"/>
+    <cell fill="101" id="80" region="35 -36" universe="8"/>
     <lattice id="100" name="Fuel assembly (lower half)">
       <pitch>1.26 1.26</pitch>
       <dimension>17 17</dimension>
@@ -277,23 +277,23 @@
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder" />
-    <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder" />
-    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane" />
-    <surface coeffs="-199.0" id="32" type="z-plane" />
-    <surface coeffs="-193.0" id="33" type="z-plane" />
-    <surface coeffs="-183.0" id="34" type="z-plane" />
-    <surface coeffs="0.0" id="35" type="z-plane" />
-    <surface coeffs="183.0" id="36" type="z-plane" />
-    <surface coeffs="203.0" id="37" type="z-plane" />
-    <surface coeffs="215.0" id="38" type="z-plane" />
-    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane" />
+    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder"/>
+    <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder"/>
+    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane"/>
+    <surface coeffs="-199.0" id="32" type="z-plane"/>
+    <surface coeffs="-193.0" id="33" type="z-plane"/>
+    <surface coeffs="-183.0" id="34" type="z-plane"/>
+    <surface coeffs="0.0" id="35" type="z-plane"/>
+    <surface coeffs="183.0" id="36" type="z-plane"/>
+    <surface coeffs="203.0" id="37" type="z-plane"/>
+    <surface coeffs="215.0" id="38" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/torus/inputs_true.dat b/tests/regression_tests/torus/inputs_true.dat
index c4aa2072a8..a5c7a8d7ae 100644
--- a/tests/regression_tests/torus/inputs_true.dat
+++ b/tests/regression_tests/torus/inputs_true.dat
@@ -2,28 +2,28 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cm3" value="12.0" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cm3" value="12.0"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0" />
-      <nuclide ao="1.0" name="H1" />
+      <density units="g/cm3" value="1.0"/>
+      <nuclide ao="1.0" name="H1"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-2" universe="1" />
-    <cell id="2" material="1" region="-3" universe="1" />
-    <cell id="3" material="1" region="-1" universe="1" />
-    <cell id="4" material="2" region="-5 4 -7 6 -9 8 2 3 1" universe="1" />
-    <surface coeffs="0.0 0.0 0.0 3 1.5 1" id="1" type="z-torus" />
-    <surface coeffs="6 0.0 0.0 3 1.5 1" id="2" type="x-torus" />
-    <surface coeffs="6 0.0 0.0 6 1 0.75" id="3" type="y-torus" />
-    <surface boundary="vacuum" coeffs="-5" id="4" type="x-plane" />
-    <surface boundary="vacuum" coeffs="14" id="5" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-5" id="6" type="y-plane" />
-    <surface boundary="vacuum" coeffs="5" id="7" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-8" id="8" type="z-plane" />
-    <surface boundary="vacuum" coeffs="8" id="9" type="z-plane" />
+    <cell id="1" material="1" region="-2" universe="1"/>
+    <cell id="2" material="1" region="-3" universe="1"/>
+    <cell id="3" material="1" region="-1" universe="1"/>
+    <cell id="4" material="2" region="-5 4 -7 6 -9 8 2 3 1" universe="1"/>
+    <surface coeffs="0.0 0.0 0.0 3 1.5 1" id="1" type="z-torus"/>
+    <surface coeffs="6 0.0 0.0 3 1.5 1" id="2" type="x-torus"/>
+    <surface coeffs="6 0.0 0.0 6 1 0.75" id="3" type="y-torus"/>
+    <surface boundary="vacuum" coeffs="-5" id="4" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="14" id="5" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-5" id="6" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="5" id="7" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-8" id="8" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="8" id="9" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/torus/large_major/inputs_true.dat b/tests/regression_tests/torus/large_major/inputs_true.dat
index 8e3c9a9e31..44a67b8aa0 100644
--- a/tests/regression_tests/torus/large_major/inputs_true.dat
+++ b/tests/regression_tests/torus/large_major/inputs_true.dat
@@ -2,21 +2,21 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cm3" value="1.0" />
-      <nuclide ao="1.0" name="W184" />
+      <density units="g/cm3" value="1.0"/>
+      <nuclide ao="1.0" name="W184"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="5.0" />
-      <nuclide ao="1.0" name="Fe56" />
+      <density units="g/cm3" value="5.0"/>
+      <nuclide ao="1.0" name="Fe56"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="void" region="-1" universe="1" />
-    <cell id="2" material="1" region="1 -2" universe="1" />
-    <cell id="3" material="2" region="2 -3" universe="1" />
-    <surface coeffs="0.0 0.0 0.0 1000.0 30.0 30.0" id="1" type="z-torus" />
-    <surface coeffs="0.0 0.0 0.0 1000.0 35.0 35.0" id="2" type="z-torus" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 1000.0 40.0 40.0" id="3" type="z-torus" />
+    <cell id="1" material="void" region="-1" universe="1"/>
+    <cell id="2" material="1" region="1 -2" universe="1"/>
+    <cell id="3" material="2" region="2 -3" universe="1"/>
+    <surface coeffs="0.0 0.0 0.0 1000.0 30.0 30.0" id="1" type="z-torus"/>
+    <surface coeffs="0.0 0.0 0.0 1000.0 35.0 35.0" id="2" type="z-torus"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 1000.0 40.0 40.0" id="3" type="z-torus"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
diff --git a/tests/regression_tests/trigger_statepoint_restart/inputs_true.dat b/tests/regression_tests/trigger_statepoint_restart/inputs_true.dat
index d30f24fc0a..6f0b629eb6 100644
--- a/tests/regression_tests/trigger_statepoint_restart/inputs_true.dat
+++ b/tests/regression_tests/trigger_statepoint_restart/inputs_true.dat
@@ -2,13 +2,13 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cm3" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cm3" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/triso/inputs_true.dat b/tests/regression_tests/triso/inputs_true.dat
index c434838849..606f05f14d 100644
--- a/tests/regression_tests/triso/inputs_true.dat
+++ b/tests/regression_tests/triso/inputs_true.dat
@@ -2,239 +2,239 @@
 <model>
   <materials>
     <material depletable="true" id="1">
-      <density units="g/cm3" value="10.5" />
-      <nuclide ao="0.14154" name="U235" />
-      <nuclide ao="0.85846" name="U238" />
-      <nuclide ao="0.5" name="C0" />
-      <nuclide ao="1.5" name="O16" />
+      <density units="g/cm3" value="10.5"/>
+      <nuclide ao="0.14154" name="U235"/>
+      <nuclide ao="0.85846" name="U238"/>
+      <nuclide ao="0.5" name="C0"/>
+      <nuclide ao="1.5" name="O16"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0" />
-      <nuclide ao="1.0" name="C0" />
-      <sab name="c_Graphite" />
+      <density units="g/cm3" value="1.0"/>
+      <nuclide ao="1.0" name="C0"/>
+      <sab name="c_Graphite"/>
     </material>
     <material id="3">
-      <density units="g/cm3" value="1.9" />
-      <nuclide ao="1.0" name="C0" />
-      <sab name="c_Graphite" />
+      <density units="g/cm3" value="1.9"/>
+      <nuclide ao="1.0" name="C0"/>
+      <sab name="c_Graphite"/>
     </material>
     <material id="4">
-      <density units="g/cm3" value="3.2" />
-      <nuclide ao="1.0" name="C0" />
-      <nuclide ao="0.9222968" name="Si28" />
-      <nuclide ao="0.0468316" name="Si29" />
-      <nuclide ao="0.0308716" name="Si30" />
+      <density units="g/cm3" value="3.2"/>
+      <nuclide ao="1.0" name="C0"/>
+      <nuclide ao="0.9222968" name="Si28"/>
+      <nuclide ao="0.0468316" name="Si29"/>
+      <nuclide ao="0.0308716" name="Si30"/>
     </material>
     <material id="5">
-      <density units="g/cm3" value="1.87" />
-      <nuclide ao="1.0" name="C0" />
-      <sab name="c_Graphite" />
+      <density units="g/cm3" value="1.87"/>
+      <nuclide ao="1.0" name="C0"/>
+      <sab name="c_Graphite"/>
     </material>
     <material id="6">
-      <density units="g/cm3" value="1.1995" />
-      <nuclide ao="1.0" name="C0" />
-      <sab name="c_Graphite" />
+      <density units="g/cm3" value="1.1995"/>
+      <nuclide ao="1.0" name="C0"/>
+      <sab name="c_Graphite"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <cell id="2" material="2" region="1 -2" universe="1" />
-    <cell id="3" material="3" region="2 -3" universe="1" />
-    <cell id="4" material="4" region="3 -4" universe="1" />
-    <cell id="5" material="5" region="4" universe="1" />
-    <cell fill="2" id="6" region="5 -6 7 -8 9 -10" universe="0" />
-    <cell fill="1" id="107" region="-111" translation="-0.0014062011817633224 -0.015257747167296776 -0.09184766966024316" universe="27" />
-    <cell fill="1" id="108" region="-112" translation="0.10909902639777394 -0.004179177767328068 -0.046240930185910245" universe="15" />
-    <cell fill="1" id="109" region="-113" translation="0.13878336652768952 -0.06900710536877097 -0.03848821497485455" universe="10" />
-    <cell fill="1" id="110" region="-114" translation="-0.19454996680564374 -0.06900710536877097 -0.03848821497485455" universe="11" />
-    <cell fill="1" id="111" region="-115" translation="-0.09846455191076986 -0.02594038069469251 -0.06155174933292362" universe="18" />
-    <cell fill="1" id="112" region="-116" translation="-0.09321591784308736 -0.12248857482372477 -0.04999802384282931" universe="14" />
-    <cell fill="1" id="113" region="-117" translation="0.2028198996079864 0.08501514690643278 0.07431198844628262" universe="22" />
-    <cell fill="1" id="114" region="-118" translation="-0.13051343372534685 0.08501514690643278 0.07431198844628262" universe="23" />
-    <cell fill="1" id="115" region="-119" translation="0.03417350410997999 -0.09641153719944834 -0.10112098092715327" universe="5" />
-    <cell fill="1" id="116" region="-120" translation="0.037913118842446136 0.06870772519039314 -0.10875752039644154" universe="19" />
-    <cell fill="1" id="117" region="-121" translation="0.07388008140640989 -0.07130227505402231 -0.09782982564187503" universe="6" />
-    <cell fill="1" id="118" region="-122" translation="0.08897214754414112 0.08694165211410448 0.07587737301598729" universe="3" />
-    <cell fill="1" id="119" region="-123" translation="-0.03698302711710488 0.1408784014909229 -0.10474284149572705" universe="4" />
-    <cell fill="1" id="120" region="-124" translation="-0.03698302711710488 -0.19245493184241047 -0.10474284149572705" universe="7" />
-    <cell fill="1" id="121" region="-125" translation="-0.02428069661424781 0.05168393238830282 0.1302704892646539" universe="17" />
-    <cell fill="1" id="122" region="-126" translation="-0.02428069661424781 0.05168393238830282 -0.20306284406867936" universe="26" />
-    <cell fill="1" id="123" region="-127" translation="0.04578051975994746 0.1175901605138544 -0.0038022862212453434" universe="27" />
-    <cell fill="1" id="124" region="-128" translation="-0.013741908464450836 0.18016577553053154 0.20276897514248216" universe="12" />
-    <cell fill="1" id="125" region="-129" translation="-0.013741908464450836 -0.15316755780280183 0.20276897514248216" universe="15" />
-    <cell fill="1" id="126" region="-130" translation="-0.013741908464450836 0.18016577553053154 -0.1305643581908511" universe="21" />
-    <cell fill="1" id="127" region="-131" translation="-0.013741908464450836 -0.15316755780280183 -0.1305643581908511" universe="24" />
-    <cell fill="1" id="128" region="-132" translation="0.19334606515602848 0.066228023881572 -0.07131104153532436" universe="19" />
-    <cell fill="1" id="129" region="-133" translation="-0.13998726817730478 0.066228023881572 -0.07131104153532436" universe="20" />
-    <cell fill="1" id="130" region="-134" translation="-0.031185656140686913 0.155914746052082 0.15331720509241947" universe="8" />
-    <cell fill="1" id="131" region="-135" translation="-0.031185656140686913 -0.17741858728125126 0.15331720509241947" universe="11" />
-    <cell fill="1" id="132" region="-136" translation="-0.031185656140686913 0.155914746052082 -0.1800161282409139" universe="17" />
-    <cell fill="1" id="133" region="-137" translation="-0.031185656140686913 -0.17741858728125126 -0.1800161282409139" universe="20" />
-    <cell fill="1" id="134" region="-138" translation="0.08018004492442865 0.016826191928232426 -0.016389596762212966" universe="28" />
-    <cell fill="1" id="135" region="-139" translation="0.00483733774062417 0.08148156718302602 -0.09280826916311341" universe="7" />
-    <cell fill="1" id="136" region="-140" translation="0.0978117791120118 -0.06105974469736897 -0.07844553364014112" universe="18" />
-    <cell fill="1" id="137" region="-141" translation="0.0339716094789545 0.044675266050854034 0.18588381767108564" universe="15" />
-    <cell fill="1" id="138" region="-142" translation="0.0339716094789545 0.044675266050854034 -0.14744951566224762" universe="24" />
-    <cell fill="1" id="139" region="-143" translation="0.15974177782488064 -0.11470938473074832 -0.055880627694202434" universe="16" />
-    <cell fill="1" id="140" region="-144" translation="-0.17359155550845262 -0.11470938473074832 -0.055880627694202434" universe="17" />
-    <cell fill="1" id="141" region="-145" translation="0.007714449992858363 -0.07841911930069978 0.019169121324834393" universe="19" />
-    <cell fill="1" id="142" region="-146" translation="-0.09772496056025104 -0.009435582016802613 -0.0973407871549632" universe="7" />
-    <cell fill="1" id="143" region="-147" translation="-0.08460405234526575 0.18619630211681182 0.10902502186367324" universe="24" />
-    <cell fill="1" id="144" region="-148" translation="-0.08460405234526575 -0.14713703121652144 0.10902502186367324" universe="27" />
-    <cell fill="1" id="145" region="-149" translation="0.08530970516294267 -0.09740948712101977 0.031538023054709596" universe="7" />
-    <cell fill="1" id="146" region="-150" translation="0.002049400245853761 0.10800782833319489 -0.08566939881823532" universe="28" />
-    <cell fill="1" id="147" region="-151" translation="0.036269774055772475 -0.0034880407315701634 0.08814057857502322" universe="10" />
-    <cell fill="1" id="148" region="-152" translation="0.012607957648281654 0.08090056062626749 0.0712211465420014" universe="19" />
-    <cell fill="1" id="149" region="-153" translation="-0.03741489943578313 0.1221086949309545 0.0439406213163509" universe="13" />
-    <cell fill="1" id="150" region="-154" translation="0.0851566223435044 -0.1191899586548319 -0.07364696787394387" universe="23" />
-    <cell fill="1" id="151" region="-155" translation="-0.03992848096555457 0.020214072912877246 -0.11315245980004196" universe="29" />
-    <cell fill="1" id="152" region="-156" translation="-0.050315754084578224 0.017099968565308377 0.056173125204605934" universe="17" />
-    <cell fill="1" id="153" region="-157" translation="-0.06766398274549851 -0.07303578778642877 0.005410963730880458" universe="22" />
-    <cell fill="1" id="154" region="-158" translation="0.06408439016382617 0.05853632250550789 0.00432158793112436" universe="13" />
-    <cell fill="1" id="155" region="-159" translation="-0.013801059755509382 0.20222454587424032 0.19241766819445416" universe="4" />
-    <cell fill="1" id="156" region="-160" translation="-0.013801059755509382 -0.13110878745909305 0.19241766819445416" universe="7" />
-    <cell fill="1" id="157" region="-161" translation="-0.013801059755509382 0.20222454587424032 -0.1409156651388792" universe="13" />
-    <cell fill="1" id="158" region="-162" translation="-0.013801059755509382 -0.13110878745909305 -0.1409156651388792" universe="16" />
-    <cell fill="1" id="159" region="-163" translation="0.03522733749799645 0.11305459403611595 0.10295023150858529" universe="16" />
-    <cell fill="1" id="160" region="-164" translation="-0.03831660450870228 -0.09880556873790897 0.08578673946744877" universe="4" />
-    <cell fill="1" id="161" region="-165" translation="0.03782024089160585 0.07732392719766301 -0.002829721222114334" universe="24" />
-    <cell fill="1" id="162" region="-166" translation="-0.060112483234699754 -0.06134051474053648 -0.04363492058502072" universe="29" />
-    <cell fill="1" id="163" region="-167" translation="0.10930502703326198 -0.020465939386398402 0.15848543253913627" universe="18" />
-    <cell fill="1" id="164" region="-168" translation="0.10930502703326198 -0.020465939386398402 -0.174847900794197" universe="27" />
-    <cell fill="1" id="165" region="-169" translation="-0.04821581350719811 -0.10913639479587178 -0.11108700962300094" universe="3" />
-    <cell fill="1" id="166" region="-170" translation="-0.09934364058994583 0.10405480441904197 -0.0241798283786806" universe="5" />
-    <cell fill="1" id="167" region="-171" translation="0.11425630804159204 0.19090246541367445 -0.06077533762167586" universe="4" />
-    <cell fill="1" id="168" region="-172" translation="0.11425630804159204 -0.14243086791965892 -0.06077533762167586" universe="7" />
-    <cell fill="1" id="169" region="-173" translation="0.0217205011905508 0.02506675532845576 0.029520031599966412" universe="6" />
-    <cell fill="1" id="170" region="-174" translation="0.12543650024083502 0.19371057833811733 -0.04147065769319469" universe="15" />
-    <cell fill="1" id="171" region="-175" translation="-0.20789683309249835 0.19371057833811733 -0.04147065769319469" universe="16" />
-    <cell fill="1" id="172" region="-176" translation="0.12543650024083502 -0.13962275499521593 -0.04147065769319469" universe="18" />
-    <cell fill="1" id="173" region="-177" translation="-0.20789683309249835 -0.13962275499521593 -0.04147065769319469" universe="19" />
-    <cell fill="1" id="174" region="-178" translation="-0.10385697059087434 -0.07239894918409101 0.047733316833160344" universe="7" />
-    <cell fill="1" id="175" region="-179" translation="-0.02484533723289073 0.03270050374260325 0.009261180540203251" universe="18" />
-    <cell fill="1" id="176" region="-180" translation="-0.10535768832641407 -0.10806169784882003 0.009669056668934639" universe="3" />
-    <cell fill="1" id="177" region="-181" translation="0.20034387531341857 0.02227169438582799 0.18731645229850835" universe="13" />
-    <cell fill="1" id="178" region="-182" translation="-0.13298945801991469 0.02227169438582799 0.18731645229850835" universe="14" />
-    <cell fill="1" id="179" region="-183" translation="0.20034387531341857 0.02227169438582799 -0.1460168810348249" universe="22" />
-    <cell fill="1" id="180" region="-184" translation="-0.13298945801991469 0.02227169438582799 -0.1460168810348249" universe="23" />
-    <cell fill="1" id="181" region="-185" translation="0.1631199405760454 0.04092483075648701 0.07754240264809376" universe="7" />
-    <cell fill="1" id="182" region="-186" translation="-0.17021339275728786 0.04092483075648701 0.07754240264809376" universe="8" />
-    <cell fill="1" id="183" region="-187" translation="0.102073447728939 -0.060687493103351975 0.01519685776716928" universe="20" />
-    <cell fill="1" id="184" region="-188" translation="0.07991907014916044 0.13595762576986914 -0.09622087197472673" universe="15" />
-    <cell fill="1" id="185" region="-189" translation="0.07991907014916044 -0.19737570756346412 -0.09622087197472673" universe="18" />
-    <cell fill="1" id="186" region="-190" translation="0.06943697893246592 0.16968387178879557 0.11988276699391809" universe="13" />
-    <cell fill="1" id="187" region="-191" translation="0.06943697893246592 -0.1636494615445378 0.11988276699391809" universe="16" />
-    <cell fill="1" id="188" region="-192" translation="-0.07059889277962383 0.1489570802132021 0.09503214710980579" universe="21" />
-    <cell fill="1" id="189" region="-193" translation="-0.07059889277962383 -0.18437625312013128 0.09503214710980579" universe="24" />
-    <cell fill="1" id="190" region="-194" translation="0.010468267263955 0.15608028424842002 -0.00511339431390323" universe="23" />
-    <cell fill="1" id="191" region="-195" translation="0.010468267263955 -0.17725304908491335 -0.00511339431390323" universe="26" />
-    <cell fill="1" id="192" region="-196" translation="0.15972123417512762 0.06883522628651784 -0.11009587369358387" universe="27" />
-    <cell fill="1" id="193" region="-197" translation="-0.17361209915820575 0.06883522628651784 -0.11009587369358387" universe="28" />
-    <cell fill="1" id="194" region="-198" translation="0.08981179676970563 0.06434186205946246 0.032607233968534766" universe="8" />
-    <cell fill="1" id="195" region="-199" translation="0.0033702311569031584 0.10040789537086448 0.1867831868031803" universe="20" />
-    <cell fill="1" id="196" region="-200" translation="0.0033702311569031584 0.10040789537086448 -0.14655014653015297" universe="29" />
-    <cell fill="1" id="197" region="-201" translation="0.05329895281727448 -0.02881629065525937 0.15193411713913396" universe="12" />
-    <cell fill="1" id="198" region="-202" translation="0.05329895281727448 -0.02881629065525937 -0.1813992161941993" universe="21" />
-    <cell fill="1" id="199" region="-203" translation="0.14663786554095865 -0.0001831711922081758 0.173437280372308" universe="6" />
-    <cell fill="1" id="200" region="-204" translation="-0.18669546779237473 -0.0001831711922081758 0.173437280372308" universe="7" />
-    <cell fill="1" id="201" region="-205" translation="0.14663786554095865 -0.0001831711922081758 -0.15989605296102538" universe="15" />
-    <cell fill="1" id="202" region="-206" translation="-0.18669546779237473 -0.0001831711922081758 -0.15989605296102538" universe="16" />
-    <cell fill="1" id="203" region="-207" translation="0.006886156712931468 0.0325721225173089 -0.10785254014381473" universe="11" />
-    <cell fill="1" id="204" region="-208" translation="0.05946426530734861 0.17562994884896627 0.11256068342977466" universe="21" />
-    <cell fill="1" id="205" region="-209" translation="0.05946426530734861 -0.1577033844843671 0.11256068342977466" universe="24" />
-    <cell fill="1" id="206" region="-210" translation="-0.0745211393530899 0.18602539894086317 0.07061211191996841" universe="5" />
-    <cell fill="1" id="207" region="-211" translation="-0.0745211393530899 -0.1473079343924702 0.07061211191996841" universe="8" />
-    <cell fill="1" id="208" region="-212" translation="0.15971361633210523 -0.02416800360737892 0.062334297185282495" universe="28" />
-    <cell fill="1" id="209" region="-213" translation="-0.17361971700122802 -0.02416800360737892 0.062334297185282495" universe="29" />
-    <cell fill="1" id="210" region="-214" translation="-0.014191419448261688 0.11114945107218455 0.0903966514577691" universe="10" />
-    <cell fill="1" id="211" region="-215" translation="0.20641337800388493 -0.04689191572037532 0.03093832014609521" universe="4" />
-    <cell fill="1" id="212" region="-216" translation="-0.12691995532944833 -0.04689191572037532 0.03093832014609521" universe="5" />
-    <cell fill="1" id="213" region="-217" translation="0.042925982468302815 0.0705557158479822 -0.09611246805643225" universe="23" />
-    <cell fill="1" id="214" region="-218" translation="0.09174118398607445 -0.02102680816462299 -0.12074712654412828" universe="19" />
-    <cell fill="1" id="215" region="-219" translation="0.1871144659776534 0.14219092895822716 0.0030395151604761805" universe="21" />
-    <cell fill="1" id="216" region="-220" translation="-0.14621886735567996 0.14219092895822716 0.0030395151604761805" universe="22" />
-    <cell fill="1" id="217" region="-221" translation="0.1871144659776534 -0.1911424043751062 0.0030395151604761805" universe="24" />
-    <cell fill="1" id="218" region="-222" translation="-0.14621886735567996 -0.1911424043751062 0.0030395151604761805" universe="25" />
-    <cell fill="1" id="219" region="-223" translation="-0.08858601205119498 -0.05740809172565153 0.0018937978357634888" universe="21" />
-    <cell fill="1" id="220" region="-224" translation="-0.06956272452538859 -0.03258611645335985 0.1876749617320655" universe="11" />
-    <cell fill="1" id="221" region="-225" translation="-0.06956272452538859 -0.03258611645335985 -0.14565837160126788" universe="20" />
-    <cell fill="1" id="222" region="-226" translation="0.06480048668590577 0.08039356693483157 -0.0495807099830502" universe="4" />
-    <cell fill="1" id="223" region="-227" translation="0.11976882848311299 0.024414887718198774 0.059001075831400684" universe="18" />
-    <cell fill="1" id="224" region="-228" translation="0.055815690196973966 -0.03866224334773988 0.12934415570493119" universe="8" />
-    <cell fill="1" id="225" region="-229" translation="0.055815690196973966 -0.03866224334773988 -0.20398917762840219" universe="17" />
-    <cell fill="1" id="226" region="-230" translation="-0.07057140884385227 -0.033261585924167725 -0.11308117958912334" universe="11" />
-    <cell fill="1" id="227" region="-231" translation="0.0191891610992464 -0.08777511864372084 0.09496767886953814" universe="5" />
-    <cell fill="1" id="228" region="-232" translation="0.11357577214048964 -0.07231206070759028 -0.01862315233444045" universe="8" />
-    <cell fill="1" id="229" region="-233" translation="0.028822870329182626 0.09660360434040871 -0.10994545899370212" universe="21" />
-    <cell fill="1" id="230" region="-234" translation="-0.030272006016200004 0.04272149160139638 -0.11143715881676097" universe="18" />
-    <cell fill="1" id="231" region="-235" translation="0.09719339210824351 0.04131007428864286 0.14476192535372884" universe="11" />
-    <cell fill="1" id="232" region="-236" translation="0.09719339210824351 0.04131007428864286 -0.18857140797960453" universe="20" />
-    <cell fill="1" id="233" region="-237" translation="0.1075803128789849 -0.02104725713738881 -0.03274843538002781" universe="6" />
-    <cell fill="1" id="234" region="-238" translation="0.1392019576325615 -0.08814436128642017 -0.11479828495132216" universe="4" />
-    <cell fill="1" id="235" region="-239" translation="-0.19413137570077177 -0.08814436128642017 -0.11479828495132216" universe="5" />
-    <cell fill="1" id="236" region="-240" translation="0.10847197677361597 0.1461592302081176 0.08841042383901798" universe="14" />
-    <cell fill="1" id="237" region="-241" translation="0.10847197677361597 -0.18717410312521576 0.08841042383901798" universe="17" />
-    <cell fill="1" id="238" region="-242" translation="0.045127058382085194 0.0967807216119615 0.0967653665331849" universe="29" />
-    <cell fill="1" id="239" region="-243" translation="-0.022464471745497094 0.07259277205138148 0.10785219865057927" universe="12" />
-    <cell fill="1" id="240" region="-244" translation="0.10606353369903221 0.03928703229725711 0.17228776926768086" universe="17" />
-    <cell fill="1" id="241" region="-245" translation="0.10606353369903221 0.03928703229725711 -0.1610455640656524" universe="26" />
-    <cell fill="1" id="242" region="-246" translation="0.14815941963538226 0.11277655887534538 0.03808687169681996" universe="13" />
-    <cell fill="1" id="243" region="-247" translation="-0.185173913697951 0.11277655887534538 0.03808687169681996" universe="14" />
-    <cell fill="1" id="244" region="-248" translation="0.15693581669068946 0.10114531834923532 -0.04992356195780889" universe="3" />
-    <cell fill="1" id="245" region="-249" translation="-0.17639751664264391 0.10114531834923532 -0.04992356195780889" universe="4" />
-    <cell fill="1" id="246" region="-250" translation="0.13264357875679378 0.10919805128102966 -0.04769549879176793" universe="18" />
-    <cell fill="1" id="247" region="-251" translation="-0.2006897545765396 0.10919805128102966 -0.04769549879176793" universe="19" />
-    <cell fill="1" id="248" region="-252" translation="0.13916564434634993 0.13134319648704007 0.07015912178562622" universe="25" />
-    <cell fill="1" id="249" region="-253" translation="-0.19416768898698333 0.13134319648704007 0.07015912178562622" universe="26" />
-    <cell fill="1" id="250" region="-254" translation="0.13916564434634993 -0.2019901368462932 0.07015912178562622" universe="28" />
-    <cell fill="1" id="251" region="-255" translation="-0.19416768898698333 -0.2019901368462932 0.07015912178562622" universe="29" />
-    <cell fill="1" id="252" region="-256" translation="-0.10026688643231585 0.1564443552698941 0.1751728484794038" universe="4" />
-    <cell fill="1" id="253" region="-257" translation="-0.10026688643231585 -0.17688897806343928 0.1751728484794038" universe="7" />
-    <cell fill="1" id="254" region="-258" translation="-0.10026688643231585 0.1564443552698941 -0.15816048485392958" universe="13" />
-    <cell fill="1" id="255" region="-259" translation="-0.10026688643231585 -0.17688897806343928 -0.15816048485392958" universe="16" />
-    <cell fill="1" id="256" region="-260" translation="0.16555436030710213 -0.015531455219433332 0.02691614144169241" universe="27" />
-    <cell fill="1" id="257" region="-261" translation="-0.16777897302623124 -0.015531455219433332 0.02691614144169241" universe="28" />
-    <cell fill="1" id="258" region="-262" translation="0.152805274648522 0.18166556620660584 0.040488366683789634" universe="12" />
-    <cell fill="1" id="259" region="-263" translation="-0.18052805868481137 0.18166556620660584 0.040488366683789634" universe="13" />
-    <cell fill="1" id="260" region="-264" translation="0.152805274648522 -0.15166776712672753 0.040488366683789634" universe="15" />
-    <cell fill="1" id="261" region="-265" translation="-0.18052805868481137 -0.15166776712672753 0.040488366683789634" universe="16" />
-    <cell fill="1" id="262" region="-266" translation="0.07231116694829032 0.08785370537091952 0.09997055589943346" universe="7" />
-    <cell fill="1" id="263" region="-267" translation="-0.10576424362412257 0.09874497232579027 -0.05820080940738992" universe="3" />
-    <cell fill="1" id="264" region="-268" translation="0.046877953125145755 -0.059492732184222796 -0.055635341857650844" universe="4" />
-    <cell fill="1" id="265" region="-269" translation="0.1239423066569788 0.14183046274229005 -0.06583818749209458" universe="22" />
-    <cell fill="1" id="266" region="-270" translation="0.1239423066569788 -0.19150287059104332 -0.06583818749209458" universe="25" />
-    <cell fill="1" id="267" region="-271" translation="0.0013087859341976982 -0.06327594480884835 -0.05382522074205143" universe="10" />
-    <cell fill="1" id="268" region="-272" translation="0.11058883669906516 -0.038954175820645864 0.16834558789033005" universe="11" />
-    <cell fill="1" id="269" region="-273" translation="0.11058883669906516 -0.038954175820645864 -0.16498774544300332" universe="20" />
-    <cell fill="1" id="270" region="-274" translation="-0.02657010065724863 0.013144978841080679 0.050587944514051575" universe="24" />
-    <cell id="271" material="6" region="122 169 180 248 267" universe="3" />
-    <cell id="272" material="6" region="123 159 164 171 215 226 238 249 256 268" universe="4" />
-    <cell id="273" material="6" region="119 170 210 216 231 239" universe="5" />
-    <cell id="274" material="6" region="121 173 203 237" universe="6" />
-    <cell id="275" material="6" region="124 139 146 149 160 172 178 185 204 257 266" universe="7" />
-    <cell id="276" material="6" region="134 186 198 211 228 232" universe="8" />
-    <cell id="277" material="6" universe="9" />
-    <cell id="278" material="6" region="113 151 214 271" universe="10" />
-    <cell id="279" material="6" region="114 135 207 224 230 235 272" universe="11" />
-    <cell id="280" material="6" region="128 201 243 262" universe="12" />
-    <cell id="281" material="6" region="153 158 161 181 190 246 258 263" universe="13" />
-    <cell id="282" material="6" region="116 182 240 247" universe="14" />
-    <cell id="283" material="6" region="112 129 141 174 188 205 264" universe="15" />
-    <cell id="284" material="6" region="143 162 163 175 191 206 259 265" universe="16" />
-    <cell id="285" material="6" region="125 136 144 156 229 241 244" universe="17" />
-    <cell id="286" material="6" region="115 140 167 176 179 189 227 234 250" universe="18" />
-    <cell id="287" material="6" region="120 132 145 152 177 218 251" universe="19" />
-    <cell id="288" material="6" region="133 137 187 199 225 236 273" universe="20" />
-    <cell id="289" material="6" region="130 192 202 208 219 223 233" universe="21" />
-    <cell id="290" material="6" region="117 157 183 220 269" universe="22" />
-    <cell id="291" material="6" region="118 154 184 194 217" universe="23" />
-    <cell id="292" material="6" region="131 142 147 165 193 209 221 274" universe="24" />
-    <cell id="293" material="6" region="222 252 270" universe="25" />
-    <cell id="294" material="6" region="126 195 245 253" universe="26" />
-    <cell id="295" material="6" region="111 127 148 168 196 260" universe="27" />
-    <cell id="296" material="6" region="138 150 197 212 254 261" universe="28" />
-    <cell id="297" material="6" region="155 166 200 213 242 255" universe="29" />
-    <cell id="298" material="6" universe="30" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <cell id="2" material="2" region="1 -2" universe="1"/>
+    <cell id="3" material="3" region="2 -3" universe="1"/>
+    <cell id="4" material="4" region="3 -4" universe="1"/>
+    <cell id="5" material="5" region="4" universe="1"/>
+    <cell fill="2" id="6" region="5 -6 7 -8 9 -10" universe="0"/>
+    <cell fill="1" id="107" region="-111" translation="-0.0014062011817633224 -0.015257747167296776 -0.09184766966024316" universe="27"/>
+    <cell fill="1" id="108" region="-112" translation="0.10909902639777394 -0.004179177767328068 -0.046240930185910245" universe="15"/>
+    <cell fill="1" id="109" region="-113" translation="0.13878336652768952 -0.06900710536877097 -0.03848821497485455" universe="10"/>
+    <cell fill="1" id="110" region="-114" translation="-0.19454996680564374 -0.06900710536877097 -0.03848821497485455" universe="11"/>
+    <cell fill="1" id="111" region="-115" translation="-0.09846455191076986 -0.02594038069469251 -0.06155174933292362" universe="18"/>
+    <cell fill="1" id="112" region="-116" translation="-0.09321591784308736 -0.12248857482372477 -0.04999802384282931" universe="14"/>
+    <cell fill="1" id="113" region="-117" translation="0.2028198996079864 0.08501514690643278 0.07431198844628262" universe="22"/>
+    <cell fill="1" id="114" region="-118" translation="-0.13051343372534685 0.08501514690643278 0.07431198844628262" universe="23"/>
+    <cell fill="1" id="115" region="-119" translation="0.03417350410997999 -0.09641153719944834 -0.10112098092715327" universe="5"/>
+    <cell fill="1" id="116" region="-120" translation="0.037913118842446136 0.06870772519039314 -0.10875752039644154" universe="19"/>
+    <cell fill="1" id="117" region="-121" translation="0.07388008140640989 -0.07130227505402231 -0.09782982564187503" universe="6"/>
+    <cell fill="1" id="118" region="-122" translation="0.08897214754414112 0.08694165211410448 0.07587737301598729" universe="3"/>
+    <cell fill="1" id="119" region="-123" translation="-0.03698302711710488 0.1408784014909229 -0.10474284149572705" universe="4"/>
+    <cell fill="1" id="120" region="-124" translation="-0.03698302711710488 -0.19245493184241047 -0.10474284149572705" universe="7"/>
+    <cell fill="1" id="121" region="-125" translation="-0.02428069661424781 0.05168393238830282 0.1302704892646539" universe="17"/>
+    <cell fill="1" id="122" region="-126" translation="-0.02428069661424781 0.05168393238830282 -0.20306284406867936" universe="26"/>
+    <cell fill="1" id="123" region="-127" translation="0.04578051975994746 0.1175901605138544 -0.0038022862212453434" universe="27"/>
+    <cell fill="1" id="124" region="-128" translation="-0.013741908464450836 0.18016577553053154 0.20276897514248216" universe="12"/>
+    <cell fill="1" id="125" region="-129" translation="-0.013741908464450836 -0.15316755780280183 0.20276897514248216" universe="15"/>
+    <cell fill="1" id="126" region="-130" translation="-0.013741908464450836 0.18016577553053154 -0.1305643581908511" universe="21"/>
+    <cell fill="1" id="127" region="-131" translation="-0.013741908464450836 -0.15316755780280183 -0.1305643581908511" universe="24"/>
+    <cell fill="1" id="128" region="-132" translation="0.19334606515602848 0.066228023881572 -0.07131104153532436" universe="19"/>
+    <cell fill="1" id="129" region="-133" translation="-0.13998726817730478 0.066228023881572 -0.07131104153532436" universe="20"/>
+    <cell fill="1" id="130" region="-134" translation="-0.031185656140686913 0.155914746052082 0.15331720509241947" universe="8"/>
+    <cell fill="1" id="131" region="-135" translation="-0.031185656140686913 -0.17741858728125126 0.15331720509241947" universe="11"/>
+    <cell fill="1" id="132" region="-136" translation="-0.031185656140686913 0.155914746052082 -0.1800161282409139" universe="17"/>
+    <cell fill="1" id="133" region="-137" translation="-0.031185656140686913 -0.17741858728125126 -0.1800161282409139" universe="20"/>
+    <cell fill="1" id="134" region="-138" translation="0.08018004492442865 0.016826191928232426 -0.016389596762212966" universe="28"/>
+    <cell fill="1" id="135" region="-139" translation="0.00483733774062417 0.08148156718302602 -0.09280826916311341" universe="7"/>
+    <cell fill="1" id="136" region="-140" translation="0.0978117791120118 -0.06105974469736897 -0.07844553364014112" universe="18"/>
+    <cell fill="1" id="137" region="-141" translation="0.0339716094789545 0.044675266050854034 0.18588381767108564" universe="15"/>
+    <cell fill="1" id="138" region="-142" translation="0.0339716094789545 0.044675266050854034 -0.14744951566224762" universe="24"/>
+    <cell fill="1" id="139" region="-143" translation="0.15974177782488064 -0.11470938473074832 -0.055880627694202434" universe="16"/>
+    <cell fill="1" id="140" region="-144" translation="-0.17359155550845262 -0.11470938473074832 -0.055880627694202434" universe="17"/>
+    <cell fill="1" id="141" region="-145" translation="0.007714449992858363 -0.07841911930069978 0.019169121324834393" universe="19"/>
+    <cell fill="1" id="142" region="-146" translation="-0.09772496056025104 -0.009435582016802613 -0.0973407871549632" universe="7"/>
+    <cell fill="1" id="143" region="-147" translation="-0.08460405234526575 0.18619630211681182 0.10902502186367324" universe="24"/>
+    <cell fill="1" id="144" region="-148" translation="-0.08460405234526575 -0.14713703121652144 0.10902502186367324" universe="27"/>
+    <cell fill="1" id="145" region="-149" translation="0.08530970516294267 -0.09740948712101977 0.031538023054709596" universe="7"/>
+    <cell fill="1" id="146" region="-150" translation="0.002049400245853761 0.10800782833319489 -0.08566939881823532" universe="28"/>
+    <cell fill="1" id="147" region="-151" translation="0.036269774055772475 -0.0034880407315701634 0.08814057857502322" universe="10"/>
+    <cell fill="1" id="148" region="-152" translation="0.012607957648281654 0.08090056062626749 0.0712211465420014" universe="19"/>
+    <cell fill="1" id="149" region="-153" translation="-0.03741489943578313 0.1221086949309545 0.0439406213163509" universe="13"/>
+    <cell fill="1" id="150" region="-154" translation="0.0851566223435044 -0.1191899586548319 -0.07364696787394387" universe="23"/>
+    <cell fill="1" id="151" region="-155" translation="-0.03992848096555457 0.020214072912877246 -0.11315245980004196" universe="29"/>
+    <cell fill="1" id="152" region="-156" translation="-0.050315754084578224 0.017099968565308377 0.056173125204605934" universe="17"/>
+    <cell fill="1" id="153" region="-157" translation="-0.06766398274549851 -0.07303578778642877 0.005410963730880458" universe="22"/>
+    <cell fill="1" id="154" region="-158" translation="0.06408439016382617 0.05853632250550789 0.00432158793112436" universe="13"/>
+    <cell fill="1" id="155" region="-159" translation="-0.013801059755509382 0.20222454587424032 0.19241766819445416" universe="4"/>
+    <cell fill="1" id="156" region="-160" translation="-0.013801059755509382 -0.13110878745909305 0.19241766819445416" universe="7"/>
+    <cell fill="1" id="157" region="-161" translation="-0.013801059755509382 0.20222454587424032 -0.1409156651388792" universe="13"/>
+    <cell fill="1" id="158" region="-162" translation="-0.013801059755509382 -0.13110878745909305 -0.1409156651388792" universe="16"/>
+    <cell fill="1" id="159" region="-163" translation="0.03522733749799645 0.11305459403611595 0.10295023150858529" universe="16"/>
+    <cell fill="1" id="160" region="-164" translation="-0.03831660450870228 -0.09880556873790897 0.08578673946744877" universe="4"/>
+    <cell fill="1" id="161" region="-165" translation="0.03782024089160585 0.07732392719766301 -0.002829721222114334" universe="24"/>
+    <cell fill="1" id="162" region="-166" translation="-0.060112483234699754 -0.06134051474053648 -0.04363492058502072" universe="29"/>
+    <cell fill="1" id="163" region="-167" translation="0.10930502703326198 -0.020465939386398402 0.15848543253913627" universe="18"/>
+    <cell fill="1" id="164" region="-168" translation="0.10930502703326198 -0.020465939386398402 -0.174847900794197" universe="27"/>
+    <cell fill="1" id="165" region="-169" translation="-0.04821581350719811 -0.10913639479587178 -0.11108700962300094" universe="3"/>
+    <cell fill="1" id="166" region="-170" translation="-0.09934364058994583 0.10405480441904197 -0.0241798283786806" universe="5"/>
+    <cell fill="1" id="167" region="-171" translation="0.11425630804159204 0.19090246541367445 -0.06077533762167586" universe="4"/>
+    <cell fill="1" id="168" region="-172" translation="0.11425630804159204 -0.14243086791965892 -0.06077533762167586" universe="7"/>
+    <cell fill="1" id="169" region="-173" translation="0.0217205011905508 0.02506675532845576 0.029520031599966412" universe="6"/>
+    <cell fill="1" id="170" region="-174" translation="0.12543650024083502 0.19371057833811733 -0.04147065769319469" universe="15"/>
+    <cell fill="1" id="171" region="-175" translation="-0.20789683309249835 0.19371057833811733 -0.04147065769319469" universe="16"/>
+    <cell fill="1" id="172" region="-176" translation="0.12543650024083502 -0.13962275499521593 -0.04147065769319469" universe="18"/>
+    <cell fill="1" id="173" region="-177" translation="-0.20789683309249835 -0.13962275499521593 -0.04147065769319469" universe="19"/>
+    <cell fill="1" id="174" region="-178" translation="-0.10385697059087434 -0.07239894918409101 0.047733316833160344" universe="7"/>
+    <cell fill="1" id="175" region="-179" translation="-0.02484533723289073 0.03270050374260325 0.009261180540203251" universe="18"/>
+    <cell fill="1" id="176" region="-180" translation="-0.10535768832641407 -0.10806169784882003 0.009669056668934639" universe="3"/>
+    <cell fill="1" id="177" region="-181" translation="0.20034387531341857 0.02227169438582799 0.18731645229850835" universe="13"/>
+    <cell fill="1" id="178" region="-182" translation="-0.13298945801991469 0.02227169438582799 0.18731645229850835" universe="14"/>
+    <cell fill="1" id="179" region="-183" translation="0.20034387531341857 0.02227169438582799 -0.1460168810348249" universe="22"/>
+    <cell fill="1" id="180" region="-184" translation="-0.13298945801991469 0.02227169438582799 -0.1460168810348249" universe="23"/>
+    <cell fill="1" id="181" region="-185" translation="0.1631199405760454 0.04092483075648701 0.07754240264809376" universe="7"/>
+    <cell fill="1" id="182" region="-186" translation="-0.17021339275728786 0.04092483075648701 0.07754240264809376" universe="8"/>
+    <cell fill="1" id="183" region="-187" translation="0.102073447728939 -0.060687493103351975 0.01519685776716928" universe="20"/>
+    <cell fill="1" id="184" region="-188" translation="0.07991907014916044 0.13595762576986914 -0.09622087197472673" universe="15"/>
+    <cell fill="1" id="185" region="-189" translation="0.07991907014916044 -0.19737570756346412 -0.09622087197472673" universe="18"/>
+    <cell fill="1" id="186" region="-190" translation="0.06943697893246592 0.16968387178879557 0.11988276699391809" universe="13"/>
+    <cell fill="1" id="187" region="-191" translation="0.06943697893246592 -0.1636494615445378 0.11988276699391809" universe="16"/>
+    <cell fill="1" id="188" region="-192" translation="-0.07059889277962383 0.1489570802132021 0.09503214710980579" universe="21"/>
+    <cell fill="1" id="189" region="-193" translation="-0.07059889277962383 -0.18437625312013128 0.09503214710980579" universe="24"/>
+    <cell fill="1" id="190" region="-194" translation="0.010468267263955 0.15608028424842002 -0.00511339431390323" universe="23"/>
+    <cell fill="1" id="191" region="-195" translation="0.010468267263955 -0.17725304908491335 -0.00511339431390323" universe="26"/>
+    <cell fill="1" id="192" region="-196" translation="0.15972123417512762 0.06883522628651784 -0.11009587369358387" universe="27"/>
+    <cell fill="1" id="193" region="-197" translation="-0.17361209915820575 0.06883522628651784 -0.11009587369358387" universe="28"/>
+    <cell fill="1" id="194" region="-198" translation="0.08981179676970563 0.06434186205946246 0.032607233968534766" universe="8"/>
+    <cell fill="1" id="195" region="-199" translation="0.0033702311569031584 0.10040789537086448 0.1867831868031803" universe="20"/>
+    <cell fill="1" id="196" region="-200" translation="0.0033702311569031584 0.10040789537086448 -0.14655014653015297" universe="29"/>
+    <cell fill="1" id="197" region="-201" translation="0.05329895281727448 -0.02881629065525937 0.15193411713913396" universe="12"/>
+    <cell fill="1" id="198" region="-202" translation="0.05329895281727448 -0.02881629065525937 -0.1813992161941993" universe="21"/>
+    <cell fill="1" id="199" region="-203" translation="0.14663786554095865 -0.0001831711922081758 0.173437280372308" universe="6"/>
+    <cell fill="1" id="200" region="-204" translation="-0.18669546779237473 -0.0001831711922081758 0.173437280372308" universe="7"/>
+    <cell fill="1" id="201" region="-205" translation="0.14663786554095865 -0.0001831711922081758 -0.15989605296102538" universe="15"/>
+    <cell fill="1" id="202" region="-206" translation="-0.18669546779237473 -0.0001831711922081758 -0.15989605296102538" universe="16"/>
+    <cell fill="1" id="203" region="-207" translation="0.006886156712931468 0.0325721225173089 -0.10785254014381473" universe="11"/>
+    <cell fill="1" id="204" region="-208" translation="0.05946426530734861 0.17562994884896627 0.11256068342977466" universe="21"/>
+    <cell fill="1" id="205" region="-209" translation="0.05946426530734861 -0.1577033844843671 0.11256068342977466" universe="24"/>
+    <cell fill="1" id="206" region="-210" translation="-0.0745211393530899 0.18602539894086317 0.07061211191996841" universe="5"/>
+    <cell fill="1" id="207" region="-211" translation="-0.0745211393530899 -0.1473079343924702 0.07061211191996841" universe="8"/>
+    <cell fill="1" id="208" region="-212" translation="0.15971361633210523 -0.02416800360737892 0.062334297185282495" universe="28"/>
+    <cell fill="1" id="209" region="-213" translation="-0.17361971700122802 -0.02416800360737892 0.062334297185282495" universe="29"/>
+    <cell fill="1" id="210" region="-214" translation="-0.014191419448261688 0.11114945107218455 0.0903966514577691" universe="10"/>
+    <cell fill="1" id="211" region="-215" translation="0.20641337800388493 -0.04689191572037532 0.03093832014609521" universe="4"/>
+    <cell fill="1" id="212" region="-216" translation="-0.12691995532944833 -0.04689191572037532 0.03093832014609521" universe="5"/>
+    <cell fill="1" id="213" region="-217" translation="0.042925982468302815 0.0705557158479822 -0.09611246805643225" universe="23"/>
+    <cell fill="1" id="214" region="-218" translation="0.09174118398607445 -0.02102680816462299 -0.12074712654412828" universe="19"/>
+    <cell fill="1" id="215" region="-219" translation="0.1871144659776534 0.14219092895822716 0.0030395151604761805" universe="21"/>
+    <cell fill="1" id="216" region="-220" translation="-0.14621886735567996 0.14219092895822716 0.0030395151604761805" universe="22"/>
+    <cell fill="1" id="217" region="-221" translation="0.1871144659776534 -0.1911424043751062 0.0030395151604761805" universe="24"/>
+    <cell fill="1" id="218" region="-222" translation="-0.14621886735567996 -0.1911424043751062 0.0030395151604761805" universe="25"/>
+    <cell fill="1" id="219" region="-223" translation="-0.08858601205119498 -0.05740809172565153 0.0018937978357634888" universe="21"/>
+    <cell fill="1" id="220" region="-224" translation="-0.06956272452538859 -0.03258611645335985 0.1876749617320655" universe="11"/>
+    <cell fill="1" id="221" region="-225" translation="-0.06956272452538859 -0.03258611645335985 -0.14565837160126788" universe="20"/>
+    <cell fill="1" id="222" region="-226" translation="0.06480048668590577 0.08039356693483157 -0.0495807099830502" universe="4"/>
+    <cell fill="1" id="223" region="-227" translation="0.11976882848311299 0.024414887718198774 0.059001075831400684" universe="18"/>
+    <cell fill="1" id="224" region="-228" translation="0.055815690196973966 -0.03866224334773988 0.12934415570493119" universe="8"/>
+    <cell fill="1" id="225" region="-229" translation="0.055815690196973966 -0.03866224334773988 -0.20398917762840219" universe="17"/>
+    <cell fill="1" id="226" region="-230" translation="-0.07057140884385227 -0.033261585924167725 -0.11308117958912334" universe="11"/>
+    <cell fill="1" id="227" region="-231" translation="0.0191891610992464 -0.08777511864372084 0.09496767886953814" universe="5"/>
+    <cell fill="1" id="228" region="-232" translation="0.11357577214048964 -0.07231206070759028 -0.01862315233444045" universe="8"/>
+    <cell fill="1" id="229" region="-233" translation="0.028822870329182626 0.09660360434040871 -0.10994545899370212" universe="21"/>
+    <cell fill="1" id="230" region="-234" translation="-0.030272006016200004 0.04272149160139638 -0.11143715881676097" universe="18"/>
+    <cell fill="1" id="231" region="-235" translation="0.09719339210824351 0.04131007428864286 0.14476192535372884" universe="11"/>
+    <cell fill="1" id="232" region="-236" translation="0.09719339210824351 0.04131007428864286 -0.18857140797960453" universe="20"/>
+    <cell fill="1" id="233" region="-237" translation="0.1075803128789849 -0.02104725713738881 -0.03274843538002781" universe="6"/>
+    <cell fill="1" id="234" region="-238" translation="0.1392019576325615 -0.08814436128642017 -0.11479828495132216" universe="4"/>
+    <cell fill="1" id="235" region="-239" translation="-0.19413137570077177 -0.08814436128642017 -0.11479828495132216" universe="5"/>
+    <cell fill="1" id="236" region="-240" translation="0.10847197677361597 0.1461592302081176 0.08841042383901798" universe="14"/>
+    <cell fill="1" id="237" region="-241" translation="0.10847197677361597 -0.18717410312521576 0.08841042383901798" universe="17"/>
+    <cell fill="1" id="238" region="-242" translation="0.045127058382085194 0.0967807216119615 0.0967653665331849" universe="29"/>
+    <cell fill="1" id="239" region="-243" translation="-0.022464471745497094 0.07259277205138148 0.10785219865057927" universe="12"/>
+    <cell fill="1" id="240" region="-244" translation="0.10606353369903221 0.03928703229725711 0.17228776926768086" universe="17"/>
+    <cell fill="1" id="241" region="-245" translation="0.10606353369903221 0.03928703229725711 -0.1610455640656524" universe="26"/>
+    <cell fill="1" id="242" region="-246" translation="0.14815941963538226 0.11277655887534538 0.03808687169681996" universe="13"/>
+    <cell fill="1" id="243" region="-247" translation="-0.185173913697951 0.11277655887534538 0.03808687169681996" universe="14"/>
+    <cell fill="1" id="244" region="-248" translation="0.15693581669068946 0.10114531834923532 -0.04992356195780889" universe="3"/>
+    <cell fill="1" id="245" region="-249" translation="-0.17639751664264391 0.10114531834923532 -0.04992356195780889" universe="4"/>
+    <cell fill="1" id="246" region="-250" translation="0.13264357875679378 0.10919805128102966 -0.04769549879176793" universe="18"/>
+    <cell fill="1" id="247" region="-251" translation="-0.2006897545765396 0.10919805128102966 -0.04769549879176793" universe="19"/>
+    <cell fill="1" id="248" region="-252" translation="0.13916564434634993 0.13134319648704007 0.07015912178562622" universe="25"/>
+    <cell fill="1" id="249" region="-253" translation="-0.19416768898698333 0.13134319648704007 0.07015912178562622" universe="26"/>
+    <cell fill="1" id="250" region="-254" translation="0.13916564434634993 -0.2019901368462932 0.07015912178562622" universe="28"/>
+    <cell fill="1" id="251" region="-255" translation="-0.19416768898698333 -0.2019901368462932 0.07015912178562622" universe="29"/>
+    <cell fill="1" id="252" region="-256" translation="-0.10026688643231585 0.1564443552698941 0.1751728484794038" universe="4"/>
+    <cell fill="1" id="253" region="-257" translation="-0.10026688643231585 -0.17688897806343928 0.1751728484794038" universe="7"/>
+    <cell fill="1" id="254" region="-258" translation="-0.10026688643231585 0.1564443552698941 -0.15816048485392958" universe="13"/>
+    <cell fill="1" id="255" region="-259" translation="-0.10026688643231585 -0.17688897806343928 -0.15816048485392958" universe="16"/>
+    <cell fill="1" id="256" region="-260" translation="0.16555436030710213 -0.015531455219433332 0.02691614144169241" universe="27"/>
+    <cell fill="1" id="257" region="-261" translation="-0.16777897302623124 -0.015531455219433332 0.02691614144169241" universe="28"/>
+    <cell fill="1" id="258" region="-262" translation="0.152805274648522 0.18166556620660584 0.040488366683789634" universe="12"/>
+    <cell fill="1" id="259" region="-263" translation="-0.18052805868481137 0.18166556620660584 0.040488366683789634" universe="13"/>
+    <cell fill="1" id="260" region="-264" translation="0.152805274648522 -0.15166776712672753 0.040488366683789634" universe="15"/>
+    <cell fill="1" id="261" region="-265" translation="-0.18052805868481137 -0.15166776712672753 0.040488366683789634" universe="16"/>
+    <cell fill="1" id="262" region="-266" translation="0.07231116694829032 0.08785370537091952 0.09997055589943346" universe="7"/>
+    <cell fill="1" id="263" region="-267" translation="-0.10576424362412257 0.09874497232579027 -0.05820080940738992" universe="3"/>
+    <cell fill="1" id="264" region="-268" translation="0.046877953125145755 -0.059492732184222796 -0.055635341857650844" universe="4"/>
+    <cell fill="1" id="265" region="-269" translation="0.1239423066569788 0.14183046274229005 -0.06583818749209458" universe="22"/>
+    <cell fill="1" id="266" region="-270" translation="0.1239423066569788 -0.19150287059104332 -0.06583818749209458" universe="25"/>
+    <cell fill="1" id="267" region="-271" translation="0.0013087859341976982 -0.06327594480884835 -0.05382522074205143" universe="10"/>
+    <cell fill="1" id="268" region="-272" translation="0.11058883669906516 -0.038954175820645864 0.16834558789033005" universe="11"/>
+    <cell fill="1" id="269" region="-273" translation="0.11058883669906516 -0.038954175820645864 -0.16498774544300332" universe="20"/>
+    <cell fill="1" id="270" region="-274" translation="-0.02657010065724863 0.013144978841080679 0.050587944514051575" universe="24"/>
+    <cell id="271" material="6" region="122 169 180 248 267" universe="3"/>
+    <cell id="272" material="6" region="123 159 164 171 215 226 238 249 256 268" universe="4"/>
+    <cell id="273" material="6" region="119 170 210 216 231 239" universe="5"/>
+    <cell id="274" material="6" region="121 173 203 237" universe="6"/>
+    <cell id="275" material="6" region="124 139 146 149 160 172 178 185 204 257 266" universe="7"/>
+    <cell id="276" material="6" region="134 186 198 211 228 232" universe="8"/>
+    <cell id="277" material="6" universe="9"/>
+    <cell id="278" material="6" region="113 151 214 271" universe="10"/>
+    <cell id="279" material="6" region="114 135 207 224 230 235 272" universe="11"/>
+    <cell id="280" material="6" region="128 201 243 262" universe="12"/>
+    <cell id="281" material="6" region="153 158 161 181 190 246 258 263" universe="13"/>
+    <cell id="282" material="6" region="116 182 240 247" universe="14"/>
+    <cell id="283" material="6" region="112 129 141 174 188 205 264" universe="15"/>
+    <cell id="284" material="6" region="143 162 163 175 191 206 259 265" universe="16"/>
+    <cell id="285" material="6" region="125 136 144 156 229 241 244" universe="17"/>
+    <cell id="286" material="6" region="115 140 167 176 179 189 227 234 250" universe="18"/>
+    <cell id="287" material="6" region="120 132 145 152 177 218 251" universe="19"/>
+    <cell id="288" material="6" region="133 137 187 199 225 236 273" universe="20"/>
+    <cell id="289" material="6" region="130 192 202 208 219 223 233" universe="21"/>
+    <cell id="290" material="6" region="117 157 183 220 269" universe="22"/>
+    <cell id="291" material="6" region="118 154 184 194 217" universe="23"/>
+    <cell id="292" material="6" region="131 142 147 165 193 209 221 274" universe="24"/>
+    <cell id="293" material="6" region="222 252 270" universe="25"/>
+    <cell id="294" material="6" region="126 195 245 253" universe="26"/>
+    <cell id="295" material="6" region="111 127 148 168 196 260" universe="27"/>
+    <cell id="296" material="6" region="138 150 197 212 254 261" universe="28"/>
+    <cell id="297" material="6" region="155 166 200 213 242 255" universe="29"/>
+    <cell id="298" material="6" universe="30"/>
     <lattice id="2">
       <pitch>0.3333333333333333 0.3333333333333333 0.3333333333333333</pitch>
       <outer>30</outer>
@@ -253,180 +253,180 @@
 24 25 26 
 21 22 23 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.0 0.02125" id="1" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 0.03125" id="2" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 0.03475" id="3" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 0.03825" id="4" type="sphere" />
-    <surface boundary="reflective" coeffs="-0.5" id="5" type="x-plane" />
-    <surface boundary="reflective" coeffs="0.5" id="6" type="x-plane" />
-    <surface boundary="reflective" coeffs="-0.5" id="7" type="y-plane" />
-    <surface boundary="reflective" coeffs="0.5" id="8" type="y-plane" />
-    <surface boundary="reflective" coeffs="-0.5" id="9" type="z-plane" />
-    <surface boundary="reflective" coeffs="0.5" id="10" type="z-plane" />
-    <surface coeffs="-0.0014062011817633224 -0.015257747167296776 -0.09184766966024316 0.04225" id="111" type="sphere" />
-    <surface coeffs="0.10909902639777394 -0.004179177767328068 -0.046240930185910245 0.04225" id="112" type="sphere" />
-    <surface coeffs="0.13878336652768952 -0.06900710536877097 -0.03848821497485455 0.04225" id="113" type="sphere" />
-    <surface coeffs="-0.19454996680564374 -0.06900710536877097 -0.03848821497485455 0.04225" id="114" type="sphere" />
-    <surface coeffs="-0.09846455191076986 -0.02594038069469251 -0.06155174933292362 0.04225" id="115" type="sphere" />
-    <surface coeffs="-0.09321591784308736 -0.12248857482372477 -0.04999802384282931 0.04225" id="116" type="sphere" />
-    <surface coeffs="0.2028198996079864 0.08501514690643278 0.07431198844628262 0.04225" id="117" type="sphere" />
-    <surface coeffs="-0.13051343372534685 0.08501514690643278 0.07431198844628262 0.04225" id="118" type="sphere" />
-    <surface coeffs="0.03417350410997999 -0.09641153719944834 -0.10112098092715327 0.04225" id="119" type="sphere" />
-    <surface coeffs="0.037913118842446136 0.06870772519039314 -0.10875752039644154 0.04225" id="120" type="sphere" />
-    <surface coeffs="0.07388008140640989 -0.07130227505402231 -0.09782982564187503 0.04225" id="121" type="sphere" />
-    <surface coeffs="0.08897214754414112 0.08694165211410448 0.07587737301598729 0.04225" id="122" type="sphere" />
-    <surface coeffs="-0.03698302711710488 0.1408784014909229 -0.10474284149572705 0.04225" id="123" type="sphere" />
-    <surface coeffs="-0.03698302711710488 -0.19245493184241047 -0.10474284149572705 0.04225" id="124" type="sphere" />
-    <surface coeffs="-0.02428069661424781 0.05168393238830282 0.1302704892646539 0.04225" id="125" type="sphere" />
-    <surface coeffs="-0.02428069661424781 0.05168393238830282 -0.20306284406867936 0.04225" id="126" type="sphere" />
-    <surface coeffs="0.04578051975994746 0.1175901605138544 -0.0038022862212453434 0.04225" id="127" type="sphere" />
-    <surface coeffs="-0.013741908464450836 0.18016577553053154 0.20276897514248216 0.04225" id="128" type="sphere" />
-    <surface coeffs="-0.013741908464450836 -0.15316755780280183 0.20276897514248216 0.04225" id="129" type="sphere" />
-    <surface coeffs="-0.013741908464450836 0.18016577553053154 -0.1305643581908511 0.04225" id="130" type="sphere" />
-    <surface coeffs="-0.013741908464450836 -0.15316755780280183 -0.1305643581908511 0.04225" id="131" type="sphere" />
-    <surface coeffs="0.19334606515602848 0.066228023881572 -0.07131104153532436 0.04225" id="132" type="sphere" />
-    <surface coeffs="-0.13998726817730478 0.066228023881572 -0.07131104153532436 0.04225" id="133" type="sphere" />
-    <surface coeffs="-0.031185656140686913 0.155914746052082 0.15331720509241947 0.04225" id="134" type="sphere" />
-    <surface coeffs="-0.031185656140686913 -0.17741858728125126 0.15331720509241947 0.04225" id="135" type="sphere" />
-    <surface coeffs="-0.031185656140686913 0.155914746052082 -0.1800161282409139 0.04225" id="136" type="sphere" />
-    <surface coeffs="-0.031185656140686913 -0.17741858728125126 -0.1800161282409139 0.04225" id="137" type="sphere" />
-    <surface coeffs="0.08018004492442865 0.016826191928232426 -0.016389596762212966 0.04225" id="138" type="sphere" />
-    <surface coeffs="0.00483733774062417 0.08148156718302602 -0.09280826916311341 0.04225" id="139" type="sphere" />
-    <surface coeffs="0.0978117791120118 -0.06105974469736897 -0.07844553364014112 0.04225" id="140" type="sphere" />
-    <surface coeffs="0.0339716094789545 0.044675266050854034 0.18588381767108564 0.04225" id="141" type="sphere" />
-    <surface coeffs="0.0339716094789545 0.044675266050854034 -0.14744951566224762 0.04225" id="142" type="sphere" />
-    <surface coeffs="0.15974177782488064 -0.11470938473074832 -0.055880627694202434 0.04225" id="143" type="sphere" />
-    <surface coeffs="-0.17359155550845262 -0.11470938473074832 -0.055880627694202434 0.04225" id="144" type="sphere" />
-    <surface coeffs="0.007714449992858363 -0.07841911930069978 0.019169121324834393 0.04225" id="145" type="sphere" />
-    <surface coeffs="-0.09772496056025104 -0.009435582016802613 -0.0973407871549632 0.04225" id="146" type="sphere" />
-    <surface coeffs="-0.08460405234526575 0.18619630211681182 0.10902502186367324 0.04225" id="147" type="sphere" />
-    <surface coeffs="-0.08460405234526575 -0.14713703121652144 0.10902502186367324 0.04225" id="148" type="sphere" />
-    <surface coeffs="0.08530970516294267 -0.09740948712101977 0.031538023054709596 0.04225" id="149" type="sphere" />
-    <surface coeffs="0.002049400245853761 0.10800782833319489 -0.08566939881823532 0.04225" id="150" type="sphere" />
-    <surface coeffs="0.036269774055772475 -0.0034880407315701634 0.08814057857502322 0.04225" id="151" type="sphere" />
-    <surface coeffs="0.012607957648281654 0.08090056062626749 0.0712211465420014 0.04225" id="152" type="sphere" />
-    <surface coeffs="-0.03741489943578313 0.1221086949309545 0.0439406213163509 0.04225" id="153" type="sphere" />
-    <surface coeffs="0.0851566223435044 -0.1191899586548319 -0.07364696787394387 0.04225" id="154" type="sphere" />
-    <surface coeffs="-0.03992848096555457 0.020214072912877246 -0.11315245980004196 0.04225" id="155" type="sphere" />
-    <surface coeffs="-0.050315754084578224 0.017099968565308377 0.056173125204605934 0.04225" id="156" type="sphere" />
-    <surface coeffs="-0.06766398274549851 -0.07303578778642877 0.005410963730880458 0.04225" id="157" type="sphere" />
-    <surface coeffs="0.06408439016382617 0.05853632250550789 0.00432158793112436 0.04225" id="158" type="sphere" />
-    <surface coeffs="-0.013801059755509382 0.20222454587424032 0.19241766819445416 0.04225" id="159" type="sphere" />
-    <surface coeffs="-0.013801059755509382 -0.13110878745909305 0.19241766819445416 0.04225" id="160" type="sphere" />
-    <surface coeffs="-0.013801059755509382 0.20222454587424032 -0.1409156651388792 0.04225" id="161" type="sphere" />
-    <surface coeffs="-0.013801059755509382 -0.13110878745909305 -0.1409156651388792 0.04225" id="162" type="sphere" />
-    <surface coeffs="0.03522733749799645 0.11305459403611595 0.10295023150858529 0.04225" id="163" type="sphere" />
-    <surface coeffs="-0.03831660450870228 -0.09880556873790897 0.08578673946744877 0.04225" id="164" type="sphere" />
-    <surface coeffs="0.03782024089160585 0.07732392719766301 -0.002829721222114334 0.04225" id="165" type="sphere" />
-    <surface coeffs="-0.060112483234699754 -0.06134051474053648 -0.04363492058502072 0.04225" id="166" type="sphere" />
-    <surface coeffs="0.10930502703326198 -0.020465939386398402 0.15848543253913627 0.04225" id="167" type="sphere" />
-    <surface coeffs="0.10930502703326198 -0.020465939386398402 -0.174847900794197 0.04225" id="168" type="sphere" />
-    <surface coeffs="-0.04821581350719811 -0.10913639479587178 -0.11108700962300094 0.04225" id="169" type="sphere" />
-    <surface coeffs="-0.09934364058994583 0.10405480441904197 -0.0241798283786806 0.04225" id="170" type="sphere" />
-    <surface coeffs="0.11425630804159204 0.19090246541367445 -0.06077533762167586 0.04225" id="171" type="sphere" />
-    <surface coeffs="0.11425630804159204 -0.14243086791965892 -0.06077533762167586 0.04225" id="172" type="sphere" />
-    <surface coeffs="0.0217205011905508 0.02506675532845576 0.029520031599966412 0.04225" id="173" type="sphere" />
-    <surface coeffs="0.12543650024083502 0.19371057833811733 -0.04147065769319469 0.04225" id="174" type="sphere" />
-    <surface coeffs="-0.20789683309249835 0.19371057833811733 -0.04147065769319469 0.04225" id="175" type="sphere" />
-    <surface coeffs="0.12543650024083502 -0.13962275499521593 -0.04147065769319469 0.04225" id="176" type="sphere" />
-    <surface coeffs="-0.20789683309249835 -0.13962275499521593 -0.04147065769319469 0.04225" id="177" type="sphere" />
-    <surface coeffs="-0.10385697059087434 -0.07239894918409101 0.047733316833160344 0.04225" id="178" type="sphere" />
-    <surface coeffs="-0.02484533723289073 0.03270050374260325 0.009261180540203251 0.04225" id="179" type="sphere" />
-    <surface coeffs="-0.10535768832641407 -0.10806169784882003 0.009669056668934639 0.04225" id="180" type="sphere" />
-    <surface coeffs="0.20034387531341857 0.02227169438582799 0.18731645229850835 0.04225" id="181" type="sphere" />
-    <surface coeffs="-0.13298945801991469 0.02227169438582799 0.18731645229850835 0.04225" id="182" type="sphere" />
-    <surface coeffs="0.20034387531341857 0.02227169438582799 -0.1460168810348249 0.04225" id="183" type="sphere" />
-    <surface coeffs="-0.13298945801991469 0.02227169438582799 -0.1460168810348249 0.04225" id="184" type="sphere" />
-    <surface coeffs="0.1631199405760454 0.04092483075648701 0.07754240264809376 0.04225" id="185" type="sphere" />
-    <surface coeffs="-0.17021339275728786 0.04092483075648701 0.07754240264809376 0.04225" id="186" type="sphere" />
-    <surface coeffs="0.102073447728939 -0.060687493103351975 0.01519685776716928 0.04225" id="187" type="sphere" />
-    <surface coeffs="0.07991907014916044 0.13595762576986914 -0.09622087197472673 0.04225" id="188" type="sphere" />
-    <surface coeffs="0.07991907014916044 -0.19737570756346412 -0.09622087197472673 0.04225" id="189" type="sphere" />
-    <surface coeffs="0.06943697893246592 0.16968387178879557 0.11988276699391809 0.04225" id="190" type="sphere" />
-    <surface coeffs="0.06943697893246592 -0.1636494615445378 0.11988276699391809 0.04225" id="191" type="sphere" />
-    <surface coeffs="-0.07059889277962383 0.1489570802132021 0.09503214710980579 0.04225" id="192" type="sphere" />
-    <surface coeffs="-0.07059889277962383 -0.18437625312013128 0.09503214710980579 0.04225" id="193" type="sphere" />
-    <surface coeffs="0.010468267263955 0.15608028424842002 -0.00511339431390323 0.04225" id="194" type="sphere" />
-    <surface coeffs="0.010468267263955 -0.17725304908491335 -0.00511339431390323 0.04225" id="195" type="sphere" />
-    <surface coeffs="0.15972123417512762 0.06883522628651784 -0.11009587369358387 0.04225" id="196" type="sphere" />
-    <surface coeffs="-0.17361209915820575 0.06883522628651784 -0.11009587369358387 0.04225" id="197" type="sphere" />
-    <surface coeffs="0.08981179676970563 0.06434186205946246 0.032607233968534766 0.04225" id="198" type="sphere" />
-    <surface coeffs="0.0033702311569031584 0.10040789537086448 0.1867831868031803 0.04225" id="199" type="sphere" />
-    <surface coeffs="0.0033702311569031584 0.10040789537086448 -0.14655014653015297 0.04225" id="200" type="sphere" />
-    <surface coeffs="0.05329895281727448 -0.02881629065525937 0.15193411713913396 0.04225" id="201" type="sphere" />
-    <surface coeffs="0.05329895281727448 -0.02881629065525937 -0.1813992161941993 0.04225" id="202" type="sphere" />
-    <surface coeffs="0.14663786554095865 -0.0001831711922081758 0.173437280372308 0.04225" id="203" type="sphere" />
-    <surface coeffs="-0.18669546779237473 -0.0001831711922081758 0.173437280372308 0.04225" id="204" type="sphere" />
-    <surface coeffs="0.14663786554095865 -0.0001831711922081758 -0.15989605296102538 0.04225" id="205" type="sphere" />
-    <surface coeffs="-0.18669546779237473 -0.0001831711922081758 -0.15989605296102538 0.04225" id="206" type="sphere" />
-    <surface coeffs="0.006886156712931468 0.0325721225173089 -0.10785254014381473 0.04225" id="207" type="sphere" />
-    <surface coeffs="0.05946426530734861 0.17562994884896627 0.11256068342977466 0.04225" id="208" type="sphere" />
-    <surface coeffs="0.05946426530734861 -0.1577033844843671 0.11256068342977466 0.04225" id="209" type="sphere" />
-    <surface coeffs="-0.0745211393530899 0.18602539894086317 0.07061211191996841 0.04225" id="210" type="sphere" />
-    <surface coeffs="-0.0745211393530899 -0.1473079343924702 0.07061211191996841 0.04225" id="211" type="sphere" />
-    <surface coeffs="0.15971361633210523 -0.02416800360737892 0.062334297185282495 0.04225" id="212" type="sphere" />
-    <surface coeffs="-0.17361971700122802 -0.02416800360737892 0.062334297185282495 0.04225" id="213" type="sphere" />
-    <surface coeffs="-0.014191419448261688 0.11114945107218455 0.0903966514577691 0.04225" id="214" type="sphere" />
-    <surface coeffs="0.20641337800388493 -0.04689191572037532 0.03093832014609521 0.04225" id="215" type="sphere" />
-    <surface coeffs="-0.12691995532944833 -0.04689191572037532 0.03093832014609521 0.04225" id="216" type="sphere" />
-    <surface coeffs="0.042925982468302815 0.0705557158479822 -0.09611246805643225 0.04225" id="217" type="sphere" />
-    <surface coeffs="0.09174118398607445 -0.02102680816462299 -0.12074712654412828 0.04225" id="218" type="sphere" />
-    <surface coeffs="0.1871144659776534 0.14219092895822716 0.0030395151604761805 0.04225" id="219" type="sphere" />
-    <surface coeffs="-0.14621886735567996 0.14219092895822716 0.0030395151604761805 0.04225" id="220" type="sphere" />
-    <surface coeffs="0.1871144659776534 -0.1911424043751062 0.0030395151604761805 0.04225" id="221" type="sphere" />
-    <surface coeffs="-0.14621886735567996 -0.1911424043751062 0.0030395151604761805 0.04225" id="222" type="sphere" />
-    <surface coeffs="-0.08858601205119498 -0.05740809172565153 0.0018937978357634888 0.04225" id="223" type="sphere" />
-    <surface coeffs="-0.06956272452538859 -0.03258611645335985 0.1876749617320655 0.04225" id="224" type="sphere" />
-    <surface coeffs="-0.06956272452538859 -0.03258611645335985 -0.14565837160126788 0.04225" id="225" type="sphere" />
-    <surface coeffs="0.06480048668590577 0.08039356693483157 -0.0495807099830502 0.04225" id="226" type="sphere" />
-    <surface coeffs="0.11976882848311299 0.024414887718198774 0.059001075831400684 0.04225" id="227" type="sphere" />
-    <surface coeffs="0.055815690196973966 -0.03866224334773988 0.12934415570493119 0.04225" id="228" type="sphere" />
-    <surface coeffs="0.055815690196973966 -0.03866224334773988 -0.20398917762840219 0.04225" id="229" type="sphere" />
-    <surface coeffs="-0.07057140884385227 -0.033261585924167725 -0.11308117958912334 0.04225" id="230" type="sphere" />
-    <surface coeffs="0.0191891610992464 -0.08777511864372084 0.09496767886953814 0.04225" id="231" type="sphere" />
-    <surface coeffs="0.11357577214048964 -0.07231206070759028 -0.01862315233444045 0.04225" id="232" type="sphere" />
-    <surface coeffs="0.028822870329182626 0.09660360434040871 -0.10994545899370212 0.04225" id="233" type="sphere" />
-    <surface coeffs="-0.030272006016200004 0.04272149160139638 -0.11143715881676097 0.04225" id="234" type="sphere" />
-    <surface coeffs="0.09719339210824351 0.04131007428864286 0.14476192535372884 0.04225" id="235" type="sphere" />
-    <surface coeffs="0.09719339210824351 0.04131007428864286 -0.18857140797960453 0.04225" id="236" type="sphere" />
-    <surface coeffs="0.1075803128789849 -0.02104725713738881 -0.03274843538002781 0.04225" id="237" type="sphere" />
-    <surface coeffs="0.1392019576325615 -0.08814436128642017 -0.11479828495132216 0.04225" id="238" type="sphere" />
-    <surface coeffs="-0.19413137570077177 -0.08814436128642017 -0.11479828495132216 0.04225" id="239" type="sphere" />
-    <surface coeffs="0.10847197677361597 0.1461592302081176 0.08841042383901798 0.04225" id="240" type="sphere" />
-    <surface coeffs="0.10847197677361597 -0.18717410312521576 0.08841042383901798 0.04225" id="241" type="sphere" />
-    <surface coeffs="0.045127058382085194 0.0967807216119615 0.0967653665331849 0.04225" id="242" type="sphere" />
-    <surface coeffs="-0.022464471745497094 0.07259277205138148 0.10785219865057927 0.04225" id="243" type="sphere" />
-    <surface coeffs="0.10606353369903221 0.03928703229725711 0.17228776926768086 0.04225" id="244" type="sphere" />
-    <surface coeffs="0.10606353369903221 0.03928703229725711 -0.1610455640656524 0.04225" id="245" type="sphere" />
-    <surface coeffs="0.14815941963538226 0.11277655887534538 0.03808687169681996 0.04225" id="246" type="sphere" />
-    <surface coeffs="-0.185173913697951 0.11277655887534538 0.03808687169681996 0.04225" id="247" type="sphere" />
-    <surface coeffs="0.15693581669068946 0.10114531834923532 -0.04992356195780889 0.04225" id="248" type="sphere" />
-    <surface coeffs="-0.17639751664264391 0.10114531834923532 -0.04992356195780889 0.04225" id="249" type="sphere" />
-    <surface coeffs="0.13264357875679378 0.10919805128102966 -0.04769549879176793 0.04225" id="250" type="sphere" />
-    <surface coeffs="-0.2006897545765396 0.10919805128102966 -0.04769549879176793 0.04225" id="251" type="sphere" />
-    <surface coeffs="0.13916564434634993 0.13134319648704007 0.07015912178562622 0.04225" id="252" type="sphere" />
-    <surface coeffs="-0.19416768898698333 0.13134319648704007 0.07015912178562622 0.04225" id="253" type="sphere" />
-    <surface coeffs="0.13916564434634993 -0.2019901368462932 0.07015912178562622 0.04225" id="254" type="sphere" />
-    <surface coeffs="-0.19416768898698333 -0.2019901368462932 0.07015912178562622 0.04225" id="255" type="sphere" />
-    <surface coeffs="-0.10026688643231585 0.1564443552698941 0.1751728484794038 0.04225" id="256" type="sphere" />
-    <surface coeffs="-0.10026688643231585 -0.17688897806343928 0.1751728484794038 0.04225" id="257" type="sphere" />
-    <surface coeffs="-0.10026688643231585 0.1564443552698941 -0.15816048485392958 0.04225" id="258" type="sphere" />
-    <surface coeffs="-0.10026688643231585 -0.17688897806343928 -0.15816048485392958 0.04225" id="259" type="sphere" />
-    <surface coeffs="0.16555436030710213 -0.015531455219433332 0.02691614144169241 0.04225" id="260" type="sphere" />
-    <surface coeffs="-0.16777897302623124 -0.015531455219433332 0.02691614144169241 0.04225" id="261" type="sphere" />
-    <surface coeffs="0.152805274648522 0.18166556620660584 0.040488366683789634 0.04225" id="262" type="sphere" />
-    <surface coeffs="-0.18052805868481137 0.18166556620660584 0.040488366683789634 0.04225" id="263" type="sphere" />
-    <surface coeffs="0.152805274648522 -0.15166776712672753 0.040488366683789634 0.04225" id="264" type="sphere" />
-    <surface coeffs="-0.18052805868481137 -0.15166776712672753 0.040488366683789634 0.04225" id="265" type="sphere" />
-    <surface coeffs="0.07231116694829032 0.08785370537091952 0.09997055589943346 0.04225" id="266" type="sphere" />
-    <surface coeffs="-0.10576424362412257 0.09874497232579027 -0.05820080940738992 0.04225" id="267" type="sphere" />
-    <surface coeffs="0.046877953125145755 -0.059492732184222796 -0.055635341857650844 0.04225" id="268" type="sphere" />
-    <surface coeffs="0.1239423066569788 0.14183046274229005 -0.06583818749209458 0.04225" id="269" type="sphere" />
-    <surface coeffs="0.1239423066569788 -0.19150287059104332 -0.06583818749209458 0.04225" id="270" type="sphere" />
-    <surface coeffs="0.0013087859341976982 -0.06327594480884835 -0.05382522074205143 0.04225" id="271" type="sphere" />
-    <surface coeffs="0.11058883669906516 -0.038954175820645864 0.16834558789033005 0.04225" id="272" type="sphere" />
-    <surface coeffs="0.11058883669906516 -0.038954175820645864 -0.16498774544300332 0.04225" id="273" type="sphere" />
-    <surface coeffs="-0.02657010065724863 0.013144978841080679 0.050587944514051575 0.04225" id="274" type="sphere" />
+    <surface coeffs="0.0 0.0 0.0 0.02125" id="1" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 0.03125" id="2" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 0.03475" id="3" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 0.03825" id="4" type="sphere"/>
+    <surface boundary="reflective" coeffs="-0.5" id="5" type="x-plane"/>
+    <surface boundary="reflective" coeffs="0.5" id="6" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-0.5" id="7" type="y-plane"/>
+    <surface boundary="reflective" coeffs="0.5" id="8" type="y-plane"/>
+    <surface boundary="reflective" coeffs="-0.5" id="9" type="z-plane"/>
+    <surface boundary="reflective" coeffs="0.5" id="10" type="z-plane"/>
+    <surface coeffs="-0.0014062011817633224 -0.015257747167296776 -0.09184766966024316 0.04225" id="111" type="sphere"/>
+    <surface coeffs="0.10909902639777394 -0.004179177767328068 -0.046240930185910245 0.04225" id="112" type="sphere"/>
+    <surface coeffs="0.13878336652768952 -0.06900710536877097 -0.03848821497485455 0.04225" id="113" type="sphere"/>
+    <surface coeffs="-0.19454996680564374 -0.06900710536877097 -0.03848821497485455 0.04225" id="114" type="sphere"/>
+    <surface coeffs="-0.09846455191076986 -0.02594038069469251 -0.06155174933292362 0.04225" id="115" type="sphere"/>
+    <surface coeffs="-0.09321591784308736 -0.12248857482372477 -0.04999802384282931 0.04225" id="116" type="sphere"/>
+    <surface coeffs="0.2028198996079864 0.08501514690643278 0.07431198844628262 0.04225" id="117" type="sphere"/>
+    <surface coeffs="-0.13051343372534685 0.08501514690643278 0.07431198844628262 0.04225" id="118" type="sphere"/>
+    <surface coeffs="0.03417350410997999 -0.09641153719944834 -0.10112098092715327 0.04225" id="119" type="sphere"/>
+    <surface coeffs="0.037913118842446136 0.06870772519039314 -0.10875752039644154 0.04225" id="120" type="sphere"/>
+    <surface coeffs="0.07388008140640989 -0.07130227505402231 -0.09782982564187503 0.04225" id="121" type="sphere"/>
+    <surface coeffs="0.08897214754414112 0.08694165211410448 0.07587737301598729 0.04225" id="122" type="sphere"/>
+    <surface coeffs="-0.03698302711710488 0.1408784014909229 -0.10474284149572705 0.04225" id="123" type="sphere"/>
+    <surface coeffs="-0.03698302711710488 -0.19245493184241047 -0.10474284149572705 0.04225" id="124" type="sphere"/>
+    <surface coeffs="-0.02428069661424781 0.05168393238830282 0.1302704892646539 0.04225" id="125" type="sphere"/>
+    <surface coeffs="-0.02428069661424781 0.05168393238830282 -0.20306284406867936 0.04225" id="126" type="sphere"/>
+    <surface coeffs="0.04578051975994746 0.1175901605138544 -0.0038022862212453434 0.04225" id="127" type="sphere"/>
+    <surface coeffs="-0.013741908464450836 0.18016577553053154 0.20276897514248216 0.04225" id="128" type="sphere"/>
+    <surface coeffs="-0.013741908464450836 -0.15316755780280183 0.20276897514248216 0.04225" id="129" type="sphere"/>
+    <surface coeffs="-0.013741908464450836 0.18016577553053154 -0.1305643581908511 0.04225" id="130" type="sphere"/>
+    <surface coeffs="-0.013741908464450836 -0.15316755780280183 -0.1305643581908511 0.04225" id="131" type="sphere"/>
+    <surface coeffs="0.19334606515602848 0.066228023881572 -0.07131104153532436 0.04225" id="132" type="sphere"/>
+    <surface coeffs="-0.13998726817730478 0.066228023881572 -0.07131104153532436 0.04225" id="133" type="sphere"/>
+    <surface coeffs="-0.031185656140686913 0.155914746052082 0.15331720509241947 0.04225" id="134" type="sphere"/>
+    <surface coeffs="-0.031185656140686913 -0.17741858728125126 0.15331720509241947 0.04225" id="135" type="sphere"/>
+    <surface coeffs="-0.031185656140686913 0.155914746052082 -0.1800161282409139 0.04225" id="136" type="sphere"/>
+    <surface coeffs="-0.031185656140686913 -0.17741858728125126 -0.1800161282409139 0.04225" id="137" type="sphere"/>
+    <surface coeffs="0.08018004492442865 0.016826191928232426 -0.016389596762212966 0.04225" id="138" type="sphere"/>
+    <surface coeffs="0.00483733774062417 0.08148156718302602 -0.09280826916311341 0.04225" id="139" type="sphere"/>
+    <surface coeffs="0.0978117791120118 -0.06105974469736897 -0.07844553364014112 0.04225" id="140" type="sphere"/>
+    <surface coeffs="0.0339716094789545 0.044675266050854034 0.18588381767108564 0.04225" id="141" type="sphere"/>
+    <surface coeffs="0.0339716094789545 0.044675266050854034 -0.14744951566224762 0.04225" id="142" type="sphere"/>
+    <surface coeffs="0.15974177782488064 -0.11470938473074832 -0.055880627694202434 0.04225" id="143" type="sphere"/>
+    <surface coeffs="-0.17359155550845262 -0.11470938473074832 -0.055880627694202434 0.04225" id="144" type="sphere"/>
+    <surface coeffs="0.007714449992858363 -0.07841911930069978 0.019169121324834393 0.04225" id="145" type="sphere"/>
+    <surface coeffs="-0.09772496056025104 -0.009435582016802613 -0.0973407871549632 0.04225" id="146" type="sphere"/>
+    <surface coeffs="-0.08460405234526575 0.18619630211681182 0.10902502186367324 0.04225" id="147" type="sphere"/>
+    <surface coeffs="-0.08460405234526575 -0.14713703121652144 0.10902502186367324 0.04225" id="148" type="sphere"/>
+    <surface coeffs="0.08530970516294267 -0.09740948712101977 0.031538023054709596 0.04225" id="149" type="sphere"/>
+    <surface coeffs="0.002049400245853761 0.10800782833319489 -0.08566939881823532 0.04225" id="150" type="sphere"/>
+    <surface coeffs="0.036269774055772475 -0.0034880407315701634 0.08814057857502322 0.04225" id="151" type="sphere"/>
+    <surface coeffs="0.012607957648281654 0.08090056062626749 0.0712211465420014 0.04225" id="152" type="sphere"/>
+    <surface coeffs="-0.03741489943578313 0.1221086949309545 0.0439406213163509 0.04225" id="153" type="sphere"/>
+    <surface coeffs="0.0851566223435044 -0.1191899586548319 -0.07364696787394387 0.04225" id="154" type="sphere"/>
+    <surface coeffs="-0.03992848096555457 0.020214072912877246 -0.11315245980004196 0.04225" id="155" type="sphere"/>
+    <surface coeffs="-0.050315754084578224 0.017099968565308377 0.056173125204605934 0.04225" id="156" type="sphere"/>
+    <surface coeffs="-0.06766398274549851 -0.07303578778642877 0.005410963730880458 0.04225" id="157" type="sphere"/>
+    <surface coeffs="0.06408439016382617 0.05853632250550789 0.00432158793112436 0.04225" id="158" type="sphere"/>
+    <surface coeffs="-0.013801059755509382 0.20222454587424032 0.19241766819445416 0.04225" id="159" type="sphere"/>
+    <surface coeffs="-0.013801059755509382 -0.13110878745909305 0.19241766819445416 0.04225" id="160" type="sphere"/>
+    <surface coeffs="-0.013801059755509382 0.20222454587424032 -0.1409156651388792 0.04225" id="161" type="sphere"/>
+    <surface coeffs="-0.013801059755509382 -0.13110878745909305 -0.1409156651388792 0.04225" id="162" type="sphere"/>
+    <surface coeffs="0.03522733749799645 0.11305459403611595 0.10295023150858529 0.04225" id="163" type="sphere"/>
+    <surface coeffs="-0.03831660450870228 -0.09880556873790897 0.08578673946744877 0.04225" id="164" type="sphere"/>
+    <surface coeffs="0.03782024089160585 0.07732392719766301 -0.002829721222114334 0.04225" id="165" type="sphere"/>
+    <surface coeffs="-0.060112483234699754 -0.06134051474053648 -0.04363492058502072 0.04225" id="166" type="sphere"/>
+    <surface coeffs="0.10930502703326198 -0.020465939386398402 0.15848543253913627 0.04225" id="167" type="sphere"/>
+    <surface coeffs="0.10930502703326198 -0.020465939386398402 -0.174847900794197 0.04225" id="168" type="sphere"/>
+    <surface coeffs="-0.04821581350719811 -0.10913639479587178 -0.11108700962300094 0.04225" id="169" type="sphere"/>
+    <surface coeffs="-0.09934364058994583 0.10405480441904197 -0.0241798283786806 0.04225" id="170" type="sphere"/>
+    <surface coeffs="0.11425630804159204 0.19090246541367445 -0.06077533762167586 0.04225" id="171" type="sphere"/>
+    <surface coeffs="0.11425630804159204 -0.14243086791965892 -0.06077533762167586 0.04225" id="172" type="sphere"/>
+    <surface coeffs="0.0217205011905508 0.02506675532845576 0.029520031599966412 0.04225" id="173" type="sphere"/>
+    <surface coeffs="0.12543650024083502 0.19371057833811733 -0.04147065769319469 0.04225" id="174" type="sphere"/>
+    <surface coeffs="-0.20789683309249835 0.19371057833811733 -0.04147065769319469 0.04225" id="175" type="sphere"/>
+    <surface coeffs="0.12543650024083502 -0.13962275499521593 -0.04147065769319469 0.04225" id="176" type="sphere"/>
+    <surface coeffs="-0.20789683309249835 -0.13962275499521593 -0.04147065769319469 0.04225" id="177" type="sphere"/>
+    <surface coeffs="-0.10385697059087434 -0.07239894918409101 0.047733316833160344 0.04225" id="178" type="sphere"/>
+    <surface coeffs="-0.02484533723289073 0.03270050374260325 0.009261180540203251 0.04225" id="179" type="sphere"/>
+    <surface coeffs="-0.10535768832641407 -0.10806169784882003 0.009669056668934639 0.04225" id="180" type="sphere"/>
+    <surface coeffs="0.20034387531341857 0.02227169438582799 0.18731645229850835 0.04225" id="181" type="sphere"/>
+    <surface coeffs="-0.13298945801991469 0.02227169438582799 0.18731645229850835 0.04225" id="182" type="sphere"/>
+    <surface coeffs="0.20034387531341857 0.02227169438582799 -0.1460168810348249 0.04225" id="183" type="sphere"/>
+    <surface coeffs="-0.13298945801991469 0.02227169438582799 -0.1460168810348249 0.04225" id="184" type="sphere"/>
+    <surface coeffs="0.1631199405760454 0.04092483075648701 0.07754240264809376 0.04225" id="185" type="sphere"/>
+    <surface coeffs="-0.17021339275728786 0.04092483075648701 0.07754240264809376 0.04225" id="186" type="sphere"/>
+    <surface coeffs="0.102073447728939 -0.060687493103351975 0.01519685776716928 0.04225" id="187" type="sphere"/>
+    <surface coeffs="0.07991907014916044 0.13595762576986914 -0.09622087197472673 0.04225" id="188" type="sphere"/>
+    <surface coeffs="0.07991907014916044 -0.19737570756346412 -0.09622087197472673 0.04225" id="189" type="sphere"/>
+    <surface coeffs="0.06943697893246592 0.16968387178879557 0.11988276699391809 0.04225" id="190" type="sphere"/>
+    <surface coeffs="0.06943697893246592 -0.1636494615445378 0.11988276699391809 0.04225" id="191" type="sphere"/>
+    <surface coeffs="-0.07059889277962383 0.1489570802132021 0.09503214710980579 0.04225" id="192" type="sphere"/>
+    <surface coeffs="-0.07059889277962383 -0.18437625312013128 0.09503214710980579 0.04225" id="193" type="sphere"/>
+    <surface coeffs="0.010468267263955 0.15608028424842002 -0.00511339431390323 0.04225" id="194" type="sphere"/>
+    <surface coeffs="0.010468267263955 -0.17725304908491335 -0.00511339431390323 0.04225" id="195" type="sphere"/>
+    <surface coeffs="0.15972123417512762 0.06883522628651784 -0.11009587369358387 0.04225" id="196" type="sphere"/>
+    <surface coeffs="-0.17361209915820575 0.06883522628651784 -0.11009587369358387 0.04225" id="197" type="sphere"/>
+    <surface coeffs="0.08981179676970563 0.06434186205946246 0.032607233968534766 0.04225" id="198" type="sphere"/>
+    <surface coeffs="0.0033702311569031584 0.10040789537086448 0.1867831868031803 0.04225" id="199" type="sphere"/>
+    <surface coeffs="0.0033702311569031584 0.10040789537086448 -0.14655014653015297 0.04225" id="200" type="sphere"/>
+    <surface coeffs="0.05329895281727448 -0.02881629065525937 0.15193411713913396 0.04225" id="201" type="sphere"/>
+    <surface coeffs="0.05329895281727448 -0.02881629065525937 -0.1813992161941993 0.04225" id="202" type="sphere"/>
+    <surface coeffs="0.14663786554095865 -0.0001831711922081758 0.173437280372308 0.04225" id="203" type="sphere"/>
+    <surface coeffs="-0.18669546779237473 -0.0001831711922081758 0.173437280372308 0.04225" id="204" type="sphere"/>
+    <surface coeffs="0.14663786554095865 -0.0001831711922081758 -0.15989605296102538 0.04225" id="205" type="sphere"/>
+    <surface coeffs="-0.18669546779237473 -0.0001831711922081758 -0.15989605296102538 0.04225" id="206" type="sphere"/>
+    <surface coeffs="0.006886156712931468 0.0325721225173089 -0.10785254014381473 0.04225" id="207" type="sphere"/>
+    <surface coeffs="0.05946426530734861 0.17562994884896627 0.11256068342977466 0.04225" id="208" type="sphere"/>
+    <surface coeffs="0.05946426530734861 -0.1577033844843671 0.11256068342977466 0.04225" id="209" type="sphere"/>
+    <surface coeffs="-0.0745211393530899 0.18602539894086317 0.07061211191996841 0.04225" id="210" type="sphere"/>
+    <surface coeffs="-0.0745211393530899 -0.1473079343924702 0.07061211191996841 0.04225" id="211" type="sphere"/>
+    <surface coeffs="0.15971361633210523 -0.02416800360737892 0.062334297185282495 0.04225" id="212" type="sphere"/>
+    <surface coeffs="-0.17361971700122802 -0.02416800360737892 0.062334297185282495 0.04225" id="213" type="sphere"/>
+    <surface coeffs="-0.014191419448261688 0.11114945107218455 0.0903966514577691 0.04225" id="214" type="sphere"/>
+    <surface coeffs="0.20641337800388493 -0.04689191572037532 0.03093832014609521 0.04225" id="215" type="sphere"/>
+    <surface coeffs="-0.12691995532944833 -0.04689191572037532 0.03093832014609521 0.04225" id="216" type="sphere"/>
+    <surface coeffs="0.042925982468302815 0.0705557158479822 -0.09611246805643225 0.04225" id="217" type="sphere"/>
+    <surface coeffs="0.09174118398607445 -0.02102680816462299 -0.12074712654412828 0.04225" id="218" type="sphere"/>
+    <surface coeffs="0.1871144659776534 0.14219092895822716 0.0030395151604761805 0.04225" id="219" type="sphere"/>
+    <surface coeffs="-0.14621886735567996 0.14219092895822716 0.0030395151604761805 0.04225" id="220" type="sphere"/>
+    <surface coeffs="0.1871144659776534 -0.1911424043751062 0.0030395151604761805 0.04225" id="221" type="sphere"/>
+    <surface coeffs="-0.14621886735567996 -0.1911424043751062 0.0030395151604761805 0.04225" id="222" type="sphere"/>
+    <surface coeffs="-0.08858601205119498 -0.05740809172565153 0.0018937978357634888 0.04225" id="223" type="sphere"/>
+    <surface coeffs="-0.06956272452538859 -0.03258611645335985 0.1876749617320655 0.04225" id="224" type="sphere"/>
+    <surface coeffs="-0.06956272452538859 -0.03258611645335985 -0.14565837160126788 0.04225" id="225" type="sphere"/>
+    <surface coeffs="0.06480048668590577 0.08039356693483157 -0.0495807099830502 0.04225" id="226" type="sphere"/>
+    <surface coeffs="0.11976882848311299 0.024414887718198774 0.059001075831400684 0.04225" id="227" type="sphere"/>
+    <surface coeffs="0.055815690196973966 -0.03866224334773988 0.12934415570493119 0.04225" id="228" type="sphere"/>
+    <surface coeffs="0.055815690196973966 -0.03866224334773988 -0.20398917762840219 0.04225" id="229" type="sphere"/>
+    <surface coeffs="-0.07057140884385227 -0.033261585924167725 -0.11308117958912334 0.04225" id="230" type="sphere"/>
+    <surface coeffs="0.0191891610992464 -0.08777511864372084 0.09496767886953814 0.04225" id="231" type="sphere"/>
+    <surface coeffs="0.11357577214048964 -0.07231206070759028 -0.01862315233444045 0.04225" id="232" type="sphere"/>
+    <surface coeffs="0.028822870329182626 0.09660360434040871 -0.10994545899370212 0.04225" id="233" type="sphere"/>
+    <surface coeffs="-0.030272006016200004 0.04272149160139638 -0.11143715881676097 0.04225" id="234" type="sphere"/>
+    <surface coeffs="0.09719339210824351 0.04131007428864286 0.14476192535372884 0.04225" id="235" type="sphere"/>
+    <surface coeffs="0.09719339210824351 0.04131007428864286 -0.18857140797960453 0.04225" id="236" type="sphere"/>
+    <surface coeffs="0.1075803128789849 -0.02104725713738881 -0.03274843538002781 0.04225" id="237" type="sphere"/>
+    <surface coeffs="0.1392019576325615 -0.08814436128642017 -0.11479828495132216 0.04225" id="238" type="sphere"/>
+    <surface coeffs="-0.19413137570077177 -0.08814436128642017 -0.11479828495132216 0.04225" id="239" type="sphere"/>
+    <surface coeffs="0.10847197677361597 0.1461592302081176 0.08841042383901798 0.04225" id="240" type="sphere"/>
+    <surface coeffs="0.10847197677361597 -0.18717410312521576 0.08841042383901798 0.04225" id="241" type="sphere"/>
+    <surface coeffs="0.045127058382085194 0.0967807216119615 0.0967653665331849 0.04225" id="242" type="sphere"/>
+    <surface coeffs="-0.022464471745497094 0.07259277205138148 0.10785219865057927 0.04225" id="243" type="sphere"/>
+    <surface coeffs="0.10606353369903221 0.03928703229725711 0.17228776926768086 0.04225" id="244" type="sphere"/>
+    <surface coeffs="0.10606353369903221 0.03928703229725711 -0.1610455640656524 0.04225" id="245" type="sphere"/>
+    <surface coeffs="0.14815941963538226 0.11277655887534538 0.03808687169681996 0.04225" id="246" type="sphere"/>
+    <surface coeffs="-0.185173913697951 0.11277655887534538 0.03808687169681996 0.04225" id="247" type="sphere"/>
+    <surface coeffs="0.15693581669068946 0.10114531834923532 -0.04992356195780889 0.04225" id="248" type="sphere"/>
+    <surface coeffs="-0.17639751664264391 0.10114531834923532 -0.04992356195780889 0.04225" id="249" type="sphere"/>
+    <surface coeffs="0.13264357875679378 0.10919805128102966 -0.04769549879176793 0.04225" id="250" type="sphere"/>
+    <surface coeffs="-0.2006897545765396 0.10919805128102966 -0.04769549879176793 0.04225" id="251" type="sphere"/>
+    <surface coeffs="0.13916564434634993 0.13134319648704007 0.07015912178562622 0.04225" id="252" type="sphere"/>
+    <surface coeffs="-0.19416768898698333 0.13134319648704007 0.07015912178562622 0.04225" id="253" type="sphere"/>
+    <surface coeffs="0.13916564434634993 -0.2019901368462932 0.07015912178562622 0.04225" id="254" type="sphere"/>
+    <surface coeffs="-0.19416768898698333 -0.2019901368462932 0.07015912178562622 0.04225" id="255" type="sphere"/>
+    <surface coeffs="-0.10026688643231585 0.1564443552698941 0.1751728484794038 0.04225" id="256" type="sphere"/>
+    <surface coeffs="-0.10026688643231585 -0.17688897806343928 0.1751728484794038 0.04225" id="257" type="sphere"/>
+    <surface coeffs="-0.10026688643231585 0.1564443552698941 -0.15816048485392958 0.04225" id="258" type="sphere"/>
+    <surface coeffs="-0.10026688643231585 -0.17688897806343928 -0.15816048485392958 0.04225" id="259" type="sphere"/>
+    <surface coeffs="0.16555436030710213 -0.015531455219433332 0.02691614144169241 0.04225" id="260" type="sphere"/>
+    <surface coeffs="-0.16777897302623124 -0.015531455219433332 0.02691614144169241 0.04225" id="261" type="sphere"/>
+    <surface coeffs="0.152805274648522 0.18166556620660584 0.040488366683789634 0.04225" id="262" type="sphere"/>
+    <surface coeffs="-0.18052805868481137 0.18166556620660584 0.040488366683789634 0.04225" id="263" type="sphere"/>
+    <surface coeffs="0.152805274648522 -0.15166776712672753 0.040488366683789634 0.04225" id="264" type="sphere"/>
+    <surface coeffs="-0.18052805868481137 -0.15166776712672753 0.040488366683789634 0.04225" id="265" type="sphere"/>
+    <surface coeffs="0.07231116694829032 0.08785370537091952 0.09997055589943346 0.04225" id="266" type="sphere"/>
+    <surface coeffs="-0.10576424362412257 0.09874497232579027 -0.05820080940738992 0.04225" id="267" type="sphere"/>
+    <surface coeffs="0.046877953125145755 -0.059492732184222796 -0.055635341857650844 0.04225" id="268" type="sphere"/>
+    <surface coeffs="0.1239423066569788 0.14183046274229005 -0.06583818749209458 0.04225" id="269" type="sphere"/>
+    <surface coeffs="0.1239423066569788 -0.19150287059104332 -0.06583818749209458 0.04225" id="270" type="sphere"/>
+    <surface coeffs="0.0013087859341976982 -0.06327594480884835 -0.05382522074205143 0.04225" id="271" type="sphere"/>
+    <surface coeffs="0.11058883669906516 -0.038954175820645864 0.16834558789033005 0.04225" id="272" type="sphere"/>
+    <surface coeffs="0.11058883669906516 -0.038954175820645864 -0.16498774544300332 0.04225" id="273" type="sphere"/>
+    <surface coeffs="-0.02657010065724863 0.013144978841080679 0.050587944514051575 0.04225" id="274" type="sphere"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true.dat b/tests/regression_tests/unstructured_mesh/inputs_true.dat
index dba721d7ed..55fdf825bc 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -48,7 +48,7 @@
     <batches>10</batches>
     <source strength="1.0">
       <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform" />
+        <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true0.dat b/tests/regression_tests/unstructured_mesh/inputs_true0.dat
index 7c3b5a53a3..45e15c5971 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true0.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true0.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -48,7 +48,7 @@
     <batches>10</batches>
     <source strength="1.0">
       <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform" />
+        <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true1.dat b/tests/regression_tests/unstructured_mesh/inputs_true1.dat
index 2a0ca5168c..d47985ceb2 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true1.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true1.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -48,7 +48,7 @@
     <batches>10</batches>
     <source strength="1.0">
       <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform" />
+        <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true10.dat b/tests/regression_tests/unstructured_mesh/inputs_true10.dat
index 1290a98357..943ef2dc8e 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true10.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true10.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -48,7 +48,7 @@
     <batches>10</batches>
     <source strength="1.0">
       <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform" />
+        <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true11.dat b/tests/regression_tests/unstructured_mesh/inputs_true11.dat
index 5edb5cf0ff..d0888b4b8b 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true11.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true11.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -48,7 +48,7 @@
     <batches>10</batches>
     <source strength="1.0">
       <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform" />
+        <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true12.dat b/tests/regression_tests/unstructured_mesh/inputs_true12.dat
index d8def3b5b6..b431b412e6 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true12.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true12.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -48,7 +48,7 @@
     <batches>10</batches>
     <source strength="1.0">
       <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform" />
+        <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true13.dat b/tests/regression_tests/unstructured_mesh/inputs_true13.dat
index 3afb0ce50e..f53e733a88 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true13.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true13.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -48,7 +48,7 @@
     <batches>10</batches>
     <source strength="1.0">
       <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform" />
+        <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true14.dat b/tests/regression_tests/unstructured_mesh/inputs_true14.dat
index b7de468eab..05bdf3ae9d 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true14.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true14.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -48,7 +48,7 @@
     <batches>10</batches>
     <source strength="1.0">
       <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform" />
+        <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true15.dat b/tests/regression_tests/unstructured_mesh/inputs_true15.dat
index bdb1dd0374..67c8af4276 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true15.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true15.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -48,7 +48,7 @@
     <batches>10</batches>
     <source strength="1.0">
       <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform" />
+        <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true2.dat b/tests/regression_tests/unstructured_mesh/inputs_true2.dat
index b2a998786d..78ff40199a 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true2.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true2.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -48,7 +48,7 @@
     <batches>10</batches>
     <source strength="1.0">
       <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform" />
+        <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true3.dat b/tests/regression_tests/unstructured_mesh/inputs_true3.dat
index 4a66dc2a6c..fe55154934 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true3.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true3.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane" />
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -48,7 +48,7 @@
     <batches>10</batches>
     <source strength="1.0">
       <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform" />
+        <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true4.dat b/tests/regression_tests/unstructured_mesh/inputs_true4.dat
index 7006c0f417..843632fdd6 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true4.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true4.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="13" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="14" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="15" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="13" material="13" name="fuel" region="73 -74 75 -76 77 -78" universe="5" />
-    <cell id="14" material="14" name="clad" region="(-73 | 74 | -75 | 76 | -77 | 78) (79 -80 81 -82 83 -84)" universe="5" />
-    <cell id="15" material="15" name="water" region="(-79 | 80 | -81 | 82 | -83 | 84) (85 -86 87 -88 89 -90)" universe="5" />
-    <surface coeffs="-5.0" id="73" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="74" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="75" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="76" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="77" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="78" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="79" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="80" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="81" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="82" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="83" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="84" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-15" id="85" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="15" id="86" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-15" id="87" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="15" id="88" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-15" id="89" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="15" id="90" name="maximum z" type="z-plane" />
+    <cell id="13" material="13" name="fuel" region="73 -74 75 -76 77 -78" universe="5"/>
+    <cell id="14" material="14" name="clad" region="(-73 | 74 | -75 | 76 | -77 | 78) (79 -80 81 -82 83 -84)" universe="5"/>
+    <cell id="15" material="15" name="water" region="(-79 | 80 | -81 | 82 | -83 | 84) (85 -86 87 -88 89 -90)" universe="5"/>
+    <surface coeffs="-5.0" id="73" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="74" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="75" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="76" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="77" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="78" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="79" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="80" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="81" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="82" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="83" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="84" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-15" id="85" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="15" id="86" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-15" id="87" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="15" id="88" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-15" id="89" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="15" id="90" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -48,7 +48,7 @@
     <batches>10</batches>
     <source strength="1.0">
       <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform" />
+        <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -56,7 +56,7 @@
           <parameters>0.0 1.0</parameters>
         </phi>
       </space>
-      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional" />
+      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional"/>
       <energy type="discrete">
         <parameters>15000000.0 1.0</parameters>
       </energy>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true5.dat b/tests/regression_tests/unstructured_mesh/inputs_true5.dat
index 6c20900fa7..dc9129d98a 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true5.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true5.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="16" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="17" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="18" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="16" material="16" name="fuel" region="91 -92 93 -94 95 -96" universe="6" />
-    <cell id="17" material="17" name="clad" region="(-91 | 92 | -93 | 94 | -95 | 96) (97 -98 99 -100 101 -102)" universe="6" />
-    <cell id="18" material="18" name="water" region="(-97 | 98 | -99 | 100 | -101 | 102) (103 -104 105 -106 107 -108)" universe="6" />
-    <surface coeffs="-5.0" id="91" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="92" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="93" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="94" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="95" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="96" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="97" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="98" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="99" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="100" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="101" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="102" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-15" id="103" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="15" id="104" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-15" id="105" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="15" id="106" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-15" id="107" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="15" id="108" name="maximum z" type="z-plane" />
+    <cell id="16" material="16" name="fuel" region="91 -92 93 -94 95 -96" universe="6"/>
+    <cell id="17" material="17" name="clad" region="(-91 | 92 | -93 | 94 | -95 | 96) (97 -98 99 -100 101 -102)" universe="6"/>
+    <cell id="18" material="18" name="water" region="(-97 | 98 | -99 | 100 | -101 | 102) (103 -104 105 -106 107 -108)" universe="6"/>
+    <surface coeffs="-5.0" id="91" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="92" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="93" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="94" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="95" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="96" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="97" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="98" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="99" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="100" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="101" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="102" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-15" id="103" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="15" id="104" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-15" id="105" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="15" id="106" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-15" id="107" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="15" id="108" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -48,7 +48,7 @@
     <batches>10</batches>
     <source strength="1.0">
       <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform" />
+        <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -56,7 +56,7 @@
           <parameters>0.0 1.0</parameters>
         </phi>
       </space>
-      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional" />
+      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional"/>
       <energy type="discrete">
         <parameters>15000000.0 1.0</parameters>
       </energy>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true6.dat b/tests/regression_tests/unstructured_mesh/inputs_true6.dat
index e0be903602..82bc307037 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true6.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true6.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="19" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="20" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="21" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="19" material="19" name="fuel" region="109 -110 111 -112 113 -114" universe="7" />
-    <cell id="20" material="20" name="clad" region="(-109 | 110 | -111 | 112 | -113 | 114) (115 -116 117 -118 119 -120)" universe="7" />
-    <cell id="21" material="21" name="water" region="(-115 | 116 | -117 | 118 | -119 | 120) (121 -122 123 -124 125 -126)" universe="7" />
-    <surface coeffs="-5.0" id="109" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="110" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="111" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="112" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="113" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="114" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="115" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="116" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="117" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="118" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="119" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="120" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-10" id="121" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="10" id="122" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-10" id="123" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="10" id="124" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-10" id="125" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="10" id="126" name="maximum z" type="z-plane" />
+    <cell id="19" material="19" name="fuel" region="109 -110 111 -112 113 -114" universe="7"/>
+    <cell id="20" material="20" name="clad" region="(-109 | 110 | -111 | 112 | -113 | 114) (115 -116 117 -118 119 -120)" universe="7"/>
+    <cell id="21" material="21" name="water" region="(-115 | 116 | -117 | 118 | -119 | 120) (121 -122 123 -124 125 -126)" universe="7"/>
+    <surface coeffs="-5.0" id="109" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="110" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="111" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="112" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="113" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="114" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="115" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="116" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="117" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="118" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="119" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="120" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-10" id="121" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="10" id="122" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-10" id="123" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="10" id="124" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-10" id="125" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="10" id="126" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -48,7 +48,7 @@
     <batches>10</batches>
     <source strength="1.0">
       <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform" />
+        <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -56,7 +56,7 @@
           <parameters>0.0 1.0</parameters>
         </phi>
       </space>
-      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional" />
+      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional"/>
       <energy type="discrete">
         <parameters>15000000.0 1.0</parameters>
       </energy>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true7.dat b/tests/regression_tests/unstructured_mesh/inputs_true7.dat
index 3a4cc1b830..b982c40d05 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true7.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true7.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="22" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="23" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="24" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="22" material="22" name="fuel" region="127 -128 129 -130 131 -132" universe="8" />
-    <cell id="23" material="23" name="clad" region="(-127 | 128 | -129 | 130 | -131 | 132) (133 -134 135 -136 137 -138)" universe="8" />
-    <cell id="24" material="24" name="water" region="(-133 | 134 | -135 | 136 | -137 | 138) (139 -140 141 -142 143 -144)" universe="8" />
-    <surface coeffs="-5.0" id="127" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="128" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="129" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="130" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="131" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="132" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="133" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="134" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="135" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="136" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="137" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="138" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-10" id="139" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="10" id="140" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-10" id="141" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="10" id="142" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-10" id="143" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="10" id="144" name="maximum z" type="z-plane" />
+    <cell id="22" material="22" name="fuel" region="127 -128 129 -130 131 -132" universe="8"/>
+    <cell id="23" material="23" name="clad" region="(-127 | 128 | -129 | 130 | -131 | 132) (133 -134 135 -136 137 -138)" universe="8"/>
+    <cell id="24" material="24" name="water" region="(-133 | 134 | -135 | 136 | -137 | 138) (139 -140 141 -142 143 -144)" universe="8"/>
+    <surface coeffs="-5.0" id="127" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="128" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="129" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="130" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="131" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="132" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="133" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="134" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="135" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="136" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="137" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="138" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-10" id="139" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="10" id="140" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-10" id="141" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="10" id="142" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-10" id="143" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="10" id="144" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -48,7 +48,7 @@
     <batches>10</batches>
     <source strength="1.0">
       <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform" />
+        <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -56,7 +56,7 @@
           <parameters>0.0 1.0</parameters>
         </phi>
       </space>
-      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional" />
+      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional"/>
       <energy type="discrete">
         <parameters>15000000.0 1.0</parameters>
       </energy>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true8.dat b/tests/regression_tests/unstructured_mesh/inputs_true8.dat
index bd19a95aea..1e3b6cb83e 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true8.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true8.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -48,7 +48,7 @@
     <batches>10</batches>
     <source strength="1.0">
       <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform" />
+        <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true9.dat b/tests/regression_tests/unstructured_mesh/inputs_true9.dat
index 2e595a96c9..cb35eb1867 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true9.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true9.dat
@@ -2,45 +2,45 @@
 <model>
   <materials>
     <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77" />
-      <nuclide ao="0.5145" name="Zr90" />
-      <nuclide ao="0.1122" name="Zr91" />
-      <nuclide ao="0.1715" name="Zr92" />
-      <nuclide ao="0.1738" name="Zr94" />
-      <nuclide ao="0.028" name="Zr96" />
+      <density units="g/cc" value="5.77"/>
+      <nuclide ao="0.5145" name="Zr90"/>
+      <nuclide ao="0.1122" name="Zr91"/>
+      <nuclide ao="0.1715" name="Zr92"/>
+      <nuclide ao="0.1738" name="Zr94"/>
+      <nuclide ao="0.028" name="Zr96"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
+      <density units="atom/b-cm" value="0.07416"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1" />
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1" />
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1" />
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane" />
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane" />
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane" />
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane" />
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane" />
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane" />
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane" />
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane" />
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane" />
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane" />
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane" />
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane" />
-    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane" />
-    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane" />
+    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
+    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
+    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
+    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
+    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
+    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
+    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
+    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
+    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
+    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
+    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
+    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
@@ -48,7 +48,7 @@
     <batches>10</batches>
     <source strength="1.0">
       <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform" />
+        <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
diff --git a/tests/regression_tests/void/inputs_true.dat b/tests/regression_tests/void/inputs_true.dat
index 443c168bd4..4e996c71d0 100644
--- a/tests/regression_tests/void/inputs_true.dat
+++ b/tests/regression_tests/void/inputs_true.dat
@@ -2,112 +2,112 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cm3" value="7.14" />
-      <nuclide ao="1.0" name="Zn64" />
+      <density units="g/cm3" value="7.14"/>
+      <nuclide ao="1.0" name="Zn64"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <cell id="2" material="void" region="1 -2" universe="1" />
-    <cell id="3" material="1" region="2 -3" universe="1" />
-    <cell id="4" material="void" region="3 -4" universe="1" />
-    <cell id="5" material="1" region="4 -5" universe="1" />
-    <cell id="6" material="void" region="5 -6" universe="1" />
-    <cell id="7" material="1" region="6 -7" universe="1" />
-    <cell id="8" material="void" region="7 -8" universe="1" />
-    <cell id="9" material="1" region="8 -9" universe="1" />
-    <cell id="10" material="void" region="9 -10" universe="1" />
-    <cell id="11" material="1" region="10 -11" universe="1" />
-    <cell id="12" material="void" region="11 -12" universe="1" />
-    <cell id="13" material="1" region="12 -13" universe="1" />
-    <cell id="14" material="void" region="13 -14" universe="1" />
-    <cell id="15" material="1" region="14 -15" universe="1" />
-    <cell id="16" material="void" region="15 -16" universe="1" />
-    <cell id="17" material="1" region="16 -17" universe="1" />
-    <cell id="18" material="void" region="17 -18" universe="1" />
-    <cell id="19" material="1" region="18 -19" universe="1" />
-    <cell id="20" material="void" region="19 -20" universe="1" />
-    <cell id="21" material="1" region="20 -21" universe="1" />
-    <cell id="22" material="void" region="21 -22" universe="1" />
-    <cell id="23" material="1" region="22 -23" universe="1" />
-    <cell id="24" material="void" region="23 -24" universe="1" />
-    <cell id="25" material="1" region="24 -25" universe="1" />
-    <cell id="26" material="void" region="25 -26" universe="1" />
-    <cell id="27" material="1" region="26 -27" universe="1" />
-    <cell id="28" material="void" region="27 -28" universe="1" />
-    <cell id="29" material="1" region="28 -29" universe="1" />
-    <cell id="30" material="void" region="29 -30" universe="1" />
-    <cell id="31" material="1" region="30 -31" universe="1" />
-    <cell id="32" material="void" region="31 -32" universe="1" />
-    <cell id="33" material="1" region="32 -33" universe="1" />
-    <cell id="34" material="void" region="33 -34" universe="1" />
-    <cell id="35" material="1" region="34 -35" universe="1" />
-    <cell id="36" material="void" region="35 -36" universe="1" />
-    <cell id="37" material="1" region="36 -37" universe="1" />
-    <cell id="38" material="void" region="37 -38" universe="1" />
-    <cell id="39" material="1" region="38 -39" universe="1" />
-    <cell id="40" material="void" region="39 -40" universe="1" />
-    <cell id="41" material="1" region="40 -41" universe="1" />
-    <cell id="42" material="void" region="41 -42" universe="1" />
-    <cell id="43" material="1" region="42 -43" universe="1" />
-    <cell id="44" material="void" region="43 -44" universe="1" />
-    <cell id="45" material="1" region="44 -45" universe="1" />
-    <cell id="46" material="void" region="45 -46" universe="1" />
-    <cell id="47" material="1" region="46 -47" universe="1" />
-    <cell id="48" material="void" region="47 -48" universe="1" />
-    <cell id="49" material="1" region="48 -49" universe="1" />
-    <cell id="50" material="void" region="49 -50" universe="1" />
-    <cell id="51" material="1" region="50" universe="1" />
-    <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 3.020408163265306" id="2" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 5.040816326530612" id="3" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 7.061224489795918" id="4" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 9.081632653061224" id="5" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 11.102040816326529" id="6" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 13.122448979591836" id="7" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 15.142857142857142" id="8" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 17.163265306122447" id="9" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 19.183673469387752" id="10" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 21.204081632653057" id="11" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 23.224489795918366" id="12" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 25.24489795918367" id="13" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 27.265306122448976" id="14" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 29.285714285714285" id="15" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 31.30612244897959" id="16" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 33.326530612244895" id="17" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 35.3469387755102" id="18" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 37.367346938775505" id="19" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 39.38775510204081" id="20" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 41.408163265306115" id="21" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 43.42857142857142" id="22" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 45.44897959183673" id="23" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 47.469387755102034" id="24" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 49.48979591836734" id="25" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 51.51020408163265" id="26" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 53.53061224489795" id="27" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 55.55102040816326" id="28" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 57.57142857142857" id="29" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 59.59183673469387" id="30" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 61.61224489795918" id="31" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 63.63265306122448" id="32" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 65.65306122448979" id="33" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 67.67346938775509" id="34" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 69.6938775510204" id="35" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 71.71428571428571" id="36" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 73.73469387755101" id="37" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 75.75510204081633" id="38" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 77.77551020408163" id="39" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 79.79591836734693" id="40" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 81.81632653061223" id="41" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 83.83673469387755" id="42" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 85.85714285714285" id="43" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 87.87755102040815" id="44" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 89.89795918367346" id="45" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 91.91836734693877" id="46" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 93.93877551020407" id="47" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 95.95918367346938" id="48" type="sphere" />
-    <surface coeffs="0.0 0.0 0.0 97.97959183673468" id="49" type="sphere" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100.0" id="50" type="sphere" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <cell id="2" material="void" region="1 -2" universe="1"/>
+    <cell id="3" material="1" region="2 -3" universe="1"/>
+    <cell id="4" material="void" region="3 -4" universe="1"/>
+    <cell id="5" material="1" region="4 -5" universe="1"/>
+    <cell id="6" material="void" region="5 -6" universe="1"/>
+    <cell id="7" material="1" region="6 -7" universe="1"/>
+    <cell id="8" material="void" region="7 -8" universe="1"/>
+    <cell id="9" material="1" region="8 -9" universe="1"/>
+    <cell id="10" material="void" region="9 -10" universe="1"/>
+    <cell id="11" material="1" region="10 -11" universe="1"/>
+    <cell id="12" material="void" region="11 -12" universe="1"/>
+    <cell id="13" material="1" region="12 -13" universe="1"/>
+    <cell id="14" material="void" region="13 -14" universe="1"/>
+    <cell id="15" material="1" region="14 -15" universe="1"/>
+    <cell id="16" material="void" region="15 -16" universe="1"/>
+    <cell id="17" material="1" region="16 -17" universe="1"/>
+    <cell id="18" material="void" region="17 -18" universe="1"/>
+    <cell id="19" material="1" region="18 -19" universe="1"/>
+    <cell id="20" material="void" region="19 -20" universe="1"/>
+    <cell id="21" material="1" region="20 -21" universe="1"/>
+    <cell id="22" material="void" region="21 -22" universe="1"/>
+    <cell id="23" material="1" region="22 -23" universe="1"/>
+    <cell id="24" material="void" region="23 -24" universe="1"/>
+    <cell id="25" material="1" region="24 -25" universe="1"/>
+    <cell id="26" material="void" region="25 -26" universe="1"/>
+    <cell id="27" material="1" region="26 -27" universe="1"/>
+    <cell id="28" material="void" region="27 -28" universe="1"/>
+    <cell id="29" material="1" region="28 -29" universe="1"/>
+    <cell id="30" material="void" region="29 -30" universe="1"/>
+    <cell id="31" material="1" region="30 -31" universe="1"/>
+    <cell id="32" material="void" region="31 -32" universe="1"/>
+    <cell id="33" material="1" region="32 -33" universe="1"/>
+    <cell id="34" material="void" region="33 -34" universe="1"/>
+    <cell id="35" material="1" region="34 -35" universe="1"/>
+    <cell id="36" material="void" region="35 -36" universe="1"/>
+    <cell id="37" material="1" region="36 -37" universe="1"/>
+    <cell id="38" material="void" region="37 -38" universe="1"/>
+    <cell id="39" material="1" region="38 -39" universe="1"/>
+    <cell id="40" material="void" region="39 -40" universe="1"/>
+    <cell id="41" material="1" region="40 -41" universe="1"/>
+    <cell id="42" material="void" region="41 -42" universe="1"/>
+    <cell id="43" material="1" region="42 -43" universe="1"/>
+    <cell id="44" material="void" region="43 -44" universe="1"/>
+    <cell id="45" material="1" region="44 -45" universe="1"/>
+    <cell id="46" material="void" region="45 -46" universe="1"/>
+    <cell id="47" material="1" region="46 -47" universe="1"/>
+    <cell id="48" material="void" region="47 -48" universe="1"/>
+    <cell id="49" material="1" region="48 -49" universe="1"/>
+    <cell id="50" material="void" region="49 -50" universe="1"/>
+    <cell id="51" material="1" region="50" universe="1"/>
+    <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 3.020408163265306" id="2" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 5.040816326530612" id="3" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 7.061224489795918" id="4" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 9.081632653061224" id="5" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 11.102040816326529" id="6" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 13.122448979591836" id="7" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 15.142857142857142" id="8" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 17.163265306122447" id="9" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 19.183673469387752" id="10" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 21.204081632653057" id="11" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 23.224489795918366" id="12" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 25.24489795918367" id="13" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 27.265306122448976" id="14" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 29.285714285714285" id="15" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 31.30612244897959" id="16" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 33.326530612244895" id="17" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 35.3469387755102" id="18" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 37.367346938775505" id="19" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 39.38775510204081" id="20" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 41.408163265306115" id="21" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 43.42857142857142" id="22" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 45.44897959183673" id="23" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 47.469387755102034" id="24" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 49.48979591836734" id="25" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 51.51020408163265" id="26" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 53.53061224489795" id="27" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 55.55102040816326" id="28" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 57.57142857142857" id="29" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 59.59183673469387" id="30" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 61.61224489795918" id="31" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 63.63265306122448" id="32" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 65.65306122448979" id="33" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 67.67346938775509" id="34" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 69.6938775510204" id="35" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 71.71428571428571" id="36" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 73.73469387755101" id="37" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 75.75510204081633" id="38" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 77.77551020408163" id="39" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 79.79591836734693" id="40" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 81.81632653061223" id="41" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 83.83673469387755" id="42" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 85.85714285714285" id="43" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 87.87755102040815" id="44" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 89.89795918367346" id="45" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 91.91836734693877" id="46" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 93.93877551020407" id="47" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 95.95918367346938" id="48" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 97.97959183673468" id="49" type="sphere"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100.0" id="50" type="sphere"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
diff --git a/tests/regression_tests/volume_calc/inputs_true.dat b/tests/regression_tests/volume_calc/inputs_true.dat
index 879e05b8fc..e3a8162e3b 100644
--- a/tests/regression_tests/volume_calc/inputs_true.dat
+++ b/tests/regression_tests/volume_calc/inputs_true.dat
@@ -2,27 +2,27 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cc" value="1.0" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <nuclide ao="0.0001" name="B10" />
-      <sab name="c_H_in_H2O" />
+      <density units="g/cc" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <nuclide ao="0.0001" name="B10"/>
+      <sab name="c_H_in_H2O"/>
     </material>
     <material depletable="true" id="2">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
-      <nuclide ao="0.1" name="Mo99" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
+      <nuclide ao="0.1" name="Mo99"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="2" region="-1 -3 5" universe="0" />
-    <cell id="2" material="1" region="-2 3" universe="0" />
-    <cell id="3" material="1" region="-4 -3" universe="0" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="z-cylinder" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 5.0 1.0" id="2" type="sphere" />
-    <surface coeffs="5.0" id="3" type="z-plane" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 -5.0 1.0" id="4" type="sphere" />
-    <surface coeffs="-5.0" id="5" type="z-plane" />
+    <cell id="1" material="2" region="-1 -3 5" universe="0"/>
+    <cell id="2" material="1" region="-2 3" universe="0"/>
+    <cell id="3" material="1" region="-4 -3" universe="0"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="z-cylinder"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 5.0 1.0" id="2" type="sphere"/>
+    <surface coeffs="5.0" id="3" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 -5.0 1.0" id="4" type="sphere"/>
+    <surface coeffs="-5.0" id="5" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>volume</run_mode>
@@ -53,7 +53,7 @@
       <samples>100</samples>
       <lower_left>-1.0 -1.0 -6.0</lower_left>
       <upper_right>1.0 1.0 6.0</upper_right>
-      <threshold threshold="0.1" type="std_dev" />
+      <threshold threshold="0.1" type="std_dev"/>
     </volume_calc>
     <volume_calc>
       <domain_type>material</domain_type>
@@ -61,7 +61,7 @@
       <samples>100</samples>
       <lower_left>-1.0 -1.0 -6.0</lower_left>
       <upper_right>1.0 1.0 6.0</upper_right>
-      <threshold threshold="0.1" type="rel_err" />
+      <threshold threshold="0.1" type="rel_err"/>
     </volume_calc>
     <volume_calc>
       <domain_type>cell</domain_type>
@@ -69,7 +69,7 @@
       <samples>100</samples>
       <lower_left>-1.0 -1.0 -6.0</lower_left>
       <upper_right>1.0 1.0 6.0</upper_right>
-      <threshold threshold="0.05" type="variance" />
+      <threshold threshold="0.05" type="variance"/>
     </volume_calc>
   </settings>
   </model>
diff --git a/tests/regression_tests/volume_calc/inputs_true_mg.dat b/tests/regression_tests/volume_calc/inputs_true_mg.dat
index f114bd8c2f..2ace5cd3c9 100644
--- a/tests/regression_tests/volume_calc/inputs_true_mg.dat
+++ b/tests/regression_tests/volume_calc/inputs_true_mg.dat
@@ -3,26 +3,26 @@
   <materials>
     <cross_sections>mg_lib.h5</cross_sections>
     <material id="1">
-      <density units="g/cc" value="1.0" />
-      <nuclide ao="2.0" name="H1" />
-      <nuclide ao="1.0" name="O16" />
-      <nuclide ao="0.0001" name="B10" />
+      <density units="g/cc" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <nuclide ao="0.0001" name="B10"/>
     </material>
     <material depletable="true" id="2">
-      <density units="g/cc" value="4.5" />
-      <nuclide ao="1.0" name="U235" />
-      <nuclide ao="0.1" name="Mo99" />
+      <density units="g/cc" value="4.5"/>
+      <nuclide ao="1.0" name="U235"/>
+      <nuclide ao="0.1" name="Mo99"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="2" region="-1 -3 5" universe="0" />
-    <cell id="2" material="1" region="-2 3" universe="0" />
-    <cell id="3" material="1" region="-4 -3" universe="0" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="z-cylinder" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 5.0 1.0" id="2" type="sphere" />
-    <surface coeffs="5.0" id="3" type="z-plane" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 -5.0 1.0" id="4" type="sphere" />
-    <surface coeffs="-5.0" id="5" type="z-plane" />
+    <cell id="1" material="2" region="-1 -3 5" universe="0"/>
+    <cell id="2" material="1" region="-2 3" universe="0"/>
+    <cell id="3" material="1" region="-4 -3" universe="0"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="z-cylinder"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 5.0 1.0" id="2" type="sphere"/>
+    <surface coeffs="5.0" id="3" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 -5.0 1.0" id="4" type="sphere"/>
+    <surface coeffs="-5.0" id="5" type="z-plane"/>
   </geometry>
   <settings>
     <run_mode>volume</run_mode>
@@ -54,7 +54,7 @@
       <samples>100</samples>
       <lower_left>-1.0 -1.0 -6.0</lower_left>
       <upper_right>1.0 1.0 6.0</upper_right>
-      <threshold threshold="0.1" type="std_dev" />
+      <threshold threshold="0.1" type="std_dev"/>
     </volume_calc>
     <volume_calc>
       <domain_type>material</domain_type>
@@ -62,7 +62,7 @@
       <samples>100</samples>
       <lower_left>-1.0 -1.0 -6.0</lower_left>
       <upper_right>1.0 1.0 6.0</upper_right>
-      <threshold threshold="0.1" type="rel_err" />
+      <threshold threshold="0.1" type="rel_err"/>
     </volume_calc>
     <volume_calc>
       <domain_type>cell</domain_type>
@@ -70,7 +70,7 @@
       <samples>100</samples>
       <lower_left>-1.0 -1.0 -6.0</lower_left>
       <upper_right>1.0 1.0 6.0</upper_right>
-      <threshold threshold="0.05" type="variance" />
+      <threshold threshold="0.05" type="variance"/>
     </volume_calc>
   </settings>
   </model>
diff --git a/tests/regression_tests/weightwindows/inputs_true.dat b/tests/regression_tests/weightwindows/inputs_true.dat
index 16f03a4a0b..16966ccafe 100644
--- a/tests/regression_tests/weightwindows/inputs_true.dat
+++ b/tests/regression_tests/weightwindows/inputs_true.dat
@@ -2,33 +2,33 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cc" value="2.3" />
-      <nuclide ao="0.168018676" name="H1" />
-      <nuclide ao="1.93244e-05" name="H2" />
-      <nuclide ao="0.561814465" name="O16" />
-      <nuclide ao="0.00021401" name="O17" />
-      <nuclide ao="0.021365" name="Na23" />
-      <nuclide ao="0.021343" name="Al27" />
-      <nuclide ao="0.187439342" name="Si28" />
-      <nuclide ao="0.009517714" name="Si29" />
-      <nuclide ao="0.006273944" name="Si30" />
-      <nuclide ao="0.018026179" name="Ca40" />
-      <nuclide ao="0.00012031" name="Ca42" />
-      <nuclide ao="2.51033e-05" name="Ca43" />
-      <nuclide ao="0.000387892" name="Ca44" />
-      <nuclide ao="7.438e-07" name="Ca46" />
-      <nuclide ao="3.47727e-05" name="Ca48" />
-      <nuclide ao="0.000248179" name="Fe54" />
-      <nuclide ao="0.003895875" name="Fe56" />
-      <nuclide ao="8.99727e-05" name="Fe57" />
-      <nuclide ao="1.19737e-05" name="Fe58" />
+      <density units="g/cc" value="2.3"/>
+      <nuclide ao="0.168018676" name="H1"/>
+      <nuclide ao="1.93244e-05" name="H2"/>
+      <nuclide ao="0.561814465" name="O16"/>
+      <nuclide ao="0.00021401" name="O17"/>
+      <nuclide ao="0.021365" name="Na23"/>
+      <nuclide ao="0.021343" name="Al27"/>
+      <nuclide ao="0.187439342" name="Si28"/>
+      <nuclide ao="0.009517714" name="Si29"/>
+      <nuclide ao="0.006273944" name="Si30"/>
+      <nuclide ao="0.018026179" name="Ca40"/>
+      <nuclide ao="0.00012031" name="Ca42"/>
+      <nuclide ao="2.51033e-05" name="Ca43"/>
+      <nuclide ao="0.000387892" name="Ca44"/>
+      <nuclide ao="7.438e-07" name="Ca46"/>
+      <nuclide ao="3.47727e-05" name="Ca48"/>
+      <nuclide ao="0.000248179" name="Fe54"/>
+      <nuclide ao="0.003895875" name="Fe56"/>
+      <nuclide ao="8.99727e-05" name="Fe57"/>
+      <nuclide ao="1.19737e-05" name="Fe58"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" region="-1" universe="1" />
-    <cell id="2" material="void" region="1 -2" universe="1" />
-    <surface coeffs="0.0 0.0 0.0 240" id="1" type="sphere" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 250" id="2" type="sphere" />
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <cell id="2" material="void" region="1 -2" universe="1"/>
+    <surface coeffs="0.0 0.0 0.0 240" id="1" type="sphere"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 250" id="2" type="sphere"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
diff --git a/tests/unit_tests/test_cell.py b/tests/unit_tests/test_cell.py
index cef77f1608..1df3df9c55 100644
--- a/tests/unit_tests/test_cell.py
+++ b/tests/unit_tests/test_cell.py
@@ -1,4 +1,4 @@
-import xml.etree. ElementTree as ET
+import lxml.etree as ET
 
 import numpy as np
 from uncertainties import ufloat
diff --git a/tests/unit_tests/test_deplete_nuclide.py b/tests/unit_tests/test_deplete_nuclide.py
index e73af69550..07db57bd6d 100644
--- a/tests/unit_tests/test_deplete_nuclide.py
+++ b/tests/unit_tests/test_deplete_nuclide.py
@@ -1,6 +1,6 @@
 """Tests for the openmc.deplete.Nuclide class."""
 
-import xml.etree.ElementTree as ET
+import lxml.etree as ET
 import copy
 import numpy as np
 import pytest
@@ -345,4 +345,4 @@ def test_deepcopy():
     assert copied_nuc == nuc
     # Mutate the original and verify the copy remains intact
     nuc *= 2
-    assert copied_nuc != nuc
\ No newline at end of file
+    assert copied_nuc != nuc
diff --git a/tests/unit_tests/test_geometry.py b/tests/unit_tests/test_geometry.py
index f99232ff25..3b2deee285 100644
--- a/tests/unit_tests/test_geometry.py
+++ b/tests/unit_tests/test_geometry.py
@@ -1,4 +1,4 @@
-import xml.etree.ElementTree as ET
+import lxml.etree as ET
 from pathlib import Path
 
 import numpy as np
diff --git a/tests/unit_tests/test_lattice.py b/tests/unit_tests/test_lattice.py
index 99bc284b0e..97cd898435 100644
--- a/tests/unit_tests/test_lattice.py
+++ b/tests/unit_tests/test_lattice.py
@@ -1,5 +1,5 @@
 from math import sqrt
-import xml.etree.ElementTree as ET
+import lxml.etree as ET
 
 import openmc
 import pytest
diff --git a/tests/unit_tests/test_universe.py b/tests/unit_tests/test_universe.py
index fc92de9c78..aedc814383 100644
--- a/tests/unit_tests/test_universe.py
+++ b/tests/unit_tests/test_universe.py
@@ -1,4 +1,4 @@
-import xml.etree.ElementTree as ET
+import lxml.etree as ET
 
 import numpy as np
 import openmc