diff --git a/src/input_xml.F90 b/src/input_xml.F90
index 39ef53a7de..cfc1c2a9e3 100644
--- a/src/input_xml.F90
+++ b/src/input_xml.F90
@@ -2458,12 +2458,12 @@ contains
             t % moment_order(j) = n_order
 
           case ('nu-scatter-n')
+            ! Set tally estimator to analog
+            t % estimator = ESTIMATOR_ANALOG
             if (n_order == 0) then
               t % score_bins(j) = SCORE_NU_SCATTER
             else
               t % score_bins(j) = SCORE_NU_SCATTER_N
-              ! Set tally estimator to analog
-              t % estimator = ESTIMATOR_ANALOG
             end if
             t % moment_order(j) = n_order
 
diff --git a/tests/test_score_flux_yn/results_test.dat b/tests/test_score_flux_yn/results_test.dat
new file mode 100644
index 0000000000..e586c894ac
--- /dev/null
+++ b/tests/test_score_flux_yn/results_test.dat
@@ -0,0 +1,448 @@
+k-combined:
+9.785262E-01 2.895177E-02
+tally 1:
+2.435729E+01
+1.203987E+02
+8.194681E+00
+1.380086E+01
+3.940735E+01
+3.173417E+02
+3.867197E+01
+3.002989E+02
+1.337306E+01
+3.597709E+01
+6.603960E+01
+8.773418E+02
+tally 2:
+2.435729E+01
+1.203987E+02
+-1.312433E-01
+2.122879E-01
+2.116196E-01
+6.066255E-02
+-5.313614E-01
+2.706195E-01
+-1.075684E-01
+7.055293E-02
+1.243217E-01
+4.159849E-02
+2.468823E-01
+1.768096E-01
+-1.123588E+00
+3.763177E-01
+-1.648770E-02
+1.832803E-01
+2.802677E-01
+5.082361E-02
+-2.061149E-01
+3.165317E-02
+-1.807522E-01
+5.391268E-02
+4.530400E-01
+1.087546E-01
+-6.668795E-01
+1.641587E-01
+-2.043175E-02
+5.328027E-02
+-4.884041E-01
+5.671422E-02
+1.284666E-01
+1.392098E-02
+-1.432327E-01
+4.612313E-02
+2.306910E-01
+5.105478E-02
+1.541349E-01
+3.338018E-02
+1.058470E-01
+5.362792E-02
+-1.047112E-01
+4.224258E-02
+2.943176E-01
+4.868725E-02
+2.587610E-02
+4.315807E-02
+-3.523267E-02
+3.992323E-02
+2.858380E-02
+2.103937E-02
+-8.696462E-02
+2.368855E-02
+-1.389638E-01
+2.956421E-02
+-3.501207E-01
+3.399027E-02
+1.902988E-01
+3.608903E-02
+5.327172E-02
+3.572644E-02
+-2.426249E-01
+1.431615E-02
+-3.050565E-01
+5.036758E-02
+-2.450581E-01
+3.287240E-02
+3.917853E-01
+5.203000E-02
+9.280421E-02
+3.986423E-02
+8.194681E+00
+1.380086E+01
+-1.198609E-01
+2.695675E-02
+1.383659E-01
+2.636170E-02
+-1.749412E-01
+2.760502E-02
+-9.940427E-02
+1.568240E-02
+6.891264E-02
+1.026583E-02
+1.590465E-01
+1.034971E-02
+-3.138227E-01
+2.840189E-02
+-2.863762E-02
+1.621002E-02
+1.352890E-01
+6.206260E-03
+-4.004307E-02
+3.615784E-03
+-7.902125E-02
+1.613512E-02
+1.951944E-01
+2.062619E-02
+-2.509090E-01
+2.990177E-02
+-7.269079E-03
+3.049242E-03
+-5.414351E-02
+3.014519E-03
+6.260478E-02
+1.067701E-03
+-6.869296E-02
+3.560172E-03
+7.374905E-02
+8.314559E-03
+8.279954E-02
+3.348473E-03
+5.763034E-02
+1.854541E-02
+-4.318960E-02
+3.464200E-03
+7.982046E-02
+1.229306E-02
+1.040014E-02
+1.053815E-02
+2.346513E-02
+3.165815E-03
+1.465521E-02
+1.948357E-03
+-1.095875E-02
+2.265977E-03
+-3.900368E-02
+3.842750E-03
+-2.042671E-06
+1.832329E-03
+5.396847E-02
+3.217326E-03
+2.982176E-02
+1.176203E-02
+-2.814986E-02
+1.536677E-03
+-1.081965E-01
+5.407495E-03
+-3.828136E-02
+2.878498E-03
+7.710669E-02
+3.209292E-03
+6.098258E-02
+2.186137E-03
+3.940735E+01
+3.173417E+02
+-4.295696E-01
+2.690844E-01
+5.348104E-01
+2.016075E-01
+-2.609804E-01
+2.138709E-01
+-5.728795E-01
+2.250658E-01
+1.642274E-01
+3.798058E-01
+-4.820927E-02
+1.782804E-01
+-1.217072E+00
+4.264214E-01
+7.722249E-02
+1.569837E-01
+4.762644E-01
+1.486818E-01
+-1.154941E-01
+7.167031E-02
+-5.131035E-01
+3.048317E-01
+4.549123E-01
+1.380401E-01
+-9.594184E-01
+3.120862E-01
+-1.980919E-01
+1.051642E-01
+-1.318185E-01
+4.789331E-02
+1.375739E-01
+3.256717E-02
+-2.735374E-01
+4.667995E-02
+1.737686E-01
+6.821558E-02
+2.284751E-01
+4.756464E-02
+-2.076359E-01
+9.139686E-02
+-1.203908E-02
+1.955920E-02
+5.958901E-01
+1.930652E-01
+4.040923E-01
+1.903999E-01
+-2.109673E-02
+1.771182E-01
+2.678499E-03
+3.839698E-02
+-1.291510E-01
+8.549633E-02
+-5.355609E-02
+8.872016E-02
+-2.460868E-01
+1.952909E-02
+4.739432E-01
+7.754571E-02
+-5.944508E-02
+4.505470E-02
+2.471670E-01
+2.965480E-02
+-4.979193E-01
+1.916606E-01
+-2.393405E-02
+7.535656E-02
+5.654207E-01
+1.170234E-01
+3.792949E-01
+7.850400E-02
+3.867197E+01
+3.002989E+02
+8.242962E-01
+3.328988E-01
+-8.721432E-01
+5.499353E-01
+-2.827445E-02
+3.808892E-01
+3.027429E-01
+3.196213E-01
+-2.668704E-01
+1.775652E-01
+-1.364711E-01
+3.174950E-02
+1.693700E-01
+3.777266E-01
+3.705874E-01
+1.301648E-01
+-6.953870E-01
+2.916220E-01
+-1.232998E-01
+2.594878E-01
+-6.396748E-01
+1.781359E-01
+-4.475990E-01
+8.796908E-02
+-6.138249E-05
+2.637576E-02
+-3.625609E-01
+1.071480E-01
+-3.679703E-01
+9.529230E-02
+1.887420E-01
+9.572426E-02
+4.512924E-01
+8.828619E-02
+-5.301536E-01
+8.836266E-02
+-5.682538E-01
+1.322901E-01
+-5.640185E-01
+2.067701E-01
+3.060929E-04
+1.385243E-01
+-4.297178E-02
+1.481975E-02
+3.664976E-01
+1.014056E-01
+-1.205351E-01
+5.420132E-03
+-2.494761E-01
+2.833111E-02
+-6.076287E-02
+1.659625E-02
+1.750036E-01
+5.761870E-02
+-1.153502E-02
+3.068594E-02
+1.175234E-01
+5.121138E-02
+-1.125845E-01
+2.987398E-02
+1.480797E-01
+1.698824E-02
+-1.492174E-01
+5.382400E-02
+1.748708E-01
+5.434295E-02
+1.527959E-01
+8.471653E-02
+-2.904372E-01
+1.339215E-01
+1.337306E+01
+3.597709E+01
+1.853470E-01
+3.391063E-02
+-3.879575E-01
+4.413806E-02
+1.110756E-01
+4.326819E-02
+1.272136E-02
+3.910615E-02
+-1.708158E-01
+2.766384E-02
+-7.586373E-03
+3.074551E-03
+1.355828E-01
+4.352850E-02
+1.720338E-01
+3.816177E-02
+-1.970199E-01
+3.589295E-02
+-2.050677E-01
+2.927217E-02
+-1.954428E-01
+2.960696E-02
+-9.327484E-02
+1.166779E-02
+-1.277191E-02
+1.154098E-02
+-6.068542E-02
+1.384060E-02
+-1.322775E-01
+1.720248E-02
+5.815605E-02
+1.135370E-02
+5.351119E-02
+1.134169E-02
+-1.303371E-01
+1.231369E-02
+-1.952041E-01
+8.455846E-03
+-1.885871E-01
+1.963780E-02
+4.399038E-02
+2.402598E-02
+2.517287E-02
+5.478896E-04
+1.156188E-01
+1.077148E-02
+-1.591577E-02
+3.461640E-03
+-7.822656E-02
+2.494263E-03
+-3.635209E-02
+1.957925E-03
+1.353515E-01
+7.473575E-03
+-2.381012E-02
+1.967444E-03
+-5.755770E-02
+3.281243E-03
+5.989480E-03
+3.300085E-03
+-6.040364E-02
+4.806497E-03
+2.536904E-02
+4.434017E-03
+3.776001E-02
+1.478745E-02
+3.411739E-02
+7.395006E-03
+-1.019437E-01
+2.119077E-02
+6.603960E+01
+8.773418E+02
+1.757705E+00
+9.979547E-01
+-9.291194E-01
+9.718246E-01
+6.503126E-01
+7.550216E-01
+1.385724E-01
+5.626979E-01
+-6.450707E-01
+5.509520E-01
+1.145305E-01
+2.637490E-01
+6.041981E-01
+1.002567E+00
+7.176775E-01
+8.116244E-01
+-9.631121E-01
+1.095794E+00
+-5.595901E-01
+5.480297E-01
+-5.984362E-01
+5.063932E-01
+-2.603570E-01
+1.151510E-01
+-8.686749E-02
+1.730599E-01
+-2.120689E-01
+3.466831E-01
+-4.031881E-01
+2.600876E-01
+1.789517E-01
+1.259649E-01
+7.595657E-01
+2.791850E-01
+-7.179829E-01
+1.692839E-01
+-6.844193E-01
+1.655593E-01
+-4.480497E-01
+2.887629E-01
+2.385511E-01
+4.148430E-01
+-1.091249E-01
+1.239082E-01
+5.107831E-01
+1.995329E-01
+3.584899E-02
+3.709753E-02
+-5.233802E-01
+9.374099E-02
+-5.070384E-02
+4.140585E-03
+2.924110E-01
+1.951736E-01
+-2.947218E-02
+5.834542E-02
+-2.679404E-03
+1.905263E-02
+1.668483E-01
+1.361507E-01
+-1.784183E-01
+3.440944E-02
+2.258658E-02
+1.802431E-01
+2.878469E-01
+2.782490E-01
+8.842691E-02
+1.041700E-01
+-5.403488E-01
+5.187324E-01
diff --git a/tests/test_score_nuscatter_n/results_test.dat b/tests/test_score_nuscatter_n/results_test.dat
new file mode 100644
index 0000000000..f0bdd471cd
--- /dev/null
+++ b/tests/test_score_nuscatter_n/results_test.dat
@@ -0,0 +1,33 @@
+k-combined:
+9.785262E-01 2.895177E-02
+tallies:
+9.630000E+00
+1.882770E+01
+9.951694E-01
+2.306142E-01
+4.578746E-01
+5.623761E-02
+4.846244E-01
+6.415248E-02
+1.908107E-01
+1.203246E-02
+1.920000E+00
+7.570000E-01
+2.543372E-01
+1.948219E-02
+1.781533E-01
+7.666342E-03
+2.613666E-02
+1.105500E-03
+-1.067567E-01
+3.627605E-03
+3.114000E+01
+1.988874E+02
+1.607479E+01
+5.265956E+01
+5.942231E+00
+7.358984E+00
+5.014911E-01
+1.018317E-01
+-7.566804E-01
+1.535164E-01
diff --git a/tests/test_score_nuscatter_n/tallies.xml b/tests/test_score_nuscatter_n/tallies.xml
index b962a81cc1..90e28227b6 100644
--- a/tests/test_score_nuscatter_n/tallies.xml
+++ b/tests/test_score_nuscatter_n/tallies.xml
@@ -3,7 +3,7 @@
 
   <tally id="1">
     <filter type="cell" bins="21 22 23" />
-    <scores>nuscatter nuscatter-1 nuscatter-2 nuscatter-3 nuscatter-4</scores>
+    <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_pn/results_test.dat b/tests/test_score_nuscatter_pn/results_test.dat
new file mode 100644
index 0000000000..61f40f694c
--- /dev/null
+++ b/tests/test_score_nuscatter_pn/results_test.dat
@@ -0,0 +1,24 @@
+k-combined:
+9.785262E-01 2.895177E-02
+tally 1:
+9.630000E+00
+1.882770E+01
+9.951694E-01
+2.306142E-01
+4.578746E-01
+5.623761E-02
+4.846244E-01
+6.415248E-02
+1.908107E-01
+1.203246E-02
+tally 2:
+9.630000E+00
+1.882770E+01
+9.951694E-01
+2.306142E-01
+4.578746E-01
+5.623761E-02
+4.846244E-01
+6.415248E-02
+1.908107E-01
+1.203246E-02
diff --git a/tests/test_score_nuscatter_pn/tallies.xml b/tests/test_score_nuscatter_pn/tallies.xml
index 9914c7aa4b..dfad48dda2 100644
--- a/tests/test_score_nuscatter_pn/tallies.xml
+++ b/tests/test_score_nuscatter_pn/tallies.xml
@@ -3,12 +3,12 @@
 
   <tally id="1">
     <filter type="cell" bins="21" />
-    <scores>nuscatter-0 nuscatter-1 nuscatter-2 nuscatter-3 nuscatter-4</scores>
+    <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>nuscatter-p4</scores>
+    <scores>nu-scatter-p4</scores>
   </tally>
 
 </tallies>
diff --git a/tests/test_score_nuscatter_yn/results_test.dat b/tests/test_score_nuscatter_yn/results_test.dat
new file mode 100644
index 0000000000..4854c866e8
--- /dev/null
+++ b/tests/test_score_nuscatter_yn/results_test.dat
@@ -0,0 +1,38 @@
+k-combined:
+9.785262E-01 2.895177E-02
+tally 1:
+9.630000E+00
+1.882770E+01
+tally 2:
+9.630000E+00
+1.882770E+01
+-3.859107E-02
+5.633136E-03
+1.605692E-01
+1.156085E-02
+-3.977190E-02
+6.818184E-03
+3.522369E-02
+3.789031E-03
+-7.407836E-02
+2.699128E-03
+-2.238973E-02
+4.031197E-03
+-8.969310E-02
+2.769455E-03
+4.330738E-02
+1.714798E-03
+-2.173918E-03
+4.710249E-03
+2.499041E-02
+1.104051E-03
+-7.071751E-02
+2.855396E-03
+-5.031274E-02
+1.551567E-03
+-8.277227E-02
+2.137523E-03
+-1.616867E-02
+1.338600E-03
+-1.497058E-02
+2.014934E-03
diff --git a/tests/test_score_nuscatter_yn/tallies.xml b/tests/test_score_nuscatter_yn/tallies.xml
index b9f977f091..b80b37dc8c 100644
--- a/tests/test_score_nuscatter_yn/tallies.xml
+++ b/tests/test_score_nuscatter_yn/tallies.xml
@@ -3,12 +3,12 @@
 
   <tally id="1">
     <filter type="cell" bins="21" />
-    <scores>nuscatter-0</scores>
+    <scores>nu-scatter-0</scores>
   </tally>
 
   <tally id="2">
     <filter type="cell" bins="21" />
-    <scores>nuscatter-y4</scores>
+    <scores>nu-scatter-y3</scores>
   </tally>
 
 </tallies>
diff --git a/tests/test_score_scatter_yn/results_test.dat b/tests/test_score_scatter_yn/results_test.dat
new file mode 100644
index 0000000000..617d117058
--- /dev/null
+++ b/tests/test_score_scatter_yn/results_test.dat
@@ -0,0 +1,56 @@
+k-combined:
+9.785262E-01 2.895177E-02
+tally 1:
+9.630000E+00
+1.882770E+01
+tally 2:
+9.630000E+00
+1.882770E+01
+-3.859107E-02
+5.633136E-03
+1.605692E-01
+1.156085E-02
+-3.977190E-02
+6.818184E-03
+3.522369E-02
+3.789031E-03
+-7.407836E-02
+2.699128E-03
+-2.238973E-02
+4.031197E-03
+-8.969310E-02
+2.769455E-03
+4.330738E-02
+1.714798E-03
+-2.173918E-03
+4.710249E-03
+2.499041E-02
+1.104051E-03
+-7.071751E-02
+2.855396E-03
+-5.031274E-02
+1.551567E-03
+-8.277227E-02
+2.137523E-03
+-1.616867E-02
+1.338600E-03
+-1.497058E-02
+2.014934E-03
+-2.683538E-02
+1.569513E-03
+-4.613955E-03
+9.640026E-04
+8.947303E-03
+3.299483E-04
+-8.588404E-03
+7.913430E-04
+-1.510489E-02
+2.519720E-03
+3.236471E-03
+1.675379E-03
+-1.237888E-02
+9.699709E-04
+4.744373E-02
+1.066913E-03
+-4.995487E-02
+1.125835E-03
diff --git a/tests/test_score_scatter_yn/tallies.xml b/tests/test_score_scatter_yn/tallies.xml
index 41d61e9503..3c46c13d40 100644
--- a/tests/test_score_scatter_yn/tallies.xml
+++ b/tests/test_score_scatter_yn/tallies.xml
@@ -4,6 +4,7 @@
   <tally id="1">
     <filter type="cell" bins="21" />
     <scores>scatter-0</scores>
+    <estimator>analog</estimator>
   </tally>
 
   <tally id="2">
diff --git a/tests/test_score_total_yn/results_test.dat b/tests/test_score_total_yn/results_test.dat
new file mode 100644
index 0000000000..1722472dfd
--- /dev/null
+++ b/tests/test_score_total_yn/results_test.dat
@@ -0,0 +1,212 @@
+k-combined:
+9.785262E-01 2.895177E-02
+tally 1:
+0.000000E+00
+0.000000E+00
+1.094646E+01
+2.428429E+01
+2.225169E+00
+1.016830E+00
+3.150587E+01
+2.052037E+02
+tally 2:
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+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.094646E+01
+2.428429E+01
+5.846652E-02
+4.670734E-02
+1.274633E-01
+5.689843E-03
+-2.769645E-01
+3.469519E-02
+-9.770271E-02
+2.212600E-02
+-1.718138E-03
+6.195671E-03
+5.293044E-02
+1.357406E-02
+-4.557967E-01
+5.262731E-02
+-5.968883E-02
+3.239875E-02
+5.152732E-02
+5.322314E-03
+-4.737115E-02
+2.543009E-03
+-4.137677E-02
+7.737200E-03
+2.349356E-01
+3.675562E-02
+-2.118782E-01
+2.259914E-02
+9.771726E-02
+7.657338E-03
+-1.425459E-01
+6.661165E-03
+5.503163E-02
+3.547136E-03
+-2.043861E-02
+6.938007E-03
+9.716884E-02
+7.890404E-03
+4.580386E-02
+1.770664E-03
+9.386179E-02
+1.633861E-02
+-1.267384E-01
+1.875299E-02
+1.489661E-01
+1.033285E-02
+-1.653923E-02
+4.659923E-03
+-7.241633E-02
+6.087112E-03
+2.225169E+00
+1.016830E+00
+-3.287201E-02
+3.113510E-03
+5.276917E-02
+2.373544E-03
+-3.047290E-02
+2.066181E-03
+-2.215745E-02
+1.448141E-03
+-3.197517E-03
+1.029606E-03
+3.785832E-02
+5.476722E-04
+-7.694649E-02
+2.322476E-03
+-1.318499E-02
+1.294712E-03
+3.252651E-02
+7.647996E-04
+-8.446605E-03
+2.396205E-04
+-2.387179E-02
+5.981366E-04
+4.490141E-02
+9.076461E-04
+-5.073474E-02
+1.479816E-03
+2.337733E-03
+3.629619E-04
+-1.592142E-02
+1.932660E-04
+2.817351E-02
+2.756714E-04
+-7.179521E-03
+2.705344E-04
+5.563912E-03
+5.688500E-04
+2.382506E-02
+2.909462E-04
+1.753681E-02
+6.909020E-04
+-2.592268E-02
+3.202222E-04
+2.160865E-02
+9.134735E-04
+-4.319667E-03
+7.902430E-04
+1.070167E-02
+2.288415E-04
+3.150587E+01
+2.052037E+02
+-1.508479E-01
+3.017029E-01
+1.402160E-01
+7.296606E-02
+-6.067590E-01
+1.366120E-01
+-4.674088E-01
+1.052625E-01
+4.292988E-02
+1.212020E-01
+-8.705007E-02
+7.120546E-02
+-4.832242E-01
+9.504346E-02
+-1.625084E-01
+1.004166E-01
+7.545226E-02
+5.868337E-02
+-6.752172E-03
+3.870347E-02
+-3.514281E-01
+7.616059E-02
+5.581075E-01
+1.419356E-01
+-4.187866E-01
+5.601005E-02
+2.708391E-01
+6.304397E-02
+4.343467E-02
+7.332731E-02
+-3.196333E-02
+1.037211E-02
+-1.138408E-03
+2.321733E-02
+6.915075E-02
+2.899777E-02
+4.666937E-02
+2.139001E-02
+2.022369E-01
+7.382740E-02
+-1.274694E-01
+1.226053E-02
+3.724451E-01
+1.421241E-01
+1.587808E-01
+7.967636E-02
+-8.004346E-03
+4.594356E-02