Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r98a1a2a624373a1d140daed0136522ab6e635237 -r752ec32e48ba27c3939d7e8ec56091cb917e3eef
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 98a1a2a624373a1d140daed0136522ab6e635237)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 752ec32e48ba27c3939d7e8ec56091cb917e3eef)
@@ -131,7 +131,6 @@
 void execOperationModes( void )
 {
     DG_OP_MODE_T newMode;
-    U32 priorSubMode = currentSubMode;
 
     priorSubMode = currentSubMode;
 
@@ -150,7 +149,6 @@
     if ( currentMode != newMode )
     {
         // handle transition to new mode
-        priorSubMode = 0;
         lastMode = currentMode;
         transitionToNewOperationMode( newMode );
         currentMode = newMode;
@@ -416,6 +414,34 @@
 
 /*********************************************************************//**
  * @brief
+ * The testSetOperationMode function will transition to a given operation
+ * mode if the transition is legal.
+ * @details Inputs: none
+ * @details Outputs: modeRequest[]
+ * @param newMode ID of requested mode to transition to
+ * @return TRUE if request successful, FALSE if not
+ *************************************************************************/
+BOOL testSetOperationMode( DG_OP_MODE_T newMode )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        DG_OP_MODE_T check = MODE_TRANSITION_TABLE[ currentMode ][ newMode ];
+
+        // Is mode transition legal?
+        if ( check == newMode )
+        {
+            requestNewOperationMode( newMode );
+            result = TRUE;
+        }
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The testSetDGOpModePublishIntervalOverride function overrides the
  * DG operation mode publish interval.
  * @details Inputs: none