Index: firmware/source/sys_main.c
===================================================================
diff -u -r1c2f96bf994157b11c0c32ddaf96fc91a9a1da1d -rd9c2c8e146f20a2acefb9ac1f6497536fb2c404e
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 1c2f96bf994157b11c0c32ddaf96fc91a9a1da1d)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision d9c2c8e146f20a2acefb9ac1f6497536fb2c404e)
@@ -68,10 +68,10 @@
 #include "ConductivitySensors.h"
 #include "ConcentratePumps.h"
 #include "CPLD.h"
-#include "DialysateFlow.h"
 #include "DrainPump.h"
 #include "Fans.h"
 #include "FluidLeak.h"
+#include "FlowSensors.h"
 #include "FPGA.h"
 #include "Heaters.h"
 #include "Integrity.h"
@@ -92,6 +92,7 @@
 #include "TemperatureSensors.h"
 #include "Thermistors.h"
 #include "Timers.h"
+#include "Utilities.h"
 #include "UVReactors.h"
 #include "Valves.h"
 #include "Voltages.h"
@@ -170,6 +171,7 @@
  *************************************************************************/
 static void initSoftware( void )
 {
+    initSemaphores();
     initTimers();
     initSafetyShutdown();
     initCPLD();
@@ -178,7 +180,7 @@
     initInterrupts();
     initFPGA();
     initInternalADC();
-    initDialysateFlowMeter();
+    initFlowSensors();
     initPressures();
     initLoadCell();
     initNVDataMgmt();
@@ -203,6 +205,7 @@
     initFluidLeak();
     initOperationModes();
     initIntegrity();
+    initTestConfigs();
 }
 
 /*************************************************************************