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

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

diff --git a/tests/test_score_MT/geometry.xml b/tests/test_score_MT/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_MT/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-    </universes>
-  </lattice>
-
-</geometry>
diff --git a/tests/test_score_MT/inputs_true.dat b/tests/test_score_MT/inputs_true.dat
new file mode 100644
index 0000000000..b78dd8061f
--- /dev/null
+++ b/tests/test_score_MT/inputs_true.dat
@@ -0,0 +1 @@
+5bf02c7821f3a428d780a95fcffc5873d3ff025f77e511a8bc4d35551bfa8ff1bf95b3d177971fe55f6b58133f303fe7003054125f396bd56c1924a852ff4681
\ No newline at end of file
diff --git a/tests/test_score_MT/materials.xml b/tests/test_score_MT/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_MT/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_MT/results_true.dat b/tests/test_score_MT/results_true.dat
index 4b1c1af26c..dc3dce006a 100644
--- a/tests/test_score_MT/results_true.dat
+++ b/tests/test_score_MT/results_true.dat
@@ -1,5 +1,5 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
 0.000000E+00
 0.000000E+00
@@ -9,30 +9,30 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-6.261679E-03
-2.310296E-05
-6.261679E-03
-2.310296E-05
-3.434524E-01
-2.482946E-02
-1.059004E+00
-2.432555E-01
-3.828838E-04
-9.365499E-08
-3.828838E-04
-9.365499E-08
-3.226036E-02
-2.229037E-04
-1.450446E-02
-4.382852E-05
-8.650696E-08
-7.483455E-15
-8.650696E-08
-7.483455E-15
-7.312640E-05
-2.080857E-09
-6.101318E-02
-8.452067E-04
+4.549173E-03
+1.042847E-05
+4.549173E-03
+1.042847E-05
+5.349258E-01
+5.819756E-02
+1.771520E+00
+6.368768E-01
+2.840231E-04
+7.989175E-08
+2.840231E-04
+7.989175E-08
+4.456152E-02
+4.011605E-04
+3.237732E-02
+2.535641E-04
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+9.260440E-05
+2.080213E-09
+9.514028E-02
+1.832676E-03
 tally 2:
 0.000000E+00
 0.000000E+00
@@ -46,16 +46,16 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.000000E-01
-2.440000E-02
+5.700000E-01
+6.530000E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.000000E-02
-6.000000E-04
+5.000000E-02
+1.100000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -75,27 +75,27 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.724026E-03
-1.684945E-05
-5.724026E-03
-1.684945E-05
-3.250298E-01
-2.370870E-02
-1.083784E+00
-2.568556E-01
-4.449887E-05
-1.980149E-09
-4.449887E-05
-1.980149E-09
-3.526275E-02
-2.863085E-04
-1.417358E-02
-4.375519E-05
+7.477762E-03
+3.606695E-05
+7.477762E-03
+3.606695E-05
+5.749995E-01
+6.679702E-02
+1.748150E+00
+6.191138E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.106469E-05
-8.605176E-10
-6.204277E-02
-8.555398E-04
+4.201948E-02
+3.812116E-04
+2.128743E-02
+1.104373E-04
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.503792E-04
+7.112750E-09
+9.209675E-02
+1.724470E-03
diff --git a/tests/test_score_MT/settings.xml b/tests/test_score_MT/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_MT/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_MT/tallies.xml b/tests/test_score_MT/tallies.xml
deleted file mode 100644
index 5e66ae929e..0000000000
--- a/tests/test_score_MT/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>n2n 16 51 102</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>n2n 16 51 102</scores>
-    <estimator>analog</estimator>
-  </tally>
-
-  <tally id="3">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>n2n 16 51 102</scores>
-    <estimator>collision</estimator>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_MT/test_score_MT.py b/tests/test_score_MT/test_score_MT.py
index 1777db993e..d1a9b99cd8 100644
--- a/tests/test_score_MT/test_score_MT.py
+++ b/tests/test_score_MT/test_score_MT.py
@@ -2,9 +2,34 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreMTTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(10, 21, 22, 23))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('n2n') for t in tallies]
+        [t.add_score('16') for t in tallies]
+        [t.add_score('51') for t in tallies]
+        [t.add_score('102') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreMTTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_flux/geometry.xml b/tests/test_score_flux/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_flux/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-    </universes>
-  </lattice>
-
-</geometry>
diff --git a/tests/test_score_flux/inputs_true.dat b/tests/test_score_flux/inputs_true.dat
new file mode 100644
index 0000000000..d56fdcb9a7
--- /dev/null
+++ b/tests/test_score_flux/inputs_true.dat
@@ -0,0 +1 @@
+6f1f560fb5830abea765a6ee6a2d5762f6107398e7ec6adf136d718846ca9b73b00f3e1b73a3433cf812532def4cd614e251d7c40b0d4e0e38f47c4a44d08b8b
\ No newline at end of file
diff --git a/tests/test_score_flux/materials.xml b/tests/test_score_flux/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_flux/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_flux/results_true.dat b/tests/test_score_flux/results_true.dat
index 31ca238d48..575b8ff178 100644
--- a/tests/test_score_flux/results_true.dat
+++ b/tests/test_score_flux/results_true.dat
@@ -1,41 +1,41 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-3.224218E+01
-2.217821E+02
-1.079687E+01
-2.494701E+01
-5.252579E+01
-5.951604E+02
-3.325822E+01
-2.414028E+02
-1.145800E+01
-2.880575E+01
-5.605671E+01
-6.804062E+02
+5.010477E+01
+5.039958E+02
+1.732466E+01
+6.033456E+01
+8.428445E+01
+1.425022E+03
+1.357577E+01
+3.704803E+01
+4.758922E+00
+4.591527E+00
+2.297418E+01
+1.067445E+02
 tally 2:
-3.077754E+01
-2.017424E+02
-1.172238E+01
-3.139127E+01
-5.231699E+01
-5.870469E+02
-3.259142E+01
-2.336719E+02
-1.040924E+01
-2.432332E+01
-5.709679E+01
-6.978668E+02
+5.188799E+01
+5.402176E+02
+1.593914E+01
+5.169154E+01
+8.557014E+01
+1.465192E+03
+1.427596E+01
+4.078276E+01
+4.943558E+00
+5.054633E+00
+2.194332E+01
+9.737940E+01
 tally 3:
-3.077754E+01
-2.017424E+02
-1.172238E+01
-3.139127E+01
-5.231699E+01
-5.870469E+02
-3.259142E+01
-2.336719E+02
-1.040924E+01
-2.432332E+01
-5.709679E+01
-6.978668E+02
+5.188799E+01
+5.402176E+02
+1.593914E+01
+5.169154E+01
+8.557014E+01
+1.465192E+03
+1.427596E+01
+4.078276E+01
+4.943558E+00
+5.054633E+00
+2.194332E+01
+9.737940E+01
diff --git a/tests/test_score_flux/settings.xml b/tests/test_score_flux/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_flux/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_flux/tallies.xml b/tests/test_score_flux/tallies.xml
deleted file mode 100644
index bcde40c75d..0000000000
--- a/tests/test_score_flux/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21 22 23 27 28 29" />
-    <scores>flux</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="21 22 23 27 28 29" />
-    <scores>flux</scores>
-    <estimator>analog</estimator>
-  </tally>
-
-  <tally id="3">
-    <filter type="cell" bins="21 22 23 27 28 29" />
-    <scores>flux</scores>
-    <estimator>collision</estimator>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_flux/test_score_flux.py b/tests/test_score_flux/test_score_flux.py
index 1777db993e..94a034758d 100644
--- a/tests/test_score_flux/test_score_flux.py
+++ b/tests/test_score_flux/test_score_flux.py
@@ -2,9 +2,31 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreFluxTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, 22, 23, 27, 28, 29))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('flux') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreFluxTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_flux_yn/geometry.xml b/tests/test_score_flux_yn/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_flux_yn/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-    </universes>
-  </lattice>
-
-</geometry>
diff --git a/tests/test_score_flux_yn/inputs_true.dat b/tests/test_score_flux_yn/inputs_true.dat
new file mode 100644
index 0000000000..b4d82f71eb
--- /dev/null
+++ b/tests/test_score_flux_yn/inputs_true.dat
@@ -0,0 +1 @@
+7436214ee6931cdc4e8cf00a35f67c60280187fd6989a2ba3e8d51215e585cfc5cae41d5bab63176e306bcaf16e425f0b36bb8241a063f35ef36df2410bdf86a
\ No newline at end of file
diff --git a/tests/test_score_flux_yn/materials.xml b/tests/test_score_flux_yn/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_flux_yn/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_flux_yn/results_true.dat b/tests/test_score_flux_yn/results_true.dat
index 937f810ea6..78ee844771 100644
--- a/tests/test_score_flux_yn/results_true.dat
+++ b/tests/test_score_flux_yn/results_true.dat
@@ -1,1314 +1,1301 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-3.224218E+01
-2.217821E+02
-1.079687E+01
-2.494701E+01
-5.252579E+01
-5.951604E+02
-3.325822E+01
-2.414028E+02
-1.145800E+01
-2.880575E+01
-5.605671E+01
-6.804062E+02
+5.010477E+01
+5.039958E+02
+2.176053E-01
+4.865261E-01
+-1.086984E+00
+1.047217E+00
+-4.795412E-01
+1.558959E-01
+-5.701504E-01
+1.292349E-01
+-5.368919E-01
+9.576579E-02
+-9.479107E-01
+2.504916E-01
+1.224897E-01
+4.670746E-01
+8.535124E-01
+5.228963E-01
+-1.992643E-01
+7.139374E-02
+-5.251275E-01
+1.407419E-01
+4.161764E-01
+8.583663E-02
+1.900003E-01
+6.274903E-02
+1.756301E-01
+6.672692E-02
+8.899097E-01
+2.932284E-01
+1.829964E-01
+1.780842E-01
+3.128622E-02
+1.040374E-01
+-2.048946E-01
+7.820016E-02
+-1.770632E-01
+4.339147E-02
+3.158973E-02
+1.032146E-01
+-2.632637E-01
+1.069343E-01
+4.191749E-01
+7.076456E-02
+-2.010288E-01
+3.814062E-02
+1.087619E-01
+2.328146E-02
+-2.966642E-01
+7.687789E-02
+2.042266E-01
+3.305349E-02
+-2.931179E-01
+6.178212E-02
+-5.521659E-01
+1.525784E-01
+-1.344386E-01
+1.983161E-01
+-1.636737E-01
+1.164849E-01
+5.187003E-01
+1.397304E-01
+2.399050E-01
+2.860510E-01
+2.967924E-01
+1.035081E-01
+-7.005240E-02
+2.007454E-02
+3.237492E-02
+2.506195E-02
+-6.959898E-02
+7.999033E-02
+1.732466E+01
+6.033456E+01
+3.107535E-02
+4.649239E-02
+-3.970747E-01
+9.427351E-02
+-1.123739E-01
+1.390365E-02
+-2.898450E-02
+3.902114E-03
+-2.631777E-01
+1.693614E-02
+-3.010145E-01
+2.549605E-02
+3.897172E-02
+3.337532E-02
+2.061855E-01
+5.566838E-02
+-6.067592E-02
+1.537371E-02
+-1.412859E-01
+1.026936E-02
+2.971338E-01
+2.017773E-02
+2.229947E-01
+2.097948E-02
+-6.075875E-03
+1.442041E-02
+2.389356E-01
+2.418354E-02
+4.914702E-02
+1.401262E-02
+-8.942816E-02
+1.285068E-02
+-1.041318E-01
+8.815681E-03
+-8.589408E-02
+4.120018E-03
+-7.343529E-02
+1.344074E-02
+4.450570E-02
+9.667309E-03
+1.602555E-01
+1.139203E-02
+1.567487E-02
+6.127441E-03
+5.173147E-02
+7.550481E-03
+-1.719948E-01
+7.484666E-03
+7.675999E-02
+5.875577E-03
+-5.024191E-02
+1.070000E-02
+-1.702066E-01
+1.443420E-02
+-3.419759E-02
+2.637248E-02
+4.600843E-02
+1.078680E-02
+2.458398E-01
+2.682601E-02
+-3.085412E-02
+2.243953E-02
+1.178334E-01
+8.380493E-03
+-8.449310E-02
+2.905176E-03
+-1.512034E-02
+3.692235E-03
+7.089635E-03
+4.536425E-03
+8.428445E+01
+1.425022E+03
+-1.362036E-01
+4.955117E-01
+-2.368550E+00
+1.691161E+00
+-7.107734E-01
+8.353526E-01
+-6.040498E-01
+1.849927E-01
+-7.580790E-01
+2.328322E-01
+-2.827702E-01
+4.902552E-01
+2.263047E-01
+4.920612E-01
+1.086735E+00
+1.264217E+00
+-2.674729E-01
+1.812824E-01
+-9.480041E-01
+3.494658E-01
+1.131279E+00
+4.394262E-01
+6.028149E-01
+7.611055E-01
+-4.226627E-01
+9.934511E-02
+4.674984E-01
+4.988034E-01
+4.404050E-01
+2.451286E-01
+9.924713E-02
+2.916276E-01
+-5.691463E-01
+1.499514E-01
+3.042408E-02
+1.223962E-01
+9.963351E-03
+1.056905E-01
+7.166813E-01
+1.498011E-01
+3.740392E-01
+2.456929E-01
+-9.657707E-02
+1.698541E-01
+2.079664E-01
+1.965244E-01
+-1.119856E+00
+3.770763E-01
+2.039849E-01
+8.304410E-02
+-4.199012E-01
+2.410734E-01
+-6.791470E-01
+2.497291E-01
+2.416848E-01
+5.299837E-01
+8.546582E-02
+4.898367E-02
+4.674386E-01
+2.280610E-01
+3.594172E-01
+5.739204E-01
+4.972395E-01
+2.816960E-01
+-4.736196E-01
+7.973237E-02
+-1.484500E-01
+8.763644E-02
+1.318617E-02
+1.581561E-01
+1.357577E+01
+3.704803E+01
+3.384888E-03
+1.080209E-01
+2.872142E-01
+1.224352E-01
+2.863822E-01
+1.491797E-01
+-1.972755E-01
+3.885966E-02
+2.015479E-02
+3.471051E-02
+2.173233E-01
+6.336006E-02
+-2.432345E-01
+9.646809E-02
+3.387966E-02
+3.753576E-02
+1.185678E-01
+1.112748E-02
+-7.895500E-02
+3.265370E-02
+-2.546256E-01
+5.142289E-02
+-4.647286E-02
+1.740042E-02
+-2.660905E-01
+4.717290E-02
+-1.510244E-01
+2.742362E-02
+1.058091E-01
+2.185823E-02
+2.153774E-01
+1.729585E-02
+-4.988894E-02
+2.207988E-02
+-4.352527E-02
+1.760359E-02
+1.436143E-02
+2.593599E-02
+-2.352747E-01
+1.960774E-02
+-2.822795E-01
+3.249990E-02
+-7.774355E-02
+9.008554E-03
+1.239406E-01
+2.331185E-02
+-2.880954E-01
+4.411740E-02
+-2.049660E-02
+2.503723E-02
+3.213790E-02
+3.867984E-02
+1.371693E-01
+4.194468E-02
+2.551557E-02
+4.767256E-02
+-1.191569E-01
+3.416422E-02
+-3.330294E-01
+3.474803E-02
+-1.842925E-01
+4.126454E-02
+-1.224990E-02
+1.230302E-02
+1.544261E-01
+8.671624E-03
+-2.122959E-01
+6.350218E-02
+-2.914181E-01
+3.809905E-02
+4.758922E+00
+4.591527E+00
+-6.067377E-02
+6.804346E-03
+1.316435E-01
+1.476493E-02
+1.867152E-01
+1.538802E-02
+-7.179389E-02
+3.473818E-03
+4.986417E-02
+4.841351E-03
+6.776718E-02
+8.811355E-03
+-4.792045E-02
+9.184441E-03
+-8.434738E-03
+3.853397E-03
+2.548586E-02
+7.203200E-04
+7.527437E-03
+2.037011E-03
+-2.163081E-02
+4.158974E-03
+-8.760026E-02
+5.772134E-03
+-7.520795E-02
+4.970576E-03
+-3.964671E-02
+1.497841E-03
+7.221753E-02
+5.863209E-03
+4.932819E-02
+2.532767E-03
+-9.734545E-03
+1.795577E-03
+-7.011235E-02
+2.210883E-03
+2.399198E-02
+4.136626E-03
+-3.191172E-04
+1.877929E-03
+-9.710977E-02
+5.285483E-03
+-4.824457E-02
+3.483504E-03
+7.075225E-02
+3.161643E-03
+-8.040602E-02
+5.499063E-03
+-1.607824E-02
+4.903695E-03
+3.492398E-02
+5.092265E-03
+-1.006502E-02
+3.910353E-03
+1.573863E-02
+6.305496E-03
+-3.123873E-02
+3.823757E-03
+-7.909433E-02
+1.715877E-03
+-7.160670E-02
+1.015353E-02
+-4.496969E-02
+1.852488E-03
+6.430477E-02
+1.306442E-03
+-3.397473E-02
+9.427230E-03
+-1.245838E-01
+4.976908E-03
+2.297418E+01
+1.067445E+02
+3.798346E-02
+3.290807E-01
+4.774316E-01
+1.652719E-01
+4.484246E-01
+1.838690E-01
+-2.684741E-01
+1.314460E-01
+1.697264E-01
+1.010791E-01
+5.566969E-01
+1.619332E-01
+-1.922269E-01
+1.622489E-01
+-2.094814E-01
+6.127647E-02
+3.104826E-02
+6.793969E-02
+4.360087E-02
+4.949024E-02
+-2.391312E-01
+9.061066E-02
+-2.985719E-01
+5.766047E-02
+-4.703235E-01
+1.110755E-01
+-2.651010E-01
+7.292117E-02
+1.640899E-01
+7.843023E-02
+4.369130E-01
+7.815370E-02
+2.842619E-02
+3.428084E-02
+-2.196648E-01
+4.603142E-02
+-1.710839E-01
+1.096328E-01
+-1.574989E-02
+2.927805E-02
+-1.811474E-01
+8.048153E-02
+-2.781610E-01
+1.252087E-01
+5.703734E-02
+4.910322E-02
+-3.299004E-01
+1.018308E-01
+-1.639460E-01
+1.231675E-01
+1.411391E-01
+8.293452E-02
+2.675276E-02
+7.910978E-02
+-4.464321E-02
+1.158543E-01
+-1.929947E-01
+9.887250E-02
+-5.501938E-01
+9.398742E-02
+-4.386734E-01
+1.054327E-01
+-1.583625E-01
+9.952385E-03
+1.449942E-01
+7.975730E-03
+-1.797342E-01
+1.517262E-01
+-5.629679E-01
+8.574197E-02
 tally 2:
-3.224218E+01
-2.217821E+02
--4.524803E-01
-1.326110E-01
--2.725152E-01
-4.845463E-01
--4.030063E-01
-1.825349E-01
--2.145346E-01
-7.197305E-02
-2.488985E-01
-4.295894E-02
--6.797085E-01
-2.125889E-01
-1.698034E-01
-3.750580E-02
--6.596628E-02
-6.507545E-02
-4.519597E-02
-1.432412E-02
-6.227959E-01
-1.066624E-01
-2.328135E-01
-8.583522E-02
--8.899482E-01
-1.982834E-01
-3.269468E-01
-5.392549E-02
-1.684792E-01
-1.461138E-01
--2.026161E-01
-1.992812E-01
-2.599678E-01
-7.704699E-02
--3.329837E-01
-8.761827E-02
--5.287177E-01
-9.089410E-02
-3.666982E-01
-4.451200E-02
-2.096594E-01
-4.539545E-02
-2.091762E-01
-4.861771E-02
-1.476292E-01
-2.837569E-02
--4.091772E-01
-1.141307E-01
--1.652694E-01
-5.552090E-02
-8.207679E-02
-1.659512E-02
--1.203575E-01
-6.408952E-02
--8.219791E-03
-9.915873E-02
--3.768675E-02
-8.535079E-02
-1.305167E-01
-1.917693E-02
-1.823050E-01
-1.945159E-02
-2.999655E-01
-4.587948E-02
-3.687435E-01
-1.382795E-01
-1.220376E-01
-6.297901E-02
-3.899923E-01
-5.894393E-02
--1.878957E-02
-1.159448E-01
-1.079687E+01
-2.494701E+01
--1.067271E-01
-9.075462E-03
--2.571244E-02
-4.402172E-02
--3.646387E-02
-2.948533E-02
--1.043828E-01
-1.600528E-02
-4.361032E-02
-3.875958E-03
--3.096545E-01
-3.184604E-02
-8.723730E-02
-4.599654E-03
-6.541966E-03
-9.605866E-03
-5.837907E-02
-3.026784E-03
-1.523399E-01
-7.846764E-03
-2.778305E-02
-8.106935E-03
--2.895648E-01
-1.983532E-02
-4.866247E-02
-1.048055E-02
-2.600097E-02
-1.465465E-02
--6.958338E-02
-3.287519E-02
-1.690742E-01
-1.204714E-02
--1.127534E-01
-7.881362E-03
--1.662306E-01
-9.412057E-03
-1.674047E-01
-6.690449E-03
--4.370664E-02
-5.828314E-03
-9.323095E-02
-4.400433E-03
-1.353164E-02
-1.389416E-03
--1.062009E-01
-1.297730E-02
--5.331064E-02
-5.321055E-03
-7.698466E-02
-3.247975E-03
--2.095250E-02
-4.788058E-03
--8.861817E-03
-7.657174E-03
-1.769365E-02
-1.144058E-03
-1.788678E-02
-2.746804E-03
-4.403056E-03
-6.918351E-04
-1.059091E-01
-1.394217E-02
-1.442934E-01
-1.318500E-02
-2.199047E-02
-5.838245E-03
-8.175546E-02
-3.242012E-03
-7.359786E-03
-1.673277E-02
-5.252579E+01
-5.951604E+02
--8.293789E-01
-2.900775E-01
-6.285324E-01
-1.487344E+00
--4.765860E-01
-8.058451E-01
--3.101266E-01
-1.597231E-01
-3.333449E-01
-1.162003E-01
--1.314742E+00
-4.565068E-01
-4.726655E-01
-1.161194E-01
-2.824987E-01
-8.732802E-02
-1.025468E-01
-4.935830E-02
-4.216767E-01
-1.225700E-01
--4.022783E-02
-1.178843E-01
--7.967853E-01
-2.698001E-01
-3.741686E-01
-2.849501E-01
-3.377745E-01
-3.722806E-01
-9.234355E-02
-4.498496E-01
-8.019475E-01
-3.404218E-01
--3.086622E-01
-1.857604E-01
--8.474654E-01
-1.733363E-01
-8.124627E-01
-1.415201E-01
--3.075481E-01
-3.345921E-02
-7.126178E-01
-2.478330E-01
-2.983972E-01
-2.913106E-02
--6.759256E-01
-4.245338E-01
--3.491214E-01
-1.017784E-01
-1.637602E-01
-7.414687E-02
--3.344942E-01
-1.165491E-01
--6.038784E-02
-1.791698E-01
-2.645086E-01
-8.129446E-02
--2.738265E-01
-6.616303E-02
-1.135151E-02
-4.140154E-02
-4.679883E-01
-1.914750E-01
-2.876984E-01
-1.355086E-01
--2.741613E-01
-1.060457E-01
-5.972204E-01
-2.144153E-01
--9.215131E-02
-4.815135E-01
-3.325822E+01
-2.414028E+02
--3.072951E-02
-3.385901E-01
-9.729550E-01
-3.745599E-01
--5.237870E-01
-3.101477E-01
--5.994810E-01
-1.696123E-01
--3.402784E-01
-1.910685E-01
--3.779571E-01
-2.598004E-01
--4.804007E-01
-1.417261E-01
--5.444032E-01
-1.756801E-01
--9.921809E-02
-6.889191E-02
--3.768065E-01
-8.931168E-02
-5.814513E-02
-1.660714E-02
--1.263664E-01
-2.650287E-01
-1.951860E-01
-2.090892E-01
-3.576168E-01
-2.511782E-01
--9.547988E-02
-7.900044E-03
-5.460746E-01
-1.319868E-01
--1.577655E-01
-8.575762E-02
-2.938792E-02
-7.941653E-02
--7.505627E-01
-2.530444E-01
--2.399786E-01
-1.105633E-01
-2.035740E-01
-2.442135E-02
-1.190368E-01
-8.652216E-02
-5.753449E-01
-9.353813E-02
-4.911025E-01
-6.795258E-02
--2.967023E-03
-7.063512E-03
--2.158307E-01
-4.680921E-02
--1.811238E-01
-7.008450E-02
-1.809785E-01
-3.414843E-02
--1.380825E-01
-3.469381E-02
-3.722241E-01
-3.956589E-02
-2.064516E-01
-2.676312E-02
--3.889056E-01
-6.737109E-02
-1.625815E-01
-1.356347E-02
--5.278455E-01
-1.297993E-01
--1.269304E-02
-1.253029E-02
-1.145800E+01
-2.880575E+01
-6.201234E-02
-4.410457E-02
-2.694694E-01
-6.262339E-02
--1.173739E-01
-4.727885E-02
--1.785056E-01
-1.745391E-02
--4.744392E-02
-2.117667E-02
-3.998416E-02
-6.058339E-02
--1.927536E-01
-1.710512E-02
--1.800560E-01
-2.420071E-02
--1.136912E-01
-1.049357E-02
--1.104415E-01
-1.181394E-02
-3.486245E-02
-3.673104E-03
--8.343502E-02
-2.270299E-02
--3.064437E-02
-1.197968E-02
-1.912081E-01
-2.808487E-02
-2.601014E-02
-1.311244E-03
-1.295023E-01
-1.108983E-02
--1.158397E-01
-1.033182E-02
-8.316701E-02
-2.061897E-02
--1.136796E-01
-3.133021E-02
--1.722931E-02
-2.168654E-02
-1.464014E-01
-8.570818E-03
-5.859338E-02
-6.076029E-03
-1.776223E-01
-1.345571E-02
-1.582455E-01
-9.719314E-03
-9.088118E-03
-1.681557E-03
--6.298727E-02
-5.287397E-03
-5.793395E-03
-6.397495E-03
--1.835123E-02
-4.506573E-03
--7.558061E-02
-4.462082E-03
-3.136371E-02
-3.181332E-03
--2.787527E-02
-1.765822E-03
--9.878307E-02
-3.381183E-03
-1.279690E-01
-4.386067E-03
--1.043523E-01
-5.381331E-03
-1.000162E-02
-6.707280E-04
-5.605671E+01
-6.804062E+02
-1.431465E-01
-1.700768E+00
-2.010680E+00
-2.307036E+00
--5.276592E-01
-1.006050E+00
--9.123132E-01
-4.824313E-01
--3.276490E-01
-5.842232E-01
-6.749445E-02
-6.049661E-01
--1.317515E+00
-4.738014E-01
--9.470910E-01
-4.937085E-01
--3.338536E-01
-2.196164E-01
--3.032729E-01
-1.241029E-01
--3.285269E-01
-5.276607E-02
--4.107012E-01
-6.402858E-01
-3.357626E-01
-2.672801E-01
-1.000507E+00
-5.263322E-01
--1.834202E-01
-9.495434E-02
-8.133484E-01
-3.011488E-01
--4.083516E-01
-2.428630E-01
-4.032934E-01
-1.825835E-01
--8.291267E-01
-6.773284E-01
--2.401557E-01
-2.280331E-01
-4.325658E-01
-1.163540E-01
-6.671759E-02
-2.181769E-01
-6.984462E-01
-1.716985E-01
-7.108347E-01
-1.386394E-01
-1.709795E-01
-5.320122E-02
--2.354809E-01
-7.105363E-02
-1.600239E-01
-9.179874E-02
-2.802111E-02
-6.149546E-02
--4.005049E-01
-2.195356E-01
-7.914623E-01
-2.273026E-01
-3.392453E-01
-1.101813E-01
--7.821576E-01
-1.637944E-01
-4.736782E-01
-1.531480E-01
--5.253391E-01
-1.093913E-01
-2.235961E-01
-5.449263E-02
+5.188799E+01
+5.402176E+02
+-5.713505E-01
+4.615729E-01
+-3.761827E-01
+5.750500E-01
+8.374325E-01
+1.862938E-01
+-3.954940E-01
+2.347775E-01
+-6.290233E-01
+1.864254E-01
+-6.656201E-01
+2.124518E-01
+4.729571E-01
+6.739065E-01
+4.921338E-01
+1.907183E-01
+-3.988992E-01
+3.761412E-01
+-1.125861E-01
+3.659299E-01
+-1.283461E-01
+5.045920E-02
+1.101261E-02
+1.391469E-01
+4.286921E-01
+2.097120E-01
+5.360702E-01
+1.809190E-01
+8.470757E-01
+2.461922E-01
+-4.140592E-01
+2.702824E-01
+-2.269391E-02
+5.000308E-03
+-1.585595E-01
+3.527370E-02
+-9.890128E-02
+1.067921E-01
+3.153468E-02
+1.483763E-01
+6.967922E-02
+7.789031E-02
+2.040956E-01
+4.637270E-02
+-2.345641E-01
+3.574654E-01
+-1.500187E-01
+1.514334E-01
+-3.019192E-01
+1.334819E-01
+1.796739E-01
+7.106788E-02
+-2.120506E-01
+1.144496E-01
+-6.891611E-02
+7.257229E-02
+-2.306514E-01
+7.048631E-02
+7.800814E-01
+2.467831E-01
+2.790547E-02
+5.494857E-02
+-1.896182E-01
+5.971620E-02
+1.644354E-02
+1.059859E-01
+-7.792754E-02
+2.085845E-02
+-1.114682E-01
+1.227128E-01
+1.593914E+01
+5.169154E+01
+1.039804E+00
+5.028617E-01
+-7.912437E-01
+5.548318E-01
+2.575930E-01
+1.148260E-01
+-6.331302E-01
+2.556615E-01
+-1.712129E-01
+7.877790E-02
+-5.816921E-01
+1.456126E-01
+2.272958E-01
+8.788738E-02
+3.822477E-01
+6.244032E-02
+-2.999416E-01
+8.461810E-02
+-2.623060E-02
+1.458472E-02
+1.300437E-01
+4.478019E-02
+-4.767351E-02
+7.362462E-02
+7.928962E-02
+4.510319E-02
+3.500548E-03
+4.881244E-02
+-2.067837E-01
+8.186594E-02
+-3.825304E-01
+1.082951E-01
+-3.558676E-01
+5.708469E-02
+4.048126E-01
+9.076309E-02
+4.553585E-02
+2.926622E-02
+-1.294373E-01
+1.870238E-02
+-3.195745E-01
+5.918983E-02
+-5.541420E-02
+6.185102E-02
+2.517910E-01
+1.252247E-01
+-6.864842E-02
+8.483359E-02
+-3.087092E-02
+1.682640E-02
+-6.457777E-02
+2.980731E-02
+-3.360246E-01
+3.729711E-02
+-2.091466E-01
+1.119332E-01
+-4.226988E-01
+5.973848E-02
+-5.390062E-02
+1.424816E-01
+-2.955041E-02
+7.118983E-03
+3.100944E-01
+5.584902E-02
+-4.266659E-01
+4.397359E-02
+-3.155083E-01
+7.428242E-02
+5.282933E-02
+2.010740E-02
+8.557014E+01
+1.465192E+03
+-3.913589E-01
+5.368834E-01
+-2.113693E+00
+2.169443E+00
+2.298156E-01
+6.330809E-01
+1.449786E-01
+2.666314E-01
+-2.958820E-01
+2.750937E-01
+1.054389E+00
+5.351584E-01
+4.775640E-02
+2.044779E-01
+4.186858E-01
+8.940845E-01
+-6.035852E-02
+3.754000E-01
+-1.597608E+00
+5.815293E-01
+5.200807E-01
+3.829815E-01
+9.437855E-01
+7.241779E-01
+-5.232235E-01
+1.966074E-01
+2.872008E-01
+1.241395E+00
+-1.039246E+00
+6.158088E-01
+3.058638E-01
+1.593114E-01
+-5.132144E-01
+4.577375E-01
+6.727602E-01
+4.119990E-01
+3.280880E-01
+4.971028E-01
+7.837744E-01
+2.444483E-01
+7.686392E-01
+3.456688E-01
+-5.035943E-01
+1.631734E-01
+4.145045E-01
+3.177084E-01
+-1.924638E-01
+3.336696E-01
+-1.484767E-01
+9.030824E-02
+-2.393846E-01
+6.598721E-02
+-5.318081E-01
+2.895430E-01
+1.518564E-01
+3.818155E-01
+5.795851E-01
+9.003270E-02
+3.580512E-01
+8.821756E-02
+5.366649E-01
+2.497151E-01
+-3.347132E-01
+1.352062E-01
+4.567995E-01
+1.561741E-01
+-2.279100E-01
+2.122433E-01
+4.461881E-01
+2.325205E-01
+1.427596E+01
+4.078276E+01
+5.217165E-02
+2.453888E-02
+1.584690E-01
+3.106540E-01
+4.560315E-01
+4.277362E-01
+-1.990373E-02
+5.277850E-02
+1.125203E-02
+6.443927E-02
+3.308696E-01
+1.037411E-01
+-2.750414E-01
+3.814328E-02
+-2.758789E-01
+1.449907E-01
+-3.474494E-02
+1.886069E-02
+-3.638818E-03
+1.651468E-01
+-2.060159E-02
+3.031181E-02
+3.225892E-01
+7.944048E-02
+-3.922626E-01
+5.950804E-02
+-7.374795E-01
+1.624566E-01
+-1.467806E-02
+1.234636E-01
+8.061252E-02
+4.356030E-02
+-1.065107E-01
+1.431995E-02
+-2.455689E-01
+4.182386E-02
+-3.425697E-01
+1.088413E-01
+-9.867791E-03
+4.864904E-02
+-2.403769E-01
+2.231699E-02
+1.795461E-01
+2.969251E-02
+-1.516375E-01
+2.951230E-02
+-3.101470E-01
+7.377660E-02
+1.996325E-01
+1.846547E-02
+9.153483E-02
+2.867924E-02
+2.545349E-01
+4.621843E-02
+1.776575E-01
+1.075483E-01
+-2.561501E-01
+4.947817E-02
+-1.558585E-01
+1.467725E-02
+-1.530184E-01
+5.532615E-02
+-1.802320E-01
+1.603564E-02
+3.331892E-01
+3.315195E-02
+-1.878592E-01
+3.588542E-02
+-3.843863E-01
+1.011661E-01
+4.943558E+00
+5.054633E+00
+3.508923E-01
+5.360844E-02
+2.595623E-01
+3.819756E-02
+-2.524359E-01
+4.825078E-02
+-3.376117E-01
+4.115606E-02
+8.885054E-02
+3.685958E-02
+1.168333E-01
+5.916818E-02
+-1.993698E-01
+5.632369E-02
+3.988948E-01
+4.366034E-02
+1.021403E-01
+4.690526E-03
+-1.508432E-01
+2.173064E-02
+-2.407920E-01
+2.510560E-02
+-1.703993E-01
+2.599072E-02
+8.752998E-02
+3.657089E-02
+-1.269869E-02
+2.565400E-02
+2.026727E-01
+1.804748E-02
+-4.913307E-03
+4.059747E-02
+-2.554771E-02
+7.959679E-03
+-1.549008E-02
+3.658041E-02
+-9.294647E-02
+2.754890E-03
+2.566876E-02
+4.951779E-03
+-1.016212E-02
+2.777381E-02
+3.601396E-01
+3.828736E-02
+-8.923373E-03
+3.126410E-03
+8.722969E-02
+1.182345E-02
+-2.332024E-02
+5.685275E-03
+2.101415E-01
+1.224880E-02
+-9.619916E-03
+9.042453E-03
+-2.480871E-01
+2.222042E-02
+9.764734E-02
+4.847970E-03
+-1.623487E-01
+1.814336E-02
+5.091875E-02
+1.290604E-02
+7.192058E-02
+1.343350E-02
+-1.316640E-01
+3.514269E-02
+-9.198972E-02
+1.244138E-02
+-1.225056E-01
+3.035718E-02
+2.194332E+01
+9.737940E+01
+-3.052407E-01
+4.072957E-01
+3.531168E-02
+2.019382E-01
+8.793928E-01
+4.041664E-01
+-4.072462E-01
+6.027190E-02
+-8.907772E-02
+1.952922E-01
+9.519375E-02
+9.821752E-02
+3.205302E-01
+2.075134E-01
+1.124955E-01
+6.446089E-02
+-3.366117E-01
+8.184450E-02
+-3.676127E-02
+3.861064E-02
+2.001007E-01
+6.507942E-02
+-1.155787E-01
+4.761238E-02
+-2.779628E-01
+3.425225E-02
+1.099627E-01
+5.462866E-02
+-2.654341E-01
+1.868127E-02
+2.246854E-01
+3.157231E-02
+-1.422513E-01
+5.939434E-02
+-8.583155E-02
+5.668810E-02
+6.967936E-02
+1.924265E-02
+-2.246405E-03
+1.576409E-02
+7.321307E-02
+2.061990E-02
+-4.949248E-01
+1.278374E-01
+4.468760E-02
+3.814622E-02
+-9.398135E-02
+1.772831E-02
+-2.757022E-01
+1.349555E-01
+1.715161E-02
+5.040025E-02
+-1.682974E-01
+7.558363E-02
+-4.700401E-02
+2.700354E-02
+1.109855E-01
+2.666559E-02
+2.136115E-01
+7.786593E-02
+-2.089667E-01
+1.489893E-02
+-6.959959E-02
+7.545487E-02
+-3.296680E-02
+1.604995E-02
+-1.587440E-01
+5.482886E-02
+-3.203027E-01
+3.421361E-02
 tally 3:
-3.077754E+01
-2.017424E+02
--4.040800E-01
-5.606719E-01
--5.238239E-01
-4.460714E-01
-1.155164E-01
-1.686786E-01
--1.972294E-01
-2.912851E-01
-4.908524E-01
-1.374195E-01
--1.467088E-02
-1.080839E-01
-6.749037E-02
-1.397361E-01
-4.136479E-03
-9.237632E-02
--3.742305E-01
-9.917374E-02
-5.374208E-01
-2.530961E-01
-2.270996E-01
-9.415721E-02
--4.568867E-02
-1.277446E-01
-1.581716E-01
-6.217155E-02
-4.667840E-01
-1.143380E-01
-9.684270E-02
-7.302998E-02
-8.366629E-01
-1.797483E-01
--5.657893E-01
-2.553910E-01
--2.351441E-02
-4.395513E-02
-7.843306E-01
-1.466478E-01
-4.617856E-02
-1.154681E-02
-1.431343E-01
-3.531062E-02
-4.625825E-01
-6.235642E-02
--8.837342E-02
-6.231694E-02
--3.766755E-01
-6.412261E-02
-1.995226E-01
-1.743990E-01
--2.498625E-02
-8.897536E-02
--1.039315E-01
-1.868672E-01
-6.712910E-01
-2.084042E-01
-5.805639E-02
-4.049580E-02
-1.603677E-01
-4.280033E-02
-3.909878E-01
-7.726018E-02
-9.878354E-02
-4.630595E-02
--2.389983E-01
-3.528604E-02
-1.641046E-01
-1.669859E-01
--2.351986E-02
-1.048794E-02
-1.172238E+01
-3.139127E+01
--1.057733E+00
-2.820672E-01
-5.708838E-02
-6.224675E-02
-2.492981E-02
-1.827498E-01
--1.339268E-01
-1.968929E-02
-2.363867E-01
-3.028587E-02
--2.867841E-01
-2.680318E-02
--2.352784E-01
-1.895006E-02
-4.365572E-01
-1.883240E-01
--3.388837E-01
-7.209932E-02
-3.488374E-01
-6.640137E-02
--3.343893E-01
-4.149634E-02
--4.575314E-01
-7.461614E-02
-4.436881E-01
-1.325092E-01
-3.394853E-01
-2.987173E-02
--2.633936E-02
-6.171428E-02
-9.994191E-02
-6.447641E-02
--1.618840E-01
-3.497845E-02
--1.290678E-01
-3.735394E-02
-9.852126E-03
-2.963925E-02
--1.656539E-01
-4.190396E-02
--2.292763E-01
-7.045480E-02
--4.616824E-03
-1.926690E-02
--1.960839E-01
-1.396042E-02
--2.133526E-02
-5.189823E-02
-2.933136E-01
-5.721356E-02
--1.084914E-01
-2.448532E-02
--4.778583E-01
-7.644033E-02
-1.736901E-01
-6.630467E-02
--5.460801E-02
-1.510381E-02
-1.106093E-01
-1.590306E-02
-1.659501E-01
-5.983218E-02
-1.343781E-02
-2.751294E-02
-2.052693E-01
-3.478581E-02
--1.006298E-01
-1.815313E-02
--2.563766E-01
-3.045246E-02
-5.231699E+01
-5.870469E+02
--6.102587E-01
-5.930968E-01
-1.184182E+00
-1.364433E+00
--6.362263E-02
-8.852514E-01
--4.844978E-01
-1.751923E-01
-8.223413E-01
-2.436206E-01
--9.656506E-01
-3.513566E-01
-2.710494E-01
-7.170772E-01
-4.792482E-01
-2.551569E-01
--1.266077E-01
-2.824778E-01
-6.389964E-01
-2.501483E-01
-8.915816E-01
-3.557431E-01
--1.007448E+00
-5.743018E-01
-3.528444E-01
-2.428078E-01
--5.833000E-01
-3.733648E-01
--4.660289E-01
-6.567263E-02
-5.856088E-01
-2.336146E-01
-3.836351E-02
-7.665403E-02
--6.721211E-01
-2.651780E-01
-5.725993E-01
-2.101026E-01
--2.130594E-01
-1.855350E-02
-2.607168E-01
-1.564288E-01
--3.399382E-02
-3.067656E-02
--1.228976E+00
-6.554836E-01
--2.962235E-01
-1.808511E-01
-5.521675E-01
-1.722073E-01
--1.658751E-01
-1.994119E-02
--2.671896E-01
-1.343320E-01
--2.325282E-01
-4.677656E-02
--3.380310E-01
-1.703532E-01
--3.571853E-01
-1.140525E-01
-3.836770E-02
-8.586429E-02
-7.328263E-01
-1.567227E-01
-4.840110E-02
-2.718471E-02
-5.654783E-01
-3.645579E-01
--3.027585E-01
-1.407867E-01
-3.259142E+01
-2.336719E+02
-3.053294E-01
-2.086257E-01
--7.563597E-01
-2.816768E-01
--3.039288E-01
-2.855043E-01
--2.648323E-01
-1.883784E-01
-2.665933E-01
-1.782353E-01
-1.978960E-01
-1.419567E-01
-1.228712E-01
-1.913946E-01
--9.152681E-03
-1.324681E-01
--5.707326E-01
-1.092067E-01
-2.326858E-01
-6.731743E-02
--5.170241E-01
-1.353439E-01
--4.064026E-01
-9.715030E-02
--1.142031E-01
-7.748788E-02
-2.928039E-01
-2.716157E-01
--1.721186E-01
-1.447738E-01
-6.452116E-01
-1.821975E-01
--5.697276E-01
-1.047333E-01
--9.640967E-02
-1.139327E-01
--4.509832E-01
-2.079493E-01
--2.134684E-02
-2.907667E-01
--2.434868E-01
-1.235397E-01
-2.550330E-01
-2.979627E-01
-9.598615E-01
-3.140885E-01
-1.218430E-01
-6.283872E-02
-2.412915E-01
-1.907292E-02
--2.236667E-01
-4.379414E-02
-2.844474E-01
-2.965692E-02
-1.618860E-01
-8.293785E-03
--1.265583E-01
-4.515449E-02
-6.356127E-02
-1.358134E-02
--3.844886E-01
-8.600010E-02
--1.942739E-01
-7.516022E-02
-1.765511E-01
-3.522611E-02
--3.433188E-01
-3.456066E-02
--1.501983E-01
-5.633844E-02
-1.040924E+01
-2.432332E+01
--4.138270E-01
-1.309129E-01
--3.151106E-01
-1.286964E-01
-9.213222E-02
-6.189454E-02
--2.746107E-01
-8.103949E-02
--9.781742E-02
-3.783736E-02
--1.178371E-01
-3.242332E-02
--5.837932E-01
-2.059491E-01
--7.338223E-03
-8.012203E-02
-5.628994E-02
-2.190669E-02
-8.155585E-02
-1.039007E-01
-6.052048E-02
-4.339463E-02
--1.157646E-02
-1.839000E-02
--2.641673E-01
-4.737589E-02
--8.531135E-02
-5.432766E-02
-6.036555E-01
-1.190329E-01
--3.149976E-01
-5.735264E-02
--8.456340E-02
-4.563143E-03
-2.224065E-01
-6.600030E-02
-9.562392E-03
-1.843524E-02
--2.400599E-01
-3.182217E-02
--6.534941E-01
-1.180315E-01
-4.371157E-01
-9.076666E-02
-3.257455E-02
-2.936184E-02
--8.788428E-02
-1.923293E-02
--2.604776E-01
-3.660313E-02
--6.315350E-02
-1.503534E-02
-5.609294E-01
-8.783528E-02
--7.363672E-01
-1.789210E-01
-2.883575E-01
-6.478578E-02
--3.302954E-02
-1.517946E-02
--3.234157E-01
-4.418920E-02
-2.846318E-01
-2.712085E-02
--3.227536E-01
-5.062832E-02
-4.391474E-01
-5.548002E-02
-1.322988E-01
-2.995854E-02
-5.709679E+01
-6.978668E+02
-2.859201E-02
-1.094507E+00
-6.058587E-01
-6.079927E-01
-7.553798E-02
-1.131607E+00
--5.851206E-01
-1.215663E+00
-8.266012E-02
-9.031287E-01
--7.088368E-01
-3.984608E-01
--4.414986E-01
-1.502417E-01
-2.241998E-01
-3.228823E-01
--7.328574E-01
-2.430448E-01
--8.070160E-01
-1.767265E-01
--1.154449E-01
-8.739303E-03
--3.787161E-01
-4.728756E-01
--1.743577E-01
-1.091245E-01
-2.878137E-01
-2.724285E-01
-2.128994E-01
-4.440539E-01
-9.495567E-01
-3.622719E-01
-1.422950E-01
-5.309223E-02
-1.323659E-01
-1.911979E-01
--1.303752E-01
-5.710728E-01
--4.611294E-02
-4.086632E-02
-5.937879E-01
-1.006156E-01
--3.558925E-01
-2.998983E-01
-1.175971E+00
-5.323321E-01
-2.426485E-01
-1.497265E-01
-7.805090E-02
-5.060214E-02
--2.914577E-01
-2.233355E-01
-1.053098E-01
-6.693123E-02
-4.541315E-01
-1.328340E-01
--6.290732E-02
-8.910616E-02
-7.371592E-01
-1.980732E-01
-5.804701E-01
-1.711949E-01
--6.642202E-01
-1.131866E-01
-1.779818E-01
-6.530190E-02
--5.224739E-01
-2.534102E-01
--1.824905E-01
-2.910309E-02
-tally 4:
-3.077754E+01
-2.017424E+02
--4.040800E-01
-5.606719E-01
--5.238239E-01
-4.460714E-01
-1.155164E-01
-1.686786E-01
--1.972294E-01
-2.912851E-01
-4.908524E-01
-1.374195E-01
--1.467088E-02
-1.080839E-01
-6.749037E-02
-1.397361E-01
-4.136479E-03
-9.237632E-02
--3.742305E-01
-9.917374E-02
-5.374208E-01
-2.530961E-01
-2.270996E-01
-9.415721E-02
--4.568867E-02
-1.277446E-01
-1.581716E-01
-6.217155E-02
-4.667840E-01
-1.143380E-01
-9.684270E-02
-7.302998E-02
-8.366629E-01
-1.797483E-01
--5.657893E-01
-2.553910E-01
--2.351441E-02
-4.395513E-02
-7.843306E-01
-1.466478E-01
-4.617856E-02
-1.154681E-02
-1.431343E-01
-3.531062E-02
-4.625825E-01
-6.235642E-02
--8.837342E-02
-6.231694E-02
--3.766755E-01
-6.412261E-02
-1.995226E-01
-1.743990E-01
--2.498625E-02
-8.897536E-02
--1.039315E-01
-1.868672E-01
-6.712910E-01
-2.084042E-01
-5.805639E-02
-4.049580E-02
-1.603677E-01
-4.280033E-02
-3.909878E-01
-7.726018E-02
-9.878354E-02
-4.630595E-02
--2.389983E-01
-3.528604E-02
-1.641046E-01
-1.669859E-01
--2.351986E-02
-1.048794E-02
-1.172238E+01
-3.139127E+01
--1.057733E+00
-2.820672E-01
-5.708838E-02
-6.224675E-02
-2.492981E-02
-1.827498E-01
--1.339268E-01
-1.968929E-02
-2.363867E-01
-3.028587E-02
--2.867841E-01
-2.680318E-02
--2.352784E-01
-1.895006E-02
-4.365572E-01
-1.883240E-01
--3.388837E-01
-7.209932E-02
-3.488374E-01
-6.640137E-02
--3.343893E-01
-4.149634E-02
--4.575314E-01
-7.461614E-02
-4.436881E-01
-1.325092E-01
-3.394853E-01
-2.987173E-02
--2.633936E-02
-6.171428E-02
-9.994191E-02
-6.447641E-02
--1.618840E-01
-3.497845E-02
--1.290678E-01
-3.735394E-02
-9.852126E-03
-2.963925E-02
--1.656539E-01
-4.190396E-02
--2.292763E-01
-7.045480E-02
--4.616824E-03
-1.926690E-02
--1.960839E-01
-1.396042E-02
--2.133526E-02
-5.189823E-02
-2.933136E-01
-5.721356E-02
--1.084914E-01
-2.448532E-02
--4.778583E-01
-7.644033E-02
-1.736901E-01
-6.630467E-02
--5.460801E-02
-1.510381E-02
-1.106093E-01
-1.590306E-02
-1.659501E-01
-5.983218E-02
-1.343781E-02
-2.751294E-02
-2.052693E-01
-3.478581E-02
--1.006298E-01
-1.815313E-02
--2.563766E-01
-3.045246E-02
-5.231699E+01
-5.870469E+02
--6.102587E-01
-5.930968E-01
-1.184182E+00
-1.364433E+00
--6.362263E-02
-8.852514E-01
--4.844978E-01
-1.751923E-01
-8.223413E-01
-2.436206E-01
--9.656506E-01
-3.513566E-01
-2.710494E-01
-7.170772E-01
-4.792482E-01
-2.551569E-01
--1.266077E-01
-2.824778E-01
-6.389964E-01
-2.501483E-01
-8.915816E-01
-3.557431E-01
--1.007448E+00
-5.743018E-01
-3.528444E-01
-2.428078E-01
--5.833000E-01
-3.733648E-01
--4.660289E-01
-6.567263E-02
-5.856088E-01
-2.336146E-01
-3.836351E-02
-7.665403E-02
--6.721211E-01
-2.651780E-01
-5.725993E-01
-2.101026E-01
--2.130594E-01
-1.855350E-02
-2.607168E-01
-1.564288E-01
--3.399382E-02
-3.067656E-02
--1.228976E+00
-6.554836E-01
--2.962235E-01
-1.808511E-01
-5.521675E-01
-1.722073E-01
--1.658751E-01
-1.994119E-02
--2.671896E-01
-1.343320E-01
--2.325282E-01
-4.677656E-02
--3.380310E-01
-1.703532E-01
--3.571853E-01
-1.140525E-01
-3.836770E-02
-8.586429E-02
-7.328263E-01
-1.567227E-01
-4.840110E-02
-2.718471E-02
-5.654783E-01
-3.645579E-01
--3.027585E-01
-1.407867E-01
-3.259142E+01
-2.336719E+02
-3.053294E-01
-2.086257E-01
--7.563597E-01
-2.816768E-01
--3.039288E-01
-2.855043E-01
--2.648323E-01
-1.883784E-01
-2.665933E-01
-1.782353E-01
-1.978960E-01
-1.419567E-01
-1.228712E-01
-1.913946E-01
--9.152681E-03
-1.324681E-01
--5.707326E-01
-1.092067E-01
-2.326858E-01
-6.731743E-02
--5.170241E-01
-1.353439E-01
--4.064026E-01
-9.715030E-02
--1.142031E-01
-7.748788E-02
-2.928039E-01
-2.716157E-01
--1.721186E-01
-1.447738E-01
-6.452116E-01
-1.821975E-01
--5.697276E-01
-1.047333E-01
--9.640967E-02
-1.139327E-01
--4.509832E-01
-2.079493E-01
--2.134684E-02
-2.907667E-01
--2.434868E-01
-1.235397E-01
-2.550330E-01
-2.979627E-01
-9.598615E-01
-3.140885E-01
-1.218430E-01
-6.283872E-02
-2.412915E-01
-1.907292E-02
--2.236667E-01
-4.379414E-02
-2.844474E-01
-2.965692E-02
-1.618860E-01
-8.293785E-03
--1.265583E-01
-4.515449E-02
-6.356127E-02
-1.358134E-02
--3.844886E-01
-8.600010E-02
--1.942739E-01
-7.516022E-02
-1.765511E-01
-3.522611E-02
--3.433188E-01
-3.456066E-02
--1.501983E-01
-5.633844E-02
-1.040924E+01
-2.432332E+01
--4.138270E-01
-1.309129E-01
--3.151106E-01
-1.286964E-01
-9.213222E-02
-6.189454E-02
--2.746107E-01
-8.103949E-02
--9.781742E-02
-3.783736E-02
--1.178371E-01
-3.242332E-02
--5.837932E-01
-2.059491E-01
--7.338223E-03
-8.012203E-02
-5.628994E-02
-2.190669E-02
-8.155585E-02
-1.039007E-01
-6.052048E-02
-4.339463E-02
--1.157646E-02
-1.839000E-02
--2.641673E-01
-4.737589E-02
--8.531135E-02
-5.432766E-02
-6.036555E-01
-1.190329E-01
--3.149976E-01
-5.735264E-02
--8.456340E-02
-4.563143E-03
-2.224065E-01
-6.600030E-02
-9.562392E-03
-1.843524E-02
--2.400599E-01
-3.182217E-02
--6.534941E-01
-1.180315E-01
-4.371157E-01
-9.076666E-02
-3.257455E-02
-2.936184E-02
--8.788428E-02
-1.923293E-02
--2.604776E-01
-3.660313E-02
--6.315350E-02
-1.503534E-02
-5.609294E-01
-8.783528E-02
--7.363672E-01
-1.789210E-01
-2.883575E-01
-6.478578E-02
--3.302954E-02
-1.517946E-02
--3.234157E-01
-4.418920E-02
-2.846318E-01
-2.712085E-02
--3.227536E-01
-5.062832E-02
-4.391474E-01
-5.548002E-02
-1.322988E-01
-2.995854E-02
-5.709679E+01
-6.978668E+02
-2.859201E-02
-1.094507E+00
-6.058587E-01
-6.079927E-01
-7.553798E-02
-1.131607E+00
--5.851206E-01
-1.215663E+00
-8.266012E-02
-9.031287E-01
--7.088368E-01
-3.984608E-01
--4.414986E-01
-1.502417E-01
-2.241998E-01
-3.228823E-01
--7.328574E-01
-2.430448E-01
--8.070160E-01
-1.767265E-01
--1.154449E-01
-8.739303E-03
--3.787161E-01
-4.728756E-01
--1.743577E-01
-1.091245E-01
-2.878137E-01
-2.724285E-01
-2.128994E-01
-4.440539E-01
-9.495567E-01
-3.622719E-01
-1.422950E-01
-5.309223E-02
-1.323659E-01
-1.911979E-01
--1.303752E-01
-5.710728E-01
--4.611294E-02
-4.086632E-02
-5.937879E-01
-1.006156E-01
--3.558925E-01
-2.998983E-01
-1.175971E+00
-5.323321E-01
-2.426485E-01
-1.497265E-01
-7.805090E-02
-5.060214E-02
--2.914577E-01
-2.233355E-01
-1.053098E-01
-6.693123E-02
-4.541315E-01
-1.328340E-01
--6.290732E-02
-8.910616E-02
-7.371592E-01
-1.980732E-01
-5.804701E-01
-1.711949E-01
--6.642202E-01
-1.131866E-01
-1.779818E-01
-6.530190E-02
--5.224739E-01
-2.534102E-01
--1.824905E-01
-2.910309E-02
+5.188799E+01
+5.402176E+02
+-5.713505E-01
+4.615729E-01
+-3.761827E-01
+5.750500E-01
+8.374325E-01
+1.862938E-01
+-3.954940E-01
+2.347775E-01
+-6.290233E-01
+1.864254E-01
+-6.656201E-01
+2.124518E-01
+4.729571E-01
+6.739065E-01
+4.921338E-01
+1.907183E-01
+-3.988992E-01
+3.761412E-01
+-1.125861E-01
+3.659299E-01
+-1.283461E-01
+5.045920E-02
+1.101261E-02
+1.391469E-01
+4.286921E-01
+2.097120E-01
+5.360702E-01
+1.809190E-01
+8.470757E-01
+2.461922E-01
+-4.140592E-01
+2.702824E-01
+-2.269391E-02
+5.000308E-03
+-1.585595E-01
+3.527370E-02
+-9.890128E-02
+1.067921E-01
+3.153468E-02
+1.483763E-01
+6.967922E-02
+7.789031E-02
+2.040956E-01
+4.637270E-02
+-2.345641E-01
+3.574654E-01
+-1.500187E-01
+1.514334E-01
+-3.019192E-01
+1.334819E-01
+1.796739E-01
+7.106788E-02
+-2.120506E-01
+1.144496E-01
+-6.891611E-02
+7.257229E-02
+-2.306514E-01
+7.048631E-02
+7.800814E-01
+2.467831E-01
+2.790547E-02
+5.494857E-02
+-1.896182E-01
+5.971620E-02
+1.644354E-02
+1.059859E-01
+-7.792754E-02
+2.085845E-02
+-1.114682E-01
+1.227128E-01
+1.593914E+01
+5.169154E+01
+1.039804E+00
+5.028617E-01
+-7.912437E-01
+5.548318E-01
+2.575930E-01
+1.148260E-01
+-6.331302E-01
+2.556615E-01
+-1.712129E-01
+7.877790E-02
+-5.816921E-01
+1.456126E-01
+2.272958E-01
+8.788738E-02
+3.822477E-01
+6.244032E-02
+-2.999416E-01
+8.461810E-02
+-2.623060E-02
+1.458472E-02
+1.300437E-01
+4.478019E-02
+-4.767351E-02
+7.362462E-02
+7.928962E-02
+4.510319E-02
+3.500548E-03
+4.881244E-02
+-2.067837E-01
+8.186594E-02
+-3.825304E-01
+1.082951E-01
+-3.558676E-01
+5.708469E-02
+4.048126E-01
+9.076309E-02
+4.553585E-02
+2.926622E-02
+-1.294373E-01
+1.870238E-02
+-3.195745E-01
+5.918983E-02
+-5.541420E-02
+6.185102E-02
+2.517910E-01
+1.252247E-01
+-6.864842E-02
+8.483359E-02
+-3.087092E-02
+1.682640E-02
+-6.457777E-02
+2.980731E-02
+-3.360246E-01
+3.729711E-02
+-2.091466E-01
+1.119332E-01
+-4.226988E-01
+5.973848E-02
+-5.390062E-02
+1.424816E-01
+-2.955041E-02
+7.118983E-03
+3.100944E-01
+5.584902E-02
+-4.266659E-01
+4.397359E-02
+-3.155083E-01
+7.428242E-02
+5.282933E-02
+2.010740E-02
+8.557014E+01
+1.465192E+03
+-3.913589E-01
+5.368834E-01
+-2.113693E+00
+2.169443E+00
+2.298156E-01
+6.330809E-01
+1.449786E-01
+2.666314E-01
+-2.958820E-01
+2.750937E-01
+1.054389E+00
+5.351584E-01
+4.775640E-02
+2.044779E-01
+4.186858E-01
+8.940845E-01
+-6.035852E-02
+3.754000E-01
+-1.597608E+00
+5.815293E-01
+5.200807E-01
+3.829815E-01
+9.437855E-01
+7.241779E-01
+-5.232235E-01
+1.966074E-01
+2.872008E-01
+1.241395E+00
+-1.039246E+00
+6.158088E-01
+3.058638E-01
+1.593114E-01
+-5.132144E-01
+4.577375E-01
+6.727602E-01
+4.119990E-01
+3.280880E-01
+4.971028E-01
+7.837744E-01
+2.444483E-01
+7.686392E-01
+3.456688E-01
+-5.035943E-01
+1.631734E-01
+4.145045E-01
+3.177084E-01
+-1.924638E-01
+3.336696E-01
+-1.484767E-01
+9.030824E-02
+-2.393846E-01
+6.598721E-02
+-5.318081E-01
+2.895430E-01
+1.518564E-01
+3.818155E-01
+5.795851E-01
+9.003270E-02
+3.580512E-01
+8.821756E-02
+5.366649E-01
+2.497151E-01
+-3.347132E-01
+1.352062E-01
+4.567995E-01
+1.561741E-01
+-2.279100E-01
+2.122433E-01
+4.461881E-01
+2.325205E-01
+1.427596E+01
+4.078276E+01
+5.217165E-02
+2.453888E-02
+1.584690E-01
+3.106540E-01
+4.560315E-01
+4.277362E-01
+-1.990373E-02
+5.277850E-02
+1.125203E-02
+6.443927E-02
+3.308696E-01
+1.037411E-01
+-2.750414E-01
+3.814328E-02
+-2.758789E-01
+1.449907E-01
+-3.474494E-02
+1.886069E-02
+-3.638818E-03
+1.651468E-01
+-2.060159E-02
+3.031181E-02
+3.225892E-01
+7.944048E-02
+-3.922626E-01
+5.950804E-02
+-7.374795E-01
+1.624566E-01
+-1.467806E-02
+1.234636E-01
+8.061252E-02
+4.356030E-02
+-1.065107E-01
+1.431995E-02
+-2.455689E-01
+4.182386E-02
+-3.425697E-01
+1.088413E-01
+-9.867791E-03
+4.864904E-02
+-2.403769E-01
+2.231699E-02
+1.795461E-01
+2.969251E-02
+-1.516375E-01
+2.951230E-02
+-3.101470E-01
+7.377660E-02
+1.996325E-01
+1.846547E-02
+9.153483E-02
+2.867924E-02
+2.545349E-01
+4.621843E-02
+1.776575E-01
+1.075483E-01
+-2.561501E-01
+4.947817E-02
+-1.558585E-01
+1.467725E-02
+-1.530184E-01
+5.532615E-02
+-1.802320E-01
+1.603564E-02
+3.331892E-01
+3.315195E-02
+-1.878592E-01
+3.588542E-02
+-3.843863E-01
+1.011661E-01
+4.943558E+00
+5.054633E+00
+3.508923E-01
+5.360844E-02
+2.595623E-01
+3.819756E-02
+-2.524359E-01
+4.825078E-02
+-3.376117E-01
+4.115606E-02
+8.885054E-02
+3.685958E-02
+1.168333E-01
+5.916818E-02
+-1.993698E-01
+5.632369E-02
+3.988948E-01
+4.366034E-02
+1.021403E-01
+4.690526E-03
+-1.508432E-01
+2.173064E-02
+-2.407920E-01
+2.510560E-02
+-1.703993E-01
+2.599072E-02
+8.752998E-02
+3.657089E-02
+-1.269869E-02
+2.565400E-02
+2.026727E-01
+1.804748E-02
+-4.913307E-03
+4.059747E-02
+-2.554771E-02
+7.959679E-03
+-1.549008E-02
+3.658041E-02
+-9.294647E-02
+2.754890E-03
+2.566876E-02
+4.951779E-03
+-1.016212E-02
+2.777381E-02
+3.601396E-01
+3.828736E-02
+-8.923373E-03
+3.126410E-03
+8.722969E-02
+1.182345E-02
+-2.332024E-02
+5.685275E-03
+2.101415E-01
+1.224880E-02
+-9.619916E-03
+9.042453E-03
+-2.480871E-01
+2.222042E-02
+9.764734E-02
+4.847970E-03
+-1.623487E-01
+1.814336E-02
+5.091875E-02
+1.290604E-02
+7.192058E-02
+1.343350E-02
+-1.316640E-01
+3.514269E-02
+-9.198972E-02
+1.244138E-02
+-1.225056E-01
+3.035718E-02
+2.194332E+01
+9.737940E+01
+-3.052407E-01
+4.072957E-01
+3.531168E-02
+2.019382E-01
+8.793928E-01
+4.041664E-01
+-4.072462E-01
+6.027190E-02
+-8.907772E-02
+1.952922E-01
+9.519375E-02
+9.821752E-02
+3.205302E-01
+2.075134E-01
+1.124955E-01
+6.446089E-02
+-3.366117E-01
+8.184450E-02
+-3.676127E-02
+3.861064E-02
+2.001007E-01
+6.507942E-02
+-1.155787E-01
+4.761238E-02
+-2.779628E-01
+3.425225E-02
+1.099627E-01
+5.462866E-02
+-2.654341E-01
+1.868127E-02
+2.246854E-01
+3.157231E-02
+-1.422513E-01
+5.939434E-02
+-8.583155E-02
+5.668810E-02
+6.967936E-02
+1.924265E-02
+-2.246405E-03
+1.576409E-02
+7.321307E-02
+2.061990E-02
+-4.949248E-01
+1.278374E-01
+4.468760E-02
+3.814622E-02
+-9.398135E-02
+1.772831E-02
+-2.757022E-01
+1.349555E-01
+1.715161E-02
+5.040025E-02
+-1.682974E-01
+7.558363E-02
+-4.700401E-02
+2.700354E-02
+1.109855E-01
+2.666559E-02
+2.136115E-01
+7.786593E-02
+-2.089667E-01
+1.489893E-02
+-6.959959E-02
+7.545487E-02
+-3.296680E-02
+1.604995E-02
+-1.587440E-01
+5.482886E-02
+-3.203027E-01
+3.421361E-02
diff --git a/tests/test_score_flux_yn/settings.xml b/tests/test_score_flux_yn/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_flux_yn/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_flux_yn/tallies.xml b/tests/test_score_flux_yn/tallies.xml
deleted file mode 100644
index e9f08bd4e6..0000000000
--- a/tests/test_score_flux_yn/tallies.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21 22 23 27 28 29" />
-    <scores>flux</scores>
-  </tally>
-  
-  <tally id="2">
-    <filter type="cell" bins="21 22 23 27 28 29" />
-    <scores>flux-y5</scores>
-  </tally>
-  
-  <tally id="3">
-    <filter type="cell" bins="21 22 23 27 28 29" />
-    <scores>flux-y5</scores>
-    <estimator>analog</estimator>
-  </tally>
-  
-  <tally id="4">
-    <filter type="cell" bins="21 22 23 27 28 29" />
-    <scores>flux-y5</scores>
-    <estimator>collision</estimator>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_flux_yn/test_score_flux_yn.py b/tests/test_score_flux_yn/test_score_flux_yn.py
index 1777db993e..0122768040 100755
--- a/tests/test_score_flux_yn/test_score_flux_yn.py
+++ b/tests/test_score_flux_yn/test_score_flux_yn.py
@@ -2,9 +2,31 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreFluxYnTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, 22, 23, 27, 28, 29))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('flux-y5') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreFluxYnTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_kappafission/geometry.xml b/tests/test_score_kappafission/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_kappafission/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-    </universes>
-  </lattice>
-
-</geometry>
diff --git a/tests/test_score_kappafission/inputs_true.dat b/tests/test_score_kappafission/inputs_true.dat
new file mode 100644
index 0000000000..67b1e38750
--- /dev/null
+++ b/tests/test_score_kappafission/inputs_true.dat
@@ -0,0 +1 @@
+46d1dbf99a14e08eddf34721d2380bf7969b8d299c48a64cfae22dfde29e3b8eab227d663f3ecb234dac2712b5971af2735fd69301b7614c7adae6c3da795e51
\ No newline at end of file
diff --git a/tests/test_score_kappafission/materials.xml b/tests/test_score_kappafission/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_kappafission/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_kappafission/results_true.dat b/tests/test_score_kappafission/results_true.dat
index e992b4b682..23c12eed20 100644
--- a/tests/test_score_kappafission/results_true.dat
+++ b/tests/test_score_kappafission/results_true.dat
@@ -1,29 +1,29 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-1.848110E+02
-7.563211E+03
+3.057169E+02
+1.886844E+04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.035912E+02
-8.999693E+03
+7.017044E+01
+1.049216E+03
 tally 2:
-1.765331E+02
-6.974050E+03
+2.992056E+02
+1.852593E+04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.938441E+02
-7.888708E+03
+7.782271E+01
+1.267469E+03
 tally 3:
-1.770125E+02
-6.702714E+03
+2.933944E+02
+1.740955E+04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.942246E+02
-8.416720E+03
+7.679811E+01
+1.191597E+03
diff --git a/tests/test_score_kappafission/settings.xml b/tests/test_score_kappafission/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_kappafission/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_kappafission/tallies.xml b/tests/test_score_kappafission/tallies.xml
deleted file mode 100644
index 8fe5d5c842..0000000000
--- a/tests/test_score_kappafission/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21 22 23 27" />
-    <scores>kappa-fission</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="21 22 23 27" />
-    <scores>kappa-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-
-  <tally id="3">
-    <filter type="cell" bins="21 22 23 27" />
-    <scores>kappa-fission</scores>
-    <estimator>collision</estimator>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_kappafission/test_score_kappafission.py b/tests/test_score_kappafission/test_score_kappafission.py
index 1777db993e..fe43309400 100644
--- a/tests/test_score_kappafission/test_score_kappafission.py
+++ b/tests/test_score_kappafission/test_score_kappafission.py
@@ -2,9 +2,31 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreKappaFissionTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, 22, 23, 27))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('kappa-fission') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreKappaFissionTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_nufission/geometry.xml b/tests/test_score_nufission/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_nufission/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-    </universes>
-  </lattice>
-
-</geometry>
diff --git a/tests/test_score_nufission/inputs_true.dat b/tests/test_score_nufission/inputs_true.dat
new file mode 100644
index 0000000000..dbf21a50b3
--- /dev/null
+++ b/tests/test_score_nufission/inputs_true.dat
@@ -0,0 +1 @@
+8500d149868598a30fc818a34fe0465cf926b79632a8a7a1f96799cc955f30544b2cec131878bbded295179a2fc103657c2ecdb8c28ea10b84b7f6f0091fac7a
\ No newline at end of file
diff --git a/tests/test_score_nufission/materials.xml b/tests/test_score_nufission/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_nufission/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_nufission/results_true.dat b/tests/test_score_nufission/results_true.dat
index 33c4ff9fbc..046c5b289e 100644
--- a/tests/test_score_nufission/results_true.dat
+++ b/tests/test_score_nufission/results_true.dat
@@ -1,29 +1,29 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-2.486342E+00
-1.368793E+00
+4.110726E+00
+3.411205E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.733038E+00
-1.616903E+00
+9.429333E-01
+1.889683E-01
 tally 2:
-2.296157E+00
-1.167084E+00
+4.104411E+00
+3.453290E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.679940E+00
-1.498454E+00
+1.034371E+00
+2.220105E-01
 tally 3:
-2.381373E+00
-1.213497E+00
+3.947006E+00
+3.149452E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.607077E+00
-1.513932E+00
+1.031768E+00
+2.152452E-01
diff --git a/tests/test_score_nufission/settings.xml b/tests/test_score_nufission/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_nufission/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_nufission/tallies.xml b/tests/test_score_nufission/tallies.xml
deleted file mode 100644
index 2812a00b55..0000000000
--- a/tests/test_score_nufission/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21 22 23 27" />
-    <scores>nu-fission</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="21 22 23 27" />
-    <scores>nu-fission</scores>
-    <estimator>analog</estimator>
-  </tally>
-
-  <tally id="3">
-    <filter type="cell" bins="21 22 23 27" />
-    <scores>nu-fission</scores>
-    <estimator>collision</estimator>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_nufission/test_score_nufission.py b/tests/test_score_nufission/test_score_nufission.py
index 1777db993e..2c0bbd2f19 100644
--- a/tests/test_score_nufission/test_score_nufission.py
+++ b/tests/test_score_nufission/test_score_nufission.py
@@ -2,9 +2,31 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreNuFissionTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, 22, 23, 27))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('nu-fission') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreNuFissionTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_nuscatter/geometry.xml b/tests/test_score_nuscatter/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_nuscatter/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-    </universes>
-  </lattice>
-
-</geometry>
diff --git a/tests/test_score_nuscatter/inputs_true.dat b/tests/test_score_nuscatter/inputs_true.dat
new file mode 100644
index 0000000000..889941afce
--- /dev/null
+++ b/tests/test_score_nuscatter/inputs_true.dat
@@ -0,0 +1 @@
+41644968ea3a500af029e799ceef40c270d26944e0e7426afe1b8b2e15743b79c8b2989ecaaa0dac958046a89a49dab9d592cc7a4e059cd1f917b62219a8ed31
\ No newline at end of file
diff --git a/tests/test_score_nuscatter/materials.xml b/tests/test_score_nuscatter/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_nuscatter/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_nuscatter/results_true.dat b/tests/test_score_nuscatter/results_true.dat
index 66e0c0a031..675509932e 100644
--- a/tests/test_score_nuscatter/results_true.dat
+++ b/tests/test_score_nuscatter/results_true.dat
@@ -1,11 +1,11 @@
 k-combined:
-9.870214E-01 2.095925E-02
+9.935192E-01 5.457292E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-3.353000E+01
-1.133379E+02
-8.150000E+00
-6.793700E+00
-1.098500E+02
-1.221333E+03
+1.940000E+01
+7.561780E+01
+4.340000E+00
+3.813000E+00
+6.440000E+01
+8.302674E+02
diff --git a/tests/test_score_nuscatter/settings.xml b/tests/test_score_nuscatter/settings.xml
deleted file mode 100644
index ce632aae31..0000000000
--- a/tests/test_score_nuscatter/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>0</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_nuscatter/tallies.xml b/tests/test_score_nuscatter/tallies.xml
deleted file mode 100644
index 08f8fa32cc..0000000000
--- a/tests/test_score_nuscatter/tallies.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>nu-scatter</scores>
-  </tally>
-
-</tallies>
\ No newline at end of file
diff --git a/tests/test_score_nuscatter/test_score_nuscatter.py b/tests/test_score_nuscatter/test_score_nuscatter.py
index 1777db993e..81fca1e68b 100644
--- a/tests/test_score_nuscatter/test_score_nuscatter.py
+++ b/tests/test_score_nuscatter/test_score_nuscatter.py
@@ -2,9 +2,28 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreNuScatterTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(10, 21, 22, 23))
+        t = openmc.Tally(tally_id=1)
+        t.add_filter(filt)
+        t.add_score('nu-scatter')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(t)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreNuScatterTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_nuscatter_n/geometry.xml b/tests/test_score_nuscatter_n/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_nuscatter_n/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-    </universes>
-  </lattice>
-
-</geometry>
diff --git a/tests/test_score_nuscatter_n/inputs_true.dat b/tests/test_score_nuscatter_n/inputs_true.dat
new file mode 100644
index 0000000000..228c224001
--- /dev/null
+++ b/tests/test_score_nuscatter_n/inputs_true.dat
@@ -0,0 +1 @@
+c8072b4ce735db4cc196a688f2d253e5683d5ef7b7a254ceab4d689d3902bb4fd7223ad824d002f3abf7e0fe7fbd80ab6c0273c8972df1ec26ff69cbd26c13ee
\ No newline at end of file
diff --git a/tests/test_score_nuscatter_n/materials.xml b/tests/test_score_nuscatter_n/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_nuscatter_n/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_nuscatter_n/results_true.dat b/tests/test_score_nuscatter_n/results_true.dat
index 5dbc7f8abf..cdcbcfb524 100644
--- a/tests/test_score_nuscatter_n/results_true.dat
+++ b/tests/test_score_nuscatter_n/results_true.dat
@@ -1,33 +1,33 @@
 k-combined:
-9.870214E-01 2.095925E-02
+9.935192E-01 5.457292E-02
 tally 1:
-3.353000E+01
-1.133379E+02
-3.491100E+00
-1.265776E+00
-1.948509E+00
-4.761101E-01
-9.177045E-01
-1.251750E-01
-5.654249E-01
-5.567043E-02
-8.150000E+00
-6.793700E+00
-1.223263E+00
-1.678053E-01
-7.833173E-01
-8.407682E-02
-1.350170E-01
-7.393546E-03
-2.164837E-01
-1.367122E-02
-1.098500E+02
-1.221333E+03
-5.598624E+01
-3.183267E+02
-2.048716E+01
-4.301097E+01
-1.399456E+00
-4.458904E-01
--2.183180E+00
-6.628474E-01
+1.940000E+01
+7.561780E+01
+2.629221E+00
+1.399188E+00
+1.567944E+00
+5.124385E-01
+6.926532E-01
+1.577035E-01
+6.111349E-01
+1.006724E-01
+4.340000E+00
+3.813000E+00
+6.633546E-01
+9.836364E-02
+3.707954E-01
+3.694050E-02
+-4.267991E-02
+1.870638E-03
+5.239484E-02
+1.032955E-02
+6.440000E+01
+8.302674E+02
+3.312945E+01
+2.197504E+02
+1.239256E+01
+3.104303E+01
+7.813162E-01
+2.790254E-01
+-1.320978E+00
+4.696586E-01
diff --git a/tests/test_score_nuscatter_n/settings.xml b/tests/test_score_nuscatter_n/settings.xml
deleted file mode 100644
index ce632aae31..0000000000
--- a/tests/test_score_nuscatter_n/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>0</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_nuscatter_n/tallies.xml b/tests/test_score_nuscatter_n/tallies.xml
deleted file mode 100644
index 90e28227b6..0000000000
--- a/tests/test_score_nuscatter_n/tallies.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21 22 23" />
-    <scores>nu-scatter nu-scatter-1 nu-scatter-2 nu-scatter-3 nu-scatter-4</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_nuscatter_n/test_score_nuscatter_n.py b/tests/test_score_nuscatter_n/test_score_nuscatter_n.py
index 1777db993e..05e00e8132 100644
--- a/tests/test_score_nuscatter_n/test_score_nuscatter_n.py
+++ b/tests/test_score_nuscatter_n/test_score_nuscatter_n.py
@@ -2,9 +2,32 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreNuScatterNTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, 22, 23))
+        t = openmc.Tally(tally_id=1)
+        t.add_filter(filt)
+        t.add_score('nu-scatter')
+        t.add_score('nu-scatter-1')
+        t.add_score('nu-scatter-2')
+        t.add_score('nu-scatter-3')
+        t.add_score('nu-scatter-4')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(t)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreNuScatterNTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_nuscatter_pn/geometry.xml b/tests/test_score_nuscatter_pn/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_nuscatter_pn/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-    </universes>
-  </lattice>
-
-</geometry>
diff --git a/tests/test_score_nuscatter_pn/inputs_true.dat b/tests/test_score_nuscatter_pn/inputs_true.dat
new file mode 100644
index 0000000000..f04187297d
--- /dev/null
+++ b/tests/test_score_nuscatter_pn/inputs_true.dat
@@ -0,0 +1 @@
+dbe91c112a02bf9c1098c2ba93c737bfd048f356d00dab280a245c572821d345a9d4c2cfa766f8b83c42362d9b8dbbb3d5ce240b6e749541aac3cae567b715c4
\ No newline at end of file
diff --git a/tests/test_score_nuscatter_pn/materials.xml b/tests/test_score_nuscatter_pn/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_nuscatter_pn/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_nuscatter_pn/results_true.dat b/tests/test_score_nuscatter_pn/results_true.dat
index 41bc17f8b8..81d1d1ad73 100644
--- a/tests/test_score_nuscatter_pn/results_true.dat
+++ b/tests/test_score_nuscatter_pn/results_true.dat
@@ -1,24 +1,24 @@
 k-combined:
-9.870214E-01 2.095925E-02
+9.935192E-01 5.457292E-02
 tally 1:
-3.353000E+01
-1.133379E+02
-3.491100E+00
-1.265776E+00
-1.948509E+00
-4.761101E-01
-9.177045E-01
-1.251750E-01
-5.654249E-01
-5.567043E-02
+1.940000E+01
+7.561780E+01
+2.629221E+00
+1.399188E+00
+1.567944E+00
+5.124385E-01
+6.926532E-01
+1.577035E-01
+6.111349E-01
+1.006724E-01
 tally 2:
-3.353000E+01
-1.133379E+02
-3.491100E+00
-1.265776E+00
-1.948509E+00
-4.761101E-01
-9.177045E-01
-1.251750E-01
-5.654249E-01
-5.567043E-02
+1.940000E+01
+7.561780E+01
+2.629221E+00
+1.399188E+00
+1.567944E+00
+5.124385E-01
+6.926532E-01
+1.577035E-01
+6.111349E-01
+1.006724E-01
diff --git a/tests/test_score_nuscatter_pn/settings.xml b/tests/test_score_nuscatter_pn/settings.xml
deleted file mode 100644
index ce632aae31..0000000000
--- a/tests/test_score_nuscatter_pn/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>0</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_nuscatter_pn/tallies.xml b/tests/test_score_nuscatter_pn/tallies.xml
deleted file mode 100644
index dfad48dda2..0000000000
--- a/tests/test_score_nuscatter_pn/tallies.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21" />
-    <scores>nu-scatter-0 nu-scatter-1 nu-scatter-2 nu-scatter-3 nu-scatter-4</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="21" />
-    <scores>nu-scatter-p4</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py b/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py
index 1777db993e..009bccd159 100644
--- a/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py
+++ b/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py
@@ -2,9 +2,36 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreNuScatterPNTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, ))
+        t1 = openmc.Tally(tally_id=1)
+        t1.add_filter(filt)
+        t1.add_score('nu-scatter-0')
+        t1.add_score('nu-scatter-1')
+        t1.add_score('nu-scatter-2')
+        t1.add_score('nu-scatter-3')
+        t1.add_score('nu-scatter-4')
+        t2 = openmc.Tally(tally_id=2)
+        t2.add_filter(filt)
+        t2.add_score('nu-scatter-p4')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(t1)
+        self._input_set.tallies.add_tally(t2)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreNuScatterPNTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_nuscatter_yn/geometry.xml b/tests/test_score_nuscatter_yn/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_nuscatter_yn/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-    </universes>
-  </lattice>
-
-</geometry>
diff --git a/tests/test_score_nuscatter_yn/inputs_true.dat b/tests/test_score_nuscatter_yn/inputs_true.dat
new file mode 100644
index 0000000000..2a0fde3095
--- /dev/null
+++ b/tests/test_score_nuscatter_yn/inputs_true.dat
@@ -0,0 +1 @@
+31e4d35c4845eaa7d3ec4b021f820a4526b0d8a43fdd69288c1c94551a895c05bbd10cfe72b54dafc9abe31ed56ef06a6fb3de77088e4c2da25b547fc06ac74d
\ No newline at end of file
diff --git a/tests/test_score_nuscatter_yn/materials.xml b/tests/test_score_nuscatter_yn/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_nuscatter_yn/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_nuscatter_yn/results_true.dat b/tests/test_score_nuscatter_yn/results_true.dat
index cdf051ee75..fde6f07ec4 100644
--- a/tests/test_score_nuscatter_yn/results_true.dat
+++ b/tests/test_score_nuscatter_yn/results_true.dat
@@ -1,38 +1,38 @@
 k-combined:
-9.870214E-01 2.095925E-02
+9.935192E-01 5.457292E-02
 tally 1:
-3.353000E+01
-1.133379E+02
+1.940000E+01
+7.561780E+01
 tally 2:
-3.353000E+01
-1.133379E+02
-4.293226E-01
-6.259462E-02
--2.011041E-02
-5.388144E-02
-3.900136E-01
-5.873137E-02
-6.150213E-02
-9.043796E-03
-5.518583E-02
-1.739087E-02
--2.047987E-01
-1.993679E-02
-6.710345E-02
-1.652573E-02
--3.619254E-02
-1.598186E-02
-3.551558E-02
-9.077346E-03
-1.044669E-01
-2.082961E-03
--3.782063E-02
-1.681459E-02
-1.752386E-01
-1.411429E-02
--3.289649E-02
-9.534958E-03
-5.252770E-02
-7.518445E-03
-2.688056E-02
-3.397824E-03
+1.940000E+01
+7.561780E+01
+-8.464573E-02
+1.823218E-02
+-1.116469E-01
+3.380141E-02
+-2.130479E-03
+1.022241E-02
+-4.896859E-02
+1.074348E-02
+-1.482536E-01
+1.114316E-02
+-6.827566E-02
+4.248457E-03
+1.494503E-01
+2.605186E-02
+2.010847E-01
+1.699034E-02
+4.535125E-02
+2.658493E-03
+-4.135950E-02
+4.170544E-03
+1.277006E-01
+6.276355E-03
+4.192667E-02
+4.955945E-03
+-9.607170E-02
+3.280003E-03
+1.533637E-01
+7.107300E-03
+3.570929E-02
+4.795032E-03
diff --git a/tests/test_score_nuscatter_yn/settings.xml b/tests/test_score_nuscatter_yn/settings.xml
deleted file mode 100644
index ce632aae31..0000000000
--- a/tests/test_score_nuscatter_yn/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>0</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_nuscatter_yn/tallies.xml b/tests/test_score_nuscatter_yn/tallies.xml
deleted file mode 100644
index b80b37dc8c..0000000000
--- a/tests/test_score_nuscatter_yn/tallies.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21" />
-    <scores>nu-scatter-0</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="21" />
-    <scores>nu-scatter-y3</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py b/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py
index 1777db993e..d1fa3e029f 100644
--- a/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py
+++ b/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py
@@ -2,9 +2,32 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreNuScatterYNTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, ))
+        t1 = openmc.Tally(tally_id=1)
+        t1.add_filter(filt)
+        t1.add_score('nu-scatter-0')
+        t2 = openmc.Tally(tally_id=2)
+        t2.add_filter(filt)
+        t2.add_score('nu-scatter-y3')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(t1)
+        self._input_set.tallies.add_tally(t2)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreNuScatterYNTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_scatter/geometry.xml b/tests/test_score_scatter/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_scatter/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-    </universes>
-  </lattice>
-
-</geometry>
diff --git a/tests/test_score_scatter/inputs_true.dat b/tests/test_score_scatter/inputs_true.dat
new file mode 100644
index 0000000000..c5f1c1f17a
--- /dev/null
+++ b/tests/test_score_scatter/inputs_true.dat
@@ -0,0 +1 @@
+c07fa98f19d66732be7bd394b30b6e2d18d54a9fec2ae729e9d00adb55d9c00533bacb2d3fe4eee7f41e6e0b6841e82ff313bc593bf3b7932bd8d026dc81a58d
\ No newline at end of file
diff --git a/tests/test_score_scatter/materials.xml b/tests/test_score_scatter/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_scatter/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_scatter/results_true.dat b/tests/test_score_scatter/results_true.dat
index 21d7d83c27..50782e4167 100644
--- a/tests/test_score_scatter/results_true.dat
+++ b/tests/test_score_scatter/results_true.dat
@@ -1,29 +1,29 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-1.223028E+01
-3.185078E+01
-2.900350E+00
-1.814004E+00
-4.059013E+01
-3.609499E+02
+1.907306E+01
+7.310892E+01
+4.678711E+00
+4.406892E+00
+6.487881E+01
+8.433246E+02
 tally 2:
 0.000000E+00
 0.000000E+00
-1.169000E+01
-2.915330E+01
-3.200000E+00
-2.342600E+00
-4.064000E+01
-3.595168E+02
+1.940000E+01
+7.561780E+01
+4.340000E+00
+3.813000E+00
+6.440000E+01
+8.302674E+02
 tally 3:
 0.000000E+00
 0.000000E+00
-1.172929E+01
-2.935812E+01
-3.185726E+00
-2.323517E+00
-4.074319E+01
-3.614902E+02
+1.952859E+01
+7.659866E+01
+4.328145E+00
+3.794232E+00
+6.439437E+01
+8.300759E+02
diff --git a/tests/test_score_scatter/settings.xml b/tests/test_score_scatter/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_scatter/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_scatter/tallies.xml b/tests/test_score_scatter/tallies.xml
deleted file mode 100644
index b6eb73b506..0000000000
--- a/tests/test_score_scatter/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>scatter</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>scatter</scores>
-    <estimator>analog</estimator>
-  </tally>
-
-  <tally id="3">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>scatter</scores>
-    <estimator>collision</estimator>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_scatter/test_score_scatter.py b/tests/test_score_scatter/test_score_scatter.py
index 1777db993e..76ff39e01f 100644
--- a/tests/test_score_scatter/test_score_scatter.py
+++ b/tests/test_score_scatter/test_score_scatter.py
@@ -2,9 +2,31 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreScatterTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(10, 21, 22, 23))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('scatter') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreScatterTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_scatter_n/geometry.xml b/tests/test_score_scatter_n/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_scatter_n/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-    </universes>
-  </lattice>
-
-</geometry>
diff --git a/tests/test_score_scatter_n/inputs_true.dat b/tests/test_score_scatter_n/inputs_true.dat
new file mode 100644
index 0000000000..37dc7074f0
--- /dev/null
+++ b/tests/test_score_scatter_n/inputs_true.dat
@@ -0,0 +1 @@
+5a6ec0557a68deb5334e0689575531328bad6964f48409ef70343266e88a5c691099486813c69c3c4c0e6154e23342d228f924606b664ae7c4cdd24818626797
\ No newline at end of file
diff --git a/tests/test_score_scatter_n/materials.xml b/tests/test_score_scatter_n/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_scatter_n/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_scatter_n/results_true.dat b/tests/test_score_scatter_n/results_true.dat
index b46a1e184d..cdcbcfb524 100644
--- a/tests/test_score_scatter_n/results_true.dat
+++ b/tests/test_score_scatter_n/results_true.dat
@@ -1,33 +1,33 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-1.169000E+01
-2.915330E+01
-1.247253E+00
-3.767436E-01
-5.330812E-01
-1.385083E-01
-2.987823E-01
-5.699361E-02
-2.645512E-01
-2.905381E-02
-3.200000E+00
-2.342600E+00
-3.809941E-01
-2.965326E-02
-4.319242E-01
-3.738822E-02
-9.261909E-02
-6.711328E-03
--6.052442E-02
-7.087230E-03
-4.064000E+01
-3.595168E+02
-2.096700E+01
-9.516606E+01
-7.560566E+00
-1.248694E+01
-2.093348E-01
-4.278510E-02
--1.449929E+00
-4.356371E-01
+1.940000E+01
+7.561780E+01
+2.629221E+00
+1.399188E+00
+1.567944E+00
+5.124385E-01
+6.926532E-01
+1.577035E-01
+6.111349E-01
+1.006724E-01
+4.340000E+00
+3.813000E+00
+6.633546E-01
+9.836364E-02
+3.707954E-01
+3.694050E-02
+-4.267991E-02
+1.870638E-03
+5.239484E-02
+1.032955E-02
+6.440000E+01
+8.302674E+02
+3.312945E+01
+2.197504E+02
+1.239256E+01
+3.104303E+01
+7.813162E-01
+2.790254E-01
+-1.320978E+00
+4.696586E-01
diff --git a/tests/test_score_scatter_n/settings.xml b/tests/test_score_scatter_n/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_scatter_n/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_scatter_n/tallies.xml b/tests/test_score_scatter_n/tallies.xml
deleted file mode 100644
index 0164dea358..0000000000
--- a/tests/test_score_scatter_n/tallies.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21 22 23" />
-    <scores>scatter scatter-1 scatter-2 scatter-3 scatter-4</scores>
-  </tally>
-
-</tallies>
\ No newline at end of file
diff --git a/tests/test_score_scatter_n/test_score_scatter_n.py b/tests/test_score_scatter_n/test_score_scatter_n.py
index 1777db993e..304cd6cb77 100644
--- a/tests/test_score_scatter_n/test_score_scatter_n.py
+++ b/tests/test_score_scatter_n/test_score_scatter_n.py
@@ -2,9 +2,32 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreScatterNTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, 22, 23))
+        t = openmc.Tally(tally_id=1)
+        t.add_filter(filt)
+        t.add_score('scatter')
+        t.add_score('scatter-1')
+        t.add_score('scatter-2')
+        t.add_score('scatter-3')
+        t.add_score('scatter-4')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(t)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreScatterNTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_scatter_pn/geometry.xml b/tests/test_score_scatter_pn/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_scatter_pn/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-    </universes>
-  </lattice>
-
-</geometry>
diff --git a/tests/test_score_scatter_pn/inputs_true.dat b/tests/test_score_scatter_pn/inputs_true.dat
new file mode 100644
index 0000000000..06dab53407
--- /dev/null
+++ b/tests/test_score_scatter_pn/inputs_true.dat
@@ -0,0 +1 @@
+112ae1a84c81f58885583b463f576bf1d9b5f5cbb0f5dfb36147ab30be2ef0d7506cfee053b54c26baad1b233d5d97cd1698c2af909682275e0b8fd79dd8f43c
\ No newline at end of file
diff --git a/tests/test_score_scatter_pn/materials.xml b/tests/test_score_scatter_pn/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_scatter_pn/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_scatter_pn/results_true.dat b/tests/test_score_scatter_pn/results_true.dat
index 3c34895d90..81d1d1ad73 100644
--- a/tests/test_score_scatter_pn/results_true.dat
+++ b/tests/test_score_scatter_pn/results_true.dat
@@ -1,24 +1,24 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-1.169000E+01
-2.915330E+01
-1.247253E+00
-3.767436E-01
-5.330812E-01
-1.385083E-01
-2.987823E-01
-5.699361E-02
-2.645512E-01
-2.905381E-02
+1.940000E+01
+7.561780E+01
+2.629221E+00
+1.399188E+00
+1.567944E+00
+5.124385E-01
+6.926532E-01
+1.577035E-01
+6.111349E-01
+1.006724E-01
 tally 2:
-1.169000E+01
-2.915330E+01
-1.247253E+00
-3.767436E-01
-5.330812E-01
-1.385083E-01
-2.987823E-01
-5.699361E-02
-2.645512E-01
-2.905381E-02
+1.940000E+01
+7.561780E+01
+2.629221E+00
+1.399188E+00
+1.567944E+00
+5.124385E-01
+6.926532E-01
+1.577035E-01
+6.111349E-01
+1.006724E-01
diff --git a/tests/test_score_scatter_pn/settings.xml b/tests/test_score_scatter_pn/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_scatter_pn/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_scatter_pn/tallies.xml b/tests/test_score_scatter_pn/tallies.xml
deleted file mode 100644
index 61a7854d68..0000000000
--- a/tests/test_score_scatter_pn/tallies.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21" />
-    <scores>scatter-0 scatter-1 scatter-2 scatter-3 scatter-4</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="21" />
-    <scores>scatter-p4</scores>
-  </tally>
-
-</tallies>
\ No newline at end of file
diff --git a/tests/test_score_scatter_pn/test_score_scatter_pn.py b/tests/test_score_scatter_pn/test_score_scatter_pn.py
index 1777db993e..79a4502c9c 100644
--- a/tests/test_score_scatter_pn/test_score_scatter_pn.py
+++ b/tests/test_score_scatter_pn/test_score_scatter_pn.py
@@ -2,9 +2,37 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreScatterPNTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, ))
+        t1 = openmc.Tally(tally_id=1)
+        t1.add_filter(filt)
+        t1.add_score('scatter-0')
+        t1.add_score('scatter-1')
+        t1.add_score('scatter-2')
+        t1.add_score('scatter-3')
+        t1.add_score('scatter-4')
+        t1.estimator = 'analog'
+        t2 = openmc.Tally(tally_id=2)
+        t2.add_filter(filt)
+        t2.add_score('scatter-p4')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(t1)
+        self._input_set.tallies.add_tally(t2)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreScatterPNTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_scatter_yn/geometry.xml b/tests/test_score_scatter_yn/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_scatter_yn/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-    </universes>
-  </lattice>
-
-</geometry>
diff --git a/tests/test_score_scatter_yn/inputs_true.dat b/tests/test_score_scatter_yn/inputs_true.dat
new file mode 100644
index 0000000000..c7c1c822af
--- /dev/null
+++ b/tests/test_score_scatter_yn/inputs_true.dat
@@ -0,0 +1 @@
+ad59269de656ab6ea87cf55f1ecb8cd60f4bb652b881bc9f3f705fd17714fee4cdbb105b99d9b50e5d39375f89d37437888d432f53457cd5d61e1956b81e2097
\ No newline at end of file
diff --git a/tests/test_score_scatter_yn/materials.xml b/tests/test_score_scatter_yn/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_scatter_yn/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_scatter_yn/results_true.dat b/tests/test_score_scatter_yn/results_true.dat
index 9df7ea42a7..3e22703ad7 100644
--- a/tests/test_score_scatter_yn/results_true.dat
+++ b/tests/test_score_scatter_yn/results_true.dat
@@ -1,56 +1,56 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
-1.169000E+01
-2.915330E+01
+1.940000E+01
+7.561780E+01
 tally 2:
-1.169000E+01
-2.915330E+01
--2.198379E-01
-2.828670E-02
--1.317276E-01
-9.568596E-03
-8.309792E-02
-1.155410E-02
--2.288506E-02
-3.710542E-03
--2.720674E-02
-1.789163E-03
--1.323964E-02
-1.819112E-04
-8.941597E-02
-4.265616E-03
-1.516805E-01
-1.332526E-02
--1.832782E-02
-6.611171E-03
-1.311371E-02
-2.840648E-03
-3.728365E-02
-2.866806E-03
--5.100587E-02
-2.957146E-03
-3.388028E-02
-2.481570E-03
--7.766921E-02
-3.129377E-03
-1.666131E-02
-3.828290E-03
-8.102553E-02
-2.118169E-03
-6.303084E-03
-7.156173E-04
--2.083478E-03
-2.683340E-03
-6.794806E-03
-3.912783E-04
-1.005390E-01
-2.920205E-03
--5.332517E-02
-2.205372E-03
--1.584725E-02
-8.984498E-04
-3.486904E-02
-6.448722E-04
--2.420912E-02
-6.352276E-04
+1.940000E+01
+7.561780E+01
+-8.464573E-02
+1.823218E-02
+-1.116469E-01
+3.380141E-02
+-2.130479E-03
+1.022241E-02
+-4.896859E-02
+1.074348E-02
+-1.482536E-01
+1.114316E-02
+-6.827566E-02
+4.248457E-03
+1.494503E-01
+2.605186E-02
+2.010847E-01
+1.699034E-02
+4.535125E-02
+2.658493E-03
+-4.135950E-02
+4.170544E-03
+1.277006E-01
+6.276355E-03
+4.192667E-02
+4.955945E-03
+-9.607170E-02
+3.280003E-03
+1.533637E-01
+7.107300E-03
+3.570929E-02
+4.795032E-03
+-1.183812E-01
+3.369458E-03
+-1.555883E-02
+9.917545E-04
+-9.288972E-02
+2.083169E-03
+-1.698033E-02
+1.027209E-03
+7.433184E-03
+5.046022E-04
+9.078711E-02
+2.020877E-03
+-7.502769E-02
+2.431965E-03
+-3.565718E-02
+5.978599E-03
+-7.076433E-02
+2.138810E-03
diff --git a/tests/test_score_scatter_yn/settings.xml b/tests/test_score_scatter_yn/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_scatter_yn/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_scatter_yn/tallies.xml b/tests/test_score_scatter_yn/tallies.xml
deleted file mode 100644
index 3c46c13d40..0000000000
--- a/tests/test_score_scatter_yn/tallies.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="21" />
-    <scores>scatter-0</scores>
-    <estimator>analog</estimator>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="21" />
-    <scores>scatter-y4</scores>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_scatter_yn/test_score_scatter_yn.py b/tests/test_score_scatter_yn/test_score_scatter_yn.py
index 1777db993e..f99fc5923f 100644
--- a/tests/test_score_scatter_yn/test_score_scatter_yn.py
+++ b/tests/test_score_scatter_yn/test_score_scatter_yn.py
@@ -2,9 +2,33 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreScatterYNTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, ))
+        t1 = openmc.Tally(tally_id=1)
+        t1.add_filter(filt)
+        t1.add_score('scatter-0')
+        t1.estimator = 'analog'
+        t2 = openmc.Tally(tally_id=2)
+        t2.add_filter(filt)
+        t2.add_score('scatter-y4')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(t1)
+        self._input_set.tallies.add_tally(t2)
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreScatterYNTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_total/geometry.xml b/tests/test_score_total/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_total/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-    </universes>
-  </lattice>
-
-</geometry>
diff --git a/tests/test_score_total/inputs_true.dat b/tests/test_score_total/inputs_true.dat
new file mode 100644
index 0000000000..114ec33e14
--- /dev/null
+++ b/tests/test_score_total/inputs_true.dat
@@ -0,0 +1 @@
+1ba17d4cef859221f314a0e7576a762260effe8f1977c9c6c74a80007d80b92d8d0fffadf39dde5e054809f3bf63529930428f79c6c4008d53e8be7644cd538a
\ No newline at end of file
diff --git a/tests/test_score_total/materials.xml b/tests/test_score_total/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_total/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_total/results_true.dat b/tests/test_score_total/results_true.dat
index e782fd9d04..a51e32b159 100644
--- a/tests/test_score_total/results_true.dat
+++ b/tests/test_score_total/results_true.dat
@@ -1,29 +1,29 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-1.423676E+01
-4.330937E+01
-2.914798E+00
-1.831649E+00
-4.088282E+01
-3.662539E+02
+2.240915E+01
+1.009032E+02
+4.711189E+00
+4.469059E+00
+6.533718E+01
+8.552989E+02
 tally 2:
 0.000000E+00
 0.000000E+00
-1.372000E+01
-4.018980E+01
-3.200000E+00
-2.342600E+00
-4.104000E+01
-3.668254E+02
+2.278000E+01
+1.042404E+02
+4.350000E+00
+3.833900E+00
+6.484000E+01
+8.416314E+02
 tally 3:
 0.000000E+00
 0.000000E+00
-1.372000E+01
-4.018980E+01
-3.200000E+00
-2.342600E+00
-4.104000E+01
-3.668254E+02
+2.278000E+01
+1.042404E+02
+4.350000E+00
+3.833900E+00
+6.484000E+01
+8.416314E+02
diff --git a/tests/test_score_total/settings.xml b/tests/test_score_total/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_total/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_total/tallies.xml b/tests/test_score_total/tallies.xml
deleted file mode 100644
index 02286f96c7..0000000000
--- a/tests/test_score_total/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>total</scores>
-  </tally>
-
-  <tally id="2">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>total</scores>
-    <estimator>analog</estimator>
-  </tally>
-
-  <tally id="3">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>total</scores>
-    <estimator>collision</estimator>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_total/test_score_total.py b/tests/test_score_total/test_score_total.py
index 1777db993e..702a8141c1 100644
--- a/tests/test_score_total/test_score_total.py
+++ b/tests/test_score_total/test_score_total.py
@@ -2,9 +2,31 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreTotalTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(10, 21, 22, 23))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('total') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreTotalTestHarness('statepoint.10.*', True)
     harness.main()
diff --git a/tests/test_score_total_yn/geometry.xml b/tests/test_score_total_yn/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_total_yn/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
-  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
-  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
-  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
-  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
-  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
-  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
-  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
-
-  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
-  <surface id="32" type="z-plane" coeffs="-199.0" />
-  <surface id="33" type="z-plane" coeffs="-193.0" />
-  <surface id="34" type="z-plane" coeffs="-183.0" />
-  <surface id="35" type="z-plane" coeffs="0.0" />
-  <surface id="36" type="z-plane" coeffs="183.0" />
-  <surface id="37" type="z-plane" coeffs="203.0" />
-  <surface id="38" type="z-plane" coeffs="215.0" />
-  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
-
-  <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
-
-  <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
-
-  <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
-
-  <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
-
-  <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="4" surfaces="34 -35" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
-
-  <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="3" surfaces="35 -36" />
-
-  <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
-
-  <!-- Fuel Assembly (Lower Half) -->
-  <lattice id="100">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
-      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-    </universes>
-  </lattice>
-
-  <!-- Fuel Assembly (Upper Half) -->
-  <lattice id="101">
-    <dimension>17 17</dimension>
-    <lower_left>-10.71 -10.71</lower_left>
-    <pitch>1.26 1.26</pitch>
-    <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
-      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Lower Half) -->
-  <lattice id="200">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
-      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
-      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
-      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    </universes>
-  </lattice>
-
-  <!-- Core Lattice (Upper Half) -->
-  <lattice id="201">
-    <dimension>21 21</dimension>
-    <lower_left>-224.91 -224.91</lower_left>
-    <pitch>21.42 21.42</pitch>
-    <universes>
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
-      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
-      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
-      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-    </universes>
-  </lattice>
-
-</geometry>
diff --git a/tests/test_score_total_yn/inputs_true.dat b/tests/test_score_total_yn/inputs_true.dat
new file mode 100644
index 0000000000..471cadfb20
--- /dev/null
+++ b/tests/test_score_total_yn/inputs_true.dat
@@ -0,0 +1 @@
+8967621db0c045e1c12b181eb825b0528bf1f8ef03d5d5e036e14f5151d4bcec36c56b1ec2faba66254d09a29795f9ed44599762e7dfd506fff8bf4d27de8328
\ No newline at end of file
diff --git a/tests/test_score_total_yn/materials.xml b/tests/test_score_total_yn/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_total_yn/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <default_xs>71c</default_xs>
-
-  <!-- Fuel composition -->
-  <material id="1">
-    <density value="10.062" units="g/cm3" />
-    <nuclide name="U-234"   ao="4.9476e-6" />
-    <nuclide name="U-235"   ao="4.8218e-4" />
-    <nuclide name="U-236"   ao="9.0402e-5" />
-    <nuclide name="U-238"   ao="2.1504e-2" />
-    <nuclide name="Np-237"  ao="7.3733e-6" />
-    <nuclide name="Pu-238"  ao="1.5148e-6" />
-    <nuclide name="Pu-239"  ao="1.3955e-4" />
-    <nuclide name="Pu-240"  ao="3.4405e-5" />
-    <nuclide name="Pu-241"  ao="2.1439e-5" />
-    <nuclide name="Pu-242"  ao="3.7422e-6" />
-    <nuclide name="Am-241"  ao="4.5041e-7" />
-    <nuclide name="Am-242m" ao="9.2301e-9" />
-    <nuclide name="Am-243"  ao="4.7878e-7" />
-    <nuclide name="Cm-242"  ao="1.0485e-7" />
-    <nuclide name="Cm-243"  ao="1.4268e-9" />
-    <nuclide name="Cm-244"  ao="8.8756e-8" />
-    <nuclide name="Cm-245"  ao="3.5285e-9" />
-    <nuclide name="Mo-95"   ao="2.6497e-5" />
-    <nuclide name="Tc-99"   ao="3.2772e-5" />
-    <nuclide name="Ru-101"  ao="3.0742e-5" />
-    <nuclide name="Ru-103"  ao="2.3505e-6" />
-    <nuclide name="Ag-109"  ao="2.0009e-6" />
-    <nuclide name="Xe-135"  ao="1.0801e-8" />
-    <nuclide name="Cs-133"  ao="3.4612e-5" />
-    <nuclide name="Nd-143"  ao="2.6078e-5" />
-    <nuclide name="Nd-145"  ao="1.9898e-5" />
-    <nuclide name="Sm-147"  ao="1.6128e-6" />
-    <nuclide name="Sm-149"  ao="1.1627e-7" />
-    <nuclide name="Sm-150"  ao="7.1727e-6" />
-    <nuclide name="Sm-151"  ao="5.4947e-7" />
-    <nuclide name="Sm-152"  ao="3.0221e-6" />
-    <nuclide name="Eu-153"  ao="2.6209e-6" />
-    <nuclide name="Gd-155"  ao="1.5369e-9" />
-    <nuclide name="O-16"    ao="4.5737e-2" />
-  </material>
-
-  <!-- Cladding composition -->
-  <material id="2">
-    <density value="5.77" units="g/cm3" />
-    <nuclide name="Zr-90" ao="0.5145" />
-    <nuclide name="Zr-91" ao="0.1122" />
-    <nuclide name="Zr-92" ao="0.1715" />
-    <nuclide name="Zr-94" ao="0.1738" />
-    <nuclide name="Zr-96" ao="0.0280" />
-  </material>
-
-  <!-- Cold borated water -->
-  <material id="3">
-    <density value="0.07416" units="atom/b-cm" />
-    <nuclide name="H-1" ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Hot borated water -->
-  <material id="4">
-    <density value="0.06614" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="2.0" />
-    <nuclide name="O-16" ao="1.0" />
-    <nuclide name="B-10" ao="6.490e-4" />
-    <nuclide name="B-11" ao="2.689e-3" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- RPV Composition -->
-  <material id="5">
-    <density value="7.9" units="g/cm3" />
-    <nuclide name="Fe-54"  wo="0.05437098" />
-    <nuclide name="Fe-56"  wo="0.88500663" />
-    <nuclide name="Fe-57"  wo="0.0208008" />
-    <nuclide name="Fe-58"  wo="0.00282159" />
-    <nuclide name="Ni-58"  wo="0.0067198" />
-    <nuclide name="Ni-60"  wo="0.0026776" />
-    <nuclide name="Ni-61"  wo="0.0001183" />
-    <nuclide name="Ni-62"  wo="0.0003835" />
-    <nuclide name="Ni-64"  wo="0.0001008" />
-    <nuclide name="Mn-55"  wo="0.01" />
-    <nuclide name="Mo-92"  wo="0.000849" />
-    <nuclide name="Mo-94"  wo="0.0005418" />
-    <nuclide name="Mo-95"  wo="0.0009438" />
-    <nuclide name="Mo-96"  wo="0.0010002" />
-    <nuclide name="Mo-97"  wo="0.0005796" />
-    <nuclide name="Mo-98"  wo="0.0014814" />
-    <nuclide name="Mo-100" wo="0.0006042" />
-    <nuclide name="Si-28"  wo="0.00367464" />
-    <nuclide name="Si-29"  wo="0.00019336" />
-    <nuclide name="Si-30"  wo="0.000132" />
-    <nuclide name="Cr-50"  wo="0.00010435" />
-    <nuclide name="Cr-52"  wo="0.002092475" />
-    <nuclide name="Cr-53"  wo="0.00024185" />
-    <nuclide name="Cr-54"  wo="6.1325e-05" />
-    <nuclide name="C-Nat"  wo="0.0025" />
-    <nuclide name="Cu-63"  wo="0.0013696" />
-    <nuclide name="Cu-65"  wo="0.0006304" />
-  </material>
-
-  <!-- Lower radial reflector -->
-  <material id="6">
-    <density value="4.32" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0095661" />
-    <nuclide name="O-16"  wo="0.0759107" />
-    <nuclide name="B-10"  wo="3.08409e-5" />
-    <nuclide name="B-11"  wo="1.40499e-4" />
-    <nuclide name="Fe-54" wo="0.035620772088" />
-    <nuclide name="Fe-56" wo="0.579805982228" />
-    <nuclide name="Fe-57" wo="0.01362750048" />
-    <nuclide name="Fe-58" wo="0.001848545204" />
-    <nuclide name="Ni-58" wo="0.055298376566" />
-    <nuclide name="Ni-60" wo="0.022034425592" />
-    <nuclide name="Ni-61" wo="0.000973510811" />
-    <nuclide name="Ni-62" wo="0.003155886695" />
-    <nuclide name="Ni-64" wo="0.000829500336" />
-    <nuclide name="Mn-55" wo="0.0182870" />
-    <nuclide name="Si-28" wo="0.00839976771" />
-    <nuclide name="Si-29" wo="0.00044199679" />
-    <nuclide name="Si-30" wo="0.0003017355" />
-    <nuclide name="Cr-50" wo="0.007251360806" />
-    <nuclide name="Cr-52" wo="0.145407678031" />
-    <nuclide name="Cr-53" wo="0.016806340306" />
-    <nuclide name="Cr-54" wo="0.004261520857" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Upper radial reflector / Top plate region -->
-  <material id="7">
-    <density value="4.28" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0086117" />
-    <nuclide name="O-16"  wo="0.0683369" />
-    <nuclide name="B-10"  wo="2.77638e-5" />
-    <nuclide name="B-11"  wo="1.26481e-4" />
-    <nuclide name="Fe-54" wo="0.035953677186" />
-    <nuclide name="Fe-56" wo="0.585224740891" />
-    <nuclide name="Fe-57" wo="0.01375486056" />
-    <nuclide name="Fe-58" wo="0.001865821363" />
-    <nuclide name="Ni-58" wo="0.055815129186" />
-    <nuclide name="Ni-60" wo="0.022240333032" />
-    <nuclide name="Ni-61" wo="0.000982608081" />
-    <nuclide name="Ni-62" wo="0.003185377845" />
-    <nuclide name="Ni-64" wo="0.000837251856" />
-    <nuclide name="Mn-55" wo="0.0184579" />
-    <nuclide name="Si-28" wo="0.00847831314" />
-    <nuclide name="Si-29" wo="0.00044612986" />
-    <nuclide name="Si-30" wo="0.000304557" />
-    <nuclide name="Cr-50" wo="0.00731912987" />
-    <nuclide name="Cr-52" wo="0.146766614995" />
-    <nuclide name="Cr-53" wo="0.01696340737" />
-    <nuclide name="Cr-54" wo="0.004301347765" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom plate region -->
-  <material id="8">
-    <density value="7.184" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0011505" />
-    <nuclide name="O-16"  wo="0.0091296" />
-    <nuclide name="B-10"  wo="3.70915e-6" />
-    <nuclide name="B-11"  wo="1.68974e-5" />
-    <nuclide name="Fe-54" wo="0.03855611055" />
-    <nuclide name="Fe-56" wo="0.627585036425" />
-    <nuclide name="Fe-57" wo="0.014750478" />
-    <nuclide name="Fe-58" wo="0.002000875025" />
-    <nuclide name="Ni-58" wo="0.059855207342" />
-    <nuclide name="Ni-60" wo="0.023850159704" />
-    <nuclide name="Ni-61" wo="0.001053732407" />
-    <nuclide name="Ni-62" wo="0.003415945715" />
-    <nuclide name="Ni-64" wo="0.000897854832" />
-    <nuclide name="Mn-55" wo="0.0197940" />
-    <nuclide name="Si-28" wo="0.00909197802" />
-    <nuclide name="Si-29" wo="0.00047842098" />
-    <nuclide name="Si-30" wo="0.000326601" />
-    <nuclide name="Cr-50" wo="0.007848910646" />
-    <nuclide name="Cr-52" wo="0.157390026871" />
-    <nuclide name="Cr-53" wo="0.018191270146" />
-    <nuclide name="Cr-54" wo="0.004612692337" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom nozzle region -->
-  <material id="9">
-    <density value="2.53" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0245014" />
-    <nuclide name="O-16"  wo="0.1944274" />
-    <nuclide name="B-10"  wo="7.89917e-5" />
-    <nuclide name="B-11"  wo="3.59854e-4" />
-    <nuclide name="Fe-54" wo="0.030411411144" />
-    <nuclide name="Fe-56" wo="0.495012237964" />
-    <nuclide name="Fe-57" wo="0.01163454624" />
-    <nuclide name="Fe-58" wo="0.001578204652" />
-    <nuclide name="Ni-58" wo="0.047211231662" />
-    <nuclide name="Ni-60" wo="0.018811987544" />
-    <nuclide name="Ni-61" wo="0.000831139127" />
-    <nuclide name="Ni-62" wo="0.002694352115" />
-    <nuclide name="Ni-64" wo="0.000708189552" />
-    <nuclide name="Mn-55" wo="0.0156126" />
-    <nuclide name="Si-28" wo="0.007171335558" />
-    <nuclide name="Si-29" wo="0.000377356542" />
-    <nuclide name="Si-30" wo="0.0002576079" />
-    <nuclide name="Cr-50" wo="0.006190885148" />
-    <nuclide name="Cr-52" wo="0.124142524198" />
-    <nuclide name="Cr-53" wo="0.014348496148" />
-    <nuclide name="Cr-54" wo="0.003638294506" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top nozzle region -->
-  <material id="10">
-    <density value="1.746" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0358870" />
-    <nuclide name="O-16"  wo="0.2847761" />
-    <nuclide name="B-10"  wo="1.15699e-4" />
-    <nuclide name="B-11"  wo="5.27075e-4" />
-    <nuclide name="Fe-54" wo="0.02644016154" />
-    <nuclide name="Fe-56" wo="0.43037146399" />
-    <nuclide name="Fe-57" wo="0.0101152584" />
-    <nuclide name="Fe-58" wo="0.00137211607" />
-    <nuclide name="Ni-58" wo="0.04104621835" />
-    <nuclide name="Ni-60" wo="0.0163554502" />
-    <nuclide name="Ni-61" wo="0.000722605975" />
-    <nuclide name="Ni-62" wo="0.002342513875" />
-    <nuclide name="Ni-64" wo="0.0006157116" />
-    <nuclide name="Mn-55" wo="0.0135739" />
-    <nuclide name="Si-28" wo="0.006234853554" />
-    <nuclide name="Si-29" wo="0.000328078746" />
-    <nuclide name="Si-30" wo="0.0002239677" />
-    <nuclide name="Cr-50" wo="0.005382452306" />
-    <nuclide name="Cr-52" wo="0.107931450781" />
-    <nuclide name="Cr-53" wo="0.012474806806" />
-    <nuclide name="Cr-54" wo="0.003163190107" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Top of Fuel Assemblies -->
-  <material id="11">
-    <density value="3.044" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0162913" />
-    <nuclide name="O-16"  wo="0.1292776" />
-    <nuclide name="B-10"  wo="5.25228e-5" />
-    <nuclide name="B-11"  wo="2.39272e-4" />
-    <nuclide name="Zr-90" wo="0.43313403903" />
-    <nuclide name="Zr-91" wo="0.09549277374" />
-    <nuclide name="Zr-92" wo="0.14759527104" />
-    <nuclide name="Zr-94" wo="0.15280552077" />
-    <nuclide name="Zr-96" wo="0.02511169542" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-  <!-- Bottom of Fuel Assemblies -->
-  <material id="12">
-    <density value="1.762" units="g/cm3" />
-    <nuclide name="H-1"   wo="0.0292856" />
-    <nuclide name="O-16"  wo="0.2323919" />
-    <nuclide name="B-10"  wo="9.44159e-5" />
-    <nuclide name="B-11"  wo="4.30120e-4" />
-    <nuclide name="Zr-90" wo="0.3741373658" />
-    <nuclide name="Zr-91" wo="0.0824858164" />
-    <nuclide name="Zr-92" wo="0.1274914944" />
-    <nuclide name="Zr-94" wo="0.1319920622" />
-    <nuclide name="Zr-96" wo="0.0216912612" />
-    <sab name="HH2O" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_score_total_yn/results_true.dat b/tests/test_score_total_yn/results_true.dat
index 28a4b1627e..5d7a1498de 100644
--- a/tests/test_score_total_yn/results_true.dat
+++ b/tests/test_score_total_yn/results_true.dat
@@ -1,14 +1,406 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.935192E-01 5.457292E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-1.423676E+01
-4.330937E+01
-2.914798E+00
-1.831649E+00
-4.088282E+01
-3.662539E+02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.265629E+00
+3.233643E-01
+5.626298E-02
+1.292090E-03
+2.035173E-02
+6.296227E-04
+1.928563E-02
+8.190514E-04
+-2.468301E-02
+2.354849E-04
+9.148092E-03
+2.225568E-04
+-5.879447E-02
+8.590977E-04
+-1.445300E-02
+1.531576E-04
+6.018866E-02
+8.591329E-04
+1.403996E-02
+4.821838E-04
+9.815924E-03
+5.880801E-04
+-9.749601E-03
+4.650507E-04
+-8.702902E-03
+6.682813E-05
+1.953899E-02
+2.762602E-04
+2.823080E-02
+3.090601E-04
+-2.932935E-03
+1.767294E-05
+6.394250E-03
+1.447695E-04
+-1.504208E-03
+4.671038E-05
+-1.575220E-02
+1.620546E-04
+-2.910381E-03
+2.389274E-04
+-3.020227E-02
+5.422131E-04
+-8.190946E-03
+3.025911E-04
+2.246625E-02
+3.354891E-04
+-2.002110E-02
+2.075929E-04
+-1.962614E-02
+3.166447E-04
+2.240915E+01
+1.009032E+02
+1.856657E-01
+9.493183E-02
+-1.690914E-01
+1.047180E-01
+-1.866343E-01
+5.134677E-02
+-2.029558E-01
+1.341115E-02
+-1.379135E-01
+2.187965E-02
+-5.257769E-01
+7.022699E-02
+-6.848163E-02
+8.861152E-02
+3.794798E-01
+6.518809E-02
+-1.093894E-01
+2.155411E-02
+-1.520483E-01
+2.978741E-02
+1.718356E-01
+2.986391E-02
+8.273807E-02
+1.139398E-02
+1.312033E-01
+1.195907E-02
+3.286682E-01
+4.246009E-02
+8.878513E-02
+3.773227E-02
+-2.541223E-02
+1.841611E-02
+-1.249772E-02
+7.518231E-03
+-1.468495E-01
+1.193263E-02
+2.206397E-02
+3.376086E-02
+-1.990498E-01
+2.246024E-02
+1.181081E-01
+2.651049E-02
+-8.952636E-03
+9.032436E-03
+5.183546E-02
+1.061147E-02
+-1.047213E-01
+9.680702E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+4.711189E+00
+4.469059E+00
+1.149862E-03
+4.006261E-03
+-5.485896E-02
+5.881771E-03
+-6.936896E-02
+1.501967E-03
+1.033506E-02
+4.261122E-04
+-1.042957E-01
+2.255383E-03
+-7.082011E-02
+2.495972E-03
+1.099802E-02
+2.333908E-03
+5.635534E-02
+4.286572E-03
+-2.310646E-02
+1.542196E-03
+-2.259159E-02
+5.408191E-04
+9.307209E-02
+1.773060E-03
+6.296915E-02
+2.394743E-03
+-8.108703E-03
+9.384558E-04
+7.125823E-02
+2.782853E-03
+7.168104E-03
+1.083383E-03
+-2.498842E-02
+5.768656E-04
+-2.297890E-02
+8.711670E-04
+-1.775752E-02
+2.271706E-04
+-1.794820E-02
+8.018486E-04
+1.963115E-02
+7.104338E-04
+5.288264E-02
+6.415302E-04
+5.895017E-03
+3.571409E-04
+2.190858E-02
+5.489095E-04
+-3.829208E-02
+5.977452E-04
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+6.533718E+01
+8.552989E+02
+4.658976E-02
+2.719315E-01
+-5.661220E-01
+5.439751E-01
+-3.051142E-01
+4.890036E-01
+-1.640760E-01
+2.200294E-02
+-2.675559E-01
+1.660319E-01
+2.007804E-01
+3.303623E-01
+2.670686E-02
+2.330239E-02
+3.111327E-01
+2.876993E-01
+-6.871786E-02
+1.625684E-01
+-5.849816E-01
+2.074413E-01
+3.674709E-01
+9.029605E-02
+3.420122E-01
+3.147918E-01
+1.580259E-01
+4.184964E-02
+1.509855E-01
+1.718636E-01
+4.008602E-01
+1.315982E-01
+1.253163E-01
+7.030618E-02
+1.826521E-02
+4.452932E-02
+-9.755491E-02
+1.276313E-01
+5.434521E-02
+3.809202E-02
+7.041533E-01
+1.522383E-01
+1.434910E-01
+1.112940E-01
+1.947700E-01
+9.469651E-02
+-7.044463E-02
+3.058029E-02
+-6.586398E-01
+1.337469E-01
 tally 2:
 0.000000E+00
 0.000000E+00
@@ -110,106 +502,106 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.812543E-01
-1.349265E-01
--7.005988E-03
-2.198486E-04
-3.237937E-02
-7.569491E-04
--3.865436E-04
-4.048167E-04
--1.003877E-02
-3.195619E-04
-3.738815E-03
-3.506174E-04
--2.549288E-02
-3.086810E-04
-1.693002E-02
-1.255885E-04
-3.059341E-03
-1.971678E-04
-9.247344E-03
-2.402855E-04
-6.618469E-04
-1.639025E-04
-1.992953E-02
-1.365376E-04
-3.262256E-03
-1.341040E-05
-2.864166E-03
-4.394787E-05
-1.494351E-03
-1.001007E-04
--1.091424E-02
-1.221030E-04
-9.875992E-03
-1.141979E-04
-1.263647E-02
-2.400023E-04
--2.944398E-03
-1.246417E-04
-1.970051E-03
-1.600160E-04
-6.148931E-03
-4.774182E-05
-1.107728E-02
-1.095420E-04
-1.382599E-02
-1.537793E-04
--1.296297E-02
-1.392028E-04
--1.479385E-02
-1.650074E-04
-1.423676E+01
-4.330937E+01
--2.802155E-01
-3.016146E-02
--8.009314E-02
-4.251899E-02
--7.383773E-02
-1.547362E-02
--1.274422E-01
-2.290306E-02
-1.370426E-01
-1.002935E-02
--2.607280E-01
-3.414307E-02
-1.497421E-02
-2.944540E-03
--2.866477E-02
-9.113662E-03
--3.949118E-02
-4.437767E-03
-2.283116E-01
-1.792907E-02
-1.334103E-01
-1.587762E-02
--3.139096E-01
-2.330713E-02
-1.025884E-03
-5.754195E-03
-1.099489E-01
-1.861634E-02
--7.863729E-02
-2.276108E-02
-1.219111E-01
-1.363203E-02
--1.261893E-01
-1.937908E-02
--1.995428E-01
-1.383344E-02
-8.803472E-02
-3.742219E-03
-1.501143E-01
-1.288322E-02
-4.522115E-02
-8.283014E-03
-1.113588E-01
-8.523967E-03
--1.820582E-01
-1.648932E-02
--1.121108E-01
-1.059879E-02
+1.270000E+00
+3.313000E-01
+6.672369E-03
+5.154703E-03
+2.741231E-02
+3.707114E-03
+6.785459E-02
+1.525452E-03
+-7.226258E-02
+3.119519E-03
+-1.458773E-02
+5.829469E-03
+9.286573E-02
+4.614384E-03
+-8.836014E-02
+3.693860E-03
+7.682597E-02
+3.692450E-03
+5.624405E-04
+1.894653E-03
+-2.446734E-02
+2.962636E-04
+-2.865534E-02
+8.238323E-04
+1.746333E-02
+1.350727E-03
+6.812468E-02
+2.154847E-03
+2.170333E-02
+8.368218E-04
+-3.464644E-02
+6.341450E-04
+1.586865E-03
+2.086260E-04
+1.122866E-02
+1.828956E-03
+5.147244E-02
+2.116013E-03
+-5.140617E-03
+2.011918E-03
+3.662973E-02
+1.511591E-03
+-3.826498E-04
+1.254739E-03
+9.466189E-02
+2.206340E-03
+-1.695030E-02
+2.963888E-04
+-4.620345E-02
+1.330607E-03
+2.278000E+01
+1.042404E+02
+-2.705944E-01
+4.019819E-02
+8.910115E-02
+7.598548E-02
+4.240148E-01
+6.249778E-02
+-1.711683E-01
+3.365297E-02
+-1.320939E-01
+4.677615E-02
+-3.833055E-01
+3.838770E-02
+1.938748E-01
+8.311489E-02
+1.859290E-01
+1.653719E-02
+-2.875551E-01
+7.432886E-02
+1.513934E-02
+7.854478E-02
+1.932642E-02
+1.428749E-02
+4.617741E-02
+1.844961E-02
+1.063807E-01
+3.103047E-02
+1.309557E-01
+1.198530E-02
+2.797364E-01
+2.403350E-02
+-1.332777E-01
+2.277289E-02
+9.430025E-02
+5.826855E-03
+-1.012356E-01
+1.537804E-02
+-8.178736E-02
+4.470169E-02
+-1.197123E-01
+2.596045E-02
+3.984096E-02
+1.209844E-02
+1.148842E-01
+6.772712E-03
+-1.705431E-02
+3.920009E-02
+-2.694201E-02
+2.653514E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -260,56 +652,56 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.914798E+00
-1.831649E+00
--3.213884E-02
-1.391026E-03
--1.124311E-02
-2.059984E-03
--1.372399E-02
-2.990198E-03
--6.931800E-03
-1.073303E-03
--5.448993E-03
-3.542504E-04
--7.264172E-02
-1.742045E-03
-1.526380E-02
-5.962297E-04
-1.576474E-02
-5.335071E-04
-2.028206E-02
-2.915489E-04
-4.014298E-02
-4.285950E-04
-8.228146E-03
-6.388002E-04
--8.183952E-02
-2.031634E-03
-1.014523E-02
-1.159653E-03
-9.321030E-03
-7.480844E-04
--3.156017E-02
-2.064357E-03
-3.606483E-02
-4.060244E-04
--3.866234E-02
-1.046100E-03
--5.723297E-02
-1.042437E-03
-2.894838E-02
-2.922848E-04
--1.529225E-03
-2.472179E-04
-9.484410E-03
-4.172637E-04
--4.442548E-04
-2.518508E-04
--3.065480E-02
-3.571846E-04
--6.519117E-03
-1.779322E-04
+4.350000E+00
+3.833900E+00
+2.792800E-01
+3.102658E-02
+-2.343095E-01
+3.826449E-02
+3.428573E-02
+6.437027E-03
+-1.025176E-01
+1.798807E-02
+-4.106130E-02
+3.786695E-03
+-1.470480E-01
+8.519720E-03
+1.989035E-02
+5.067928E-03
+8.094404E-02
+3.412899E-03
+-5.616421E-02
+2.709728E-03
+2.421213E-02
+3.683849E-03
+4.794858E-02
+4.392540E-03
+-1.637085E-02
+5.339723E-03
+-2.046073E-02
+5.231271E-03
+1.554627E-02
+4.457612E-03
+-3.441131E-02
+7.049061E-03
+-1.139075E-01
+7.627867E-03
+-8.358967E-02
+4.023855E-03
+1.221815E-01
+5.628324E-03
+-2.061337E-02
+1.926605E-03
+-1.583607E-02
+1.093902E-03
+-7.623859E-02
+5.519074E-03
+-1.115748E-02
+3.984642E-03
+7.665232E-02
+1.111550E-02
+-2.673980E-02
+7.957502E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -360,56 +752,56 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.088282E+01
-3.662539E+02
--9.859591E-01
-2.743013E-01
-2.392244E-01
-3.795971E-01
--3.389717E-01
-7.054539E-01
--1.673679E-01
-1.081377E-01
-2.918680E-01
-7.161035E-02
--5.627453E-01
-9.124299E-02
-7.185542E-01
-2.062140E-01
-8.533956E-02
-3.649126E-02
-7.630639E-02
-1.623523E-02
-3.785290E-02
-4.181389E-02
-1.388919E-01
-1.307834E-01
--2.682812E-01
-6.653584E-02
-7.151084E-02
-3.466772E-02
-6.941393E-02
-2.821800E-02
-2.392050E-02
-1.132504E-01
-3.749985E-01
-8.337209E-02
--2.998887E-01
-6.767226E-02
--3.629285E-01
-7.246083E-02
-3.989685E-01
-4.378581E-02
-1.330115E-01
-2.634398E-02
-2.649739E-01
-4.300042E-02
-5.793351E-01
-7.399884E-02
--2.236528E-01
-3.130205E-02
--3.695818E-01
-4.703480E-02
+6.484000E+01
+8.416314E+02
+-3.758929E-01
+3.104729E-01
+-7.263839E-01
+7.809822E-01
+4.648018E-03
+2.834459E-01
+-1.055002E-01
+3.040070E-02
+7.118727E-02
+7.977682E-02
+7.664673E-01
+1.821315E-01
+2.087917E-01
+4.041777E-02
+2.761598E-01
+3.014608E-01
+2.119970E-01
+2.965940E-02
+-8.139971E-01
+1.653848E-01
+1.280103E-01
+4.989381E-02
+6.090725E-01
+2.822967E-01
+2.502533E-02
+1.011286E-02
+-3.776030E-01
+2.846556E-01
+-1.484779E-01
+1.060501E-01
+3.365875E-01
+2.827604E-02
+-8.437307E-02
+9.086937E-02
+2.827425E-01
+6.353956E-02
+1.139952E-01
+1.067588E-01
+6.809505E-01
+1.329962E-01
+1.408254E-01
+3.003253E-02
+-1.222838E-01
+5.353793E-02
+-2.274047E-02
+3.333572E-02
+-1.026245E-01
+5.889851E-02
 tally 3:
 0.000000E+00
 0.000000E+00
@@ -511,106 +903,106 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.200000E-01
-1.152000E-01
--9.800486E-03
-5.637123E-04
--2.018554E-02
-4.617738E-04
--6.271657E-03
-8.252833E-04
--8.231683E-03
-3.035447E-03
--2.566508E-02
-1.108829E-03
-2.748466E-03
-1.641191E-03
-6.833190E-03
-5.993876E-04
-3.392213E-02
-2.143714E-03
-3.105616E-02
-1.012625E-03
--5.473567E-02
-1.615531E-03
--1.435523E-02
-1.095690E-03
-4.579564E-03
-6.451444E-04
--1.570409E-02
-3.833387E-04
-1.633422E-02
-2.144997E-03
--7.438775E-03
-6.441846E-04
-5.440025E-04
-1.290719E-04
--1.687899E-02
-1.606230E-03
-3.315902E-02
-1.061759E-03
--1.184684E-02
-4.312573E-04
--4.732586E-02
-1.387994E-03
--1.563538E-02
-3.316015E-04
-3.681927E-02
-5.403320E-04
-2.928507E-03
-5.761742E-04
--3.519362E-02
-6.725185E-04
-1.372000E+01
-4.018980E+01
--2.015212E-01
-1.072884E-01
--2.606953E-01
-4.894468E-02
-7.537153E-02
-2.216346E-02
--3.818524E-02
-6.301675E-02
-2.386335E-01
-1.931104E-02
--1.872805E-02
-1.265896E-02
-3.732943E-02
-2.347696E-02
--8.857050E-02
-1.636275E-02
--1.718450E-01
-1.043488E-02
-1.526226E-01
-2.435399E-02
-7.344765E-02
-1.541644E-02
--9.819186E-03
-1.473467E-02
--8.215914E-03
-1.463085E-02
-2.197504E-01
-2.244815E-02
-2.521002E-02
-8.206540E-03
-3.677974E-01
-3.982027E-02
--1.934606E-01
-3.440019E-02
-1.050141E-01
-2.346980E-02
-2.458487E-01
-1.861429E-02
-4.226131E-02
-2.690841E-03
-3.174234E-02
-1.867018E-02
-2.284995E-01
-1.190246E-02
--7.894573E-03
-3.715471E-03
--1.593928E-01
-1.391828E-02
+1.220551E+00
+3.029523E-01
+1.939259E-02
+4.050014E-04
+3.502926E-03
+8.473601E-04
+4.575201E-02
+2.544994E-03
+-1.560898E-02
+2.801847E-04
+-8.658638E-03
+8.241229E-04
+-4.445033E-02
+1.063052E-03
+7.845580E-03
+2.558127E-04
+2.549169E-02
+8.288961E-04
+-9.797138E-03
+2.713506E-04
+8.620131E-03
+8.537125E-04
+-4.992993E-03
+2.206385E-04
+2.780887E-02
+3.020884E-04
+-2.040716E-02
+1.760440E-04
+2.351435E-02
+2.067041E-04
+7.044751E-03
+7.297774E-05
+7.233581E-03
+1.258072E-04
+5.582777E-03
+9.135959E-05
+3.887969E-03
+4.965340E-04
+-2.396743E-02
+7.407861E-04
+-7.371142E-03
+1.109942E-04
+-1.089834E-02
+2.188565E-04
+2.790414E-02
+2.398608E-04
+-1.464849E-02
+1.014603E-04
+-1.981204E-02
+2.919798E-04
+2.278000E+01
+1.042404E+02
+-2.705944E-01
+4.019819E-02
+8.910115E-02
+7.598548E-02
+4.240148E-01
+6.249778E-02
+-1.711683E-01
+3.365297E-02
+-1.320939E-01
+4.677615E-02
+-3.833055E-01
+3.838770E-02
+1.938748E-01
+8.311489E-02
+1.859290E-01
+1.653719E-02
+-2.875551E-01
+7.432886E-02
+1.513934E-02
+7.854478E-02
+1.932642E-02
+1.428749E-02
+4.617741E-02
+1.844961E-02
+1.063807E-01
+3.103047E-02
+1.309557E-01
+1.198530E-02
+2.797364E-01
+2.403350E-02
+-1.332777E-01
+2.277289E-02
+9.430025E-02
+5.826855E-03
+-1.012356E-01
+1.537804E-02
+-8.178736E-02
+4.470169E-02
+-1.197123E-01
+2.596045E-02
+3.984096E-02
+1.209844E-02
+1.148842E-01
+6.772712E-03
+-1.705431E-02
+3.920009E-02
+-2.694201E-02
+2.653514E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -661,56 +1053,56 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.200000E+00
-2.342600E+00
--2.991985E-01
-1.868406E-02
-4.460301E-02
-4.132113E-03
--2.190630E-02
-1.023889E-02
--3.265764E-02
-2.060374E-03
-3.491521E-02
-4.785957E-04
--3.623623E-02
-5.929111E-04
--4.962268E-02
-1.814245E-03
-1.406439E-01
-1.174445E-02
--9.433277E-02
-5.036897E-03
-9.058176E-02
-3.871598E-03
--1.409089E-01
-6.665385E-03
--1.062337E-01
-4.771650E-03
-1.155280E-01
-8.020320E-03
-8.348336E-02
-1.633941E-03
-1.475434E-02
-3.411046E-03
-4.474425E-03
-6.049348E-03
-6.716359E-03
-2.898000E-03
--3.674047E-02
-2.971797E-03
--2.368070E-02
-9.474965E-04
--6.109826E-02
-4.846201E-03
--5.076118E-02
-8.354393E-03
--1.763594E-02
-1.017310E-03
--2.941064E-02
-1.044916E-03
--5.631429E-03
-3.915186E-03
+4.350000E+00
+3.833900E+00
+2.792800E-01
+3.102658E-02
+-2.343095E-01
+3.826449E-02
+3.428573E-02
+6.437027E-03
+-1.025176E-01
+1.798807E-02
+-4.106130E-02
+3.786695E-03
+-1.470480E-01
+8.519720E-03
+1.989035E-02
+5.067928E-03
+8.094404E-02
+3.412899E-03
+-5.616421E-02
+2.709728E-03
+2.421213E-02
+3.683849E-03
+4.794858E-02
+4.392540E-03
+-1.637085E-02
+5.339723E-03
+-2.046073E-02
+5.231271E-03
+1.554627E-02
+4.457612E-03
+-3.441131E-02
+7.049061E-03
+-1.139075E-01
+7.627867E-03
+-8.358967E-02
+4.023855E-03
+1.221815E-01
+5.628324E-03
+-2.061337E-02
+1.926605E-03
+-1.583607E-02
+1.093902E-03
+-7.623859E-02
+5.519074E-03
+-1.115748E-02
+3.984642E-03
+7.665232E-02
+1.111550E-02
+-2.673980E-02
+7.957502E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -761,454 +1153,53 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.104000E+01
-3.668254E+02
--7.832373E-01
-3.913941E-01
-2.281642E-01
-2.669856E-01
--3.731272E-01
-6.152809E-01
--3.232973E-01
-7.526283E-02
-3.686513E-01
-9.047618E-02
--6.018185E-01
-9.140623E-02
-3.848843E-01
-3.431711E-01
-3.397425E-03
-8.879103E-02
--2.471531E-02
-5.561795E-02
-1.373897E-01
-7.288680E-02
-1.816888E-01
-5.419638E-02
--3.504404E-01
-1.461853E-01
-1.225356E-01
-3.443595E-02
--3.109887E-01
-5.492397E-02
--3.542105E-01
-6.530224E-02
-2.104218E-01
-4.093872E-02
-2.661467E-02
-3.058847E-02
--3.744331E-01
-6.755739E-02
-1.391218E-01
-4.432842E-02
-1.622041E-01
-6.843992E-03
-4.149973E-02
-1.782398E-02
-2.551752E-01
-2.626972E-02
--4.706697E-01
-9.193926E-02
--1.287882E-01
-3.489982E-02
-tally 4:
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-7.652157E-01
-1.242826E-01
--1.008373E-02
-5.281691E-04
--1.014715E-02
-2.749212E-04
--2.506414E-02
-2.613512E-04
-4.320187E-03
-4.316562E-04
-1.439246E-02
-9.138575E-05
--1.532539E-02
-2.360878E-04
-9.963404E-03
-1.511695E-04
--6.314554E-03
-2.742799E-05
-7.969329E-03
-1.380329E-04
--1.298431E-03
-3.287236E-04
-1.441639E-02
-1.409552E-04
-6.516689E-03
-2.511011E-04
-1.294596E-02
-2.249729E-04
-6.983038E-03
-6.334969E-05
--1.086161E-02
-1.140033E-04
-2.217006E-02
-4.221807E-04
--6.503276E-03
-2.028281E-04
-2.915180E-02
-3.659182E-04
--9.080091E-03
-1.503808E-04
--6.476980E-04
-1.927326E-04
--1.549603E-02
-3.445843E-04
-2.957508E-02
-1.835035E-04
-6.982790E-03
-1.237342E-04
--2.653281E-02
-2.606704E-04
-1.372000E+01
-4.018980E+01
--2.015212E-01
-1.072884E-01
--2.606953E-01
-4.894468E-02
-7.537153E-02
-2.216346E-02
--3.818524E-02
-6.301675E-02
-2.386335E-01
-1.931104E-02
--1.872805E-02
-1.265896E-02
-3.732943E-02
-2.347696E-02
--8.857050E-02
-1.636275E-02
--1.718450E-01
-1.043488E-02
-1.526226E-01
-2.435399E-02
-7.344765E-02
-1.541644E-02
--9.819186E-03
-1.473467E-02
--8.215914E-03
-1.463085E-02
-2.197504E-01
-2.244815E-02
-2.521002E-02
-8.206540E-03
-3.677974E-01
-3.982027E-02
--1.934606E-01
-3.440019E-02
-1.050141E-01
-2.346980E-02
-2.458487E-01
-1.861429E-02
-4.226131E-02
-2.690841E-03
-3.174234E-02
-1.867018E-02
-2.284995E-01
-1.190246E-02
--7.894573E-03
-3.715471E-03
--1.593928E-01
-1.391828E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.200000E+00
-2.342600E+00
--2.991985E-01
-1.868406E-02
-4.460301E-02
-4.132113E-03
--2.190630E-02
-1.023889E-02
--3.265764E-02
-2.060374E-03
-3.491521E-02
-4.785957E-04
--3.623623E-02
-5.929111E-04
--4.962268E-02
-1.814245E-03
-1.406439E-01
-1.174445E-02
--9.433277E-02
-5.036897E-03
-9.058176E-02
-3.871598E-03
--1.409089E-01
-6.665385E-03
--1.062337E-01
-4.771650E-03
-1.155280E-01
-8.020320E-03
-8.348336E-02
-1.633941E-03
-1.475434E-02
-3.411046E-03
-4.474425E-03
-6.049348E-03
-6.716359E-03
-2.898000E-03
--3.674047E-02
-2.971797E-03
--2.368070E-02
-9.474965E-04
--6.109826E-02
-4.846201E-03
--5.076118E-02
-8.354393E-03
--1.763594E-02
-1.017310E-03
--2.941064E-02
-1.044916E-03
--5.631429E-03
-3.915186E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-4.104000E+01
-3.668254E+02
--7.832373E-01
-3.913941E-01
-2.281642E-01
-2.669856E-01
--3.731272E-01
-6.152809E-01
--3.232973E-01
-7.526283E-02
-3.686513E-01
-9.047618E-02
--6.018185E-01
-9.140623E-02
-3.848843E-01
-3.431711E-01
-3.397425E-03
-8.879103E-02
--2.471531E-02
-5.561795E-02
-1.373897E-01
-7.288680E-02
-1.816888E-01
-5.419638E-02
--3.504404E-01
-1.461853E-01
-1.225356E-01
-3.443595E-02
--3.109887E-01
-5.492397E-02
--3.542105E-01
-6.530224E-02
-2.104218E-01
-4.093872E-02
-2.661467E-02
-3.058847E-02
--3.744331E-01
-6.755739E-02
-1.391218E-01
-4.432842E-02
-1.622041E-01
-6.843992E-03
-4.149973E-02
-1.782398E-02
-2.551752E-01
-2.626972E-02
--4.706697E-01
-9.193926E-02
--1.287882E-01
-3.489982E-02
+6.484000E+01
+8.416314E+02
+-3.758929E-01
+3.104729E-01
+-7.263839E-01
+7.809822E-01
+4.648018E-03
+2.834459E-01
+-1.055002E-01
+3.040070E-02
+7.118727E-02
+7.977682E-02
+7.664673E-01
+1.821315E-01
+2.087917E-01
+4.041777E-02
+2.761598E-01
+3.014608E-01
+2.119970E-01
+2.965940E-02
+-8.139971E-01
+1.653848E-01
+1.280103E-01
+4.989381E-02
+6.090725E-01
+2.822967E-01
+2.502533E-02
+1.011286E-02
+-3.776030E-01
+2.846556E-01
+-1.484779E-01
+1.060501E-01
+3.365875E-01
+2.827604E-02
+-8.437307E-02
+9.086937E-02
+2.827425E-01
+6.353956E-02
+1.139952E-01
+1.067588E-01
+6.809505E-01
+1.329962E-01
+1.408254E-01
+3.003253E-02
+-1.222838E-01
+5.353793E-02
+-2.274047E-02
+3.333572E-02
+-1.026245E-01
+5.889851E-02
diff --git a/tests/test_score_total_yn/settings.xml b/tests/test_score_total_yn/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_total_yn/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <source>
-    <space type="box">
-      <parameters>
-        -160 -160 -183
-         160  160  183
-      </parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/test_score_total_yn/tallies.xml b/tests/test_score_total_yn/tallies.xml
deleted file mode 100644
index 51cb79c395..0000000000
--- a/tests/test_score_total_yn/tallies.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<tallies>
-
-  <tally id="1">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>total</scores>
-  </tally>
-  
-  <tally id="2">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>total-y4</scores>
-    <nuclides>U-235 total</nuclides>
-  </tally>
-  
-  <tally id="3">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>total-y4</scores>
-    <nuclides>U-235 total</nuclides>
-    <estimator>analog</estimator>
-  </tally>
-  
-  <tally id="4">
-    <filter type="cell" bins="10 21 22 23" />
-    <scores>total-y4</scores>
-    <nuclides>U-235 total</nuclides>
-    <estimator>collision</estimator>
-  </tally>
-
-</tallies>
diff --git a/tests/test_score_total_yn/test_score_total_yn.py b/tests/test_score_total_yn/test_score_total_yn.py
index 1777db993e..07cac86d2a 100644
--- a/tests/test_score_total_yn/test_score_total_yn.py
+++ b/tests/test_score_total_yn/test_score_total_yn.py
@@ -2,9 +2,33 @@
 
 import sys
 sys.path.insert(0, '..')
-from testing_harness import TestHarness
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+import os
+
+
+class ScoreTotalYNTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(10, 21, 22, 23))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('total-y4') for t in tallies]
+        [t.add_nuclide('U-235') for t in tallies]
+        [t.add_nuclide('total') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        PyAPITestHarness._build_inputs(self)
+
+    def _cleanup(self):
+        PyAPITestHarness._cleanup(self)
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
 
 
 if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*', True)
+    harness = ScoreTotalYNTestHarness('statepoint.10.*', True)
     harness.main()