Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r49a4a0ea2ccfcc6b583330d4aad064d9176697f4 -ra72cc92cae2b043fadc8ed9a1d065cfb403185a0
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 49a4a0ea2ccfcc6b583330d4aad064d9176697f4)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision a72cc92cae2b043fadc8ed9a1d065cfb403185a0)
@@ -170,7 +170,7 @@
 {
     VALVE_POSITION_T commandedPosition;                         ///< Valve commanded position enum
     VALVE_POSITION_T currentPosition;                           ///< Valve current position enum
-    VALVE_POSITION_T pendingCommandedPosition;                           ///< Valve pending position enum
+    VALVE_POSITION_T pendingCommandedPosition;                  ///< Valve pending position enum
     OVERRIDE_S32_T   currentPositionInCounts;                   ///< Valve current position in counts
     S16              targetPositionInCounts;                    ///< Valve target position in counts
     BOOL             hasTransitionBeenRequested;                ///< Valve transition request flag
@@ -334,7 +334,6 @@
     // All the other positions are valid
     if ( ( position != VALVE_POSITION_NOT_IN_POSITION ) && ( valve < NUM_OF_VALVES ) )
     {
-        //valvesStatus[ valve ].commandedPosition = position; TODO remove
         valvesStatus[ valve ].pendingCommandedPosition   = position;
         valvesStatus[ valve ].hasTransitionBeenRequested = TRUE;
         result = TRUE;
@@ -846,15 +845,12 @@
     {
         // The valve is in range. Set the current position to the commanded position
         valvesStatus[ valve ].currentPosition = commandedPositionEnum;
-        // Set the transition request to false as it has been serviced
-        //valvesStatus[ valve ].hasTransitionBeenRequested = FALSE; TODO remove
 
         // If we are in Pos B, enable current relaxation
         if ( commandedPositionEnum == VALVE_POSITION_B_OPEN )
         {
             // Enable current relaxation
             setFPGAValveSetPoint( valve, currentPosition, TRUE );
-            //valvesStatus[ valve ].hasTransitionBeenRequested = TRUE; TODO remove
         }
 
         // Go back to Idle state
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r3a480399e9fd87f51a12a469cc56242ebeb93539 -ra72cc92cae2b043fadc8ed9a1d065cfb403185a0
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 3a480399e9fd87f51a12a469cc56242ebeb93539)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision a72cc92cae2b043fadc8ed9a1d065cfb403185a0)
@@ -145,8 +145,7 @@
             break;
 
         case POST_STATE_WATCHDOG:
-            //testStatus = execWatchdogTest();
-            testStatus = SELF_TEST_STATUS_PASSED; // Why is this not passing in unit 4?
+            testStatus = execWatchdogTest();
             postState = handlePOSTStatus( testStatus );
             break;
 
@@ -218,8 +217,7 @@
             break;
 
         case POST_STATE_UI_POST:
-            //testStatus = execUITest();
-            testStatus = SELF_TEST_STATUS_PASSED; // TODO why is this failing in unit 4?
+            testStatus = execUITest();
             postState = handlePOSTStatus( testStatus );
             break;
 
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -re250309026d33ff57fd00d74ccc05b1595610656 -ra72cc92cae2b043fadc8ed9a1d065cfb403185a0
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision e250309026d33ff57fd00d74ccc05b1595610656)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision a72cc92cae2b043fadc8ed9a1d065cfb403185a0)
@@ -1306,6 +1306,10 @@
             handleHDUsageInfoRequest( message );
             break;
 
+        case MSG_ID_HD_STOP_RTC_CLOCK:
+            handleStopHDRTCClock( message );
+            break;
+
         // NOTE: this always must be the last case
         case MSG_ID_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -re250309026d33ff57fd00d74ccc05b1595610656 -ra72cc92cae2b043fadc8ed9a1d065cfb403185a0
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e250309026d33ff57fd00d74ccc05b1595610656)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a72cc92cae2b043fadc8ed9a1d065cfb403185a0)
@@ -7853,7 +7853,7 @@
 
     if ( 0 == message->hdr.payloadLen )
     {
-        testSetStopRTC();
+        result = testSetStopRTC();
     }
 
     // respond to request