diff --git a/tests/regression_tests/model_xml/adj_cell_rotation_inputs_true.dat b/tests/regression_tests/model_xml/adj_cell_rotation_inputs_true.dat
index 3b14f304ea..1c4516f42d 100644
--- a/tests/regression_tests/model_xml/adj_cell_rotation_inputs_true.dat
+++ b/tests/regression_tests/model_xml/adj_cell_rotation_inputs_true.dat
@@ -13,16 +13,16 @@
   <geometry>
     <cell id="1" material="1" region="-1" universe="1" />
     <cell id="2" material="2" region="1" universe="1" />
-    <cell id="3" fill="1" region="2 -3 4 -5 6 -8" rotation="10 20 30" universe="2" />
-    <cell id="4" fill="1" region="2 -3 4 -5 8 -7" translation="0 0 15" universe="2" />
-    <surface id="1" type="sphere" coeffs="1.0 0.0 0.0 5.0" />
-    <surface id="2" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-7.5" />
-    <surface id="3" name="maximum x" type="x-plane" boundary="vacuum" coeffs="7.5" />
-    <surface id="4" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-7.5" />
-    <surface id="5" name="maximum y" type="y-plane" boundary="vacuum" coeffs="7.5" />
-    <surface id="6" type="z-plane" boundary="vacuum" coeffs="-7.5" />
-    <surface id="7" type="z-plane" boundary="vacuum" coeffs="22.5" />
-    <surface id="8" type="z-plane" coeffs="7.5" />
+    <cell fill="1" id="3" region="2 -3 4 -5 6 -8" rotation="10 20 30" universe="2" />
+    <cell fill="1" id="4" region="2 -3 4 -5 8 -7" translation="0 0 15" universe="2" />
+    <surface coeffs="1.0 0.0 0.0 5.0" id="1" type="sphere" />
+    <surface boundary="vacuum" coeffs="-7.5" id="2" name="minimum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="7.5" id="3" name="maximum x" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-7.5" id="4" name="minimum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="7.5" id="5" name="maximum y" type="y-plane" />
+    <surface boundary="vacuum" coeffs="-7.5" id="6" type="z-plane" />
+    <surface boundary="vacuum" coeffs="22.5" id="7" type="z-plane" />
+    <surface coeffs="7.5" id="8" type="z-plane" />
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/model_xml/energy_laws_inputs_true.dat b/tests/regression_tests/model_xml/energy_laws_inputs_true.dat
index 62485ff72a..c89ccc97ee 100644
--- a/tests/regression_tests/model_xml/energy_laws_inputs_true.dat
+++ b/tests/regression_tests/model_xml/energy_laws_inputs_true.dat
@@ -12,7 +12,7 @@
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1" />
-    <surface id="1" type="sphere" boundary="reflective" coeffs="0.0 0.0 0.0 100.0" />
+    <surface boundary="reflective" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere" />
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/model_xml/lattice_multiple_inputs_true.dat b/tests/regression_tests/model_xml/lattice_multiple_inputs_true.dat
index d828b25f6b..0eed3c2015 100644
--- a/tests/regression_tests/model_xml/lattice_multiple_inputs_true.dat
+++ b/tests/regression_tests/model_xml/lattice_multiple_inputs_true.dat
@@ -18,8 +18,8 @@
     <cell id="2" material="2" region="1" universe="1" />
     <cell id="3" material="1" region="-2" universe="2" />
     <cell id="4" material="2" region="2" universe="2" />
-    <cell id="5" fill="3" universe="4" />
-    <cell id="6" fill="5" region="3 -4 5 -6" universe="6" />
+    <cell fill="3" id="5" universe="4" />
+    <cell fill="5" id="6" region="3 -4 5 -6" universe="6" />
     <lattice id="3">
       <pitch>1.2 1.2</pitch>
       <outer>1</outer>
@@ -37,12 +37,12 @@
 4 4 
 4 4 </universes>
     </lattice>
-    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 0.4" />
-    <surface id="2" type="z-cylinder" coeffs="0.0 0.0 0.5" />
-    <surface id="3" name="minimum x" type="x-plane" boundary="reflective" coeffs="-2.4" />
-    <surface id="4" name="maximum x" type="x-plane" boundary="reflective" coeffs="2.4" />
-    <surface id="5" name="minimum y" type="y-plane" boundary="reflective" coeffs="-2.4" />
-    <surface id="6" name="maximum y" type="y-plane" boundary="reflective" coeffs="2.4" />
+    <surface coeffs="0.0 0.0 0.4" id="1" type="z-cylinder" />
+    <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-2.4" id="3" name="minimum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="2.4" id="4" name="maximum x" type="x-plane" />
+    <surface boundary="reflective" coeffs="-2.4" id="5" name="minimum y" type="y-plane" />
+    <surface boundary="reflective" coeffs="2.4" id="6" name="maximum y" type="y-plane" />
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/model_xml/photon_production_inputs_true.dat b/tests/regression_tests/model_xml/photon_production_inputs_true.dat
index 9e60033bec..e4fe9a5858 100644
--- a/tests/regression_tests/model_xml/photon_production_inputs_true.dat
+++ b/tests/regression_tests/model_xml/photon_production_inputs_true.dat
@@ -10,10 +10,10 @@
     <cell id="1" material="void" region="-1 2 -3" universe="1" />
     <cell id="2" material="1" region="-1 3 -4" universe="1" />
     <cell id="3" material="void" region="~(-1 2 -4)" universe="1" />
-    <surface id="1" type="x-cylinder" boundary="vacuum" coeffs="0.0 0.0 1.0" />
-    <surface id="2" type="x-plane" boundary="vacuum" coeffs="-1.0" />
-    <surface id="3" type="x-plane" coeffs="1.0" />
-    <surface id="4" type="x-plane" boundary="vacuum" coeffs="1000000000.0" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="x-cylinder" />
+    <surface boundary="vacuum" coeffs="-1.0" id="2" type="x-plane" />
+    <surface coeffs="1.0" id="3" type="x-plane" />
+    <surface boundary="vacuum" coeffs="1000000000.0" id="4" type="x-plane" />
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>