Index: firmware/App/Modes/FPModes/FPOperationModes.c
===================================================================
diff -u -rd210786d6c7d75bb0b4d9e18efc40a01d85123fe -r46e6d3bf0ebcc13a0b709c2de317d209119b61be
--- firmware/App/Modes/FPModes/FPOperationModes.c	(.../FPOperationModes.c)	(revision d210786d6c7d75bb0b4d9e18efc40a01d85123fe)
+++ firmware/App/Modes/FPModes/FPOperationModes.c	(.../FPOperationModes.c)	(revision 46e6d3bf0ebcc13a0b709c2de317d209119b61be)
@@ -403,11 +403,17 @@
  * @brief
  * The isFPDefeatured function returns if the Leahi device is defeatured.
  * @details \b Inputs: none
- * @details \b Outputs: none
+ * @details \b Outputs: isDeviceDefeatured
  * @return TRUE if FP device is de-featured, FALSE if not.
  *************************************************************************/
 BOOL isFPDefeatured( void )
 {
+    // TODO decide whether we need this test config even after NVM is defined
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_FP_ENABLE_DEFEATURE ) )
+    {
+        isDeviceDefeatured = TRUE;
+    }
+
     // TODO - pull status from NV mem.
     return isDeviceDefeatured;
 }
@@ -417,11 +423,17 @@
  * The isBoostPumpInstalled function returns if the Leahi device
  * has a boost pump installed.
  * @details \b Inputs: none
- * @details \b Outputs: none
+ * @details \b Outputs: isBoostInstalled
  * @return TRUE if FP device is contains a boost pump, FALSE if not.
  *************************************************************************/
 BOOL isBoostPumpInstalled( void )
 {
+    // TODO decide whether we need this test config even after NVM is defined
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_FP_ENABLE_BOOST_PUMP ) )
+    {
+        isBoostInstalled = TRUE;
+    }
+
     // TODO - pull status from NV mem.
     return isBoostInstalled;
 }