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] 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'))