From 4507139173cbe0f21173e3f4db5cbe0a972b43a5 Mon Sep 17 00:00:00 2001
From: Sterling Harper <sterlingmharper@gmail.com>
Date: Mon, 21 Sep 2015 10:08:04 -0400
Subject: [PATCH 01/10] Add PythonAPI functionality to TestHarness

---
 tests/input_set.py                         | 609 +++++++++++++++++++++
 tests/test_filter_cell/geometry.xml        | 181 ------
 tests/test_filter_cell/inputs_true.dat     |   1 +
 tests/test_filter_cell/materials.xml       | 272 ---------
 tests/test_filter_cell/results_true.dat    |  14 +-
 tests/test_filter_cell/settings.xml        |  19 -
 tests/test_filter_cell/tallies.xml         |   9 -
 tests/test_filter_cell/test_filter_cell.py |  23 +-
 tests/testing_harness.py                   |  85 ++-
 9 files changed, 722 insertions(+), 491 deletions(-)
 create mode 100644 tests/input_set.py
 delete mode 100644 tests/test_filter_cell/geometry.xml
 create mode 100644 tests/test_filter_cell/inputs_true.dat
 delete mode 100644 tests/test_filter_cell/materials.xml
 delete mode 100644 tests/test_filter_cell/settings.xml
 delete mode 100644 tests/test_filter_cell/tallies.xml

diff --git a/tests/input_set.py b/tests/input_set.py
new file mode 100644
index 0000000000..95cf07a142
--- /dev/null
+++ b/tests/input_set.py
@@ -0,0 +1,609 @@
+import openmc
+
+
+class InputSet(object):
+    def __init__(self):
+        self.settings = openmc.SettingsFile()
+        self.materials = openmc.MaterialsFile()
+        self.geometry = openmc.GeometryFile()
+        self.tallies = None
+        self.plots = None
+
+    def export(self):
+        self.settings.export_to_xml()
+        self.materials.export_to_xml()
+        self.geometry.export_to_xml()
+        if self.tallies is not None: self.tallies.export_to_xml()
+        if self.plots is not None: self.plots.export_to_xml()
+
+    def build_default_materials_and_geometry(self):
+        # Define materials.
+        fuel = openmc.Material(name='Fuel', material_id=1)
+        fuel.set_density('g/cm3', 10.062)
+        fuel.add_nuclide("U-234", 4.9476e-6)
+        fuel.add_nuclide("U-235", 4.8218e-4)
+        fuel.add_nuclide("U-236", 9.0402e-5)
+        fuel.add_nuclide("U-238", 2.1504e-2)
+        fuel.add_nuclide("Np-237", 7.3733e-6)
+        fuel.add_nuclide("Pu-238", 1.5148e-6)
+        fuel.add_nuclide("Pu-239", 1.3955e-4)
+        fuel.add_nuclide("Pu-240", 3.4405e-5)
+        fuel.add_nuclide("Pu-241", 2.1439e-5)
+        fuel.add_nuclide("Pu-242", 3.7422e-6)
+        fuel.add_nuclide("Am-241", 4.5041e-7)
+        fuel.add_nuclide("Am-242m", 9.2301e-9)
+        fuel.add_nuclide("Am-243", 4.7878e-7)
+        fuel.add_nuclide("Cm-242", 1.0485e-7)
+        fuel.add_nuclide("Cm-243", 1.4268e-9)
+        fuel.add_nuclide("Cm-244", 8.8756e-8)
+        fuel.add_nuclide("Cm-245", 3.5285e-9)
+        fuel.add_nuclide("Mo-95", 2.6497e-5)
+        fuel.add_nuclide("Tc-99", 3.2772e-5)
+        fuel.add_nuclide("Ru-101", 3.0742e-5)
+        fuel.add_nuclide("Ru-103", 2.3505e-6)
+        fuel.add_nuclide("Ag-109", 2.0009e-6)
+        fuel.add_nuclide("Xe-135", 1.0801e-8)
+        fuel.add_nuclide("Cs-133", 3.4612e-5)
+        fuel.add_nuclide("Nd-143", 2.6078e-5)
+        fuel.add_nuclide("Nd-145", 1.9898e-5)
+        fuel.add_nuclide("Sm-147", 1.6128e-6)
+        fuel.add_nuclide("Sm-149", 1.1627e-7)
+        fuel.add_nuclide("Sm-150", 7.1727e-6)
+        fuel.add_nuclide("Sm-151", 5.4947e-7)
+        fuel.add_nuclide("Sm-152", 3.0221e-6)
+        fuel.add_nuclide("Eu-153", 2.6209e-6)
+        fuel.add_nuclide("Gd-155", 1.5369e-9)
+        fuel.add_nuclide("O-16", 4.5737e-2)
+
+        clad = openmc.Material(name='Cladding', material_id=2)
+        clad.set_density('g/cm3', 5.77)
+        clad.add_nuclide("Zr-90", 0.5145)
+        clad.add_nuclide("Zr-91", 0.1122)
+        clad.add_nuclide("Zr-92", 0.1715)
+        clad.add_nuclide("Zr-94", 0.1738)
+        clad.add_nuclide("Zr-96", 0.0280)
+
+        cold_water = openmc.Material(name='Cold borated water', material_id=3)
+        cold_water.set_density('atom/b-cm', 0.07416)
+        cold_water.add_nuclide("H-1", 2.0)
+        cold_water.add_nuclide("O-16", 1.0)
+        cold_water.add_nuclide("B-10", 6.490e-4)
+        cold_water.add_nuclide("B-11", 2.689e-3)
+        cold_water.add_s_alpha_beta('HH2O', '71t')
+
+        hot_water = openmc.Material(name='Hot borated water', material_id=4)
+        hot_water.set_density('atom/b-cm', 0.06614)
+        hot_water.add_nuclide("H-1", 2.0)
+        hot_water.add_nuclide("O-16", 1.0)
+        hot_water.add_nuclide("B-10", 6.490e-4)
+        hot_water.add_nuclide("B-11", 2.689e-3)
+        hot_water.add_s_alpha_beta('HH2O', '71t')
+
+        rpv_steel = openmc.Material(name='Reactor pressure vessel steel',
+             material_id=5)
+        rpv_steel.set_density('g/cm3', 7.9)
+        rpv_steel.add_nuclide("Fe-54", 0.05437098, 'wo')
+        rpv_steel.add_nuclide("Fe-56", 0.88500663, 'wo')
+        rpv_steel.add_nuclide("Fe-57", 0.0208008, 'wo')
+        rpv_steel.add_nuclide("Fe-58", 0.00282159, 'wo')
+        rpv_steel.add_nuclide("Ni-58", 0.0067198, 'wo')
+        rpv_steel.add_nuclide("Ni-60", 0.0026776, 'wo')
+        rpv_steel.add_nuclide("Ni-61", 0.0001183, 'wo')
+        rpv_steel.add_nuclide("Ni-62", 0.0003835, 'wo')
+        rpv_steel.add_nuclide("Ni-64", 0.0001008, 'wo')
+        rpv_steel.add_nuclide("Mn-55", 0.01, 'wo')
+        rpv_steel.add_nuclide("Mo-92", 0.000849, 'wo')
+        rpv_steel.add_nuclide("Mo-94", 0.0005418, 'wo')
+        rpv_steel.add_nuclide("Mo-95", 0.0009438, 'wo')
+        rpv_steel.add_nuclide("Mo-96", 0.0010002, 'wo')
+        rpv_steel.add_nuclide("Mo-97", 0.0005796, 'wo')
+        rpv_steel.add_nuclide("Mo-98", 0.0014814, 'wo')
+        rpv_steel.add_nuclide("Mo-100", 0.0006042, 'wo')
+        rpv_steel.add_nuclide("Si-28", 0.00367464, 'wo')
+        rpv_steel.add_nuclide("Si-29", 0.00019336, 'wo')
+        rpv_steel.add_nuclide("Si-30", 0.000132, 'wo')
+        rpv_steel.add_nuclide("Cr-50", 0.00010435, 'wo')
+        rpv_steel.add_nuclide("Cr-52", 0.002092475, 'wo')
+        rpv_steel.add_nuclide("Cr-53", 0.00024185, 'wo')
+        rpv_steel.add_nuclide("Cr-54", 6.1325e-05, 'wo')
+        rpv_steel.add_nuclide("C-Nat", 0.0025, 'wo')
+        rpv_steel.add_nuclide("Cu-63", 0.0013696, 'wo')
+        rpv_steel.add_nuclide("Cu-65", 0.0006304, 'wo')
+
+        lower_rad_ref = openmc.Material(name='Lower radial reflector',
+             material_id=6)
+        lower_rad_ref.set_density('g/cm3', 4.32)
+        lower_rad_ref.add_nuclide("H-1", 0.0095661, 'wo')
+        lower_rad_ref.add_nuclide("O-16", 0.0759107, 'wo')
+        lower_rad_ref.add_nuclide("B-10", 3.08409e-5, 'wo')
+        lower_rad_ref.add_nuclide("B-11", 1.40499e-4, 'wo')
+        lower_rad_ref.add_nuclide("Fe-54", 0.035620772088, 'wo')
+        lower_rad_ref.add_nuclide("Fe-56", 0.579805982228, 'wo')
+        lower_rad_ref.add_nuclide("Fe-57", 0.01362750048, 'wo')
+        lower_rad_ref.add_nuclide("Fe-58", 0.001848545204, 'wo')
+        lower_rad_ref.add_nuclide("Ni-58", 0.055298376566, 'wo')
+        lower_rad_ref.add_nuclide("Ni-60", 0.022034425592, 'wo')
+        lower_rad_ref.add_nuclide("Ni-61", 0.000973510811, 'wo')
+        lower_rad_ref.add_nuclide("Ni-62", 0.003155886695, 'wo')
+        lower_rad_ref.add_nuclide("Ni-64", 0.000829500336, 'wo')
+        lower_rad_ref.add_nuclide("Mn-55", 0.0182870, 'wo')
+        lower_rad_ref.add_nuclide("Si-28", 0.00839976771, 'wo')
+        lower_rad_ref.add_nuclide("Si-29", 0.00044199679, 'wo')
+        lower_rad_ref.add_nuclide("Si-30", 0.0003017355, 'wo')
+        lower_rad_ref.add_nuclide("Cr-50", 0.007251360806, 'wo')
+        lower_rad_ref.add_nuclide("Cr-52", 0.145407678031, 'wo')
+        lower_rad_ref.add_nuclide("Cr-53", 0.016806340306, 'wo')
+        lower_rad_ref.add_nuclide("Cr-54", 0.004261520857, 'wo')
+        lower_rad_ref.add_s_alpha_beta('HH2O', '71t')
+
+        upper_rad_ref = openmc.Material(name='Upper radial reflector /'
+                                             'Top plate region', material_id=7)
+        upper_rad_ref.set_density('g/cm3', 4.28)
+        upper_rad_ref.add_nuclide("H-1", 0.0086117, 'wo')
+        upper_rad_ref.add_nuclide("O-16", 0.0683369, 'wo')
+        upper_rad_ref.add_nuclide("B-10", 2.77638e-5, 'wo')
+        upper_rad_ref.add_nuclide("B-11", 1.26481e-4, 'wo')
+        upper_rad_ref.add_nuclide("Fe-54", 0.035953677186, 'wo')
+        upper_rad_ref.add_nuclide("Fe-56", 0.585224740891, 'wo')
+        upper_rad_ref.add_nuclide("Fe-57", 0.01375486056, 'wo')
+        upper_rad_ref.add_nuclide("Fe-58", 0.001865821363, 'wo')
+        upper_rad_ref.add_nuclide("Ni-58", 0.055815129186, 'wo')
+        upper_rad_ref.add_nuclide("Ni-60", 0.022240333032, 'wo')
+        upper_rad_ref.add_nuclide("Ni-61", 0.000982608081, 'wo')
+        upper_rad_ref.add_nuclide("Ni-62", 0.003185377845, 'wo')
+        upper_rad_ref.add_nuclide("Ni-64", 0.000837251856, 'wo')
+        upper_rad_ref.add_nuclide("Mn-55", 0.0184579, 'wo')
+        upper_rad_ref.add_nuclide("Si-28", 0.00847831314, 'wo')
+        upper_rad_ref.add_nuclide("Si-29", 0.00044612986, 'wo')
+        upper_rad_ref.add_nuclide("Si-30", 0.000304557, 'wo')
+        upper_rad_ref.add_nuclide("Cr-50", 0.00731912987, 'wo')
+        upper_rad_ref.add_nuclide("Cr-52", 0.146766614995, 'wo')
+        upper_rad_ref.add_nuclide("Cr-53", 0.01696340737, 'wo')
+        upper_rad_ref.add_nuclide("Cr-54", 0.004301347765, 'wo')
+        upper_rad_ref.add_s_alpha_beta('HH2O', '71t')
+
+        bot_plate = openmc.Material(name='Bottom plate region', material_id=8)
+        bot_plate.set_density('g/cm3', 7.184)
+        bot_plate.add_nuclide("H-1", 0.0011505, 'wo')
+        bot_plate.add_nuclide("O-16", 0.0091296, 'wo')
+        bot_plate.add_nuclide("B-10", 3.70915e-6, 'wo')
+        bot_plate.add_nuclide("B-11", 1.68974e-5, 'wo')
+        bot_plate.add_nuclide("Fe-54", 0.03855611055, 'wo')
+        bot_plate.add_nuclide("Fe-56", 0.627585036425, 'wo')
+        bot_plate.add_nuclide("Fe-57", 0.014750478, 'wo')
+        bot_plate.add_nuclide("Fe-58", 0.002000875025, 'wo')
+        bot_plate.add_nuclide("Ni-58", 0.059855207342, 'wo')
+        bot_plate.add_nuclide("Ni-60", 0.023850159704, 'wo')
+        bot_plate.add_nuclide("Ni-61", 0.001053732407, 'wo')
+        bot_plate.add_nuclide("Ni-62", 0.003415945715, 'wo')
+        bot_plate.add_nuclide("Ni-64", 0.000897854832, 'wo')
+        bot_plate.add_nuclide("Mn-55", 0.0197940, 'wo')
+        bot_plate.add_nuclide("Si-28", 0.00909197802, 'wo')
+        bot_plate.add_nuclide("Si-29", 0.00047842098, 'wo')
+        bot_plate.add_nuclide("Si-30", 0.000326601, 'wo')
+        bot_plate.add_nuclide("Cr-50", 0.007848910646, 'wo')
+        bot_plate.add_nuclide("Cr-52", 0.157390026871, 'wo')
+        bot_plate.add_nuclide("Cr-53", 0.018191270146, 'wo')
+        bot_plate.add_nuclide("Cr-54", 0.004612692337, 'wo')
+        bot_plate.add_s_alpha_beta('HH2O', '71t')
+
+        bot_nozzle = openmc.Material(name='Bottom nozzle region', material_id=9)
+        bot_nozzle.set_density('g/cm3', 2.53)
+        bot_nozzle.add_nuclide("H-1", 0.0245014, 'wo')
+        bot_nozzle.add_nuclide("O-16", 0.1944274, 'wo')
+        bot_nozzle.add_nuclide("B-10", 7.89917e-5, 'wo')
+        bot_nozzle.add_nuclide("B-11", 3.59854e-4, 'wo')
+        bot_nozzle.add_nuclide("Fe-54", 0.030411411144, 'wo')
+        bot_nozzle.add_nuclide("Fe-56", 0.495012237964, 'wo')
+        bot_nozzle.add_nuclide("Fe-57", 0.01163454624, 'wo')
+        bot_nozzle.add_nuclide("Fe-58", 0.001578204652, 'wo')
+        bot_nozzle.add_nuclide("Ni-58", 0.047211231662, 'wo')
+        bot_nozzle.add_nuclide("Ni-60", 0.018811987544, 'wo')
+        bot_nozzle.add_nuclide("Ni-61", 0.000831139127, 'wo')
+        bot_nozzle.add_nuclide("Ni-62", 0.002694352115, 'wo')
+        bot_nozzle.add_nuclide("Ni-64", 0.000708189552, 'wo')
+        bot_nozzle.add_nuclide("Mn-55", 0.0156126, 'wo')
+        bot_nozzle.add_nuclide("Si-28", 0.007171335558, 'wo')
+        bot_nozzle.add_nuclide("Si-29", 0.000377356542, 'wo')
+        bot_nozzle.add_nuclide("Si-30", 0.0002576079, 'wo')
+        bot_nozzle.add_nuclide("Cr-50", 0.006190885148, 'wo')
+        bot_nozzle.add_nuclide("Cr-52", 0.124142524198, 'wo')
+        bot_nozzle.add_nuclide("Cr-53", 0.014348496148, 'wo')
+        bot_nozzle.add_nuclide("Cr-54", 0.003638294506, 'wo')
+        bot_nozzle.add_s_alpha_beta('HH2O', '71t')
+
+        top_nozzle = openmc.Material(name='Top nozzle region', material_id=10)
+        top_nozzle.set_density('g/cm3', 1.746)
+        top_nozzle.add_nuclide("H-1", 0.0358870, 'wo')
+        top_nozzle.add_nuclide("O-16", 0.2847761, 'wo')
+        top_nozzle.add_nuclide("B-10", 1.15699e-4, 'wo')
+        top_nozzle.add_nuclide("B-11", 5.27075e-4, 'wo')
+        top_nozzle.add_nuclide("Fe-54", 0.02644016154, 'wo')
+        top_nozzle.add_nuclide("Fe-56", 0.43037146399, 'wo')
+        top_nozzle.add_nuclide("Fe-57", 0.0101152584, 'wo')
+        top_nozzle.add_nuclide("Fe-58", 0.00137211607, 'wo')
+        top_nozzle.add_nuclide("Ni-58", 0.04104621835, 'wo')
+        top_nozzle.add_nuclide("Ni-60", 0.0163554502, 'wo')
+        top_nozzle.add_nuclide("Ni-61", 0.000722605975, 'wo')
+        top_nozzle.add_nuclide("Ni-62", 0.002342513875, 'wo')
+        top_nozzle.add_nuclide("Ni-64", 0.0006157116, 'wo')
+        top_nozzle.add_nuclide("Mn-55", 0.0135739, 'wo')
+        top_nozzle.add_nuclide("Si-28", 0.006234853554, 'wo')
+        top_nozzle.add_nuclide("Si-29", 0.000328078746, 'wo')
+        top_nozzle.add_nuclide("Si-30", 0.0002239677, 'wo')
+        top_nozzle.add_nuclide("Cr-50", 0.005382452306, 'wo')
+        top_nozzle.add_nuclide("Cr-52", 0.107931450781, 'wo')
+        top_nozzle.add_nuclide("Cr-53", 0.012474806806, 'wo')
+        top_nozzle.add_nuclide("Cr-54", 0.003163190107, 'wo')
+        top_nozzle.add_s_alpha_beta('HH2O', '71t')
+
+        top_fa = openmc.Material(name='Top of fuel assemblies', material_id=11)
+        top_fa.set_density('g/cm3', 3.044)
+        top_fa.add_nuclide("H-1", 0.0162913, 'wo')
+        top_fa.add_nuclide("O-16", 0.1292776, 'wo')
+        top_fa.add_nuclide("B-10", 5.25228e-5, 'wo')
+        top_fa.add_nuclide("B-11", 2.39272e-4, 'wo')
+        top_fa.add_nuclide("Zr-90", 0.43313403903, 'wo')
+        top_fa.add_nuclide("Zr-91", 0.09549277374, 'wo')
+        top_fa.add_nuclide("Zr-92", 0.14759527104, 'wo')
+        top_fa.add_nuclide("Zr-94", 0.15280552077, 'wo')
+        top_fa.add_nuclide("Zr-96", 0.02511169542, 'wo')
+        top_fa.add_s_alpha_beta('HH2O', '71t')
+
+        bot_fa = openmc.Material(name='Bottom of fuel assemblies', material_id=12)
+        bot_fa.set_density('g/cm3', 1.762)
+        bot_fa.add_nuclide("H-1", 0.0292856, 'wo')
+        bot_fa.add_nuclide("O-16", 0.2323919, 'wo')
+        bot_fa.add_nuclide("B-10", 9.44159e-5, 'wo')
+        bot_fa.add_nuclide("B-11", 4.30120e-4, 'wo')
+        bot_fa.add_nuclide("Zr-90", 0.3741373658, 'wo')
+        bot_fa.add_nuclide("Zr-91", 0.0824858164, 'wo')
+        bot_fa.add_nuclide("Zr-92", 0.1274914944, 'wo')
+        bot_fa.add_nuclide("Zr-94", 0.1319920622, 'wo')
+        bot_fa.add_nuclide("Zr-96", 0.0216912612, 'wo')
+        bot_fa.add_s_alpha_beta('HH2O', '71t')
+
+        # Define the materials file.
+        self.materials.default_xs = '71c'
+        self.materials.add_materials((fuel, clad, cold_water, hot_water,
+             rpv_steel, lower_rad_ref, upper_rad_ref, bot_plate, bot_nozzle,
+             top_nozzle, top_fa, bot_fa))
+
+        # Define surfaces.
+        s1 = openmc.ZCylinder(R=0.41, surface_id=1)
+        s2 = openmc.ZCylinder(R=0.475, surface_id=2)
+        s3 = openmc.ZCylinder(R=0.56, surface_id=3)
+        s4 = openmc.ZCylinder(R=0.62, surface_id=4)
+        s5 = openmc.ZCylinder(R=187.6, surface_id=5)
+        s6 = openmc.ZCylinder(R=209.0, surface_id=6)
+        s7 = openmc.ZCylinder(R=229.0, surface_id=7)
+        s8 = openmc.ZCylinder(R=249.0, surface_id=8)
+        s8.boundary_type = 'vacuum'
+
+        s31 = openmc.ZPlane(z0=-229.0, surface_id=31)
+        s31.boundary_type = 'vacuum'
+        s32 = openmc.ZPlane(z0=-199.0, surface_id=32)
+        s33 = openmc.ZPlane(z0=-193.0, surface_id=33)
+        s34 = openmc.ZPlane(z0=-183.0, surface_id=34)
+        s35 = openmc.ZPlane(z0=0.0, surface_id=35)
+        s36 = openmc.ZPlane(z0=183.0, surface_id=36)
+        s37 = openmc.ZPlane(z0=203.0, surface_id=37)
+        s38 = openmc.ZPlane(z0=215.0, surface_id=38)
+        s39 = openmc.ZPlane(z0=223.0, surface_id=39)
+        s39.boundary_type = 'vacuum'
+
+        # Define pin cells.
+        fuel_cold = openmc.Universe(name='Fuel pin, cladding, cold water',
+                                    universe_id=1)
+        c21 = openmc.Cell(cell_id=21)
+        c21.add_surface(s1, -1)
+        c21.fill = fuel
+        c22 = openmc.Cell(cell_id=22)
+        c22.add_surface(s1, +1)
+        c22.add_surface(s2, -1)
+        c22.fill = clad
+        c23 = openmc.Cell(cell_id=23)
+        c23.add_surface(s2, +1)
+        c23.fill = cold_water
+        fuel_cold.add_cells((c21, c22, c23))
+
+        tube_cold = openmc.Universe(name='Instrumentation guide tube, '
+                                    'cold water', universe_id=2)
+        c24 = openmc.Cell(cell_id=24)
+        c24.add_surface(s3, -1)
+        c24.fill = cold_water
+        c25 = openmc.Cell(cell_id=25)
+        c25.add_surface(s3, +1)
+        c25.add_surface(s4, -1)
+        c25.fill = clad
+        c26 = openmc.Cell(cell_id=26)
+        c26.add_surface(s4, +1)
+        c26.fill = cold_water
+        tube_cold.add_cells((c24, c25, c26))
+
+        fuel_hot = openmc.Universe(name='Fuel pin, cladding, hot water',
+                                   universe_id=3)
+        c27 = openmc.Cell(cell_id=27)
+        c27.add_surface(s1, -1)
+        c27.fill = fuel
+        c28 = openmc.Cell(cell_id=28)
+        c28.add_surface(s1, +1)
+        c28.add_surface(s2, -1)
+        c28.fill = clad
+        c29 = openmc.Cell(cell_id=29)
+        c29.add_surface(s2, +1)
+        c29.fill = hot_water
+        fuel_hot.add_cells((c27, c28, c29))
+
+        tube_hot = openmc.Universe(name='Instrumentation guide tube, hot water',
+                                   universe_id=4)
+        c30 = openmc.Cell(cell_id=30)
+        c30.add_surface(s3, -1)
+        c30.fill = hot_water
+        c31 = openmc.Cell(cell_id=31)
+        c31.add_surface(s3, +1)
+        c31.add_surface(s4, -1)
+        c31.fill = clad
+        c32 = openmc.Cell(cell_id=32)
+        c32.add_surface(s4, +1)
+        c32.fill = hot_water
+        tube_hot.add_cells((c30, c31, c32))
+
+        # Define fuel lattices.
+        l100 = openmc.RectLattice(name='Fuel assembly (lower half)',
+                                  lattice_id=100)
+        l100.dimension = (17, 17)
+        l100.lower_left = (-10.71, -10.71)
+        l100.pitch = (1.26, 1.26)
+        l100.universes = [
+             [fuel_cold]*17,
+             [fuel_cold]*17,
+             [fuel_cold]*5 + [tube_cold] + [fuel_cold]*2 + [tube_cold]
+                + [fuel_cold]*2 + [tube_cold] + [fuel_cold]*5,
+             [fuel_cold]*3 + [tube_cold] + [fuel_cold]*9 + [tube_cold]
+                + [fuel_cold]*3,
+             [fuel_cold]*17,
+             [fuel_cold]*2 + [tube_cold] + [fuel_cold]*2 + [tube_cold]
+                + [fuel_cold]*2 + [tube_cold] + [fuel_cold]*2 + [tube_cold]
+                + [fuel_cold]*2 + [tube_cold] + [fuel_cold]*2,
+             [fuel_cold]*17,
+             [fuel_cold]*17,
+             [fuel_cold]*2 + [tube_cold] + [fuel_cold]*2 + [tube_cold]
+                + [fuel_cold]*2 + [tube_cold] + [fuel_cold]*2 + [tube_cold]
+                + [fuel_cold]*2 + [tube_cold] + [fuel_cold]*2,
+             [fuel_cold]*17,
+             [fuel_cold]*17,
+             [fuel_cold]*2 + [tube_cold] + [fuel_cold]*2 + [tube_cold]
+                + [fuel_cold]*2 + [tube_cold] + [fuel_cold]*2 + [tube_cold]
+                + [fuel_cold]*2 + [tube_cold] + [fuel_cold]*2,
+             [fuel_cold]*17,
+             [fuel_cold]*3 + [tube_cold] + [fuel_cold]*9 + [tube_cold]
+                + [fuel_cold]*3,
+             [fuel_cold]*5 + [tube_cold] + [fuel_cold]*2 + [tube_cold]
+                + [fuel_cold]*2 + [tube_cold] + [fuel_cold]*5,
+             [fuel_cold]*17,
+             [fuel_cold]*17 ]
+
+        l101 = openmc.RectLattice(name='Fuel assembly (upper half)',
+                                  lattice_id=101)
+        l101.dimension = (17, 17)
+        l101.lower_left = (-10.71, -10.71)
+        l101.pitch = (1.26, 1.26)
+        l101.universes = [
+             [fuel_hot]*17,
+             [fuel_hot]*17,
+             [fuel_hot]*5 + [tube_hot] + [fuel_hot]*2 + [tube_hot]
+                + [fuel_hot]*2 + [tube_hot] + [fuel_hot]*5,
+             [fuel_hot]*3 + [tube_hot] + [fuel_hot]*9 + [tube_hot]
+                + [fuel_hot]*3,
+             [fuel_hot]*17,
+             [fuel_hot]*2 + [tube_hot] + [fuel_hot]*2 + [tube_hot]
+                + [fuel_hot]*2 + [tube_hot] + [fuel_hot]*2 + [tube_hot]
+                + [fuel_hot]*2 + [tube_hot] + [fuel_hot]*2,
+             [fuel_hot]*17,
+             [fuel_hot]*17,
+             [fuel_hot]*2 + [tube_hot] + [fuel_hot]*2 + [tube_hot]
+                + [fuel_hot]*2 + [tube_hot] + [fuel_hot]*2 + [tube_hot]
+                + [fuel_hot]*2 + [tube_hot] + [fuel_hot]*2,
+             [fuel_hot]*17,
+             [fuel_hot]*17,
+             [fuel_hot]*2 + [tube_hot] + [fuel_hot]*2 + [tube_hot]
+                + [fuel_hot]*2 + [tube_hot] + [fuel_hot]*2 + [tube_hot]
+                + [fuel_hot]*2 + [tube_hot] + [fuel_hot]*2,
+             [fuel_hot]*17,
+             [fuel_hot]*3 + [tube_hot] + [fuel_hot]*9 + [tube_hot]
+                + [fuel_hot]*3,
+             [fuel_hot]*5 + [tube_hot] + [fuel_hot]*2 + [tube_hot]
+                + [fuel_hot]*2 + [tube_hot] + [fuel_hot]*5,
+             [fuel_hot]*17,
+             [fuel_hot]*17 ]
+
+        # Define assemblies.
+        fa_cw = openmc.Universe(name='Water assembly (cold)',
+                                universe_id=5)
+        c50 = openmc.Cell(cell_id=50)
+        c50.add_surface(s34, +1)
+        c50.add_surface(s35, -1)
+        c50.fill = cold_water
+        fa_cw.add_cells((c50, ))
+
+        fa_hw = openmc.Universe(name='Water assembly (hot)',
+                                universe_id=7)
+        c70 = openmc.Cell(cell_id=70)
+        c70.add_surface(s35, +1)
+        c70.add_surface(s36, -1)
+        c70.fill = hot_water
+        fa_hw.add_cells((c70, ))
+
+        fa_cold = openmc.Universe(name='Fuel assemlby (cold)', universe_id=6)
+        c60 = openmc.Cell(cell_id=60)
+        c60.add_surface(s34, +1)
+        c60.add_surface(s35, -1)
+        c60.fill = l100
+        fa_cold.add_cells((c60, ))
+
+        fa_hot = openmc.Universe(name='Fuel assemlby (hot)', universe_id=8)
+        c80 = openmc.Cell(cell_id=80)
+        c80.add_surface(s35, +1)
+        c80.add_surface(s36, -1)
+        c80.fill = l101
+        fa_hot.add_cells((c80, ))
+
+        # Define core lattices
+        l200 = openmc.RectLattice(name='Core lattice (lower half)',
+                                  lattice_id=200)
+        l200.dimension = (21, 21)
+        l200.lower_left = (-224.91, -224.91)
+        l200.pitch = (21.42, 21.42)
+        l200.universes = [
+             [fa_cw]*21,
+             [fa_cw]*21,
+             [fa_cw]*7 + [fa_cold]*7 + [fa_cw]*7,
+             [fa_cw]*5 + [fa_cold]*11 + [fa_cw]*5,
+             [fa_cw]*4 + [fa_cold]*13 + [fa_cw]*4,
+             [fa_cw]*3 + [fa_cold]*15 + [fa_cw]*3,
+             [fa_cw]*3 + [fa_cold]*15 + [fa_cw]*3,
+             [fa_cw]*2 + [fa_cold]*17 + [fa_cw]*2,
+             [fa_cw]*2 + [fa_cold]*17 + [fa_cw]*2,
+             [fa_cw]*2 + [fa_cold]*17 + [fa_cw]*2,
+             [fa_cw]*2 + [fa_cold]*17 + [fa_cw]*2,
+             [fa_cw]*2 + [fa_cold]*17 + [fa_cw]*2,
+             [fa_cw]*2 + [fa_cold]*17 + [fa_cw]*2,
+             [fa_cw]*2 + [fa_cold]*17 + [fa_cw]*2,
+             [fa_cw]*3 + [fa_cold]*15 + [fa_cw]*3,
+             [fa_cw]*3 + [fa_cold]*15 + [fa_cw]*3,
+             [fa_cw]*4 + [fa_cold]*13 + [fa_cw]*4,
+             [fa_cw]*5 + [fa_cold]*11 + [fa_cw]*5,
+             [fa_cw]*7 + [fa_cold]*7 + [fa_cw]*7,
+             [fa_cw]*21,
+             [fa_cw]*21]
+
+        l201 = openmc.RectLattice(name='Core lattice (lower half)',
+                                  lattice_id=201)
+        l201.dimension = (21, 21)
+        l201.lower_left = (-224.91, -224.91)
+        l201.pitch = (21.42, 21.42)
+        l201.universes = [
+             [fa_hw]*21,
+             [fa_hw]*21,
+             [fa_hw]*7 + [fa_hot]*7 + [fa_hw]*7,
+             [fa_hw]*5 + [fa_hot]*11 + [fa_hw]*5,
+             [fa_hw]*4 + [fa_hot]*13 + [fa_hw]*4,
+             [fa_hw]*3 + [fa_hot]*15 + [fa_hw]*3,
+             [fa_hw]*3 + [fa_hot]*15 + [fa_hw]*3,
+             [fa_hw]*2 + [fa_hot]*17 + [fa_hw]*2,
+             [fa_hw]*2 + [fa_hot]*17 + [fa_hw]*2,
+             [fa_hw]*2 + [fa_hot]*17 + [fa_hw]*2,
+             [fa_hw]*2 + [fa_hot]*17 + [fa_hw]*2,
+             [fa_hw]*2 + [fa_hot]*17 + [fa_hw]*2,
+             [fa_hw]*2 + [fa_hot]*17 + [fa_hw]*2,
+             [fa_hw]*2 + [fa_hot]*17 + [fa_hw]*2,
+             [fa_hw]*3 + [fa_hot]*15 + [fa_hw]*3,
+             [fa_hw]*3 + [fa_hot]*15 + [fa_hw]*3,
+             [fa_hw]*4 + [fa_hot]*13 + [fa_hw]*4,
+             [fa_hw]*5 + [fa_hot]*11 + [fa_hw]*5,
+             [fa_hw]*7 + [fa_hot]*7 + [fa_hw]*7,
+             [fa_hw]*21,
+             [fa_hw]*21]
+
+        # Define root universe.
+        root = openmc.Universe(universe_id=0, name='root universe')
+        c1 = openmc.Cell(cell_id=1)
+        c1.add_surface(s6, -1)
+        c1.add_surface(s34, +1)
+        c1.add_surface(s35, -1)
+        c1.fill = l200
+
+        c2 = openmc.Cell(cell_id=2)
+        c2.add_surface(s6, -1)
+        c1.add_surface(s35, +1)
+        c2.add_surface(s36, -1)
+        c2.fill = l201
+
+        c3 = openmc.Cell(cell_id=3)
+        c3.add_surface(s7, -1)
+        c3.add_surface(s31, +1)
+        c3.add_surface(s32, -1)
+        c3.fill = bot_plate
+
+        c4 = openmc.Cell(cell_id=4)
+        c4.add_surface(s5, -1)
+        c4.add_surface(s32, +1)
+        c4.add_surface(s33, -1)
+        c4.fill = bot_nozzle
+
+        c5 = openmc.Cell(cell_id=5)
+        c5.add_surface(s5, -1)
+        c5.add_surface(s33, +1)
+        c5.add_surface(s34, -1)
+        c5.fill = bot_fa
+
+        c6 = openmc.Cell(cell_id=6)
+        c6.add_surface(s5, -1)
+        c6.add_surface(s36, +1)
+        c6.add_surface(s37, -1)
+        c6.fill = top_fa
+
+        c7 = openmc.Cell(cell_id=7)
+        c7.add_surface(s5, -1)
+        c7.add_surface(s37, +1)
+        c7.add_surface(s38, -1)
+        c7.fill = top_nozzle
+
+        c8 = openmc.Cell(cell_id=8)
+        c8.add_surface(s7, -1)
+        c8.add_surface(s38, +1)
+        c8.add_surface(s39, -1)
+        c8.fill = upper_rad_ref
+
+        c9 = openmc.Cell(cell_id=9)
+        c9.add_surface(s6, +1)
+        c9.add_surface(s7, -1)
+        c9.add_surface(s32, +1)
+        c9.add_surface(s38, -1)
+        c9.fill = bot_nozzle
+
+        c10 = openmc.Cell(cell_id=10)
+        c10.add_surface(s7, +1)
+        c10.add_surface(s8, -1)
+        c10.add_surface(s31, +1)
+        c10.add_surface(s39, -1)
+        c10.fill = rpv_steel
+
+        c11 = openmc.Cell(cell_id=11)
+        c11.add_surface(s5, +1)
+        c11.add_surface(s6, -1)
+        c11.add_surface(s32, +1)
+        c11.add_surface(s34, -1)
+        c11.fill = lower_rad_ref
+
+        c12 = openmc.Cell(cell_id=12)
+        c12.add_surface(s5, +1)
+        c12.add_surface(s6, -1)
+        c12.add_surface(s36, +1)
+        c12.add_surface(s38, -1)
+        c12.fill = upper_rad_ref
+
+        root.add_cells((c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12))
+
+        # Define the geometry file.
+        geometry = openmc.Geometry()
+        geometry.root_universe = root
+
+        self.geometry.geometry = geometry
+
+    def build_default_settings(self):
+        self.settings.batches = 10
+        self.settings.inactive = 5
+        self.settings.particles = 100
+        self.settings.set_source_space('box', (-160, -160, -183, 160, 160, 183))
+
+    def build_defualt_plots(self):
+        plot = openmc.Plot()
+        plot.filename = 'mat'
+        plot.origin = (125, 125, 0)
+        plot.width = (250, 250)
+        plot.pixels = (3000, 3000)
+        plot.color = 'mat'
+
+        self.plots.add_plot(plot)
diff --git a/tests/test_filter_cell/geometry.xml b/tests/test_filter_cell/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_filter_cell/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_filter_cell/inputs_true.dat b/tests/test_filter_cell/inputs_true.dat
new file mode 100644
index 0000000000..7455ded398
--- /dev/null
+++ b/tests/test_filter_cell/inputs_true.dat
@@ -0,0 +1 @@
+55f5e81110db78873ebe2d1411e6f3feb1df98ee14a6489a6b2d9c1164448e48a158b2c0f4efc8ea71d6aabe2e64d029b997d656e5975d2ab549ea365480933b
\ No newline at end of file
diff --git a/tests/test_filter_cell/materials.xml b/tests/test_filter_cell/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_filter_cell/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_filter_cell/results_true.dat b/tests/test_filter_cell/results_true.dat
index f3aa5d89b1..5aebd42967 100644
--- a/tests/test_filter_cell/results_true.dat
+++ b/tests/test_filter_cell/results_true.dat
@@ -1,11 +1,11 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-1.423676E+01
-4.330937E+01
-2.914798E+00
-1.831649E+00
-4.088282E+01
-3.662539E+02
+2.240915E+01
+1.009032E+02
+4.711189E+00
+4.469059E+00
+6.533718E+01
+8.552989E+02
diff --git a/tests/test_filter_cell/settings.xml b/tests/test_filter_cell/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_filter_cell/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_filter_cell/tallies.xml b/tests/test_filter_cell/tallies.xml
deleted file mode 100644
index 815b84c145..0000000000
--- a/tests/test_filter_cell/tallies.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>total</scores>
-  </tally>
-
-</tallies>
\ No newline at end of file
diff --git a/tests/test_filter_cell/test_filter_cell.py b/tests/test_filter_cell/test_filter_cell.py
index 1777db993e..f6d6545b79 100644
--- a/tests/test_filter_cell/test_filter_cell.py
+++ b/tests/test_filter_cell/test_filter_cell.py
@@ -2,9 +2,28 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class FilterCellTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        cell_filter = openmc.Filter(type='cell', bins=(10, 21, 22, 23))
+        tally = openmc.Tally(tally_id=1)
+        tally.add_filter(cell_filter)
+        tally.add_score('total')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(tally)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = FilterCellTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/testing_harness.py b/tests/testing_harness.py
index 2059c46dae..a74e76ed3c 100644
--- a/tests/testing_harness.py
+++ b/tests/testing_harness.py
@@ -11,6 +11,7 @@ import sys
 
 import numpy as np
 
+from input_set import InputSet
 sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 from openmc.executor import Executor
@@ -124,7 +125,7 @@ class TestHarness(object):
 
     def _write_results(self, results_string):
         """Write the results to an ASCII file."""
-        with open('results_test.dat','w') as fh:
+        with open('results_test.dat', 'w') as fh:
             fh.write(results_string)
 
     def _overwrite_results(self):
@@ -132,12 +133,14 @@ class TestHarness(object):
         shutil.copyfile('results_test.dat', 'results_true.dat')
 
     def _compare_results(self):
+        """Make sure the current results agree with the _true standard."""
         compare = filecmp.cmp('results_test.dat', 'results_true.dat')
         if not compare:
             os.rename('results_test.dat', 'results_error.dat')
         assert compare, 'Results do not agree.'
 
     def _cleanup(self):
+        """Delete statepoints, tally, and test files."""
         output = glob.glob(os.path.join(os.getcwd(), 'statepoint.*.*'))
         output.append(os.path.join(os.getcwd(), 'tallies.out'))
         output.append(os.path.join(os.getcwd(), 'results_test.dat'))
@@ -269,3 +272,83 @@ class ParticleRestartTestHarness(TestHarness):
                                                            p.uvw[2])
 
         return outstr
+
+
+class PyAPITestHarness(TestHarness):
+    def __init__(self, statepoint_name, tallies_present=False):
+        TestHarness.__init__(self, statepoint_name, tallies_present)
+        self._input_set = InputSet()
+
+    def execute_test(self):
+        """Build input XMLs, run OpenMC, and verify correct results."""
+        try:
+            self._build_inputs()
+            inputs = self._get_inputs()
+            self._write_inputs(inputs)
+            self._compare_inputs()
+            self._run_openmc()
+            self._test_output_created()
+            results = self._get_results()
+            self._write_results(results)
+            self._compare_results()
+        finally:
+            self._cleanup()
+
+    def update_results(self):
+        """Update results_true.dat and inputs_true.dat"""
+        try:
+            self._build_inputs()
+            inputs = self._get_inputs()
+            self._write_inputs(inputs)
+            self._overwrite_inputs()
+            self._run_openmc()
+            self._test_output_created()
+            results = self._get_results()
+            self._write_results(results)
+            self._overwrite_results()
+        finally:
+            self._cleanup()
+
+    def _build_inputs(self):
+        """Write input XML files."""
+        self._input_set.build_default_materials_and_geometry()
+        self._input_set.build_default_settings()
+        self._input_set.export()
+
+    def _get_inputs(self):
+        """Return a hash digest of the input XML files."""
+        xmls = glob.glob(os.path.join(os.getcwd(), '*.xml'))
+        outstr = '\n'.join([open(fin).read() for fin in xmls])
+
+        sha512 = hashlib.sha512()
+        sha512.update(outstr.encode('utf-8'))
+        outstr = sha512.hexdigest()
+
+        return outstr
+
+    def _write_inputs(self, input_digest):
+        """Write the digest of the input XMLs to an ASCII file."""
+        with open('inputs_test.dat', 'w') as fh:
+            fh.write(input_digest)
+
+    def _overwrite_inputs(self):
+        """Overwrite inputs_true.dat with inputs_test.dat"""
+        shutil.copyfile('inputs_test.dat', 'inputs_true.dat')
+
+    def _compare_inputs(self):
+        """Make sure the current inputs agree with the _true standard."""
+        compare = filecmp.cmp('inputs_test.dat', 'inputs_true.dat')
+        if not compare:
+            os.rename('inputs_test.dat', 'inputs_error.dat')
+        assert compare, 'Input files are broken.'
+
+    def _cleanup(self):
+        """Delete XMLs, statepoints, tally, and test files."""
+        TestHarness._cleanup(self)
+        output = [os.path.join(os.getcwd(), 'materials.xml')]
+        output.append(os.path.join(os.getcwd(), 'geometry.xml'))
+        output.append(os.path.join(os.getcwd(), 'settings.xml'))
+        output.append(os.path.join(os.getcwd(), 'inputs_test.dat'))
+        for f in output:
+            if os.path.exists(f):
+                os.remove(f)

From 30425070e4e6a2b47f6b6c2c989195c38d4f2b83 Mon Sep 17 00:00:00 2001
From: Sterling Harper <sterlingmharper@gmail.com>
Date: Mon, 21 Sep 2015 11:36:22 -0400
Subject: [PATCH 02/10] Move some tests to PythonAPI

---
 openmc/temp.py                                |  12 -
 tests/test_filter_cell/test_filter_cell.py    |   4 +-
 tests/test_filter_cellborn/geometry.xml       | 181 ------------
 tests/test_filter_cellborn/inputs_true.dat    |   1 +
 tests/test_filter_cellborn/materials.xml      | 272 ------------------
 tests/test_filter_cellborn/results_true.dat   |   6 +-
 tests/test_filter_cellborn/settings.xml       |  19 --
 tests/test_filter_cellborn/tallies.xml        |   9 -
 .../test_filter_cellborn.py                   |  23 +-
 tests/test_filter_energy/geometry.xml         | 181 ------------
 tests/test_filter_energy/inputs_true.dat      |   1 +
 tests/test_filter_energy/materials.xml        | 272 ------------------
 tests/test_filter_energy/results_true.dat     |  18 +-
 tests/test_filter_energy/settings.xml         |  19 --
 tests/test_filter_energy/tallies.xml          |   9 -
 .../test_filter_energy/test_filter_energy.py  |  24 +-
 tests/test_filter_energyout/geometry.xml      | 181 ------------
 tests/test_filter_energyout/inputs_true.dat   |   1 +
 tests/test_filter_energyout/materials.xml     | 272 ------------------
 tests/test_filter_energyout/results_true.dat  |  18 +-
 tests/test_filter_energyout/settings.xml      |  19 --
 tests/test_filter_energyout/tallies.xml       |   9 -
 .../test_filter_energyout.py                  |  24 +-
 tests/test_filter_group_transfer/geometry.xml | 181 ------------
 .../inputs_true.dat                           |   1 +
 .../test_filter_group_transfer/materials.xml  | 272 ------------------
 .../results_true.dat                          |  66 ++---
 tests/test_filter_group_transfer/settings.xml |  19 --
 tests/test_filter_group_transfer/tallies.xml  |  10 -
 .../test_filter_group_transfer.py             |  28 +-
 tests/test_filter_material/geometry.xml       | 181 ------------
 tests/test_filter_material/inputs_true.dat    |   1 +
 tests/test_filter_material/materials.xml      | 272 ------------------
 tests/test_filter_material/results_true.dat   |  18 +-
 tests/test_filter_material/settings.xml       |  19 --
 tests/test_filter_material/tallies.xml        |   9 -
 .../test_filter_material.py                   |  23 +-
 tests/test_filter_universe/geometry.xml       | 181 ------------
 tests/test_filter_universe/inputs_true.dat    |   1 +
 tests/test_filter_universe/materials.xml      | 272 ------------------
 tests/test_filter_universe/results_true.dat   |  18 +-
 tests/test_filter_universe/settings.xml       |  19 --
 tests/test_filter_universe/tallies.xml        |   9 -
 .../test_filter_universe.py                   |  23 +-
 tests/test_score_absorption/geometry.xml      | 181 ------------
 tests/test_score_absorption/inputs_true.dat   |   1 +
 tests/test_score_absorption/materials.xml     | 272 ------------------
 tests/test_score_absorption/results_true.dat  |  38 +--
 tests/test_score_absorption/settings.xml      |  19 --
 tests/test_score_absorption/tallies.xml       |  21 --
 .../test_score_absorption.py                  |  26 +-
 tests/test_score_events/geometry.xml          | 181 ------------
 tests/test_score_events/inputs_true.dat       |   1 +
 tests/test_score_events/materials.xml         | 272 ------------------
 tests/test_score_events/results_true.dat      |  18 +-
 tests/test_score_events/settings.xml          |  19 --
 tests/test_score_events/tallies.xml           |  17 --
 tests/test_score_events/test_score_events.py  |  25 +-
 tests/test_score_fission/geometry.xml         | 181 ------------
 tests/test_score_fission/inputs_true.dat      |   1 +
 tests/test_score_fission/materials.xml        | 272 ------------------
 tests/test_score_fission/results_true.dat     |  26 +-
 tests/test_score_fission/settings.xml         |  19 --
 tests/test_score_fission/tallies.xml          |  21 --
 .../test_score_fission/test_score_fission.py  |  26 +-
 tests/testing_harness.py                      |   6 +-
 66 files changed, 332 insertions(+), 4509 deletions(-)
 delete mode 100644 openmc/temp.py
 delete mode 100644 tests/test_filter_cellborn/geometry.xml
 create mode 100644 tests/test_filter_cellborn/inputs_true.dat
 delete mode 100644 tests/test_filter_cellborn/materials.xml
 delete mode 100644 tests/test_filter_cellborn/settings.xml
 delete mode 100644 tests/test_filter_cellborn/tallies.xml
 delete mode 100644 tests/test_filter_energy/geometry.xml
 create mode 100644 tests/test_filter_energy/inputs_true.dat
 delete mode 100644 tests/test_filter_energy/materials.xml
 delete mode 100644 tests/test_filter_energy/settings.xml
 delete mode 100644 tests/test_filter_energy/tallies.xml
 delete mode 100644 tests/test_filter_energyout/geometry.xml
 create mode 100644 tests/test_filter_energyout/inputs_true.dat
 delete mode 100644 tests/test_filter_energyout/materials.xml
 delete mode 100644 tests/test_filter_energyout/settings.xml
 delete mode 100644 tests/test_filter_energyout/tallies.xml
 delete mode 100644 tests/test_filter_group_transfer/geometry.xml
 create mode 100644 tests/test_filter_group_transfer/inputs_true.dat
 delete mode 100644 tests/test_filter_group_transfer/materials.xml
 delete mode 100644 tests/test_filter_group_transfer/settings.xml
 delete mode 100644 tests/test_filter_group_transfer/tallies.xml
 delete mode 100644 tests/test_filter_material/geometry.xml
 create mode 100644 tests/test_filter_material/inputs_true.dat
 delete mode 100644 tests/test_filter_material/materials.xml
 delete mode 100644 tests/test_filter_material/settings.xml
 delete mode 100644 tests/test_filter_material/tallies.xml
 delete mode 100644 tests/test_filter_universe/geometry.xml
 create mode 100644 tests/test_filter_universe/inputs_true.dat
 delete mode 100644 tests/test_filter_universe/materials.xml
 delete mode 100644 tests/test_filter_universe/settings.xml
 delete mode 100644 tests/test_filter_universe/tallies.xml
 delete mode 100644 tests/test_score_absorption/geometry.xml
 create mode 100644 tests/test_score_absorption/inputs_true.dat
 delete mode 100644 tests/test_score_absorption/materials.xml
 delete mode 100644 tests/test_score_absorption/settings.xml
 delete mode 100644 tests/test_score_absorption/tallies.xml
 delete mode 100644 tests/test_score_events/geometry.xml
 create mode 100644 tests/test_score_events/inputs_true.dat
 delete mode 100644 tests/test_score_events/materials.xml
 delete mode 100644 tests/test_score_events/settings.xml
 delete mode 100644 tests/test_score_events/tallies.xml
 delete mode 100644 tests/test_score_fission/geometry.xml
 create mode 100644 tests/test_score_fission/inputs_true.dat
 delete mode 100644 tests/test_score_fission/materials.xml
 delete mode 100644 tests/test_score_fission/settings.xml
 delete mode 100644 tests/test_score_fission/tallies.xml

diff --git a/openmc/temp.py b/openmc/temp.py
deleted file mode 100644
index 91f6082996..0000000000
--- a/openmc/temp.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from checkvalue import *
-from checkvalue import _isinstance
-
-import numpy as np
-
-zs = np.zeros((2,))
-
-print _isinstance(zs[0], Integral)
-print _isinstance(zs[0], Real)
-print _isinstance(zs[0], (Integral, Real))
-
-print check_iterable_type('thing', zs, (Real, Integral))
diff --git a/tests/test_filter_cell/test_filter_cell.py b/tests/test_filter_cell/test_filter_cell.py
index f6d6545b79..534a681b49 100644
--- a/tests/test_filter_cell/test_filter_cell.py
+++ b/tests/test_filter_cell/test_filter_cell.py
@@ -9,9 +9,9 @@ import os
 
 class FilterCellTestHarness(PyAPITestHarness):
     def _build_inputs(self):
-        cell_filter = openmc.Filter(type='cell', bins=(10, 21, 22, 23))
+        filt = openmc.Filter(type='cell', bins=(10, 21, 22, 23))
         tally = openmc.Tally(tally_id=1)
-        tally.add_filter(cell_filter)
+        tally.add_filter(filt)
         tally.add_score('total')
         self._input_set.tallies = openmc.TalliesFile()
         self._input_set.tallies.add_tally(tally)
diff --git a/tests/test_filter_cellborn/geometry.xml b/tests/test_filter_cellborn/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_filter_cellborn/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_filter_cellborn/inputs_true.dat b/tests/test_filter_cellborn/inputs_true.dat
new file mode 100644
index 0000000000..8a234a6223
--- /dev/null
+++ b/tests/test_filter_cellborn/inputs_true.dat
@@ -0,0 +1 @@
+b9e90c6f594460d23ab84d56ff31897da3f47fdb558356468bb74119df0081f1600953045e4ec68e6048e334cb14abe1566cd72c414d3133c7f4a29d1140bb9e
\ No newline at end of file
diff --git a/tests/test_filter_cellborn/materials.xml b/tests/test_filter_cellborn/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_filter_cellborn/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_filter_cellborn/results_true.dat b/tests/test_filter_cellborn/results_true.dat
index 36dcf40d06..1aedcc9c63 100644
--- a/tests/test_filter_cellborn/results_true.dat
+++ b/tests/test_filter_cellborn/results_true.dat
@@ -1,10 +1,10 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-7.007584E+01
-1.050827E+03
+1.073903E+02
+2.311705E+03
 0.000000E+00
 0.000000E+00
 0.000000E+00
diff --git a/tests/test_filter_cellborn/settings.xml b/tests/test_filter_cellborn/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_filter_cellborn/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_filter_cellborn/tallies.xml b/tests/test_filter_cellborn/tallies.xml
deleted file mode 100644
index b278b07ff8..0000000000
--- a/tests/test_filter_cellborn/tallies.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cellborn" bins="10 21 22 23" />
-    <scores>total</scores>
-  </tally>
-
-</tallies>
\ No newline at end of file
diff --git a/tests/test_filter_cellborn/test_filter_cellborn.py b/tests/test_filter_cellborn/test_filter_cellborn.py
index 1777db993e..3420311aeb 100644
--- a/tests/test_filter_cellborn/test_filter_cellborn.py
+++ b/tests/test_filter_cellborn/test_filter_cellborn.py
@@ -2,9 +2,28 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class FilterCellbornTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cellborn', bins=(10, 21, 22, 23))
+        tally = openmc.Tally(tally_id=1)
+        tally.add_filter(filt)
+        tally.add_score('total')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(tally)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = FilterCellbornTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_filter_energy/geometry.xml b/tests/test_filter_energy/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_filter_energy/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_filter_energy/inputs_true.dat b/tests/test_filter_energy/inputs_true.dat
new file mode 100644
index 0000000000..977dfc0ae0
--- /dev/null
+++ b/tests/test_filter_energy/inputs_true.dat
@@ -0,0 +1 @@
+f41cd0988306e97da0e720c37ca123b2fab894f0cd60a69b6d47a0d6097d993efbf20c61345c71f3e0561af7968684f8fcd39eb908c9c34fbbe2e835eccc659b
\ No newline at end of file
diff --git a/tests/test_filter_energy/materials.xml b/tests/test_filter_energy/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_filter_energy/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_filter_energy/results_true.dat b/tests/test_filter_energy/results_true.dat
index e3f6cff98d..b25314510c 100644
--- a/tests/test_filter_energy/results_true.dat
+++ b/tests/test_filter_energy/results_true.dat
@@ -1,11 +1,11 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-2.770022E+01
-1.559167E+02
-4.285040E+01
-3.679177E+02
-5.288354E+01
-5.619308E+02
-1.134904E+01
-2.579927E+01
+2.777972E+01
+1.636507E+02
+4.274382E+01
+3.658341E+02
+5.403589E+01
+5.860017E+02
+1.137001E+01
+2.594280E+01
diff --git a/tests/test_filter_energy/settings.xml b/tests/test_filter_energy/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_filter_energy/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_filter_energy/tallies.xml b/tests/test_filter_energy/tallies.xml
deleted file mode 100644
index 69ce1d593b..0000000000
--- a/tests/test_filter_energy/tallies.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="energy" bins="0.0 0.253e-6 1.0e-3 1.0 20.0" />
-    <scores>total</scores>
-  </tally>
-
-</tallies>
\ No newline at end of file
diff --git a/tests/test_filter_energy/test_filter_energy.py b/tests/test_filter_energy/test_filter_energy.py
index 1777db993e..f16c458faa 100644
--- a/tests/test_filter_energy/test_filter_energy.py
+++ b/tests/test_filter_energy/test_filter_energy.py
@@ -2,9 +2,29 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class FilterEnergyTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='energy',
+                             bins=(0.0, 0.253e-6, 1.0e-3, 1.0, 20.0))
+        tally = openmc.Tally(tally_id=1)
+        tally.add_filter(filt)
+        tally.add_score('total')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(tally)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = FilterEnergyTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_filter_energyout/geometry.xml b/tests/test_filter_energyout/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_filter_energyout/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_filter_energyout/inputs_true.dat b/tests/test_filter_energyout/inputs_true.dat
new file mode 100644
index 0000000000..f31f456eb4
--- /dev/null
+++ b/tests/test_filter_energyout/inputs_true.dat
@@ -0,0 +1 @@
+52c9c541a82b4f395889450ab4696dffb13ee01427e65e79556080bab88388e91c932b862686a4e449948016e03240bc0692d1fc4386b61f5d0a05310158d232
\ No newline at end of file
diff --git a/tests/test_filter_energyout/materials.xml b/tests/test_filter_energyout/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_filter_energyout/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_filter_energyout/results_true.dat b/tests/test_filter_energyout/results_true.dat
index 649f4d7259..7c626faa4b 100644
--- a/tests/test_filter_energyout/results_true.dat
+++ b/tests/test_filter_energyout/results_true.dat
@@ -1,11 +1,11 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-2.835000E+01
-1.631463E+02
-4.252000E+01
-3.622146E+02
-5.192000E+01
-5.401444E+02
-7.390000E+00
-1.097710E+01
+2.742000E+01
+1.574582E+02
+4.267000E+01
+3.646435E+02
+5.278000E+01
+5.578420E+02
+7.900000E+00
+1.253260E+01
diff --git a/tests/test_filter_energyout/settings.xml b/tests/test_filter_energyout/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_filter_energyout/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_filter_energyout/tallies.xml b/tests/test_filter_energyout/tallies.xml
deleted file mode 100644
index ebec597f13..0000000000
--- a/tests/test_filter_energyout/tallies.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="energyout" bins="0.0 0.253e-6 1.0e-3 1.0 20.0" />
-    <scores>scatter</scores>
-  </tally>
-
-</tallies>
\ No newline at end of file
diff --git a/tests/test_filter_energyout/test_filter_energyout.py b/tests/test_filter_energyout/test_filter_energyout.py
index 1777db993e..24704c6d70 100644
--- a/tests/test_filter_energyout/test_filter_energyout.py
+++ b/tests/test_filter_energyout/test_filter_energyout.py
@@ -2,9 +2,29 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class FilterEnergyoutTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='energyout',
+                             bins=(0.0, 0.253e-6, 1.0e-3, 1.0, 20.0))
+        tally = openmc.Tally(tally_id=1)
+        tally.add_filter(filt)
+        tally.add_score('scatter')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(tally)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = FilterEnergyoutTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_filter_group_transfer/geometry.xml b/tests/test_filter_group_transfer/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_filter_group_transfer/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_filter_group_transfer/inputs_true.dat b/tests/test_filter_group_transfer/inputs_true.dat
new file mode 100644
index 0000000000..d19163cafa
--- /dev/null
+++ b/tests/test_filter_group_transfer/inputs_true.dat
@@ -0,0 +1 @@
+25c0be6220072084bed91a172e0e55545b968b60da14f6b36a58493e0fb6b0e96a4b3eb576df1c503b0e18629149d3ee0754de2ffed5ffd82d6e6b7e0f261993
\ No newline at end of file
diff --git a/tests/test_filter_group_transfer/materials.xml b/tests/test_filter_group_transfer/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_filter_group_transfer/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_filter_group_transfer/results_true.dat b/tests/test_filter_group_transfer/results_true.dat
index f2d5faa991..576c6b9d76 100644
--- a/tests/test_filter_group_transfer/results_true.dat
+++ b/tests/test_filter_group_transfer/results_true.dat
@@ -1,54 +1,54 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-2.571000E+01
-1.344145E+02
+2.486000E+01
+1.303342E+02
 0.000000E+00
 0.000000E+00
-2.000000E-02
-2.000000E-04
+5.000000E-02
+1.700000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.909862E-01
-1.660072E-01
+8.967969E-01
+1.846735E-01
 0.000000E+00
 0.000000E+00
-2.269580E+00
-1.046926E+00
-2.640000E+00
-1.397800E+00
+2.379073E+00
+1.190296E+00
+2.560000E+00
+1.318200E+00
 0.000000E+00
 0.000000E+00
-3.799000E+01
-2.892451E+02
+3.800000E+01
+2.893420E+02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.267964E-01
-2.170374E-02
+3.734177E-01
+3.189810E-02
 0.000000E+00
 0.000000E+00
-8.811378E-01
-1.642094E-01
+9.891140E-01
+2.024582E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.510000E+00
-4.068900E+00
+4.620000E+00
+4.269800E+00
 0.000000E+00
 0.000000E+00
-4.842000E+01
-4.700146E+02
-6.079426E-02
-8.532151E-04
+4.933000E+01
+4.873911E+02
+1.011778E-02
+1.023695E-04
 0.000000E+00
 0.000000E+00
-1.182446E-01
-3.979568E-03
+5.982886E-02
+1.821968E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -57,11 +57,11 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.500000E+00
-2.455800E+00
-1.158638E-01
-2.993934E-03
-7.390000E+00
-1.097710E+01
-3.126942E-01
-2.185793E-02
+3.450000E+00
+2.383100E+00
+1.413190E-01
+4.286264E-03
+7.900000E+00
+1.253260E+01
+2.891151E-01
+1.897512E-02
diff --git a/tests/test_filter_group_transfer/settings.xml b/tests/test_filter_group_transfer/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_filter_group_transfer/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_filter_group_transfer/tallies.xml b/tests/test_filter_group_transfer/tallies.xml
deleted file mode 100644
index 64a6fa5e10..0000000000
--- a/tests/test_filter_group_transfer/tallies.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="energy" bins="0.0 0.253e-6 1.0e-3 1.0 20.0" />
-    <filter type="energyout" bins="0.0 0.253e-6 1.0e-3 1.0 20.0" />
-    <scores>scatter nu-fission</scores>
-  </tally>
-
-</tallies>
\ No newline at end of file
diff --git a/tests/test_filter_group_transfer/test_filter_group_transfer.py b/tests/test_filter_group_transfer/test_filter_group_transfer.py
index 1777db993e..86cd82ac32 100644
--- a/tests/test_filter_group_transfer/test_filter_group_transfer.py
+++ b/tests/test_filter_group_transfer/test_filter_group_transfer.py
@@ -2,9 +2,33 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class FilterGroupTransferTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt1 = openmc.Filter(type='energy',
+                              bins=(0.0, 0.253e-6, 1.0e-3, 1.0, 20.0))
+        filt2 = openmc.Filter(type='energyout',
+                              bins=(0.0, 0.253e-6, 1.0e-3, 1.0, 20.0))
+        tally = openmc.Tally(tally_id=1)
+        tally.add_filter(filt1)
+        tally.add_filter(filt2)
+        tally.add_score('scatter')
+        tally.add_score('nu-fission')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(tally)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = FilterGroupTransferTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_filter_material/geometry.xml b/tests/test_filter_material/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_filter_material/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_filter_material/inputs_true.dat b/tests/test_filter_material/inputs_true.dat
new file mode 100644
index 0000000000..83b555b1d5
--- /dev/null
+++ b/tests/test_filter_material/inputs_true.dat
@@ -0,0 +1 @@
+d9822da9c74042812df6046cc810a7b13b90c7f4e6487c8f904b8e6b6a3655938b7f5bec0866a51fc3bc8b9612368f6f79b4f34283abd73663c58172b25d073e
\ No newline at end of file
diff --git a/tests/test_filter_material/materials.xml b/tests/test_filter_material/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_filter_material/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_filter_material/results_true.dat b/tests/test_filter_material/results_true.dat
index 86e1e943ce..eb9d920358 100644
--- a/tests/test_filter_material/results_true.dat
+++ b/tests/test_filter_material/results_true.dat
@@ -1,11 +1,11 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-2.923791E+01
-1.711686E+02
-6.753642E+00
-9.145065E+00
-4.921142E+01
-5.186991E+02
-4.731999E+01
-4.905260E+02
+2.840222E+01
+1.617027E+02
+6.793657E+00
+9.256930E+00
+7.648212E+01
+1.171747E+03
+2.158747E+01
+9.962972E+01
diff --git a/tests/test_filter_material/settings.xml b/tests/test_filter_material/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_filter_material/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_filter_material/tallies.xml b/tests/test_filter_material/tallies.xml
deleted file mode 100644
index 4b8d1ce8f0..0000000000
--- a/tests/test_filter_material/tallies.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="material" bins="1 2 3 4" />
-    <scores>total</scores>
-  </tally>
-
-</tallies>
\ No newline at end of file
diff --git a/tests/test_filter_material/test_filter_material.py b/tests/test_filter_material/test_filter_material.py
index 1777db993e..8d81cddb6b 100644
--- a/tests/test_filter_material/test_filter_material.py
+++ b/tests/test_filter_material/test_filter_material.py
@@ -2,9 +2,28 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class FilterMaterialTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='material', bins=(1, 2, 3, 4))
+        tally = openmc.Tally(tally_id=1)
+        tally.add_filter(filt)
+        tally.add_score('total')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(tally)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = FilterMaterialTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_filter_universe/geometry.xml b/tests/test_filter_universe/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_filter_universe/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_filter_universe/inputs_true.dat b/tests/test_filter_universe/inputs_true.dat
new file mode 100644
index 0000000000..e442de057e
--- /dev/null
+++ b/tests/test_filter_universe/inputs_true.dat
@@ -0,0 +1 @@
+a65cbed55e510edcb54362e9bd38a639b36d2bf4ff312f9355c5552e9407bab27730437f3298a90deb6abbdf36810e8e23c87d11d09a55ce5227fa2bfba1f4aa
\ No newline at end of file
diff --git a/tests/test_filter_universe/materials.xml b/tests/test_filter_universe/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_filter_universe/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_filter_universe/results_true.dat b/tests/test_filter_universe/results_true.dat
index 856d97d593..22f863c913 100644
--- a/tests/test_filter_universe/results_true.dat
+++ b/tests/test_filter_universe/results_true.dat
@@ -1,11 +1,11 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-5.803437E+01
-7.324822E+02
-7.168085E+00
-1.101286E+01
-5.815302E+01
-7.373019E+02
-5.778029E+00
-7.558661E+00
+9.245752E+01
+1.713583E+03
+1.150558E+01
+2.689915E+01
+2.299276E+01
+1.068299E+02
+3.009831E+00
+1.837623E+00
diff --git a/tests/test_filter_universe/settings.xml b/tests/test_filter_universe/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_filter_universe/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_filter_universe/tallies.xml b/tests/test_filter_universe/tallies.xml
deleted file mode 100644
index bcf16f53a6..0000000000
--- a/tests/test_filter_universe/tallies.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="universe" bins="1 2 3 4" />
-    <scores>total</scores>
-  </tally>
-
-</tallies>
\ No newline at end of file
diff --git a/tests/test_filter_universe/test_filter_universe.py b/tests/test_filter_universe/test_filter_universe.py
index 1777db993e..189758f2ee 100644
--- a/tests/test_filter_universe/test_filter_universe.py
+++ b/tests/test_filter_universe/test_filter_universe.py
@@ -2,9 +2,28 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class FilterUniverseTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='universe', bins=(1, 2, 3, 4))
+        tally = openmc.Tally(tally_id=1)
+        tally.add_filter(filt)
+        tally.add_score('total')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(tally)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = FilterUniverseTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_absorption/geometry.xml b/tests/test_score_absorption/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_absorption/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_absorption/inputs_true.dat b/tests/test_score_absorption/inputs_true.dat
new file mode 100644
index 0000000000..be73d98b6c
--- /dev/null
+++ b/tests/test_score_absorption/inputs_true.dat
@@ -0,0 +1 @@
+55faff4d2b9eb95d51b31ec618a03a25b1bc82338fe5a043ffcf4ced388265c75cf7d97db94dc50622edc592f093f366de490c94c01ee20a1df1de635f659533
\ No newline at end of file
diff --git a/tests/test_score_absorption/materials.xml b/tests/test_score_absorption/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_absorption/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_absorption/results_true.dat b/tests/test_score_absorption/results_true.dat
index 9370a146f5..1984cc4e66 100644
--- a/tests/test_score_absorption/results_true.dat
+++ b/tests/test_score_absorption/results_true.dat
@@ -1,29 +1,29 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-2.006479E+00
-8.808050E-01
-1.444838E-02
-4.349668E-05
-2.926865E-01
-1.944083E-02
+3.336094E+00
+2.246259E+00
+3.247758E-02
+2.553866E-04
+4.583764E-01
+4.253734E-02
 tally 2:
 0.000000E+00
 0.000000E+00
-2.030000E+00
-8.879000E-01
-0.000000E+00
-0.000000E+00
-4.000000E-01
-4.240000E-02
+3.380000E+00
+2.293800E+00
+1.000000E-02
+1.000000E-04
+4.400000E-01
+4.360000E-02
 tally 3:
 0.000000E+00
 0.000000E+00
-1.990713E+00
-8.557870E-01
-1.427399E-02
-4.420707E-05
-2.968053E-01
-1.960663E-02
+3.251414E+00
+2.129893E+00
+2.185530E-02
+1.156492E-04
+4.456283E-01
+4.031784E-02
diff --git a/tests/test_score_absorption/settings.xml b/tests/test_score_absorption/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_absorption/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_absorption/tallies.xml b/tests/test_score_absorption/tallies.xml
deleted file mode 100644
index 8b2dc29314..0000000000
--- a/tests/test_score_absorption/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>absorption</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="10 21 22 23" />
-    <estimator>analog</estimator>
-    <scores>absorption</scores>
-  </tally>
-
-  <tally id="3">
-    <filter type="cell" bins="10 21 22 23" />
-    <estimator>collision</estimator>
-    <scores>absorption</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_absorption/test_score_absorption.py b/tests/test_score_absorption/test_score_absorption.py
index 1777db993e..2accb25045 100644
--- a/tests/test_score_absorption/test_score_absorption.py
+++ b/tests/test_score_absorption/test_score_absorption.py
@@ -2,9 +2,31 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreAbsorptionTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(10, 21, 22, 23))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('absorption') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreAbsorptionTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_events/geometry.xml b/tests/test_score_events/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_events/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_events/inputs_true.dat b/tests/test_score_events/inputs_true.dat
new file mode 100644
index 0000000000..7535b3f66f
--- /dev/null
+++ b/tests/test_score_events/inputs_true.dat
@@ -0,0 +1 @@
+6ad38e2ba1108cbc2a1cb6bfcb5131fd5f7d31c7699c7659daeb42733d75df6cb1ef058277e300d35374d54f0b85a210c0ab0a37dc80a1b234e455d4293af94f
\ No newline at end of file
diff --git a/tests/test_score_events/materials.xml b/tests/test_score_events/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_events/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_events/results_true.dat b/tests/test_score_events/results_true.dat
index 35ae33eb86..e6547cc820 100644
--- a/tests/test_score_events/results_true.dat
+++ b/tests/test_score_events/results_true.dat
@@ -1,12 +1,12 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-5.328000E+01
-6.082750E+02
-5.594000E+01
-6.836068E+02
+8.539000E+01
+1.463307E+03
+2.312000E+01
+1.070560E+02
 tally 2:
-1.372000E+01
-4.018980E+01
-1.474000E+01
-4.802520E+01
+2.278000E+01
+1.042404E+02
+6.260000E+00
+7.850600E+00
diff --git a/tests/test_score_events/settings.xml b/tests/test_score_events/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_events/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_events/tallies.xml b/tests/test_score_events/tallies.xml
deleted file mode 100644
index ac47f9ec86..0000000000
--- a/tests/test_score_events/tallies.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <!-- Number of tracks in fuel -->
-  <tally id="1">
-    <filter type="cell" bins="21 27" />
-    <scores>events</scores>
-  </tally>
-
-  <!-- Number of collisions in fuel -->
-  <tally id="2">
-    <filter type="cell" bins="21 27" />
-    <estimator>analog</estimator>
-    <scores>events</scores>
-  </tally>
-
-</tallies>
\ No newline at end of file
diff --git a/tests/test_score_events/test_score_events.py b/tests/test_score_events/test_score_events.py
index 1777db993e..74d6e100da 100644
--- a/tests/test_score_events/test_score_events.py
+++ b/tests/test_score_events/test_score_events.py
@@ -2,9 +2,30 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreEventsTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, 27))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 3)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('events') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreEventsTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_fission/geometry.xml b/tests/test_score_fission/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_fission/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_fission/inputs_true.dat b/tests/test_score_fission/inputs_true.dat
new file mode 100644
index 0000000000..e4f120bc16
--- /dev/null
+++ b/tests/test_score_fission/inputs_true.dat
@@ -0,0 +1 @@
+43d51743c601d4e347e7a1735398b76213fdf22488749d9496093bd8ccc2ead36c1fadfe7dc27b74d21832b270a0b88d03c6e0ce5fcae066f7a7a32789abb8fd
\ No newline at end of file
diff --git a/tests/test_score_fission/materials.xml b/tests/test_score_fission/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_fission/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_fission/results_true.dat b/tests/test_score_fission/results_true.dat
index 86b31aaafd..aecb466dda 100644
--- a/tests/test_score_fission/results_true.dat
+++ b/tests/test_score_fission/results_true.dat
@@ -1,29 +1,29 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-9.432574E-01
-1.970463E-01
+1.559747E+00
+4.911504E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.039280E+00
-2.345809E-01
+3.579938E-01
+2.731974E-02
 tally 2:
-8.953531E-01
-1.798609E-01
+1.526951E+00
+4.824326E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.923196E-01
-2.067216E-01
+3.966177E-01
+3.291468E-02
 tally 3:
-9.036254E-01
-1.746552E-01
+1.496616E+00
+4.530639E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.912744E-01
-2.192705E-01
+3.919885E-01
+3.104206E-02
diff --git a/tests/test_score_fission/settings.xml b/tests/test_score_fission/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_fission/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_fission/tallies.xml b/tests/test_score_fission/tallies.xml
deleted file mode 100644
index a8b57f9116..0000000000
--- a/tests/test_score_fission/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21 22 23 27" />
-    <scores>fission</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="21 22 23 27" />
-    <estimator>analog</estimator>
-    <scores>fission</scores>
-  </tally>
-
-  <tally id="3">
-    <filter type="cell" bins="21 22 23 27" />
-    <estimator>collision</estimator>
-    <scores>fission</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_fission/test_score_fission.py b/tests/test_score_fission/test_score_fission.py
index 1777db993e..e9253d11d1 100644
--- a/tests/test_score_fission/test_score_fission.py
+++ b/tests/test_score_fission/test_score_fission.py
@@ -2,9 +2,31 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreFissionTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, 22, 23, 27))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('fission') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreFissionTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/testing_harness.py b/tests/testing_harness.py
index a74e76ed3c..d60892692a 100644
--- a/tests/testing_harness.py
+++ b/tests/testing_harness.py
@@ -317,8 +317,10 @@ class PyAPITestHarness(TestHarness):
 
     def _get_inputs(self):
         """Return a hash digest of the input XML files."""
-        xmls = glob.glob(os.path.join(os.getcwd(), '*.xml'))
-        outstr = '\n'.join([open(fin).read() for fin in xmls])
+        xmls = ('geometry.xml', 'tallies.xml', 'materials.xml', 'settings.xml')
+        xmls = [os.path.join(os.getcwd(), fname) for fname in xmls]
+        outstr = '\n'.join([open(fname).read() for fname in xmls
+                            if os.path.exists(fname)])
 
         sha512 = hashlib.sha512()
         sha512.update(outstr.encode('utf-8'))

From 3d5840214df82cbea2fdc3f80215d82f587b73ad Mon Sep 17 00:00:00 2001
From: Sterling Harper <sterlingmharper@gmail.com>
Date: Fri, 2 Oct 2015 17:54:36 -0400
Subject: [PATCH 03/10] Move more tests to PythonAPI

---
 tests/test_score_MT/geometry.xml              |  181 --
 tests/test_score_MT/inputs_true.dat           |    1 +
 tests/test_score_MT/materials.xml             |  272 --
 tests/test_score_MT/results_true.dat          |   98 +-
 tests/test_score_MT/settings.xml              |   19 -
 tests/test_score_MT/tallies.xml               |   21 -
 tests/test_score_MT/test_score_MT.py          |   29 +-
 tests/test_score_flux/geometry.xml            |  181 --
 tests/test_score_flux/inputs_true.dat         |    1 +
 tests/test_score_flux/materials.xml           |  272 --
 tests/test_score_flux/results_true.dat        |   74 +-
 tests/test_score_flux/settings.xml            |   19 -
 tests/test_score_flux/tallies.xml             |   21 -
 tests/test_score_flux/test_score_flux.py      |   26 +-
 tests/test_score_flux_yn/geometry.xml         |  181 --
 tests/test_score_flux_yn/inputs_true.dat      |    1 +
 tests/test_score_flux_yn/materials.xml        |  272 --
 tests/test_score_flux_yn/results_true.dat     | 2607 ++++++++---------
 tests/test_score_flux_yn/settings.xml         |   19 -
 tests/test_score_flux_yn/tallies.xml          |   26 -
 .../test_score_flux_yn/test_score_flux_yn.py  |   26 +-
 tests/test_score_kappafission/geometry.xml    |  181 --
 tests/test_score_kappafission/inputs_true.dat |    1 +
 tests/test_score_kappafission/materials.xml   |  272 --
 .../test_score_kappafission/results_true.dat  |   26 +-
 tests/test_score_kappafission/settings.xml    |   19 -
 tests/test_score_kappafission/tallies.xml     |   21 -
 .../test_score_kappafission.py                |   26 +-
 tests/test_score_nufission/geometry.xml       |  181 --
 tests/test_score_nufission/inputs_true.dat    |    1 +
 tests/test_score_nufission/materials.xml      |  272 --
 tests/test_score_nufission/results_true.dat   |   26 +-
 tests/test_score_nufission/settings.xml       |   19 -
 tests/test_score_nufission/tallies.xml        |   21 -
 .../test_score_nufission.py                   |   26 +-
 tests/test_score_nuscatter/geometry.xml       |  181 --
 tests/test_score_nuscatter/inputs_true.dat    |    1 +
 tests/test_score_nuscatter/materials.xml      |  272 --
 tests/test_score_nuscatter/results_true.dat   |   14 +-
 tests/test_score_nuscatter/settings.xml       |   19 -
 tests/test_score_nuscatter/tallies.xml        |    9 -
 .../test_score_nuscatter.py                   |   23 +-
 tests/test_score_nuscatter_n/geometry.xml     |  181 --
 tests/test_score_nuscatter_n/inputs_true.dat  |    1 +
 tests/test_score_nuscatter_n/materials.xml    |  272 --
 tests/test_score_nuscatter_n/results_true.dat |   62 +-
 tests/test_score_nuscatter_n/settings.xml     |   19 -
 tests/test_score_nuscatter_n/tallies.xml      |    9 -
 .../test_score_nuscatter_n.py                 |   27 +-
 tests/test_score_nuscatter_pn/geometry.xml    |  181 --
 tests/test_score_nuscatter_pn/inputs_true.dat |    1 +
 tests/test_score_nuscatter_pn/materials.xml   |  272 --
 .../test_score_nuscatter_pn/results_true.dat  |   42 +-
 tests/test_score_nuscatter_pn/settings.xml    |   19 -
 tests/test_score_nuscatter_pn/tallies.xml     |   14 -
 .../test_score_nuscatter_pn.py                |   31 +-
 tests/test_score_nuscatter_yn/geometry.xml    |  181 --
 tests/test_score_nuscatter_yn/inputs_true.dat |    1 +
 tests/test_score_nuscatter_yn/materials.xml   |  272 --
 .../test_score_nuscatter_yn/results_true.dat  |   70 +-
 tests/test_score_nuscatter_yn/settings.xml    |   19 -
 tests/test_score_nuscatter_yn/tallies.xml     |   14 -
 .../test_score_nuscatter_yn.py                |   27 +-
 tests/test_score_scatter/geometry.xml         |  181 --
 tests/test_score_scatter/inputs_true.dat      |    1 +
 tests/test_score_scatter/materials.xml        |  272 --
 tests/test_score_scatter/results_true.dat     |   38 +-
 tests/test_score_scatter/settings.xml         |   19 -
 tests/test_score_scatter/tallies.xml          |   21 -
 .../test_score_scatter/test_score_scatter.py  |   26 +-
 tests/test_score_scatter_n/geometry.xml       |  181 --
 tests/test_score_scatter_n/inputs_true.dat    |    1 +
 tests/test_score_scatter_n/materials.xml      |  272 --
 tests/test_score_scatter_n/results_true.dat   |   62 +-
 tests/test_score_scatter_n/settings.xml       |   19 -
 tests/test_score_scatter_n/tallies.xml        |    9 -
 .../test_score_scatter_n.py                   |   27 +-
 tests/test_score_scatter_pn/geometry.xml      |  181 --
 tests/test_score_scatter_pn/inputs_true.dat   |    1 +
 tests/test_score_scatter_pn/materials.xml     |  272 --
 tests/test_score_scatter_pn/results_true.dat  |   42 +-
 tests/test_score_scatter_pn/settings.xml      |   19 -
 tests/test_score_scatter_pn/tallies.xml       |   14 -
 .../test_score_scatter_pn.py                  |   32 +-
 tests/test_score_scatter_yn/geometry.xml      |  181 --
 tests/test_score_scatter_yn/inputs_true.dat   |    1 +
 tests/test_score_scatter_yn/materials.xml     |  272 --
 tests/test_score_scatter_yn/results_true.dat  |  106 +-
 tests/test_score_scatter_yn/settings.xml      |   19 -
 tests/test_score_scatter_yn/tallies.xml       |   15 -
 .../test_score_scatter_yn.py                  |   28 +-
 tests/test_score_total/geometry.xml           |  181 --
 tests/test_score_total/inputs_true.dat        |    1 +
 tests/test_score_total/materials.xml          |  272 --
 tests/test_score_total/results_true.dat       |   38 +-
 tests/test_score_total/settings.xml           |   19 -
 tests/test_score_total/tallies.xml            |   21 -
 tests/test_score_total/test_score_total.py    |   26 +-
 tests/test_score_total_yn/geometry.xml        |  181 --
 tests/test_score_total_yn/inputs_true.dat     |    1 +
 tests/test_score_total_yn/materials.xml       |  272 --
 tests/test_score_total_yn/results_true.dat    | 1607 +++++-----
 tests/test_score_total_yn/settings.xml        |   19 -
 tests/test_score_total_yn/tallies.xml         |   29 -
 .../test_score_total_yn.py                    |   28 +-
 105 files changed, 2838 insertions(+), 9842 deletions(-)
 delete mode 100644 tests/test_score_MT/geometry.xml
 create mode 100644 tests/test_score_MT/inputs_true.dat
 delete mode 100644 tests/test_score_MT/materials.xml
 delete mode 100644 tests/test_score_MT/settings.xml
 delete mode 100644 tests/test_score_MT/tallies.xml
 delete mode 100644 tests/test_score_flux/geometry.xml
 create mode 100644 tests/test_score_flux/inputs_true.dat
 delete mode 100644 tests/test_score_flux/materials.xml
 delete mode 100644 tests/test_score_flux/settings.xml
 delete mode 100644 tests/test_score_flux/tallies.xml
 delete mode 100644 tests/test_score_flux_yn/geometry.xml
 create mode 100644 tests/test_score_flux_yn/inputs_true.dat
 delete mode 100644 tests/test_score_flux_yn/materials.xml
 delete mode 100644 tests/test_score_flux_yn/settings.xml
 delete mode 100644 tests/test_score_flux_yn/tallies.xml
 delete mode 100644 tests/test_score_kappafission/geometry.xml
 create mode 100644 tests/test_score_kappafission/inputs_true.dat
 delete mode 100644 tests/test_score_kappafission/materials.xml
 delete mode 100644 tests/test_score_kappafission/settings.xml
 delete mode 100644 tests/test_score_kappafission/tallies.xml
 delete mode 100644 tests/test_score_nufission/geometry.xml
 create mode 100644 tests/test_score_nufission/inputs_true.dat
 delete mode 100644 tests/test_score_nufission/materials.xml
 delete mode 100644 tests/test_score_nufission/settings.xml
 delete mode 100644 tests/test_score_nufission/tallies.xml
 delete mode 100644 tests/test_score_nuscatter/geometry.xml
 create mode 100644 tests/test_score_nuscatter/inputs_true.dat
 delete mode 100644 tests/test_score_nuscatter/materials.xml
 delete mode 100644 tests/test_score_nuscatter/settings.xml
 delete mode 100644 tests/test_score_nuscatter/tallies.xml
 delete mode 100644 tests/test_score_nuscatter_n/geometry.xml
 create mode 100644 tests/test_score_nuscatter_n/inputs_true.dat
 delete mode 100644 tests/test_score_nuscatter_n/materials.xml
 delete mode 100644 tests/test_score_nuscatter_n/settings.xml
 delete mode 100644 tests/test_score_nuscatter_n/tallies.xml
 delete mode 100644 tests/test_score_nuscatter_pn/geometry.xml
 create mode 100644 tests/test_score_nuscatter_pn/inputs_true.dat
 delete mode 100644 tests/test_score_nuscatter_pn/materials.xml
 delete mode 100644 tests/test_score_nuscatter_pn/settings.xml
 delete mode 100644 tests/test_score_nuscatter_pn/tallies.xml
 delete mode 100644 tests/test_score_nuscatter_yn/geometry.xml
 create mode 100644 tests/test_score_nuscatter_yn/inputs_true.dat
 delete mode 100644 tests/test_score_nuscatter_yn/materials.xml
 delete mode 100644 tests/test_score_nuscatter_yn/settings.xml
 delete mode 100644 tests/test_score_nuscatter_yn/tallies.xml
 delete mode 100644 tests/test_score_scatter/geometry.xml
 create mode 100644 tests/test_score_scatter/inputs_true.dat
 delete mode 100644 tests/test_score_scatter/materials.xml
 delete mode 100644 tests/test_score_scatter/settings.xml
 delete mode 100644 tests/test_score_scatter/tallies.xml
 delete mode 100644 tests/test_score_scatter_n/geometry.xml
 create mode 100644 tests/test_score_scatter_n/inputs_true.dat
 delete mode 100644 tests/test_score_scatter_n/materials.xml
 delete mode 100644 tests/test_score_scatter_n/settings.xml
 delete mode 100644 tests/test_score_scatter_n/tallies.xml
 delete mode 100644 tests/test_score_scatter_pn/geometry.xml
 create mode 100644 tests/test_score_scatter_pn/inputs_true.dat
 delete mode 100644 tests/test_score_scatter_pn/materials.xml
 delete mode 100644 tests/test_score_scatter_pn/settings.xml
 delete mode 100644 tests/test_score_scatter_pn/tallies.xml
 delete mode 100644 tests/test_score_scatter_yn/geometry.xml
 create mode 100644 tests/test_score_scatter_yn/inputs_true.dat
 delete mode 100644 tests/test_score_scatter_yn/materials.xml
 delete mode 100644 tests/test_score_scatter_yn/settings.xml
 delete mode 100644 tests/test_score_scatter_yn/tallies.xml
 delete mode 100644 tests/test_score_total/geometry.xml
 create mode 100644 tests/test_score_total/inputs_true.dat
 delete mode 100644 tests/test_score_total/materials.xml
 delete mode 100644 tests/test_score_total/settings.xml
 delete mode 100644 tests/test_score_total/tallies.xml
 delete mode 100644 tests/test_score_total_yn/geometry.xml
 create mode 100644 tests/test_score_total_yn/inputs_true.dat
 delete mode 100644 tests/test_score_total_yn/materials.xml
 delete mode 100644 tests/test_score_total_yn/settings.xml
 delete mode 100644 tests/test_score_total_yn/tallies.xml

diff --git a/tests/test_score_MT/geometry.xml b/tests/test_score_MT/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_MT/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_MT/inputs_true.dat b/tests/test_score_MT/inputs_true.dat
new file mode 100644
index 0000000000..b78dd8061f
--- /dev/null
+++ b/tests/test_score_MT/inputs_true.dat
@@ -0,0 +1 @@
+5bf02c7821f3a428d780a95fcffc5873d3ff025f77e511a8bc4d35551bfa8ff1bf95b3d177971fe55f6b58133f303fe7003054125f396bd56c1924a852ff4681
\ No newline at end of file
diff --git a/tests/test_score_MT/materials.xml b/tests/test_score_MT/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_MT/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_MT/results_true.dat b/tests/test_score_MT/results_true.dat
index 4b1c1af26c..dc3dce006a 100644
--- a/tests/test_score_MT/results_true.dat
+++ b/tests/test_score_MT/results_true.dat
@@ -1,5 +1,5 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
 0.000000E+00
 0.000000E+00
@@ -9,30 +9,30 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-6.261679E-03
-2.310296E-05
-6.261679E-03
-2.310296E-05
-3.434524E-01
-2.482946E-02
-1.059004E+00
-2.432555E-01
-3.828838E-04
-9.365499E-08
-3.828838E-04
-9.365499E-08
-3.226036E-02
-2.229037E-04
-1.450446E-02
-4.382852E-05
-8.650696E-08
-7.483455E-15
-8.650696E-08
-7.483455E-15
-7.312640E-05
-2.080857E-09
-6.101318E-02
-8.452067E-04
+4.549173E-03
+1.042847E-05
+4.549173E-03
+1.042847E-05
+5.349258E-01
+5.819756E-02
+1.771520E+00
+6.368768E-01
+2.840231E-04
+7.989175E-08
+2.840231E-04
+7.989175E-08
+4.456152E-02
+4.011605E-04
+3.237732E-02
+2.535641E-04
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+9.260440E-05
+2.080213E-09
+9.514028E-02
+1.832676E-03
 tally 2:
 0.000000E+00
 0.000000E+00
@@ -46,16 +46,16 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.000000E-01
-2.440000E-02
+5.700000E-01
+6.530000E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.000000E-02
-6.000000E-04
+5.000000E-02
+1.100000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -75,27 +75,27 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.724026E-03
-1.684945E-05
-5.724026E-03
-1.684945E-05
-3.250298E-01
-2.370870E-02
-1.083784E+00
-2.568556E-01
-4.449887E-05
-1.980149E-09
-4.449887E-05
-1.980149E-09
-3.526275E-02
-2.863085E-04
-1.417358E-02
-4.375519E-05
+7.477762E-03
+3.606695E-05
+7.477762E-03
+3.606695E-05
+5.749995E-01
+6.679702E-02
+1.748150E+00
+6.191138E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.106469E-05
-8.605176E-10
-6.204277E-02
-8.555398E-04
+4.201948E-02
+3.812116E-04
+2.128743E-02
+1.104373E-04
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.503792E-04
+7.112750E-09
+9.209675E-02
+1.724470E-03
diff --git a/tests/test_score_MT/settings.xml b/tests/test_score_MT/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_MT/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_MT/tallies.xml b/tests/test_score_MT/tallies.xml
deleted file mode 100644
index 5e66ae929e..0000000000
--- a/tests/test_score_MT/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>n2n 16 51 102</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>n2n 16 51 102</scores>
-    <estimator>analog</estimator>
-  </tally>
-
-  <tally id="3">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>n2n 16 51 102</scores>
-    <estimator>collision</estimator>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_MT/test_score_MT.py b/tests/test_score_MT/test_score_MT.py
index 1777db993e..d1a9b99cd8 100644
--- a/tests/test_score_MT/test_score_MT.py
+++ b/tests/test_score_MT/test_score_MT.py
@@ -2,9 +2,34 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreMTTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(10, 21, 22, 23))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('n2n') for t in tallies]
+        [t.add_score('16') for t in tallies]
+        [t.add_score('51') for t in tallies]
+        [t.add_score('102') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreMTTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_flux/geometry.xml b/tests/test_score_flux/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_flux/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_flux/inputs_true.dat b/tests/test_score_flux/inputs_true.dat
new file mode 100644
index 0000000000..d56fdcb9a7
--- /dev/null
+++ b/tests/test_score_flux/inputs_true.dat
@@ -0,0 +1 @@
+6f1f560fb5830abea765a6ee6a2d5762f6107398e7ec6adf136d718846ca9b73b00f3e1b73a3433cf812532def4cd614e251d7c40b0d4e0e38f47c4a44d08b8b
\ No newline at end of file
diff --git a/tests/test_score_flux/materials.xml b/tests/test_score_flux/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_flux/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_flux/results_true.dat b/tests/test_score_flux/results_true.dat
index 31ca238d48..575b8ff178 100644
--- a/tests/test_score_flux/results_true.dat
+++ b/tests/test_score_flux/results_true.dat
@@ -1,41 +1,41 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-3.224218E+01
-2.217821E+02
-1.079687E+01
-2.494701E+01
-5.252579E+01
-5.951604E+02
-3.325822E+01
-2.414028E+02
-1.145800E+01
-2.880575E+01
-5.605671E+01
-6.804062E+02
+5.010477E+01
+5.039958E+02
+1.732466E+01
+6.033456E+01
+8.428445E+01
+1.425022E+03
+1.357577E+01
+3.704803E+01
+4.758922E+00
+4.591527E+00
+2.297418E+01
+1.067445E+02
 tally 2:
-3.077754E+01
-2.017424E+02
-1.172238E+01
-3.139127E+01
-5.231699E+01
-5.870469E+02
-3.259142E+01
-2.336719E+02
-1.040924E+01
-2.432332E+01
-5.709679E+01
-6.978668E+02
+5.188799E+01
+5.402176E+02
+1.593914E+01
+5.169154E+01
+8.557014E+01
+1.465192E+03
+1.427596E+01
+4.078276E+01
+4.943558E+00
+5.054633E+00
+2.194332E+01
+9.737940E+01
 tally 3:
-3.077754E+01
-2.017424E+02
-1.172238E+01
-3.139127E+01
-5.231699E+01
-5.870469E+02
-3.259142E+01
-2.336719E+02
-1.040924E+01
-2.432332E+01
-5.709679E+01
-6.978668E+02
+5.188799E+01
+5.402176E+02
+1.593914E+01
+5.169154E+01
+8.557014E+01
+1.465192E+03
+1.427596E+01
+4.078276E+01
+4.943558E+00
+5.054633E+00
+2.194332E+01
+9.737940E+01
diff --git a/tests/test_score_flux/settings.xml b/tests/test_score_flux/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_flux/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_flux/tallies.xml b/tests/test_score_flux/tallies.xml
deleted file mode 100644
index bcde40c75d..0000000000
--- a/tests/test_score_flux/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21 22 23 27 28 29" />
-    <scores>flux</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="21 22 23 27 28 29" />
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-
-  <tally id="3">
-    <filter type="cell" bins="21 22 23 27 28 29" />
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_flux/test_score_flux.py b/tests/test_score_flux/test_score_flux.py
index 1777db993e..94a034758d 100644
--- a/tests/test_score_flux/test_score_flux.py
+++ b/tests/test_score_flux/test_score_flux.py
@@ -2,9 +2,31 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreFluxTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, 22, 23, 27, 28, 29))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('flux') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreFluxTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_flux_yn/geometry.xml b/tests/test_score_flux_yn/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_flux_yn/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_flux_yn/inputs_true.dat b/tests/test_score_flux_yn/inputs_true.dat
new file mode 100644
index 0000000000..b4d82f71eb
--- /dev/null
+++ b/tests/test_score_flux_yn/inputs_true.dat
@@ -0,0 +1 @@
+7436214ee6931cdc4e8cf00a35f67c60280187fd6989a2ba3e8d51215e585cfc5cae41d5bab63176e306bcaf16e425f0b36bb8241a063f35ef36df2410bdf86a
\ No newline at end of file
diff --git a/tests/test_score_flux_yn/materials.xml b/tests/test_score_flux_yn/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_flux_yn/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_flux_yn/results_true.dat b/tests/test_score_flux_yn/results_true.dat
index 937f810ea6..78ee844771 100644
--- a/tests/test_score_flux_yn/results_true.dat
+++ b/tests/test_score_flux_yn/results_true.dat
@@ -1,1314 +1,1301 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-3.224218E+01
-2.217821E+02
-1.079687E+01
-2.494701E+01
-5.252579E+01
-5.951604E+02
-3.325822E+01
-2.414028E+02
-1.145800E+01
-2.880575E+01
-5.605671E+01
-6.804062E+02
+5.010477E+01
+5.039958E+02
+2.176053E-01
+4.865261E-01
+-1.086984E+00
+1.047217E+00
+-4.795412E-01
+1.558959E-01
+-5.701504E-01
+1.292349E-01
+-5.368919E-01
+9.576579E-02
+-9.479107E-01
+2.504916E-01
+1.224897E-01
+4.670746E-01
+8.535124E-01
+5.228963E-01
+-1.992643E-01
+7.139374E-02
+-5.251275E-01
+1.407419E-01
+4.161764E-01
+8.583663E-02
+1.900003E-01
+6.274903E-02
+1.756301E-01
+6.672692E-02
+8.899097E-01
+2.932284E-01
+1.829964E-01
+1.780842E-01
+3.128622E-02
+1.040374E-01
+-2.048946E-01
+7.820016E-02
+-1.770632E-01
+4.339147E-02
+3.158973E-02
+1.032146E-01
+-2.632637E-01
+1.069343E-01
+4.191749E-01
+7.076456E-02
+-2.010288E-01
+3.814062E-02
+1.087619E-01
+2.328146E-02
+-2.966642E-01
+7.687789E-02
+2.042266E-01
+3.305349E-02
+-2.931179E-01
+6.178212E-02
+-5.521659E-01
+1.525784E-01
+-1.344386E-01
+1.983161E-01
+-1.636737E-01
+1.164849E-01
+5.187003E-01
+1.397304E-01
+2.399050E-01
+2.860510E-01
+2.967924E-01
+1.035081E-01
+-7.005240E-02
+2.007454E-02
+3.237492E-02
+2.506195E-02
+-6.959898E-02
+7.999033E-02
+1.732466E+01
+6.033456E+01
+3.107535E-02
+4.649239E-02
+-3.970747E-01
+9.427351E-02
+-1.123739E-01
+1.390365E-02
+-2.898450E-02
+3.902114E-03
+-2.631777E-01
+1.693614E-02
+-3.010145E-01
+2.549605E-02
+3.897172E-02
+3.337532E-02
+2.061855E-01
+5.566838E-02
+-6.067592E-02
+1.537371E-02
+-1.412859E-01
+1.026936E-02
+2.971338E-01
+2.017773E-02
+2.229947E-01
+2.097948E-02
+-6.075875E-03
+1.442041E-02
+2.389356E-01
+2.418354E-02
+4.914702E-02
+1.401262E-02
+-8.942816E-02
+1.285068E-02
+-1.041318E-01
+8.815681E-03
+-8.589408E-02
+4.120018E-03
+-7.343529E-02
+1.344074E-02
+4.450570E-02
+9.667309E-03
+1.602555E-01
+1.139203E-02
+1.567487E-02
+6.127441E-03
+5.173147E-02
+7.550481E-03
+-1.719948E-01
+7.484666E-03
+7.675999E-02
+5.875577E-03
+-5.024191E-02
+1.070000E-02
+-1.702066E-01
+1.443420E-02
+-3.419759E-02
+2.637248E-02
+4.600843E-02
+1.078680E-02
+2.458398E-01
+2.682601E-02
+-3.085412E-02
+2.243953E-02
+1.178334E-01
+8.380493E-03
+-8.449310E-02
+2.905176E-03
+-1.512034E-02
+3.692235E-03
+7.089635E-03
+4.536425E-03
+8.428445E+01
+1.425022E+03
+-1.362036E-01
+4.955117E-01
+-2.368550E+00
+1.691161E+00
+-7.107734E-01
+8.353526E-01
+-6.040498E-01
+1.849927E-01
+-7.580790E-01
+2.328322E-01
+-2.827702E-01
+4.902552E-01
+2.263047E-01
+4.920612E-01
+1.086735E+00
+1.264217E+00
+-2.674729E-01
+1.812824E-01
+-9.480041E-01
+3.494658E-01
+1.131279E+00
+4.394262E-01
+6.028149E-01
+7.611055E-01
+-4.226627E-01
+9.934511E-02
+4.674984E-01
+4.988034E-01
+4.404050E-01
+2.451286E-01
+9.924713E-02
+2.916276E-01
+-5.691463E-01
+1.499514E-01
+3.042408E-02
+1.223962E-01
+9.963351E-03
+1.056905E-01
+7.166813E-01
+1.498011E-01
+3.740392E-01
+2.456929E-01
+-9.657707E-02
+1.698541E-01
+2.079664E-01
+1.965244E-01
+-1.119856E+00
+3.770763E-01
+2.039849E-01
+8.304410E-02
+-4.199012E-01
+2.410734E-01
+-6.791470E-01
+2.497291E-01
+2.416848E-01
+5.299837E-01
+8.546582E-02
+4.898367E-02
+4.674386E-01
+2.280610E-01
+3.594172E-01
+5.739204E-01
+4.972395E-01
+2.816960E-01
+-4.736196E-01
+7.973237E-02
+-1.484500E-01
+8.763644E-02
+1.318617E-02
+1.581561E-01
+1.357577E+01
+3.704803E+01
+3.384888E-03
+1.080209E-01
+2.872142E-01
+1.224352E-01
+2.863822E-01
+1.491797E-01
+-1.972755E-01
+3.885966E-02
+2.015479E-02
+3.471051E-02
+2.173233E-01
+6.336006E-02
+-2.432345E-01
+9.646809E-02
+3.387966E-02
+3.753576E-02
+1.185678E-01
+1.112748E-02
+-7.895500E-02
+3.265370E-02
+-2.546256E-01
+5.142289E-02
+-4.647286E-02
+1.740042E-02
+-2.660905E-01
+4.717290E-02
+-1.510244E-01
+2.742362E-02
+1.058091E-01
+2.185823E-02
+2.153774E-01
+1.729585E-02
+-4.988894E-02
+2.207988E-02
+-4.352527E-02
+1.760359E-02
+1.436143E-02
+2.593599E-02
+-2.352747E-01
+1.960774E-02
+-2.822795E-01
+3.249990E-02
+-7.774355E-02
+9.008554E-03
+1.239406E-01
+2.331185E-02
+-2.880954E-01
+4.411740E-02
+-2.049660E-02
+2.503723E-02
+3.213790E-02
+3.867984E-02
+1.371693E-01
+4.194468E-02
+2.551557E-02
+4.767256E-02
+-1.191569E-01
+3.416422E-02
+-3.330294E-01
+3.474803E-02
+-1.842925E-01
+4.126454E-02
+-1.224990E-02
+1.230302E-02
+1.544261E-01
+8.671624E-03
+-2.122959E-01
+6.350218E-02
+-2.914181E-01
+3.809905E-02
+4.758922E+00
+4.591527E+00
+-6.067377E-02
+6.804346E-03
+1.316435E-01
+1.476493E-02
+1.867152E-01
+1.538802E-02
+-7.179389E-02
+3.473818E-03
+4.986417E-02
+4.841351E-03
+6.776718E-02
+8.811355E-03
+-4.792045E-02
+9.184441E-03
+-8.434738E-03
+3.853397E-03
+2.548586E-02
+7.203200E-04
+7.527437E-03
+2.037011E-03
+-2.163081E-02
+4.158974E-03
+-8.760026E-02
+5.772134E-03
+-7.520795E-02
+4.970576E-03
+-3.964671E-02
+1.497841E-03
+7.221753E-02
+5.863209E-03
+4.932819E-02
+2.532767E-03
+-9.734545E-03
+1.795577E-03
+-7.011235E-02
+2.210883E-03
+2.399198E-02
+4.136626E-03
+-3.191172E-04
+1.877929E-03
+-9.710977E-02
+5.285483E-03
+-4.824457E-02
+3.483504E-03
+7.075225E-02
+3.161643E-03
+-8.040602E-02
+5.499063E-03
+-1.607824E-02
+4.903695E-03
+3.492398E-02
+5.092265E-03
+-1.006502E-02
+3.910353E-03
+1.573863E-02
+6.305496E-03
+-3.123873E-02
+3.823757E-03
+-7.909433E-02
+1.715877E-03
+-7.160670E-02
+1.015353E-02
+-4.496969E-02
+1.852488E-03
+6.430477E-02
+1.306442E-03
+-3.397473E-02
+9.427230E-03
+-1.245838E-01
+4.976908E-03
+2.297418E+01
+1.067445E+02
+3.798346E-02
+3.290807E-01
+4.774316E-01
+1.652719E-01
+4.484246E-01
+1.838690E-01
+-2.684741E-01
+1.314460E-01
+1.697264E-01
+1.010791E-01
+5.566969E-01
+1.619332E-01
+-1.922269E-01
+1.622489E-01
+-2.094814E-01
+6.127647E-02
+3.104826E-02
+6.793969E-02
+4.360087E-02
+4.949024E-02
+-2.391312E-01
+9.061066E-02
+-2.985719E-01
+5.766047E-02
+-4.703235E-01
+1.110755E-01
+-2.651010E-01
+7.292117E-02
+1.640899E-01
+7.843023E-02
+4.369130E-01
+7.815370E-02
+2.842619E-02
+3.428084E-02
+-2.196648E-01
+4.603142E-02
+-1.710839E-01
+1.096328E-01
+-1.574989E-02
+2.927805E-02
+-1.811474E-01
+8.048153E-02
+-2.781610E-01
+1.252087E-01
+5.703734E-02
+4.910322E-02
+-3.299004E-01
+1.018308E-01
+-1.639460E-01
+1.231675E-01
+1.411391E-01
+8.293452E-02
+2.675276E-02
+7.910978E-02
+-4.464321E-02
+1.158543E-01
+-1.929947E-01
+9.887250E-02
+-5.501938E-01
+9.398742E-02
+-4.386734E-01
+1.054327E-01
+-1.583625E-01
+9.952385E-03
+1.449942E-01
+7.975730E-03
+-1.797342E-01
+1.517262E-01
+-5.629679E-01
+8.574197E-02
 tally 2:
-3.224218E+01
-2.217821E+02
--4.524803E-01
-1.326110E-01
--2.725152E-01
-4.845463E-01
--4.030063E-01
-1.825349E-01
--2.145346E-01
-7.197305E-02
-2.488985E-01
-4.295894E-02
--6.797085E-01
-2.125889E-01
-1.698034E-01
-3.750580E-02
--6.596628E-02
-6.507545E-02
-4.519597E-02
-1.432412E-02
-6.227959E-01
-1.066624E-01
-2.328135E-01
-8.583522E-02
--8.899482E-01
-1.982834E-01
-3.269468E-01
-5.392549E-02
-1.684792E-01
-1.461138E-01
--2.026161E-01
-1.992812E-01
-2.599678E-01
-7.704699E-02
--3.329837E-01
-8.761827E-02
--5.287177E-01
-9.089410E-02
-3.666982E-01
-4.451200E-02
-2.096594E-01
-4.539545E-02
-2.091762E-01
-4.861771E-02
-1.476292E-01
-2.837569E-02
--4.091772E-01
-1.141307E-01
--1.652694E-01
-5.552090E-02
-8.207679E-02
-1.659512E-02
--1.203575E-01
-6.408952E-02
--8.219791E-03
-9.915873E-02
--3.768675E-02
-8.535079E-02
-1.305167E-01
-1.917693E-02
-1.823050E-01
-1.945159E-02
-2.999655E-01
-4.587948E-02
-3.687435E-01
-1.382795E-01
-1.220376E-01
-6.297901E-02
-3.899923E-01
-5.894393E-02
--1.878957E-02
-1.159448E-01
-1.079687E+01
-2.494701E+01
--1.067271E-01
-9.075462E-03
--2.571244E-02
-4.402172E-02
--3.646387E-02
-2.948533E-02
--1.043828E-01
-1.600528E-02
-4.361032E-02
-3.875958E-03
--3.096545E-01
-3.184604E-02
-8.723730E-02
-4.599654E-03
-6.541966E-03
-9.605866E-03
-5.837907E-02
-3.026784E-03
-1.523399E-01
-7.846764E-03
-2.778305E-02
-8.106935E-03
--2.895648E-01
-1.983532E-02
-4.866247E-02
-1.048055E-02
-2.600097E-02
-1.465465E-02
--6.958338E-02
-3.287519E-02
-1.690742E-01
-1.204714E-02
--1.127534E-01
-7.881362E-03
--1.662306E-01
-9.412057E-03
-1.674047E-01
-6.690449E-03
--4.370664E-02
-5.828314E-03
-9.323095E-02
-4.400433E-03
-1.353164E-02
-1.389416E-03
--1.062009E-01
-1.297730E-02
--5.331064E-02
-5.321055E-03
-7.698466E-02
-3.247975E-03
--2.095250E-02
-4.788058E-03
--8.861817E-03
-7.657174E-03
-1.769365E-02
-1.144058E-03
-1.788678E-02
-2.746804E-03
-4.403056E-03
-6.918351E-04
-1.059091E-01
-1.394217E-02
-1.442934E-01
-1.318500E-02
-2.199047E-02
-5.838245E-03
-8.175546E-02
-3.242012E-03
-7.359786E-03
-1.673277E-02
-5.252579E+01
-5.951604E+02
--8.293789E-01
-2.900775E-01
-6.285324E-01
-1.487344E+00
--4.765860E-01
-8.058451E-01
--3.101266E-01
-1.597231E-01
-3.333449E-01
-1.162003E-01
--1.314742E+00
-4.565068E-01
-4.726655E-01
-1.161194E-01
-2.824987E-01
-8.732802E-02
-1.025468E-01
-4.935830E-02
-4.216767E-01
-1.225700E-01
--4.022783E-02
-1.178843E-01
--7.967853E-01
-2.698001E-01
-3.741686E-01
-2.849501E-01
-3.377745E-01
-3.722806E-01
-9.234355E-02
-4.498496E-01
-8.019475E-01
-3.404218E-01
--3.086622E-01
-1.857604E-01
--8.474654E-01
-1.733363E-01
-8.124627E-01
-1.415201E-01
--3.075481E-01
-3.345921E-02
-7.126178E-01
-2.478330E-01
-2.983972E-01
-2.913106E-02
--6.759256E-01
-4.245338E-01
--3.491214E-01
-1.017784E-01
-1.637602E-01
-7.414687E-02
--3.344942E-01
-1.165491E-01
--6.038784E-02
-1.791698E-01
-2.645086E-01
-8.129446E-02
--2.738265E-01
-6.616303E-02
-1.135151E-02
-4.140154E-02
-4.679883E-01
-1.914750E-01
-2.876984E-01
-1.355086E-01
--2.741613E-01
-1.060457E-01
-5.972204E-01
-2.144153E-01
--9.215131E-02
-4.815135E-01
-3.325822E+01
-2.414028E+02
--3.072951E-02
-3.385901E-01
-9.729550E-01
-3.745599E-01
--5.237870E-01
-3.101477E-01
--5.994810E-01
-1.696123E-01
--3.402784E-01
-1.910685E-01
--3.779571E-01
-2.598004E-01
--4.804007E-01
-1.417261E-01
--5.444032E-01
-1.756801E-01
--9.921809E-02
-6.889191E-02
--3.768065E-01
-8.931168E-02
-5.814513E-02
-1.660714E-02
--1.263664E-01
-2.650287E-01
-1.951860E-01
-2.090892E-01
-3.576168E-01
-2.511782E-01
--9.547988E-02
-7.900044E-03
-5.460746E-01
-1.319868E-01
--1.577655E-01
-8.575762E-02
-2.938792E-02
-7.941653E-02
--7.505627E-01
-2.530444E-01
--2.399786E-01
-1.105633E-01
-2.035740E-01
-2.442135E-02
-1.190368E-01
-8.652216E-02
-5.753449E-01
-9.353813E-02
-4.911025E-01
-6.795258E-02
--2.967023E-03
-7.063512E-03
--2.158307E-01
-4.680921E-02
--1.811238E-01
-7.008450E-02
-1.809785E-01
-3.414843E-02
--1.380825E-01
-3.469381E-02
-3.722241E-01
-3.956589E-02
-2.064516E-01
-2.676312E-02
--3.889056E-01
-6.737109E-02
-1.625815E-01
-1.356347E-02
--5.278455E-01
-1.297993E-01
--1.269304E-02
-1.253029E-02
-1.145800E+01
-2.880575E+01
-6.201234E-02
-4.410457E-02
-2.694694E-01
-6.262339E-02
--1.173739E-01
-4.727885E-02
--1.785056E-01
-1.745391E-02
--4.744392E-02
-2.117667E-02
-3.998416E-02
-6.058339E-02
--1.927536E-01
-1.710512E-02
--1.800560E-01
-2.420071E-02
--1.136912E-01
-1.049357E-02
--1.104415E-01
-1.181394E-02
-3.486245E-02
-3.673104E-03
--8.343502E-02
-2.270299E-02
--3.064437E-02
-1.197968E-02
-1.912081E-01
-2.808487E-02
-2.601014E-02
-1.311244E-03
-1.295023E-01
-1.108983E-02
--1.158397E-01
-1.033182E-02
-8.316701E-02
-2.061897E-02
--1.136796E-01
-3.133021E-02
--1.722931E-02
-2.168654E-02
-1.464014E-01
-8.570818E-03
-5.859338E-02
-6.076029E-03
-1.776223E-01
-1.345571E-02
-1.582455E-01
-9.719314E-03
-9.088118E-03
-1.681557E-03
--6.298727E-02
-5.287397E-03
-5.793395E-03
-6.397495E-03
--1.835123E-02
-4.506573E-03
--7.558061E-02
-4.462082E-03
-3.136371E-02
-3.181332E-03
--2.787527E-02
-1.765822E-03
--9.878307E-02
-3.381183E-03
-1.279690E-01
-4.386067E-03
--1.043523E-01
-5.381331E-03
-1.000162E-02
-6.707280E-04
-5.605671E+01
-6.804062E+02
-1.431465E-01
-1.700768E+00
-2.010680E+00
-2.307036E+00
--5.276592E-01
-1.006050E+00
--9.123132E-01
-4.824313E-01
--3.276490E-01
-5.842232E-01
-6.749445E-02
-6.049661E-01
--1.317515E+00
-4.738014E-01
--9.470910E-01
-4.937085E-01
--3.338536E-01
-2.196164E-01
--3.032729E-01
-1.241029E-01
--3.285269E-01
-5.276607E-02
--4.107012E-01
-6.402858E-01
-3.357626E-01
-2.672801E-01
-1.000507E+00
-5.263322E-01
--1.834202E-01
-9.495434E-02
-8.133484E-01
-3.011488E-01
--4.083516E-01
-2.428630E-01
-4.032934E-01
-1.825835E-01
--8.291267E-01
-6.773284E-01
--2.401557E-01
-2.280331E-01
-4.325658E-01
-1.163540E-01
-6.671759E-02
-2.181769E-01
-6.984462E-01
-1.716985E-01
-7.108347E-01
-1.386394E-01
-1.709795E-01
-5.320122E-02
--2.354809E-01
-7.105363E-02
-1.600239E-01
-9.179874E-02
-2.802111E-02
-6.149546E-02
--4.005049E-01
-2.195356E-01
-7.914623E-01
-2.273026E-01
-3.392453E-01
-1.101813E-01
--7.821576E-01
-1.637944E-01
-4.736782E-01
-1.531480E-01
--5.253391E-01
-1.093913E-01
-2.235961E-01
-5.449263E-02
+5.188799E+01
+5.402176E+02
+-5.713505E-01
+4.615729E-01
+-3.761827E-01
+5.750500E-01
+8.374325E-01
+1.862938E-01
+-3.954940E-01
+2.347775E-01
+-6.290233E-01
+1.864254E-01
+-6.656201E-01
+2.124518E-01
+4.729571E-01
+6.739065E-01
+4.921338E-01
+1.907183E-01
+-3.988992E-01
+3.761412E-01
+-1.125861E-01
+3.659299E-01
+-1.283461E-01
+5.045920E-02
+1.101261E-02
+1.391469E-01
+4.286921E-01
+2.097120E-01
+5.360702E-01
+1.809190E-01
+8.470757E-01
+2.461922E-01
+-4.140592E-01
+2.702824E-01
+-2.269391E-02
+5.000308E-03
+-1.585595E-01
+3.527370E-02
+-9.890128E-02
+1.067921E-01
+3.153468E-02
+1.483763E-01
+6.967922E-02
+7.789031E-02
+2.040956E-01
+4.637270E-02
+-2.345641E-01
+3.574654E-01
+-1.500187E-01
+1.514334E-01
+-3.019192E-01
+1.334819E-01
+1.796739E-01
+7.106788E-02
+-2.120506E-01
+1.144496E-01
+-6.891611E-02
+7.257229E-02
+-2.306514E-01
+7.048631E-02
+7.800814E-01
+2.467831E-01
+2.790547E-02
+5.494857E-02
+-1.896182E-01
+5.971620E-02
+1.644354E-02
+1.059859E-01
+-7.792754E-02
+2.085845E-02
+-1.114682E-01
+1.227128E-01
+1.593914E+01
+5.169154E+01
+1.039804E+00
+5.028617E-01
+-7.912437E-01
+5.548318E-01
+2.575930E-01
+1.148260E-01
+-6.331302E-01
+2.556615E-01
+-1.712129E-01
+7.877790E-02
+-5.816921E-01
+1.456126E-01
+2.272958E-01
+8.788738E-02
+3.822477E-01
+6.244032E-02
+-2.999416E-01
+8.461810E-02
+-2.623060E-02
+1.458472E-02
+1.300437E-01
+4.478019E-02
+-4.767351E-02
+7.362462E-02
+7.928962E-02
+4.510319E-02
+3.500548E-03
+4.881244E-02
+-2.067837E-01
+8.186594E-02
+-3.825304E-01
+1.082951E-01
+-3.558676E-01
+5.708469E-02
+4.048126E-01
+9.076309E-02
+4.553585E-02
+2.926622E-02
+-1.294373E-01
+1.870238E-02
+-3.195745E-01
+5.918983E-02
+-5.541420E-02
+6.185102E-02
+2.517910E-01
+1.252247E-01
+-6.864842E-02
+8.483359E-02
+-3.087092E-02
+1.682640E-02
+-6.457777E-02
+2.980731E-02
+-3.360246E-01
+3.729711E-02
+-2.091466E-01
+1.119332E-01
+-4.226988E-01
+5.973848E-02
+-5.390062E-02
+1.424816E-01
+-2.955041E-02
+7.118983E-03
+3.100944E-01
+5.584902E-02
+-4.266659E-01
+4.397359E-02
+-3.155083E-01
+7.428242E-02
+5.282933E-02
+2.010740E-02
+8.557014E+01
+1.465192E+03
+-3.913589E-01
+5.368834E-01
+-2.113693E+00
+2.169443E+00
+2.298156E-01
+6.330809E-01
+1.449786E-01
+2.666314E-01
+-2.958820E-01
+2.750937E-01
+1.054389E+00
+5.351584E-01
+4.775640E-02
+2.044779E-01
+4.186858E-01
+8.940845E-01
+-6.035852E-02
+3.754000E-01
+-1.597608E+00
+5.815293E-01
+5.200807E-01
+3.829815E-01
+9.437855E-01
+7.241779E-01
+-5.232235E-01
+1.966074E-01
+2.872008E-01
+1.241395E+00
+-1.039246E+00
+6.158088E-01
+3.058638E-01
+1.593114E-01
+-5.132144E-01
+4.577375E-01
+6.727602E-01
+4.119990E-01
+3.280880E-01
+4.971028E-01
+7.837744E-01
+2.444483E-01
+7.686392E-01
+3.456688E-01
+-5.035943E-01
+1.631734E-01
+4.145045E-01
+3.177084E-01
+-1.924638E-01
+3.336696E-01
+-1.484767E-01
+9.030824E-02
+-2.393846E-01
+6.598721E-02
+-5.318081E-01
+2.895430E-01
+1.518564E-01
+3.818155E-01
+5.795851E-01
+9.003270E-02
+3.580512E-01
+8.821756E-02
+5.366649E-01
+2.497151E-01
+-3.347132E-01
+1.352062E-01
+4.567995E-01
+1.561741E-01
+-2.279100E-01
+2.122433E-01
+4.461881E-01
+2.325205E-01
+1.427596E+01
+4.078276E+01
+5.217165E-02
+2.453888E-02
+1.584690E-01
+3.106540E-01
+4.560315E-01
+4.277362E-01
+-1.990373E-02
+5.277850E-02
+1.125203E-02
+6.443927E-02
+3.308696E-01
+1.037411E-01
+-2.750414E-01
+3.814328E-02
+-2.758789E-01
+1.449907E-01
+-3.474494E-02
+1.886069E-02
+-3.638818E-03
+1.651468E-01
+-2.060159E-02
+3.031181E-02
+3.225892E-01
+7.944048E-02
+-3.922626E-01
+5.950804E-02
+-7.374795E-01
+1.624566E-01
+-1.467806E-02
+1.234636E-01
+8.061252E-02
+4.356030E-02
+-1.065107E-01
+1.431995E-02
+-2.455689E-01
+4.182386E-02
+-3.425697E-01
+1.088413E-01
+-9.867791E-03
+4.864904E-02
+-2.403769E-01
+2.231699E-02
+1.795461E-01
+2.969251E-02
+-1.516375E-01
+2.951230E-02
+-3.101470E-01
+7.377660E-02
+1.996325E-01
+1.846547E-02
+9.153483E-02
+2.867924E-02
+2.545349E-01
+4.621843E-02
+1.776575E-01
+1.075483E-01
+-2.561501E-01
+4.947817E-02
+-1.558585E-01
+1.467725E-02
+-1.530184E-01
+5.532615E-02
+-1.802320E-01
+1.603564E-02
+3.331892E-01
+3.315195E-02
+-1.878592E-01
+3.588542E-02
+-3.843863E-01
+1.011661E-01
+4.943558E+00
+5.054633E+00
+3.508923E-01
+5.360844E-02
+2.595623E-01
+3.819756E-02
+-2.524359E-01
+4.825078E-02
+-3.376117E-01
+4.115606E-02
+8.885054E-02
+3.685958E-02
+1.168333E-01
+5.916818E-02
+-1.993698E-01
+5.632369E-02
+3.988948E-01
+4.366034E-02
+1.021403E-01
+4.690526E-03
+-1.508432E-01
+2.173064E-02
+-2.407920E-01
+2.510560E-02
+-1.703993E-01
+2.599072E-02
+8.752998E-02
+3.657089E-02
+-1.269869E-02
+2.565400E-02
+2.026727E-01
+1.804748E-02
+-4.913307E-03
+4.059747E-02
+-2.554771E-02
+7.959679E-03
+-1.549008E-02
+3.658041E-02
+-9.294647E-02
+2.754890E-03
+2.566876E-02
+4.951779E-03
+-1.016212E-02
+2.777381E-02
+3.601396E-01
+3.828736E-02
+-8.923373E-03
+3.126410E-03
+8.722969E-02
+1.182345E-02
+-2.332024E-02
+5.685275E-03
+2.101415E-01
+1.224880E-02
+-9.619916E-03
+9.042453E-03
+-2.480871E-01
+2.222042E-02
+9.764734E-02
+4.847970E-03
+-1.623487E-01
+1.814336E-02
+5.091875E-02
+1.290604E-02
+7.192058E-02
+1.343350E-02
+-1.316640E-01
+3.514269E-02
+-9.198972E-02
+1.244138E-02
+-1.225056E-01
+3.035718E-02
+2.194332E+01
+9.737940E+01
+-3.052407E-01
+4.072957E-01
+3.531168E-02
+2.019382E-01
+8.793928E-01
+4.041664E-01
+-4.072462E-01
+6.027190E-02
+-8.907772E-02
+1.952922E-01
+9.519375E-02
+9.821752E-02
+3.205302E-01
+2.075134E-01
+1.124955E-01
+6.446089E-02
+-3.366117E-01
+8.184450E-02
+-3.676127E-02
+3.861064E-02
+2.001007E-01
+6.507942E-02
+-1.155787E-01
+4.761238E-02
+-2.779628E-01
+3.425225E-02
+1.099627E-01
+5.462866E-02
+-2.654341E-01
+1.868127E-02
+2.246854E-01
+3.157231E-02
+-1.422513E-01
+5.939434E-02
+-8.583155E-02
+5.668810E-02
+6.967936E-02
+1.924265E-02
+-2.246405E-03
+1.576409E-02
+7.321307E-02
+2.061990E-02
+-4.949248E-01
+1.278374E-01
+4.468760E-02
+3.814622E-02
+-9.398135E-02
+1.772831E-02
+-2.757022E-01
+1.349555E-01
+1.715161E-02
+5.040025E-02
+-1.682974E-01
+7.558363E-02
+-4.700401E-02
+2.700354E-02
+1.109855E-01
+2.666559E-02
+2.136115E-01
+7.786593E-02
+-2.089667E-01
+1.489893E-02
+-6.959959E-02
+7.545487E-02
+-3.296680E-02
+1.604995E-02
+-1.587440E-01
+5.482886E-02
+-3.203027E-01
+3.421361E-02
 tally 3:
-3.077754E+01
-2.017424E+02
--4.040800E-01
-5.606719E-01
--5.238239E-01
-4.460714E-01
-1.155164E-01
-1.686786E-01
--1.972294E-01
-2.912851E-01
-4.908524E-01
-1.374195E-01
--1.467088E-02
-1.080839E-01
-6.749037E-02
-1.397361E-01
-4.136479E-03
-9.237632E-02
--3.742305E-01
-9.917374E-02
-5.374208E-01
-2.530961E-01
-2.270996E-01
-9.415721E-02
--4.568867E-02
-1.277446E-01
-1.581716E-01
-6.217155E-02
-4.667840E-01
-1.143380E-01
-9.684270E-02
-7.302998E-02
-8.366629E-01
-1.797483E-01
--5.657893E-01
-2.553910E-01
--2.351441E-02
-4.395513E-02
-7.843306E-01
-1.466478E-01
-4.617856E-02
-1.154681E-02
-1.431343E-01
-3.531062E-02
-4.625825E-01
-6.235642E-02
--8.837342E-02
-6.231694E-02
--3.766755E-01
-6.412261E-02
-1.995226E-01
-1.743990E-01
--2.498625E-02
-8.897536E-02
--1.039315E-01
-1.868672E-01
-6.712910E-01
-2.084042E-01
-5.805639E-02
-4.049580E-02
-1.603677E-01
-4.280033E-02
-3.909878E-01
-7.726018E-02
-9.878354E-02
-4.630595E-02
--2.389983E-01
-3.528604E-02
-1.641046E-01
-1.669859E-01
--2.351986E-02
-1.048794E-02
-1.172238E+01
-3.139127E+01
--1.057733E+00
-2.820672E-01
-5.708838E-02
-6.224675E-02
-2.492981E-02
-1.827498E-01
--1.339268E-01
-1.968929E-02
-2.363867E-01
-3.028587E-02
--2.867841E-01
-2.680318E-02
--2.352784E-01
-1.895006E-02
-4.365572E-01
-1.883240E-01
--3.388837E-01
-7.209932E-02
-3.488374E-01
-6.640137E-02
--3.343893E-01
-4.149634E-02
--4.575314E-01
-7.461614E-02
-4.436881E-01
-1.325092E-01
-3.394853E-01
-2.987173E-02
--2.633936E-02
-6.171428E-02
-9.994191E-02
-6.447641E-02
--1.618840E-01
-3.497845E-02
--1.290678E-01
-3.735394E-02
-9.852126E-03
-2.963925E-02
--1.656539E-01
-4.190396E-02
--2.292763E-01
-7.045480E-02
--4.616824E-03
-1.926690E-02
--1.960839E-01
-1.396042E-02
--2.133526E-02
-5.189823E-02
-2.933136E-01
-5.721356E-02
--1.084914E-01
-2.448532E-02
--4.778583E-01
-7.644033E-02
-1.736901E-01
-6.630467E-02
--5.460801E-02
-1.510381E-02
-1.106093E-01
-1.590306E-02
-1.659501E-01
-5.983218E-02
-1.343781E-02
-2.751294E-02
-2.052693E-01
-3.478581E-02
--1.006298E-01
-1.815313E-02
--2.563766E-01
-3.045246E-02
-5.231699E+01
-5.870469E+02
--6.102587E-01
-5.930968E-01
-1.184182E+00
-1.364433E+00
--6.362263E-02
-8.852514E-01
--4.844978E-01
-1.751923E-01
-8.223413E-01
-2.436206E-01
--9.656506E-01
-3.513566E-01
-2.710494E-01
-7.170772E-01
-4.792482E-01
-2.551569E-01
--1.266077E-01
-2.824778E-01
-6.389964E-01
-2.501483E-01
-8.915816E-01
-3.557431E-01
--1.007448E+00
-5.743018E-01
-3.528444E-01
-2.428078E-01
--5.833000E-01
-3.733648E-01
--4.660289E-01
-6.567263E-02
-5.856088E-01
-2.336146E-01
-3.836351E-02
-7.665403E-02
--6.721211E-01
-2.651780E-01
-5.725993E-01
-2.101026E-01
--2.130594E-01
-1.855350E-02
-2.607168E-01
-1.564288E-01
--3.399382E-02
-3.067656E-02
--1.228976E+00
-6.554836E-01
--2.962235E-01
-1.808511E-01
-5.521675E-01
-1.722073E-01
--1.658751E-01
-1.994119E-02
--2.671896E-01
-1.343320E-01
--2.325282E-01
-4.677656E-02
--3.380310E-01
-1.703532E-01
--3.571853E-01
-1.140525E-01
-3.836770E-02
-8.586429E-02
-7.328263E-01
-1.567227E-01
-4.840110E-02
-2.718471E-02
-5.654783E-01
-3.645579E-01
--3.027585E-01
-1.407867E-01
-3.259142E+01
-2.336719E+02
-3.053294E-01
-2.086257E-01
--7.563597E-01
-2.816768E-01
--3.039288E-01
-2.855043E-01
--2.648323E-01
-1.883784E-01
-2.665933E-01
-1.782353E-01
-1.978960E-01
-1.419567E-01
-1.228712E-01
-1.913946E-01
--9.152681E-03
-1.324681E-01
--5.707326E-01
-1.092067E-01
-2.326858E-01
-6.731743E-02
--5.170241E-01
-1.353439E-01
--4.064026E-01
-9.715030E-02
--1.142031E-01
-7.748788E-02
-2.928039E-01
-2.716157E-01
--1.721186E-01
-1.447738E-01
-6.452116E-01
-1.821975E-01
--5.697276E-01
-1.047333E-01
--9.640967E-02
-1.139327E-01
--4.509832E-01
-2.079493E-01
--2.134684E-02
-2.907667E-01
--2.434868E-01
-1.235397E-01
-2.550330E-01
-2.979627E-01
-9.598615E-01
-3.140885E-01
-1.218430E-01
-6.283872E-02
-2.412915E-01
-1.907292E-02
--2.236667E-01
-4.379414E-02
-2.844474E-01
-2.965692E-02
-1.618860E-01
-8.293785E-03
--1.265583E-01
-4.515449E-02
-6.356127E-02
-1.358134E-02
--3.844886E-01
-8.600010E-02
--1.942739E-01
-7.516022E-02
-1.765511E-01
-3.522611E-02
--3.433188E-01
-3.456066E-02
--1.501983E-01
-5.633844E-02
-1.040924E+01
-2.432332E+01
--4.138270E-01
-1.309129E-01
--3.151106E-01
-1.286964E-01
-9.213222E-02
-6.189454E-02
--2.746107E-01
-8.103949E-02
--9.781742E-02
-3.783736E-02
--1.178371E-01
-3.242332E-02
--5.837932E-01
-2.059491E-01
--7.338223E-03
-8.012203E-02
-5.628994E-02
-2.190669E-02
-8.155585E-02
-1.039007E-01
-6.052048E-02
-4.339463E-02
--1.157646E-02
-1.839000E-02
--2.641673E-01
-4.737589E-02
--8.531135E-02
-5.432766E-02
-6.036555E-01
-1.190329E-01
--3.149976E-01
-5.735264E-02
--8.456340E-02
-4.563143E-03
-2.224065E-01
-6.600030E-02
-9.562392E-03
-1.843524E-02
--2.400599E-01
-3.182217E-02
--6.534941E-01
-1.180315E-01
-4.371157E-01
-9.076666E-02
-3.257455E-02
-2.936184E-02
--8.788428E-02
-1.923293E-02
--2.604776E-01
-3.660313E-02
--6.315350E-02
-1.503534E-02
-5.609294E-01
-8.783528E-02
--7.363672E-01
-1.789210E-01
-2.883575E-01
-6.478578E-02
--3.302954E-02
-1.517946E-02
--3.234157E-01
-4.418920E-02
-2.846318E-01
-2.712085E-02
--3.227536E-01
-5.062832E-02
-4.391474E-01
-5.548002E-02
-1.322988E-01
-2.995854E-02
-5.709679E+01
-6.978668E+02
-2.859201E-02
-1.094507E+00
-6.058587E-01
-6.079927E-01
-7.553798E-02
-1.131607E+00
--5.851206E-01
-1.215663E+00
-8.266012E-02
-9.031287E-01
--7.088368E-01
-3.984608E-01
--4.414986E-01
-1.502417E-01
-2.241998E-01
-3.228823E-01
--7.328574E-01
-2.430448E-01
--8.070160E-01
-1.767265E-01
--1.154449E-01
-8.739303E-03
--3.787161E-01
-4.728756E-01
--1.743577E-01
-1.091245E-01
-2.878137E-01
-2.724285E-01
-2.128994E-01
-4.440539E-01
-9.495567E-01
-3.622719E-01
-1.422950E-01
-5.309223E-02
-1.323659E-01
-1.911979E-01
--1.303752E-01
-5.710728E-01
--4.611294E-02
-4.086632E-02
-5.937879E-01
-1.006156E-01
--3.558925E-01
-2.998983E-01
-1.175971E+00
-5.323321E-01
-2.426485E-01
-1.497265E-01
-7.805090E-02
-5.060214E-02
--2.914577E-01
-2.233355E-01
-1.053098E-01
-6.693123E-02
-4.541315E-01
-1.328340E-01
--6.290732E-02
-8.910616E-02
-7.371592E-01
-1.980732E-01
-5.804701E-01
-1.711949E-01
--6.642202E-01
-1.131866E-01
-1.779818E-01
-6.530190E-02
--5.224739E-01
-2.534102E-01
--1.824905E-01
-2.910309E-02
-tally 4:
-3.077754E+01
-2.017424E+02
--4.040800E-01
-5.606719E-01
--5.238239E-01
-4.460714E-01
-1.155164E-01
-1.686786E-01
--1.972294E-01
-2.912851E-01
-4.908524E-01
-1.374195E-01
--1.467088E-02
-1.080839E-01
-6.749037E-02
-1.397361E-01
-4.136479E-03
-9.237632E-02
--3.742305E-01
-9.917374E-02
-5.374208E-01
-2.530961E-01
-2.270996E-01
-9.415721E-02
--4.568867E-02
-1.277446E-01
-1.581716E-01
-6.217155E-02
-4.667840E-01
-1.143380E-01
-9.684270E-02
-7.302998E-02
-8.366629E-01
-1.797483E-01
--5.657893E-01
-2.553910E-01
--2.351441E-02
-4.395513E-02
-7.843306E-01
-1.466478E-01
-4.617856E-02
-1.154681E-02
-1.431343E-01
-3.531062E-02
-4.625825E-01
-6.235642E-02
--8.837342E-02
-6.231694E-02
--3.766755E-01
-6.412261E-02
-1.995226E-01
-1.743990E-01
--2.498625E-02
-8.897536E-02
--1.039315E-01
-1.868672E-01
-6.712910E-01
-2.084042E-01
-5.805639E-02
-4.049580E-02
-1.603677E-01
-4.280033E-02
-3.909878E-01
-7.726018E-02
-9.878354E-02
-4.630595E-02
--2.389983E-01
-3.528604E-02
-1.641046E-01
-1.669859E-01
--2.351986E-02
-1.048794E-02
-1.172238E+01
-3.139127E+01
--1.057733E+00
-2.820672E-01
-5.708838E-02
-6.224675E-02
-2.492981E-02
-1.827498E-01
--1.339268E-01
-1.968929E-02
-2.363867E-01
-3.028587E-02
--2.867841E-01
-2.680318E-02
--2.352784E-01
-1.895006E-02
-4.365572E-01
-1.883240E-01
--3.388837E-01
-7.209932E-02
-3.488374E-01
-6.640137E-02
--3.343893E-01
-4.149634E-02
--4.575314E-01
-7.461614E-02
-4.436881E-01
-1.325092E-01
-3.394853E-01
-2.987173E-02
--2.633936E-02
-6.171428E-02
-9.994191E-02
-6.447641E-02
--1.618840E-01
-3.497845E-02
--1.290678E-01
-3.735394E-02
-9.852126E-03
-2.963925E-02
--1.656539E-01
-4.190396E-02
--2.292763E-01
-7.045480E-02
--4.616824E-03
-1.926690E-02
--1.960839E-01
-1.396042E-02
--2.133526E-02
-5.189823E-02
-2.933136E-01
-5.721356E-02
--1.084914E-01
-2.448532E-02
--4.778583E-01
-7.644033E-02
-1.736901E-01
-6.630467E-02
--5.460801E-02
-1.510381E-02
-1.106093E-01
-1.590306E-02
-1.659501E-01
-5.983218E-02
-1.343781E-02
-2.751294E-02
-2.052693E-01
-3.478581E-02
--1.006298E-01
-1.815313E-02
--2.563766E-01
-3.045246E-02
-5.231699E+01
-5.870469E+02
--6.102587E-01
-5.930968E-01
-1.184182E+00
-1.364433E+00
--6.362263E-02
-8.852514E-01
--4.844978E-01
-1.751923E-01
-8.223413E-01
-2.436206E-01
--9.656506E-01
-3.513566E-01
-2.710494E-01
-7.170772E-01
-4.792482E-01
-2.551569E-01
--1.266077E-01
-2.824778E-01
-6.389964E-01
-2.501483E-01
-8.915816E-01
-3.557431E-01
--1.007448E+00
-5.743018E-01
-3.528444E-01
-2.428078E-01
--5.833000E-01
-3.733648E-01
--4.660289E-01
-6.567263E-02
-5.856088E-01
-2.336146E-01
-3.836351E-02
-7.665403E-02
--6.721211E-01
-2.651780E-01
-5.725993E-01
-2.101026E-01
--2.130594E-01
-1.855350E-02
-2.607168E-01
-1.564288E-01
--3.399382E-02
-3.067656E-02
--1.228976E+00
-6.554836E-01
--2.962235E-01
-1.808511E-01
-5.521675E-01
-1.722073E-01
--1.658751E-01
-1.994119E-02
--2.671896E-01
-1.343320E-01
--2.325282E-01
-4.677656E-02
--3.380310E-01
-1.703532E-01
--3.571853E-01
-1.140525E-01
-3.836770E-02
-8.586429E-02
-7.328263E-01
-1.567227E-01
-4.840110E-02
-2.718471E-02
-5.654783E-01
-3.645579E-01
--3.027585E-01
-1.407867E-01
-3.259142E+01
-2.336719E+02
-3.053294E-01
-2.086257E-01
--7.563597E-01
-2.816768E-01
--3.039288E-01
-2.855043E-01
--2.648323E-01
-1.883784E-01
-2.665933E-01
-1.782353E-01
-1.978960E-01
-1.419567E-01
-1.228712E-01
-1.913946E-01
--9.152681E-03
-1.324681E-01
--5.707326E-01
-1.092067E-01
-2.326858E-01
-6.731743E-02
--5.170241E-01
-1.353439E-01
--4.064026E-01
-9.715030E-02
--1.142031E-01
-7.748788E-02
-2.928039E-01
-2.716157E-01
--1.721186E-01
-1.447738E-01
-6.452116E-01
-1.821975E-01
--5.697276E-01
-1.047333E-01
--9.640967E-02
-1.139327E-01
--4.509832E-01
-2.079493E-01
--2.134684E-02
-2.907667E-01
--2.434868E-01
-1.235397E-01
-2.550330E-01
-2.979627E-01
-9.598615E-01
-3.140885E-01
-1.218430E-01
-6.283872E-02
-2.412915E-01
-1.907292E-02
--2.236667E-01
-4.379414E-02
-2.844474E-01
-2.965692E-02
-1.618860E-01
-8.293785E-03
--1.265583E-01
-4.515449E-02
-6.356127E-02
-1.358134E-02
--3.844886E-01
-8.600010E-02
--1.942739E-01
-7.516022E-02
-1.765511E-01
-3.522611E-02
--3.433188E-01
-3.456066E-02
--1.501983E-01
-5.633844E-02
-1.040924E+01
-2.432332E+01
--4.138270E-01
-1.309129E-01
--3.151106E-01
-1.286964E-01
-9.213222E-02
-6.189454E-02
--2.746107E-01
-8.103949E-02
--9.781742E-02
-3.783736E-02
--1.178371E-01
-3.242332E-02
--5.837932E-01
-2.059491E-01
--7.338223E-03
-8.012203E-02
-5.628994E-02
-2.190669E-02
-8.155585E-02
-1.039007E-01
-6.052048E-02
-4.339463E-02
--1.157646E-02
-1.839000E-02
--2.641673E-01
-4.737589E-02
--8.531135E-02
-5.432766E-02
-6.036555E-01
-1.190329E-01
--3.149976E-01
-5.735264E-02
--8.456340E-02
-4.563143E-03
-2.224065E-01
-6.600030E-02
-9.562392E-03
-1.843524E-02
--2.400599E-01
-3.182217E-02
--6.534941E-01
-1.180315E-01
-4.371157E-01
-9.076666E-02
-3.257455E-02
-2.936184E-02
--8.788428E-02
-1.923293E-02
--2.604776E-01
-3.660313E-02
--6.315350E-02
-1.503534E-02
-5.609294E-01
-8.783528E-02
--7.363672E-01
-1.789210E-01
-2.883575E-01
-6.478578E-02
--3.302954E-02
-1.517946E-02
--3.234157E-01
-4.418920E-02
-2.846318E-01
-2.712085E-02
--3.227536E-01
-5.062832E-02
-4.391474E-01
-5.548002E-02
-1.322988E-01
-2.995854E-02
-5.709679E+01
-6.978668E+02
-2.859201E-02
-1.094507E+00
-6.058587E-01
-6.079927E-01
-7.553798E-02
-1.131607E+00
--5.851206E-01
-1.215663E+00
-8.266012E-02
-9.031287E-01
--7.088368E-01
-3.984608E-01
--4.414986E-01
-1.502417E-01
-2.241998E-01
-3.228823E-01
--7.328574E-01
-2.430448E-01
--8.070160E-01
-1.767265E-01
--1.154449E-01
-8.739303E-03
--3.787161E-01
-4.728756E-01
--1.743577E-01
-1.091245E-01
-2.878137E-01
-2.724285E-01
-2.128994E-01
-4.440539E-01
-9.495567E-01
-3.622719E-01
-1.422950E-01
-5.309223E-02
-1.323659E-01
-1.911979E-01
--1.303752E-01
-5.710728E-01
--4.611294E-02
-4.086632E-02
-5.937879E-01
-1.006156E-01
--3.558925E-01
-2.998983E-01
-1.175971E+00
-5.323321E-01
-2.426485E-01
-1.497265E-01
-7.805090E-02
-5.060214E-02
--2.914577E-01
-2.233355E-01
-1.053098E-01
-6.693123E-02
-4.541315E-01
-1.328340E-01
--6.290732E-02
-8.910616E-02
-7.371592E-01
-1.980732E-01
-5.804701E-01
-1.711949E-01
--6.642202E-01
-1.131866E-01
-1.779818E-01
-6.530190E-02
--5.224739E-01
-2.534102E-01
--1.824905E-01
-2.910309E-02
+5.188799E+01
+5.402176E+02
+-5.713505E-01
+4.615729E-01
+-3.761827E-01
+5.750500E-01
+8.374325E-01
+1.862938E-01
+-3.954940E-01
+2.347775E-01
+-6.290233E-01
+1.864254E-01
+-6.656201E-01
+2.124518E-01
+4.729571E-01
+6.739065E-01
+4.921338E-01
+1.907183E-01
+-3.988992E-01
+3.761412E-01
+-1.125861E-01
+3.659299E-01
+-1.283461E-01
+5.045920E-02
+1.101261E-02
+1.391469E-01
+4.286921E-01
+2.097120E-01
+5.360702E-01
+1.809190E-01
+8.470757E-01
+2.461922E-01
+-4.140592E-01
+2.702824E-01
+-2.269391E-02
+5.000308E-03
+-1.585595E-01
+3.527370E-02
+-9.890128E-02
+1.067921E-01
+3.153468E-02
+1.483763E-01
+6.967922E-02
+7.789031E-02
+2.040956E-01
+4.637270E-02
+-2.345641E-01
+3.574654E-01
+-1.500187E-01
+1.514334E-01
+-3.019192E-01
+1.334819E-01
+1.796739E-01
+7.106788E-02
+-2.120506E-01
+1.144496E-01
+-6.891611E-02
+7.257229E-02
+-2.306514E-01
+7.048631E-02
+7.800814E-01
+2.467831E-01
+2.790547E-02
+5.494857E-02
+-1.896182E-01
+5.971620E-02
+1.644354E-02
+1.059859E-01
+-7.792754E-02
+2.085845E-02
+-1.114682E-01
+1.227128E-01
+1.593914E+01
+5.169154E+01
+1.039804E+00
+5.028617E-01
+-7.912437E-01
+5.548318E-01
+2.575930E-01
+1.148260E-01
+-6.331302E-01
+2.556615E-01
+-1.712129E-01
+7.877790E-02
+-5.816921E-01
+1.456126E-01
+2.272958E-01
+8.788738E-02
+3.822477E-01
+6.244032E-02
+-2.999416E-01
+8.461810E-02
+-2.623060E-02
+1.458472E-02
+1.300437E-01
+4.478019E-02
+-4.767351E-02
+7.362462E-02
+7.928962E-02
+4.510319E-02
+3.500548E-03
+4.881244E-02
+-2.067837E-01
+8.186594E-02
+-3.825304E-01
+1.082951E-01
+-3.558676E-01
+5.708469E-02
+4.048126E-01
+9.076309E-02
+4.553585E-02
+2.926622E-02
+-1.294373E-01
+1.870238E-02
+-3.195745E-01
+5.918983E-02
+-5.541420E-02
+6.185102E-02
+2.517910E-01
+1.252247E-01
+-6.864842E-02
+8.483359E-02
+-3.087092E-02
+1.682640E-02
+-6.457777E-02
+2.980731E-02
+-3.360246E-01
+3.729711E-02
+-2.091466E-01
+1.119332E-01
+-4.226988E-01
+5.973848E-02
+-5.390062E-02
+1.424816E-01
+-2.955041E-02
+7.118983E-03
+3.100944E-01
+5.584902E-02
+-4.266659E-01
+4.397359E-02
+-3.155083E-01
+7.428242E-02
+5.282933E-02
+2.010740E-02
+8.557014E+01
+1.465192E+03
+-3.913589E-01
+5.368834E-01
+-2.113693E+00
+2.169443E+00
+2.298156E-01
+6.330809E-01
+1.449786E-01
+2.666314E-01
+-2.958820E-01
+2.750937E-01
+1.054389E+00
+5.351584E-01
+4.775640E-02
+2.044779E-01
+4.186858E-01
+8.940845E-01
+-6.035852E-02
+3.754000E-01
+-1.597608E+00
+5.815293E-01
+5.200807E-01
+3.829815E-01
+9.437855E-01
+7.241779E-01
+-5.232235E-01
+1.966074E-01
+2.872008E-01
+1.241395E+00
+-1.039246E+00
+6.158088E-01
+3.058638E-01
+1.593114E-01
+-5.132144E-01
+4.577375E-01
+6.727602E-01
+4.119990E-01
+3.280880E-01
+4.971028E-01
+7.837744E-01
+2.444483E-01
+7.686392E-01
+3.456688E-01
+-5.035943E-01
+1.631734E-01
+4.145045E-01
+3.177084E-01
+-1.924638E-01
+3.336696E-01
+-1.484767E-01
+9.030824E-02
+-2.393846E-01
+6.598721E-02
+-5.318081E-01
+2.895430E-01
+1.518564E-01
+3.818155E-01
+5.795851E-01
+9.003270E-02
+3.580512E-01
+8.821756E-02
+5.366649E-01
+2.497151E-01
+-3.347132E-01
+1.352062E-01
+4.567995E-01
+1.561741E-01
+-2.279100E-01
+2.122433E-01
+4.461881E-01
+2.325205E-01
+1.427596E+01
+4.078276E+01
+5.217165E-02
+2.453888E-02
+1.584690E-01
+3.106540E-01
+4.560315E-01
+4.277362E-01
+-1.990373E-02
+5.277850E-02
+1.125203E-02
+6.443927E-02
+3.308696E-01
+1.037411E-01
+-2.750414E-01
+3.814328E-02
+-2.758789E-01
+1.449907E-01
+-3.474494E-02
+1.886069E-02
+-3.638818E-03
+1.651468E-01
+-2.060159E-02
+3.031181E-02
+3.225892E-01
+7.944048E-02
+-3.922626E-01
+5.950804E-02
+-7.374795E-01
+1.624566E-01
+-1.467806E-02
+1.234636E-01
+8.061252E-02
+4.356030E-02
+-1.065107E-01
+1.431995E-02
+-2.455689E-01
+4.182386E-02
+-3.425697E-01
+1.088413E-01
+-9.867791E-03
+4.864904E-02
+-2.403769E-01
+2.231699E-02
+1.795461E-01
+2.969251E-02
+-1.516375E-01
+2.951230E-02
+-3.101470E-01
+7.377660E-02
+1.996325E-01
+1.846547E-02
+9.153483E-02
+2.867924E-02
+2.545349E-01
+4.621843E-02
+1.776575E-01
+1.075483E-01
+-2.561501E-01
+4.947817E-02
+-1.558585E-01
+1.467725E-02
+-1.530184E-01
+5.532615E-02
+-1.802320E-01
+1.603564E-02
+3.331892E-01
+3.315195E-02
+-1.878592E-01
+3.588542E-02
+-3.843863E-01
+1.011661E-01
+4.943558E+00
+5.054633E+00
+3.508923E-01
+5.360844E-02
+2.595623E-01
+3.819756E-02
+-2.524359E-01
+4.825078E-02
+-3.376117E-01
+4.115606E-02
+8.885054E-02
+3.685958E-02
+1.168333E-01
+5.916818E-02
+-1.993698E-01
+5.632369E-02
+3.988948E-01
+4.366034E-02
+1.021403E-01
+4.690526E-03
+-1.508432E-01
+2.173064E-02
+-2.407920E-01
+2.510560E-02
+-1.703993E-01
+2.599072E-02
+8.752998E-02
+3.657089E-02
+-1.269869E-02
+2.565400E-02
+2.026727E-01
+1.804748E-02
+-4.913307E-03
+4.059747E-02
+-2.554771E-02
+7.959679E-03
+-1.549008E-02
+3.658041E-02
+-9.294647E-02
+2.754890E-03
+2.566876E-02
+4.951779E-03
+-1.016212E-02
+2.777381E-02
+3.601396E-01
+3.828736E-02
+-8.923373E-03
+3.126410E-03
+8.722969E-02
+1.182345E-02
+-2.332024E-02
+5.685275E-03
+2.101415E-01
+1.224880E-02
+-9.619916E-03
+9.042453E-03
+-2.480871E-01
+2.222042E-02
+9.764734E-02
+4.847970E-03
+-1.623487E-01
+1.814336E-02
+5.091875E-02
+1.290604E-02
+7.192058E-02
+1.343350E-02
+-1.316640E-01
+3.514269E-02
+-9.198972E-02
+1.244138E-02
+-1.225056E-01
+3.035718E-02
+2.194332E+01
+9.737940E+01
+-3.052407E-01
+4.072957E-01
+3.531168E-02
+2.019382E-01
+8.793928E-01
+4.041664E-01
+-4.072462E-01
+6.027190E-02
+-8.907772E-02
+1.952922E-01
+9.519375E-02
+9.821752E-02
+3.205302E-01
+2.075134E-01
+1.124955E-01
+6.446089E-02
+-3.366117E-01
+8.184450E-02
+-3.676127E-02
+3.861064E-02
+2.001007E-01
+6.507942E-02
+-1.155787E-01
+4.761238E-02
+-2.779628E-01
+3.425225E-02
+1.099627E-01
+5.462866E-02
+-2.654341E-01
+1.868127E-02
+2.246854E-01
+3.157231E-02
+-1.422513E-01
+5.939434E-02
+-8.583155E-02
+5.668810E-02
+6.967936E-02
+1.924265E-02
+-2.246405E-03
+1.576409E-02
+7.321307E-02
+2.061990E-02
+-4.949248E-01
+1.278374E-01
+4.468760E-02
+3.814622E-02
+-9.398135E-02
+1.772831E-02
+-2.757022E-01
+1.349555E-01
+1.715161E-02
+5.040025E-02
+-1.682974E-01
+7.558363E-02
+-4.700401E-02
+2.700354E-02
+1.109855E-01
+2.666559E-02
+2.136115E-01
+7.786593E-02
+-2.089667E-01
+1.489893E-02
+-6.959959E-02
+7.545487E-02
+-3.296680E-02
+1.604995E-02
+-1.587440E-01
+5.482886E-02
+-3.203027E-01
+3.421361E-02
diff --git a/tests/test_score_flux_yn/settings.xml b/tests/test_score_flux_yn/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_flux_yn/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_flux_yn/tallies.xml b/tests/test_score_flux_yn/tallies.xml
deleted file mode 100644
index e9f08bd4e6..0000000000
--- a/tests/test_score_flux_yn/tallies.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21 22 23 27 28 29" />
-    <scores>flux</scores>
-  </tally>
-  
-  <tally id="2">
-    <filter type="cell" bins="21 22 23 27 28 29" />
-    <scores>flux-y5</scores>
-  </tally>
-  
-  <tally id="3">
-    <filter type="cell" bins="21 22 23 27 28 29" />
-    <scores>flux-y5</scores>
-    <estimator>analog</estimator>
-  </tally>
-  
-  <tally id="4">
-    <filter type="cell" bins="21 22 23 27 28 29" />
-    <scores>flux-y5</scores>
-    <estimator>collision</estimator>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_flux_yn/test_score_flux_yn.py b/tests/test_score_flux_yn/test_score_flux_yn.py
index 1777db993e..0122768040 100755
--- a/tests/test_score_flux_yn/test_score_flux_yn.py
+++ b/tests/test_score_flux_yn/test_score_flux_yn.py
@@ -2,9 +2,31 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreFluxYnTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, 22, 23, 27, 28, 29))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('flux-y5') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreFluxYnTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_kappafission/geometry.xml b/tests/test_score_kappafission/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_kappafission/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_kappafission/inputs_true.dat b/tests/test_score_kappafission/inputs_true.dat
new file mode 100644
index 0000000000..67b1e38750
--- /dev/null
+++ b/tests/test_score_kappafission/inputs_true.dat
@@ -0,0 +1 @@
+46d1dbf99a14e08eddf34721d2380bf7969b8d299c48a64cfae22dfde29e3b8eab227d663f3ecb234dac2712b5971af2735fd69301b7614c7adae6c3da795e51
\ No newline at end of file
diff --git a/tests/test_score_kappafission/materials.xml b/tests/test_score_kappafission/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_kappafission/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_kappafission/results_true.dat b/tests/test_score_kappafission/results_true.dat
index e992b4b682..23c12eed20 100644
--- a/tests/test_score_kappafission/results_true.dat
+++ b/tests/test_score_kappafission/results_true.dat
@@ -1,29 +1,29 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-1.848110E+02
-7.563211E+03
+3.057169E+02
+1.886844E+04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.035912E+02
-8.999693E+03
+7.017044E+01
+1.049216E+03
 tally 2:
-1.765331E+02
-6.974050E+03
+2.992056E+02
+1.852593E+04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.938441E+02
-7.888708E+03
+7.782271E+01
+1.267469E+03
 tally 3:
-1.770125E+02
-6.702714E+03
+2.933944E+02
+1.740955E+04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.942246E+02
-8.416720E+03
+7.679811E+01
+1.191597E+03
diff --git a/tests/test_score_kappafission/settings.xml b/tests/test_score_kappafission/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_kappafission/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_kappafission/tallies.xml b/tests/test_score_kappafission/tallies.xml
deleted file mode 100644
index 8fe5d5c842..0000000000
--- a/tests/test_score_kappafission/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21 22 23 27" />
-    <scores>kappa-fission</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="21 22 23 27" />
-    <scores>kappa-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-
-  <tally id="3">
-    <filter type="cell" bins="21 22 23 27" />
-    <scores>kappa-fission</scores>
-    <estimator>collision</estimator>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_kappafission/test_score_kappafission.py b/tests/test_score_kappafission/test_score_kappafission.py
index 1777db993e..fe43309400 100644
--- a/tests/test_score_kappafission/test_score_kappafission.py
+++ b/tests/test_score_kappafission/test_score_kappafission.py
@@ -2,9 +2,31 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreKappaFissionTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, 22, 23, 27))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('kappa-fission') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreKappaFissionTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_nufission/geometry.xml b/tests/test_score_nufission/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_nufission/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_nufission/inputs_true.dat b/tests/test_score_nufission/inputs_true.dat
new file mode 100644
index 0000000000..dbf21a50b3
--- /dev/null
+++ b/tests/test_score_nufission/inputs_true.dat
@@ -0,0 +1 @@
+8500d149868598a30fc818a34fe0465cf926b79632a8a7a1f96799cc955f30544b2cec131878bbded295179a2fc103657c2ecdb8c28ea10b84b7f6f0091fac7a
\ No newline at end of file
diff --git a/tests/test_score_nufission/materials.xml b/tests/test_score_nufission/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_nufission/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_nufission/results_true.dat b/tests/test_score_nufission/results_true.dat
index 33c4ff9fbc..046c5b289e 100644
--- a/tests/test_score_nufission/results_true.dat
+++ b/tests/test_score_nufission/results_true.dat
@@ -1,29 +1,29 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-2.486342E+00
-1.368793E+00
+4.110726E+00
+3.411205E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.733038E+00
-1.616903E+00
+9.429333E-01
+1.889683E-01
 tally 2:
-2.296157E+00
-1.167084E+00
+4.104411E+00
+3.453290E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.679940E+00
-1.498454E+00
+1.034371E+00
+2.220105E-01
 tally 3:
-2.381373E+00
-1.213497E+00
+3.947006E+00
+3.149452E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.607077E+00
-1.513932E+00
+1.031768E+00
+2.152452E-01
diff --git a/tests/test_score_nufission/settings.xml b/tests/test_score_nufission/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_nufission/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_nufission/tallies.xml b/tests/test_score_nufission/tallies.xml
deleted file mode 100644
index 2812a00b55..0000000000
--- a/tests/test_score_nufission/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21 22 23 27" />
-    <scores>nu-fission</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="21 22 23 27" />
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-
-  <tally id="3">
-    <filter type="cell" bins="21 22 23 27" />
-    <scores>nu-fission</scores>
-    <estimator>collision</estimator>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_nufission/test_score_nufission.py b/tests/test_score_nufission/test_score_nufission.py
index 1777db993e..2c0bbd2f19 100644
--- a/tests/test_score_nufission/test_score_nufission.py
+++ b/tests/test_score_nufission/test_score_nufission.py
@@ -2,9 +2,31 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreNuFissionTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, 22, 23, 27))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('nu-fission') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreNuFissionTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_nuscatter/geometry.xml b/tests/test_score_nuscatter/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_nuscatter/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_nuscatter/inputs_true.dat b/tests/test_score_nuscatter/inputs_true.dat
new file mode 100644
index 0000000000..889941afce
--- /dev/null
+++ b/tests/test_score_nuscatter/inputs_true.dat
@@ -0,0 +1 @@
+41644968ea3a500af029e799ceef40c270d26944e0e7426afe1b8b2e15743b79c8b2989ecaaa0dac958046a89a49dab9d592cc7a4e059cd1f917b62219a8ed31
\ No newline at end of file
diff --git a/tests/test_score_nuscatter/materials.xml b/tests/test_score_nuscatter/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_nuscatter/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_nuscatter/results_true.dat b/tests/test_score_nuscatter/results_true.dat
index 66e0c0a031..675509932e 100644
--- a/tests/test_score_nuscatter/results_true.dat
+++ b/tests/test_score_nuscatter/results_true.dat
@@ -1,11 +1,11 @@
 k-combined:
-9.870214E-01 2.095925E-02
+9.935192E-01 5.457292E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-3.353000E+01
-1.133379E+02
-8.150000E+00
-6.793700E+00
-1.098500E+02
-1.221333E+03
+1.940000E+01
+7.561780E+01
+4.340000E+00
+3.813000E+00
+6.440000E+01
+8.302674E+02
diff --git a/tests/test_score_nuscatter/settings.xml b/tests/test_score_nuscatter/settings.xml
deleted file mode 100644
index ce632aae31..0000000000
--- a/tests/test_score_nuscatter/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>0</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_nuscatter/tallies.xml b/tests/test_score_nuscatter/tallies.xml
deleted file mode 100644
index 08f8fa32cc..0000000000
--- a/tests/test_score_nuscatter/tallies.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>nu-scatter</scores>
-  </tally>
-
-</tallies>
\ No newline at end of file
diff --git a/tests/test_score_nuscatter/test_score_nuscatter.py b/tests/test_score_nuscatter/test_score_nuscatter.py
index 1777db993e..81fca1e68b 100644
--- a/tests/test_score_nuscatter/test_score_nuscatter.py
+++ b/tests/test_score_nuscatter/test_score_nuscatter.py
@@ -2,9 +2,28 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreNuScatterTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(10, 21, 22, 23))
+        t = openmc.Tally(tally_id=1)
+        t.add_filter(filt)
+        t.add_score('nu-scatter')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(t)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreNuScatterTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_nuscatter_n/geometry.xml b/tests/test_score_nuscatter_n/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_nuscatter_n/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_nuscatter_n/inputs_true.dat b/tests/test_score_nuscatter_n/inputs_true.dat
new file mode 100644
index 0000000000..228c224001
--- /dev/null
+++ b/tests/test_score_nuscatter_n/inputs_true.dat
@@ -0,0 +1 @@
+c8072b4ce735db4cc196a688f2d253e5683d5ef7b7a254ceab4d689d3902bb4fd7223ad824d002f3abf7e0fe7fbd80ab6c0273c8972df1ec26ff69cbd26c13ee
\ No newline at end of file
diff --git a/tests/test_score_nuscatter_n/materials.xml b/tests/test_score_nuscatter_n/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_nuscatter_n/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_nuscatter_n/results_true.dat b/tests/test_score_nuscatter_n/results_true.dat
index 5dbc7f8abf..cdcbcfb524 100644
--- a/tests/test_score_nuscatter_n/results_true.dat
+++ b/tests/test_score_nuscatter_n/results_true.dat
@@ -1,33 +1,33 @@
 k-combined:
-9.870214E-01 2.095925E-02
+9.935192E-01 5.457292E-02
 tally 1:
-3.353000E+01
-1.133379E+02
-3.491100E+00
-1.265776E+00
-1.948509E+00
-4.761101E-01
-9.177045E-01
-1.251750E-01
-5.654249E-01
-5.567043E-02
-8.150000E+00
-6.793700E+00
-1.223263E+00
-1.678053E-01
-7.833173E-01
-8.407682E-02
-1.350170E-01
-7.393546E-03
-2.164837E-01
-1.367122E-02
-1.098500E+02
-1.221333E+03
-5.598624E+01
-3.183267E+02
-2.048716E+01
-4.301097E+01
-1.399456E+00
-4.458904E-01
--2.183180E+00
-6.628474E-01
+1.940000E+01
+7.561780E+01
+2.629221E+00
+1.399188E+00
+1.567944E+00
+5.124385E-01
+6.926532E-01
+1.577035E-01
+6.111349E-01
+1.006724E-01
+4.340000E+00
+3.813000E+00
+6.633546E-01
+9.836364E-02
+3.707954E-01
+3.694050E-02
+-4.267991E-02
+1.870638E-03
+5.239484E-02
+1.032955E-02
+6.440000E+01
+8.302674E+02
+3.312945E+01
+2.197504E+02
+1.239256E+01
+3.104303E+01
+7.813162E-01
+2.790254E-01
+-1.320978E+00
+4.696586E-01
diff --git a/tests/test_score_nuscatter_n/settings.xml b/tests/test_score_nuscatter_n/settings.xml
deleted file mode 100644
index ce632aae31..0000000000
--- a/tests/test_score_nuscatter_n/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>0</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_nuscatter_n/tallies.xml b/tests/test_score_nuscatter_n/tallies.xml
deleted file mode 100644
index 90e28227b6..0000000000
--- a/tests/test_score_nuscatter_n/tallies.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21 22 23" />
-    <scores>nu-scatter nu-scatter-1 nu-scatter-2 nu-scatter-3 nu-scatter-4</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_nuscatter_n/test_score_nuscatter_n.py b/tests/test_score_nuscatter_n/test_score_nuscatter_n.py
index 1777db993e..05e00e8132 100644
--- a/tests/test_score_nuscatter_n/test_score_nuscatter_n.py
+++ b/tests/test_score_nuscatter_n/test_score_nuscatter_n.py
@@ -2,9 +2,32 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreNuScatterNTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, 22, 23))
+        t = openmc.Tally(tally_id=1)
+        t.add_filter(filt)
+        t.add_score('nu-scatter')
+        t.add_score('nu-scatter-1')
+        t.add_score('nu-scatter-2')
+        t.add_score('nu-scatter-3')
+        t.add_score('nu-scatter-4')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(t)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreNuScatterNTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_nuscatter_pn/geometry.xml b/tests/test_score_nuscatter_pn/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_nuscatter_pn/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_nuscatter_pn/inputs_true.dat b/tests/test_score_nuscatter_pn/inputs_true.dat
new file mode 100644
index 0000000000..f04187297d
--- /dev/null
+++ b/tests/test_score_nuscatter_pn/inputs_true.dat
@@ -0,0 +1 @@
+dbe91c112a02bf9c1098c2ba93c737bfd048f356d00dab280a245c572821d345a9d4c2cfa766f8b83c42362d9b8dbbb3d5ce240b6e749541aac3cae567b715c4
\ No newline at end of file
diff --git a/tests/test_score_nuscatter_pn/materials.xml b/tests/test_score_nuscatter_pn/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_nuscatter_pn/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_nuscatter_pn/results_true.dat b/tests/test_score_nuscatter_pn/results_true.dat
index 41bc17f8b8..81d1d1ad73 100644
--- a/tests/test_score_nuscatter_pn/results_true.dat
+++ b/tests/test_score_nuscatter_pn/results_true.dat
@@ -1,24 +1,24 @@
 k-combined:
-9.870214E-01 2.095925E-02
+9.935192E-01 5.457292E-02
 tally 1:
-3.353000E+01
-1.133379E+02
-3.491100E+00
-1.265776E+00
-1.948509E+00
-4.761101E-01
-9.177045E-01
-1.251750E-01
-5.654249E-01
-5.567043E-02
+1.940000E+01
+7.561780E+01
+2.629221E+00
+1.399188E+00
+1.567944E+00
+5.124385E-01
+6.926532E-01
+1.577035E-01
+6.111349E-01
+1.006724E-01
 tally 2:
-3.353000E+01
-1.133379E+02
-3.491100E+00
-1.265776E+00
-1.948509E+00
-4.761101E-01
-9.177045E-01
-1.251750E-01
-5.654249E-01
-5.567043E-02
+1.940000E+01
+7.561780E+01
+2.629221E+00
+1.399188E+00
+1.567944E+00
+5.124385E-01
+6.926532E-01
+1.577035E-01
+6.111349E-01
+1.006724E-01
diff --git a/tests/test_score_nuscatter_pn/settings.xml b/tests/test_score_nuscatter_pn/settings.xml
deleted file mode 100644
index ce632aae31..0000000000
--- a/tests/test_score_nuscatter_pn/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>0</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_nuscatter_pn/tallies.xml b/tests/test_score_nuscatter_pn/tallies.xml
deleted file mode 100644
index dfad48dda2..0000000000
--- a/tests/test_score_nuscatter_pn/tallies.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21" />
-    <scores>nu-scatter-0 nu-scatter-1 nu-scatter-2 nu-scatter-3 nu-scatter-4</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="21" />
-    <scores>nu-scatter-p4</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py b/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py
index 1777db993e..009bccd159 100644
--- a/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py
+++ b/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py
@@ -2,9 +2,36 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreNuScatterPNTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, ))
+        t1 = openmc.Tally(tally_id=1)
+        t1.add_filter(filt)
+        t1.add_score('nu-scatter-0')
+        t1.add_score('nu-scatter-1')
+        t1.add_score('nu-scatter-2')
+        t1.add_score('nu-scatter-3')
+        t1.add_score('nu-scatter-4')
+        t2 = openmc.Tally(tally_id=2)
+        t2.add_filter(filt)
+        t2.add_score('nu-scatter-p4')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(t1)
+        self._input_set.tallies.add_tally(t2)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreNuScatterPNTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_nuscatter_yn/geometry.xml b/tests/test_score_nuscatter_yn/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_nuscatter_yn/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_nuscatter_yn/inputs_true.dat b/tests/test_score_nuscatter_yn/inputs_true.dat
new file mode 100644
index 0000000000..2a0fde3095
--- /dev/null
+++ b/tests/test_score_nuscatter_yn/inputs_true.dat
@@ -0,0 +1 @@
+31e4d35c4845eaa7d3ec4b021f820a4526b0d8a43fdd69288c1c94551a895c05bbd10cfe72b54dafc9abe31ed56ef06a6fb3de77088e4c2da25b547fc06ac74d
\ No newline at end of file
diff --git a/tests/test_score_nuscatter_yn/materials.xml b/tests/test_score_nuscatter_yn/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_nuscatter_yn/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_nuscatter_yn/results_true.dat b/tests/test_score_nuscatter_yn/results_true.dat
index cdf051ee75..fde6f07ec4 100644
--- a/tests/test_score_nuscatter_yn/results_true.dat
+++ b/tests/test_score_nuscatter_yn/results_true.dat
@@ -1,38 +1,38 @@
 k-combined:
-9.870214E-01 2.095925E-02
+9.935192E-01 5.457292E-02
 tally 1:
-3.353000E+01
-1.133379E+02
+1.940000E+01
+7.561780E+01
 tally 2:
-3.353000E+01
-1.133379E+02
-4.293226E-01
-6.259462E-02
--2.011041E-02
-5.388144E-02
-3.900136E-01
-5.873137E-02
-6.150213E-02
-9.043796E-03
-5.518583E-02
-1.739087E-02
--2.047987E-01
-1.993679E-02
-6.710345E-02
-1.652573E-02
--3.619254E-02
-1.598186E-02
-3.551558E-02
-9.077346E-03
-1.044669E-01
-2.082961E-03
--3.782063E-02
-1.681459E-02
-1.752386E-01
-1.411429E-02
--3.289649E-02
-9.534958E-03
-5.252770E-02
-7.518445E-03
-2.688056E-02
-3.397824E-03
+1.940000E+01
+7.561780E+01
+-8.464573E-02
+1.823218E-02
+-1.116469E-01
+3.380141E-02
+-2.130479E-03
+1.022241E-02
+-4.896859E-02
+1.074348E-02
+-1.482536E-01
+1.114316E-02
+-6.827566E-02
+4.248457E-03
+1.494503E-01
+2.605186E-02
+2.010847E-01
+1.699034E-02
+4.535125E-02
+2.658493E-03
+-4.135950E-02
+4.170544E-03
+1.277006E-01
+6.276355E-03
+4.192667E-02
+4.955945E-03
+-9.607170E-02
+3.280003E-03
+1.533637E-01
+7.107300E-03
+3.570929E-02
+4.795032E-03
diff --git a/tests/test_score_nuscatter_yn/settings.xml b/tests/test_score_nuscatter_yn/settings.xml
deleted file mode 100644
index ce632aae31..0000000000
--- a/tests/test_score_nuscatter_yn/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>0</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_nuscatter_yn/tallies.xml b/tests/test_score_nuscatter_yn/tallies.xml
deleted file mode 100644
index b80b37dc8c..0000000000
--- a/tests/test_score_nuscatter_yn/tallies.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21" />
-    <scores>nu-scatter-0</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="21" />
-    <scores>nu-scatter-y3</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py b/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py
index 1777db993e..d1fa3e029f 100644
--- a/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py
+++ b/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py
@@ -2,9 +2,32 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreNuScatterYNTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, ))
+        t1 = openmc.Tally(tally_id=1)
+        t1.add_filter(filt)
+        t1.add_score('nu-scatter-0')
+        t2 = openmc.Tally(tally_id=2)
+        t2.add_filter(filt)
+        t2.add_score('nu-scatter-y3')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(t1)
+        self._input_set.tallies.add_tally(t2)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreNuScatterYNTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_scatter/geometry.xml b/tests/test_score_scatter/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_scatter/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_scatter/inputs_true.dat b/tests/test_score_scatter/inputs_true.dat
new file mode 100644
index 0000000000..c5f1c1f17a
--- /dev/null
+++ b/tests/test_score_scatter/inputs_true.dat
@@ -0,0 +1 @@
+c07fa98f19d66732be7bd394b30b6e2d18d54a9fec2ae729e9d00adb55d9c00533bacb2d3fe4eee7f41e6e0b6841e82ff313bc593bf3b7932bd8d026dc81a58d
\ No newline at end of file
diff --git a/tests/test_score_scatter/materials.xml b/tests/test_score_scatter/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_scatter/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_scatter/results_true.dat b/tests/test_score_scatter/results_true.dat
index 21d7d83c27..50782e4167 100644
--- a/tests/test_score_scatter/results_true.dat
+++ b/tests/test_score_scatter/results_true.dat
@@ -1,29 +1,29 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-1.223028E+01
-3.185078E+01
-2.900350E+00
-1.814004E+00
-4.059013E+01
-3.609499E+02
+1.907306E+01
+7.310892E+01
+4.678711E+00
+4.406892E+00
+6.487881E+01
+8.433246E+02
 tally 2:
 0.000000E+00
 0.000000E+00
-1.169000E+01
-2.915330E+01
-3.200000E+00
-2.342600E+00
-4.064000E+01
-3.595168E+02
+1.940000E+01
+7.561780E+01
+4.340000E+00
+3.813000E+00
+6.440000E+01
+8.302674E+02
 tally 3:
 0.000000E+00
 0.000000E+00
-1.172929E+01
-2.935812E+01
-3.185726E+00
-2.323517E+00
-4.074319E+01
-3.614902E+02
+1.952859E+01
+7.659866E+01
+4.328145E+00
+3.794232E+00
+6.439437E+01
+8.300759E+02
diff --git a/tests/test_score_scatter/settings.xml b/tests/test_score_scatter/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_scatter/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_scatter/tallies.xml b/tests/test_score_scatter/tallies.xml
deleted file mode 100644
index b6eb73b506..0000000000
--- a/tests/test_score_scatter/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>scatter</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-
-  <tally id="3">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>scatter</scores>
-    <estimator>collision</estimator>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_scatter/test_score_scatter.py b/tests/test_score_scatter/test_score_scatter.py
index 1777db993e..76ff39e01f 100644
--- a/tests/test_score_scatter/test_score_scatter.py
+++ b/tests/test_score_scatter/test_score_scatter.py
@@ -2,9 +2,31 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreScatterTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(10, 21, 22, 23))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('scatter') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreScatterTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_scatter_n/geometry.xml b/tests/test_score_scatter_n/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_scatter_n/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_scatter_n/inputs_true.dat b/tests/test_score_scatter_n/inputs_true.dat
new file mode 100644
index 0000000000..37dc7074f0
--- /dev/null
+++ b/tests/test_score_scatter_n/inputs_true.dat
@@ -0,0 +1 @@
+5a6ec0557a68deb5334e0689575531328bad6964f48409ef70343266e88a5c691099486813c69c3c4c0e6154e23342d228f924606b664ae7c4cdd24818626797
\ No newline at end of file
diff --git a/tests/test_score_scatter_n/materials.xml b/tests/test_score_scatter_n/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_scatter_n/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_scatter_n/results_true.dat b/tests/test_score_scatter_n/results_true.dat
index b46a1e184d..cdcbcfb524 100644
--- a/tests/test_score_scatter_n/results_true.dat
+++ b/tests/test_score_scatter_n/results_true.dat
@@ -1,33 +1,33 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-1.169000E+01
-2.915330E+01
-1.247253E+00
-3.767436E-01
-5.330812E-01
-1.385083E-01
-2.987823E-01
-5.699361E-02
-2.645512E-01
-2.905381E-02
-3.200000E+00
-2.342600E+00
-3.809941E-01
-2.965326E-02
-4.319242E-01
-3.738822E-02
-9.261909E-02
-6.711328E-03
--6.052442E-02
-7.087230E-03
-4.064000E+01
-3.595168E+02
-2.096700E+01
-9.516606E+01
-7.560566E+00
-1.248694E+01
-2.093348E-01
-4.278510E-02
--1.449929E+00
-4.356371E-01
+1.940000E+01
+7.561780E+01
+2.629221E+00
+1.399188E+00
+1.567944E+00
+5.124385E-01
+6.926532E-01
+1.577035E-01
+6.111349E-01
+1.006724E-01
+4.340000E+00
+3.813000E+00
+6.633546E-01
+9.836364E-02
+3.707954E-01
+3.694050E-02
+-4.267991E-02
+1.870638E-03
+5.239484E-02
+1.032955E-02
+6.440000E+01
+8.302674E+02
+3.312945E+01
+2.197504E+02
+1.239256E+01
+3.104303E+01
+7.813162E-01
+2.790254E-01
+-1.320978E+00
+4.696586E-01
diff --git a/tests/test_score_scatter_n/settings.xml b/tests/test_score_scatter_n/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_scatter_n/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_scatter_n/tallies.xml b/tests/test_score_scatter_n/tallies.xml
deleted file mode 100644
index 0164dea358..0000000000
--- a/tests/test_score_scatter_n/tallies.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21 22 23" />
-    <scores>scatter scatter-1 scatter-2 scatter-3 scatter-4</scores>
-  </tally>
-
-</tallies>
\ No newline at end of file
diff --git a/tests/test_score_scatter_n/test_score_scatter_n.py b/tests/test_score_scatter_n/test_score_scatter_n.py
index 1777db993e..304cd6cb77 100644
--- a/tests/test_score_scatter_n/test_score_scatter_n.py
+++ b/tests/test_score_scatter_n/test_score_scatter_n.py
@@ -2,9 +2,32 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreScatterNTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, 22, 23))
+        t = openmc.Tally(tally_id=1)
+        t.add_filter(filt)
+        t.add_score('scatter')
+        t.add_score('scatter-1')
+        t.add_score('scatter-2')
+        t.add_score('scatter-3')
+        t.add_score('scatter-4')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(t)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreScatterNTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_scatter_pn/geometry.xml b/tests/test_score_scatter_pn/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_scatter_pn/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_scatter_pn/inputs_true.dat b/tests/test_score_scatter_pn/inputs_true.dat
new file mode 100644
index 0000000000..06dab53407
--- /dev/null
+++ b/tests/test_score_scatter_pn/inputs_true.dat
@@ -0,0 +1 @@
+112ae1a84c81f58885583b463f576bf1d9b5f5cbb0f5dfb36147ab30be2ef0d7506cfee053b54c26baad1b233d5d97cd1698c2af909682275e0b8fd79dd8f43c
\ No newline at end of file
diff --git a/tests/test_score_scatter_pn/materials.xml b/tests/test_score_scatter_pn/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_scatter_pn/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_scatter_pn/results_true.dat b/tests/test_score_scatter_pn/results_true.dat
index 3c34895d90..81d1d1ad73 100644
--- a/tests/test_score_scatter_pn/results_true.dat
+++ b/tests/test_score_scatter_pn/results_true.dat
@@ -1,24 +1,24 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-1.169000E+01
-2.915330E+01
-1.247253E+00
-3.767436E-01
-5.330812E-01
-1.385083E-01
-2.987823E-01
-5.699361E-02
-2.645512E-01
-2.905381E-02
+1.940000E+01
+7.561780E+01
+2.629221E+00
+1.399188E+00
+1.567944E+00
+5.124385E-01
+6.926532E-01
+1.577035E-01
+6.111349E-01
+1.006724E-01
 tally 2:
-1.169000E+01
-2.915330E+01
-1.247253E+00
-3.767436E-01
-5.330812E-01
-1.385083E-01
-2.987823E-01
-5.699361E-02
-2.645512E-01
-2.905381E-02
+1.940000E+01
+7.561780E+01
+2.629221E+00
+1.399188E+00
+1.567944E+00
+5.124385E-01
+6.926532E-01
+1.577035E-01
+6.111349E-01
+1.006724E-01
diff --git a/tests/test_score_scatter_pn/settings.xml b/tests/test_score_scatter_pn/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_scatter_pn/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_scatter_pn/tallies.xml b/tests/test_score_scatter_pn/tallies.xml
deleted file mode 100644
index 61a7854d68..0000000000
--- a/tests/test_score_scatter_pn/tallies.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21" />
-    <scores>scatter-0 scatter-1 scatter-2 scatter-3 scatter-4</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="21" />
-    <scores>scatter-p4</scores>
-  </tally>
-
-</tallies>
\ No newline at end of file
diff --git a/tests/test_score_scatter_pn/test_score_scatter_pn.py b/tests/test_score_scatter_pn/test_score_scatter_pn.py
index 1777db993e..79a4502c9c 100644
--- a/tests/test_score_scatter_pn/test_score_scatter_pn.py
+++ b/tests/test_score_scatter_pn/test_score_scatter_pn.py
@@ -2,9 +2,37 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreScatterPNTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, ))
+        t1 = openmc.Tally(tally_id=1)
+        t1.add_filter(filt)
+        t1.add_score('scatter-0')
+        t1.add_score('scatter-1')
+        t1.add_score('scatter-2')
+        t1.add_score('scatter-3')
+        t1.add_score('scatter-4')
+        t1.estimator = 'analog'
+        t2 = openmc.Tally(tally_id=2)
+        t2.add_filter(filt)
+        t2.add_score('scatter-p4')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(t1)
+        self._input_set.tallies.add_tally(t2)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreScatterPNTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_scatter_yn/geometry.xml b/tests/test_score_scatter_yn/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_scatter_yn/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_scatter_yn/inputs_true.dat b/tests/test_score_scatter_yn/inputs_true.dat
new file mode 100644
index 0000000000..c7c1c822af
--- /dev/null
+++ b/tests/test_score_scatter_yn/inputs_true.dat
@@ -0,0 +1 @@
+ad59269de656ab6ea87cf55f1ecb8cd60f4bb652b881bc9f3f705fd17714fee4cdbb105b99d9b50e5d39375f89d37437888d432f53457cd5d61e1956b81e2097
\ No newline at end of file
diff --git a/tests/test_score_scatter_yn/materials.xml b/tests/test_score_scatter_yn/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_scatter_yn/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_scatter_yn/results_true.dat b/tests/test_score_scatter_yn/results_true.dat
index 9df7ea42a7..3e22703ad7 100644
--- a/tests/test_score_scatter_yn/results_true.dat
+++ b/tests/test_score_scatter_yn/results_true.dat
@@ -1,56 +1,56 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-1.169000E+01
-2.915330E+01
+1.940000E+01
+7.561780E+01
 tally 2:
-1.169000E+01
-2.915330E+01
--2.198379E-01
-2.828670E-02
--1.317276E-01
-9.568596E-03
-8.309792E-02
-1.155410E-02
--2.288506E-02
-3.710542E-03
--2.720674E-02
-1.789163E-03
--1.323964E-02
-1.819112E-04
-8.941597E-02
-4.265616E-03
-1.516805E-01
-1.332526E-02
--1.832782E-02
-6.611171E-03
-1.311371E-02
-2.840648E-03
-3.728365E-02
-2.866806E-03
--5.100587E-02
-2.957146E-03
-3.388028E-02
-2.481570E-03
--7.766921E-02
-3.129377E-03
-1.666131E-02
-3.828290E-03
-8.102553E-02
-2.118169E-03
-6.303084E-03
-7.156173E-04
--2.083478E-03
-2.683340E-03
-6.794806E-03
-3.912783E-04
-1.005390E-01
-2.920205E-03
--5.332517E-02
-2.205372E-03
--1.584725E-02
-8.984498E-04
-3.486904E-02
-6.448722E-04
--2.420912E-02
-6.352276E-04
+1.940000E+01
+7.561780E+01
+-8.464573E-02
+1.823218E-02
+-1.116469E-01
+3.380141E-02
+-2.130479E-03
+1.022241E-02
+-4.896859E-02
+1.074348E-02
+-1.482536E-01
+1.114316E-02
+-6.827566E-02
+4.248457E-03
+1.494503E-01
+2.605186E-02
+2.010847E-01
+1.699034E-02
+4.535125E-02
+2.658493E-03
+-4.135950E-02
+4.170544E-03
+1.277006E-01
+6.276355E-03
+4.192667E-02
+4.955945E-03
+-9.607170E-02
+3.280003E-03
+1.533637E-01
+7.107300E-03
+3.570929E-02
+4.795032E-03
+-1.183812E-01
+3.369458E-03
+-1.555883E-02
+9.917545E-04
+-9.288972E-02
+2.083169E-03
+-1.698033E-02
+1.027209E-03
+7.433184E-03
+5.046022E-04
+9.078711E-02
+2.020877E-03
+-7.502769E-02
+2.431965E-03
+-3.565718E-02
+5.978599E-03
+-7.076433E-02
+2.138810E-03
diff --git a/tests/test_score_scatter_yn/settings.xml b/tests/test_score_scatter_yn/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_scatter_yn/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_scatter_yn/tallies.xml b/tests/test_score_scatter_yn/tallies.xml
deleted file mode 100644
index 3c46c13d40..0000000000
--- a/tests/test_score_scatter_yn/tallies.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21" />
-    <scores>scatter-0</scores>
-    <estimator>analog</estimator>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="21" />
-    <scores>scatter-y4</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_scatter_yn/test_score_scatter_yn.py b/tests/test_score_scatter_yn/test_score_scatter_yn.py
index 1777db993e..f99fc5923f 100644
--- a/tests/test_score_scatter_yn/test_score_scatter_yn.py
+++ b/tests/test_score_scatter_yn/test_score_scatter_yn.py
@@ -2,9 +2,33 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreScatterYNTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, ))
+        t1 = openmc.Tally(tally_id=1)
+        t1.add_filter(filt)
+        t1.add_score('scatter-0')
+        t1.estimator = 'analog'
+        t2 = openmc.Tally(tally_id=2)
+        t2.add_filter(filt)
+        t2.add_score('scatter-y4')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(t1)
+        self._input_set.tallies.add_tally(t2)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreScatterYNTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_total/geometry.xml b/tests/test_score_total/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_total/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_total/inputs_true.dat b/tests/test_score_total/inputs_true.dat
new file mode 100644
index 0000000000..114ec33e14
--- /dev/null
+++ b/tests/test_score_total/inputs_true.dat
@@ -0,0 +1 @@
+1ba17d4cef859221f314a0e7576a762260effe8f1977c9c6c74a80007d80b92d8d0fffadf39dde5e054809f3bf63529930428f79c6c4008d53e8be7644cd538a
\ No newline at end of file
diff --git a/tests/test_score_total/materials.xml b/tests/test_score_total/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_total/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_total/results_true.dat b/tests/test_score_total/results_true.dat
index e782fd9d04..a51e32b159 100644
--- a/tests/test_score_total/results_true.dat
+++ b/tests/test_score_total/results_true.dat
@@ -1,29 +1,29 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-1.423676E+01
-4.330937E+01
-2.914798E+00
-1.831649E+00
-4.088282E+01
-3.662539E+02
+2.240915E+01
+1.009032E+02
+4.711189E+00
+4.469059E+00
+6.533718E+01
+8.552989E+02
 tally 2:
 0.000000E+00
 0.000000E+00
-1.372000E+01
-4.018980E+01
-3.200000E+00
-2.342600E+00
-4.104000E+01
-3.668254E+02
+2.278000E+01
+1.042404E+02
+4.350000E+00
+3.833900E+00
+6.484000E+01
+8.416314E+02
 tally 3:
 0.000000E+00
 0.000000E+00
-1.372000E+01
-4.018980E+01
-3.200000E+00
-2.342600E+00
-4.104000E+01
-3.668254E+02
+2.278000E+01
+1.042404E+02
+4.350000E+00
+3.833900E+00
+6.484000E+01
+8.416314E+02
diff --git a/tests/test_score_total/settings.xml b/tests/test_score_total/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_total/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_total/tallies.xml b/tests/test_score_total/tallies.xml
deleted file mode 100644
index 02286f96c7..0000000000
--- a/tests/test_score_total/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>total</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>total</scores>
-    <estimator>analog</estimator>
-  </tally>
-
-  <tally id="3">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>total</scores>
-    <estimator>collision</estimator>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_total/test_score_total.py b/tests/test_score_total/test_score_total.py
index 1777db993e..702a8141c1 100644
--- a/tests/test_score_total/test_score_total.py
+++ b/tests/test_score_total/test_score_total.py
@@ -2,9 +2,31 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreTotalTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(10, 21, 22, 23))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('total') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreTotalTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_total_yn/geometry.xml b/tests/test_score_total_yn/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_total_yn/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 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>
-
-</geometry>
diff --git a/tests/test_score_total_yn/inputs_true.dat b/tests/test_score_total_yn/inputs_true.dat
new file mode 100644
index 0000000000..471cadfb20
--- /dev/null
+++ b/tests/test_score_total_yn/inputs_true.dat
@@ -0,0 +1 @@
+8967621db0c045e1c12b181eb825b0528bf1f8ef03d5d5e036e14f5151d4bcec36c56b1ec2faba66254d09a29795f9ed44599762e7dfd506fff8bf4d27de8328
\ No newline at end of file
diff --git a/tests/test_score_total_yn/materials.xml b/tests/test_score_total_yn/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_total_yn/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_total_yn/results_true.dat b/tests/test_score_total_yn/results_true.dat
index 28a4b1627e..5d7a1498de 100644
--- a/tests/test_score_total_yn/results_true.dat
+++ b/tests/test_score_total_yn/results_true.dat
@@ -1,14 +1,406 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-1.423676E+01
-4.330937E+01
-2.914798E+00
-1.831649E+00
-4.088282E+01
-3.662539E+02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.265629E+00
+3.233643E-01
+5.626298E-02
+1.292090E-03
+2.035173E-02
+6.296227E-04
+1.928563E-02
+8.190514E-04
+-2.468301E-02
+2.354849E-04
+9.148092E-03
+2.225568E-04
+-5.879447E-02
+8.590977E-04
+-1.445300E-02
+1.531576E-04
+6.018866E-02
+8.591329E-04
+1.403996E-02
+4.821838E-04
+9.815924E-03
+5.880801E-04
+-9.749601E-03
+4.650507E-04
+-8.702902E-03
+6.682813E-05
+1.953899E-02
+2.762602E-04
+2.823080E-02
+3.090601E-04
+-2.932935E-03
+1.767294E-05
+6.394250E-03
+1.447695E-04
+-1.504208E-03
+4.671038E-05
+-1.575220E-02
+1.620546E-04
+-2.910381E-03
+2.389274E-04
+-3.020227E-02
+5.422131E-04
+-8.190946E-03
+3.025911E-04
+2.246625E-02
+3.354891E-04
+-2.002110E-02
+2.075929E-04
+-1.962614E-02
+3.166447E-04
+2.240915E+01
+1.009032E+02
+1.856657E-01
+9.493183E-02
+-1.690914E-01
+1.047180E-01
+-1.866343E-01
+5.134677E-02
+-2.029558E-01
+1.341115E-02
+-1.379135E-01
+2.187965E-02
+-5.257769E-01
+7.022699E-02
+-6.848163E-02
+8.861152E-02
+3.794798E-01
+6.518809E-02
+-1.093894E-01
+2.155411E-02
+-1.520483E-01
+2.978741E-02
+1.718356E-01
+2.986391E-02
+8.273807E-02
+1.139398E-02
+1.312033E-01
+1.195907E-02
+3.286682E-01
+4.246009E-02
+8.878513E-02
+3.773227E-02
+-2.541223E-02
+1.841611E-02
+-1.249772E-02
+7.518231E-03
+-1.468495E-01
+1.193263E-02
+2.206397E-02
+3.376086E-02
+-1.990498E-01
+2.246024E-02
+1.181081E-01
+2.651049E-02
+-8.952636E-03
+9.032436E-03
+5.183546E-02
+1.061147E-02
+-1.047213E-01
+9.680702E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+4.711189E+00
+4.469059E+00
+1.149862E-03
+4.006261E-03
+-5.485896E-02
+5.881771E-03
+-6.936896E-02
+1.501967E-03
+1.033506E-02
+4.261122E-04
+-1.042957E-01
+2.255383E-03
+-7.082011E-02
+2.495972E-03
+1.099802E-02
+2.333908E-03
+5.635534E-02
+4.286572E-03
+-2.310646E-02
+1.542196E-03
+-2.259159E-02
+5.408191E-04
+9.307209E-02
+1.773060E-03
+6.296915E-02
+2.394743E-03
+-8.108703E-03
+9.384558E-04
+7.125823E-02
+2.782853E-03
+7.168104E-03
+1.083383E-03
+-2.498842E-02
+5.768656E-04
+-2.297890E-02
+8.711670E-04
+-1.775752E-02
+2.271706E-04
+-1.794820E-02
+8.018486E-04
+1.963115E-02
+7.104338E-04
+5.288264E-02
+6.415302E-04
+5.895017E-03
+3.571409E-04
+2.190858E-02
+5.489095E-04
+-3.829208E-02
+5.977452E-04
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+6.533718E+01
+8.552989E+02
+4.658976E-02
+2.719315E-01
+-5.661220E-01
+5.439751E-01
+-3.051142E-01
+4.890036E-01
+-1.640760E-01
+2.200294E-02
+-2.675559E-01
+1.660319E-01
+2.007804E-01
+3.303623E-01
+2.670686E-02
+2.330239E-02
+3.111327E-01
+2.876993E-01
+-6.871786E-02
+1.625684E-01
+-5.849816E-01
+2.074413E-01
+3.674709E-01
+9.029605E-02
+3.420122E-01
+3.147918E-01
+1.580259E-01
+4.184964E-02
+1.509855E-01
+1.718636E-01
+4.008602E-01
+1.315982E-01
+1.253163E-01
+7.030618E-02
+1.826521E-02
+4.452932E-02
+-9.755491E-02
+1.276313E-01
+5.434521E-02
+3.809202E-02
+7.041533E-01
+1.522383E-01
+1.434910E-01
+1.112940E-01
+1.947700E-01
+9.469651E-02
+-7.044463E-02
+3.058029E-02
+-6.586398E-01
+1.337469E-01
 tally 2:
 0.000000E+00
 0.000000E+00
@@ -110,106 +502,106 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.812543E-01
-1.349265E-01
--7.005988E-03
-2.198486E-04
-3.237937E-02
-7.569491E-04
--3.865436E-04
-4.048167E-04
--1.003877E-02
-3.195619E-04
-3.738815E-03
-3.506174E-04
--2.549288E-02
-3.086810E-04
-1.693002E-02
-1.255885E-04
-3.059341E-03
-1.971678E-04
-9.247344E-03
-2.402855E-04
-6.618469E-04
-1.639025E-04
-1.992953E-02
-1.365376E-04
-3.262256E-03
-1.341040E-05
-2.864166E-03
-4.394787E-05
-1.494351E-03
-1.001007E-04
--1.091424E-02
-1.221030E-04
-9.875992E-03
-1.141979E-04
-1.263647E-02
-2.400023E-04
--2.944398E-03
-1.246417E-04
-1.970051E-03
-1.600160E-04
-6.148931E-03
-4.774182E-05
-1.107728E-02
-1.095420E-04
-1.382599E-02
-1.537793E-04
--1.296297E-02
-1.392028E-04
--1.479385E-02
-1.650074E-04
-1.423676E+01
-4.330937E+01
--2.802155E-01
-3.016146E-02
--8.009314E-02
-4.251899E-02
--7.383773E-02
-1.547362E-02
--1.274422E-01
-2.290306E-02
-1.370426E-01
-1.002935E-02
--2.607280E-01
-3.414307E-02
-1.497421E-02
-2.944540E-03
--2.866477E-02
-9.113662E-03
--3.949118E-02
-4.437767E-03
-2.283116E-01
-1.792907E-02
-1.334103E-01
-1.587762E-02
--3.139096E-01
-2.330713E-02
-1.025884E-03
-5.754195E-03
-1.099489E-01
-1.861634E-02
--7.863729E-02
-2.276108E-02
-1.219111E-01
-1.363203E-02
--1.261893E-01
-1.937908E-02
--1.995428E-01
-1.383344E-02
-8.803472E-02
-3.742219E-03
-1.501143E-01
-1.288322E-02
-4.522115E-02
-8.283014E-03
-1.113588E-01
-8.523967E-03
--1.820582E-01
-1.648932E-02
--1.121108E-01
-1.059879E-02
+1.270000E+00
+3.313000E-01
+6.672369E-03
+5.154703E-03
+2.741231E-02
+3.707114E-03
+6.785459E-02
+1.525452E-03
+-7.226258E-02
+3.119519E-03
+-1.458773E-02
+5.829469E-03
+9.286573E-02
+4.614384E-03
+-8.836014E-02
+3.693860E-03
+7.682597E-02
+3.692450E-03
+5.624405E-04
+1.894653E-03
+-2.446734E-02
+2.962636E-04
+-2.865534E-02
+8.238323E-04
+1.746333E-02
+1.350727E-03
+6.812468E-02
+2.154847E-03
+2.170333E-02
+8.368218E-04
+-3.464644E-02
+6.341450E-04
+1.586865E-03
+2.086260E-04
+1.122866E-02
+1.828956E-03
+5.147244E-02
+2.116013E-03
+-5.140617E-03
+2.011918E-03
+3.662973E-02
+1.511591E-03
+-3.826498E-04
+1.254739E-03
+9.466189E-02
+2.206340E-03
+-1.695030E-02
+2.963888E-04
+-4.620345E-02
+1.330607E-03
+2.278000E+01
+1.042404E+02
+-2.705944E-01
+4.019819E-02
+8.910115E-02
+7.598548E-02
+4.240148E-01
+6.249778E-02
+-1.711683E-01
+3.365297E-02
+-1.320939E-01
+4.677615E-02
+-3.833055E-01
+3.838770E-02
+1.938748E-01
+8.311489E-02
+1.859290E-01
+1.653719E-02
+-2.875551E-01
+7.432886E-02
+1.513934E-02
+7.854478E-02
+1.932642E-02
+1.428749E-02
+4.617741E-02
+1.844961E-02
+1.063807E-01
+3.103047E-02
+1.309557E-01
+1.198530E-02
+2.797364E-01
+2.403350E-02
+-1.332777E-01
+2.277289E-02
+9.430025E-02
+5.826855E-03
+-1.012356E-01
+1.537804E-02
+-8.178736E-02
+4.470169E-02
+-1.197123E-01
+2.596045E-02
+3.984096E-02
+1.209844E-02
+1.148842E-01
+6.772712E-03
+-1.705431E-02
+3.920009E-02
+-2.694201E-02
+2.653514E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -260,56 +652,56 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.914798E+00
-1.831649E+00
--3.213884E-02
-1.391026E-03
--1.124311E-02
-2.059984E-03
--1.372399E-02
-2.990198E-03
--6.931800E-03
-1.073303E-03
--5.448993E-03
-3.542504E-04
--7.264172E-02
-1.742045E-03
-1.526380E-02
-5.962297E-04
-1.576474E-02
-5.335071E-04
-2.028206E-02
-2.915489E-04
-4.014298E-02
-4.285950E-04
-8.228146E-03
-6.388002E-04
--8.183952E-02
-2.031634E-03
-1.014523E-02
-1.159653E-03
-9.321030E-03
-7.480844E-04
--3.156017E-02
-2.064357E-03
-3.606483E-02
-4.060244E-04
--3.866234E-02
-1.046100E-03
--5.723297E-02
-1.042437E-03
-2.894838E-02
-2.922848E-04
--1.529225E-03
-2.472179E-04
-9.484410E-03
-4.172637E-04
--4.442548E-04
-2.518508E-04
--3.065480E-02
-3.571846E-04
--6.519117E-03
-1.779322E-04
+4.350000E+00
+3.833900E+00
+2.792800E-01
+3.102658E-02
+-2.343095E-01
+3.826449E-02
+3.428573E-02
+6.437027E-03
+-1.025176E-01
+1.798807E-02
+-4.106130E-02
+3.786695E-03
+-1.470480E-01
+8.519720E-03
+1.989035E-02
+5.067928E-03
+8.094404E-02
+3.412899E-03
+-5.616421E-02
+2.709728E-03
+2.421213E-02
+3.683849E-03
+4.794858E-02
+4.392540E-03
+-1.637085E-02
+5.339723E-03
+-2.046073E-02
+5.231271E-03
+1.554627E-02
+4.457612E-03
+-3.441131E-02
+7.049061E-03
+-1.139075E-01
+7.627867E-03
+-8.358967E-02
+4.023855E-03
+1.221815E-01
+5.628324E-03
+-2.061337E-02
+1.926605E-03
+-1.583607E-02
+1.093902E-03
+-7.623859E-02
+5.519074E-03
+-1.115748E-02
+3.984642E-03
+7.665232E-02
+1.111550E-02
+-2.673980E-02
+7.957502E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -360,56 +752,56 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.088282E+01
-3.662539E+02
--9.859591E-01
-2.743013E-01
-2.392244E-01
-3.795971E-01
--3.389717E-01
-7.054539E-01
--1.673679E-01
-1.081377E-01
-2.918680E-01
-7.161035E-02
--5.627453E-01
-9.124299E-02
-7.185542E-01
-2.062140E-01
-8.533956E-02
-3.649126E-02
-7.630639E-02
-1.623523E-02
-3.785290E-02
-4.181389E-02
-1.388919E-01
-1.307834E-01
--2.682812E-01
-6.653584E-02
-7.151084E-02
-3.466772E-02
-6.941393E-02
-2.821800E-02
-2.392050E-02
-1.132504E-01
-3.749985E-01
-8.337209E-02
--2.998887E-01
-6.767226E-02
--3.629285E-01
-7.246083E-02
-3.989685E-01
-4.378581E-02
-1.330115E-01
-2.634398E-02
-2.649739E-01
-4.300042E-02
-5.793351E-01
-7.399884E-02
--2.236528E-01
-3.130205E-02
--3.695818E-01
-4.703480E-02
+6.484000E+01
+8.416314E+02
+-3.758929E-01
+3.104729E-01
+-7.263839E-01
+7.809822E-01
+4.648018E-03
+2.834459E-01
+-1.055002E-01
+3.040070E-02
+7.118727E-02
+7.977682E-02
+7.664673E-01
+1.821315E-01
+2.087917E-01
+4.041777E-02
+2.761598E-01
+3.014608E-01
+2.119970E-01
+2.965940E-02
+-8.139971E-01
+1.653848E-01
+1.280103E-01
+4.989381E-02
+6.090725E-01
+2.822967E-01
+2.502533E-02
+1.011286E-02
+-3.776030E-01
+2.846556E-01
+-1.484779E-01
+1.060501E-01
+3.365875E-01
+2.827604E-02
+-8.437307E-02
+9.086937E-02
+2.827425E-01
+6.353956E-02
+1.139952E-01
+1.067588E-01
+6.809505E-01
+1.329962E-01
+1.408254E-01
+3.003253E-02
+-1.222838E-01
+5.353793E-02
+-2.274047E-02
+3.333572E-02
+-1.026245E-01
+5.889851E-02
 tally 3:
 0.000000E+00
 0.000000E+00
@@ -511,106 +903,106 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.200000E-01
-1.152000E-01
--9.800486E-03
-5.637123E-04
--2.018554E-02
-4.617738E-04
--6.271657E-03
-8.252833E-04
--8.231683E-03
-3.035447E-03
--2.566508E-02
-1.108829E-03
-2.748466E-03
-1.641191E-03
-6.833190E-03
-5.993876E-04
-3.392213E-02
-2.143714E-03
-3.105616E-02
-1.012625E-03
--5.473567E-02
-1.615531E-03
--1.435523E-02
-1.095690E-03
-4.579564E-03
-6.451444E-04
--1.570409E-02
-3.833387E-04
-1.633422E-02
-2.144997E-03
--7.438775E-03
-6.441846E-04
-5.440025E-04
-1.290719E-04
--1.687899E-02
-1.606230E-03
-3.315902E-02
-1.061759E-03
--1.184684E-02
-4.312573E-04
--4.732586E-02
-1.387994E-03
--1.563538E-02
-3.316015E-04
-3.681927E-02
-5.403320E-04
-2.928507E-03
-5.761742E-04
--3.519362E-02
-6.725185E-04
-1.372000E+01
-4.018980E+01
--2.015212E-01
-1.072884E-01
--2.606953E-01
-4.894468E-02
-7.537153E-02
-2.216346E-02
--3.818524E-02
-6.301675E-02
-2.386335E-01
-1.931104E-02
--1.872805E-02
-1.265896E-02
-3.732943E-02
-2.347696E-02
--8.857050E-02
-1.636275E-02
--1.718450E-01
-1.043488E-02
-1.526226E-01
-2.435399E-02
-7.344765E-02
-1.541644E-02
--9.819186E-03
-1.473467E-02
--8.215914E-03
-1.463085E-02
-2.197504E-01
-2.244815E-02
-2.521002E-02
-8.206540E-03
-3.677974E-01
-3.982027E-02
--1.934606E-01
-3.440019E-02
-1.050141E-01
-2.346980E-02
-2.458487E-01
-1.861429E-02
-4.226131E-02
-2.690841E-03
-3.174234E-02
-1.867018E-02
-2.284995E-01
-1.190246E-02
--7.894573E-03
-3.715471E-03
--1.593928E-01
-1.391828E-02
+1.220551E+00
+3.029523E-01
+1.939259E-02
+4.050014E-04
+3.502926E-03
+8.473601E-04
+4.575201E-02
+2.544994E-03
+-1.560898E-02
+2.801847E-04
+-8.658638E-03
+8.241229E-04
+-4.445033E-02
+1.063052E-03
+7.845580E-03
+2.558127E-04
+2.549169E-02
+8.288961E-04
+-9.797138E-03
+2.713506E-04
+8.620131E-03
+8.537125E-04
+-4.992993E-03
+2.206385E-04
+2.780887E-02
+3.020884E-04
+-2.040716E-02
+1.760440E-04
+2.351435E-02
+2.067041E-04
+7.044751E-03
+7.297774E-05
+7.233581E-03
+1.258072E-04
+5.582777E-03
+9.135959E-05
+3.887969E-03
+4.965340E-04
+-2.396743E-02
+7.407861E-04
+-7.371142E-03
+1.109942E-04
+-1.089834E-02
+2.188565E-04
+2.790414E-02
+2.398608E-04
+-1.464849E-02
+1.014603E-04
+-1.981204E-02
+2.919798E-04
+2.278000E+01
+1.042404E+02
+-2.705944E-01
+4.019819E-02
+8.910115E-02
+7.598548E-02
+4.240148E-01
+6.249778E-02
+-1.711683E-01
+3.365297E-02
+-1.320939E-01
+4.677615E-02
+-3.833055E-01
+3.838770E-02
+1.938748E-01
+8.311489E-02
+1.859290E-01
+1.653719E-02
+-2.875551E-01
+7.432886E-02
+1.513934E-02
+7.854478E-02
+1.932642E-02
+1.428749E-02
+4.617741E-02
+1.844961E-02
+1.063807E-01
+3.103047E-02
+1.309557E-01
+1.198530E-02
+2.797364E-01
+2.403350E-02
+-1.332777E-01
+2.277289E-02
+9.430025E-02
+5.826855E-03
+-1.012356E-01
+1.537804E-02
+-8.178736E-02
+4.470169E-02
+-1.197123E-01
+2.596045E-02
+3.984096E-02
+1.209844E-02
+1.148842E-01
+6.772712E-03
+-1.705431E-02
+3.920009E-02
+-2.694201E-02
+2.653514E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -661,56 +1053,56 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.200000E+00
-2.342600E+00
--2.991985E-01
-1.868406E-02
-4.460301E-02
-4.132113E-03
--2.190630E-02
-1.023889E-02
--3.265764E-02
-2.060374E-03
-3.491521E-02
-4.785957E-04
--3.623623E-02
-5.929111E-04
--4.962268E-02
-1.814245E-03
-1.406439E-01
-1.174445E-02
--9.433277E-02
-5.036897E-03
-9.058176E-02
-3.871598E-03
--1.409089E-01
-6.665385E-03
--1.062337E-01
-4.771650E-03
-1.155280E-01
-8.020320E-03
-8.348336E-02
-1.633941E-03
-1.475434E-02
-3.411046E-03
-4.474425E-03
-6.049348E-03
-6.716359E-03
-2.898000E-03
--3.674047E-02
-2.971797E-03
--2.368070E-02
-9.474965E-04
--6.109826E-02
-4.846201E-03
--5.076118E-02
-8.354393E-03
--1.763594E-02
-1.017310E-03
--2.941064E-02
-1.044916E-03
--5.631429E-03
-3.915186E-03
+4.350000E+00
+3.833900E+00
+2.792800E-01
+3.102658E-02
+-2.343095E-01
+3.826449E-02
+3.428573E-02
+6.437027E-03
+-1.025176E-01
+1.798807E-02
+-4.106130E-02
+3.786695E-03
+-1.470480E-01
+8.519720E-03
+1.989035E-02
+5.067928E-03
+8.094404E-02
+3.412899E-03
+-5.616421E-02
+2.709728E-03
+2.421213E-02
+3.683849E-03
+4.794858E-02
+4.392540E-03
+-1.637085E-02
+5.339723E-03
+-2.046073E-02
+5.231271E-03
+1.554627E-02
+4.457612E-03
+-3.441131E-02
+7.049061E-03
+-1.139075E-01
+7.627867E-03
+-8.358967E-02
+4.023855E-03
+1.221815E-01
+5.628324E-03
+-2.061337E-02
+1.926605E-03
+-1.583607E-02
+1.093902E-03
+-7.623859E-02
+5.519074E-03
+-1.115748E-02
+3.984642E-03
+7.665232E-02
+1.111550E-02
+-2.673980E-02
+7.957502E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -761,454 +1153,53 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.104000E+01
-3.668254E+02
--7.832373E-01
-3.913941E-01
-2.281642E-01
-2.669856E-01
--3.731272E-01
-6.152809E-01
--3.232973E-01
-7.526283E-02
-3.686513E-01
-9.047618E-02
--6.018185E-01
-9.140623E-02
-3.848843E-01
-3.431711E-01
-3.397425E-03
-8.879103E-02
--2.471531E-02
-5.561795E-02
-1.373897E-01
-7.288680E-02
-1.816888E-01
-5.419638E-02
--3.504404E-01
-1.461853E-01
-1.225356E-01
-3.443595E-02
--3.109887E-01
-5.492397E-02
--3.542105E-01
-6.530224E-02
-2.104218E-01
-4.093872E-02
-2.661467E-02
-3.058847E-02
--3.744331E-01
-6.755739E-02
-1.391218E-01
-4.432842E-02
-1.622041E-01
-6.843992E-03
-4.149973E-02
-1.782398E-02
-2.551752E-01
-2.626972E-02
--4.706697E-01
-9.193926E-02
--1.287882E-01
-3.489982E-02
-tally 4:
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-7.652157E-01
-1.242826E-01
--1.008373E-02
-5.281691E-04
--1.014715E-02
-2.749212E-04
--2.506414E-02
-2.613512E-04
-4.320187E-03
-4.316562E-04
-1.439246E-02
-9.138575E-05
--1.532539E-02
-2.360878E-04
-9.963404E-03
-1.511695E-04
--6.314554E-03
-2.742799E-05
-7.969329E-03
-1.380329E-04
--1.298431E-03
-3.287236E-04
-1.441639E-02
-1.409552E-04
-6.516689E-03
-2.511011E-04
-1.294596E-02
-2.249729E-04
-6.983038E-03
-6.334969E-05
--1.086161E-02
-1.140033E-04
-2.217006E-02
-4.221807E-04
--6.503276E-03
-2.028281E-04
-2.915180E-02
-3.659182E-04
--9.080091E-03
-1.503808E-04
--6.476980E-04
-1.927326E-04
--1.549603E-02
-3.445843E-04
-2.957508E-02
-1.835035E-04
-6.982790E-03
-1.237342E-04
--2.653281E-02
-2.606704E-04
-1.372000E+01
-4.018980E+01
--2.015212E-01
-1.072884E-01
--2.606953E-01
-4.894468E-02
-7.537153E-02
-2.216346E-02
--3.818524E-02
-6.301675E-02
-2.386335E-01
-1.931104E-02
--1.872805E-02
-1.265896E-02
-3.732943E-02
-2.347696E-02
--8.857050E-02
-1.636275E-02
--1.718450E-01
-1.043488E-02
-1.526226E-01
-2.435399E-02
-7.344765E-02
-1.541644E-02
--9.819186E-03
-1.473467E-02
--8.215914E-03
-1.463085E-02
-2.197504E-01
-2.244815E-02
-2.521002E-02
-8.206540E-03
-3.677974E-01
-3.982027E-02
--1.934606E-01
-3.440019E-02
-1.050141E-01
-2.346980E-02
-2.458487E-01
-1.861429E-02
-4.226131E-02
-2.690841E-03
-3.174234E-02
-1.867018E-02
-2.284995E-01
-1.190246E-02
--7.894573E-03
-3.715471E-03
--1.593928E-01
-1.391828E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.200000E+00
-2.342600E+00
--2.991985E-01
-1.868406E-02
-4.460301E-02
-4.132113E-03
--2.190630E-02
-1.023889E-02
--3.265764E-02
-2.060374E-03
-3.491521E-02
-4.785957E-04
--3.623623E-02
-5.929111E-04
--4.962268E-02
-1.814245E-03
-1.406439E-01
-1.174445E-02
--9.433277E-02
-5.036897E-03
-9.058176E-02
-3.871598E-03
--1.409089E-01
-6.665385E-03
--1.062337E-01
-4.771650E-03
-1.155280E-01
-8.020320E-03
-8.348336E-02
-1.633941E-03
-1.475434E-02
-3.411046E-03
-4.474425E-03
-6.049348E-03
-6.716359E-03
-2.898000E-03
--3.674047E-02
-2.971797E-03
--2.368070E-02
-9.474965E-04
--6.109826E-02
-4.846201E-03
--5.076118E-02
-8.354393E-03
--1.763594E-02
-1.017310E-03
--2.941064E-02
-1.044916E-03
--5.631429E-03
-3.915186E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-4.104000E+01
-3.668254E+02
--7.832373E-01
-3.913941E-01
-2.281642E-01
-2.669856E-01
--3.731272E-01
-6.152809E-01
--3.232973E-01
-7.526283E-02
-3.686513E-01
-9.047618E-02
--6.018185E-01
-9.140623E-02
-3.848843E-01
-3.431711E-01
-3.397425E-03
-8.879103E-02
--2.471531E-02
-5.561795E-02
-1.373897E-01
-7.288680E-02
-1.816888E-01
-5.419638E-02
--3.504404E-01
-1.461853E-01
-1.225356E-01
-3.443595E-02
--3.109887E-01
-5.492397E-02
--3.542105E-01
-6.530224E-02
-2.104218E-01
-4.093872E-02
-2.661467E-02
-3.058847E-02
--3.744331E-01
-6.755739E-02
-1.391218E-01
-4.432842E-02
-1.622041E-01
-6.843992E-03
-4.149973E-02
-1.782398E-02
-2.551752E-01
-2.626972E-02
--4.706697E-01
-9.193926E-02
--1.287882E-01
-3.489982E-02
+6.484000E+01
+8.416314E+02
+-3.758929E-01
+3.104729E-01
+-7.263839E-01
+7.809822E-01
+4.648018E-03
+2.834459E-01
+-1.055002E-01
+3.040070E-02
+7.118727E-02
+7.977682E-02
+7.664673E-01
+1.821315E-01
+2.087917E-01
+4.041777E-02
+2.761598E-01
+3.014608E-01
+2.119970E-01
+2.965940E-02
+-8.139971E-01
+1.653848E-01
+1.280103E-01
+4.989381E-02
+6.090725E-01
+2.822967E-01
+2.502533E-02
+1.011286E-02
+-3.776030E-01
+2.846556E-01
+-1.484779E-01
+1.060501E-01
+3.365875E-01
+2.827604E-02
+-8.437307E-02
+9.086937E-02
+2.827425E-01
+6.353956E-02
+1.139952E-01
+1.067588E-01
+6.809505E-01
+1.329962E-01
+1.408254E-01
+3.003253E-02
+-1.222838E-01
+5.353793E-02
+-2.274047E-02
+3.333572E-02
+-1.026245E-01
+5.889851E-02
diff --git a/tests/test_score_total_yn/settings.xml b/tests/test_score_total_yn/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_total_yn/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_total_yn/tallies.xml b/tests/test_score_total_yn/tallies.xml
deleted file mode 100644
index 51cb79c395..0000000000
--- a/tests/test_score_total_yn/tallies.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>total</scores>
-  </tally>
-  
-  <tally id="2">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>total-y4</scores>
-    <nuclides>U-235 total</nuclides>
-  </tally>
-  
-  <tally id="3">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>total-y4</scores>
-    <nuclides>U-235 total</nuclides>
-    <estimator>analog</estimator>
-  </tally>
-  
-  <tally id="4">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>total-y4</scores>
-    <nuclides>U-235 total</nuclides>
-    <estimator>collision</estimator>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_total_yn/test_score_total_yn.py b/tests/test_score_total_yn/test_score_total_yn.py
index 1777db993e..07cac86d2a 100644
--- a/tests/test_score_total_yn/test_score_total_yn.py
+++ b/tests/test_score_total_yn/test_score_total_yn.py
@@ -2,9 +2,33 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreTotalYNTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(10, 21, 22, 23))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('total-y4') for t in tallies]
+        [t.add_nuclide('U-235') for t in tallies]
+        [t.add_nuclide('total') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreTotalYNTestHarness('statepoint.10.*', True)
     harness.main()

From d14750149a42bd41013587847c040c179f371412 Mon Sep 17 00:00:00 2001
From: Sterling Harper <sterlingmharper@gmail.com>
Date: Fri, 2 Oct 2015 23:19:00 -0400
Subject: [PATCH 04/10] Fix Python paths in tests

---
 .gitignore                                                | 3 ++-
 tests/test_basic/test_basic.py                            | 4 +++-
 tests/test_cmfd_feed/test_cmfd_feed.py                    | 4 +++-
 tests/test_cmfd_nofeed/test_cmfd_nofeed.py                | 4 +++-
 .../test_confidence_intervals.py                          | 4 +++-
 tests/test_density_atombcm/test_density_atombcm.py        | 4 +++-
 tests/test_density_atomcm3/test_density_atomcm3.py        | 4 +++-
 tests/test_density_kgm3/test_density_kgm3.py              | 4 +++-
 tests/test_density_sum/test_density_sum.py                | 4 +++-
 .../test_eigenvalue_genperbatch.py                        | 4 +++-
 .../test_eigenvalue_no_inactive.py                        | 4 +++-
 tests/test_energy_grid/test_energy_grid.py                | 4 +++-
 tests/test_entropy/test_entropy.py                        | 7 ++++---
 tests/test_filter_cell/test_filter_cell.py                | 5 +++--
 tests/test_filter_cellborn/test_filter_cellborn.py        | 5 +++--
 tests/test_filter_distribcell/test_filter_distribcell.py  | 4 ++--
 tests/test_filter_energy/test_filter_energy.py            | 5 +++--
 tests/test_filter_energyout/test_filter_energyout.py      | 5 +++--
 .../test_filter_group_transfer.py                         | 5 +++--
 tests/test_filter_material/test_filter_material.py        | 5 +++--
 tests/test_filter_mesh_2d/test_filter_mesh_2d.py          | 4 +++-
 tests/test_filter_mesh_3d/test_filter_mesh_3d.py          | 4 +++-
 tests/test_filter_universe/test_filter_universe.py        | 5 +++--
 tests/test_fixed_source/test_fixed_source.py              | 8 +++++---
 tests/test_infinite_cell/test_infinite_cell.py            | 4 +++-
 tests/test_lattice/test_lattice.py                        | 4 +++-
 tests/test_lattice_hex/test_lattice_hex.py                | 4 +++-
 tests/test_lattice_mixed/test_lattice_mixed.py            | 4 +++-
 tests/test_lattice_multiple/test_lattice_multiple.py      | 4 +++-
 tests/test_many_scores/test_many_scores.py                | 4 +++-
 tests/test_natural_element/test_natural_element.py        | 4 +++-
 tests/test_output/test_output.py                          | 6 +++---
 .../test_particle_restart_eigval.py                       | 4 +++-
 .../test_particle_restart_fixed.py                        | 4 +++-
 tests/test_plot_background/test_plot_background.py        | 4 +++-
 tests/test_plot_basis/test_plot_basis.py                  | 4 +++-
 tests/test_plot_colspec/test_plot_colspec.py              | 4 +++-
 tests/test_plot_mask/test_plot_mask.py                    | 4 +++-
 tests/test_ptables_off/test_ptables_off.py                | 4 +++-
 tests/test_reflective_cone/test_reflective_cone.py        | 4 +++-
 .../test_reflective_cylinder/test_reflective_cylinder.py  | 4 +++-
 tests/test_reflective_plane/test_reflective_plane.py      | 4 +++-
 tests/test_reflective_sphere/test_reflective_sphere.py    | 4 +++-
 .../test_resonance_scattering.py                          | 4 +++-
 tests/test_rotation/test_rotation.py                      | 4 +++-
 tests/test_salphabeta/test_salphabeta.py                  | 4 +++-
 .../test_salphabeta_multiple/test_salphabeta_multiple.py  | 4 +++-
 tests/test_score_MT/test_score_MT.py                      | 5 +++--
 tests/test_score_absorption/test_score_absorption.py      | 5 +++--
 tests/test_score_current/test_score_current.py            | 4 +++-
 tests/test_score_events/test_score_events.py              | 5 +++--
 tests/test_score_fission/test_score_fission.py            | 5 +++--
 tests/test_score_flux/test_score_flux.py                  | 5 +++--
 tests/test_score_flux_yn/test_score_flux_yn.py            | 5 +++--
 tests/test_score_kappafission/test_score_kappafission.py  | 5 +++--
 tests/test_score_nufission/test_score_nufission.py        | 5 +++--
 tests/test_score_nuscatter/test_score_nuscatter.py        | 5 +++--
 tests/test_score_nuscatter_n/test_score_nuscatter_n.py    | 5 +++--
 tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py  | 5 +++--
 tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py  | 5 +++--
 tests/test_score_scatter/test_score_scatter.py            | 5 +++--
 tests/test_score_scatter_n/test_score_scatter_n.py        | 5 +++--
 tests/test_score_scatter_pn/test_score_scatter_pn.py      | 5 +++--
 tests/test_score_scatter_yn/test_score_scatter_yn.py      | 5 +++--
 tests/test_score_total/test_score_total.py                | 5 +++--
 tests/test_score_total_yn/test_score_total_yn.py          | 5 +++--
 tests/test_seed/test_seed.py                              | 4 +++-
 tests/test_source_angle_mono/test_source_angle_mono.py    | 4 +++-
 .../test_source_energy_maxwell.py                         | 4 +++-
 tests/test_source_energy_mono/test_source_energy_mono.py  | 4 +++-
 tests/test_source_file/test_source_file.py                | 4 ++--
 tests/test_source_point/test_source_point.py              | 4 +++-
 tests/test_sourcepoint_batch/test_sourcepoint_batch.py    | 7 ++++---
 .../test_sourcepoint_interval.py                          | 7 ++++---
 tests/test_sourcepoint_latest/test_sourcepoint_latest.py  | 7 +++----
 .../test_sourcepoint_restart/test_sourcepoint_restart.py  | 4 +++-
 tests/test_statepoint_batch/test_statepoint_batch.py      | 7 +++++--
 .../test_statepoint_interval/test_statepoint_interval.py  | 6 ++++--
 tests/test_statepoint_restart/test_statepoint_restart.py  | 8 +++++---
 .../test_statepoint_sourcesep.py                          | 6 +++---
 tests/test_survival_biasing/test_survival_biasing.py      | 4 +++-
 tests/test_tally_assumesep/test_tally_assumesep.py        | 4 +++-
 tests/test_tally_nuclides/test_tally_nuclides.py          | 4 +++-
 tests/test_trace/test_trace.py                            | 4 +++-
 tests/test_track_output/test_track_output.py              | 6 +++---
 tests/test_translation/test_translation.py                | 4 +++-
 .../test_trigger_batch_interval.py                        | 4 +++-
 .../test_trigger_no_batch_interval.py                     | 4 +++-
 tests/test_trigger_no_status/test_trigger_no_status.py    | 4 +++-
 tests/test_trigger_tallies/test_trigger_tallies.py        | 4 +++-
 tests/test_uniform_fs/test_uniform_fs.py                  | 4 +++-
 tests/test_union_energy_grids/test_union_energy_grids.py  | 4 +++-
 tests/test_universe/test_universe.py                      | 4 +++-
 tests/test_void/test_void.py                              | 4 +++-
 94 files changed, 289 insertions(+), 142 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5634632fa4..1998a6c5b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ src/xml-fortran/xmlreader
 
 # Test results error file
 results_error.dat
+inputs_error.dat
 
 # Test build files
 tests/build/
@@ -62,4 +63,4 @@ data/nndc
 .idea/*
 
 # IPython notebook checkpoints
-.ipynb_checkpoints
\ No newline at end of file
+.ipynb_checkpoints
diff --git a/tests/test_basic/test_basic.py b/tests/test_basic/test_basic.py
index 6633e59111..835bf91c7b 100755
--- a/tests/test_basic/test_basic.py
+++ b/tests/test_basic/test_basic.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_cmfd_feed/test_cmfd_feed.py b/tests/test_cmfd_feed/test_cmfd_feed.py
index a3d2f30310..af1f0542d4 100644
--- a/tests/test_cmfd_feed/test_cmfd_feed.py
+++ b/tests/test_cmfd_feed/test_cmfd_feed.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import CMFDTestHarness
 
 
diff --git a/tests/test_cmfd_nofeed/test_cmfd_nofeed.py b/tests/test_cmfd_nofeed/test_cmfd_nofeed.py
index a3d2f30310..af1f0542d4 100644
--- a/tests/test_cmfd_nofeed/test_cmfd_nofeed.py
+++ b/tests/test_cmfd_nofeed/test_cmfd_nofeed.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import CMFDTestHarness
 
 
diff --git a/tests/test_confidence_intervals/test_confidence_intervals.py b/tests/test_confidence_intervals/test_confidence_intervals.py
index 1777db993e..67227ca324 100755
--- a/tests/test_confidence_intervals/test_confidence_intervals.py
+++ b/tests/test_confidence_intervals/test_confidence_intervals.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_density_atombcm/test_density_atombcm.py b/tests/test_density_atombcm/test_density_atombcm.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_density_atombcm/test_density_atombcm.py
+++ b/tests/test_density_atombcm/test_density_atombcm.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_density_atomcm3/test_density_atomcm3.py b/tests/test_density_atomcm3/test_density_atomcm3.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_density_atomcm3/test_density_atomcm3.py
+++ b/tests/test_density_atomcm3/test_density_atomcm3.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_density_kgm3/test_density_kgm3.py b/tests/test_density_kgm3/test_density_kgm3.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_density_kgm3/test_density_kgm3.py
+++ b/tests/test_density_kgm3/test_density_kgm3.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_density_sum/test_density_sum.py b/tests/test_density_sum/test_density_sum.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_density_sum/test_density_sum.py
+++ b/tests/test_density_sum/test_density_sum.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_eigenvalue_genperbatch/test_eigenvalue_genperbatch.py b/tests/test_eigenvalue_genperbatch/test_eigenvalue_genperbatch.py
index 22752c1894..3b0d22b9ea 100644
--- a/tests/test_eigenvalue_genperbatch/test_eigenvalue_genperbatch.py
+++ b/tests/test_eigenvalue_genperbatch/test_eigenvalue_genperbatch.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_eigenvalue_no_inactive/test_eigenvalue_no_inactive.py b/tests/test_eigenvalue_no_inactive/test_eigenvalue_no_inactive.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_eigenvalue_no_inactive/test_eigenvalue_no_inactive.py
+++ b/tests/test_eigenvalue_no_inactive/test_eigenvalue_no_inactive.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_energy_grid/test_energy_grid.py b/tests/test_energy_grid/test_energy_grid.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_energy_grid/test_energy_grid.py
+++ b/tests/test_energy_grid/test_energy_grid.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_entropy/test_entropy.py b/tests/test_entropy/test_entropy.py
index 43c17da141..1af8945e34 100644
--- a/tests/test_entropy/test_entropy.py
+++ b/tests/test_entropy/test_entropy.py
@@ -3,9 +3,10 @@
 import glob
 import os
 import sys
-
-sys.path.insert(0, '..')
-from testing_harness import *
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
+from testing_harness import TestHarness
+from openmc.statepoint import StatePoint
 
 
 class EntropyTestHarness(TestHarness):
diff --git a/tests/test_filter_cell/test_filter_cell.py b/tests/test_filter_cell/test_filter_cell.py
index 534a681b49..767007d7ab 100644
--- a/tests/test_filter_cell/test_filter_cell.py
+++ b/tests/test_filter_cell/test_filter_cell.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class FilterCellTestHarness(PyAPITestHarness):
diff --git a/tests/test_filter_cellborn/test_filter_cellborn.py b/tests/test_filter_cellborn/test_filter_cellborn.py
index 3420311aeb..14b50137eb 100644
--- a/tests/test_filter_cellborn/test_filter_cellborn.py
+++ b/tests/test_filter_cellborn/test_filter_cellborn.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class FilterCellbornTestHarness(PyAPITestHarness):
diff --git a/tests/test_filter_distribcell/test_filter_distribcell.py b/tests/test_filter_distribcell/test_filter_distribcell.py
index 541d6b6af1..a0ed938ba3 100644
--- a/tests/test_filter_distribcell/test_filter_distribcell.py
+++ b/tests/test_filter_distribcell/test_filter_distribcell.py
@@ -4,8 +4,8 @@ import glob
 import hashlib
 import os
 import sys
-
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import *
 
 
diff --git a/tests/test_filter_energy/test_filter_energy.py b/tests/test_filter_energy/test_filter_energy.py
index f16c458faa..55e7e55c65 100644
--- a/tests/test_filter_energy/test_filter_energy.py
+++ b/tests/test_filter_energy/test_filter_energy.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class FilterEnergyTestHarness(PyAPITestHarness):
diff --git a/tests/test_filter_energyout/test_filter_energyout.py b/tests/test_filter_energyout/test_filter_energyout.py
index 24704c6d70..d1fda4e0da 100644
--- a/tests/test_filter_energyout/test_filter_energyout.py
+++ b/tests/test_filter_energyout/test_filter_energyout.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class FilterEnergyoutTestHarness(PyAPITestHarness):
diff --git a/tests/test_filter_group_transfer/test_filter_group_transfer.py b/tests/test_filter_group_transfer/test_filter_group_transfer.py
index 86cd82ac32..fcffc45d11 100644
--- a/tests/test_filter_group_transfer/test_filter_group_transfer.py
+++ b/tests/test_filter_group_transfer/test_filter_group_transfer.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class FilterGroupTransferTestHarness(PyAPITestHarness):
diff --git a/tests/test_filter_material/test_filter_material.py b/tests/test_filter_material/test_filter_material.py
index 8d81cddb6b..8d66e822eb 100644
--- a/tests/test_filter_material/test_filter_material.py
+++ b/tests/test_filter_material/test_filter_material.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class FilterMaterialTestHarness(PyAPITestHarness):
diff --git a/tests/test_filter_mesh_2d/test_filter_mesh_2d.py b/tests/test_filter_mesh_2d/test_filter_mesh_2d.py
index 1777db993e..67227ca324 100644
--- a/tests/test_filter_mesh_2d/test_filter_mesh_2d.py
+++ b/tests/test_filter_mesh_2d/test_filter_mesh_2d.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_filter_mesh_3d/test_filter_mesh_3d.py b/tests/test_filter_mesh_3d/test_filter_mesh_3d.py
index 1777db993e..67227ca324 100644
--- a/tests/test_filter_mesh_3d/test_filter_mesh_3d.py
+++ b/tests/test_filter_mesh_3d/test_filter_mesh_3d.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_filter_universe/test_filter_universe.py b/tests/test_filter_universe/test_filter_universe.py
index 189758f2ee..1bd62d0b27 100644
--- a/tests/test_filter_universe/test_filter_universe.py
+++ b/tests/test_filter_universe/test_filter_universe.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class FilterUniverseTestHarness(PyAPITestHarness):
diff --git a/tests/test_fixed_source/test_fixed_source.py b/tests/test_fixed_source/test_fixed_source.py
index c3bd34856d..2a41345f6a 100644
--- a/tests/test_fixed_source/test_fixed_source.py
+++ b/tests/test_fixed_source/test_fixed_source.py
@@ -3,9 +3,11 @@
 import glob
 import os
 import sys
-
-sys.path.insert(0, '..')
-from testing_harness import *
+import numpy as np
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
+from testing_harness import TestHarness
+from openmc.statepoint import StatePoint
 
 
 class FixedSourceTestHarness(TestHarness):
diff --git a/tests/test_infinite_cell/test_infinite_cell.py b/tests/test_infinite_cell/test_infinite_cell.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_infinite_cell/test_infinite_cell.py
+++ b/tests/test_infinite_cell/test_infinite_cell.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_lattice/test_lattice.py b/tests/test_lattice/test_lattice.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_lattice/test_lattice.py
+++ b/tests/test_lattice/test_lattice.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_lattice_hex/test_lattice_hex.py b/tests/test_lattice_hex/test_lattice_hex.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_lattice_hex/test_lattice_hex.py
+++ b/tests/test_lattice_hex/test_lattice_hex.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_lattice_mixed/test_lattice_mixed.py b/tests/test_lattice_mixed/test_lattice_mixed.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_lattice_mixed/test_lattice_mixed.py
+++ b/tests/test_lattice_mixed/test_lattice_mixed.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_lattice_multiple/test_lattice_multiple.py b/tests/test_lattice_multiple/test_lattice_multiple.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_lattice_multiple/test_lattice_multiple.py
+++ b/tests/test_lattice_multiple/test_lattice_multiple.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_many_scores/test_many_scores.py b/tests/test_many_scores/test_many_scores.py
index 66bfe3dfa7..4518fc3637 100644
--- a/tests/test_many_scores/test_many_scores.py
+++ b/tests/test_many_scores/test_many_scores.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_natural_element/test_natural_element.py b/tests/test_natural_element/test_natural_element.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_natural_element/test_natural_element.py
+++ b/tests/test_natural_element/test_natural_element.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_output/test_output.py b/tests/test_output/test_output.py
index b37b7d07b2..007d3952de 100644
--- a/tests/test_output/test_output.py
+++ b/tests/test_output/test_output.py
@@ -3,9 +3,9 @@
 import glob
 import os
 import sys
-
-sys.path.insert(0, '..')
-from testing_harness import *
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
+from testing_harness import TestHarness
 
 
 class OutputTestHarness(TestHarness):
diff --git a/tests/test_particle_restart_eigval/test_particle_restart_eigval.py b/tests/test_particle_restart_eigval/test_particle_restart_eigval.py
index a9f4563d0a..38441f1529 100644
--- a/tests/test_particle_restart_eigval/test_particle_restart_eigval.py
+++ b/tests/test_particle_restart_eigval/test_particle_restart_eigval.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import ParticleRestartTestHarness
 
 
diff --git a/tests/test_particle_restart_fixed/test_particle_restart_fixed.py b/tests/test_particle_restart_fixed/test_particle_restart_fixed.py
index 385a429407..dd74fa4f5b 100644
--- a/tests/test_particle_restart_fixed/test_particle_restart_fixed.py
+++ b/tests/test_particle_restart_fixed/test_particle_restart_fixed.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import ParticleRestartTestHarness
 
 
diff --git a/tests/test_plot_background/test_plot_background.py b/tests/test_plot_background/test_plot_background.py
index 49cdacb05c..b769f2d3dc 100644
--- a/tests/test_plot_background/test_plot_background.py
+++ b/tests/test_plot_background/test_plot_background.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import PlotTestHarness
 
 
diff --git a/tests/test_plot_basis/test_plot_basis.py b/tests/test_plot_basis/test_plot_basis.py
index 85e30557d2..34b7486247 100644
--- a/tests/test_plot_basis/test_plot_basis.py
+++ b/tests/test_plot_basis/test_plot_basis.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import PlotTestHarness
 
 
diff --git a/tests/test_plot_colspec/test_plot_colspec.py b/tests/test_plot_colspec/test_plot_colspec.py
index 49cdacb05c..b769f2d3dc 100644
--- a/tests/test_plot_colspec/test_plot_colspec.py
+++ b/tests/test_plot_colspec/test_plot_colspec.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import PlotTestHarness
 
 
diff --git a/tests/test_plot_mask/test_plot_mask.py b/tests/test_plot_mask/test_plot_mask.py
index 85e30557d2..34b7486247 100644
--- a/tests/test_plot_mask/test_plot_mask.py
+++ b/tests/test_plot_mask/test_plot_mask.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import PlotTestHarness
 
 
diff --git a/tests/test_ptables_off/test_ptables_off.py b/tests/test_ptables_off/test_ptables_off.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_ptables_off/test_ptables_off.py
+++ b/tests/test_ptables_off/test_ptables_off.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_reflective_cone/test_reflective_cone.py b/tests/test_reflective_cone/test_reflective_cone.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_reflective_cone/test_reflective_cone.py
+++ b/tests/test_reflective_cone/test_reflective_cone.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_reflective_cylinder/test_reflective_cylinder.py b/tests/test_reflective_cylinder/test_reflective_cylinder.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_reflective_cylinder/test_reflective_cylinder.py
+++ b/tests/test_reflective_cylinder/test_reflective_cylinder.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_reflective_plane/test_reflective_plane.py b/tests/test_reflective_plane/test_reflective_plane.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_reflective_plane/test_reflective_plane.py
+++ b/tests/test_reflective_plane/test_reflective_plane.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_reflective_sphere/test_reflective_sphere.py b/tests/test_reflective_sphere/test_reflective_sphere.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_reflective_sphere/test_reflective_sphere.py
+++ b/tests/test_reflective_sphere/test_reflective_sphere.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_resonance_scattering/test_resonance_scattering.py b/tests/test_resonance_scattering/test_resonance_scattering.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_resonance_scattering/test_resonance_scattering.py
+++ b/tests/test_resonance_scattering/test_resonance_scattering.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_rotation/test_rotation.py b/tests/test_rotation/test_rotation.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_rotation/test_rotation.py
+++ b/tests/test_rotation/test_rotation.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_salphabeta/test_salphabeta.py b/tests/test_salphabeta/test_salphabeta.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_salphabeta/test_salphabeta.py
+++ b/tests/test_salphabeta/test_salphabeta.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_salphabeta_multiple/test_salphabeta_multiple.py b/tests/test_salphabeta_multiple/test_salphabeta_multiple.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_salphabeta_multiple/test_salphabeta_multiple.py
+++ b/tests/test_salphabeta_multiple/test_salphabeta_multiple.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_score_MT/test_score_MT.py b/tests/test_score_MT/test_score_MT.py
index d1a9b99cd8..a944771f3b 100644
--- a/tests/test_score_MT/test_score_MT.py
+++ b/tests/test_score_MT/test_score_MT.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreMTTestHarness(PyAPITestHarness):
diff --git a/tests/test_score_absorption/test_score_absorption.py b/tests/test_score_absorption/test_score_absorption.py
index 2accb25045..7547b1e4ed 100644
--- a/tests/test_score_absorption/test_score_absorption.py
+++ b/tests/test_score_absorption/test_score_absorption.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreAbsorptionTestHarness(PyAPITestHarness):
diff --git a/tests/test_score_current/test_score_current.py b/tests/test_score_current/test_score_current.py
index 64f640b96c..87a3226b0b 100644
--- a/tests/test_score_current/test_score_current.py
+++ b/tests/test_score_current/test_score_current.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import HashedTestHarness
 
 
diff --git a/tests/test_score_events/test_score_events.py b/tests/test_score_events/test_score_events.py
index 74d6e100da..5d861f4509 100644
--- a/tests/test_score_events/test_score_events.py
+++ b/tests/test_score_events/test_score_events.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreEventsTestHarness(PyAPITestHarness):
diff --git a/tests/test_score_fission/test_score_fission.py b/tests/test_score_fission/test_score_fission.py
index e9253d11d1..4dc76fc0c0 100644
--- a/tests/test_score_fission/test_score_fission.py
+++ b/tests/test_score_fission/test_score_fission.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreFissionTestHarness(PyAPITestHarness):
diff --git a/tests/test_score_flux/test_score_flux.py b/tests/test_score_flux/test_score_flux.py
index 94a034758d..f5f7351727 100644
--- a/tests/test_score_flux/test_score_flux.py
+++ b/tests/test_score_flux/test_score_flux.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreFluxTestHarness(PyAPITestHarness):
diff --git a/tests/test_score_flux_yn/test_score_flux_yn.py b/tests/test_score_flux_yn/test_score_flux_yn.py
index 0122768040..08279dea79 100755
--- a/tests/test_score_flux_yn/test_score_flux_yn.py
+++ b/tests/test_score_flux_yn/test_score_flux_yn.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreFluxYnTestHarness(PyAPITestHarness):
diff --git a/tests/test_score_kappafission/test_score_kappafission.py b/tests/test_score_kappafission/test_score_kappafission.py
index fe43309400..c9fc1bfe04 100644
--- a/tests/test_score_kappafission/test_score_kappafission.py
+++ b/tests/test_score_kappafission/test_score_kappafission.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreKappaFissionTestHarness(PyAPITestHarness):
diff --git a/tests/test_score_nufission/test_score_nufission.py b/tests/test_score_nufission/test_score_nufission.py
index 2c0bbd2f19..800200725f 100644
--- a/tests/test_score_nufission/test_score_nufission.py
+++ b/tests/test_score_nufission/test_score_nufission.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreNuFissionTestHarness(PyAPITestHarness):
diff --git a/tests/test_score_nuscatter/test_score_nuscatter.py b/tests/test_score_nuscatter/test_score_nuscatter.py
index 81fca1e68b..e94ab61f15 100644
--- a/tests/test_score_nuscatter/test_score_nuscatter.py
+++ b/tests/test_score_nuscatter/test_score_nuscatter.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreNuScatterTestHarness(PyAPITestHarness):
diff --git a/tests/test_score_nuscatter_n/test_score_nuscatter_n.py b/tests/test_score_nuscatter_n/test_score_nuscatter_n.py
index 05e00e8132..5b0a755567 100644
--- a/tests/test_score_nuscatter_n/test_score_nuscatter_n.py
+++ b/tests/test_score_nuscatter_n/test_score_nuscatter_n.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreNuScatterNTestHarness(PyAPITestHarness):
diff --git a/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py b/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py
index 009bccd159..a69679873f 100644
--- a/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py
+++ b/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreNuScatterPNTestHarness(PyAPITestHarness):
diff --git a/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py b/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py
index d1fa3e029f..0b2005bdcb 100644
--- a/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py
+++ b/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreNuScatterYNTestHarness(PyAPITestHarness):
diff --git a/tests/test_score_scatter/test_score_scatter.py b/tests/test_score_scatter/test_score_scatter.py
index 76ff39e01f..b6396ff3ef 100644
--- a/tests/test_score_scatter/test_score_scatter.py
+++ b/tests/test_score_scatter/test_score_scatter.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreScatterTestHarness(PyAPITestHarness):
diff --git a/tests/test_score_scatter_n/test_score_scatter_n.py b/tests/test_score_scatter_n/test_score_scatter_n.py
index 304cd6cb77..341b687c5f 100644
--- a/tests/test_score_scatter_n/test_score_scatter_n.py
+++ b/tests/test_score_scatter_n/test_score_scatter_n.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreScatterNTestHarness(PyAPITestHarness):
diff --git a/tests/test_score_scatter_pn/test_score_scatter_pn.py b/tests/test_score_scatter_pn/test_score_scatter_pn.py
index 79a4502c9c..6fb304ac53 100644
--- a/tests/test_score_scatter_pn/test_score_scatter_pn.py
+++ b/tests/test_score_scatter_pn/test_score_scatter_pn.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreScatterPNTestHarness(PyAPITestHarness):
diff --git a/tests/test_score_scatter_yn/test_score_scatter_yn.py b/tests/test_score_scatter_yn/test_score_scatter_yn.py
index f99fc5923f..7d572b2abb 100644
--- a/tests/test_score_scatter_yn/test_score_scatter_yn.py
+++ b/tests/test_score_scatter_yn/test_score_scatter_yn.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreScatterYNTestHarness(PyAPITestHarness):
diff --git a/tests/test_score_total/test_score_total.py b/tests/test_score_total/test_score_total.py
index 702a8141c1..c5e4294155 100644
--- a/tests/test_score_total/test_score_total.py
+++ b/tests/test_score_total/test_score_total.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreTotalTestHarness(PyAPITestHarness):
diff --git a/tests/test_score_total_yn/test_score_total_yn.py b/tests/test_score_total_yn/test_score_total_yn.py
index 07cac86d2a..456e1f93b2 100644
--- a/tests/test_score_total_yn/test_score_total_yn.py
+++ b/tests/test_score_total_yn/test_score_total_yn.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
-import os
 
 
 class ScoreTotalYNTestHarness(PyAPITestHarness):
diff --git a/tests/test_seed/test_seed.py b/tests/test_seed/test_seed.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_seed/test_seed.py
+++ b/tests/test_seed/test_seed.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_source_angle_mono/test_source_angle_mono.py b/tests/test_source_angle_mono/test_source_angle_mono.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_source_angle_mono/test_source_angle_mono.py
+++ b/tests/test_source_angle_mono/test_source_angle_mono.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_source_energy_maxwell/test_source_energy_maxwell.py b/tests/test_source_energy_maxwell/test_source_energy_maxwell.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_source_energy_maxwell/test_source_energy_maxwell.py
+++ b/tests/test_source_energy_maxwell/test_source_energy_maxwell.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_source_energy_mono/test_source_energy_mono.py b/tests/test_source_energy_mono/test_source_energy_mono.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_source_energy_mono/test_source_energy_mono.py
+++ b/tests/test_source_energy_mono/test_source_energy_mono.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_source_file/test_source_file.py b/tests/test_source_file/test_source_file.py
index fae6b2a72f..5420d71e82 100644
--- a/tests/test_source_file/test_source_file.py
+++ b/tests/test_source_file/test_source_file.py
@@ -3,8 +3,8 @@
 import glob
 import os
 import sys
-
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import *
 
 
diff --git a/tests/test_source_point/test_source_point.py b/tests/test_source_point/test_source_point.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_source_point/test_source_point.py
+++ b/tests/test_source_point/test_source_point.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_sourcepoint_batch/test_sourcepoint_batch.py b/tests/test_sourcepoint_batch/test_sourcepoint_batch.py
index a306b9aa78..eb3136754c 100644
--- a/tests/test_sourcepoint_batch/test_sourcepoint_batch.py
+++ b/tests/test_sourcepoint_batch/test_sourcepoint_batch.py
@@ -3,9 +3,10 @@
 import glob
 import os
 import sys
-
-sys.path.insert(0, '..')
-from testing_harness import *
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
+from testing_harness import TestHarness
+from openmc.statepoint import StatePoint
 
 
 class SourcepointTestHarness(TestHarness):
diff --git a/tests/test_sourcepoint_interval/test_sourcepoint_interval.py b/tests/test_sourcepoint_interval/test_sourcepoint_interval.py
index a306b9aa78..eb3136754c 100644
--- a/tests/test_sourcepoint_interval/test_sourcepoint_interval.py
+++ b/tests/test_sourcepoint_interval/test_sourcepoint_interval.py
@@ -3,9 +3,10 @@
 import glob
 import os
 import sys
-
-sys.path.insert(0, '..')
-from testing_harness import *
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
+from testing_harness import TestHarness
+from openmc.statepoint import StatePoint
 
 
 class SourcepointTestHarness(TestHarness):
diff --git a/tests/test_sourcepoint_latest/test_sourcepoint_latest.py b/tests/test_sourcepoint_latest/test_sourcepoint_latest.py
index 7d0af89b97..245eede759 100644
--- a/tests/test_sourcepoint_latest/test_sourcepoint_latest.py
+++ b/tests/test_sourcepoint_latest/test_sourcepoint_latest.py
@@ -1,11 +1,10 @@
 #!/usr/bin/env python
 
-import glob
 import os
 import sys
-
-sys.path.insert(0, '..')
-from testing_harness import *
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
+from testing_harness import TestHarness
 
 
 class SourcepointTestHarness(TestHarness):
diff --git a/tests/test_sourcepoint_restart/test_sourcepoint_restart.py b/tests/test_sourcepoint_restart/test_sourcepoint_restart.py
index 1777db993e..67227ca324 100644
--- a/tests/test_sourcepoint_restart/test_sourcepoint_restart.py
+++ b/tests/test_sourcepoint_restart/test_sourcepoint_restart.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_statepoint_batch/test_statepoint_batch.py b/tests/test_statepoint_batch/test_statepoint_batch.py
index bc5632618f..8a0ef83d27 100644
--- a/tests/test_statepoint_batch/test_statepoint_batch.py
+++ b/tests/test_statepoint_batch/test_statepoint_batch.py
@@ -1,7 +1,10 @@
 #!/usr/bin/env python 
+
+import os
 import sys
-sys.path.insert(0, '..')
-from testing_harness import *
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
+from testing_harness import TestHarness
 
 
 class StatepointTestHarness(TestHarness):
diff --git a/tests/test_statepoint_interval/test_statepoint_interval.py b/tests/test_statepoint_interval/test_statepoint_interval.py
index b41ee2b7ae..47db80f656 100644
--- a/tests/test_statepoint_interval/test_statepoint_interval.py
+++ b/tests/test_statepoint_interval/test_statepoint_interval.py
@@ -1,8 +1,10 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
-from testing_harness import *
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
+from testing_harness import TestHarness
 
 
 class StatepointTestHarness(TestHarness):
diff --git a/tests/test_statepoint_restart/test_statepoint_restart.py b/tests/test_statepoint_restart/test_statepoint_restart.py
index dd42dc8ff5..91c316f6a5 100644
--- a/tests/test_statepoint_restart/test_statepoint_restart.py
+++ b/tests/test_statepoint_restart/test_statepoint_restart.py
@@ -3,9 +3,11 @@
 import glob
 import os
 import sys
-
-sys.path.insert(0, '..')
-from testing_harness import *
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
+from testing_harness import TestHarness
+from openmc.statepoint import StatePoint
+from openmc.executor import Executor
 
 
 class StatepointRestartTestHarness(TestHarness):
diff --git a/tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py b/tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py
index c7221c90c2..70ba94838f 100644
--- a/tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py
+++ b/tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py
@@ -3,9 +3,9 @@
 import glob
 import os
 import sys
-
-sys.path.insert(0, '..')
-from testing_harness import *
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
+from testing_harness import TestHarness
 
 
 class SourcepointTestHarness(TestHarness):
diff --git a/tests/test_survival_biasing/test_survival_biasing.py b/tests/test_survival_biasing/test_survival_biasing.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_survival_biasing/test_survival_biasing.py
+++ b/tests/test_survival_biasing/test_survival_biasing.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_tally_assumesep/test_tally_assumesep.py b/tests/test_tally_assumesep/test_tally_assumesep.py
index 1777db993e..67227ca324 100644
--- a/tests/test_tally_assumesep/test_tally_assumesep.py
+++ b/tests/test_tally_assumesep/test_tally_assumesep.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_tally_nuclides/test_tally_nuclides.py b/tests/test_tally_nuclides/test_tally_nuclides.py
index 1777db993e..67227ca324 100644
--- a/tests/test_tally_nuclides/test_tally_nuclides.py
+++ b/tests/test_tally_nuclides/test_tally_nuclides.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_trace/test_trace.py b/tests/test_trace/test_trace.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_trace/test_trace.py
+++ b/tests/test_trace/test_trace.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_track_output/test_track_output.py b/tests/test_track_output/test_track_output.py
index dc0eb1a69d..7039120a41 100644
--- a/tests/test_track_output/test_track_output.py
+++ b/tests/test_track_output/test_track_output.py
@@ -4,9 +4,9 @@ import glob
 import os
 import shutil
 import sys
-
-sys.path.insert(0, '..')
-from testing_harness import *
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
+from testing_harness import TestHarness
 
 
 class TrackTestHarness(TestHarness):
diff --git a/tests/test_translation/test_translation.py b/tests/test_translation/test_translation.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_translation/test_translation.py
+++ b/tests/test_translation/test_translation.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_trigger_batch_interval/test_trigger_batch_interval.py b/tests/test_trigger_batch_interval/test_trigger_batch_interval.py
index e5c5b54b6b..18b904efb5 100644
--- a/tests/test_trigger_batch_interval/test_trigger_batch_interval.py
+++ b/tests/test_trigger_batch_interval/test_trigger_batch_interval.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_trigger_no_batch_interval/test_trigger_no_batch_interval.py b/tests/test_trigger_no_batch_interval/test_trigger_no_batch_interval.py
index ff19e3d08d..983f941d93 100644
--- a/tests/test_trigger_no_batch_interval/test_trigger_no_batch_interval.py
+++ b/tests/test_trigger_no_batch_interval/test_trigger_no_batch_interval.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_trigger_no_status/test_trigger_no_status.py b/tests/test_trigger_no_status/test_trigger_no_status.py
index 1777db993e..67227ca324 100644
--- a/tests/test_trigger_no_status/test_trigger_no_status.py
+++ b/tests/test_trigger_no_status/test_trigger_no_status.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_trigger_tallies/test_trigger_tallies.py b/tests/test_trigger_tallies/test_trigger_tallies.py
index 20094827e0..812e2c5e50 100644
--- a/tests/test_trigger_tallies/test_trigger_tallies.py
+++ b/tests/test_trigger_tallies/test_trigger_tallies.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_uniform_fs/test_uniform_fs.py b/tests/test_uniform_fs/test_uniform_fs.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_uniform_fs/test_uniform_fs.py
+++ b/tests/test_uniform_fs/test_uniform_fs.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_union_energy_grids/test_union_energy_grids.py b/tests/test_union_energy_grids/test_union_energy_grids.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_union_energy_grids/test_union_energy_grids.py
+++ b/tests/test_union_energy_grids/test_union_energy_grids.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_universe/test_universe.py b/tests/test_universe/test_universe.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_universe/test_universe.py
+++ b/tests/test_universe/test_universe.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_void/test_void.py b/tests/test_void/test_void.py
index 6633e59111..835bf91c7b 100644
--- a/tests/test_void/test_void.py
+++ b/tests/test_void/test_void.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
+import os
 import sys
-sys.path.insert(0, '..')
+sys.path.insert(0, os.pardir)
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 

From 8030112938c77d36da23b9da46008c465535748a Mon Sep 17 00:00:00 2001
From: Sterling Harper <sterlingmharper@gmail.com>
Date: Sat, 3 Oct 2015 00:16:15 -0400
Subject: [PATCH 05/10] Use OrderedDict for material nuclides in PyAPI

---
 openmc/clean_xml.py                           |    2 +-
 openmc/material.py                            |   10 +-
 tests/test_filter_cell/inputs_true.dat        |    2 +-
 tests/test_filter_cell/results_true.dat       |   14 +-
 tests/test_filter_cellborn/inputs_true.dat    |    2 +-
 tests/test_filter_cellborn/results_true.dat   |    6 +-
 tests/test_filter_energy/inputs_true.dat      |    2 +-
 tests/test_filter_energy/results_true.dat     |   18 +-
 tests/test_filter_energyout/inputs_true.dat   |    2 +-
 tests/test_filter_energyout/results_true.dat  |   18 +-
 .../inputs_true.dat                           |    2 +-
 .../results_true.dat                          |   66 +-
 tests/test_filter_material/inputs_true.dat    |    2 +-
 tests/test_filter_material/results_true.dat   |   18 +-
 tests/test_filter_universe/inputs_true.dat    |    2 +-
 tests/test_filter_universe/results_true.dat   |   18 +-
 tests/test_score_MT/inputs_true.dat           |    2 +-
 tests/test_score_MT/results_true.dat          |   90 +-
 tests/test_score_absorption/inputs_true.dat   |    2 +-
 tests/test_score_absorption/results_true.dat  |   38 +-
 tests/test_score_events/inputs_true.dat       |    2 +-
 tests/test_score_events/results_true.dat      |   18 +-
 tests/test_score_fission/inputs_true.dat      |    2 +-
 tests/test_score_fission/results_true.dat     |   26 +-
 tests/test_score_flux/inputs_true.dat         |    2 +-
 tests/test_score_flux/results_true.dat        |   74 +-
 tests/test_score_flux_yn/inputs_true.dat      |    2 +-
 tests/test_score_flux_yn/results_true.dat     | 2594 ++++++++---------
 tests/test_score_kappafission/inputs_true.dat |    2 +-
 .../test_score_kappafission/results_true.dat  |   26 +-
 tests/test_score_nufission/inputs_true.dat    |    2 +-
 tests/test_score_nufission/results_true.dat   |   26 +-
 tests/test_score_nuscatter/inputs_true.dat    |    2 +-
 tests/test_score_nuscatter/results_true.dat   |   14 +-
 tests/test_score_nuscatter_n/inputs_true.dat  |    2 +-
 tests/test_score_nuscatter_n/results_true.dat |   62 +-
 tests/test_score_nuscatter_pn/inputs_true.dat |    2 +-
 .../test_score_nuscatter_pn/results_true.dat  |   42 +-
 tests/test_score_nuscatter_yn/inputs_true.dat |    2 +-
 .../test_score_nuscatter_yn/results_true.dat  |   70 +-
 tests/test_score_scatter/inputs_true.dat      |    2 +-
 tests/test_score_scatter/results_true.dat     |   38 +-
 tests/test_score_scatter_n/inputs_true.dat    |    2 +-
 tests/test_score_scatter_n/results_true.dat   |   62 +-
 tests/test_score_scatter_pn/inputs_true.dat   |    2 +-
 tests/test_score_scatter_pn/results_true.dat  |   42 +-
 tests/test_score_scatter_yn/inputs_true.dat   |    2 +-
 tests/test_score_scatter_yn/results_true.dat  |  106 +-
 tests/test_score_total/inputs_true.dat        |    2 +-
 tests/test_score_total/results_true.dat       |   38 +-
 tests/test_score_total_yn/inputs_true.dat     |    2 +-
 tests/test_score_total_yn/results_true.dat    | 1202 ++++----
 52 files changed, 2394 insertions(+), 2394 deletions(-)

diff --git a/openmc/clean_xml.py b/openmc/clean_xml.py
index 2bb3f39f1b..aefd30ac7b 100644
--- a/openmc/clean_xml.py
+++ b/openmc/clean_xml.py
@@ -29,7 +29,7 @@ def sort_xml_elements(tree):
             comment_elements.append((element, next_element))
 
     # Now iterate over all tags and order the elements within each tag
-    for tag in tags:
+    for tag in sorted(list(tags)):
 
         # Retrieve all of the elements for this tag
         try:
diff --git a/openmc/material.py b/openmc/material.py
index e495357b54..a5714e339e 100644
--- a/openmc/material.py
+++ b/openmc/material.py
@@ -1,4 +1,4 @@
-from collections import Iterable
+from collections import Iterable, OrderedDict
 from copy import deepcopy
 from numbers import Real, Integral
 import warnings
@@ -64,15 +64,15 @@ class Material(object):
         self._density = None
         self._density_units = ''
 
-        # A dictionary of Nuclides
+        # An ordered dictionary of Nuclides (order affects OpenMC results)
         # Keys         - Nuclide names
         # Values     - tuple (nuclide, percent, percent type)
-        self._nuclides = {}
+        self._nuclides = OrderedDict()
 
-        # A dictionary of Elements
+        # An ordered dictionary of Elements (order affects OpenMC results)
         # Keys         - Element names
         # Values     - tuple (element, percent, percent type)
-        self._elements = {}
+        self._elements = OrderedDict()
 
         # If specified, a list of tuples of (table name, xs identifier)
         self._sab = []
diff --git a/tests/test_filter_cell/inputs_true.dat b/tests/test_filter_cell/inputs_true.dat
index 7455ded398..7cf1c07c2f 100644
--- a/tests/test_filter_cell/inputs_true.dat
+++ b/tests/test_filter_cell/inputs_true.dat
@@ -1 +1 @@
-55f5e81110db78873ebe2d1411e6f3feb1df98ee14a6489a6b2d9c1164448e48a158b2c0f4efc8ea71d6aabe2e64d029b997d656e5975d2ab549ea365480933b
\ No newline at end of file
+3b06e27fa039762b59076bb9431ef003e69ef32f8d01bcf908fe85f59bf7127bd8b94bf2f895b1b63e9fcdbd97aeaf4b02bc02e7bd029bfd85263c68498ce562
\ No newline at end of file
diff --git a/tests/test_filter_cell/results_true.dat b/tests/test_filter_cell/results_true.dat
index 5aebd42967..47ff3c281a 100644
--- a/tests/test_filter_cell/results_true.dat
+++ b/tests/test_filter_cell/results_true.dat
@@ -1,11 +1,11 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-2.240915E+01
-1.009032E+02
-4.711189E+00
-4.469059E+00
-6.533718E+01
-8.552989E+02
+1.767552E+01
+6.295417E+01
+3.863588E+00
+3.013300E+00
+5.356594E+01
+5.839391E+02
diff --git a/tests/test_filter_cellborn/inputs_true.dat b/tests/test_filter_cellborn/inputs_true.dat
index 8a234a6223..3379e4b26a 100644
--- a/tests/test_filter_cellborn/inputs_true.dat
+++ b/tests/test_filter_cellborn/inputs_true.dat
@@ -1 +1 @@
-b9e90c6f594460d23ab84d56ff31897da3f47fdb558356468bb74119df0081f1600953045e4ec68e6048e334cb14abe1566cd72c414d3133c7f4a29d1140bb9e
\ No newline at end of file
+6dd7d019587330bbf9c19bae7ad1d888331858b68bd77218315d5fa7b85df7fb97cb208daed584a780592cf9840e67ea3777ccbde502f3861798aac95722be9c
\ No newline at end of file
diff --git a/tests/test_filter_cellborn/results_true.dat b/tests/test_filter_cellborn/results_true.dat
index 1aedcc9c63..d0ab58f4ed 100644
--- a/tests/test_filter_cellborn/results_true.dat
+++ b/tests/test_filter_cellborn/results_true.dat
@@ -1,10 +1,10 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-1.073903E+02
-2.311705E+03
+8.921179E+01
+1.601939E+03
 0.000000E+00
 0.000000E+00
 0.000000E+00
diff --git a/tests/test_filter_energy/inputs_true.dat b/tests/test_filter_energy/inputs_true.dat
index 977dfc0ae0..58da3ba3e0 100644
--- a/tests/test_filter_energy/inputs_true.dat
+++ b/tests/test_filter_energy/inputs_true.dat
@@ -1 +1 @@
-f41cd0988306e97da0e720c37ca123b2fab894f0cd60a69b6d47a0d6097d993efbf20c61345c71f3e0561af7968684f8fcd39eb908c9c34fbbe2e835eccc659b
\ No newline at end of file
+bc9f43ff6368da544942b93ecfb2561911071c44524e35608fcb92c1262fe5543e09525414a87cd647fbc50113d64ff867730e5f4391f31b096abd7a0543b474
\ No newline at end of file
diff --git a/tests/test_filter_energy/results_true.dat b/tests/test_filter_energy/results_true.dat
index b25314510c..599e0bf888 100644
--- a/tests/test_filter_energy/results_true.dat
+++ b/tests/test_filter_energy/results_true.dat
@@ -1,11 +1,11 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-2.777972E+01
-1.636507E+02
-4.274382E+01
-3.658341E+02
-5.403589E+01
-5.860017E+02
-1.137001E+01
-2.594280E+01
+2.844008E+01
+1.619630E+02
+4.425619E+01
+3.938244E+02
+5.527425E+01
+6.120383E+02
+9.799897E+00
+1.957877E+01
diff --git a/tests/test_filter_energyout/inputs_true.dat b/tests/test_filter_energyout/inputs_true.dat
index f31f456eb4..4cfce0b49d 100644
--- a/tests/test_filter_energyout/inputs_true.dat
+++ b/tests/test_filter_energyout/inputs_true.dat
@@ -1 +1 @@
-52c9c541a82b4f395889450ab4696dffb13ee01427e65e79556080bab88388e91c932b862686a4e449948016e03240bc0692d1fc4386b61f5d0a05310158d232
\ No newline at end of file
+74c55768b2b0f5696d5bff9d36a3639c6d858bf2984d799c8b46908b897af11e691b1f9f05646d52fcee046de3bfee11e35b9b379b2967abb0922f60168017b7
\ No newline at end of file
diff --git a/tests/test_filter_energyout/results_true.dat b/tests/test_filter_energyout/results_true.dat
index 7c626faa4b..814385d5a4 100644
--- a/tests/test_filter_energyout/results_true.dat
+++ b/tests/test_filter_energyout/results_true.dat
@@ -1,11 +1,11 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-2.742000E+01
-1.574582E+02
-4.267000E+01
-3.646435E+02
-5.278000E+01
-5.578420E+02
-7.900000E+00
-1.253260E+01
+2.842000E+01
+1.620214E+02
+4.361000E+01
+3.810139E+02
+5.297000E+01
+5.616595E+02
+6.530000E+00
+8.828900E+00
diff --git a/tests/test_filter_group_transfer/inputs_true.dat b/tests/test_filter_group_transfer/inputs_true.dat
index d19163cafa..f98d11bd2b 100644
--- a/tests/test_filter_group_transfer/inputs_true.dat
+++ b/tests/test_filter_group_transfer/inputs_true.dat
@@ -1 +1 @@
-25c0be6220072084bed91a172e0e55545b968b60da14f6b36a58493e0fb6b0e96a4b3eb576df1c503b0e18629149d3ee0754de2ffed5ffd82d6e6b7e0f261993
\ No newline at end of file
+dd69e0768aa7a4e28efd20adc6a607337c9a15682fa307b1aa2459595f90a523f1fa6e4e4f6db1d74e52a2287ef4efa85d77b1751cd1a2d2e6618385cf7f4607
\ No newline at end of file
diff --git a/tests/test_filter_group_transfer/results_true.dat b/tests/test_filter_group_transfer/results_true.dat
index 576c6b9d76..c41451e776 100644
--- a/tests/test_filter_group_transfer/results_true.dat
+++ b/tests/test_filter_group_transfer/results_true.dat
@@ -1,54 +1,54 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-2.486000E+01
-1.303342E+02
+2.576000E+01
+1.331666E+02
 0.000000E+00
 0.000000E+00
-5.000000E-02
-1.700000E-03
+7.000000E-02
+1.300000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.967969E-01
-1.846735E-01
+1.050675E+00
+2.274991E-01
 0.000000E+00
 0.000000E+00
-2.379073E+00
-1.190296E+00
-2.560000E+00
-1.318200E+00
+2.070821E+00
+8.886068E-01
+2.660000E+00
+1.422000E+00
 0.000000E+00
 0.000000E+00
-3.800000E+01
-2.893420E+02
+3.897000E+01
+3.042635E+02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.734177E-01
-3.189810E-02
+4.352932E-01
+4.705717E-02
 0.000000E+00
 0.000000E+00
-9.891140E-01
-2.024582E-01
+1.018668E+00
+2.090017E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.620000E+00
-4.269800E+00
+4.570000E+00
+4.182700E+00
 0.000000E+00
 0.000000E+00
-4.933000E+01
-4.873911E+02
-1.011778E-02
-1.023695E-04
+4.968000E+01
+4.940534E+02
+6.537406E-02
+1.230788E-03
 0.000000E+00
 0.000000E+00
-5.982886E-02
-1.821968E-03
+8.678070E-02
+2.482037E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -57,11 +57,11 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.450000E+00
-2.383100E+00
-1.413190E-01
-4.286264E-03
-7.900000E+00
-1.253260E+01
-2.891151E-01
-1.897512E-02
+3.290000E+00
+2.178900E+00
+1.610879E-01
+5.883677E-03
+6.530000E+00
+8.828900E+00
+3.151783E-01
+2.052521E-02
diff --git a/tests/test_filter_material/inputs_true.dat b/tests/test_filter_material/inputs_true.dat
index 83b555b1d5..0610b45c44 100644
--- a/tests/test_filter_material/inputs_true.dat
+++ b/tests/test_filter_material/inputs_true.dat
@@ -1 +1 @@
-d9822da9c74042812df6046cc810a7b13b90c7f4e6487c8f904b8e6b6a3655938b7f5bec0866a51fc3bc8b9612368f6f79b4f34283abd73663c58172b25d073e
\ No newline at end of file
+91dd096441a7f01689ed605b7b3322c63a90c4802d73450acd825b715a8163fc892b4971e4b8b0d5a179eb51ad22bcc886f3935e7ab734d0fedebaf679415816
\ No newline at end of file
diff --git a/tests/test_filter_material/results_true.dat b/tests/test_filter_material/results_true.dat
index eb9d920358..d2b23e2901 100644
--- a/tests/test_filter_material/results_true.dat
+++ b/tests/test_filter_material/results_true.dat
@@ -1,11 +1,11 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-2.840222E+01
-1.617027E+02
-6.793657E+00
-9.256930E+00
-7.648212E+01
-1.171747E+03
-2.158747E+01
-9.962972E+01
+2.868239E+01
+1.648549E+02
+6.779424E+00
+9.202676E+00
+6.446222E+01
+8.387204E+02
+3.367496E+01
+2.349072E+02
diff --git a/tests/test_filter_universe/inputs_true.dat b/tests/test_filter_universe/inputs_true.dat
index e442de057e..cf1c7db55b 100644
--- a/tests/test_filter_universe/inputs_true.dat
+++ b/tests/test_filter_universe/inputs_true.dat
@@ -1 +1 @@
-a65cbed55e510edcb54362e9bd38a639b36d2bf4ff312f9355c5552e9407bab27730437f3298a90deb6abbdf36810e8e23c87d11d09a55ce5227fa2bfba1f4aa
\ No newline at end of file
+f3dc4c28827ca9035d2d1a39f4adef794f0e27b8c95776485e419b9610aefc6c268e6a1d5889d8170ec9400fc3a4a52bc69cd94e5056078aee7405e0bc62bad5
\ No newline at end of file
diff --git a/tests/test_filter_universe/results_true.dat b/tests/test_filter_universe/results_true.dat
index 22f863c913..f71c4d2c21 100644
--- a/tests/test_filter_universe/results_true.dat
+++ b/tests/test_filter_universe/results_true.dat
@@ -1,11 +1,11 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-9.245752E+01
-1.713583E+03
-1.150558E+01
-2.689915E+01
-2.299276E+01
-1.068299E+02
-3.009831E+00
-1.837623E+00
+7.510505E+01
+1.143811E+03
+8.792943E+00
+1.575416E+01
+4.214462E+01
+3.642975E+02
+4.335157E+00
+3.864423E+00
diff --git a/tests/test_score_MT/inputs_true.dat b/tests/test_score_MT/inputs_true.dat
index b78dd8061f..7b56862ea3 100644
--- a/tests/test_score_MT/inputs_true.dat
+++ b/tests/test_score_MT/inputs_true.dat
@@ -1 +1 @@
-5bf02c7821f3a428d780a95fcffc5873d3ff025f77e511a8bc4d35551bfa8ff1bf95b3d177971fe55f6b58133f303fe7003054125f396bd56c1924a852ff4681
\ No newline at end of file
+6ba3ebe9d50584343b012b7a935a0f75b8366659600d4de050a8e4e48405f8da36682e8ab5f495f69b646fc72e176755c0a3540f235806c73d5ebc4fc67db107
\ No newline at end of file
diff --git a/tests/test_score_MT/results_true.dat b/tests/test_score_MT/results_true.dat
index dc3dce006a..44656963f0 100644
--- a/tests/test_score_MT/results_true.dat
+++ b/tests/test_score_MT/results_true.dat
@@ -1,5 +1,5 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
 0.000000E+00
 0.000000E+00
@@ -9,30 +9,30 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.549173E-03
-1.042847E-05
-4.549173E-03
-1.042847E-05
-5.349258E-01
-5.819756E-02
-1.771520E+00
-6.368768E-01
-2.840231E-04
-7.989175E-08
-2.840231E-04
-7.989175E-08
-4.456152E-02
-4.011605E-04
-3.237732E-02
-2.535641E-04
+1.538090E-03
+1.381456E-06
+1.538090E-03
+1.381456E-06
+3.974412E-01
+3.209809E-02
+1.373550E+00
+3.796357E-01
+5.252455E-06
+2.290531E-11
+5.252455E-06
+2.290531E-11
+3.359792E-02
+2.267331E-04
+2.459115E-02
+1.233078E-04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.260440E-05
-2.080213E-09
-9.514028E-02
-1.832676E-03
+7.004005E-05
+1.748739E-09
+8.104946E-02
+1.395618E-03
 tally 2:
 0.000000E+00
 0.000000E+00
@@ -46,16 +46,16 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.700000E-01
-6.530000E-02
+2.000000E-01
+9.000000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.000000E-02
-1.100000E-03
+2.000000E-02
+2.000000E-04
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -75,27 +75,27 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.477762E-03
-3.606695E-05
-7.477762E-03
-3.606695E-05
-5.749995E-01
-6.679702E-02
-1.748150E+00
-6.191138E-01
+1.408027E-03
+1.849607E-06
+1.408027E-03
+1.849607E-06
+3.946436E-01
+3.166261E-02
+1.288136E+00
+3.382059E-01
+2.179241E-05
+4.749090E-10
+2.179241E-05
+4.749090E-10
+3.146594E-02
+2.159308E-04
+4.278352E-02
+4.094478E-04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.201948E-02
-3.812116E-04
-2.128743E-02
-1.104373E-04
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.503792E-04
-7.112750E-09
-9.209675E-02
-1.724470E-03
+1.736514E-04
+1.245171E-08
+7.989710E-02
+1.377742E-03
diff --git a/tests/test_score_absorption/inputs_true.dat b/tests/test_score_absorption/inputs_true.dat
index be73d98b6c..ad2d1f40ea 100644
--- a/tests/test_score_absorption/inputs_true.dat
+++ b/tests/test_score_absorption/inputs_true.dat
@@ -1 +1 @@
-55faff4d2b9eb95d51b31ec618a03a25b1bc82338fe5a043ffcf4ced388265c75cf7d97db94dc50622edc592f093f366de490c94c01ee20a1df1de635f659533
\ No newline at end of file
+a2be808e033014c9d748a0ec503ab6ad498f6b70250c8136bfcb9dc8f5580e69fc0bc1c6acab428c139edf64f51237ba07495b0275a19f509bf3bd20fa298e4e
\ No newline at end of file
diff --git a/tests/test_score_absorption/results_true.dat b/tests/test_score_absorption/results_true.dat
index 1984cc4e66..72661f77f4 100644
--- a/tests/test_score_absorption/results_true.dat
+++ b/tests/test_score_absorption/results_true.dat
@@ -1,29 +1,29 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-3.336094E+00
-2.246259E+00
-3.247758E-02
-2.553866E-04
-4.583764E-01
-4.253734E-02
+2.533174E+00
+1.298118E+00
+2.453769E-02
+1.227715E-04
+3.869051E-01
+3.180828E-02
 tally 2:
 0.000000E+00
 0.000000E+00
-3.380000E+00
-2.293800E+00
-1.000000E-02
-1.000000E-04
-4.400000E-01
-4.360000E-02
+2.540000E+00
+1.293400E+00
+4.000000E-02
+6.000000E-04
+4.000000E-01
+3.600000E-02
 tally 3:
 0.000000E+00
 0.000000E+00
-3.251414E+00
-2.129893E+00
-2.185530E-02
-1.156492E-04
-4.456283E-01
-4.031784E-02
+2.422314E+00
+1.193460E+00
+4.285618E-02
+4.109734E-04
+3.832282E-01
+3.169516E-02
diff --git a/tests/test_score_events/inputs_true.dat b/tests/test_score_events/inputs_true.dat
index 7535b3f66f..1d2c8447cd 100644
--- a/tests/test_score_events/inputs_true.dat
+++ b/tests/test_score_events/inputs_true.dat
@@ -1 +1 @@
-6ad38e2ba1108cbc2a1cb6bfcb5131fd5f7d31c7699c7659daeb42733d75df6cb1ef058277e300d35374d54f0b85a210c0ab0a37dc80a1b234e455d4293af94f
\ No newline at end of file
+493830fe4598d5a2e31d4b79aceb79390bfa0bd7e08681ef36d5978a72de3cd7bcdbc06147061664614ed8e069be82d01e880e8e8cb629d3bd7aa1223850c8e6
\ No newline at end of file
diff --git a/tests/test_score_events/results_true.dat b/tests/test_score_events/results_true.dat
index e6547cc820..34b114fbcb 100644
--- a/tests/test_score_events/results_true.dat
+++ b/tests/test_score_events/results_true.dat
@@ -1,12 +1,12 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-8.539000E+01
-1.463307E+03
-2.312000E+01
-1.070560E+02
+6.520000E+01
+8.551888E+02
+4.035000E+01
+3.351119E+02
 tally 2:
-2.278000E+01
-1.042404E+02
-6.260000E+00
-7.850600E+00
+1.739000E+01
+6.083290E+01
+1.104000E+01
+2.498260E+01
diff --git a/tests/test_score_fission/inputs_true.dat b/tests/test_score_fission/inputs_true.dat
index e4f120bc16..0abc63556a 100644
--- a/tests/test_score_fission/inputs_true.dat
+++ b/tests/test_score_fission/inputs_true.dat
@@ -1 +1 @@
-43d51743c601d4e347e7a1735398b76213fdf22488749d9496093bd8ccc2ead36c1fadfe7dc27b74d21832b270a0b88d03c6e0ce5fcae066f7a7a32789abb8fd
\ No newline at end of file
+e94e6338c6aadaebd6f3cdad768b53908e470dc6d650a170703b21bf0140313559ce2af78f6b8bd13498dc5019ce02603ec6ba7c68731dfa05ca4a540f159625
\ No newline at end of file
diff --git a/tests/test_score_fission/results_true.dat b/tests/test_score_fission/results_true.dat
index aecb466dda..2b28cc825c 100644
--- a/tests/test_score_fission/results_true.dat
+++ b/tests/test_score_fission/results_true.dat
@@ -1,29 +1,29 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-1.559747E+00
-4.911504E-01
+1.156315E+00
+2.733527E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.579938E-01
-2.731974E-02
+6.971594E-01
+1.004973E-01
 tally 2:
-1.526951E+00
-4.824326E-01
+1.225263E+00
+3.054971E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.966177E-01
-3.291468E-02
+6.475958E-01
+8.567154E-02
 tally 3:
-1.496616E+00
-4.530639E-01
+1.131528E+00
+2.612886E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.919885E-01
-3.104206E-02
+7.021712E-01
+1.008605E-01
diff --git a/tests/test_score_flux/inputs_true.dat b/tests/test_score_flux/inputs_true.dat
index d56fdcb9a7..fe2b65dfe1 100644
--- a/tests/test_score_flux/inputs_true.dat
+++ b/tests/test_score_flux/inputs_true.dat
@@ -1 +1 @@
-6f1f560fb5830abea765a6ee6a2d5762f6107398e7ec6adf136d718846ca9b73b00f3e1b73a3433cf812532def4cd614e251d7c40b0d4e0e38f47c4a44d08b8b
\ No newline at end of file
+23454cbb568dd5f8569f228b3d0e6d180144279005521ad009d6a99384db79330b274edc431133f5e304a6750bef2b85bfc5af46258a75ce3f0673dd0ec0c54c
\ No newline at end of file
diff --git a/tests/test_score_flux/results_true.dat b/tests/test_score_flux/results_true.dat
index 575b8ff178..5c366ea8c7 100644
--- a/tests/test_score_flux/results_true.dat
+++ b/tests/test_score_flux/results_true.dat
@@ -1,41 +1,41 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-5.010477E+01
-5.039958E+02
-1.732466E+01
-6.033456E+01
-8.428445E+01
-1.425022E+03
-1.357577E+01
-3.704803E+01
-4.758922E+00
-4.591527E+00
-2.297418E+01
-1.067445E+02
+3.890713E+01
+3.046363E+02
+1.366220E+01
+3.758161E+01
+6.561669E+01
+8.680729E+02
+2.382728E+01
+1.170590E+02
+8.047875E+00
+1.334796E+01
+4.056568E+01
+3.389623E+02
 tally 2:
-5.188799E+01
-5.402176E+02
-1.593914E+01
-5.169154E+01
-8.557014E+01
-1.465192E+03
-1.427596E+01
-4.078276E+01
-4.943558E+00
-5.054633E+00
-2.194332E+01
-9.737940E+01
+3.862543E+01
+2.993190E+02
+1.438678E+01
+4.193571E+01
+6.400634E+01
+8.298077E+02
+2.426423E+01
+1.215124E+02
+7.600812E+00
+1.199814E+01
+4.104875E+01
+3.455300E+02
 tally 3:
-5.188799E+01
-5.402176E+02
-1.593914E+01
-5.169154E+01
-8.557014E+01
-1.465192E+03
-1.427596E+01
-4.078276E+01
-4.943558E+00
-5.054633E+00
-2.194332E+01
-9.737940E+01
+3.862543E+01
+2.993190E+02
+1.438678E+01
+4.193571E+01
+6.400634E+01
+8.298077E+02
+2.426423E+01
+1.215124E+02
+7.600812E+00
+1.199814E+01
+4.104875E+01
+3.455300E+02
diff --git a/tests/test_score_flux_yn/inputs_true.dat b/tests/test_score_flux_yn/inputs_true.dat
index b4d82f71eb..ebb757bbdd 100644
--- a/tests/test_score_flux_yn/inputs_true.dat
+++ b/tests/test_score_flux_yn/inputs_true.dat
@@ -1 +1 @@
-7436214ee6931cdc4e8cf00a35f67c60280187fd6989a2ba3e8d51215e585cfc5cae41d5bab63176e306bcaf16e425f0b36bb8241a063f35ef36df2410bdf86a
\ No newline at end of file
+56b5f317d465ab32d9bc2cf85f1a22b7df773edcc642981707febd2e988e4174a3f0234744f192182edb51af23b541325496c2ca4530303afc0d2baefc0ce60e
\ No newline at end of file
diff --git a/tests/test_score_flux_yn/results_true.dat b/tests/test_score_flux_yn/results_true.dat
index 78ee844771..c657cb7bba 100644
--- a/tests/test_score_flux_yn/results_true.dat
+++ b/tests/test_score_flux_yn/results_true.dat
@@ -1,1301 +1,1301 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-5.010477E+01
-5.039958E+02
-2.176053E-01
-4.865261E-01
--1.086984E+00
-1.047217E+00
--4.795412E-01
-1.558959E-01
--5.701504E-01
-1.292349E-01
--5.368919E-01
-9.576579E-02
--9.479107E-01
-2.504916E-01
-1.224897E-01
-4.670746E-01
-8.535124E-01
-5.228963E-01
--1.992643E-01
-7.139374E-02
--5.251275E-01
-1.407419E-01
-4.161764E-01
-8.583663E-02
-1.900003E-01
-6.274903E-02
-1.756301E-01
-6.672692E-02
-8.899097E-01
-2.932284E-01
-1.829964E-01
-1.780842E-01
-3.128622E-02
-1.040374E-01
--2.048946E-01
-7.820016E-02
--1.770632E-01
-4.339147E-02
-3.158973E-02
-1.032146E-01
--2.632637E-01
-1.069343E-01
-4.191749E-01
-7.076456E-02
--2.010288E-01
-3.814062E-02
-1.087619E-01
-2.328146E-02
--2.966642E-01
-7.687789E-02
-2.042266E-01
-3.305349E-02
--2.931179E-01
-6.178212E-02
--5.521659E-01
-1.525784E-01
--1.344386E-01
-1.983161E-01
--1.636737E-01
-1.164849E-01
-5.187003E-01
-1.397304E-01
-2.399050E-01
-2.860510E-01
-2.967924E-01
-1.035081E-01
--7.005240E-02
-2.007454E-02
-3.237492E-02
-2.506195E-02
--6.959898E-02
-7.999033E-02
-1.732466E+01
-6.033456E+01
-3.107535E-02
-4.649239E-02
--3.970747E-01
-9.427351E-02
--1.123739E-01
-1.390365E-02
--2.898450E-02
-3.902114E-03
--2.631777E-01
-1.693614E-02
--3.010145E-01
-2.549605E-02
-3.897172E-02
-3.337532E-02
-2.061855E-01
-5.566838E-02
--6.067592E-02
-1.537371E-02
--1.412859E-01
-1.026936E-02
-2.971338E-01
-2.017773E-02
-2.229947E-01
-2.097948E-02
--6.075875E-03
-1.442041E-02
-2.389356E-01
-2.418354E-02
-4.914702E-02
-1.401262E-02
--8.942816E-02
-1.285068E-02
--1.041318E-01
-8.815681E-03
--8.589408E-02
-4.120018E-03
--7.343529E-02
-1.344074E-02
-4.450570E-02
-9.667309E-03
-1.602555E-01
-1.139203E-02
-1.567487E-02
-6.127441E-03
-5.173147E-02
-7.550481E-03
--1.719948E-01
-7.484666E-03
-7.675999E-02
-5.875577E-03
--5.024191E-02
-1.070000E-02
--1.702066E-01
-1.443420E-02
--3.419759E-02
-2.637248E-02
-4.600843E-02
-1.078680E-02
-2.458398E-01
-2.682601E-02
--3.085412E-02
-2.243953E-02
-1.178334E-01
-8.380493E-03
--8.449310E-02
-2.905176E-03
--1.512034E-02
-3.692235E-03
-7.089635E-03
-4.536425E-03
-8.428445E+01
-1.425022E+03
--1.362036E-01
-4.955117E-01
--2.368550E+00
-1.691161E+00
--7.107734E-01
-8.353526E-01
--6.040498E-01
-1.849927E-01
--7.580790E-01
-2.328322E-01
--2.827702E-01
-4.902552E-01
-2.263047E-01
-4.920612E-01
-1.086735E+00
-1.264217E+00
--2.674729E-01
-1.812824E-01
--9.480041E-01
-3.494658E-01
-1.131279E+00
-4.394262E-01
-6.028149E-01
-7.611055E-01
--4.226627E-01
-9.934511E-02
-4.674984E-01
-4.988034E-01
-4.404050E-01
-2.451286E-01
-9.924713E-02
-2.916276E-01
--5.691463E-01
-1.499514E-01
-3.042408E-02
-1.223962E-01
-9.963351E-03
-1.056905E-01
-7.166813E-01
-1.498011E-01
-3.740392E-01
-2.456929E-01
--9.657707E-02
-1.698541E-01
-2.079664E-01
-1.965244E-01
--1.119856E+00
-3.770763E-01
-2.039849E-01
-8.304410E-02
--4.199012E-01
-2.410734E-01
--6.791470E-01
-2.497291E-01
-2.416848E-01
-5.299837E-01
-8.546582E-02
-4.898367E-02
-4.674386E-01
-2.280610E-01
-3.594172E-01
-5.739204E-01
-4.972395E-01
-2.816960E-01
--4.736196E-01
-7.973237E-02
--1.484500E-01
-8.763644E-02
-1.318617E-02
-1.581561E-01
-1.357577E+01
-3.704803E+01
-3.384888E-03
-1.080209E-01
-2.872142E-01
-1.224352E-01
-2.863822E-01
-1.491797E-01
--1.972755E-01
-3.885966E-02
-2.015479E-02
-3.471051E-02
-2.173233E-01
-6.336006E-02
--2.432345E-01
-9.646809E-02
-3.387966E-02
-3.753576E-02
-1.185678E-01
-1.112748E-02
--7.895500E-02
-3.265370E-02
--2.546256E-01
-5.142289E-02
--4.647286E-02
-1.740042E-02
--2.660905E-01
-4.717290E-02
--1.510244E-01
-2.742362E-02
-1.058091E-01
-2.185823E-02
-2.153774E-01
-1.729585E-02
--4.988894E-02
-2.207988E-02
--4.352527E-02
-1.760359E-02
-1.436143E-02
-2.593599E-02
--2.352747E-01
-1.960774E-02
--2.822795E-01
-3.249990E-02
--7.774355E-02
-9.008554E-03
-1.239406E-01
-2.331185E-02
--2.880954E-01
-4.411740E-02
--2.049660E-02
-2.503723E-02
-3.213790E-02
-3.867984E-02
-1.371693E-01
-4.194468E-02
-2.551557E-02
-4.767256E-02
--1.191569E-01
-3.416422E-02
--3.330294E-01
-3.474803E-02
--1.842925E-01
-4.126454E-02
--1.224990E-02
-1.230302E-02
-1.544261E-01
-8.671624E-03
--2.122959E-01
-6.350218E-02
--2.914181E-01
-3.809905E-02
-4.758922E+00
-4.591527E+00
--6.067377E-02
-6.804346E-03
-1.316435E-01
-1.476493E-02
-1.867152E-01
-1.538802E-02
--7.179389E-02
-3.473818E-03
-4.986417E-02
-4.841351E-03
-6.776718E-02
-8.811355E-03
--4.792045E-02
-9.184441E-03
--8.434738E-03
-3.853397E-03
-2.548586E-02
-7.203200E-04
-7.527437E-03
-2.037011E-03
--2.163081E-02
-4.158974E-03
--8.760026E-02
-5.772134E-03
--7.520795E-02
-4.970576E-03
--3.964671E-02
-1.497841E-03
-7.221753E-02
-5.863209E-03
-4.932819E-02
-2.532767E-03
--9.734545E-03
-1.795577E-03
--7.011235E-02
-2.210883E-03
-2.399198E-02
-4.136626E-03
--3.191172E-04
-1.877929E-03
--9.710977E-02
-5.285483E-03
--4.824457E-02
-3.483504E-03
-7.075225E-02
-3.161643E-03
--8.040602E-02
-5.499063E-03
--1.607824E-02
-4.903695E-03
-3.492398E-02
-5.092265E-03
--1.006502E-02
-3.910353E-03
-1.573863E-02
-6.305496E-03
--3.123873E-02
-3.823757E-03
--7.909433E-02
-1.715877E-03
--7.160670E-02
-1.015353E-02
--4.496969E-02
-1.852488E-03
-6.430477E-02
-1.306442E-03
--3.397473E-02
-9.427230E-03
--1.245838E-01
-4.976908E-03
-2.297418E+01
-1.067445E+02
-3.798346E-02
-3.290807E-01
-4.774316E-01
-1.652719E-01
-4.484246E-01
-1.838690E-01
--2.684741E-01
-1.314460E-01
-1.697264E-01
-1.010791E-01
-5.566969E-01
-1.619332E-01
--1.922269E-01
-1.622489E-01
--2.094814E-01
-6.127647E-02
-3.104826E-02
-6.793969E-02
-4.360087E-02
-4.949024E-02
--2.391312E-01
-9.061066E-02
--2.985719E-01
-5.766047E-02
--4.703235E-01
-1.110755E-01
--2.651010E-01
-7.292117E-02
-1.640899E-01
-7.843023E-02
-4.369130E-01
-7.815370E-02
-2.842619E-02
-3.428084E-02
--2.196648E-01
-4.603142E-02
--1.710839E-01
-1.096328E-01
--1.574989E-02
-2.927805E-02
--1.811474E-01
-8.048153E-02
--2.781610E-01
-1.252087E-01
-5.703734E-02
-4.910322E-02
--3.299004E-01
-1.018308E-01
--1.639460E-01
-1.231675E-01
-1.411391E-01
-8.293452E-02
-2.675276E-02
-7.910978E-02
--4.464321E-02
-1.158543E-01
--1.929947E-01
-9.887250E-02
--5.501938E-01
-9.398742E-02
--4.386734E-01
-1.054327E-01
--1.583625E-01
-9.952385E-03
-1.449942E-01
-7.975730E-03
--1.797342E-01
-1.517262E-01
--5.629679E-01
-8.574197E-02
+3.890713E+01
+3.046363E+02
+1.623579E-01
+4.602199E-02
+4.860074E-01
+5.999399E-01
+7.895692E-01
+2.803790E-01
+2.525526E-01
+8.261176E-02
+-9.103525E-02
+2.246700E-01
+4.583205E-01
+8.444556E-02
+1.246553E-01
+2.351010E-01
+-3.534581E-01
+1.247916E-01
+3.700473E-01
+5.215562E-02
+-1.831625E-01
+1.927381E-01
+1.540114E-01
+1.918221E-02
+-1.266458E-01
+1.455875E-01
+6.796869E-01
+3.911926E-01
+1.987931E-02
+4.966442E-02
+-4.443797E-01
+8.842717E-02
+-1.073855E-01
+4.912428E-02
+3.999416E-02
+4.440138E-02
+2.857919E-01
+6.935717E-02
+-4.174851E-01
+5.485570E-02
+-2.178958E-01
+8.052149E-02
+1.179644E-02
+6.709330E-02
+8.843286E-01
+2.749681E-01
+-2.935079E-01
+3.032897E-02
+-1.809434E-01
+1.902413E-01
+2.091991E-01
+1.061912E-01
+-7.137275E-02
+4.397656E-02
+-2.311558E-01
+4.680679E-02
+9.927573E-02
+1.844111E-01
+2.821437E-02
+7.293762E-02
+6.224251E-01
+1.028351E-01
+-4.136440E-01
+5.198207E-02
+-7.833133E-02
+1.192960E-02
+-1.041586E-01
+1.587417E-01
+-3.595677E-01
+3.086335E-01
+2.096284E-01
+7.881012E-02
+1.366220E+01
+3.758161E+01
+-1.461402E-02
+3.260482E-03
+8.325893E-02
+6.248769E-02
+2.785736E-01
+3.698417E-02
+1.932396E-03
+1.561742E-02
+-8.063397E-02
+3.598680E-02
+8.565555E-02
+5.344369E-03
+3.899905E-02
+2.422867E-02
+-1.215439E-01
+9.193858E-03
+1.982614E-01
+1.045860E-02
+-7.712629E-02
+2.199979E-02
+-3.626484E-02
+9.872078E-04
+-6.305159E-02
+1.645879E-02
+3.052155E-01
+5.620564E-02
+3.507115E-02
+1.056383E-02
+-1.297490E-02
+5.889958E-03
+-1.208752E-02
+7.323602E-03
+3.441007E-03
+1.841496E-02
+5.543442E-02
+1.186636E-02
+-8.000436E-02
+3.703835E-03
+-3.636792E-02
+1.490603E-02
+-8.753196E-02
+7.958027E-03
+2.066727E-01
+1.414130E-02
+-3.652482E-02
+8.380395E-04
+-1.652432E-01
+1.878732E-02
+1.375567E-01
+1.302400E-02
+3.692057E-03
+6.312506E-03
+-9.016211E-02
+6.699735E-03
+-5.875401E-02
+1.731945E-02
+3.960008E-02
+3.595906E-03
+1.653510E-01
+9.277293E-03
+-4.064973E-02
+2.794606E-03
+-1.729061E-02
+3.219772E-03
+-5.764808E-02
+1.861051E-02
+-5.970583E-02
+2.070164E-02
+6.739411E-02
+1.063341E-02
+6.561669E+01
+8.680729E+02
+7.938430E-01
+2.994198E-01
+9.278084E-01
+1.861899E+00
+1.432236E+00
+7.429647E-01
+7.460836E-02
+5.946808E-01
+-6.140731E-02
+3.175177E-01
+1.212677E+00
+5.125288E-01
+-1.952865E-02
+5.468421E-01
+-2.965796E-01
+1.123288E-01
+5.334195E-01
+1.589612E-01
+-6.340814E-01
+4.874650E-01
+4.264003E-02
+9.109571E-03
+-4.323424E-01
+3.370329E-01
+1.186876E+00
+9.854644E-01
+-2.420825E-01
+1.699455E-01
+-2.920627E-02
+6.816643E-02
+-2.684345E-01
+9.799236E-02
+-1.281596E-01
+3.092987E-01
+3.746150E-01
+1.242044E-01
+-1.035056E+00
+2.589772E-01
+2.005450E-01
+2.074622E-01
+-5.412719E-01
+3.193584E-01
+1.070173E+00
+3.266747E-01
+-2.657850E-01
+1.599950E-01
+-4.694853E-01
+2.738937E-01
+7.761977E-01
+2.561652E-01
+3.673179E-02
+9.486916E-02
+-3.309909E-01
+1.095243E-01
+1.623761E-01
+2.874582E-01
+-2.846296E-01
+2.430397E-01
+7.384842E-01
+2.556480E-01
+-3.577508E-01
+1.763210E-01
+-2.917525E-01
+1.875646E-01
+-1.634324E-01
+2.952144E-01
+-4.329582E-01
+3.418652E-01
+2.719362E-01
+2.278925E-01
+2.382728E+01
+1.170590E+02
+4.718326E-01
+1.961501E-01
+1.612551E-02
+2.815245E-02
+6.390587E-01
+1.902968E-01
+2.290989E-01
+3.758858E-02
+1.568179E-01
+1.509162E-01
+-2.363058E-01
+6.671396E-02
+-4.350800E-02
+1.031680E-01
+-2.956828E-01
+2.515141E-02
+-4.835878E-01
+8.614200E-02
+-5.365970E-02
+8.404087E-02
+-6.079969E-02
+3.684343E-02
+-1.313088E-02
+1.488843E-02
+2.603258E-02
+2.900625E-02
+1.249213E-01
+2.737277E-02
+4.491422E-01
+9.482600E-02
+-1.095589E-01
+3.711500E-02
+-2.248159E-01
+2.815827E-02
+-5.976009E-02
+5.887828E-03
+-6.097208E-02
+5.393315E-02
+3.449714E-02
+4.332442E-02
+-1.030757E-01
+2.839453E-02
+-4.399117E-01
+8.887569E-02
+4.564910E-01
+1.172398E-01
+-2.528382E-01
+1.217655E-01
+3.443316E-01
+4.275616E-02
+5.437008E-02
+2.355567E-02
+-5.505588E-02
+5.479129E-02
+-8.326640E-02
+3.095858E-02
+-1.888781E-01
+2.884542E-02
+1.981251E-01
+1.520694E-02
+-5.279866E-02
+1.020641E-01
+-1.465368E-01
+3.070686E-02
+-2.356940E-01
+7.899657E-02
+4.109278E-01
+5.291082E-02
+2.572510E-01
+3.420895E-02
+8.047875E+00
+1.334796E+01
+1.707535E-01
+3.290927E-02
+1.024687E-01
+1.308811E-02
+1.805451E-01
+1.696222E-02
+3.519587E-02
+7.546726E-03
+1.034933E-01
+2.224207E-02
+-1.580512E-01
+2.369625E-02
+4.302961E-02
+1.635623E-02
+-2.992903E-02
+5.190220E-03
+-2.130862E-01
+1.186351E-02
+-3.321696E-02
+7.972404E-03
+-4.992040E-02
+5.667098E-03
+1.261320E-02
+2.436872E-03
+-8.314024E-04
+5.360616E-03
+-6.318247E-02
+1.644558E-03
+1.373600E-01
+1.030707E-02
+1.511677E-03
+3.467685E-03
+-1.923485E-02
+8.106508E-04
+-1.180094E-01
+4.381376E-03
+2.798056E-02
+4.871288E-03
+-7.689499E-02
+7.079493E-03
+5.842586E-02
+1.380713E-03
+-9.946341E-02
+7.085062E-03
+8.061825E-02
+8.679468E-03
+-9.229524E-03
+9.187483E-03
+1.048310E-01
+3.506026E-03
+3.666209E-02
+3.259203E-03
+-1.190727E-01
+4.935341E-03
+-7.391655E-02
+2.805554E-03
+-2.029126E-02
+2.497736E-03
+2.787185E-02
+5.677987E-04
+-6.873108E-02
+1.287727E-02
+-5.262840E-02
+3.190440E-03
+-3.910911E-02
+8.661121E-03
+1.076197E-01
+5.456176E-03
+7.476066E-02
+2.693605E-03
+4.056568E+01
+3.389623E+02
+6.428633E-01
+6.128893E-01
+4.878518E-01
+2.130257E-01
+9.548044E-01
+4.556949E-01
+2.234940E-01
+1.006817E-01
+-1.080276E-01
+5.980158E-01
+-3.639229E-01
+3.120105E-01
+-3.237506E-01
+3.451548E-01
+1.143081E-01
+7.924550E-02
+-6.456733E-01
+2.424413E-01
+1.478136E-01
+1.458665E-01
+-2.134798E-02
+9.102875E-02
+3.633264E-01
+7.386463E-02
+2.213946E-01
+1.253249E-01
+-3.153847E-01
+1.094273E-01
+7.161113E-01
+2.275500E-01
+-2.461979E-01
+1.484452E-01
+-2.332886E-01
+9.715521E-02
+-7.029988E-02
+1.835254E-02
+1.982842E-01
+9.722998E-02
+-2.089693E-01
+2.271404E-01
+-7.316104E-02
+3.974665E-02
+-3.266640E-01
+8.054809E-02
+5.126088E-01
+3.234942E-01
+-3.048753E-01
+3.439501E-01
+4.872647E-01
+9.473730E-02
+1.590200E-01
+3.613462E-02
+-4.641787E-01
+1.671339E-01
+-1.391114E-01
+3.581561E-02
+-2.209343E-01
+1.489367E-02
+3.015665E-01
+4.265694E-02
+-1.334716E-01
+2.321929E-01
+-3.702914E-01
+1.699549E-01
+-8.891532E-02
+1.708595E-01
+6.123686E-01
+1.429184E-01
+5.891300E-01
+1.085467E-01
 tally 2:
-5.188799E+01
-5.402176E+02
--5.713505E-01
-4.615729E-01
--3.761827E-01
-5.750500E-01
-8.374325E-01
-1.862938E-01
--3.954940E-01
-2.347775E-01
--6.290233E-01
-1.864254E-01
--6.656201E-01
-2.124518E-01
-4.729571E-01
-6.739065E-01
-4.921338E-01
-1.907183E-01
--3.988992E-01
-3.761412E-01
--1.125861E-01
-3.659299E-01
--1.283461E-01
-5.045920E-02
-1.101261E-02
-1.391469E-01
-4.286921E-01
-2.097120E-01
-5.360702E-01
-1.809190E-01
-8.470757E-01
-2.461922E-01
--4.140592E-01
-2.702824E-01
--2.269391E-02
-5.000308E-03
--1.585595E-01
-3.527370E-02
--9.890128E-02
-1.067921E-01
-3.153468E-02
-1.483763E-01
-6.967922E-02
-7.789031E-02
-2.040956E-01
-4.637270E-02
--2.345641E-01
-3.574654E-01
--1.500187E-01
-1.514334E-01
--3.019192E-01
-1.334819E-01
-1.796739E-01
-7.106788E-02
--2.120506E-01
-1.144496E-01
--6.891611E-02
-7.257229E-02
--2.306514E-01
-7.048631E-02
-7.800814E-01
-2.467831E-01
-2.790547E-02
-5.494857E-02
--1.896182E-01
-5.971620E-02
-1.644354E-02
-1.059859E-01
--7.792754E-02
-2.085845E-02
--1.114682E-01
-1.227128E-01
-1.593914E+01
-5.169154E+01
-1.039804E+00
-5.028617E-01
--7.912437E-01
-5.548318E-01
-2.575930E-01
-1.148260E-01
--6.331302E-01
-2.556615E-01
--1.712129E-01
-7.877790E-02
--5.816921E-01
-1.456126E-01
-2.272958E-01
-8.788738E-02
-3.822477E-01
-6.244032E-02
--2.999416E-01
-8.461810E-02
--2.623060E-02
-1.458472E-02
-1.300437E-01
-4.478019E-02
--4.767351E-02
-7.362462E-02
-7.928962E-02
-4.510319E-02
-3.500548E-03
-4.881244E-02
--2.067837E-01
-8.186594E-02
--3.825304E-01
-1.082951E-01
--3.558676E-01
-5.708469E-02
-4.048126E-01
-9.076309E-02
-4.553585E-02
-2.926622E-02
--1.294373E-01
-1.870238E-02
--3.195745E-01
-5.918983E-02
--5.541420E-02
-6.185102E-02
-2.517910E-01
-1.252247E-01
--6.864842E-02
-8.483359E-02
--3.087092E-02
-1.682640E-02
--6.457777E-02
-2.980731E-02
--3.360246E-01
-3.729711E-02
--2.091466E-01
-1.119332E-01
--4.226988E-01
-5.973848E-02
--5.390062E-02
-1.424816E-01
--2.955041E-02
-7.118983E-03
-3.100944E-01
-5.584902E-02
--4.266659E-01
-4.397359E-02
--3.155083E-01
-7.428242E-02
-5.282933E-02
-2.010740E-02
-8.557014E+01
-1.465192E+03
--3.913589E-01
-5.368834E-01
--2.113693E+00
-2.169443E+00
-2.298156E-01
-6.330809E-01
-1.449786E-01
-2.666314E-01
--2.958820E-01
-2.750937E-01
-1.054389E+00
-5.351584E-01
-4.775640E-02
-2.044779E-01
-4.186858E-01
-8.940845E-01
--6.035852E-02
-3.754000E-01
--1.597608E+00
-5.815293E-01
-5.200807E-01
-3.829815E-01
-9.437855E-01
-7.241779E-01
--5.232235E-01
-1.966074E-01
-2.872008E-01
-1.241395E+00
--1.039246E+00
-6.158088E-01
-3.058638E-01
-1.593114E-01
--5.132144E-01
-4.577375E-01
-6.727602E-01
-4.119990E-01
-3.280880E-01
-4.971028E-01
-7.837744E-01
-2.444483E-01
-7.686392E-01
-3.456688E-01
--5.035943E-01
-1.631734E-01
-4.145045E-01
-3.177084E-01
--1.924638E-01
-3.336696E-01
--1.484767E-01
-9.030824E-02
--2.393846E-01
-6.598721E-02
--5.318081E-01
-2.895430E-01
-1.518564E-01
-3.818155E-01
-5.795851E-01
-9.003270E-02
-3.580512E-01
-8.821756E-02
-5.366649E-01
-2.497151E-01
--3.347132E-01
-1.352062E-01
-4.567995E-01
-1.561741E-01
--2.279100E-01
-2.122433E-01
-4.461881E-01
-2.325205E-01
-1.427596E+01
-4.078276E+01
-5.217165E-02
-2.453888E-02
-1.584690E-01
-3.106540E-01
-4.560315E-01
-4.277362E-01
--1.990373E-02
-5.277850E-02
-1.125203E-02
-6.443927E-02
-3.308696E-01
-1.037411E-01
--2.750414E-01
-3.814328E-02
--2.758789E-01
-1.449907E-01
--3.474494E-02
-1.886069E-02
--3.638818E-03
-1.651468E-01
--2.060159E-02
-3.031181E-02
-3.225892E-01
-7.944048E-02
--3.922626E-01
-5.950804E-02
--7.374795E-01
-1.624566E-01
--1.467806E-02
-1.234636E-01
-8.061252E-02
-4.356030E-02
--1.065107E-01
-1.431995E-02
--2.455689E-01
-4.182386E-02
--3.425697E-01
-1.088413E-01
--9.867791E-03
-4.864904E-02
--2.403769E-01
-2.231699E-02
-1.795461E-01
-2.969251E-02
--1.516375E-01
-2.951230E-02
--3.101470E-01
-7.377660E-02
-1.996325E-01
-1.846547E-02
-9.153483E-02
-2.867924E-02
-2.545349E-01
-4.621843E-02
-1.776575E-01
-1.075483E-01
--2.561501E-01
-4.947817E-02
--1.558585E-01
-1.467725E-02
--1.530184E-01
-5.532615E-02
--1.802320E-01
-1.603564E-02
-3.331892E-01
-3.315195E-02
--1.878592E-01
-3.588542E-02
--3.843863E-01
-1.011661E-01
-4.943558E+00
-5.054633E+00
-3.508923E-01
-5.360844E-02
-2.595623E-01
-3.819756E-02
--2.524359E-01
-4.825078E-02
--3.376117E-01
-4.115606E-02
-8.885054E-02
-3.685958E-02
-1.168333E-01
-5.916818E-02
--1.993698E-01
-5.632369E-02
-3.988948E-01
-4.366034E-02
-1.021403E-01
-4.690526E-03
--1.508432E-01
-2.173064E-02
--2.407920E-01
-2.510560E-02
--1.703993E-01
-2.599072E-02
-8.752998E-02
-3.657089E-02
--1.269869E-02
-2.565400E-02
-2.026727E-01
-1.804748E-02
--4.913307E-03
-4.059747E-02
--2.554771E-02
-7.959679E-03
--1.549008E-02
-3.658041E-02
--9.294647E-02
-2.754890E-03
-2.566876E-02
-4.951779E-03
--1.016212E-02
-2.777381E-02
-3.601396E-01
-3.828736E-02
--8.923373E-03
-3.126410E-03
-8.722969E-02
-1.182345E-02
--2.332024E-02
-5.685275E-03
-2.101415E-01
-1.224880E-02
--9.619916E-03
-9.042453E-03
--2.480871E-01
-2.222042E-02
-9.764734E-02
-4.847970E-03
--1.623487E-01
-1.814336E-02
-5.091875E-02
-1.290604E-02
-7.192058E-02
-1.343350E-02
--1.316640E-01
-3.514269E-02
--9.198972E-02
-1.244138E-02
--1.225056E-01
-3.035718E-02
-2.194332E+01
-9.737940E+01
--3.052407E-01
-4.072957E-01
-3.531168E-02
-2.019382E-01
-8.793928E-01
-4.041664E-01
--4.072462E-01
-6.027190E-02
--8.907772E-02
-1.952922E-01
-9.519375E-02
-9.821752E-02
-3.205302E-01
-2.075134E-01
-1.124955E-01
-6.446089E-02
--3.366117E-01
-8.184450E-02
--3.676127E-02
-3.861064E-02
-2.001007E-01
-6.507942E-02
--1.155787E-01
-4.761238E-02
--2.779628E-01
-3.425225E-02
-1.099627E-01
-5.462866E-02
--2.654341E-01
-1.868127E-02
-2.246854E-01
-3.157231E-02
--1.422513E-01
-5.939434E-02
--8.583155E-02
-5.668810E-02
-6.967936E-02
-1.924265E-02
--2.246405E-03
-1.576409E-02
-7.321307E-02
-2.061990E-02
--4.949248E-01
-1.278374E-01
-4.468760E-02
-3.814622E-02
--9.398135E-02
-1.772831E-02
--2.757022E-01
-1.349555E-01
-1.715161E-02
-5.040025E-02
--1.682974E-01
-7.558363E-02
--4.700401E-02
-2.700354E-02
-1.109855E-01
-2.666559E-02
-2.136115E-01
-7.786593E-02
--2.089667E-01
-1.489893E-02
--6.959959E-02
-7.545487E-02
--3.296680E-02
-1.604995E-02
--1.587440E-01
-5.482886E-02
--3.203027E-01
-3.421361E-02
+3.862543E+01
+2.993190E+02
+5.083613E-01
+2.933365E-01
+-4.356793E-01
+6.676831E-01
+6.093148E-01
+5.685331E-01
+2.512276E-01
+1.308652E-01
+1.075955E+00
+4.775270E-01
+3.660307E-01
+1.627691E-01
+-5.402149E-01
+2.324946E-01
+-3.887573E-01
+1.028105E-01
+-4.324152E-01
+1.015147E-01
+3.306993E-02
+8.425069E-02
+-2.127456E-01
+5.435453E-02
+2.977294E-01
+1.088039E-01
+1.055079E+00
+3.590635E-01
+-6.740592E-01
+2.606281E-01
+-3.329512E-01
+1.587428E-01
+-1.248691E-01
+1.659045E-01
+-2.306000E-01
+1.062057E-01
+9.127791E-02
+2.649459E-01
+-2.629881E-01
+4.786229E-02
+2.286813E-01
+2.363629E-02
+-6.338613E-01
+1.118828E-01
+7.466647E-01
+1.424535E-01
+-7.955161E-02
+1.003327E-02
+1.082691E-01
+2.727882E-02
+5.295185E-01
+1.335133E-01
+-6.321517E-01
+1.422916E-01
+-1.236137E-01
+2.041422E-01
+-5.389265E-02
+1.852888E-01
+-3.746082E-01
+5.580885E-02
+1.383528E-01
+2.754456E-01
+-5.081204E-01
+1.886515E-01
+-4.022264E-01
+1.417397E-01
+3.377771E-01
+6.673888E-02
+1.170109E-01
+1.783182E-02
+2.097916E-01
+7.139323E-02
+1.438678E+01
+4.193571E+01
+6.547124E-01
+1.780450E-01
+2.207489E-01
+2.115835E-01
+-4.952323E-02
+3.039341E-01
+6.681546E-01
+1.389250E-01
+4.078026E-02
+4.393667E-02
+-8.695509E-01
+2.850853E-01
+1.792062E-01
+7.367253E-02
+-5.657500E-01
+2.115125E-01
+8.525189E-02
+2.541971E-02
+5.227867E-02
+2.008468E-02
+-6.825349E-02
+5.316522E-02
+3.763076E-01
+7.112554E-02
+1.279973E-02
+1.883096E-01
+7.775189E-02
+6.874374E-02
+-1.119537E-01
+8.467755E-02
+-1.600632E-01
+8.650448E-02
+-6.210095E-01
+1.094309E-01
+-9.997484E-02
+3.935353E-02
+2.300525E-01
+2.351925E-02
+2.486103E-02
+3.125565E-02
+-1.289518E-02
+2.879251E-02
+-3.166559E-01
+2.931428E-02
+1.379285E-02
+2.416257E-02
+1.220552E-02
+5.154030E-02
+1.431676E-01
+3.434080E-02
+8.148581E-02
+4.218412E-02
+-8.541678E-03
+6.396306E-02
+-7.851012E-03
+5.799658E-02
+-2.435723E-01
+6.744263E-02
+-2.429877E-01
+6.966516E-02
+1.638644E-01
+2.058798E-02
+-8.986584E-03
+1.374824E-02
+-3.547454E-01
+7.765460E-02
+-1.570173E-01
+6.916960E-02
+1.056941E-02
+7.626528E-03
+6.400634E+01
+8.298077E+02
+3.894111E-01
+8.617494E-01
+1.796567E-01
+1.065356E+00
+1.561037E+00
+7.701475E-01
+-2.237530E-01
+2.259442E-01
+-1.109999E+00
+6.179412E-01
+1.636912E+00
+7.887441E-01
+-4.661183E-01
+4.191138E-01
+-1.040546E+00
+2.971961E-01
+-1.044850E-01
+1.493530E-01
+-4.991935E-01
+3.222404E-01
+4.205099E-01
+2.734911E-01
+-7.583139E-01
+3.000853E-01
+3.750811E-01
+1.348273E-01
+-6.355508E-01
+3.666139E-01
+-5.233787E-01
+1.292414E-01
+-2.869538E-02
+9.115092E-02
+-6.851052E-01
+3.061040E-01
+1.703522E-01
+7.300335E-02
+-4.541075E-01
+4.438507E-01
+-2.674857E-01
+4.718588E-01
+-3.022517E-02
+1.136781E-01
+5.755596E-01
+2.688162E-01
+-2.698373E-01
+1.403188E-01
+8.772347E-01
+3.503562E-01
+4.258508E-01
+1.400825E-01
+-1.384853E-01
+4.924947E-02
+1.009402E-01
+2.039230E-01
+-1.339732E-01
+4.772083E-02
+3.249636E-01
+4.339747E-01
+1.564400E-01
+2.703717E-01
+-2.536360E-01
+8.543919E-02
+-3.622063E-01
+7.442240E-02
+2.074953E-02
+1.355614E-01
+-3.909820E-02
+1.007999E-01
+-3.162815E-01
+9.656425E-02
+2.426423E+01
+1.215124E+02
+9.628829E-01
+3.563586E-01
+2.964625E-01
+9.739638E-02
+3.680881E-01
+3.484018E-01
+4.339143E-01
+7.590564E-02
+-4.633394E-02
+1.080030E-01
+3.091634E-01
+1.246585E-01
+-4.520500E-02
+1.095704E-01
+2.479383E-01
+1.138276E-01
+-6.457108E-02
+6.833667E-02
+-5.623363E-02
+1.087254E-01
+-3.675294E-01
+9.602246E-02
+-1.459951E-01
+9.440544E-02
+6.817672E-02
+4.978066E-02
+1.076782E-02
+1.697440E-01
+1.024501E-02
+1.184830E-01
+-1.654178E-01
+1.689209E-02
+1.006214E-01
+3.392546E-02
+5.070063E-01
+7.598100E-02
+-2.251704E-01
+7.867348E-02
+-1.693789E-01
+2.069974E-01
+2.790249E-01
+2.674643E-02
+3.888604E-01
+3.649330E-02
+-7.614452E-02
+7.098023E-02
+1.236282E-02
+5.476895E-02
+3.151637E-01
+3.543466E-02
+-6.363562E-01
+9.323507E-02
+-2.808153E-01
+8.537981E-02
+2.197639E-01
+3.393653E-02
+-8.660625E-02
+1.575544E-02
+3.733826E-02
+1.449783E-02
+-8.800903E-04
+3.993931E-02
+3.304886E-01
+3.099095E-02
+4.149186E-02
+5.375091E-02
+2.448819E-01
+9.225028E-02
+1.230091E-01
+3.865008E-02
+7.600812E+00
+1.199814E+01
+8.738539E-01
+3.078183E-01
+-2.592305E-01
+1.015952E-01
+6.391696E-02
+6.657129E-02
+-2.857855E-01
+2.216294E-02
+3.516811E-01
+3.429194E-02
+4.585144E-02
+6.204056E-02
+1.599494E-01
+1.684846E-02
+-2.364219E-01
+1.550644E-02
+-1.197289E-01
+8.631394E-02
+-1.364517E-01
+5.086560E-02
+2.213374E-01
+2.779096E-02
+-7.328761E-02
+1.216230E-02
+-2.476803E-01
+2.724500E-02
+-6.356296E-02
+2.513244E-02
+3.886281E-01
+9.479377E-02
+1.006972E-01
+1.352120E-02
+-6.932242E-02
+3.192705E-02
+-3.232505E-02
+5.592418E-02
+-9.582599E-02
+1.504811E-02
+-2.887999E-01
+3.760482E-02
+2.372013E-01
+1.868786E-02
+-1.655526E-01
+4.720116E-02
+-8.611265E-02
+2.284310E-02
+-2.142116E-01
+2.619080E-02
+1.811202E-01
+1.457105E-02
+1.430164E-01
+2.016598E-02
+4.066031E-01
+7.671356E-02
+1.364946E-01
+1.385677E-02
+-8.357667E-02
+1.521943E-02
+-2.235270E-02
+1.029570E-02
+7.920760E-02
+4.227880E-02
+2.622096E-01
+2.327728E-02
+7.787296E-03
+2.288300E-02
+-1.645219E-02
+5.394704E-02
+-7.274557E-02
+1.075570E-02
+4.104875E+01
+3.455300E+02
+9.827893E-01
+2.751051E-01
+3.227606E-01
+1.213711E-01
+1.272840E-02
+2.813639E-01
+-1.910394E-01
+5.682320E-02
+-4.136260E-01
+2.444497E-01
+-5.123352E-02
+3.867174E-01
+-4.424857E-02
+9.651204E-02
+-3.975443E-02
+1.867060E-01
+-7.618837E-01
+1.756891E-01
+4.259599E-01
+1.146646E-01
+-5.658031E-02
+1.366891E-01
+2.464931E-01
+2.181122E-01
+1.593998E-01
+2.666678E-01
+-1.928096E-01
+1.216164E-01
+7.020992E-01
+1.701086E-01
+3.914244E-01
+1.772217E-01
+-3.285697E-01
+1.521826E-01
+-2.947923E-02
+8.201284E-02
+1.346653E-01
+4.498340E-02
+2.112724E-01
+9.923303E-02
+8.551910E-02
+8.804286E-03
+-3.631005E-01
+1.168145E-01
+1.840770E-01
+5.714283E-02
+-2.709303E-02
+9.381338E-02
+2.104005E-02
+4.479215E-02
+4.059493E-01
+8.277066E-02
+-2.877400E-01
+8.584721E-02
+4.881128E-02
+1.864179E-01
+-8.584545E-02
+4.421744E-02
+-4.392466E-01
+6.260373E-02
+3.143214E-02
+8.184856E-02
+-5.630973E-01
+1.323469E-01
+8.010498E-02
+1.096975E-01
+1.818829E-01
+1.717701E-02
+1.062149E-01
+5.400365E-02
 tally 3:
-5.188799E+01
-5.402176E+02
--5.713505E-01
-4.615729E-01
--3.761827E-01
-5.750500E-01
-8.374325E-01
-1.862938E-01
--3.954940E-01
-2.347775E-01
--6.290233E-01
-1.864254E-01
--6.656201E-01
-2.124518E-01
-4.729571E-01
-6.739065E-01
-4.921338E-01
-1.907183E-01
--3.988992E-01
-3.761412E-01
--1.125861E-01
-3.659299E-01
--1.283461E-01
-5.045920E-02
-1.101261E-02
-1.391469E-01
-4.286921E-01
-2.097120E-01
-5.360702E-01
-1.809190E-01
-8.470757E-01
-2.461922E-01
--4.140592E-01
-2.702824E-01
--2.269391E-02
-5.000308E-03
--1.585595E-01
-3.527370E-02
--9.890128E-02
-1.067921E-01
-3.153468E-02
-1.483763E-01
-6.967922E-02
-7.789031E-02
-2.040956E-01
-4.637270E-02
--2.345641E-01
-3.574654E-01
--1.500187E-01
-1.514334E-01
--3.019192E-01
-1.334819E-01
-1.796739E-01
-7.106788E-02
--2.120506E-01
-1.144496E-01
--6.891611E-02
-7.257229E-02
--2.306514E-01
-7.048631E-02
-7.800814E-01
-2.467831E-01
-2.790547E-02
-5.494857E-02
--1.896182E-01
-5.971620E-02
-1.644354E-02
-1.059859E-01
--7.792754E-02
-2.085845E-02
--1.114682E-01
-1.227128E-01
-1.593914E+01
-5.169154E+01
-1.039804E+00
-5.028617E-01
--7.912437E-01
-5.548318E-01
-2.575930E-01
-1.148260E-01
--6.331302E-01
-2.556615E-01
--1.712129E-01
-7.877790E-02
--5.816921E-01
-1.456126E-01
-2.272958E-01
-8.788738E-02
-3.822477E-01
-6.244032E-02
--2.999416E-01
-8.461810E-02
--2.623060E-02
-1.458472E-02
-1.300437E-01
-4.478019E-02
--4.767351E-02
-7.362462E-02
-7.928962E-02
-4.510319E-02
-3.500548E-03
-4.881244E-02
--2.067837E-01
-8.186594E-02
--3.825304E-01
-1.082951E-01
--3.558676E-01
-5.708469E-02
-4.048126E-01
-9.076309E-02
-4.553585E-02
-2.926622E-02
--1.294373E-01
-1.870238E-02
--3.195745E-01
-5.918983E-02
--5.541420E-02
-6.185102E-02
-2.517910E-01
-1.252247E-01
--6.864842E-02
-8.483359E-02
--3.087092E-02
-1.682640E-02
--6.457777E-02
-2.980731E-02
--3.360246E-01
-3.729711E-02
--2.091466E-01
-1.119332E-01
--4.226988E-01
-5.973848E-02
--5.390062E-02
-1.424816E-01
--2.955041E-02
-7.118983E-03
-3.100944E-01
-5.584902E-02
--4.266659E-01
-4.397359E-02
--3.155083E-01
-7.428242E-02
-5.282933E-02
-2.010740E-02
-8.557014E+01
-1.465192E+03
--3.913589E-01
-5.368834E-01
--2.113693E+00
-2.169443E+00
-2.298156E-01
-6.330809E-01
-1.449786E-01
-2.666314E-01
--2.958820E-01
-2.750937E-01
-1.054389E+00
-5.351584E-01
-4.775640E-02
-2.044779E-01
-4.186858E-01
-8.940845E-01
--6.035852E-02
-3.754000E-01
--1.597608E+00
-5.815293E-01
-5.200807E-01
-3.829815E-01
-9.437855E-01
-7.241779E-01
--5.232235E-01
-1.966074E-01
-2.872008E-01
-1.241395E+00
--1.039246E+00
-6.158088E-01
-3.058638E-01
-1.593114E-01
--5.132144E-01
-4.577375E-01
-6.727602E-01
-4.119990E-01
-3.280880E-01
-4.971028E-01
-7.837744E-01
-2.444483E-01
-7.686392E-01
-3.456688E-01
--5.035943E-01
-1.631734E-01
-4.145045E-01
-3.177084E-01
--1.924638E-01
-3.336696E-01
--1.484767E-01
-9.030824E-02
--2.393846E-01
-6.598721E-02
--5.318081E-01
-2.895430E-01
-1.518564E-01
-3.818155E-01
-5.795851E-01
-9.003270E-02
-3.580512E-01
-8.821756E-02
-5.366649E-01
-2.497151E-01
--3.347132E-01
-1.352062E-01
-4.567995E-01
-1.561741E-01
--2.279100E-01
-2.122433E-01
-4.461881E-01
-2.325205E-01
-1.427596E+01
-4.078276E+01
-5.217165E-02
-2.453888E-02
-1.584690E-01
-3.106540E-01
-4.560315E-01
-4.277362E-01
--1.990373E-02
-5.277850E-02
-1.125203E-02
-6.443927E-02
-3.308696E-01
-1.037411E-01
--2.750414E-01
-3.814328E-02
--2.758789E-01
-1.449907E-01
--3.474494E-02
-1.886069E-02
--3.638818E-03
-1.651468E-01
--2.060159E-02
-3.031181E-02
-3.225892E-01
-7.944048E-02
--3.922626E-01
-5.950804E-02
--7.374795E-01
-1.624566E-01
--1.467806E-02
-1.234636E-01
-8.061252E-02
-4.356030E-02
--1.065107E-01
-1.431995E-02
--2.455689E-01
-4.182386E-02
--3.425697E-01
-1.088413E-01
--9.867791E-03
-4.864904E-02
--2.403769E-01
-2.231699E-02
-1.795461E-01
-2.969251E-02
--1.516375E-01
-2.951230E-02
--3.101470E-01
-7.377660E-02
-1.996325E-01
-1.846547E-02
-9.153483E-02
-2.867924E-02
-2.545349E-01
-4.621843E-02
-1.776575E-01
-1.075483E-01
--2.561501E-01
-4.947817E-02
--1.558585E-01
-1.467725E-02
--1.530184E-01
-5.532615E-02
--1.802320E-01
-1.603564E-02
-3.331892E-01
-3.315195E-02
--1.878592E-01
-3.588542E-02
--3.843863E-01
-1.011661E-01
-4.943558E+00
-5.054633E+00
-3.508923E-01
-5.360844E-02
-2.595623E-01
-3.819756E-02
--2.524359E-01
-4.825078E-02
--3.376117E-01
-4.115606E-02
-8.885054E-02
-3.685958E-02
-1.168333E-01
-5.916818E-02
--1.993698E-01
-5.632369E-02
-3.988948E-01
-4.366034E-02
-1.021403E-01
-4.690526E-03
--1.508432E-01
-2.173064E-02
--2.407920E-01
-2.510560E-02
--1.703993E-01
-2.599072E-02
-8.752998E-02
-3.657089E-02
--1.269869E-02
-2.565400E-02
-2.026727E-01
-1.804748E-02
--4.913307E-03
-4.059747E-02
--2.554771E-02
-7.959679E-03
--1.549008E-02
-3.658041E-02
--9.294647E-02
-2.754890E-03
-2.566876E-02
-4.951779E-03
--1.016212E-02
-2.777381E-02
-3.601396E-01
-3.828736E-02
--8.923373E-03
-3.126410E-03
-8.722969E-02
-1.182345E-02
--2.332024E-02
-5.685275E-03
-2.101415E-01
-1.224880E-02
--9.619916E-03
-9.042453E-03
--2.480871E-01
-2.222042E-02
-9.764734E-02
-4.847970E-03
--1.623487E-01
-1.814336E-02
-5.091875E-02
-1.290604E-02
-7.192058E-02
-1.343350E-02
--1.316640E-01
-3.514269E-02
--9.198972E-02
-1.244138E-02
--1.225056E-01
-3.035718E-02
-2.194332E+01
-9.737940E+01
--3.052407E-01
-4.072957E-01
-3.531168E-02
-2.019382E-01
-8.793928E-01
-4.041664E-01
--4.072462E-01
-6.027190E-02
--8.907772E-02
-1.952922E-01
-9.519375E-02
-9.821752E-02
-3.205302E-01
-2.075134E-01
-1.124955E-01
-6.446089E-02
--3.366117E-01
-8.184450E-02
--3.676127E-02
-3.861064E-02
-2.001007E-01
-6.507942E-02
--1.155787E-01
-4.761238E-02
--2.779628E-01
-3.425225E-02
-1.099627E-01
-5.462866E-02
--2.654341E-01
-1.868127E-02
-2.246854E-01
-3.157231E-02
--1.422513E-01
-5.939434E-02
--8.583155E-02
-5.668810E-02
-6.967936E-02
-1.924265E-02
--2.246405E-03
-1.576409E-02
-7.321307E-02
-2.061990E-02
--4.949248E-01
-1.278374E-01
-4.468760E-02
-3.814622E-02
--9.398135E-02
-1.772831E-02
--2.757022E-01
-1.349555E-01
-1.715161E-02
-5.040025E-02
--1.682974E-01
-7.558363E-02
--4.700401E-02
-2.700354E-02
-1.109855E-01
-2.666559E-02
-2.136115E-01
-7.786593E-02
--2.089667E-01
-1.489893E-02
--6.959959E-02
-7.545487E-02
--3.296680E-02
-1.604995E-02
--1.587440E-01
-5.482886E-02
--3.203027E-01
-3.421361E-02
+3.862543E+01
+2.993190E+02
+5.083613E-01
+2.933365E-01
+-4.356793E-01
+6.676831E-01
+6.093148E-01
+5.685331E-01
+2.512276E-01
+1.308652E-01
+1.075955E+00
+4.775270E-01
+3.660307E-01
+1.627691E-01
+-5.402149E-01
+2.324946E-01
+-3.887573E-01
+1.028105E-01
+-4.324152E-01
+1.015147E-01
+3.306993E-02
+8.425069E-02
+-2.127456E-01
+5.435453E-02
+2.977294E-01
+1.088039E-01
+1.055079E+00
+3.590635E-01
+-6.740592E-01
+2.606281E-01
+-3.329512E-01
+1.587428E-01
+-1.248691E-01
+1.659045E-01
+-2.306000E-01
+1.062057E-01
+9.127791E-02
+2.649459E-01
+-2.629881E-01
+4.786229E-02
+2.286813E-01
+2.363629E-02
+-6.338613E-01
+1.118828E-01
+7.466647E-01
+1.424535E-01
+-7.955161E-02
+1.003327E-02
+1.082691E-01
+2.727882E-02
+5.295185E-01
+1.335133E-01
+-6.321517E-01
+1.422916E-01
+-1.236137E-01
+2.041422E-01
+-5.389265E-02
+1.852888E-01
+-3.746082E-01
+5.580885E-02
+1.383528E-01
+2.754456E-01
+-5.081204E-01
+1.886515E-01
+-4.022264E-01
+1.417397E-01
+3.377771E-01
+6.673888E-02
+1.170109E-01
+1.783182E-02
+2.097916E-01
+7.139323E-02
+1.438678E+01
+4.193571E+01
+6.547124E-01
+1.780450E-01
+2.207489E-01
+2.115835E-01
+-4.952323E-02
+3.039341E-01
+6.681546E-01
+1.389250E-01
+4.078026E-02
+4.393667E-02
+-8.695509E-01
+2.850853E-01
+1.792062E-01
+7.367253E-02
+-5.657500E-01
+2.115125E-01
+8.525189E-02
+2.541971E-02
+5.227867E-02
+2.008468E-02
+-6.825349E-02
+5.316522E-02
+3.763076E-01
+7.112554E-02
+1.279973E-02
+1.883096E-01
+7.775189E-02
+6.874374E-02
+-1.119537E-01
+8.467755E-02
+-1.600632E-01
+8.650448E-02
+-6.210095E-01
+1.094309E-01
+-9.997484E-02
+3.935353E-02
+2.300525E-01
+2.351925E-02
+2.486103E-02
+3.125565E-02
+-1.289518E-02
+2.879251E-02
+-3.166559E-01
+2.931428E-02
+1.379285E-02
+2.416257E-02
+1.220552E-02
+5.154030E-02
+1.431676E-01
+3.434080E-02
+8.148581E-02
+4.218412E-02
+-8.541678E-03
+6.396306E-02
+-7.851012E-03
+5.799658E-02
+-2.435723E-01
+6.744263E-02
+-2.429877E-01
+6.966516E-02
+1.638644E-01
+2.058798E-02
+-8.986584E-03
+1.374824E-02
+-3.547454E-01
+7.765460E-02
+-1.570173E-01
+6.916960E-02
+1.056941E-02
+7.626528E-03
+6.400634E+01
+8.298077E+02
+3.894111E-01
+8.617494E-01
+1.796567E-01
+1.065356E+00
+1.561037E+00
+7.701475E-01
+-2.237530E-01
+2.259442E-01
+-1.109999E+00
+6.179412E-01
+1.636912E+00
+7.887441E-01
+-4.661183E-01
+4.191138E-01
+-1.040546E+00
+2.971961E-01
+-1.044850E-01
+1.493530E-01
+-4.991935E-01
+3.222404E-01
+4.205099E-01
+2.734911E-01
+-7.583139E-01
+3.000853E-01
+3.750811E-01
+1.348273E-01
+-6.355508E-01
+3.666139E-01
+-5.233787E-01
+1.292414E-01
+-2.869538E-02
+9.115092E-02
+-6.851052E-01
+3.061040E-01
+1.703522E-01
+7.300335E-02
+-4.541075E-01
+4.438507E-01
+-2.674857E-01
+4.718588E-01
+-3.022517E-02
+1.136781E-01
+5.755596E-01
+2.688162E-01
+-2.698373E-01
+1.403188E-01
+8.772347E-01
+3.503562E-01
+4.258508E-01
+1.400825E-01
+-1.384853E-01
+4.924947E-02
+1.009402E-01
+2.039230E-01
+-1.339732E-01
+4.772083E-02
+3.249636E-01
+4.339747E-01
+1.564400E-01
+2.703717E-01
+-2.536360E-01
+8.543919E-02
+-3.622063E-01
+7.442240E-02
+2.074953E-02
+1.355614E-01
+-3.909820E-02
+1.007999E-01
+-3.162815E-01
+9.656425E-02
+2.426423E+01
+1.215124E+02
+9.628829E-01
+3.563586E-01
+2.964625E-01
+9.739638E-02
+3.680881E-01
+3.484018E-01
+4.339143E-01
+7.590564E-02
+-4.633394E-02
+1.080030E-01
+3.091634E-01
+1.246585E-01
+-4.520500E-02
+1.095704E-01
+2.479383E-01
+1.138276E-01
+-6.457108E-02
+6.833667E-02
+-5.623363E-02
+1.087254E-01
+-3.675294E-01
+9.602246E-02
+-1.459951E-01
+9.440544E-02
+6.817672E-02
+4.978066E-02
+1.076782E-02
+1.697440E-01
+1.024501E-02
+1.184830E-01
+-1.654178E-01
+1.689209E-02
+1.006214E-01
+3.392546E-02
+5.070063E-01
+7.598100E-02
+-2.251704E-01
+7.867348E-02
+-1.693789E-01
+2.069974E-01
+2.790249E-01
+2.674643E-02
+3.888604E-01
+3.649330E-02
+-7.614452E-02
+7.098023E-02
+1.236282E-02
+5.476895E-02
+3.151637E-01
+3.543466E-02
+-6.363562E-01
+9.323507E-02
+-2.808153E-01
+8.537981E-02
+2.197639E-01
+3.393653E-02
+-8.660625E-02
+1.575544E-02
+3.733826E-02
+1.449783E-02
+-8.800903E-04
+3.993931E-02
+3.304886E-01
+3.099095E-02
+4.149186E-02
+5.375091E-02
+2.448819E-01
+9.225028E-02
+1.230091E-01
+3.865008E-02
+7.600812E+00
+1.199814E+01
+8.738539E-01
+3.078183E-01
+-2.592305E-01
+1.015952E-01
+6.391696E-02
+6.657129E-02
+-2.857855E-01
+2.216294E-02
+3.516811E-01
+3.429194E-02
+4.585144E-02
+6.204056E-02
+1.599494E-01
+1.684846E-02
+-2.364219E-01
+1.550644E-02
+-1.197289E-01
+8.631394E-02
+-1.364517E-01
+5.086560E-02
+2.213374E-01
+2.779096E-02
+-7.328761E-02
+1.216230E-02
+-2.476803E-01
+2.724500E-02
+-6.356296E-02
+2.513244E-02
+3.886281E-01
+9.479377E-02
+1.006972E-01
+1.352120E-02
+-6.932242E-02
+3.192705E-02
+-3.232505E-02
+5.592418E-02
+-9.582599E-02
+1.504811E-02
+-2.887999E-01
+3.760482E-02
+2.372013E-01
+1.868786E-02
+-1.655526E-01
+4.720116E-02
+-8.611265E-02
+2.284310E-02
+-2.142116E-01
+2.619080E-02
+1.811202E-01
+1.457105E-02
+1.430164E-01
+2.016598E-02
+4.066031E-01
+7.671356E-02
+1.364946E-01
+1.385677E-02
+-8.357667E-02
+1.521943E-02
+-2.235270E-02
+1.029570E-02
+7.920760E-02
+4.227880E-02
+2.622096E-01
+2.327728E-02
+7.787296E-03
+2.288300E-02
+-1.645219E-02
+5.394704E-02
+-7.274557E-02
+1.075570E-02
+4.104875E+01
+3.455300E+02
+9.827893E-01
+2.751051E-01
+3.227606E-01
+1.213711E-01
+1.272840E-02
+2.813639E-01
+-1.910394E-01
+5.682320E-02
+-4.136260E-01
+2.444497E-01
+-5.123352E-02
+3.867174E-01
+-4.424857E-02
+9.651204E-02
+-3.975443E-02
+1.867060E-01
+-7.618837E-01
+1.756891E-01
+4.259599E-01
+1.146646E-01
+-5.658031E-02
+1.366891E-01
+2.464931E-01
+2.181122E-01
+1.593998E-01
+2.666678E-01
+-1.928096E-01
+1.216164E-01
+7.020992E-01
+1.701086E-01
+3.914244E-01
+1.772217E-01
+-3.285697E-01
+1.521826E-01
+-2.947923E-02
+8.201284E-02
+1.346653E-01
+4.498340E-02
+2.112724E-01
+9.923303E-02
+8.551910E-02
+8.804286E-03
+-3.631005E-01
+1.168145E-01
+1.840770E-01
+5.714283E-02
+-2.709303E-02
+9.381338E-02
+2.104005E-02
+4.479215E-02
+4.059493E-01
+8.277066E-02
+-2.877400E-01
+8.584721E-02
+4.881128E-02
+1.864179E-01
+-8.584545E-02
+4.421744E-02
+-4.392466E-01
+6.260373E-02
+3.143214E-02
+8.184856E-02
+-5.630973E-01
+1.323469E-01
+8.010498E-02
+1.096975E-01
+1.818829E-01
+1.717701E-02
+1.062149E-01
+5.400365E-02
diff --git a/tests/test_score_kappafission/inputs_true.dat b/tests/test_score_kappafission/inputs_true.dat
index 67b1e38750..86939274b8 100644
--- a/tests/test_score_kappafission/inputs_true.dat
+++ b/tests/test_score_kappafission/inputs_true.dat
@@ -1 +1 @@
-46d1dbf99a14e08eddf34721d2380bf7969b8d299c48a64cfae22dfde29e3b8eab227d663f3ecb234dac2712b5971af2735fd69301b7614c7adae6c3da795e51
\ No newline at end of file
+8dd415b571ad51a62f2394d149f6c417d63babd4e85a1ff6f1cac267c4f4bcd0642ba0b24da39ff926bee4aea7dbbe0371face03d2009d8d74e7ac31c7c45000
\ No newline at end of file
diff --git a/tests/test_score_kappafission/results_true.dat b/tests/test_score_kappafission/results_true.dat
index 23c12eed20..75d37cd87e 100644
--- a/tests/test_score_kappafission/results_true.dat
+++ b/tests/test_score_kappafission/results_true.dat
@@ -1,29 +1,29 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-3.057169E+02
-1.886844E+04
+2.266048E+02
+1.049833E+04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.017044E+01
-1.049216E+03
+1.366139E+02
+3.859561E+03
 tally 2:
-2.992056E+02
-1.852593E+04
+2.402814E+02
+1.174003E+04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.782271E+01
-1.267469E+03
+1.270420E+02
+3.297537E+03
 tally 3:
-2.933944E+02
-1.740955E+04
+2.217075E+02
+1.003168E+04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.679811E+01
-1.191597E+03
+1.375693E+02
+3.872389E+03
diff --git a/tests/test_score_nufission/inputs_true.dat b/tests/test_score_nufission/inputs_true.dat
index dbf21a50b3..4e6018f99c 100644
--- a/tests/test_score_nufission/inputs_true.dat
+++ b/tests/test_score_nufission/inputs_true.dat
@@ -1 +1 @@
-8500d149868598a30fc818a34fe0465cf926b79632a8a7a1f96799cc955f30544b2cec131878bbded295179a2fc103657c2ecdb8c28ea10b84b7f6f0091fac7a
\ No newline at end of file
+0e60125f41bbc362703886097b2bc7297ff0aae6365d4653771b86b1aab2de43a924d81b3d73afb781733b2919f30089373f74da4a96f94f988eb04ddf482e85
\ No newline at end of file
diff --git a/tests/test_score_nufission/results_true.dat b/tests/test_score_nufission/results_true.dat
index 046c5b289e..31c6abe9d5 100644
--- a/tests/test_score_nufission/results_true.dat
+++ b/tests/test_score_nufission/results_true.dat
@@ -1,29 +1,29 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-4.110726E+00
-3.411205E+00
+3.041781E+00
+1.891714E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.429333E-01
-1.889683E-01
+1.835166E+00
+6.963265E-01
 tally 2:
-4.104411E+00
-3.453290E+00
+3.341227E+00
+2.322075E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.034371E+00
-2.220105E-01
+1.862652E+00
+7.112121E-01
 tally 3:
-3.947006E+00
-3.149452E+00
+2.975121E+00
+1.806644E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.031768E+00
-2.152452E-01
+1.846861E+00
+6.985413E-01
diff --git a/tests/test_score_nuscatter/inputs_true.dat b/tests/test_score_nuscatter/inputs_true.dat
index 889941afce..440db11243 100644
--- a/tests/test_score_nuscatter/inputs_true.dat
+++ b/tests/test_score_nuscatter/inputs_true.dat
@@ -1 +1 @@
-41644968ea3a500af029e799ceef40c270d26944e0e7426afe1b8b2e15743b79c8b2989ecaaa0dac958046a89a49dab9d592cc7a4e059cd1f917b62219a8ed31
\ No newline at end of file
+5d0e915af1f424b8ca9d3723fecc2e0e0c558bcbe70b5ad45bcc8e03caf9b4caae9ed593010ce31c6dfe09be06a6dc3929b839999132917569f2ed93c3b70455
\ No newline at end of file
diff --git a/tests/test_score_nuscatter/results_true.dat b/tests/test_score_nuscatter/results_true.dat
index 675509932e..6e9935f218 100644
--- a/tests/test_score_nuscatter/results_true.dat
+++ b/tests/test_score_nuscatter/results_true.dat
@@ -1,11 +1,11 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-1.940000E+01
-7.561780E+01
-4.340000E+00
-3.813000E+00
-6.440000E+01
-8.302674E+02
+1.485000E+01
+4.439790E+01
+4.120000E+00
+3.438000E+00
+5.173000E+01
+5.467243E+02
diff --git a/tests/test_score_nuscatter_n/inputs_true.dat b/tests/test_score_nuscatter_n/inputs_true.dat
index 228c224001..a907148a7c 100644
--- a/tests/test_score_nuscatter_n/inputs_true.dat
+++ b/tests/test_score_nuscatter_n/inputs_true.dat
@@ -1 +1 @@
-c8072b4ce735db4cc196a688f2d253e5683d5ef7b7a254ceab4d689d3902bb4fd7223ad824d002f3abf7e0fe7fbd80ab6c0273c8972df1ec26ff69cbd26c13ee
\ No newline at end of file
+3db6a6067fb07ed0e213c1e293f32a23ab64fbfb45a7a69320e8326ae76e5a3020c2f73986e7a93eeee1dde1422d84081ff18f0a9770aaba94423586bd134721
\ No newline at end of file
diff --git a/tests/test_score_nuscatter_n/results_true.dat b/tests/test_score_nuscatter_n/results_true.dat
index cdcbcfb524..96e56bd6ab 100644
--- a/tests/test_score_nuscatter_n/results_true.dat
+++ b/tests/test_score_nuscatter_n/results_true.dat
@@ -1,33 +1,33 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-1.940000E+01
-7.561780E+01
-2.629221E+00
-1.399188E+00
-1.567944E+00
-5.124385E-01
-6.926532E-01
-1.577035E-01
-6.111349E-01
-1.006724E-01
-4.340000E+00
-3.813000E+00
-6.633546E-01
-9.836364E-02
-3.707954E-01
-3.694050E-02
--4.267991E-02
-1.870638E-03
-5.239484E-02
-1.032955E-02
-6.440000E+01
-8.302674E+02
-3.312945E+01
-2.197504E+02
-1.239256E+01
-3.104303E+01
-7.813162E-01
-2.790254E-01
--1.320978E+00
-4.696586E-01
+1.485000E+01
+4.439790E+01
+1.259515E+00
+3.360064E-01
+7.983154E-01
+1.355632E-01
+3.425460E-01
+2.971972E-02
+2.949225E-01
+3.975603E-02
+4.120000E+00
+3.438000E+00
+6.222571E-01
+8.335984E-02
+1.670136E-01
+1.374768E-02
+-5.819374E-02
+1.091808E-02
+-6.389550E-02
+5.688533E-03
+5.173000E+01
+5.467243E+02
+2.669403E+01
+1.451361E+02
+9.691140E+00
+1.933574E+01
+5.860769E-01
+2.122377E-01
+-1.190340E+00
+3.145785E-01
diff --git a/tests/test_score_nuscatter_pn/inputs_true.dat b/tests/test_score_nuscatter_pn/inputs_true.dat
index f04187297d..eb2962dc34 100644
--- a/tests/test_score_nuscatter_pn/inputs_true.dat
+++ b/tests/test_score_nuscatter_pn/inputs_true.dat
@@ -1 +1 @@
-dbe91c112a02bf9c1098c2ba93c737bfd048f356d00dab280a245c572821d345a9d4c2cfa766f8b83c42362d9b8dbbb3d5ce240b6e749541aac3cae567b715c4
\ No newline at end of file
+5cd39eacee3efe8d7a8db38edb741d8f773a0b42276dab8635d36e7fc9809617d9ad47510be06bc019472e1b792bc678d88fcbb26ca4ed07504a222388ee230c
\ No newline at end of file
diff --git a/tests/test_score_nuscatter_pn/results_true.dat b/tests/test_score_nuscatter_pn/results_true.dat
index 81d1d1ad73..753216a8b7 100644
--- a/tests/test_score_nuscatter_pn/results_true.dat
+++ b/tests/test_score_nuscatter_pn/results_true.dat
@@ -1,24 +1,24 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-1.940000E+01
-7.561780E+01
-2.629221E+00
-1.399188E+00
-1.567944E+00
-5.124385E-01
-6.926532E-01
-1.577035E-01
-6.111349E-01
-1.006724E-01
+1.485000E+01
+4.439790E+01
+1.259515E+00
+3.360064E-01
+7.983154E-01
+1.355632E-01
+3.425460E-01
+2.971972E-02
+2.949225E-01
+3.975603E-02
 tally 2:
-1.940000E+01
-7.561780E+01
-2.629221E+00
-1.399188E+00
-1.567944E+00
-5.124385E-01
-6.926532E-01
-1.577035E-01
-6.111349E-01
-1.006724E-01
+1.485000E+01
+4.439790E+01
+1.259515E+00
+3.360064E-01
+7.983154E-01
+1.355632E-01
+3.425460E-01
+2.971972E-02
+2.949225E-01
+3.975603E-02
diff --git a/tests/test_score_nuscatter_yn/inputs_true.dat b/tests/test_score_nuscatter_yn/inputs_true.dat
index 2a0fde3095..510c6f04d9 100644
--- a/tests/test_score_nuscatter_yn/inputs_true.dat
+++ b/tests/test_score_nuscatter_yn/inputs_true.dat
@@ -1 +1 @@
-31e4d35c4845eaa7d3ec4b021f820a4526b0d8a43fdd69288c1c94551a895c05bbd10cfe72b54dafc9abe31ed56ef06a6fb3de77088e4c2da25b547fc06ac74d
\ No newline at end of file
+4bce40c1119ba7ac23c12b0fcf79fbf9b6dfb89ce2921f5f3906cb8683b79355bd9ba208c80f736f03ea18dccf3449a4ddaedb72ebb10b27301e843c31822f58
\ No newline at end of file
diff --git a/tests/test_score_nuscatter_yn/results_true.dat b/tests/test_score_nuscatter_yn/results_true.dat
index fde6f07ec4..d1b165274d 100644
--- a/tests/test_score_nuscatter_yn/results_true.dat
+++ b/tests/test_score_nuscatter_yn/results_true.dat
@@ -1,38 +1,38 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-1.940000E+01
-7.561780E+01
+1.485000E+01
+4.439790E+01
 tally 2:
-1.940000E+01
-7.561780E+01
--8.464573E-02
-1.823218E-02
--1.116469E-01
-3.380141E-02
--2.130479E-03
-1.022241E-02
--4.896859E-02
-1.074348E-02
--1.482536E-01
-1.114316E-02
--6.827566E-02
-4.248457E-03
-1.494503E-01
-2.605186E-02
-2.010847E-01
-1.699034E-02
-4.535125E-02
-2.658493E-03
--4.135950E-02
-4.170544E-03
-1.277006E-01
-6.276355E-03
-4.192667E-02
-4.955945E-03
--9.607170E-02
-3.280003E-03
-1.533637E-01
-7.107300E-03
-3.570929E-02
-4.795032E-03
+1.485000E+01
+4.439790E+01
+8.440076E-02
+1.135203E-02
+8.198663E-02
+3.887429E-02
+1.358080E-01
+2.890416E-02
+-3.544823E-02
+9.843339E-04
+1.542072E-01
+8.228126E-03
+1.057111E-01
+3.758100E-03
+1.647870E-02
+4.827841E-03
+1.378297E-01
+1.566876E-02
+-4.676778E-02
+4.809366E-03
+1.966204E-02
+7.447981E-04
+-1.889258E-02
+6.841953E-04
+1.337703E-02
+1.250077E-03
+1.044684E-01
+6.969498E-03
+-1.177995E-02
+8.208715E-03
+1.940058E-04
+5.128759E-03
diff --git a/tests/test_score_scatter/inputs_true.dat b/tests/test_score_scatter/inputs_true.dat
index c5f1c1f17a..d7a6f4719a 100644
--- a/tests/test_score_scatter/inputs_true.dat
+++ b/tests/test_score_scatter/inputs_true.dat
@@ -1 +1 @@
-c07fa98f19d66732be7bd394b30b6e2d18d54a9fec2ae729e9d00adb55d9c00533bacb2d3fe4eee7f41e6e0b6841e82ff313bc593bf3b7932bd8d026dc81a58d
\ No newline at end of file
+8b5e7c3825ef033d12c0574595b16559981ed3dd0ced8609c461cd0e81f1f2ef28195e0a6f6886fcbae64185dfe96001fa12d3d472f6446a3135d3bd6ef83394
\ No newline at end of file
diff --git a/tests/test_score_scatter/results_true.dat b/tests/test_score_scatter/results_true.dat
index 50782e4167..8d3e0fdc03 100644
--- a/tests/test_score_scatter/results_true.dat
+++ b/tests/test_score_scatter/results_true.dat
@@ -1,29 +1,29 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-1.907306E+01
-7.310892E+01
-4.678711E+00
-4.406892E+00
-6.487881E+01
-8.433246E+02
+1.514235E+01
+4.620490E+01
+3.839050E+00
+2.975620E+00
+5.317903E+01
+5.754103E+02
 tally 2:
 0.000000E+00
 0.000000E+00
-1.940000E+01
-7.561780E+01
-4.340000E+00
-3.813000E+00
-6.440000E+01
-8.302674E+02
+1.485000E+01
+4.439790E+01
+4.120000E+00
+3.438000E+00
+5.173000E+01
+5.467243E+02
 tally 3:
 0.000000E+00
 0.000000E+00
-1.952859E+01
-7.659866E+01
-4.328145E+00
-3.794232E+00
-6.439437E+01
-8.300759E+02
+1.496769E+01
+4.502714E+01
+4.117144E+00
+3.431861E+00
+5.174677E+01
+5.469474E+02
diff --git a/tests/test_score_scatter_n/inputs_true.dat b/tests/test_score_scatter_n/inputs_true.dat
index 37dc7074f0..68febf4bc5 100644
--- a/tests/test_score_scatter_n/inputs_true.dat
+++ b/tests/test_score_scatter_n/inputs_true.dat
@@ -1 +1 @@
-5a6ec0557a68deb5334e0689575531328bad6964f48409ef70343266e88a5c691099486813c69c3c4c0e6154e23342d228f924606b664ae7c4cdd24818626797
\ No newline at end of file
+414d0faeba75d27e4785faa9812f5eac6aa108e7fd3c1388d51ae8e0d7fddd25e9f61e51afdaa70874a32e1c3d2815d82b5c79636b1ccb0d6767144fcf6f813a
\ No newline at end of file
diff --git a/tests/test_score_scatter_n/results_true.dat b/tests/test_score_scatter_n/results_true.dat
index cdcbcfb524..96e56bd6ab 100644
--- a/tests/test_score_scatter_n/results_true.dat
+++ b/tests/test_score_scatter_n/results_true.dat
@@ -1,33 +1,33 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-1.940000E+01
-7.561780E+01
-2.629221E+00
-1.399188E+00
-1.567944E+00
-5.124385E-01
-6.926532E-01
-1.577035E-01
-6.111349E-01
-1.006724E-01
-4.340000E+00
-3.813000E+00
-6.633546E-01
-9.836364E-02
-3.707954E-01
-3.694050E-02
--4.267991E-02
-1.870638E-03
-5.239484E-02
-1.032955E-02
-6.440000E+01
-8.302674E+02
-3.312945E+01
-2.197504E+02
-1.239256E+01
-3.104303E+01
-7.813162E-01
-2.790254E-01
--1.320978E+00
-4.696586E-01
+1.485000E+01
+4.439790E+01
+1.259515E+00
+3.360064E-01
+7.983154E-01
+1.355632E-01
+3.425460E-01
+2.971972E-02
+2.949225E-01
+3.975603E-02
+4.120000E+00
+3.438000E+00
+6.222571E-01
+8.335984E-02
+1.670136E-01
+1.374768E-02
+-5.819374E-02
+1.091808E-02
+-6.389550E-02
+5.688533E-03
+5.173000E+01
+5.467243E+02
+2.669403E+01
+1.451361E+02
+9.691140E+00
+1.933574E+01
+5.860769E-01
+2.122377E-01
+-1.190340E+00
+3.145785E-01
diff --git a/tests/test_score_scatter_pn/inputs_true.dat b/tests/test_score_scatter_pn/inputs_true.dat
index 06dab53407..53b1d21608 100644
--- a/tests/test_score_scatter_pn/inputs_true.dat
+++ b/tests/test_score_scatter_pn/inputs_true.dat
@@ -1 +1 @@
-112ae1a84c81f58885583b463f576bf1d9b5f5cbb0f5dfb36147ab30be2ef0d7506cfee053b54c26baad1b233d5d97cd1698c2af909682275e0b8fd79dd8f43c
\ No newline at end of file
+f83e5a272e78dba7a4b3412aa264300efbeae641de0bbcae3febe7ba5fa6668dbf9364fdc7f1c431ab9c58aaf019ae41d98ee69d4dd035d6b5e0188e7d181b20
\ No newline at end of file
diff --git a/tests/test_score_scatter_pn/results_true.dat b/tests/test_score_scatter_pn/results_true.dat
index 81d1d1ad73..753216a8b7 100644
--- a/tests/test_score_scatter_pn/results_true.dat
+++ b/tests/test_score_scatter_pn/results_true.dat
@@ -1,24 +1,24 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-1.940000E+01
-7.561780E+01
-2.629221E+00
-1.399188E+00
-1.567944E+00
-5.124385E-01
-6.926532E-01
-1.577035E-01
-6.111349E-01
-1.006724E-01
+1.485000E+01
+4.439790E+01
+1.259515E+00
+3.360064E-01
+7.983154E-01
+1.355632E-01
+3.425460E-01
+2.971972E-02
+2.949225E-01
+3.975603E-02
 tally 2:
-1.940000E+01
-7.561780E+01
-2.629221E+00
-1.399188E+00
-1.567944E+00
-5.124385E-01
-6.926532E-01
-1.577035E-01
-6.111349E-01
-1.006724E-01
+1.485000E+01
+4.439790E+01
+1.259515E+00
+3.360064E-01
+7.983154E-01
+1.355632E-01
+3.425460E-01
+2.971972E-02
+2.949225E-01
+3.975603E-02
diff --git a/tests/test_score_scatter_yn/inputs_true.dat b/tests/test_score_scatter_yn/inputs_true.dat
index c7c1c822af..6e5210212e 100644
--- a/tests/test_score_scatter_yn/inputs_true.dat
+++ b/tests/test_score_scatter_yn/inputs_true.dat
@@ -1 +1 @@
-ad59269de656ab6ea87cf55f1ecb8cd60f4bb652b881bc9f3f705fd17714fee4cdbb105b99d9b50e5d39375f89d37437888d432f53457cd5d61e1956b81e2097
\ No newline at end of file
+c90d836355fcbe14112c16f8743b9180371400c022b19f693881d91924788555ed1507a1936b4d241a63564a7661f380c5d0568d398fa8a20a25f41c5b7c4fb8
\ No newline at end of file
diff --git a/tests/test_score_scatter_yn/results_true.dat b/tests/test_score_scatter_yn/results_true.dat
index 3e22703ad7..20b7672eb5 100644
--- a/tests/test_score_scatter_yn/results_true.dat
+++ b/tests/test_score_scatter_yn/results_true.dat
@@ -1,56 +1,56 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
-1.940000E+01
-7.561780E+01
+1.485000E+01
+4.439790E+01
 tally 2:
-1.940000E+01
-7.561780E+01
--8.464573E-02
-1.823218E-02
--1.116469E-01
-3.380141E-02
--2.130479E-03
-1.022241E-02
--4.896859E-02
-1.074348E-02
--1.482536E-01
-1.114316E-02
--6.827566E-02
-4.248457E-03
-1.494503E-01
-2.605186E-02
-2.010847E-01
-1.699034E-02
-4.535125E-02
-2.658493E-03
--4.135950E-02
-4.170544E-03
-1.277006E-01
-6.276355E-03
-4.192667E-02
-4.955945E-03
--9.607170E-02
-3.280003E-03
-1.533637E-01
-7.107300E-03
-3.570929E-02
-4.795032E-03
--1.183812E-01
-3.369458E-03
--1.555883E-02
-9.917545E-04
--9.288972E-02
-2.083169E-03
--1.698033E-02
-1.027209E-03
-7.433184E-03
-5.046022E-04
-9.078711E-02
-2.020877E-03
--7.502769E-02
-2.431965E-03
--3.565718E-02
-5.978599E-03
--7.076433E-02
-2.138810E-03
+1.485000E+01
+4.439790E+01
+8.440076E-02
+1.135203E-02
+8.198663E-02
+3.887429E-02
+1.358080E-01
+2.890416E-02
+-3.544823E-02
+9.843339E-04
+1.542072E-01
+8.228126E-03
+1.057111E-01
+3.758100E-03
+1.647870E-02
+4.827841E-03
+1.378297E-01
+1.566876E-02
+-4.676778E-02
+4.809366E-03
+1.966204E-02
+7.447981E-04
+-1.889258E-02
+6.841953E-04
+1.337703E-02
+1.250077E-03
+1.044684E-01
+6.969498E-03
+-1.177995E-02
+8.208715E-03
+1.940058E-04
+5.128759E-03
+-2.165868E-02
+1.335569E-03
+3.080886E-02
+4.544434E-04
+1.039856E-03
+1.209631E-03
+1.317068E-02
+1.469722E-03
+-6.432758E-02
+2.106736E-03
+-3.323023E-02
+4.513838E-03
+2.683700E-02
+1.146747E-03
+3.494912E-02
+1.006153E-03
+6.289525E-02
+3.700145E-03
diff --git a/tests/test_score_total/inputs_true.dat b/tests/test_score_total/inputs_true.dat
index 114ec33e14..975588a1ac 100644
--- a/tests/test_score_total/inputs_true.dat
+++ b/tests/test_score_total/inputs_true.dat
@@ -1 +1 @@
-1ba17d4cef859221f314a0e7576a762260effe8f1977c9c6c74a80007d80b92d8d0fffadf39dde5e054809f3bf63529930428f79c6c4008d53e8be7644cd538a
\ No newline at end of file
+90633c6010148c10c363ed3b2e9de3213468c51dea6153dff4bb18eadc579041d967e4835023d10b6d8c42fe81017238d119f24cae754d0621698547464b16f3
\ No newline at end of file
diff --git a/tests/test_score_total/results_true.dat b/tests/test_score_total/results_true.dat
index a51e32b159..9b8a06f807 100644
--- a/tests/test_score_total/results_true.dat
+++ b/tests/test_score_total/results_true.dat
@@ -1,29 +1,29 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-2.240915E+01
-1.009032E+02
-4.711189E+00
-4.469059E+00
-6.533718E+01
-8.552989E+02
+1.767552E+01
+6.295417E+01
+3.863588E+00
+3.013300E+00
+5.356594E+01
+5.839391E+02
 tally 2:
 0.000000E+00
 0.000000E+00
-2.278000E+01
-1.042404E+02
-4.350000E+00
-3.833900E+00
-6.484000E+01
-8.416314E+02
+1.739000E+01
+6.083290E+01
+4.160000E+00
+3.501000E+00
+5.213000E+01
+5.552351E+02
 tally 3:
 0.000000E+00
 0.000000E+00
-2.278000E+01
-1.042404E+02
-4.350000E+00
-3.833900E+00
-6.484000E+01
-8.416314E+02
+1.739000E+01
+6.083290E+01
+4.160000E+00
+3.501000E+00
+5.213000E+01
+5.552351E+02
diff --git a/tests/test_score_total_yn/inputs_true.dat b/tests/test_score_total_yn/inputs_true.dat
index 471cadfb20..133138775d 100644
--- a/tests/test_score_total_yn/inputs_true.dat
+++ b/tests/test_score_total_yn/inputs_true.dat
@@ -1 +1 @@
-8967621db0c045e1c12b181eb825b0528bf1f8ef03d5d5e036e14f5151d4bcec36c56b1ec2faba66254d09a29795f9ed44599762e7dfd506fff8bf4d27de8328
\ No newline at end of file
+1bbb4a3aa9e60b4117ae6cdac13ad20e037846be37100516cbca70ad48947837f157ba441d839b773a260026284fb0f45c80b49db4c1522e64e46d905c77899a
\ No newline at end of file
diff --git a/tests/test_score_total_yn/results_true.dat b/tests/test_score_total_yn/results_true.dat
index 5d7a1498de..3565711be5 100644
--- a/tests/test_score_total_yn/results_true.dat
+++ b/tests/test_score_total_yn/results_true.dat
@@ -1,5 +1,5 @@
 k-combined:
-9.935192E-01 5.457292E-02
+9.903196E-01 4.279617E-02
 tally 1:
 0.000000E+00
 0.000000E+00
@@ -101,106 +101,106 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.265629E+00
-3.233643E-01
-5.626298E-02
-1.292090E-03
-2.035173E-02
-6.296227E-04
-1.928563E-02
-8.190514E-04
--2.468301E-02
-2.354849E-04
-9.148092E-03
-2.225568E-04
--5.879447E-02
-8.590977E-04
--1.445300E-02
-1.531576E-04
-6.018866E-02
-8.591329E-04
-1.403996E-02
-4.821838E-04
-9.815924E-03
-5.880801E-04
--9.749601E-03
-4.650507E-04
--8.702902E-03
-6.682813E-05
-1.953899E-02
-2.762602E-04
-2.823080E-02
-3.090601E-04
--2.932935E-03
-1.767294E-05
-6.394250E-03
-1.447695E-04
--1.504208E-03
-4.671038E-05
--1.575220E-02
-1.620546E-04
--2.910381E-03
-2.389274E-04
--3.020227E-02
-5.422131E-04
--8.190946E-03
-3.025911E-04
-2.246625E-02
-3.354891E-04
--2.002110E-02
-2.075929E-04
--1.962614E-02
-3.166447E-04
-2.240915E+01
-1.009032E+02
-1.856657E-01
-9.493183E-02
--1.690914E-01
-1.047180E-01
--1.866343E-01
-5.134677E-02
--2.029558E-01
-1.341115E-02
--1.379135E-01
-2.187965E-02
--5.257769E-01
-7.022699E-02
--6.848163E-02
-8.861152E-02
-3.794798E-01
-6.518809E-02
--1.093894E-01
-2.155411E-02
--1.520483E-01
-2.978741E-02
-1.718356E-01
-2.986391E-02
-8.273807E-02
-1.139398E-02
-1.312033E-01
-1.195907E-02
-3.286682E-01
-4.246009E-02
-8.878513E-02
-3.773227E-02
--2.541223E-02
-1.841611E-02
--1.249772E-02
-7.518231E-03
--1.468495E-01
-1.193263E-02
-2.206397E-02
-3.376086E-02
--1.990498E-01
-2.246024E-02
-1.181081E-01
-2.651049E-02
--8.952636E-03
-9.032436E-03
-5.183546E-02
-1.061147E-02
--1.047213E-01
-9.680702E-03
+9.780506E-01
+1.942072E-01
+4.170415E-02
+7.581469E-04
+-2.419728E-03
+6.296241E-04
+8.163997E-03
+4.785197E-04
+3.971909E-03
+1.363304E-04
+-1.585497E-02
+1.295251E-04
+-7.029875E-02
+1.208194E-03
+1.524070E-02
+2.828843E-04
+-2.141105E-02
+2.953327E-04
+2.147623E-02
+2.390414E-04
+5.592040E-04
+1.720605E-04
+-3.022066E-03
+1.843720E-04
+1.489821E-02
+9.193290E-05
+1.354668E-02
+2.551940E-04
+-5.692690E-04
+3.013453E-04
+-2.324582E-02
+2.170615E-04
+1.883012E-02
+1.045949E-04
+3.997107E-03
+1.674058E-04
+1.616443E-02
+2.046286E-04
+-1.625747E-02
+1.851351E-04
+1.120209E-02
+2.028649E-04
+-4.240284E-03
+4.019011E-05
+1.535379E-02
+9.872559E-05
+8.973926E-03
+1.448680E-04
+-3.933227E-03
+4.305328E-04
+1.767552E+01
+6.295417E+01
+1.458308E-01
+8.239551E-03
+1.976485E-01
+7.360520E-02
+2.647182E-01
+5.347815E-02
+1.828025E-01
+1.840743E-02
+-1.865994E-01
+2.843407E-02
+-6.438995E-02
+8.898045E-03
+1.416445E-01
+3.839856E-02
+-3.298894E-01
+2.672141E-02
+1.462639E-01
+1.225250E-02
+-6.410138E-02
+3.766615E-02
+-4.701705E-02
+1.968428E-03
+2.953056E-02
+2.358647E-02
+1.717672E-01
+5.877351E-02
+1.927497E-02
+1.358953E-02
+-1.708870E-01
+1.502033E-02
+4.453803E-02
+1.622532E-02
+2.076143E-02
+1.850686E-03
+1.111325E-01
+8.415150E-03
+-1.249594E-01
+7.491280E-03
+1.381757E-02
+1.537264E-02
+7.286234E-03
+9.057874E-03
+3.162973E-01
+3.303388E-02
+-1.012773E-01
+8.345375E-03
+-5.238963E-02
+3.920421E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -251,56 +251,56 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.711189E+00
-4.469059E+00
-1.149862E-03
-4.006261E-03
--5.485896E-02
-5.881771E-03
--6.936896E-02
-1.501967E-03
-1.033506E-02
-4.261122E-04
--1.042957E-01
-2.255383E-03
--7.082011E-02
-2.495972E-03
-1.099802E-02
-2.333908E-03
-5.635534E-02
-4.286572E-03
--2.310646E-02
-1.542196E-03
--2.259159E-02
-5.408191E-04
-9.307209E-02
-1.773060E-03
-6.296915E-02
-2.394743E-03
--8.108703E-03
-9.384558E-04
-7.125823E-02
-2.782853E-03
-7.168104E-03
-1.083383E-03
--2.498842E-02
-5.768656E-04
--2.297890E-02
-8.711670E-04
--1.775752E-02
-2.271706E-04
--1.794820E-02
-8.018486E-04
-1.963115E-02
-7.104338E-04
-5.288264E-02
-6.415302E-04
-5.895017E-03
-3.571409E-04
-2.190858E-02
-5.489095E-04
--3.829208E-02
-5.977452E-04
+3.863588E+00
+3.013300E+00
+-5.075749E-02
+1.018210E-03
+3.445344E-02
+5.778215E-03
+6.239642E-02
+4.107408E-03
+-1.475495E-02
+7.971898E-04
+-5.809323E-02
+3.039895E-03
+-2.510339E-02
+3.529134E-04
+9.731680E-03
+1.221628E-03
+-5.815144E-02
+1.403261E-03
+4.936694E-02
+6.481626E-04
+5.141985E-03
+1.343973E-03
+-1.515105E-02
+3.044735E-04
+4.474521E-03
+1.155268E-03
+6.855877E-02
+4.048417E-03
+-2.701969E-05
+1.279041E-03
+-2.197636E-02
+2.843662E-04
+-1.780381E-02
+8.441574E-04
+-2.916634E-02
+2.530602E-03
+2.289834E-02
+2.201375E-03
+-3.283424E-02
+7.615219E-04
+9.623726E-03
+7.614092E-04
+-2.808239E-02
+1.500381E-03
+4.835419E-02
+6.933678E-04
+2.636221E-02
+2.230834E-04
+-4.957463E-02
+1.939266E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -351,56 +351,56 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-6.533718E+01
-8.552989E+02
-4.658976E-02
-2.719315E-01
--5.661220E-01
-5.439751E-01
--3.051142E-01
-4.890036E-01
--1.640760E-01
-2.200294E-02
--2.675559E-01
-1.660319E-01
-2.007804E-01
-3.303623E-01
-2.670686E-02
-2.330239E-02
-3.111327E-01
-2.876993E-01
--6.871786E-02
-1.625684E-01
--5.849816E-01
-2.074413E-01
-3.674709E-01
-9.029605E-02
-3.420122E-01
-3.147918E-01
-1.580259E-01
-4.184964E-02
-1.509855E-01
-1.718636E-01
-4.008602E-01
-1.315982E-01
-1.253163E-01
-7.030618E-02
-1.826521E-02
-4.452932E-02
--9.755491E-02
-1.276313E-01
-5.434521E-02
-3.809202E-02
-7.041533E-01
-1.522383E-01
-1.434910E-01
-1.112940E-01
-1.947700E-01
-9.469651E-02
--7.044463E-02
-3.058029E-02
--6.586398E-01
-1.337469E-01
+5.356594E+01
+5.839391E+02
+1.198882E+00
+3.391100E-01
+3.952398E-01
+5.729760E-01
+1.045726E+00
+4.419194E-01
+2.683170E-01
+1.872580E-01
+-5.059349E-01
+2.592209E-01
+4.561651E-01
+1.253696E-01
+4.273775E-01
+3.509266E-01
+-6.300496E-01
+2.102051E-01
+3.094705E-01
+1.410278E-01
+-6.840225E-01
+1.971765E-01
+-4.123355E-02
+3.962538E-02
+-1.554557E-01
+2.784362E-02
+4.698631E-01
+1.867413E-01
+-7.016026E-02
+3.059344E-02
+-2.922284E-01
+8.680517E-02
+-1.252431E-01
+3.180591E-02
+-1.825937E-01
+8.626653E-02
+1.637960E-01
+1.329538E-01
+-6.662867E-01
+1.497985E-01
+4.662585E-01
+7.552145E-02
+-1.198254E-03
+2.020899E-01
+5.281410E-01
+9.615758E-02
+-6.396211E-02
+1.806992E-01
+-1.898620E-01
+1.113751E-01
 tally 2:
 0.000000E+00
 0.000000E+00
@@ -502,106 +502,106 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.270000E+00
-3.313000E-01
-6.672369E-03
-5.154703E-03
-2.741231E-02
-3.707114E-03
-6.785459E-02
-1.525452E-03
--7.226258E-02
-3.119519E-03
--1.458773E-02
-5.829469E-03
-9.286573E-02
-4.614384E-03
--8.836014E-02
-3.693860E-03
-7.682597E-02
-3.692450E-03
-5.624405E-04
-1.894653E-03
--2.446734E-02
-2.962636E-04
--2.865534E-02
-8.238323E-04
-1.746333E-02
-1.350727E-03
-6.812468E-02
-2.154847E-03
-2.170333E-02
-8.368218E-04
--3.464644E-02
-6.341450E-04
-1.586865E-03
-2.086260E-04
-1.122866E-02
-1.828956E-03
-5.147244E-02
-2.116013E-03
--5.140617E-03
-2.011918E-03
-3.662973E-02
-1.511591E-03
--3.826498E-04
-1.254739E-03
-9.466189E-02
-2.206340E-03
--1.695030E-02
-2.963888E-04
--4.620345E-02
-1.330607E-03
-2.278000E+01
-1.042404E+02
--2.705944E-01
-4.019819E-02
-8.910115E-02
-7.598548E-02
-4.240148E-01
-6.249778E-02
--1.711683E-01
-3.365297E-02
--1.320939E-01
-4.677615E-02
--3.833055E-01
-3.838770E-02
-1.938748E-01
-8.311489E-02
-1.859290E-01
-1.653719E-02
--2.875551E-01
-7.432886E-02
-1.513934E-02
-7.854478E-02
-1.932642E-02
-1.428749E-02
-4.617741E-02
-1.844961E-02
-1.063807E-01
-3.103047E-02
-1.309557E-01
-1.198530E-02
-2.797364E-01
-2.403350E-02
--1.332777E-01
-2.277289E-02
-9.430025E-02
-5.826855E-03
--1.012356E-01
-1.537804E-02
--8.178736E-02
-4.470169E-02
--1.197123E-01
-2.596045E-02
-3.984096E-02
-1.209844E-02
-1.148842E-01
-6.772712E-03
--1.705431E-02
-3.920009E-02
--2.694201E-02
-2.653514E-02
+9.300000E-01
+1.839000E-01
+-4.056201E-03
+8.670884E-04
+-2.262959E-02
+2.263780E-03
+4.568371E-02
+4.078305E-03
+6.023055E-02
+1.099458E-03
+2.468374E-02
+3.403931E-03
+-8.676202E-02
+2.444658E-03
+-2.075016E-02
+5.432442E-03
+1.101095E-02
+3.129947E-04
+-8.689134E-03
+2.422445E-03
+-1.097503E-02
+4.670673E-04
+-4.979355E-02
+1.791811E-03
+1.769845E-02
+6.074665E-04
+1.473469E-02
+1.257671E-03
+-1.133757E-02
+1.555143E-03
+-1.730195E-02
+1.841949E-03
+-1.191492E-02
+1.859105E-03
+-9.038577E-03
+4.401577E-04
+1.770047E-02
+4.158291E-04
+-1.492809E-02
+5.488168E-04
+7.970152E-02
+1.597910E-03
+-3.741348E-02
+5.704935E-04
+2.078478E-02
+5.379832E-04
+1.355930E-02
+6.747758E-04
+3.416200E-02
+8.262470E-04
+1.739000E+01
+6.083290E+01
+2.434171E-01
+3.049063E-02
+-1.278707E-01
+9.585267E-02
+2.597328E-01
+8.692607E-02
+2.496700E-01
+3.750933E-02
+1.309937E-01
+4.217907E-02
+-1.863241E-01
+1.738581E-02
+-1.292679E-01
+1.799004E-02
+-3.543191E-01
+3.682107E-02
+-1.904413E-01
+1.455250E-02
+-7.093238E-02
+1.473997E-02
+-1.920412E-01
+1.308864E-02
+1.566093E-01
+1.913492E-02
+2.499642E-01
+3.036874E-02
+-2.323022E-01
+3.794368E-02
+-6.361729E-02
+3.266166E-02
+4.688479E-02
+2.806712E-02
+-9.796563E-02
+1.419748E-02
+1.000847E-02
+3.233262E-02
+-7.570231E-02
+4.626536E-03
+1.489091E-01
+1.159345E-02
+-2.236285E-01
+1.480084E-02
+2.461305E-01
+1.643844E-02
+-1.773523E-02
+1.626036E-03
+6.570774E-02
+1.069893E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -652,56 +652,56 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.350000E+00
-3.833900E+00
-2.792800E-01
-3.102658E-02
--2.343095E-01
-3.826449E-02
-3.428573E-02
-6.437027E-03
--1.025176E-01
-1.798807E-02
--4.106130E-02
-3.786695E-03
--1.470480E-01
-8.519720E-03
-1.989035E-02
-5.067928E-03
-8.094404E-02
-3.412899E-03
--5.616421E-02
-2.709728E-03
-2.421213E-02
-3.683849E-03
-4.794858E-02
-4.392540E-03
--1.637085E-02
-5.339723E-03
--2.046073E-02
-5.231271E-03
-1.554627E-02
-4.457612E-03
--3.441131E-02
-7.049061E-03
--1.139075E-01
-7.627867E-03
--8.358967E-02
-4.023855E-03
-1.221815E-01
-5.628324E-03
--2.061337E-02
-1.926605E-03
--1.583607E-02
-1.093902E-03
--7.623859E-02
-5.519074E-03
--1.115748E-02
-3.984642E-03
-7.665232E-02
-1.111550E-02
--2.673980E-02
-7.957502E-03
+4.160000E+00
+3.501000E+00
+9.464171E-02
+8.682833E-03
+8.467800E-02
+1.402624E-02
+-1.283471E-02
+2.630439E-02
+1.859869E-01
+1.189528E-02
+-1.910311E-02
+2.907370E-03
+-2.542253E-01
+2.143851E-02
+4.021473E-02
+5.812599E-03
+-1.242140E-01
+1.017873E-02
+2.934198E-02
+2.409920E-03
+5.719767E-02
+2.211520E-03
+-3.023903E-02
+2.870625E-03
+1.092479E-01
+6.089989E-03
+-1.604743E-02
+1.110224E-02
+3.811062E-03
+5.234112E-03
+-5.446762E-02
+5.323411E-03
+-3.868978E-02
+4.949255E-03
+-1.384260E-01
+4.903532E-03
+-3.761889E-02
+2.524889E-03
+6.079772E-02
+2.328339E-03
+1.956623E-03
+4.096814E-03
+-1.716402E-03
+2.022751E-03
+-1.108600E-01
+3.227014E-03
+2.447622E-03
+4.075421E-03
+1.582493E-02
+4.847858E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -752,56 +752,56 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-6.484000E+01
-8.416314E+02
--3.758929E-01
-3.104729E-01
--7.263839E-01
-7.809822E-01
-4.648018E-03
-2.834459E-01
--1.055002E-01
-3.040070E-02
-7.118727E-02
-7.977682E-02
-7.664673E-01
-1.821315E-01
-2.087917E-01
-4.041777E-02
-2.761598E-01
-3.014608E-01
-2.119970E-01
-2.965940E-02
--8.139971E-01
-1.653848E-01
-1.280103E-01
-4.989381E-02
-6.090725E-01
-2.822967E-01
-2.502533E-02
-1.011286E-02
--3.776030E-01
-2.846556E-01
--1.484779E-01
-1.060501E-01
-3.365875E-01
-2.827604E-02
--8.437307E-02
-9.086937E-02
-2.827425E-01
-6.353956E-02
-1.139952E-01
-1.067588E-01
-6.809505E-01
-1.329962E-01
-1.408254E-01
-3.003253E-02
--1.222838E-01
-5.353793E-02
--2.274047E-02
-3.333572E-02
--1.026245E-01
-5.889851E-02
+5.213000E+01
+5.552351E+02
+6.019876E-01
+2.938936E-01
+2.126970E-01
+3.363271E-01
+6.928646E-01
+3.077152E-01
+-2.976474E-01
+5.830705E-02
+-7.804821E-01
+3.967156E-01
+5.737502E-01
+1.090147E-01
+2.867929E-01
+1.312720E-01
+-4.735578E-01
+6.714577E-02
+6.340442E-02
+4.240623E-02
+-1.594570E-01
+1.167021E-01
+5.403124E-02
+6.452745E-02
+-2.670969E-01
+5.822561E-02
+3.033558E-01
+4.890487E-02
+-3.515557E-01
+5.069681E-02
+-2.257462E-01
+4.682933E-02
+-1.449924E-02
+1.625521E-02
+-2.809498E-01
+6.883451E-02
+1.904808E-01
+1.004755E-01
+-2.570005E-01
+4.301248E-02
+9.493600E-02
+7.708499E-02
+2.804222E-01
+4.455703E-02
+3.199914E-01
+7.435651E-02
+2.818069E-04
+7.231318E-02
+3.689494E-01
+1.349712E-01
 tally 3:
 0.000000E+00
 0.000000E+00
@@ -903,106 +903,106 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.220551E+00
-3.029523E-01
-1.939259E-02
-4.050014E-04
-3.502926E-03
-8.473601E-04
-4.575201E-02
-2.544994E-03
--1.560898E-02
-2.801847E-04
--8.658638E-03
-8.241229E-04
--4.445033E-02
-1.063052E-03
-7.845580E-03
-2.558127E-04
-2.549169E-02
-8.288961E-04
--9.797138E-03
-2.713506E-04
-8.620131E-03
-8.537125E-04
--4.992993E-03
-2.206385E-04
-2.780887E-02
-3.020884E-04
--2.040716E-02
-1.760440E-04
-2.351435E-02
-2.067041E-04
-7.044751E-03
-7.297774E-05
-7.233581E-03
-1.258072E-04
-5.582777E-03
-9.135959E-05
-3.887969E-03
-4.965340E-04
--2.396743E-02
-7.407861E-04
--7.371142E-03
-1.109942E-04
--1.089834E-02
-2.188565E-04
-2.790414E-02
-2.398608E-04
--1.464849E-02
-1.014603E-04
--1.981204E-02
-2.919798E-04
-2.278000E+01
-1.042404E+02
--2.705944E-01
-4.019819E-02
-8.910115E-02
-7.598548E-02
-4.240148E-01
-6.249778E-02
--1.711683E-01
-3.365297E-02
--1.320939E-01
-4.677615E-02
--3.833055E-01
-3.838770E-02
-1.938748E-01
-8.311489E-02
-1.859290E-01
-1.653719E-02
--2.875551E-01
-7.432886E-02
-1.513934E-02
-7.854478E-02
-1.932642E-02
-1.428749E-02
-4.617741E-02
-1.844961E-02
-1.063807E-01
-3.103047E-02
-1.309557E-01
-1.198530E-02
-2.797364E-01
-2.403350E-02
--1.332777E-01
-2.277289E-02
-9.430025E-02
-5.826855E-03
--1.012356E-01
-1.537804E-02
--8.178736E-02
-4.470169E-02
--1.197123E-01
-2.596045E-02
-3.984096E-02
-1.209844E-02
-1.148842E-01
-6.772712E-03
--1.705431E-02
-3.920009E-02
--2.694201E-02
-2.653514E-02
+9.453374E-01
+1.815824E-01
+4.552571E-02
+8.689847E-04
+4.192526E-03
+6.095248E-04
+4.085060E-03
+3.488081E-04
+3.074303E-02
+3.709785E-04
+-1.949067E-02
+1.995057E-04
+-7.372260E-02
+1.709765E-03
+5.140901E-03
+6.268082E-05
+-2.589014E-02
+1.616678E-04
+-1.683116E-02
+2.122512E-04
+-1.074659E-02
+1.087471E-04
+-3.762844E-03
+3.439135E-05
+1.365793E-02
+5.255161E-05
+-5.869374E-05
+4.060049E-04
+-7.715004E-03
+3.629588E-04
+-8.240120E-03
+5.192031E-04
+1.662861E-02
+5.038262E-04
+2.845811E-03
+2.843348E-04
+1.826833E-03
+1.104947E-05
+5.596885E-04
+1.922661E-05
+1.398723E-02
+1.025178E-04
+-1.733988E-02
+1.184228E-04
+1.250057E-02
+1.447801E-04
+5.450018E-03
+3.725923E-05
+2.390947E-02
+6.837656E-04
+1.739000E+01
+6.083290E+01
+2.434171E-01
+3.049063E-02
+-1.278707E-01
+9.585267E-02
+2.597328E-01
+8.692607E-02
+2.496700E-01
+3.750933E-02
+1.309937E-01
+4.217907E-02
+-1.863241E-01
+1.738581E-02
+-1.292679E-01
+1.799004E-02
+-3.543191E-01
+3.682107E-02
+-1.904413E-01
+1.455250E-02
+-7.093238E-02
+1.473997E-02
+-1.920412E-01
+1.308864E-02
+1.566093E-01
+1.913492E-02
+2.499642E-01
+3.036874E-02
+-2.323022E-01
+3.794368E-02
+-6.361729E-02
+3.266166E-02
+4.688479E-02
+2.806712E-02
+-9.796563E-02
+1.419748E-02
+1.000847E-02
+3.233262E-02
+-7.570231E-02
+4.626536E-03
+1.489091E-01
+1.159345E-02
+-2.236285E-01
+1.480084E-02
+2.461305E-01
+1.643844E-02
+-1.773523E-02
+1.626036E-03
+6.570774E-02
+1.069893E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -1053,56 +1053,56 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.350000E+00
-3.833900E+00
-2.792800E-01
-3.102658E-02
--2.343095E-01
-3.826449E-02
-3.428573E-02
-6.437027E-03
--1.025176E-01
-1.798807E-02
--4.106130E-02
-3.786695E-03
--1.470480E-01
-8.519720E-03
-1.989035E-02
-5.067928E-03
-8.094404E-02
-3.412899E-03
--5.616421E-02
-2.709728E-03
-2.421213E-02
-3.683849E-03
-4.794858E-02
-4.392540E-03
--1.637085E-02
-5.339723E-03
--2.046073E-02
-5.231271E-03
-1.554627E-02
-4.457612E-03
--3.441131E-02
-7.049061E-03
--1.139075E-01
-7.627867E-03
--8.358967E-02
-4.023855E-03
-1.221815E-01
-5.628324E-03
--2.061337E-02
-1.926605E-03
--1.583607E-02
-1.093902E-03
--7.623859E-02
-5.519074E-03
--1.115748E-02
-3.984642E-03
-7.665232E-02
-1.111550E-02
--2.673980E-02
-7.957502E-03
+4.160000E+00
+3.501000E+00
+9.464171E-02
+8.682833E-03
+8.467800E-02
+1.402624E-02
+-1.283471E-02
+2.630439E-02
+1.859869E-01
+1.189528E-02
+-1.910311E-02
+2.907370E-03
+-2.542253E-01
+2.143851E-02
+4.021473E-02
+5.812599E-03
+-1.242140E-01
+1.017873E-02
+2.934198E-02
+2.409920E-03
+5.719767E-02
+2.211520E-03
+-3.023903E-02
+2.870625E-03
+1.092479E-01
+6.089989E-03
+-1.604743E-02
+1.110224E-02
+3.811062E-03
+5.234112E-03
+-5.446762E-02
+5.323411E-03
+-3.868978E-02
+4.949255E-03
+-1.384260E-01
+4.903532E-03
+-3.761889E-02
+2.524889E-03
+6.079772E-02
+2.328339E-03
+1.956623E-03
+4.096814E-03
+-1.716402E-03
+2.022751E-03
+-1.108600E-01
+3.227014E-03
+2.447622E-03
+4.075421E-03
+1.582493E-02
+4.847858E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -1153,53 +1153,53 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-6.484000E+01
-8.416314E+02
--3.758929E-01
-3.104729E-01
--7.263839E-01
-7.809822E-01
-4.648018E-03
-2.834459E-01
--1.055002E-01
-3.040070E-02
-7.118727E-02
-7.977682E-02
-7.664673E-01
-1.821315E-01
-2.087917E-01
-4.041777E-02
-2.761598E-01
-3.014608E-01
-2.119970E-01
-2.965940E-02
--8.139971E-01
-1.653848E-01
-1.280103E-01
-4.989381E-02
-6.090725E-01
-2.822967E-01
-2.502533E-02
-1.011286E-02
--3.776030E-01
-2.846556E-01
--1.484779E-01
-1.060501E-01
-3.365875E-01
-2.827604E-02
--8.437307E-02
-9.086937E-02
-2.827425E-01
-6.353956E-02
-1.139952E-01
-1.067588E-01
-6.809505E-01
-1.329962E-01
-1.408254E-01
-3.003253E-02
--1.222838E-01
-5.353793E-02
--2.274047E-02
-3.333572E-02
--1.026245E-01
-5.889851E-02
+5.213000E+01
+5.552351E+02
+6.019876E-01
+2.938936E-01
+2.126970E-01
+3.363271E-01
+6.928646E-01
+3.077152E-01
+-2.976474E-01
+5.830705E-02
+-7.804821E-01
+3.967156E-01
+5.737502E-01
+1.090147E-01
+2.867929E-01
+1.312720E-01
+-4.735578E-01
+6.714577E-02
+6.340442E-02
+4.240623E-02
+-1.594570E-01
+1.167021E-01
+5.403124E-02
+6.452745E-02
+-2.670969E-01
+5.822561E-02
+3.033558E-01
+4.890487E-02
+-3.515557E-01
+5.069681E-02
+-2.257462E-01
+4.682933E-02
+-1.449924E-02
+1.625521E-02
+-2.809498E-01
+6.883451E-02
+1.904808E-01
+1.004755E-01
+-2.570005E-01
+4.301248E-02
+9.493600E-02
+7.708499E-02
+2.804222E-01
+4.455703E-02
+3.199914E-01
+7.435651E-02
+2.818069E-04
+7.231318E-02
+3.689494E-01
+1.349712E-01

From 070a229a937eb66ab28f90d4a63ab20d73658833 Mon Sep 17 00:00:00 2001
From: Sterling Harper <sterlingmharper@gmail.com>
Date: Sat, 3 Oct 2015 02:02:44 -0400
Subject: [PATCH 06/10] Fix test_score_nuscatter* inactive batches

---
 tests/test_score_nuscatter/inputs_true.dat    |  2 +-
 tests/test_score_nuscatter/results_true.dat   | 14 ++--
 .../test_score_nuscatter.py                   |  7 +-
 tests/test_score_nuscatter_n/inputs_true.dat  |  2 +-
 tests/test_score_nuscatter_n/results_true.dat | 62 ++++++++--------
 .../test_score_nuscatter_n.py                 |  7 +-
 tests/test_score_nuscatter_pn/inputs_true.dat |  2 +-
 .../test_score_nuscatter_pn/results_true.dat  | 42 +++++------
 .../test_score_nuscatter_pn.py                |  7 +-
 tests/test_score_nuscatter_yn/inputs_true.dat |  2 +-
 .../test_score_nuscatter_yn/results_true.dat  | 70 +++++++++----------
 .../test_score_nuscatter_yn.py                |  7 +-
 12 files changed, 122 insertions(+), 102 deletions(-)

diff --git a/tests/test_score_nuscatter/inputs_true.dat b/tests/test_score_nuscatter/inputs_true.dat
index 440db11243..6ae99b4a17 100644
--- a/tests/test_score_nuscatter/inputs_true.dat
+++ b/tests/test_score_nuscatter/inputs_true.dat
@@ -1 +1 @@
-5d0e915af1f424b8ca9d3723fecc2e0e0c558bcbe70b5ad45bcc8e03caf9b4caae9ed593010ce31c6dfe09be06a6dc3929b839999132917569f2ed93c3b70455
\ No newline at end of file
+c74fb5e4e8caecd11642231b55cb9442264da220329fd6a1c9959214342acd5efb4ef23368b0b018f0388a6102bce65226f6161d32f3613128d8c3762a3f6f9e
\ No newline at end of file
diff --git a/tests/test_score_nuscatter/results_true.dat b/tests/test_score_nuscatter/results_true.dat
index 6e9935f218..8f9fcba891 100644
--- a/tests/test_score_nuscatter/results_true.dat
+++ b/tests/test_score_nuscatter/results_true.dat
@@ -1,11 +1,11 @@
 k-combined:
-9.903196E-01 4.279617E-02
+1.034954E+00 1.782721E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-1.485000E+01
-4.439790E+01
-4.120000E+00
-3.438000E+00
-5.173000E+01
-5.467243E+02
+2.514000E+01
+6.511880E+01
+6.370000E+00
+4.230900E+00
+8.547000E+01
+7.481913E+02
diff --git a/tests/test_score_nuscatter/test_score_nuscatter.py b/tests/test_score_nuscatter/test_score_nuscatter.py
index e94ab61f15..d13ded507c 100644
--- a/tests/test_score_nuscatter/test_score_nuscatter.py
+++ b/tests/test_score_nuscatter/test_score_nuscatter.py
@@ -17,7 +17,12 @@ class ScoreNuScatterTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         self._input_set.tallies.add_tally(t)
 
-        PyAPITestHarness._build_inputs(self)
+        self._input_set.build_default_materials_and_geometry()
+        self._input_set.build_default_settings()
+
+        self._input_set.settings.inactive = 0
+
+        self._input_set.export()
 
     def _cleanup(self):
         PyAPITestHarness._cleanup(self)
diff --git a/tests/test_score_nuscatter_n/inputs_true.dat b/tests/test_score_nuscatter_n/inputs_true.dat
index a907148a7c..c7924a247a 100644
--- a/tests/test_score_nuscatter_n/inputs_true.dat
+++ b/tests/test_score_nuscatter_n/inputs_true.dat
@@ -1 +1 @@
-3db6a6067fb07ed0e213c1e293f32a23ab64fbfb45a7a69320e8326ae76e5a3020c2f73986e7a93eeee1dde1422d84081ff18f0a9770aaba94423586bd134721
\ No newline at end of file
+c184ef2764fa23db32253ec4c23d36cf842f173a0a57c93cb165faf771f2ff23346756160ba5793c558448283eb0917d23e3871753ea2b7e3e24f14d6cf4179f
\ No newline at end of file
diff --git a/tests/test_score_nuscatter_n/results_true.dat b/tests/test_score_nuscatter_n/results_true.dat
index 96e56bd6ab..0c1315807f 100644
--- a/tests/test_score_nuscatter_n/results_true.dat
+++ b/tests/test_score_nuscatter_n/results_true.dat
@@ -1,33 +1,33 @@
 k-combined:
-9.903196E-01 4.279617E-02
+1.034954E+00 1.782721E-02
 tally 1:
-1.485000E+01
-4.439790E+01
-1.259515E+00
-3.360064E-01
-7.983154E-01
-1.355632E-01
-3.425460E-01
-2.971972E-02
-2.949225E-01
-3.975603E-02
-4.120000E+00
-3.438000E+00
-6.222571E-01
-8.335984E-02
-1.670136E-01
-1.374768E-02
--5.819374E-02
-1.091808E-02
--6.389550E-02
-5.688533E-03
-5.173000E+01
-5.467243E+02
-2.669403E+01
-1.451361E+02
-9.691140E+00
-1.933574E+01
-5.860769E-01
-2.122377E-01
--1.190340E+00
-3.145785E-01
+2.514000E+01
+6.511880E+01
+2.724740E+00
+8.378120E-01
+1.521255E+00
+2.667071E-01
+7.903706E-01
+1.216244E-01
+5.770120E-01
+5.508594E-02
+6.370000E+00
+4.230900E+00
+8.075261E-01
+9.047897E-02
+5.879624E-01
+4.107777E-02
+2.034636E-01
+8.243025E-03
+-2.744502E-02
+1.515916E-03
+8.547000E+01
+7.481913E+02
+4.446994E+01
+2.016855E+02
+1.664683E+01
+2.837713E+01
+1.373176E+00
+3.329601E-01
+-1.663772E+00
+4.264485E-01
diff --git a/tests/test_score_nuscatter_n/test_score_nuscatter_n.py b/tests/test_score_nuscatter_n/test_score_nuscatter_n.py
index 5b0a755567..c675bc7be3 100644
--- a/tests/test_score_nuscatter_n/test_score_nuscatter_n.py
+++ b/tests/test_score_nuscatter_n/test_score_nuscatter_n.py
@@ -21,7 +21,12 @@ class ScoreNuScatterNTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         self._input_set.tallies.add_tally(t)
 
-        PyAPITestHarness._build_inputs(self)
+        self._input_set.build_default_materials_and_geometry()
+        self._input_set.build_default_settings()
+
+        self._input_set.settings.inactive = 0
+
+        self._input_set.export()
 
     def _cleanup(self):
         PyAPITestHarness._cleanup(self)
diff --git a/tests/test_score_nuscatter_pn/inputs_true.dat b/tests/test_score_nuscatter_pn/inputs_true.dat
index eb2962dc34..30a894dafb 100644
--- a/tests/test_score_nuscatter_pn/inputs_true.dat
+++ b/tests/test_score_nuscatter_pn/inputs_true.dat
@@ -1 +1 @@
-5cd39eacee3efe8d7a8db38edb741d8f773a0b42276dab8635d36e7fc9809617d9ad47510be06bc019472e1b792bc678d88fcbb26ca4ed07504a222388ee230c
\ No newline at end of file
+79d74ffe32f564b83bdde94048f57233454881f3b55413e9b5e30ce4b9813ff6436dca98d691d941d5f31947f2215dcb656369c2b32e6240e1424e6aad96395e
\ No newline at end of file
diff --git a/tests/test_score_nuscatter_pn/results_true.dat b/tests/test_score_nuscatter_pn/results_true.dat
index 753216a8b7..603c13e701 100644
--- a/tests/test_score_nuscatter_pn/results_true.dat
+++ b/tests/test_score_nuscatter_pn/results_true.dat
@@ -1,24 +1,24 @@
 k-combined:
-9.903196E-01 4.279617E-02
+1.034954E+00 1.782721E-02
 tally 1:
-1.485000E+01
-4.439790E+01
-1.259515E+00
-3.360064E-01
-7.983154E-01
-1.355632E-01
-3.425460E-01
-2.971972E-02
-2.949225E-01
-3.975603E-02
+2.514000E+01
+6.511880E+01
+2.724740E+00
+8.378120E-01
+1.521255E+00
+2.667071E-01
+7.903706E-01
+1.216244E-01
+5.770120E-01
+5.508594E-02
 tally 2:
-1.485000E+01
-4.439790E+01
-1.259515E+00
-3.360064E-01
-7.983154E-01
-1.355632E-01
-3.425460E-01
-2.971972E-02
-2.949225E-01
-3.975603E-02
+2.514000E+01
+6.511880E+01
+2.724740E+00
+8.378120E-01
+1.521255E+00
+2.667071E-01
+7.903706E-01
+1.216244E-01
+5.770120E-01
+5.508594E-02
diff --git a/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py b/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py
index a69679873f..d3a4a55961 100644
--- a/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py
+++ b/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py
@@ -25,7 +25,12 @@ class ScoreNuScatterPNTestHarness(PyAPITestHarness):
         self._input_set.tallies.add_tally(t1)
         self._input_set.tallies.add_tally(t2)
 
-        PyAPITestHarness._build_inputs(self)
+        self._input_set.build_default_materials_and_geometry()
+        self._input_set.build_default_settings()
+
+        self._input_set.settings.inactive = 0
+
+        self._input_set.export()
 
     def _cleanup(self):
         PyAPITestHarness._cleanup(self)
diff --git a/tests/test_score_nuscatter_yn/inputs_true.dat b/tests/test_score_nuscatter_yn/inputs_true.dat
index 510c6f04d9..9a8a934b17 100644
--- a/tests/test_score_nuscatter_yn/inputs_true.dat
+++ b/tests/test_score_nuscatter_yn/inputs_true.dat
@@ -1 +1 @@
-4bce40c1119ba7ac23c12b0fcf79fbf9b6dfb89ce2921f5f3906cb8683b79355bd9ba208c80f736f03ea18dccf3449a4ddaedb72ebb10b27301e843c31822f58
\ No newline at end of file
+fd7b5b66e5d5e705da488651445d75240b05dcc1d243b2d2e8b8a729c8220221cdfa1eccfeca30897a006caaceae3e8c7449392b5027b290cb388b33e86ff2a3
\ No newline at end of file
diff --git a/tests/test_score_nuscatter_yn/results_true.dat b/tests/test_score_nuscatter_yn/results_true.dat
index d1b165274d..79c89b7708 100644
--- a/tests/test_score_nuscatter_yn/results_true.dat
+++ b/tests/test_score_nuscatter_yn/results_true.dat
@@ -1,38 +1,38 @@
 k-combined:
-9.903196E-01 4.279617E-02
+1.034954E+00 1.782721E-02
 tally 1:
-1.485000E+01
-4.439790E+01
+2.514000E+01
+6.511880E+01
 tally 2:
-1.485000E+01
-4.439790E+01
-8.440076E-02
-1.135203E-02
-8.198663E-02
-3.887429E-02
-1.358080E-01
-2.890416E-02
--3.544823E-02
-9.843339E-04
-1.542072E-01
-8.228126E-03
-1.057111E-01
-3.758100E-03
-1.647870E-02
-4.827841E-03
-1.378297E-01
-1.566876E-02
--4.676778E-02
-4.809366E-03
-1.966204E-02
-7.447981E-04
--1.889258E-02
-6.841953E-04
-1.337703E-02
-1.250077E-03
-1.044684E-01
-6.969498E-03
--1.177995E-02
-8.208715E-03
-1.940058E-04
-5.128759E-03
+2.514000E+01
+6.511880E+01
+-2.222467E-01
+2.881247E-02
+3.019176E-01
+3.014833E-02
+8.459006E-04
+4.773570E-02
+9.596964E-02
+1.009754E-02
+-4.314855E-02
+6.207871E-03
+4.607677E-02
+9.205573E-03
+-2.345994E-03
+1.243004E-02
+9.577397E-02
+6.605519E-03
+-2.821584E-02
+3.834286E-03
+-1.077389E-01
+6.570217E-03
+-1.106443E-01
+1.006436E-02
+1.322104E-01
+7.721677E-03
+1.315548E-02
+5.488918E-04
+-2.792171E-02
+5.816161E-03
+-1.994370E-02
+1.169674E-03
diff --git a/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py b/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py
index 0b2005bdcb..d48df6a21e 100644
--- a/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py
+++ b/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py
@@ -21,7 +21,12 @@ class ScoreNuScatterYNTestHarness(PyAPITestHarness):
         self._input_set.tallies.add_tally(t1)
         self._input_set.tallies.add_tally(t2)
 
-        PyAPITestHarness._build_inputs(self)
+        self._input_set.build_default_materials_and_geometry()
+        self._input_set.build_default_settings()
+
+        self._input_set.settings.inactive = 0
+
+        self._input_set.export()
 
     def _cleanup(self):
         PyAPITestHarness._cleanup(self)

From 6b92694578bcf81687e6964a6315fd973588c438 Mon Sep 17 00:00:00 2001
From: Sterling Harper <sterlingmharper@gmail.com>
Date: Sat, 3 Oct 2015 10:01:43 -0400
Subject: [PATCH 07/10] Return isotropic scores to total_yn, flux_yn tests

---
 tests/test_score_flux_yn/inputs_true.dat      |   2 +-
 tests/test_score_flux_yn/results_true.dat     | 879 +++++++++---------
 .../test_score_flux_yn/test_score_flux_yn.py  |  11 +-
 tests/test_score_total_yn/inputs_true.dat     |   2 +-
 tests/test_score_total_yn/results_true.dat    |  13 +-
 .../test_score_total_yn.py                    |  15 +-
 6 files changed, 473 insertions(+), 449 deletions(-)

diff --git a/tests/test_score_flux_yn/inputs_true.dat b/tests/test_score_flux_yn/inputs_true.dat
index ebb757bbdd..9b9313a6ab 100644
--- a/tests/test_score_flux_yn/inputs_true.dat
+++ b/tests/test_score_flux_yn/inputs_true.dat
@@ -1 +1 @@
-56b5f317d465ab32d9bc2cf85f1a22b7df773edcc642981707febd2e988e4174a3f0234744f192182edb51af23b541325496c2ca4530303afc0d2baefc0ce60e
\ No newline at end of file
+977c9d76d335d79fa561f9eab8a575a118f900818759b96b6fbdbf8d06a012a44d5892bbb22292f9b730745d86859ffcba6b16b59096eff587fca2a5d6629cf5
\ No newline at end of file
diff --git a/tests/test_score_flux_yn/results_true.dat b/tests/test_score_flux_yn/results_true.dat
index c657cb7bba..fecff843d9 100644
--- a/tests/test_score_flux_yn/results_true.dat
+++ b/tests/test_score_flux_yn/results_true.dat
@@ -3,6 +3,19 @@ k-combined:
 tally 1:
 3.890713E+01
 3.046363E+02
+1.366220E+01
+3.758161E+01
+6.561669E+01
+8.680729E+02
+2.382728E+01
+1.170590E+02
+8.047875E+00
+1.334796E+01
+4.056568E+01
+3.389623E+02
+tally 2:
+3.890713E+01
+3.046363E+02
 1.623579E-01
 4.602199E-02
 4.860074E-01
@@ -433,439 +446,6 @@ tally 1:
 1.429184E-01
 5.891300E-01
 1.085467E-01
-tally 2:
-3.862543E+01
-2.993190E+02
-5.083613E-01
-2.933365E-01
--4.356793E-01
-6.676831E-01
-6.093148E-01
-5.685331E-01
-2.512276E-01
-1.308652E-01
-1.075955E+00
-4.775270E-01
-3.660307E-01
-1.627691E-01
--5.402149E-01
-2.324946E-01
--3.887573E-01
-1.028105E-01
--4.324152E-01
-1.015147E-01
-3.306993E-02
-8.425069E-02
--2.127456E-01
-5.435453E-02
-2.977294E-01
-1.088039E-01
-1.055079E+00
-3.590635E-01
--6.740592E-01
-2.606281E-01
--3.329512E-01
-1.587428E-01
--1.248691E-01
-1.659045E-01
--2.306000E-01
-1.062057E-01
-9.127791E-02
-2.649459E-01
--2.629881E-01
-4.786229E-02
-2.286813E-01
-2.363629E-02
--6.338613E-01
-1.118828E-01
-7.466647E-01
-1.424535E-01
--7.955161E-02
-1.003327E-02
-1.082691E-01
-2.727882E-02
-5.295185E-01
-1.335133E-01
--6.321517E-01
-1.422916E-01
--1.236137E-01
-2.041422E-01
--5.389265E-02
-1.852888E-01
--3.746082E-01
-5.580885E-02
-1.383528E-01
-2.754456E-01
--5.081204E-01
-1.886515E-01
--4.022264E-01
-1.417397E-01
-3.377771E-01
-6.673888E-02
-1.170109E-01
-1.783182E-02
-2.097916E-01
-7.139323E-02
-1.438678E+01
-4.193571E+01
-6.547124E-01
-1.780450E-01
-2.207489E-01
-2.115835E-01
--4.952323E-02
-3.039341E-01
-6.681546E-01
-1.389250E-01
-4.078026E-02
-4.393667E-02
--8.695509E-01
-2.850853E-01
-1.792062E-01
-7.367253E-02
--5.657500E-01
-2.115125E-01
-8.525189E-02
-2.541971E-02
-5.227867E-02
-2.008468E-02
--6.825349E-02
-5.316522E-02
-3.763076E-01
-7.112554E-02
-1.279973E-02
-1.883096E-01
-7.775189E-02
-6.874374E-02
--1.119537E-01
-8.467755E-02
--1.600632E-01
-8.650448E-02
--6.210095E-01
-1.094309E-01
--9.997484E-02
-3.935353E-02
-2.300525E-01
-2.351925E-02
-2.486103E-02
-3.125565E-02
--1.289518E-02
-2.879251E-02
--3.166559E-01
-2.931428E-02
-1.379285E-02
-2.416257E-02
-1.220552E-02
-5.154030E-02
-1.431676E-01
-3.434080E-02
-8.148581E-02
-4.218412E-02
--8.541678E-03
-6.396306E-02
--7.851012E-03
-5.799658E-02
--2.435723E-01
-6.744263E-02
--2.429877E-01
-6.966516E-02
-1.638644E-01
-2.058798E-02
--8.986584E-03
-1.374824E-02
--3.547454E-01
-7.765460E-02
--1.570173E-01
-6.916960E-02
-1.056941E-02
-7.626528E-03
-6.400634E+01
-8.298077E+02
-3.894111E-01
-8.617494E-01
-1.796567E-01
-1.065356E+00
-1.561037E+00
-7.701475E-01
--2.237530E-01
-2.259442E-01
--1.109999E+00
-6.179412E-01
-1.636912E+00
-7.887441E-01
--4.661183E-01
-4.191138E-01
--1.040546E+00
-2.971961E-01
--1.044850E-01
-1.493530E-01
--4.991935E-01
-3.222404E-01
-4.205099E-01
-2.734911E-01
--7.583139E-01
-3.000853E-01
-3.750811E-01
-1.348273E-01
--6.355508E-01
-3.666139E-01
--5.233787E-01
-1.292414E-01
--2.869538E-02
-9.115092E-02
--6.851052E-01
-3.061040E-01
-1.703522E-01
-7.300335E-02
--4.541075E-01
-4.438507E-01
--2.674857E-01
-4.718588E-01
--3.022517E-02
-1.136781E-01
-5.755596E-01
-2.688162E-01
--2.698373E-01
-1.403188E-01
-8.772347E-01
-3.503562E-01
-4.258508E-01
-1.400825E-01
--1.384853E-01
-4.924947E-02
-1.009402E-01
-2.039230E-01
--1.339732E-01
-4.772083E-02
-3.249636E-01
-4.339747E-01
-1.564400E-01
-2.703717E-01
--2.536360E-01
-8.543919E-02
--3.622063E-01
-7.442240E-02
-2.074953E-02
-1.355614E-01
--3.909820E-02
-1.007999E-01
--3.162815E-01
-9.656425E-02
-2.426423E+01
-1.215124E+02
-9.628829E-01
-3.563586E-01
-2.964625E-01
-9.739638E-02
-3.680881E-01
-3.484018E-01
-4.339143E-01
-7.590564E-02
--4.633394E-02
-1.080030E-01
-3.091634E-01
-1.246585E-01
--4.520500E-02
-1.095704E-01
-2.479383E-01
-1.138276E-01
--6.457108E-02
-6.833667E-02
--5.623363E-02
-1.087254E-01
--3.675294E-01
-9.602246E-02
--1.459951E-01
-9.440544E-02
-6.817672E-02
-4.978066E-02
-1.076782E-02
-1.697440E-01
-1.024501E-02
-1.184830E-01
--1.654178E-01
-1.689209E-02
-1.006214E-01
-3.392546E-02
-5.070063E-01
-7.598100E-02
--2.251704E-01
-7.867348E-02
--1.693789E-01
-2.069974E-01
-2.790249E-01
-2.674643E-02
-3.888604E-01
-3.649330E-02
--7.614452E-02
-7.098023E-02
-1.236282E-02
-5.476895E-02
-3.151637E-01
-3.543466E-02
--6.363562E-01
-9.323507E-02
--2.808153E-01
-8.537981E-02
-2.197639E-01
-3.393653E-02
--8.660625E-02
-1.575544E-02
-3.733826E-02
-1.449783E-02
--8.800903E-04
-3.993931E-02
-3.304886E-01
-3.099095E-02
-4.149186E-02
-5.375091E-02
-2.448819E-01
-9.225028E-02
-1.230091E-01
-3.865008E-02
-7.600812E+00
-1.199814E+01
-8.738539E-01
-3.078183E-01
--2.592305E-01
-1.015952E-01
-6.391696E-02
-6.657129E-02
--2.857855E-01
-2.216294E-02
-3.516811E-01
-3.429194E-02
-4.585144E-02
-6.204056E-02
-1.599494E-01
-1.684846E-02
--2.364219E-01
-1.550644E-02
--1.197289E-01
-8.631394E-02
--1.364517E-01
-5.086560E-02
-2.213374E-01
-2.779096E-02
--7.328761E-02
-1.216230E-02
--2.476803E-01
-2.724500E-02
--6.356296E-02
-2.513244E-02
-3.886281E-01
-9.479377E-02
-1.006972E-01
-1.352120E-02
--6.932242E-02
-3.192705E-02
--3.232505E-02
-5.592418E-02
--9.582599E-02
-1.504811E-02
--2.887999E-01
-3.760482E-02
-2.372013E-01
-1.868786E-02
--1.655526E-01
-4.720116E-02
--8.611265E-02
-2.284310E-02
--2.142116E-01
-2.619080E-02
-1.811202E-01
-1.457105E-02
-1.430164E-01
-2.016598E-02
-4.066031E-01
-7.671356E-02
-1.364946E-01
-1.385677E-02
--8.357667E-02
-1.521943E-02
--2.235270E-02
-1.029570E-02
-7.920760E-02
-4.227880E-02
-2.622096E-01
-2.327728E-02
-7.787296E-03
-2.288300E-02
--1.645219E-02
-5.394704E-02
--7.274557E-02
-1.075570E-02
-4.104875E+01
-3.455300E+02
-9.827893E-01
-2.751051E-01
-3.227606E-01
-1.213711E-01
-1.272840E-02
-2.813639E-01
--1.910394E-01
-5.682320E-02
--4.136260E-01
-2.444497E-01
--5.123352E-02
-3.867174E-01
--4.424857E-02
-9.651204E-02
--3.975443E-02
-1.867060E-01
--7.618837E-01
-1.756891E-01
-4.259599E-01
-1.146646E-01
--5.658031E-02
-1.366891E-01
-2.464931E-01
-2.181122E-01
-1.593998E-01
-2.666678E-01
--1.928096E-01
-1.216164E-01
-7.020992E-01
-1.701086E-01
-3.914244E-01
-1.772217E-01
--3.285697E-01
-1.521826E-01
--2.947923E-02
-8.201284E-02
-1.346653E-01
-4.498340E-02
-2.112724E-01
-9.923303E-02
-8.551910E-02
-8.804286E-03
--3.631005E-01
-1.168145E-01
-1.840770E-01
-5.714283E-02
--2.709303E-02
-9.381338E-02
-2.104005E-02
-4.479215E-02
-4.059493E-01
-8.277066E-02
--2.877400E-01
-8.584721E-02
-4.881128E-02
-1.864179E-01
--8.584545E-02
-4.421744E-02
--4.392466E-01
-6.260373E-02
-3.143214E-02
-8.184856E-02
--5.630973E-01
-1.323469E-01
-8.010498E-02
-1.096975E-01
-1.818829E-01
-1.717701E-02
-1.062149E-01
-5.400365E-02
 tally 3:
 3.862543E+01
 2.993190E+02
@@ -1299,3 +879,436 @@ tally 3:
 1.717701E-02
 1.062149E-01
 5.400365E-02
+tally 4:
+3.862543E+01
+2.993190E+02
+5.083613E-01
+2.933365E-01
+-4.356793E-01
+6.676831E-01
+6.093148E-01
+5.685331E-01
+2.512276E-01
+1.308652E-01
+1.075955E+00
+4.775270E-01
+3.660307E-01
+1.627691E-01
+-5.402149E-01
+2.324946E-01
+-3.887573E-01
+1.028105E-01
+-4.324152E-01
+1.015147E-01
+3.306993E-02
+8.425069E-02
+-2.127456E-01
+5.435453E-02
+2.977294E-01
+1.088039E-01
+1.055079E+00
+3.590635E-01
+-6.740592E-01
+2.606281E-01
+-3.329512E-01
+1.587428E-01
+-1.248691E-01
+1.659045E-01
+-2.306000E-01
+1.062057E-01
+9.127791E-02
+2.649459E-01
+-2.629881E-01
+4.786229E-02
+2.286813E-01
+2.363629E-02
+-6.338613E-01
+1.118828E-01
+7.466647E-01
+1.424535E-01
+-7.955161E-02
+1.003327E-02
+1.082691E-01
+2.727882E-02
+5.295185E-01
+1.335133E-01
+-6.321517E-01
+1.422916E-01
+-1.236137E-01
+2.041422E-01
+-5.389265E-02
+1.852888E-01
+-3.746082E-01
+5.580885E-02
+1.383528E-01
+2.754456E-01
+-5.081204E-01
+1.886515E-01
+-4.022264E-01
+1.417397E-01
+3.377771E-01
+6.673888E-02
+1.170109E-01
+1.783182E-02
+2.097916E-01
+7.139323E-02
+1.438678E+01
+4.193571E+01
+6.547124E-01
+1.780450E-01
+2.207489E-01
+2.115835E-01
+-4.952323E-02
+3.039341E-01
+6.681546E-01
+1.389250E-01
+4.078026E-02
+4.393667E-02
+-8.695509E-01
+2.850853E-01
+1.792062E-01
+7.367253E-02
+-5.657500E-01
+2.115125E-01
+8.525189E-02
+2.541971E-02
+5.227867E-02
+2.008468E-02
+-6.825349E-02
+5.316522E-02
+3.763076E-01
+7.112554E-02
+1.279973E-02
+1.883096E-01
+7.775189E-02
+6.874374E-02
+-1.119537E-01
+8.467755E-02
+-1.600632E-01
+8.650448E-02
+-6.210095E-01
+1.094309E-01
+-9.997484E-02
+3.935353E-02
+2.300525E-01
+2.351925E-02
+2.486103E-02
+3.125565E-02
+-1.289518E-02
+2.879251E-02
+-3.166559E-01
+2.931428E-02
+1.379285E-02
+2.416257E-02
+1.220552E-02
+5.154030E-02
+1.431676E-01
+3.434080E-02
+8.148581E-02
+4.218412E-02
+-8.541678E-03
+6.396306E-02
+-7.851012E-03
+5.799658E-02
+-2.435723E-01
+6.744263E-02
+-2.429877E-01
+6.966516E-02
+1.638644E-01
+2.058798E-02
+-8.986584E-03
+1.374824E-02
+-3.547454E-01
+7.765460E-02
+-1.570173E-01
+6.916960E-02
+1.056941E-02
+7.626528E-03
+6.400634E+01
+8.298077E+02
+3.894111E-01
+8.617494E-01
+1.796567E-01
+1.065356E+00
+1.561037E+00
+7.701475E-01
+-2.237530E-01
+2.259442E-01
+-1.109999E+00
+6.179412E-01
+1.636912E+00
+7.887441E-01
+-4.661183E-01
+4.191138E-01
+-1.040546E+00
+2.971961E-01
+-1.044850E-01
+1.493530E-01
+-4.991935E-01
+3.222404E-01
+4.205099E-01
+2.734911E-01
+-7.583139E-01
+3.000853E-01
+3.750811E-01
+1.348273E-01
+-6.355508E-01
+3.666139E-01
+-5.233787E-01
+1.292414E-01
+-2.869538E-02
+9.115092E-02
+-6.851052E-01
+3.061040E-01
+1.703522E-01
+7.300335E-02
+-4.541075E-01
+4.438507E-01
+-2.674857E-01
+4.718588E-01
+-3.022517E-02
+1.136781E-01
+5.755596E-01
+2.688162E-01
+-2.698373E-01
+1.403188E-01
+8.772347E-01
+3.503562E-01
+4.258508E-01
+1.400825E-01
+-1.384853E-01
+4.924947E-02
+1.009402E-01
+2.039230E-01
+-1.339732E-01
+4.772083E-02
+3.249636E-01
+4.339747E-01
+1.564400E-01
+2.703717E-01
+-2.536360E-01
+8.543919E-02
+-3.622063E-01
+7.442240E-02
+2.074953E-02
+1.355614E-01
+-3.909820E-02
+1.007999E-01
+-3.162815E-01
+9.656425E-02
+2.426423E+01
+1.215124E+02
+9.628829E-01
+3.563586E-01
+2.964625E-01
+9.739638E-02
+3.680881E-01
+3.484018E-01
+4.339143E-01
+7.590564E-02
+-4.633394E-02
+1.080030E-01
+3.091634E-01
+1.246585E-01
+-4.520500E-02
+1.095704E-01
+2.479383E-01
+1.138276E-01
+-6.457108E-02
+6.833667E-02
+-5.623363E-02
+1.087254E-01
+-3.675294E-01
+9.602246E-02
+-1.459951E-01
+9.440544E-02
+6.817672E-02
+4.978066E-02
+1.076782E-02
+1.697440E-01
+1.024501E-02
+1.184830E-01
+-1.654178E-01
+1.689209E-02
+1.006214E-01
+3.392546E-02
+5.070063E-01
+7.598100E-02
+-2.251704E-01
+7.867348E-02
+-1.693789E-01
+2.069974E-01
+2.790249E-01
+2.674643E-02
+3.888604E-01
+3.649330E-02
+-7.614452E-02
+7.098023E-02
+1.236282E-02
+5.476895E-02
+3.151637E-01
+3.543466E-02
+-6.363562E-01
+9.323507E-02
+-2.808153E-01
+8.537981E-02
+2.197639E-01
+3.393653E-02
+-8.660625E-02
+1.575544E-02
+3.733826E-02
+1.449783E-02
+-8.800903E-04
+3.993931E-02
+3.304886E-01
+3.099095E-02
+4.149186E-02
+5.375091E-02
+2.448819E-01
+9.225028E-02
+1.230091E-01
+3.865008E-02
+7.600812E+00
+1.199814E+01
+8.738539E-01
+3.078183E-01
+-2.592305E-01
+1.015952E-01
+6.391696E-02
+6.657129E-02
+-2.857855E-01
+2.216294E-02
+3.516811E-01
+3.429194E-02
+4.585144E-02
+6.204056E-02
+1.599494E-01
+1.684846E-02
+-2.364219E-01
+1.550644E-02
+-1.197289E-01
+8.631394E-02
+-1.364517E-01
+5.086560E-02
+2.213374E-01
+2.779096E-02
+-7.328761E-02
+1.216230E-02
+-2.476803E-01
+2.724500E-02
+-6.356296E-02
+2.513244E-02
+3.886281E-01
+9.479377E-02
+1.006972E-01
+1.352120E-02
+-6.932242E-02
+3.192705E-02
+-3.232505E-02
+5.592418E-02
+-9.582599E-02
+1.504811E-02
+-2.887999E-01
+3.760482E-02
+2.372013E-01
+1.868786E-02
+-1.655526E-01
+4.720116E-02
+-8.611265E-02
+2.284310E-02
+-2.142116E-01
+2.619080E-02
+1.811202E-01
+1.457105E-02
+1.430164E-01
+2.016598E-02
+4.066031E-01
+7.671356E-02
+1.364946E-01
+1.385677E-02
+-8.357667E-02
+1.521943E-02
+-2.235270E-02
+1.029570E-02
+7.920760E-02
+4.227880E-02
+2.622096E-01
+2.327728E-02
+7.787296E-03
+2.288300E-02
+-1.645219E-02
+5.394704E-02
+-7.274557E-02
+1.075570E-02
+4.104875E+01
+3.455300E+02
+9.827893E-01
+2.751051E-01
+3.227606E-01
+1.213711E-01
+1.272840E-02
+2.813639E-01
+-1.910394E-01
+5.682320E-02
+-4.136260E-01
+2.444497E-01
+-5.123352E-02
+3.867174E-01
+-4.424857E-02
+9.651204E-02
+-3.975443E-02
+1.867060E-01
+-7.618837E-01
+1.756891E-01
+4.259599E-01
+1.146646E-01
+-5.658031E-02
+1.366891E-01
+2.464931E-01
+2.181122E-01
+1.593998E-01
+2.666678E-01
+-1.928096E-01
+1.216164E-01
+7.020992E-01
+1.701086E-01
+3.914244E-01
+1.772217E-01
+-3.285697E-01
+1.521826E-01
+-2.947923E-02
+8.201284E-02
+1.346653E-01
+4.498340E-02
+2.112724E-01
+9.923303E-02
+8.551910E-02
+8.804286E-03
+-3.631005E-01
+1.168145E-01
+1.840770E-01
+5.714283E-02
+-2.709303E-02
+9.381338E-02
+2.104005E-02
+4.479215E-02
+4.059493E-01
+8.277066E-02
+-2.877400E-01
+8.584721E-02
+4.881128E-02
+1.864179E-01
+-8.584545E-02
+4.421744E-02
+-4.392466E-01
+6.260373E-02
+3.143214E-02
+8.184856E-02
+-5.630973E-01
+1.323469E-01
+8.010498E-02
+1.096975E-01
+1.818829E-01
+1.717701E-02
+1.062149E-01
+5.400365E-02
diff --git a/tests/test_score_flux_yn/test_score_flux_yn.py b/tests/test_score_flux_yn/test_score_flux_yn.py
index 08279dea79..2095fc9b15 100755
--- a/tests/test_score_flux_yn/test_score_flux_yn.py
+++ b/tests/test_score_flux_yn/test_score_flux_yn.py
@@ -11,12 +11,13 @@ import openmc
 class ScoreFluxYnTestHarness(PyAPITestHarness):
     def _build_inputs(self):
         filt = openmc.Filter(type='cell', bins=(21, 22, 23, 27, 28, 29))
-        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 5)]
         [t.add_filter(filt) for t in tallies]
-        [t.add_score('flux-y5') for t in tallies]
-        tallies[0].estimator = 'tracklength'
-        tallies[1].estimator = 'analog'
-        tallies[2].estimator = 'collision'
+        tallies[0].add_score('flux')
+        [t.add_score('flux-y5') for t in tallies[1:]]
+        tallies[1].estimator = 'tracklength'
+        tallies[2].estimator = 'analog'
+        tallies[3].estimator = 'collision'
         self._input_set.tallies = openmc.TalliesFile()
         [self._input_set.tallies.add_tally(t) for t in tallies]
 
diff --git a/tests/test_score_total_yn/inputs_true.dat b/tests/test_score_total_yn/inputs_true.dat
index 133138775d..72173a0319 100644
--- a/tests/test_score_total_yn/inputs_true.dat
+++ b/tests/test_score_total_yn/inputs_true.dat
@@ -1 +1 @@
-1bbb4a3aa9e60b4117ae6cdac13ad20e037846be37100516cbca70ad48947837f157ba441d839b773a260026284fb0f45c80b49db4c1522e64e46d905c77899a
\ No newline at end of file
+def382a2f9efec93baf521911ab89e0d73ceadba486f9bb306e9cf82ffc1c67b72498c153519e05b516ff54db431430b2b25b80675961697e19774455711a5f8
\ No newline at end of file
diff --git a/tests/test_score_total_yn/results_true.dat b/tests/test_score_total_yn/results_true.dat
index 3565711be5..a64aa49cc3 100644
--- a/tests/test_score_total_yn/results_true.dat
+++ b/tests/test_score_total_yn/results_true.dat
@@ -3,6 +3,15 @@ k-combined:
 tally 1:
 0.000000E+00
 0.000000E+00
+1.767552E+01
+6.295417E+01
+3.863588E+00
+3.013300E+00
+5.356594E+01
+5.839391E+02
+tally 2:
+0.000000E+00
+0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -401,7 +410,7 @@ tally 1:
 1.806992E-01
 -1.898620E-01
 1.113751E-01
-tally 2:
+tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -802,7 +811,7 @@ tally 2:
 7.231318E-02
 3.689494E-01
 1.349712E-01
-tally 3:
+tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
diff --git a/tests/test_score_total_yn/test_score_total_yn.py b/tests/test_score_total_yn/test_score_total_yn.py
index 456e1f93b2..a1ca6715cb 100644
--- a/tests/test_score_total_yn/test_score_total_yn.py
+++ b/tests/test_score_total_yn/test_score_total_yn.py
@@ -11,14 +11,15 @@ import openmc
 class ScoreTotalYNTestHarness(PyAPITestHarness):
     def _build_inputs(self):
         filt = openmc.Filter(type='cell', bins=(10, 21, 22, 23))
-        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 5)]
         [t.add_filter(filt) for t in tallies]
-        [t.add_score('total-y4') for t in tallies]
-        [t.add_nuclide('U-235') for t in tallies]
-        [t.add_nuclide('total') for t in tallies]
-        tallies[0].estimator = 'tracklength'
-        tallies[1].estimator = 'analog'
-        tallies[2].estimator = 'collision'
+        tallies[0].add_score('total')
+        [t.add_score('total-y4') for t in tallies[1:]]
+        [t.add_nuclide('U-235') for t in tallies[1:]]
+        [t.add_nuclide('total') for t in tallies[1:]]
+        tallies[1].estimator = 'tracklength'
+        tallies[2].estimator = 'analog'
+        tallies[3].estimator = 'collision'
         self._input_set.tallies = openmc.TalliesFile()
         [self._input_set.tallies.add_tally(t) for t in tallies]
 

From 03a8fb64e6d8b54a4b24dbc2c9057fcdae7f9395 Mon Sep 17 00:00:00 2001
From: Sterling Harper <sterlingmharper@gmail.com>
Date: Sat, 3 Oct 2015 11:28:36 -0400
Subject: [PATCH 08/10] Address @paulromano comments on #469

---
 tests/test_basic/test_basic.py                               | 1 -
 tests/test_cmfd_feed/test_cmfd_feed.py                       | 1 -
 tests/test_cmfd_nofeed/test_cmfd_nofeed.py                   | 1 -
 tests/test_confidence_intervals/test_confidence_intervals.py | 1 -
 tests/test_density_atombcm/test_density_atombcm.py           | 1 -
 tests/test_density_atomcm3/test_density_atomcm3.py           | 1 -
 tests/test_density_kgm3/test_density_kgm3.py                 | 1 -
 tests/test_density_sum/test_density_sum.py                   | 1 -
 .../test_eigenvalue_genperbatch.py                           | 1 -
 .../test_eigenvalue_no_inactive.py                           | 1 -
 tests/test_energy_grid/test_energy_grid.py                   | 1 -
 tests/test_entropy/test_entropy.py                           | 1 -
 tests/test_filter_cell/test_filter_cell.py                   | 5 ++---
 tests/test_filter_cellborn/test_filter_cellborn.py           | 5 ++---
 tests/test_filter_distribcell/test_filter_distribcell.py     | 1 -
 tests/test_filter_energy/test_filter_energy.py               | 5 ++---
 tests/test_filter_energyout/test_filter_energyout.py         | 5 ++---
 .../test_filter_group_transfer/test_filter_group_transfer.py | 5 ++---
 tests/test_filter_material/test_filter_material.py           | 5 ++---
 tests/test_filter_mesh_2d/test_filter_mesh_2d.py             | 1 -
 tests/test_filter_mesh_3d/test_filter_mesh_3d.py             | 1 -
 tests/test_filter_universe/test_filter_universe.py           | 5 ++---
 tests/test_fixed_source/test_fixed_source.py                 | 1 -
 tests/test_infinite_cell/test_infinite_cell.py               | 1 -
 tests/test_lattice/test_lattice.py                           | 1 -
 tests/test_lattice_hex/test_lattice_hex.py                   | 1 -
 tests/test_lattice_mixed/test_lattice_mixed.py               | 1 -
 tests/test_lattice_multiple/test_lattice_multiple.py         | 1 -
 tests/test_many_scores/test_many_scores.py                   | 1 -
 tests/test_natural_element/test_natural_element.py           | 1 -
 tests/test_output/test_output.py                             | 1 -
 .../test_particle_restart_eigval.py                          | 1 -
 .../test_particle_restart_fixed.py                           | 1 -
 tests/test_plot_background/test_plot_background.py           | 1 -
 tests/test_plot_basis/test_plot_basis.py                     | 1 -
 tests/test_plot_colspec/test_plot_colspec.py                 | 1 -
 tests/test_plot_mask/test_plot_mask.py                       | 1 -
 tests/test_ptables_off/test_ptables_off.py                   | 1 -
 tests/test_reflective_cone/test_reflective_cone.py           | 1 -
 tests/test_reflective_cylinder/test_reflective_cylinder.py   | 1 -
 tests/test_reflective_plane/test_reflective_plane.py         | 1 -
 tests/test_reflective_sphere/test_reflective_sphere.py       | 1 -
 tests/test_resonance_scattering/test_resonance_scattering.py | 1 -
 tests/test_rotation/test_rotation.py                         | 1 -
 tests/test_salphabeta/test_salphabeta.py                     | 1 -
 tests/test_salphabeta_multiple/test_salphabeta_multiple.py   | 1 -
 tests/test_score_MT/test_score_MT.py                         | 5 ++---
 tests/test_score_absorption/test_score_absorption.py         | 5 ++---
 tests/test_score_current/test_score_current.py               | 1 -
 tests/test_score_events/test_score_events.py                 | 5 ++---
 tests/test_score_fission/test_score_fission.py               | 5 ++---
 tests/test_score_flux/test_score_flux.py                     | 5 ++---
 tests/test_score_flux_yn/test_score_flux_yn.py               | 5 ++---
 tests/test_score_kappafission/test_score_kappafission.py     | 5 ++---
 tests/test_score_nufission/test_score_nufission.py           | 5 ++---
 tests/test_score_nuscatter/test_score_nuscatter.py           | 3 +--
 tests/test_score_nuscatter_n/test_score_nuscatter_n.py       | 3 +--
 tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py     | 3 +--
 tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py     | 3 +--
 tests/test_score_scatter/test_score_scatter.py               | 5 ++---
 tests/test_score_scatter_n/test_score_scatter_n.py           | 5 ++---
 tests/test_score_scatter_pn/test_score_scatter_pn.py         | 5 ++---
 tests/test_score_scatter_yn/test_score_scatter_yn.py         | 5 ++---
 tests/test_score_total/test_score_total.py                   | 5 ++---
 tests/test_score_total_yn/test_score_total_yn.py             | 5 ++---
 tests/test_seed/test_seed.py                                 | 1 -
 tests/test_source_angle_mono/test_source_angle_mono.py       | 1 -
 .../test_source_energy_maxwell/test_source_energy_maxwell.py | 1 -
 tests/test_source_energy_mono/test_source_energy_mono.py     | 1 -
 tests/test_source_file/test_source_file.py                   | 1 -
 tests/test_source_point/test_source_point.py                 | 1 -
 tests/test_sourcepoint_batch/test_sourcepoint_batch.py       | 1 -
 tests/test_sourcepoint_interval/test_sourcepoint_interval.py | 1 -
 tests/test_sourcepoint_latest/test_sourcepoint_latest.py     | 1 -
 tests/test_sourcepoint_restart/test_sourcepoint_restart.py   | 1 -
 tests/test_statepoint_batch/test_statepoint_batch.py         | 1 -
 tests/test_statepoint_interval/test_statepoint_interval.py   | 1 -
 tests/test_statepoint_restart/test_statepoint_restart.py     | 1 -
 tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py | 1 -
 tests/test_survival_biasing/test_survival_biasing.py         | 1 -
 tests/test_tally_assumesep/test_tally_assumesep.py           | 1 -
 tests/test_tally_nuclides/test_tally_nuclides.py             | 1 -
 tests/test_trace/test_trace.py                               | 1 -
 tests/test_track_output/test_track_output.py                 | 1 -
 tests/test_translation/test_translation.py                   | 1 -
 .../test_trigger_batch_interval.py                           | 1 -
 .../test_trigger_no_batch_interval.py                        | 1 -
 tests/test_trigger_no_status/test_trigger_no_status.py       | 1 -
 tests/test_trigger_tallies/test_trigger_tallies.py           | 1 -
 tests/test_uniform_fs/test_uniform_fs.py                     | 1 -
 tests/test_union_energy_grids/test_union_energy_grids.py     | 1 -
 tests/test_universe/test_universe.py                         | 1 -
 tests/test_void/test_void.py                                 | 1 -
 tests/testing_harness.py                                     | 2 +-
 94 files changed, 47 insertions(+), 140 deletions(-)

diff --git a/tests/test_basic/test_basic.py b/tests/test_basic/test_basic.py
index 835bf91c7b..2a595f3e66 100755
--- a/tests/test_basic/test_basic.py
+++ b/tests/test_basic/test_basic.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_cmfd_feed/test_cmfd_feed.py b/tests/test_cmfd_feed/test_cmfd_feed.py
index af1f0542d4..3bc5f61743 100644
--- a/tests/test_cmfd_feed/test_cmfd_feed.py
+++ b/tests/test_cmfd_feed/test_cmfd_feed.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import CMFDTestHarness
 
 
diff --git a/tests/test_cmfd_nofeed/test_cmfd_nofeed.py b/tests/test_cmfd_nofeed/test_cmfd_nofeed.py
index af1f0542d4..3bc5f61743 100644
--- a/tests/test_cmfd_nofeed/test_cmfd_nofeed.py
+++ b/tests/test_cmfd_nofeed/test_cmfd_nofeed.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import CMFDTestHarness
 
 
diff --git a/tests/test_confidence_intervals/test_confidence_intervals.py b/tests/test_confidence_intervals/test_confidence_intervals.py
index 67227ca324..ed6addec45 100755
--- a/tests/test_confidence_intervals/test_confidence_intervals.py
+++ b/tests/test_confidence_intervals/test_confidence_intervals.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_density_atombcm/test_density_atombcm.py b/tests/test_density_atombcm/test_density_atombcm.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_density_atombcm/test_density_atombcm.py
+++ b/tests/test_density_atombcm/test_density_atombcm.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_density_atomcm3/test_density_atomcm3.py b/tests/test_density_atomcm3/test_density_atomcm3.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_density_atomcm3/test_density_atomcm3.py
+++ b/tests/test_density_atomcm3/test_density_atomcm3.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_density_kgm3/test_density_kgm3.py b/tests/test_density_kgm3/test_density_kgm3.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_density_kgm3/test_density_kgm3.py
+++ b/tests/test_density_kgm3/test_density_kgm3.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_density_sum/test_density_sum.py b/tests/test_density_sum/test_density_sum.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_density_sum/test_density_sum.py
+++ b/tests/test_density_sum/test_density_sum.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_eigenvalue_genperbatch/test_eigenvalue_genperbatch.py b/tests/test_eigenvalue_genperbatch/test_eigenvalue_genperbatch.py
index 3b0d22b9ea..d6f69fdbb5 100644
--- a/tests/test_eigenvalue_genperbatch/test_eigenvalue_genperbatch.py
+++ b/tests/test_eigenvalue_genperbatch/test_eigenvalue_genperbatch.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_eigenvalue_no_inactive/test_eigenvalue_no_inactive.py b/tests/test_eigenvalue_no_inactive/test_eigenvalue_no_inactive.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_eigenvalue_no_inactive/test_eigenvalue_no_inactive.py
+++ b/tests/test_eigenvalue_no_inactive/test_eigenvalue_no_inactive.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_energy_grid/test_energy_grid.py b/tests/test_energy_grid/test_energy_grid.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_energy_grid/test_energy_grid.py
+++ b/tests/test_energy_grid/test_energy_grid.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_entropy/test_entropy.py b/tests/test_entropy/test_entropy.py
index 1af8945e34..113cafcb27 100644
--- a/tests/test_entropy/test_entropy.py
+++ b/tests/test_entropy/test_entropy.py
@@ -4,7 +4,6 @@ import glob
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 from openmc.statepoint import StatePoint
 
diff --git a/tests/test_filter_cell/test_filter_cell.py b/tests/test_filter_cell/test_filter_cell.py
index 767007d7ab..d532d59cf8 100644
--- a/tests/test_filter_cell/test_filter_cell.py
+++ b/tests/test_filter_cell/test_filter_cell.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -17,10 +16,10 @@ class FilterCellTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         self._input_set.tallies.add_tally(tally)
 
-        PyAPITestHarness._build_inputs(self)
+        super(FilterCellTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(FilterCellTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_filter_cellborn/test_filter_cellborn.py b/tests/test_filter_cellborn/test_filter_cellborn.py
index 14b50137eb..2fac6a1fcd 100644
--- a/tests/test_filter_cellborn/test_filter_cellborn.py
+++ b/tests/test_filter_cellborn/test_filter_cellborn.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -17,10 +16,10 @@ class FilterCellbornTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         self._input_set.tallies.add_tally(tally)
 
-        PyAPITestHarness._build_inputs(self)
+        super(FilterCellbornTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(FilterCellbornTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_filter_distribcell/test_filter_distribcell.py b/tests/test_filter_distribcell/test_filter_distribcell.py
index a0ed938ba3..872d29552b 100644
--- a/tests/test_filter_distribcell/test_filter_distribcell.py
+++ b/tests/test_filter_distribcell/test_filter_distribcell.py
@@ -5,7 +5,6 @@ import hashlib
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import *
 
 
diff --git a/tests/test_filter_energy/test_filter_energy.py b/tests/test_filter_energy/test_filter_energy.py
index 55e7e55c65..54d1dd4b7f 100644
--- a/tests/test_filter_energy/test_filter_energy.py
+++ b/tests/test_filter_energy/test_filter_energy.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -18,10 +17,10 @@ class FilterEnergyTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         self._input_set.tallies.add_tally(tally)
 
-        PyAPITestHarness._build_inputs(self)
+        super(FilterEnergyTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(FilterEnergyTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_filter_energyout/test_filter_energyout.py b/tests/test_filter_energyout/test_filter_energyout.py
index d1fda4e0da..43a8c7d5a9 100644
--- a/tests/test_filter_energyout/test_filter_energyout.py
+++ b/tests/test_filter_energyout/test_filter_energyout.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -18,10 +17,10 @@ class FilterEnergyoutTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         self._input_set.tallies.add_tally(tally)
 
-        PyAPITestHarness._build_inputs(self)
+        super(FilterEnergyoutTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(FilterEnergyoutTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_filter_group_transfer/test_filter_group_transfer.py b/tests/test_filter_group_transfer/test_filter_group_transfer.py
index fcffc45d11..cbea5e0a7f 100644
--- a/tests/test_filter_group_transfer/test_filter_group_transfer.py
+++ b/tests/test_filter_group_transfer/test_filter_group_transfer.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -22,10 +21,10 @@ class FilterGroupTransferTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         self._input_set.tallies.add_tally(tally)
 
-        PyAPITestHarness._build_inputs(self)
+        super(FilterGroupTransferTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(FilterGroupTransferTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_filter_material/test_filter_material.py b/tests/test_filter_material/test_filter_material.py
index 8d66e822eb..8e42d8c9a2 100644
--- a/tests/test_filter_material/test_filter_material.py
+++ b/tests/test_filter_material/test_filter_material.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -17,10 +16,10 @@ class FilterMaterialTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         self._input_set.tallies.add_tally(tally)
 
-        PyAPITestHarness._build_inputs(self)
+        super(FilterMaterialTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(FilterMaterialTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_filter_mesh_2d/test_filter_mesh_2d.py b/tests/test_filter_mesh_2d/test_filter_mesh_2d.py
index 67227ca324..ed6addec45 100644
--- a/tests/test_filter_mesh_2d/test_filter_mesh_2d.py
+++ b/tests/test_filter_mesh_2d/test_filter_mesh_2d.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_filter_mesh_3d/test_filter_mesh_3d.py b/tests/test_filter_mesh_3d/test_filter_mesh_3d.py
index 67227ca324..ed6addec45 100644
--- a/tests/test_filter_mesh_3d/test_filter_mesh_3d.py
+++ b/tests/test_filter_mesh_3d/test_filter_mesh_3d.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_filter_universe/test_filter_universe.py b/tests/test_filter_universe/test_filter_universe.py
index 1bd62d0b27..00dd166196 100644
--- a/tests/test_filter_universe/test_filter_universe.py
+++ b/tests/test_filter_universe/test_filter_universe.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -17,10 +16,10 @@ class FilterUniverseTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         self._input_set.tallies.add_tally(tally)
 
-        PyAPITestHarness._build_inputs(self)
+        super(FilterUniverseTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(FilterUniverseTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_fixed_source/test_fixed_source.py b/tests/test_fixed_source/test_fixed_source.py
index 2a41345f6a..12dbb8d769 100644
--- a/tests/test_fixed_source/test_fixed_source.py
+++ b/tests/test_fixed_source/test_fixed_source.py
@@ -5,7 +5,6 @@ import os
 import sys
 import numpy as np
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 from openmc.statepoint import StatePoint
 
diff --git a/tests/test_infinite_cell/test_infinite_cell.py b/tests/test_infinite_cell/test_infinite_cell.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_infinite_cell/test_infinite_cell.py
+++ b/tests/test_infinite_cell/test_infinite_cell.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_lattice/test_lattice.py b/tests/test_lattice/test_lattice.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_lattice/test_lattice.py
+++ b/tests/test_lattice/test_lattice.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_lattice_hex/test_lattice_hex.py b/tests/test_lattice_hex/test_lattice_hex.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_lattice_hex/test_lattice_hex.py
+++ b/tests/test_lattice_hex/test_lattice_hex.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_lattice_mixed/test_lattice_mixed.py b/tests/test_lattice_mixed/test_lattice_mixed.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_lattice_mixed/test_lattice_mixed.py
+++ b/tests/test_lattice_mixed/test_lattice_mixed.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_lattice_multiple/test_lattice_multiple.py b/tests/test_lattice_multiple/test_lattice_multiple.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_lattice_multiple/test_lattice_multiple.py
+++ b/tests/test_lattice_multiple/test_lattice_multiple.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_many_scores/test_many_scores.py b/tests/test_many_scores/test_many_scores.py
index 4518fc3637..88c3bdfb3d 100644
--- a/tests/test_many_scores/test_many_scores.py
+++ b/tests/test_many_scores/test_many_scores.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_natural_element/test_natural_element.py b/tests/test_natural_element/test_natural_element.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_natural_element/test_natural_element.py
+++ b/tests/test_natural_element/test_natural_element.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_output/test_output.py b/tests/test_output/test_output.py
index 007d3952de..8e36ead808 100644
--- a/tests/test_output/test_output.py
+++ b/tests/test_output/test_output.py
@@ -4,7 +4,6 @@ import glob
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_particle_restart_eigval/test_particle_restart_eigval.py b/tests/test_particle_restart_eigval/test_particle_restart_eigval.py
index 38441f1529..139cb2b9f5 100644
--- a/tests/test_particle_restart_eigval/test_particle_restart_eigval.py
+++ b/tests/test_particle_restart_eigval/test_particle_restart_eigval.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import ParticleRestartTestHarness
 
 
diff --git a/tests/test_particle_restart_fixed/test_particle_restart_fixed.py b/tests/test_particle_restart_fixed/test_particle_restart_fixed.py
index dd74fa4f5b..5af7454894 100644
--- a/tests/test_particle_restart_fixed/test_particle_restart_fixed.py
+++ b/tests/test_particle_restart_fixed/test_particle_restart_fixed.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import ParticleRestartTestHarness
 
 
diff --git a/tests/test_plot_background/test_plot_background.py b/tests/test_plot_background/test_plot_background.py
index b769f2d3dc..7890eca19d 100644
--- a/tests/test_plot_background/test_plot_background.py
+++ b/tests/test_plot_background/test_plot_background.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import PlotTestHarness
 
 
diff --git a/tests/test_plot_basis/test_plot_basis.py b/tests/test_plot_basis/test_plot_basis.py
index 34b7486247..d45479e256 100644
--- a/tests/test_plot_basis/test_plot_basis.py
+++ b/tests/test_plot_basis/test_plot_basis.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import PlotTestHarness
 
 
diff --git a/tests/test_plot_colspec/test_plot_colspec.py b/tests/test_plot_colspec/test_plot_colspec.py
index b769f2d3dc..7890eca19d 100644
--- a/tests/test_plot_colspec/test_plot_colspec.py
+++ b/tests/test_plot_colspec/test_plot_colspec.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import PlotTestHarness
 
 
diff --git a/tests/test_plot_mask/test_plot_mask.py b/tests/test_plot_mask/test_plot_mask.py
index 34b7486247..d45479e256 100644
--- a/tests/test_plot_mask/test_plot_mask.py
+++ b/tests/test_plot_mask/test_plot_mask.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import PlotTestHarness
 
 
diff --git a/tests/test_ptables_off/test_ptables_off.py b/tests/test_ptables_off/test_ptables_off.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_ptables_off/test_ptables_off.py
+++ b/tests/test_ptables_off/test_ptables_off.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_reflective_cone/test_reflective_cone.py b/tests/test_reflective_cone/test_reflective_cone.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_reflective_cone/test_reflective_cone.py
+++ b/tests/test_reflective_cone/test_reflective_cone.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_reflective_cylinder/test_reflective_cylinder.py b/tests/test_reflective_cylinder/test_reflective_cylinder.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_reflective_cylinder/test_reflective_cylinder.py
+++ b/tests/test_reflective_cylinder/test_reflective_cylinder.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_reflective_plane/test_reflective_plane.py b/tests/test_reflective_plane/test_reflective_plane.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_reflective_plane/test_reflective_plane.py
+++ b/tests/test_reflective_plane/test_reflective_plane.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_reflective_sphere/test_reflective_sphere.py b/tests/test_reflective_sphere/test_reflective_sphere.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_reflective_sphere/test_reflective_sphere.py
+++ b/tests/test_reflective_sphere/test_reflective_sphere.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_resonance_scattering/test_resonance_scattering.py b/tests/test_resonance_scattering/test_resonance_scattering.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_resonance_scattering/test_resonance_scattering.py
+++ b/tests/test_resonance_scattering/test_resonance_scattering.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_rotation/test_rotation.py b/tests/test_rotation/test_rotation.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_rotation/test_rotation.py
+++ b/tests/test_rotation/test_rotation.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_salphabeta/test_salphabeta.py b/tests/test_salphabeta/test_salphabeta.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_salphabeta/test_salphabeta.py
+++ b/tests/test_salphabeta/test_salphabeta.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_salphabeta_multiple/test_salphabeta_multiple.py b/tests/test_salphabeta_multiple/test_salphabeta_multiple.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_salphabeta_multiple/test_salphabeta_multiple.py
+++ b/tests/test_salphabeta_multiple/test_salphabeta_multiple.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_score_MT/test_score_MT.py b/tests/test_score_MT/test_score_MT.py
index a944771f3b..dae86d418c 100644
--- a/tests/test_score_MT/test_score_MT.py
+++ b/tests/test_score_MT/test_score_MT.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -23,10 +22,10 @@ class ScoreMTTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         [self._input_set.tallies.add_tally(t) for t in tallies]
 
-        PyAPITestHarness._build_inputs(self)
+        super(ScoreMTTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreMTTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_score_absorption/test_score_absorption.py b/tests/test_score_absorption/test_score_absorption.py
index 7547b1e4ed..c7e3e130df 100644
--- a/tests/test_score_absorption/test_score_absorption.py
+++ b/tests/test_score_absorption/test_score_absorption.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -20,10 +19,10 @@ class ScoreAbsorptionTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         [self._input_set.tallies.add_tally(t) for t in tallies]
 
-        PyAPITestHarness._build_inputs(self)
+        super(ScoreAbsorptionTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreAbsorptionTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_score_current/test_score_current.py b/tests/test_score_current/test_score_current.py
index 87a3226b0b..99c2981c2a 100644
--- a/tests/test_score_current/test_score_current.py
+++ b/tests/test_score_current/test_score_current.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import HashedTestHarness
 
 
diff --git a/tests/test_score_events/test_score_events.py b/tests/test_score_events/test_score_events.py
index 5d861f4509..dce944592e 100644
--- a/tests/test_score_events/test_score_events.py
+++ b/tests/test_score_events/test_score_events.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -19,10 +18,10 @@ class ScoreEventsTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         [self._input_set.tallies.add_tally(t) for t in tallies]
 
-        PyAPITestHarness._build_inputs(self)
+        super(ScoreEventsTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreEventsTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_score_fission/test_score_fission.py b/tests/test_score_fission/test_score_fission.py
index 4dc76fc0c0..4026c0cabf 100644
--- a/tests/test_score_fission/test_score_fission.py
+++ b/tests/test_score_fission/test_score_fission.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -20,10 +19,10 @@ class ScoreFissionTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         [self._input_set.tallies.add_tally(t) for t in tallies]
 
-        PyAPITestHarness._build_inputs(self)
+        super(ScoreFissionTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreFissionTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_score_flux/test_score_flux.py b/tests/test_score_flux/test_score_flux.py
index f5f7351727..1eea55f45f 100644
--- a/tests/test_score_flux/test_score_flux.py
+++ b/tests/test_score_flux/test_score_flux.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -20,10 +19,10 @@ class ScoreFluxTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         [self._input_set.tallies.add_tally(t) for t in tallies]
 
-        PyAPITestHarness._build_inputs(self)
+        super(ScoreFluxTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreFluxTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_score_flux_yn/test_score_flux_yn.py b/tests/test_score_flux_yn/test_score_flux_yn.py
index 2095fc9b15..254069226c 100755
--- a/tests/test_score_flux_yn/test_score_flux_yn.py
+++ b/tests/test_score_flux_yn/test_score_flux_yn.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -21,10 +20,10 @@ class ScoreFluxYnTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         [self._input_set.tallies.add_tally(t) for t in tallies]
 
-        PyAPITestHarness._build_inputs(self)
+        super(ScoreFluxYnTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreFluxYnTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_score_kappafission/test_score_kappafission.py b/tests/test_score_kappafission/test_score_kappafission.py
index c9fc1bfe04..2e93b51c46 100644
--- a/tests/test_score_kappafission/test_score_kappafission.py
+++ b/tests/test_score_kappafission/test_score_kappafission.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -20,10 +19,10 @@ class ScoreKappaFissionTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         [self._input_set.tallies.add_tally(t) for t in tallies]
 
-        PyAPITestHarness._build_inputs(self)
+        super(ScoreKappaFissionTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreKappaFissionTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_score_nufission/test_score_nufission.py b/tests/test_score_nufission/test_score_nufission.py
index 800200725f..3d540daac7 100644
--- a/tests/test_score_nufission/test_score_nufission.py
+++ b/tests/test_score_nufission/test_score_nufission.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -20,10 +19,10 @@ class ScoreNuFissionTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         [self._input_set.tallies.add_tally(t) for t in tallies]
 
-        PyAPITestHarness._build_inputs(self)
+        super(ScoreNuFissionTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreNuFissionTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_score_nuscatter/test_score_nuscatter.py b/tests/test_score_nuscatter/test_score_nuscatter.py
index d13ded507c..6f33181265 100644
--- a/tests/test_score_nuscatter/test_score_nuscatter.py
+++ b/tests/test_score_nuscatter/test_score_nuscatter.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -25,7 +24,7 @@ class ScoreNuScatterTestHarness(PyAPITestHarness):
         self._input_set.export()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreNuScatterTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_score_nuscatter_n/test_score_nuscatter_n.py b/tests/test_score_nuscatter_n/test_score_nuscatter_n.py
index c675bc7be3..40029bd02c 100644
--- a/tests/test_score_nuscatter_n/test_score_nuscatter_n.py
+++ b/tests/test_score_nuscatter_n/test_score_nuscatter_n.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -29,7 +28,7 @@ class ScoreNuScatterNTestHarness(PyAPITestHarness):
         self._input_set.export()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreNuScatterNTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py b/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py
index d3a4a55961..6a69fe054d 100644
--- a/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py
+++ b/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -33,7 +32,7 @@ class ScoreNuScatterPNTestHarness(PyAPITestHarness):
         self._input_set.export()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreNuScatterPNTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py b/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py
index d48df6a21e..6a6ad54956 100644
--- a/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py
+++ b/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -29,7 +28,7 @@ class ScoreNuScatterYNTestHarness(PyAPITestHarness):
         self._input_set.export()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreNuScatterYNTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_score_scatter/test_score_scatter.py b/tests/test_score_scatter/test_score_scatter.py
index b6396ff3ef..0b2621acd3 100644
--- a/tests/test_score_scatter/test_score_scatter.py
+++ b/tests/test_score_scatter/test_score_scatter.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -20,10 +19,10 @@ class ScoreScatterTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         [self._input_set.tallies.add_tally(t) for t in tallies]
 
-        PyAPITestHarness._build_inputs(self)
+        super(ScoreScatterTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreScatterTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_score_scatter_n/test_score_scatter_n.py b/tests/test_score_scatter_n/test_score_scatter_n.py
index 341b687c5f..47fd12b2ed 100644
--- a/tests/test_score_scatter_n/test_score_scatter_n.py
+++ b/tests/test_score_scatter_n/test_score_scatter_n.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -21,10 +20,10 @@ class ScoreScatterNTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         self._input_set.tallies.add_tally(t)
 
-        PyAPITestHarness._build_inputs(self)
+        super(ScoreScatterNTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreScatterNTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_score_scatter_pn/test_score_scatter_pn.py b/tests/test_score_scatter_pn/test_score_scatter_pn.py
index 6fb304ac53..9186fe5480 100644
--- a/tests/test_score_scatter_pn/test_score_scatter_pn.py
+++ b/tests/test_score_scatter_pn/test_score_scatter_pn.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -26,10 +25,10 @@ class ScoreScatterPNTestHarness(PyAPITestHarness):
         self._input_set.tallies.add_tally(t1)
         self._input_set.tallies.add_tally(t2)
 
-        PyAPITestHarness._build_inputs(self)
+        super(ScoreScatterPNTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreScatterPNTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_score_scatter_yn/test_score_scatter_yn.py b/tests/test_score_scatter_yn/test_score_scatter_yn.py
index 7d572b2abb..9e6900031f 100644
--- a/tests/test_score_scatter_yn/test_score_scatter_yn.py
+++ b/tests/test_score_scatter_yn/test_score_scatter_yn.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -22,10 +21,10 @@ class ScoreScatterYNTestHarness(PyAPITestHarness):
         self._input_set.tallies.add_tally(t1)
         self._input_set.tallies.add_tally(t2)
 
-        PyAPITestHarness._build_inputs(self)
+        super(ScoreScatterYNTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreScatterYNTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_score_total/test_score_total.py b/tests/test_score_total/test_score_total.py
index c5e4294155..c6f3f335fc 100644
--- a/tests/test_score_total/test_score_total.py
+++ b/tests/test_score_total/test_score_total.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -20,10 +19,10 @@ class ScoreTotalTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         [self._input_set.tallies.add_tally(t) for t in tallies]
 
-        PyAPITestHarness._build_inputs(self)
+        super(ScoreTotalTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreTotalTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_score_total_yn/test_score_total_yn.py b/tests/test_score_total_yn/test_score_total_yn.py
index a1ca6715cb..80f947f920 100644
--- a/tests/test_score_total_yn/test_score_total_yn.py
+++ b/tests/test_score_total_yn/test_score_total_yn.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness, PyAPITestHarness
 import openmc
 
@@ -23,10 +22,10 @@ class ScoreTotalYNTestHarness(PyAPITestHarness):
         self._input_set.tallies = openmc.TalliesFile()
         [self._input_set.tallies.add_tally(t) for t in tallies]
 
-        PyAPITestHarness._build_inputs(self)
+        super(ScoreTotalYNTestHarness, self)._build_inputs()
 
     def _cleanup(self):
-        PyAPITestHarness._cleanup(self)
+        super(ScoreTotalYNTestHarness, self)._cleanup()
         f = os.path.join(os.getcwd(), 'tallies.xml')
         if os.path.exists(f): os.remove(f)
 
diff --git a/tests/test_seed/test_seed.py b/tests/test_seed/test_seed.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_seed/test_seed.py
+++ b/tests/test_seed/test_seed.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_source_angle_mono/test_source_angle_mono.py b/tests/test_source_angle_mono/test_source_angle_mono.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_source_angle_mono/test_source_angle_mono.py
+++ b/tests/test_source_angle_mono/test_source_angle_mono.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_source_energy_maxwell/test_source_energy_maxwell.py b/tests/test_source_energy_maxwell/test_source_energy_maxwell.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_source_energy_maxwell/test_source_energy_maxwell.py
+++ b/tests/test_source_energy_maxwell/test_source_energy_maxwell.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_source_energy_mono/test_source_energy_mono.py b/tests/test_source_energy_mono/test_source_energy_mono.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_source_energy_mono/test_source_energy_mono.py
+++ b/tests/test_source_energy_mono/test_source_energy_mono.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_source_file/test_source_file.py b/tests/test_source_file/test_source_file.py
index 5420d71e82..6f76438c2a 100644
--- a/tests/test_source_file/test_source_file.py
+++ b/tests/test_source_file/test_source_file.py
@@ -4,7 +4,6 @@ import glob
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import *
 
 
diff --git a/tests/test_source_point/test_source_point.py b/tests/test_source_point/test_source_point.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_source_point/test_source_point.py
+++ b/tests/test_source_point/test_source_point.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_sourcepoint_batch/test_sourcepoint_batch.py b/tests/test_sourcepoint_batch/test_sourcepoint_batch.py
index eb3136754c..5db0541344 100644
--- a/tests/test_sourcepoint_batch/test_sourcepoint_batch.py
+++ b/tests/test_sourcepoint_batch/test_sourcepoint_batch.py
@@ -4,7 +4,6 @@ import glob
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 from openmc.statepoint import StatePoint
 
diff --git a/tests/test_sourcepoint_interval/test_sourcepoint_interval.py b/tests/test_sourcepoint_interval/test_sourcepoint_interval.py
index eb3136754c..5db0541344 100644
--- a/tests/test_sourcepoint_interval/test_sourcepoint_interval.py
+++ b/tests/test_sourcepoint_interval/test_sourcepoint_interval.py
@@ -4,7 +4,6 @@ import glob
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 from openmc.statepoint import StatePoint
 
diff --git a/tests/test_sourcepoint_latest/test_sourcepoint_latest.py b/tests/test_sourcepoint_latest/test_sourcepoint_latest.py
index 245eede759..724a88fa65 100644
--- a/tests/test_sourcepoint_latest/test_sourcepoint_latest.py
+++ b/tests/test_sourcepoint_latest/test_sourcepoint_latest.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_sourcepoint_restart/test_sourcepoint_restart.py b/tests/test_sourcepoint_restart/test_sourcepoint_restart.py
index 67227ca324..ed6addec45 100644
--- a/tests/test_sourcepoint_restart/test_sourcepoint_restart.py
+++ b/tests/test_sourcepoint_restart/test_sourcepoint_restart.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_statepoint_batch/test_statepoint_batch.py b/tests/test_statepoint_batch/test_statepoint_batch.py
index 8a0ef83d27..e1dc167ffd 100644
--- a/tests/test_statepoint_batch/test_statepoint_batch.py
+++ b/tests/test_statepoint_batch/test_statepoint_batch.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_statepoint_interval/test_statepoint_interval.py b/tests/test_statepoint_interval/test_statepoint_interval.py
index 47db80f656..e7a42cdbe7 100644
--- a/tests/test_statepoint_interval/test_statepoint_interval.py
+++ b/tests/test_statepoint_interval/test_statepoint_interval.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_statepoint_restart/test_statepoint_restart.py b/tests/test_statepoint_restart/test_statepoint_restart.py
index 91c316f6a5..59b77a8213 100644
--- a/tests/test_statepoint_restart/test_statepoint_restart.py
+++ b/tests/test_statepoint_restart/test_statepoint_restart.py
@@ -4,7 +4,6 @@ import glob
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 from openmc.statepoint import StatePoint
 from openmc.executor import Executor
diff --git a/tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py b/tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py
index 70ba94838f..00ded42ec2 100644
--- a/tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py
+++ b/tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py
@@ -4,7 +4,6 @@ import glob
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_survival_biasing/test_survival_biasing.py b/tests/test_survival_biasing/test_survival_biasing.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_survival_biasing/test_survival_biasing.py
+++ b/tests/test_survival_biasing/test_survival_biasing.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_tally_assumesep/test_tally_assumesep.py b/tests/test_tally_assumesep/test_tally_assumesep.py
index 67227ca324..ed6addec45 100644
--- a/tests/test_tally_assumesep/test_tally_assumesep.py
+++ b/tests/test_tally_assumesep/test_tally_assumesep.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_tally_nuclides/test_tally_nuclides.py b/tests/test_tally_nuclides/test_tally_nuclides.py
index 67227ca324..ed6addec45 100644
--- a/tests/test_tally_nuclides/test_tally_nuclides.py
+++ b/tests/test_tally_nuclides/test_tally_nuclides.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_trace/test_trace.py b/tests/test_trace/test_trace.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_trace/test_trace.py
+++ b/tests/test_trace/test_trace.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_track_output/test_track_output.py b/tests/test_track_output/test_track_output.py
index 7039120a41..c19d39e0a6 100644
--- a/tests/test_track_output/test_track_output.py
+++ b/tests/test_track_output/test_track_output.py
@@ -5,7 +5,6 @@ import os
 import shutil
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_translation/test_translation.py b/tests/test_translation/test_translation.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_translation/test_translation.py
+++ b/tests/test_translation/test_translation.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_trigger_batch_interval/test_trigger_batch_interval.py b/tests/test_trigger_batch_interval/test_trigger_batch_interval.py
index 18b904efb5..59b900e503 100644
--- a/tests/test_trigger_batch_interval/test_trigger_batch_interval.py
+++ b/tests/test_trigger_batch_interval/test_trigger_batch_interval.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_trigger_no_batch_interval/test_trigger_no_batch_interval.py b/tests/test_trigger_no_batch_interval/test_trigger_no_batch_interval.py
index 983f941d93..f9cb68d627 100644
--- a/tests/test_trigger_no_batch_interval/test_trigger_no_batch_interval.py
+++ b/tests/test_trigger_no_batch_interval/test_trigger_no_batch_interval.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_trigger_no_status/test_trigger_no_status.py b/tests/test_trigger_no_status/test_trigger_no_status.py
index 67227ca324..ed6addec45 100644
--- a/tests/test_trigger_no_status/test_trigger_no_status.py
+++ b/tests/test_trigger_no_status/test_trigger_no_status.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_trigger_tallies/test_trigger_tallies.py b/tests/test_trigger_tallies/test_trigger_tallies.py
index 812e2c5e50..a0b2119dea 100644
--- a/tests/test_trigger_tallies/test_trigger_tallies.py
+++ b/tests/test_trigger_tallies/test_trigger_tallies.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_uniform_fs/test_uniform_fs.py b/tests/test_uniform_fs/test_uniform_fs.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_uniform_fs/test_uniform_fs.py
+++ b/tests/test_uniform_fs/test_uniform_fs.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_union_energy_grids/test_union_energy_grids.py b/tests/test_union_energy_grids/test_union_energy_grids.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_union_energy_grids/test_union_energy_grids.py
+++ b/tests/test_union_energy_grids/test_union_energy_grids.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_universe/test_universe.py b/tests/test_universe/test_universe.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_universe/test_universe.py
+++ b/tests/test_universe/test_universe.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/test_void/test_void.py b/tests/test_void/test_void.py
index 835bf91c7b..2a595f3e66 100644
--- a/tests/test_void/test_void.py
+++ b/tests/test_void/test_void.py
@@ -3,7 +3,6 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
-sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from testing_harness import TestHarness
 
 
diff --git a/tests/testing_harness.py b/tests/testing_harness.py
index ff13e580cf..828fc3a094 100644
--- a/tests/testing_harness.py
+++ b/tests/testing_harness.py
@@ -11,8 +11,8 @@ import sys
 
 import numpy as np
 
+sys.path.insert(0, os.path.join(os.pardir, os.pardir))
 from input_set import InputSet
-sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 from openmc.executor import Executor
 import openmc.particle_restart as pr

From 3327242acffe2847f6db8ae43fbc081f275ee001 Mon Sep 17 00:00:00 2001
From: Sterling Harper <sterlingmharper@gmail.com>
Date: Sat, 3 Oct 2015 23:53:06 -0400
Subject: [PATCH 09/10] Fix Python import in test_track_output

---
 tests/test_track_output/test_track_output.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_track_output/test_track_output.py b/tests/test_track_output/test_track_output.py
index c19d39e0a6..9e9ce87adb 100644
--- a/tests/test_track_output/test_track_output.py
+++ b/tests/test_track_output/test_track_output.py
@@ -2,6 +2,7 @@
 
 import glob
 import os
+from subprocess import call
 import shutil
 import sys
 sys.path.insert(0, os.pardir)

From 6871d15447a8541eda01062dd37c90eadf928bbf Mon Sep 17 00:00:00 2001
From: Sterling Harper <sterlingmharper@gmail.com>
Date: Sun, 4 Oct 2015 16:20:10 -0400
Subject: [PATCH 10/10] Fix typo in #469

---
 tests/input_set.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/input_set.py b/tests/input_set.py
index 95cf07a142..0af9345d9a 100644
--- a/tests/input_set.py
+++ b/tests/input_set.py
@@ -435,14 +435,14 @@ class InputSet(object):
         c70.fill = hot_water
         fa_hw.add_cells((c70, ))
 
-        fa_cold = openmc.Universe(name='Fuel assemlby (cold)', universe_id=6)
+        fa_cold = openmc.Universe(name='Fuel assembly (cold)', universe_id=6)
         c60 = openmc.Cell(cell_id=60)
         c60.add_surface(s34, +1)
         c60.add_surface(s35, -1)
         c60.fill = l100
         fa_cold.add_cells((c60, ))
 
-        fa_hot = openmc.Universe(name='Fuel assemlby (hot)', universe_id=8)
+        fa_hot = openmc.Universe(name='Fuel assembly (hot)', universe_id=8)
         c80 = openmc.Cell(cell_id=80)
         c80.add_surface(s35, +1)
         c80.add_surface(s36, -1)