Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r322747d530c1b8205be257557e53dcfe9caad50a -rf8bb43e62a4d10b64d8b197e372a56adfcfb88b9
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 322747d530c1b8205be257557e53dcfe9caad50a)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision f8bb43e62a4d10b64d8b197e372a56adfcfb88b9)
@@ -352,13 +352,11 @@
                 concentratePumps[ pumpId ].execState = handleConcentratePumpControlTargetSpeedState( pumpId );
                 break;
 
-#ifndef _VECTORCAST_
             // The switch case is in a for loop so the default case cannot be covered in VectorCAST
             default:
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_CONCENTRATE_PUMP_EXEC_INVALID_STATE, pumpId )
                 concentratePumps[ pumpId ].execState = CONCENTRATE_PUMP_OFF_STATE;
                 break;
-#endif
         }
     }
 }
Index: firmware/App/Controllers/DialysatePumps.c
===================================================================
diff -u -r322747d530c1b8205be257557e53dcfe9caad50a -rf8bb43e62a4d10b64d8b197e372a56adfcfb88b9
--- firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision 322747d530c1b8205be257557e53dcfe9caad50a)
+++ firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision f8bb43e62a4d10b64d8b197e372a56adfcfb88b9)
@@ -539,12 +539,10 @@
                 dialysatePumps[ pumpId ].dialysatePumpState = handleDialysatePumpControlToTargetState( pumpId );
                 break;
 
-#ifndef _VECTORCAST_
             default:
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_DIALYSATE_PUMP_EXEC_INVALID_STATE, pumpId )
                 dialysatePumps[ pumpId ].dialysatePumpState = DIALYSATE_PUMP_OFF_STATE;
                 break;
-#endif
         }
     }
 }
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r322747d530c1b8205be257557e53dcfe9caad50a -rf8bb43e62a4d10b64d8b197e372a56adfcfb88b9
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 322747d530c1b8205be257557e53dcfe9caad50a)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision f8bb43e62a4d10b64d8b197e372a56adfcfb88b9)
@@ -780,4 +780,5 @@
 
     return result;
 }
+
 /**@}*/
Index: firmware/source/sys_main.c
===================================================================
diff -u -r313982ccc772f1bbe182877dff7e00381b04e0f4 -rf8bb43e62a4d10b64d8b197e372a56adfcfb88b9
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 313982ccc772f1bbe182877dff7e00381b04e0f4)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision f8bb43e62a4d10b64d8b197e372a56adfcfb88b9)
@@ -72,7 +72,9 @@
 #include "Level.h"
 #include "MsgQueues.h"
 #include "OperationModes.h"
+#ifdef __PUMPTEST__
 #include "PistonPumpControl.h"
+#endif
 #include "Pressure.h"
 #include "ROInterface.h"
 #include "SafetyShutdown.h"