Index: firmware/App/Controllers/SyringePump.h
===================================================================
diff -u -r22293ecac97c3f374f90bb20e3c4cc03fbd27f9d -r9e43275cfdf3f60042d69d9cbbfc6d74142fa5e5
--- firmware/App/Controllers/SyringePump.h	(.../SyringePump.h)	(revision 22293ecac97c3f374f90bb20e3c4cc03fbd27f9d)
+++ firmware/App/Controllers/SyringePump.h	(.../SyringePump.h)	(revision 9e43275cfdf3f60042d69d9cbbfc6d74142fa5e5)
@@ -147,31 +147,19 @@
 BOOL isSyringePumpPreLoaded( void );
 F32  getSyringePumpVolumeDelivered( void );
 
-BOOL testSetSyringePumpDataPublishIntervalOverride( U32 value );
-BOOL testResetSyringePumpDataPublishIntervalOverride( void );
 BOOL testSyringePumpOperationRequest( SYRINGE_PUMP_OP_PAYLOAD_T opParams );
-BOOL testSetSyringePumpMeasuredRateOverride( F32 value );
-BOOL testResetSyringePumpMeasuredRateOverride( void );
-BOOL testSetHeprinBolusTargetRateOverride( F32 value );
-BOOL testResetHeprinBolusTargetRateOverride( void );
-BOOL testSetSyringePumpMeasuredForceOverride( F32 value );
-BOOL testResetSyringePumpMeasuredForceOverride( void );
-BOOL testSetSyringePumpMeasuredSyringeDetectOverride( F32 value );
-BOOL testResetSyringePumpMeasuredSyringeDetectOverride( void );
-BOOL testSetSyringePumpMeasuredHomeOverride( F32 value );
-BOOL testResetSyringePumpMeasuredHomeOverride( void );
-BOOL testSetSyringePumpMeasuredPositionOverride( S32 value );
-BOOL testResetSyringePumpMeasuredPositionOverride( void );
-BOOL testSetSyringePumpMeasuredVolumeOverride( F32 value );
-BOOL testResetSyringePumpMeasuredVolumeOverride( void );
-BOOL testSetSyringePumpStatus( U32 status );
-BOOL testResetSyringePumpStatus( void );
-BOOL testSetSyringePumpEncoderStatus( U32 status );
-BOOL testResetSyringePumpEncoderStatus( void );
-BOOL testSetSyringePumpADCandDACStatus( U32 status );
-BOOL testResetSyringePumpADCandDACStatus( void );
-BOOL testSetSyringePumpADCReadCounter( U32 ctr );
-BOOL testResetSyringePumpADCReadCounter( void );
+BOOL testSyringePumpDataPublishIntervalOverride( MESSAGE_T *message );
+BOOL testSyringePumpMeasuredRateOverride( MESSAGE_T *message );
+BOOL testHeprinBolusTargetRateOverride( MESSAGE_T *message );
+BOOL testSyringePumpMeasuredForceOverride( MESSAGE_T *message );
+BOOL testSyringePumpMeasuredSyringeDetectOverride( MESSAGE_T *message );
+BOOL testSyringePumpMeasuredHomeOverride( MESSAGE_T *message );
+BOOL testSyringePumpMeasuredPositionOverride( MESSAGE_T *message );
+BOOL testSyringePumpMeasuredVolumeOverride( MESSAGE_T *message );
+BOOL testSyringePumpStatus( MESSAGE_T *message );
+BOOL testSyringePumpEncoderStatus( MESSAGE_T *message );
+BOOL testSyringePumpADCandDACStatus( MESSAGE_T *message );
+BOOL testSyringePumpADCReadCounter( MESSAGE_T *message );
 
 /**@}*/