diff --git a/src/physics_mg.F90 b/src/physics_mg.F90
index b5d34838c2..9b18b762b0 100644
--- a/src/physics_mg.F90
+++ b/src/physics_mg.F90
@@ -31,12 +31,6 @@ contains
 
     type(Particle), intent(inout) :: p
 
-    ! Store pre-collision particle properties
-    p % last_wgt = p % wgt
-    p % last_g   = p % g
-    p % last_E   = p % E
-    p % last_uvw = p % coord(1) % uvw
-
     ! Add to collision counter for particle
     p % n_collision = p % n_collision + 1
 
diff --git a/src/tracking.F90 b/src/tracking.F90
index 90dd9c35ee..a5b9386c0c 100644
--- a/src/tracking.F90
+++ b/src/tracking.F90
@@ -112,6 +112,10 @@ contains
           material_xs % absorption = ZERO
           material_xs % nu_fission = ZERO
         end if
+
+        ! Finally, update the particle group while we have already checked for
+        ! if multi-group
+        p % last_g = p % g
       end if
 
       ! Find the distance to the nearest boundary
diff --git a/tests/run_tests.py b/tests/run_tests.py
index cd6c026072..50e9313df3 100755
--- a/tests/run_tests.py
+++ b/tests/run_tests.py
@@ -416,16 +416,16 @@ for key in iter(tests):
 
     # Verify fortran compiler exists
     if which(test.fc) is None:
-        self.msg = 'Compiler not found: {0}'.format(test.fc)
-        self.success = False
+        test.msg = 'Compiler not found: {0}'.format(test.fc)
+        test.success = False
         continue
 
     # Verify valgrind command exists
     if test.valgrind:
         valgrind_cmd = which('valgrind')
         if valgrind_cmd is None:
-            self.msg = 'No valgrind executable found.'
-            self.success = False
+            test.msg = 'No valgrind executable found.'
+            test.success = False
             continue
     else:
         valgrind_cmd = ''
@@ -433,8 +433,8 @@ for key in iter(tests):
     # Verify gcov/lcov exist
     if test.coverage:
         if which('gcov') is None:
-            self.msg = 'No {} executable found.'.format(exe)
-            self.success = False
+            test.msg = 'No {} executable found.'.format(exe)
+            test.success = False
             continue
 
     # Set test specific CTest script vars. Not used in non-script mode