Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -rb831c4f803bd92f6a16f854e3d02222fe76a379e -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision b831c4f803bd92f6a16f854e3d02222fe76a379e)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -16,13 +16,14 @@
 
 //#include "gio.h"
 
-#include "Common.h"
 #include "AlarmLamp.h"
 #include "BloodFlow.h"
 #include "DialInFlow.h"
+#include "DialOutFlow.h"
 #include "OperationModes.h"
 #include "PresOccl.h"
 #include "SystemComm.h"
+#include "SystemCommMessages.h"
 #include "WatchdogMgmt.h"
 #include "TaskGeneral.h"
 #include "RTC.h"
@@ -55,31 +56,46 @@
     execSystemCommRx();
 
     // prevent most processing until UI has started communicating
-#ifndef RM46_EVAL_BOARD_TARGET
+#ifndef SIMULATE_UI
     if ( TRUE == uiCommunicated() )
 #endif
     {
+#ifndef CAN_TEST
         // monitor pressure/occlusion sensors
         execPresOccl();
+#endif
 
         // run operation mode state machine
         execOperationModes();
 
+#ifdef CAN_TEST
+        {
+            static U32 canTestCtr = 0;
+            if ( ++canTestCtr >= 2 )
+            {
+                broadcastCANTest1LargeFrequentMessage();
+                canTestCtr = 0;
+            }
+        }
+#else
         // control blood pump
         execBloodFlowController();
 
         // control dialysate inlet pump
         execDialInFlowController();
 
-        // Control RTC
-        // After CommRx and and before execOperationModes()
+        // control dialysate outlet pump
+        execDialOutFlowController();
+
+        // manage RTC
         execRTC();
 
         // manage alarm state
         execAlarmMgmt();
 
         // control alarm lamp
         execAlarmLamp();
+#endif
 
 #ifdef RM46_EVAL_BOARD_TARGET
         if ( getUserButtonState() == PIN_SIGNAL_LOW )