Index: firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c
===================================================================
diff -u -rf7553872983e440277cae7f84b386ff195d7c394 -r886964fa2bf6a5bb61b33b8b5547f3d0c585b360
--- firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c	(.../ModeGenPermeateDefeatured.c)	(revision f7553872983e440277cae7f84b386ff195d7c394)
+++ firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c	(.../ModeGenPermeateDefeatured.c)	(revision 886964fa2bf6a5bb61b33b8b5547f3d0c585b360)
@@ -273,56 +273,6 @@
 
 /*********************************************************************//**
  * @brief
- * The validateGenPDefeaturedChangeReq function validate whether requested
- * sub mode change is legal or not.
- * @details \b Inputs: none
- * @details \b Outputs: none
- * @return TRUE if request is legal, FALSE if not.
- *************************************************************************/
-BOOL validateGenPDefeaturedChangeReq( U32 newSubMode )
-{
-    BOOL result = FALSE;
-
-    // TODO add validation logic
-    result = TRUE;
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The signalNewGenPDefeaturedSubMode function requests transition to a new
- * defeatured Gen Permeate sub mode.
- * @details \b Alarm: ALARM_ID_FP_SOFTWARE_FAULT if given new sub mode is invalid.
- * @details \b Inputs: none
- * @details \b Outputs: none
- * @return none
- *************************************************************************/
-void signalNewGenPDefeaturedSubMode( U32 newSubMode )
-{
-    FP_GENP_DEF_MODE_STATE_T reqSubMode = (FP_GENP_DEF_MODE_STATE_T)newSubMode;
-
-    if ( reqSubMode < NUM_OF_FP_GENP_DEF_MODE_STATES )
-    {
-        genPermeateDefState = reqSubMode;
-        // handle the prerequisite if any
-        switch ( reqSubMode )
-        {
-            case FP_GENP_DEF_SUPPLY_WATER:
-                break;
-
-            case FP_GENP_DEF_PAUSED:
-                break;
-
-            default:
-                break;
-        }
-        setModeGenPDefTransition( reqSubMode );
-    }
-}
-
-/*********************************************************************//**
- * @brief
  * The getGenPermeateDataPublishInterval function gets the generate permeate
  * defeatured mode data publish interval.
  * @details \b Inputs: genPermeateDefDataPublishInterval
@@ -383,4 +333,59 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testValidateGenPDefeaturedChangeReq function validate whether
+ * requested sub mode change is legal or not.
+ * @details \b Inputs: none
+ * @details \b Outputs: none
+ * @param newSubMode the enumerated sub state of the mode.
+ * @return TRUE if request is legal, FALSE if not.
+ *************************************************************************/
+BOOL testValidateGenPDefeaturedChangeReq( U32 newSubMode )
+{
+    BOOL result = FALSE;
+
+    if ( newSubMode < NUM_OF_FP_GENP_DEF_MODE_STATES )
+    {
+        switch ( newSubMode )
+        {
+            case FP_GENP_DEF_SUPPLY_WATER:
+            case FP_GENP_DEF_PAUSED:
+            default:
+                result = TRUE;
+                break;
+        }
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testSignalNewGenPDefeaturedSubMode function requests transition
+ * to a new defeatured Gen Permeate sub mode.
+ * @details \b Inputs: none
+ * @details \b Outputs: none
+ * @param newSubMode the enumerated sub state of the mode.
+ * @return none
+ *************************************************************************/
+void testSignalNewGenPDefeaturedSubMode( U32 newSubMode )
+{
+    if ( newSubMode < NUM_OF_FP_GENP_DEF_MODE_STATES )
+    {
+        genPermeateDefState = (FP_GENP_DEF_MODE_STATE_T)newSubMode;
+        // handle the prerequisite if any
+        switch ( newSubMode )
+        {
+            // Any of these state require no special handling
+            case FP_GENP_DEF_SUPPLY_WATER:
+            case FP_GENP_DEF_PAUSED:
+            default:
+                break;
+        }
+        setModeGenPDefTransition( genPermeateDefState );
+    }
+}
+
 /**@}*/