diff --git a/tests/regression_tests/void/geometry.xml b/tests/regression_tests/void/geometry.xml
deleted file mode 100644
index 48a72c7c31..0000000000
--- a/tests/regression_tests/void/geometry.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
-
-
diff --git a/tests/regression_tests/void/inputs_true.dat b/tests/regression_tests/void/inputs_true.dat
new file mode 100644
index 0000000000..6449520975
--- /dev/null
+++ b/tests/regression_tests/void/inputs_true.dat
@@ -0,0 +1,132 @@
+
+
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ fixed source
+ 1000
+ 3
+
+
+ 0.0 0.0 0.0
+
+
+
+
+
+
+ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
+
+
+ 1
+ total
+
+
diff --git a/tests/regression_tests/void/materials.xml b/tests/regression_tests/void/materials.xml
deleted file mode 100644
index f70c3a40f2..0000000000
--- a/tests/regression_tests/void/materials.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/regression_tests/void/results_true.dat b/tests/regression_tests/void/results_true.dat
index c0e8184b6f..ec87df3bad 100644
--- a/tests/regression_tests/void/results_true.dat
+++ b/tests/regression_tests/void/results_true.dat
@@ -1,2 +1,103 @@
-k-combined:
-9.612556E-01 1.990135E-02
+tally 1:
+8.636087E-01
+2.486134E-01
+0.000000E+00
+0.000000E+00
+2.848447E+00
+2.704761E+00
+0.000000E+00
+0.000000E+00
+3.944691E+00
+5.195294E+00
+0.000000E+00
+0.000000E+00
+4.822264E+00
+7.764351E+00
+0.000000E+00
+0.000000E+00
+5.295627E+00
+9.359046E+00
+0.000000E+00
+0.000000E+00
+5.331702E+00
+9.480054E+00
+0.000000E+00
+0.000000E+00
+5.598029E+00
+1.044833E+01
+0.000000E+00
+0.000000E+00
+5.803138E+00
+1.124136E+01
+0.000000E+00
+0.000000E+00
+5.768440E+00
+1.110547E+01
+0.000000E+00
+0.000000E+00
+5.554687E+00
+1.029492E+01
+0.000000E+00
+0.000000E+00
+5.503880E+00
+1.011832E+01
+0.000000E+00
+0.000000E+00
+5.059080E+00
+8.564408E+00
+0.000000E+00
+0.000000E+00
+4.718153E+00
+7.431929E+00
+0.000000E+00
+0.000000E+00
+4.575826E+00
+6.980348E+00
+0.000000E+00
+0.000000E+00
+4.283929E+00
+6.120164E+00
+0.000000E+00
+0.000000E+00
+3.997971E+00
+5.330979E+00
+0.000000E+00
+0.000000E+00
+3.735927E+00
+4.653022E+00
+0.000000E+00
+0.000000E+00
+3.302545E+00
+3.645387E+00
+0.000000E+00
+0.000000E+00
+3.082630E+00
+3.203343E+00
+0.000000E+00
+0.000000E+00
+2.775434E+00
+2.569844E+00
+0.000000E+00
+0.000000E+00
+2.518170E+00
+2.134420E+00
+0.000000E+00
+0.000000E+00
+2.233921E+00
+1.666795E+00
+0.000000E+00
+0.000000E+00
+1.829991E+00
+1.118883E+00
+0.000000E+00
+0.000000E+00
+1.420528E+00
+6.755061E-01
+0.000000E+00
+0.000000E+00
+9.856494E-01
+3.253539E-01
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
diff --git a/tests/regression_tests/void/settings.xml b/tests/regression_tests/void/settings.xml
deleted file mode 100644
index 32afc717a9..0000000000
--- a/tests/regression_tests/void/settings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- eigenvalue
- 10
- 5
- 100
-
-
-
- point
- 0.0 0.0 0.0
-
-
-
-
diff --git a/tests/regression_tests/void/test.py b/tests/regression_tests/void/test.py
index af16f2ac80..af1e3887b8 100644
--- a/tests/regression_tests/void/test.py
+++ b/tests/regression_tests/void/test.py
@@ -1,6 +1,39 @@
-from tests.testing_harness import TestHarness
+import numpy as np
+import openmc
+import pytest
+
+from tests.testing_harness import PyAPITestHarness
+
+@pytest.fixture
+def model():
+ model = openmc.model.Model()
+
+ zn = openmc.Material()
+ zn.set_density('g/cm3', 7.14)
+ zn.add_nuclide('Zn64', 1.0)
+ model.materials.append(zn)
+
+ radii = np.linspace(1.0, 100.0)
+ surfs = [openmc.Sphere(r=r) for r in radii]
+ surfs[-1].boundary_type = 'vacuum'
+ cells = [openmc.Cell(fill=(zn if i % 2 == 0 else None), region=region)
+ for i, region in enumerate(openmc.model.subdivide(surfs))]
+ model.geometry = openmc.Geometry(cells)
+
+ model.settings.run_mode = 'fixed source'
+ model.settings.batches = 3
+ model.settings.particles = 1000
+ model.settings.source = openmc.Source(space=openmc.stats.Point())
+
+ cell_filter = openmc.CellFilter(cells)
+ tally = openmc.Tally()
+ tally.filters = [cell_filter]
+ tally.scores = ['total']
+ model.tallies.append(tally)
+
+ return model
-def test_void():
- harness = TestHarness('statepoint.10.h5')
+def test_void(model):
+ harness = PyAPITestHarness('statepoint.3.h5', model)
harness.main()
diff --git a/tests/testing_harness.py b/tests/testing_harness.py
index e341a3cf17..0d3c4bec00 100644
--- a/tests/testing_harness.py
+++ b/tests/testing_harness.py
@@ -72,10 +72,12 @@ class TestHarness(object):
# Read the statepoint file.
statepoint = glob.glob(self._sp_name)[0]
with openmc.StatePoint(statepoint) as sp:
- # Write out k-combined.
- outstr = 'k-combined:\n'
- form = '{0:12.6E} {1:12.6E}\n'
- outstr += form.format(sp.k_combined.n, sp.k_combined.s)
+ outstr = ''
+ if sp.run_mode == 'eigenvalue':
+ # Write out k-combined.
+ outstr += 'k-combined:\n'
+ form = '{0:12.6E} {1:12.6E}\n'
+ outstr += form.format(sp.k_combined.n, sp.k_combined.s)
# Write out tally data.
for i, tally_ind in enumerate(sp.tallies):