Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -rae7ff6466ac1225cb5998990cc5163edc53ce003 -rb70bf4c5a7cdb4218d812546b3bc5d7dad152700
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision ae7ff6466ac1225cb5998990cc5163edc53ce003)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision b70bf4c5a7cdb4218d812546b3bc5d7dad152700)
@@ -116,13 +116,22 @@
 /*********************************************************************//**
  * @brief
  * The getSampleWaterResult function returns the result from sample water testing.
- * @details Inputs: sampleWaterPassed
+ * @details Inputs: sampleWaterResult
  * @details Outputs: none
- * @return TRUE if sample water result passed, otherwise FALSE
+ * @return water sample self-test status
  *************************************************************************/
-BOOL getSampleWaterResult( void )
+SELF_TEST_STATUS_T getSampleWaterResult( void )
 {
-    return sampleWaterResult;
+    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_FAILED;
+
+#ifndef SKIP_SAMPLE_WATER
+    if ( TRUE == sampleWaterResult )
+#endif
+    {
+        result = SELF_TEST_STATUS_PASSED;
+    }
+
+    return result;
 }
 
 /*********************************************************************//**