diff --git a/tests/test_surface_tally/inputs_true.dat b/tests/test_surface_tally/inputs_true.dat
index 4d18ff107..e66d44273 100644
--- a/tests/test_surface_tally/inputs_true.dat
+++ b/tests/test_surface_tally/inputs_true.dat
@@ -12,22 +12,16 @@
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
   <material id="13" name="UO2 fuel at 2.4% wt enrichment">
-    <density units="g/cm3" value="10.29769" />
-    <nuclide ao="0.00019522896365555328" name="U234" />
-    <nuclide ao="0.024299485497345803" name="U235" />
-    <nuclide ao="0.9755052855389987" name="U238" />
-    <nuclide ao="1.999242" name="O16" />
-    <nuclide ao="0.000758" name="O17" />
+    <density units="g/cc" value="10.0" />
+    <nuclide ao="1.0" name="U238" />
+    <nuclide ao="0.02" name="U235" />
+    <nuclide ao="2.0" name="O16" />
   </material>
   <material id="14" name="Borated water">
-    <density units="g/cm3" value="0.740582" />
-    <nuclide ao="7.928e-06" name="B10" />
-    <nuclide ao="3.2072e-05" name="B11" />
-    <nuclide ao="0.04999221300000001" name="H1" />
-    <nuclide ao="7.787e-06" name="H2" />
-    <nuclide ao="0.023990904" name="O16" />
-    <nuclide ao="9.096e-06" name="O17" />
-    <sab name="c_H_in_H2O" />
+    <density units="g/cm3" value="1" />
+    <nuclide ao="0.0001" name="B10" />
+    <nuclide ao="2.0" name="H1" />
+    <nuclide ao="1.0" name="O16" />
   </material>
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
diff --git a/tests/test_surface_tally/results_true.dat b/tests/test_surface_tally/results_true.dat
index 8e9f6c390..51e2d7dc0 100644
--- a/tests/test_surface_tally/results_true.dat
+++ b/tests/test_surface_tally/results_true.dat
@@ -1,53 +1,53 @@
 mean,std. dev.
-2.2000000e-02,1.8915015e-03
-7.0600000e-02,2.4549270e-03
-1.4900000e-01,4.1150132e-03
-6.1190000e-01,9.6014467e-03
-1.1000000e-03,3.7859389e-04
-5.8000000e-03,9.9777530e-04
-1.0300000e-02,1.5205993e-03
-4.6700000e-02,3.0333333e-03
-2.2000000e-02,1.8915015e-03
-7.0600000e-02,2.4549270e-03
-1.4900000e-01,4.1150132e-03
-6.1190000e-01,9.6014467e-03
-1.1000000e-03,3.7859389e-04
-5.8000000e-03,9.9777530e-04
-1.0300000e-02,1.5205993e-03
-4.6700000e-02,3.0333333e-03
-5.4000000e-03,6.6999171e-04
-4.5000000e-02,1.9436506e-03
-3.2300000e-02,1.4067299e-03
-3.8900000e-01,7.4311656e-03
+2.1400000e-02,1.1850926e-03
+7.4700000e-02,2.5649345e-03
+1.6090000e-01,4.4433471e-03
+6.4810000e-01,8.6041979e-03
+2.0000000e-03,3.9440532e-04
+4.2000000e-03,8.2731158e-04
+1.1200000e-02,1.0934146e-03
+4.6400000e-02,2.2715633e-03
+2.1400000e-02,1.1850926e-03
+7.4700000e-02,2.5649345e-03
+1.6090000e-01,4.4433471e-03
+6.4810000e-01,8.6041979e-03
+2.0000000e-03,3.9440532e-04
+4.2000000e-03,8.2731158e-04
+1.1200000e-02,1.0934146e-03
+4.6400000e-02,2.2715633e-03
+5.5000000e-03,5.6273143e-04
+4.4300000e-02,1.8502252e-03
+4.5600000e-02,1.2220202e-03
+4.1780000e-01,6.4460151e-03
 0.0000000e+00,0.0000000e+00
-2.6000000e-03,4.7609523e-04
-1.0000000e-04,1.0000000e-04
-1.9300000e-02,1.3337499e-03
--5.4000000e-03,6.6999171e-04
--4.5000000e-02,1.9436506e-03
--3.2300000e-02,1.4067299e-03
--3.8900000e-01,7.4311656e-03
+1.4000000e-03,3.3993463e-04
 0.0000000e+00,0.0000000e+00
--2.6000000e-03,4.7609523e-04
--1.0000000e-04,1.0000000e-04
--1.9300000e-02,1.3337499e-03
-1.6600000e-02,1.9675139e-03
-2.5600000e-02,3.2903900e-03
-1.1670000e-01,3.3100856e-03
-2.2290000e-01,5.8924622e-03
-1.1000000e-03,3.7859389e-04
-3.2000000e-03,6.4635731e-04
-1.0200000e-02,1.5114379e-03
-2.7400000e-02,3.0081371e-03
+1.6600000e-02,1.0561986e-03
+-5.5000000e-03,5.6273143e-04
+-4.4300000e-02,1.8502252e-03
+-4.5600000e-02,1.2220202e-03
+-4.1780000e-01,6.4460151e-03
 0.0000000e+00,0.0000000e+00
--3.5600000e-02,2.2020193e-03
+-1.4000000e-03,3.3993463e-04
 0.0000000e+00,0.0000000e+00
--3.6890000e-01,3.4236108e-03
+-1.6600000e-02,1.0561986e-03
+1.5900000e-02,1.1200198e-03
+3.0400000e-02,3.2734623e-03
+1.1530000e-01,3.8327536e-03
+2.3030000e-01,7.2250336e-03
+2.0000000e-03,3.9440532e-04
+2.8000000e-03,7.8598841e-04
+1.1200000e-02,1.0934146e-03
+2.9800000e-02,2.5811281e-03
 0.0000000e+00,0.0000000e+00
--2.8000000e-03,6.7986927e-04
+-3.0000000e-02,1.3743685e-03
 0.0000000e+00,0.0000000e+00
--2.2900000e-02,2.4919872e-03
--7.9490000e-01,1.2723076e-02
--3.4600000e-02,2.7414514e-03
--7.9490000e-01,1.2723076e-02
--3.4600000e-02,2.7414514e-03
+-3.4810000e-01,5.9711343e-03
+0.0000000e+00,0.0000000e+00
+-3.1000000e-03,6.9041051e-04
+0.0000000e+00,0.0000000e+00
+-2.1900000e-02,2.4241837e-03
+-9.0250000e-01,2.0941320e-02
+-3.5200000e-02,1.2806248e-03
+-9.0250000e-01,2.0941320e-02
+-3.5200000e-02,1.2806248e-03
diff --git a/tests/test_surface_tally/test_surface_tally.py b/tests/test_surface_tally/test_surface_tally.py
index 928b74100..ae525a683 100644
--- a/tests/test_surface_tally/test_surface_tally.py
+++ b/tests/test_surface_tally/test_surface_tally.py
@@ -13,16 +13,16 @@ class SurfaceTallyTestHarness(PyAPITestHarness):
     def _build_inputs(self):
         # Instantiate some Materials and register the appropriate Nuclides
         uo2 = openmc.Material(name='UO2 fuel at 2.4% wt enrichment')
-        uo2.set_density('g/cm3', 10.29769)
-        uo2.add_element('U', 1., enrichment=2.4)
-        uo2.add_element('O', 2.)
+        uo2.set_density('g/cc', 10.0)
+        uo2.add_nuclide('U238', 1.0)
+        uo2.add_nuclide('U235', 0.02)
+        uo2.add_nuclide('O16', 2.0)
 
         borated_water = openmc.Material(name='Borated water')
-        borated_water.set_density('g/cm3', 0.740582)
-        borated_water.add_element('B', 4.0e-5)
-        borated_water.add_element('H', 5.0e-2)
-        borated_water.add_element('O', 2.4e-2)
-        borated_water.add_s_alpha_beta('c_H_in_H2O')
+        borated_water.set_density('g/cm3', 1)
+        borated_water.add_nuclide('B10', 10e-5)
+        borated_water.add_nuclide('H1', 2.0)
+        borated_water.add_nuclide('O16', 1.0)
 
         # Instantiate a Materials collection and export to XML
         materials_file = openmc.Materials([uo2, borated_water])