diff --git a/tests/regression_tests/photon_production/inputs_true.dat b/tests/regression_tests/photon_production/inputs_true.dat
index 31eab718b8..6a6106cbed 100644
--- a/tests/regression_tests/photon_production/inputs_true.dat
+++ b/tests/regression_tests/photon_production/inputs_true.dat
@@ -41,7 +41,7 @@
     <bins>1</bins>
   </filter>
   <filter id="2" type="particle">
-    <bins>photon</bins>
+    <bins>neutron photon electron positron</bins>
   </filter>
   <tally id="1">
     <filters>1 2</filters>
@@ -50,7 +50,7 @@
   <tally id="2">
     <filters>2</filters>
     <nuclides>Al27 total</nuclides>
-    <scores>total heating</scores>
+    <scores>total</scores>
     <estimator>tracklength</estimator>
   </tally>
   <tally id="3">
diff --git a/tests/regression_tests/photon_production/results_true.dat b/tests/regression_tests/photon_production/results_true.dat
index a7725576c8..35e6e5602f 100644
--- a/tests/regression_tests/photon_production/results_true.dat
+++ b/tests/regression_tests/photon_production/results_true.dat
@@ -1,30 +1,92 @@
 tally 1:
+8.601000E-01
+7.397720E-01
 9.403000E-01
 8.841641E-01
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
 tally 2:
-1.819886E-01
-3.311985E-02
-1.960159E+05
-3.842224E+10
+1.249805E+00
+1.562013E+00
+1.249805E+00
+1.562013E+00
 8.281718E-01
 6.858685E-01
-1.960159E+05
-3.842224E+10
+8.281718E-01
+6.858685E-01
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
 tally 3:
-1.799069E-01
-3.236650E-02
-1.945225E+05
-3.783901E+10
+1.248100E+00
+1.557754E+00
+2.024868E+06
+4.100089E+12
+1.248100E+00
+1.557754E+00
+2.024868E+06
+4.100089E+12
 8.242000E-01
 6.793056E-01
-1.945225E+05
-3.783901E+10
+5.827819E+03
+3.396348E+07
+8.242000E-01
+6.793056E-01
+5.827819E+03
+3.396348E+07
+0.000000E+00
+0.000000E+00
+1.834863E+05
+3.366722E+10
+0.000000E+00
+0.000000E+00
+1.834863E+05
+3.366722E+10
+0.000000E+00
+0.000000E+00
+5.938849E+03
+3.526993E+07
+0.000000E+00
+0.000000E+00
+5.938849E+03
+3.526993E+07
 tally 4:
+1.248100E+00
+1.557754E+00
+2.024868E+06
+4.100089E+12
+1.248100E+00
+1.557754E+00
+2.024868E+06
+4.100089E+12
 2.308000E-01
 5.326864E-02
-1.988563E+05
-3.954384E+10
+5.822937E+03
+3.390660E+07
 8.242000E-01
 6.793056E-01
-1.988612E+05
-3.954578E+10
+5.827819E+03
+3.396348E+07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.834863E+05
+3.366722E+10
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.938849E+03
+3.526993E+07
diff --git a/tests/regression_tests/photon_production/test.py b/tests/regression_tests/photon_production/test.py
index 4ed0a7ba72..c20d4487a5 100644
--- a/tests/regression_tests/photon_production/test.py
+++ b/tests/regression_tests/photon_production/test.py
@@ -42,13 +42,13 @@ def model():
     model.settings.source = source
 
     surface_filter = openmc.SurfaceFilter(cyl)
-    particle_filter = openmc.ParticleFilter('photon')
+    particle_filter = openmc.ParticleFilter(['neutron', 'photon', 'electron', 'positron'])
     current_tally = openmc.Tally()
     current_tally.filters = [surface_filter, particle_filter]
     current_tally.scores = ['current']
     tally_tracklength = openmc.Tally()
     tally_tracklength.filters = [particle_filter]
-    tally_tracklength.scores = ['total', 'heating']
+    tally_tracklength.scores = ['total']  # heating doesn't work with tracklength
     tally_tracklength.nuclides = ['Al27', 'total']
     tally_tracklength.estimator = 'tracklength'
     tally_collision = openmc.Tally()
diff --git a/tests/regression_tests/photon_production_fission/inputs_true.dat b/tests/regression_tests/photon_production_fission/inputs_true.dat
index 1c496b2f27..c317f6273e 100644
--- a/tests/regression_tests/photon_production_fission/inputs_true.dat
+++ b/tests/regression_tests/photon_production_fission/inputs_true.dat
@@ -31,7 +31,7 @@
   <tally id="1">
     <filters>1</filters>
     <nuclides>U235 total</nuclides>
-    <scores>fission heating heating-local</scores>
+    <scores>fission heating-local</scores>
     <estimator>tracklength</estimator>
   </tally>
   <tally id="2">
diff --git a/tests/regression_tests/photon_production_fission/results_true.dat b/tests/regression_tests/photon_production_fission/results_true.dat
index ca4517b4ff..c79d775e67 100644
--- a/tests/regression_tests/photon_production_fission/results_true.dat
+++ b/tests/regression_tests/photon_production_fission/results_true.dat
@@ -3,26 +3,18 @@ k-combined:
 tally 1:
 2.600054E+00
 2.253433E+00
-4.390171E+08
-6.424554E+16
 0.000000E+00
 0.000000E+00
 2.600054E+00
 2.253433E+00
-4.390171E+08
-6.424554E+16
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.764667E+07
-7.568912E+14
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.764667E+07
-7.568912E+14
 0.000000E+00
 0.000000E+00
 tally 2:
@@ -40,14 +32,14 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.749088E+07
-7.519602E+14
+2.921131E+06
+2.853657E+12
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.749088E+07
-7.519602E+14
+2.921131E+06
+2.853657E+12
 0.000000E+00
 0.000000E+00
 tally 3:
@@ -65,13 +57,13 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.729796E+07
-7.458273E+14
+2.780823E+06
+2.586737E+12
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.743827E+07
-7.502589E+14
+2.921131E+06
+2.853657E+12
 0.000000E+00
 0.000000E+00
diff --git a/tests/regression_tests/photon_production_fission/test.py b/tests/regression_tests/photon_production_fission/test.py
index f013c9f804..595d3c2d6c 100644
--- a/tests/regression_tests/photon_production_fission/test.py
+++ b/tests/regression_tests/photon_production_fission/test.py
@@ -25,7 +25,7 @@ def model():
     particle_filter = openmc.ParticleFilter(['neutron', 'photon'])
     tally_tracklength = openmc.Tally()
     tally_tracklength.filters = [particle_filter]
-    tally_tracklength.scores = ['fission', 'heating', 'heating-local']
+    tally_tracklength.scores = ['fission', 'heating-local']
     tally_tracklength.nuclides = ['U235', 'total']
     tally_tracklength.estimator = 'tracklength'
     tally_collision = openmc.Tally()
@@ -43,6 +43,6 @@ def model():
     return model
 
 
-def test_photon_production(model):
+def test_photon_production_fission(model):
     harness = PyAPITestHarness('statepoint.5.h5', model)
     harness.main()
diff --git a/tests/regression_tests/tallies/results_true.dat b/tests/regression_tests/tallies/results_true.dat
index a88483c467..2e1b97e812 100644
--- a/tests/regression_tests/tallies/results_true.dat
+++ b/tests/regression_tests/tallies/results_true.dat
@@ -1 +1 @@
-67a1b19f5ee0260a5efd99e0712c5dc8c770b04bcb70aad5c47cdc67e8ea2f9148a9d122598d0f0d2bc2f2ae0222e1a78c8fed10dfb49866123a137b6c1c1264
\ No newline at end of file
+4d9e4a6d4891d02fac2222e0c8665033f0c955ac0082e0c6851c7674a6e967721bad8b77bf0d6c243736128a77a274b4664af54ab10462416ef6c4d18e7218ca
\ No newline at end of file