Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r7bd4510581254bc4e7292159c630a95b6ab4b368 -rcef8149cb8dfbd5c91c32f5318334c5db2366f7e
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 7bd4510581254bc4e7292159c630a95b6ab4b368)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision cef8149cb8dfbd5c91c32f5318334c5db2366f7e)
@@ -2065,8 +2065,7 @@
  *************************************************************************/
 U16 getFPGATimerCount( void )
 {
-    //return fpgaSensorReadings.fpgaTimerCountMS; // Commented for testing ONLY. TODO: uncomment DN-20SEPT2022
-    return fpgaSensorReadings.fpgaTimerCountMS + 5; // + 5 for tetsing ONLY. TODO: remove this line. DN-20SEPT2022
+    return fpgaSensorReadings.fpgaTimerCountMS;
 }
 
 /*********************************************************************//**
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r7bd4510581254bc4e7292159c630a95b6ab4b368 -rcef8149cb8dfbd5c91c32f5318334c5db2366f7e
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 7bd4510581254bc4e7292159c630a95b6ab4b368)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision cef8149cb8dfbd5c91c32f5318334c5db2366f7e)
@@ -52,10 +52,8 @@
 #define MSG_NOT_ACKED_MAX_RETRIES       3                                   ///< maximum number of times a message that requires ACK that was not ACK'd can be re-sent before alarm
 #define PENDING_ACK_LIST_SIZE           25                                  ///< maximum number of Delanli messages that can be pending ACK at any given time
 
-//#define MAX_FPGA_CLOCK_SPEED_ERRORS             3                           ///< maximum number of FPGA clock speed errors within window period before alarm - // DN-16SEPT2022 TOSO: uncomment this line.
-#define MAX_FPGA_CLOCK_SPEED_ERRORS             1                           ///< maximum number of FPGA clock speed errors within window period before alarm - // ToDO: remove this line.  DN-16SEPT2022
-//#define MAX_FPGA_CLOCK_SPEED_ERROR_WINDOW_MS    (10 * SEC_PER_MIN * MS_PER_SECOND)    ///< FPGA clock speed error window - // TODO: uncomment it - DN-19SEPT2022
-#define MAX_FPGA_CLOCK_SPEED_ERROR_WINDOW_MS    (1 * SEC_PER_MIN * MS_PER_SECOND)    ///< FPGA clock speed error window - // TODO: Force 1 minute for testing ONLY. remove it - DN-19SEPT2022
+#define MAX_FPGA_CLOCK_SPEED_ERRORS             3                           ///< maximum number of FPGA clock speed errors within window period before alarm
+#define MAX_FPGA_CLOCK_SPEED_ERROR_WINDOW_MS    (10 * SEC_PER_MIN * MS_PER_SECOND)    ///< FPGA clock speed error window
 
 #pragma pack(push, 1)
 
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -rb9d28fa9e2605dbb331da473fcf166dbf5346be5 -rcef8149cb8dfbd5c91c32f5318334c5db2366f7e
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision b9d28fa9e2605dbb331da473fcf166dbf5346be5)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision cef8149cb8dfbd5c91c32f5318334c5db2366f7e)
@@ -120,6 +120,9 @@
 
     // Heaters controller
     execHeaters();
+
+    // Monitor RAM error status
+     execRAMMonitor();
 #endif
 
     // Run non-volatile data management state machine that sends the data record
@@ -129,9 +132,6 @@
     // Run alarm management
     execAlarmMgmt();
 
-    // Monitor RAM error status
-    execRAMMonitor();
-
     // manage data to be transmitted to other sub-systems
     execSystemCommTx();