Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -r8e21697ca3dcab4150ed9945c5ab70d787c673f7
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 8e21697ca3dcab4150ed9945c5ab70d787c673f7)
@@ -532,12 +532,12 @@
             {
                 signalCANXmitsCompleted();
                 // TODO - shouldn't get here, but let's see if we do
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_SOFTWARE_FAULT, (U32)mBox )
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, (U32)mBox )
             }
         }
         else
         {   // TODO - shouldn't get here - just testing - set first data to new s/w fault enum later
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, (U32)buffer, (U32)dataSize )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, (U32)buffer, (U32)dataSize )
         }
     }
 
@@ -1087,6 +1087,7 @@
 
             case MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE:
                 handleTestDGSafetyShutdownOverrideRequest( message );
+                break;
 
             case MSG_ID_TEMPERATURE_SENSORS_VALUE_OVERRIDE:
                 handleTestTemperatureSensorsOverrideRequest ( message );
@@ -1098,8 +1099,16 @@
 
             case MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE:
                 handleTestHeatersDataPublishOverrideRequest ( message );
-                break;
+                break;
 
+            case MSG_ID_CONDUCTIVITY_OVERRIDE:
+                handleTestSetConductivityOverrideRequest ( message );
+                break;
+
+            case MSG_ID_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestSetConductivityDataPublishIntervalOverrideRequest ( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;