Index: firmware/source/sys_main.c
===================================================================
diff -u -re581f1fc8ebdcb834799d936357b1f17a06b741c -r5b7121b237be1970c0a040809503ff5786e6da0d
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision e581f1fc8ebdcb834799d936357b1f17a06b741c)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 5b7121b237be1970c0a040809503ff5786e6da0d)
@@ -46,6 +46,7 @@
 /* USER CODE END */
 
 /* Include Files */
+
 #include "sys_common.h"
 
 /* USER CODE BEGIN (1) */
@@ -68,16 +69,13 @@
 #include "DDCommon.h"
 #include "DialysatePumps.h"
 #include "FpgaDD.h"
+#include "FPInterface.h"
 #include "Heaters.h"
 #include "Interrupts.h"
 #include "Level.h"
 #include "MsgQueues.h"
 #include "OperationModes.h"
-#ifdef __PUMPTEST__
-#include "PistonPumpControl.h"
-#endif
 #include "Pressure.h"
-#include "ROInterface.h"
 #include "SafetyShutdown.h"
 #include "SystemCommDD.h"
 #include "TaskBG.h"
@@ -183,12 +181,9 @@
     initOperationModes();
     initTestConfigs();
     initTDInterface();
-    initROInterface();
+    initFPInterface();
     initUltrafiltration();
     initBloodLeak();
-#ifdef __PUMPTEST__
-    initPistonPump();
-#endif
 }
 
 /*************************************************************************