Index: firmware/App/Modes/FPModes/ModeGenPermeate.c
===================================================================
diff -u -rf7553872983e440277cae7f84b386ff195d7c394 -r886964fa2bf6a5bb61b33b8b5547f3d0c585b360
--- firmware/App/Modes/FPModes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision f7553872983e440277cae7f84b386ff195d7c394)
+++ firmware/App/Modes/FPModes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision 886964fa2bf6a5bb61b33b8b5547f3d0c585b360)
@@ -243,54 +243,6 @@
 
 /*********************************************************************//**
  * @brief
- * The validateGenPermeateChangeReq 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 validateGenPermeateChangeReq( U32 newSubMode )
-{
-    BOOL result = FALSE;
-
-    // TODO add validation logic
-    result = TRUE;
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The signalNewGenPermeateSubMode function requests transition to
- * a new Gen Permeate sub mode.
- * @details \b Inputs: none
- * @details \b Outputs: none
- * @return none
- *************************************************************************/
-void signalNewGenPermeateSubMode( U32 newSubMode )
-{
-    FP_GENP_MODE_STATE_T reqSubMode = (FP_GENP_MODE_STATE_T)newSubMode;
-
-    if ( reqSubMode < NUM_OF_FP_GENP_MODE_STATES )
-    {
-        genPermeateState = reqSubMode;
-        // handle the prerequisite if any
-        switch ( reqSubMode )
-        {
-            case FP_GENP_TANK_FILL_STATE:
-                break;
-
-            case FP_GENP_TANK_FULL_STATE:
-                break;
-            default:
-                break;
-        }
-        setModeGenPTransition( reqSubMode );
-    }
-}
-
-/*********************************************************************//**
- * @brief
  * The getTankFullAlarmTimeout function returns the tank full alarm timeout
  * @details \b Inputs: none
  * @details \b Outputs: tankFullAlarmTimeout
@@ -560,4 +512,59 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testValidateGenPermeateChangeReq 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 testValidateGenPermeateChangeReq( U32 newSubMode )
+{
+    BOOL result = FALSE;
+
+    if ( newSubMode < NUM_OF_FP_GENP_MODE_STATES )
+    {
+        switch ( newSubMode )
+        {
+            case FP_GENP_TANK_FILL_STATE:
+            case FP_GENP_TANK_FULL_STATE:
+            default:
+                result = TRUE;
+                break;
+        }
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testSignalNewGenPermeateSubMode function requests transition to
+ * a new Gen Permeate sub mode.
+ * @details \b Inputs: none
+ * @details \b Outputs: none
+ * @param newSubMode the enumerated sub state of the mode.
+ * @return none
+ *************************************************************************/
+void testSignalNewGenPermeateSubMode( U32 newSubMode )
+{
+    if ( newSubMode < NUM_OF_FP_GENP_MODE_STATES )
+    {
+        genPermeateState = (FP_GENP_MODE_STATE_T)newSubMode;
+        // handle the prerequisite if any
+        switch ( newSubMode )
+        {
+            // Any of these state require no special handling
+            case FP_GENP_TANK_FILL_STATE:
+            case FP_GENP_TANK_FULL_STATE:
+            default:
+                break;
+        }
+        setModeGenPTransition( genPermeateState );
+    }
+}
+
 /**@}*/