diff --git a/openmc/settings.py b/openmc/settings.py
index 2e4a3f3ce..2777e8cc1 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -1063,6 +1063,8 @@ class SettingsFile(object):
         self._create_confidence_intervals()
         self._create_cross_sections_subelement()
         self._create_energy_grid_subelement()
+        self._create_energy_mode_subelement()
+        self._create_max_order_subelement()
         self._create_ptables_subelement()
         self._create_run_cmfd_subelement()
         self._create_seed_subelement()
diff --git a/tests/input_set.py b/tests/input_set.py
index 956fa81ce..daff38ba1 100644
--- a/tests/input_set.py
+++ b/tests/input_set.py
@@ -641,7 +641,8 @@ class MGInputSet(InputSet):
         self.settings.batches = 10
         self.settings.inactive = 5
         self.settings.particles = 100
-        self.settings.set_source_space('box', (0.0, 0.0, 0.0, 10.0, 10.0, 2.0))
+        self.settings.source = Source(space=Box([0.0, 0.0, 0.0],
+                                                [10.0, 10.0, 2.0]))
         self.settings.energy_mode = "multi-group"
         self.settings.cross_sections = "../1d_mgxs.xml"
 
diff --git a/tests/test_mg_basic/inputs_true.dat b/tests/test_mg_basic/inputs_true.dat
index 549172b1a..fdbdb1c96 100644
--- a/tests/test_mg_basic/inputs_true.dat
+++ b/tests/test_mg_basic/inputs_true.dat
@@ -1 +1 @@
-be47096ff6382e07c58c67870eb1c77402c961ee8cb9a4671b52627f6432fe282403e70f5825c90764758fcabe5a480653a961e24d7a0349929283848e79667d
\ No newline at end of file
+04b4a5099f0097bbe02983c67dea691d0d0d4ece7fb7c264b9b2c29955baa9e870b6fa999480da08ead1e5a0c078ae33ce1b0a5c8594ad465aedf9bf3933e104
\ No newline at end of file
diff --git a/tests/test_mg_max_order/inputs_true.dat b/tests/test_mg_max_order/inputs_true.dat
index 3529d5092..1ad336e19 100644
--- a/tests/test_mg_max_order/inputs_true.dat
+++ b/tests/test_mg_max_order/inputs_true.dat
@@ -1 +1 @@
-7bd8b00b5aaad3913e0022269cf6ef92dfd0051bd79fb136838ea5a65d322d9711b454e62ef03dcf2b9dd75e31a4febcc633f968d7d07dcb6da2e0d36daf45db
\ No newline at end of file
+abe20c626d613e73ccb1a3f8468ad1b9aecca528afa9e8131a411d754eb86b8ab64a6fb1fdc9c0b8b8158ff7c82f548de5912041bf035aa5a2d4532cfe0c9510
\ No newline at end of file
diff --git a/tests/test_mg_max_order/test_mg_max_order.py b/tests/test_mg_max_order/test_mg_max_order.py
index 423f068f7..2f5ee4e4e 100644
--- a/tests/test_mg_max_order/test_mg_max_order.py
+++ b/tests/test_mg_max_order/test_mg_max_order.py
@@ -70,16 +70,16 @@ class MGNuclideInputSet(MGInputSet):
 
         self.geometry.geometry = geometry
 
-class MGNuclideTestHarness(PyAPITestHarness):
+class MGMaxOrderTestHarness(PyAPITestHarness):
     def __init__(self, statepoint_name, tallies_present, mg=False):
-        TestHarness.__init__(self, statepoint_name, tallies_present)
+        PyAPITestHarness.__init__(self, statepoint_name, tallies_present)
         self._input_set = MGNuclideInputSet()
 
     def _build_inputs(self):
-        super(MGNuclideTestHarness, self)._build_inputs()
+        super(MGMaxOrderTestHarness, self)._build_inputs()
         # Set P1 scattering
         self._input_set.settings.max_order = 1
 
 if __name__ == '__main__':
-    harness = MGNuclideTestHarness('statepoint.10.*', False, mg=True)
+    harness = MGMaxOrderTestHarness('statepoint.10.*', False, mg=True)
     harness.main()
diff --git a/tests/test_mg_nuclide/inputs_true.dat b/tests/test_mg_nuclide/inputs_true.dat
index ea61b9222..eb643bbaf 100644
--- a/tests/test_mg_nuclide/inputs_true.dat
+++ b/tests/test_mg_nuclide/inputs_true.dat
@@ -1 +1 @@
-f3d614294177f34186bf0d439330d144438ac6a2402af9b5433efb7bf6a311043140c487c86f4d3cae9d51742f5042823d224c9da6365da6c8972b44edb7fb71
\ No newline at end of file
+c9f9e7211bfb2af58130bedfd64592d093b7bfa424953eba433ecf08940595a96b8de7a892f12d1ab465cebd8e5dd784114c1b1299b534ed329df92752c9ed1f
\ No newline at end of file
diff --git a/tests/test_mg_nuclide/test_mg_nuclide.py b/tests/test_mg_nuclide/test_mg_nuclide.py
index 736473bd9..deb784bad 100644
--- a/tests/test_mg_nuclide/test_mg_nuclide.py
+++ b/tests/test_mg_nuclide/test_mg_nuclide.py
@@ -71,7 +71,7 @@ class MGNuclideInputSet(MGInputSet):
 
 class MGNuclideTestHarness(PyAPITestHarness):
     def __init__(self, statepoint_name, tallies_present, mg=False):
-        TestHarness.__init__(self, statepoint_name, tallies_present)
+        PyAPITestHarness.__init__(self, statepoint_name, tallies_present)
         self._input_set = MGNuclideInputSet()
 
     def _build_inputs(self):
diff --git a/tests/test_mg_tallies/inputs_true.dat b/tests/test_mg_tallies/inputs_true.dat
index 063b36923..304d2e888 100644
--- a/tests/test_mg_tallies/inputs_true.dat
+++ b/tests/test_mg_tallies/inputs_true.dat
@@ -1 +1 @@
-dcde495bd5d0ace409154be3529ae91d454e92f7060e38f00bc0880350d53c889b87edcfd481e6c8bcec2450bdf780e6fdc52240978eb1c67a6ef290ad85442d
\ No newline at end of file
+ca8490e0e4549fed727ddc75b6d92cfe5162e11b905218a0afaa3ce2ee0763e2ff38074de27aaa678818624f49c5823650475dfa8f66f502a98fc03145399c0d
\ No newline at end of file
diff --git a/tests/testing_harness.py b/tests/testing_harness.py
index 78e6e1076..7d6dbc914 100644
--- a/tests/testing_harness.py
+++ b/tests/testing_harness.py
@@ -244,7 +244,7 @@ class ParticleRestartTestHarness(TestHarness):
 
 class PyAPITestHarness(TestHarness):
     def __init__(self, statepoint_name, tallies_present=False, mg=False):
-                super(PyAPITestHarness, self).__init__(statepoint_name, tallies_present)
+        super(PyAPITestHarness, self).__init__(statepoint_name, tallies_present)
         self.parser.add_option('--build-inputs', dest='build_only',
                                action='store_true', default=False)
         if mg: