Index: leahi_dialin/common/test_config_defs.py
===================================================================
diff -u -r2ffe92ffe2ea7393b49bb5e28db6cd276e15eb87 -r3b5cc3a0277570a12df2ec7d5f6a6b54ce70f40b
--- leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision 2ffe92ffe2ea7393b49bb5e28db6cd276e15eb87)
+++ leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision 3b5cc3a0277570a12df2ec7d5f6a6b54ce70f40b)
@@ -22,18 +22,17 @@
 class DDTestConfigOptions(DialinEnum):
     TEST_CONFIG_DISABLE_BC_PRES_ALARM =  0                      # Test configuration to disable Balancing Chamber pressure alarms
     TEST_CONFIG_ENABLE_NEXT_GEN_HW = 1                          # Test configuration to switch to HW in development
-    TEST_CONFIG_ENABLE_DIENER_1000_SENSOR = 2                   # Test configuration to use Diener 1000 sensor instead of Diener 2000
+    TEST_CONFIG_USE_DIENER_1000_PUMP = 2                        # Test configuration to use Diener 1000 concentracte pump instead of Diener 2000
     TEST_CONFIG_DISABLE_CHAMBER_H_FILL = 3                      # Test configuration to disable Chamber H fill in case if D46 sensor is disabled
     TEST_CONFIG_DISABLE_CHAMBER_F_FILL = 4                      # Test configuration to disable Chamber F fill in case if D63 and D98 sensor is disabled
     NUM_OF_TEST_CONFIGS = 5                                     # Number of Test Configs
 
 @unique
 class FPTestConfigOptions(DialinEnum):
-    TEST_CONFIG_BETA_HW = 0                                     # Test configuration using Beta Hardware
+    TEST_CONFIG_ENABLE_NEXT_GEN_HW = 0                          # Test configuration to switch to HW in development
     NUM_OF_TEST_CONFIGS = 1                                     # Number of Test Configs
 
 @unique
 class TDTestConfigOptions(DialinEnum):
-    TEST_CONFIG_FIRST = 0                                       # First test configuration (placeholder)
+    TEST_CONFIG_ENABLE_NEXT_GEN_HW = 0                          # Test configuration to switch to HW in development
     NUM_OF_TEST_CONFIGS = 1                                     # Number of Test Configs
-
Index: leahi_dialin/dd/modules/gen_dialysate.py
===================================================================
diff -u -r5681154cdaaf629c997dc05472657bf40c94d6e1 -r3b5cc3a0277570a12df2ec7d5f6a6b54ce70f40b
--- leahi_dialin/dd/modules/gen_dialysate.py	(.../gen_dialysate.py)	(revision 5681154cdaaf629c997dc05472657bf40c94d6e1)
+++ leahi_dialin/dd/modules/gen_dialysate.py	(.../gen_dialysate.py)	(revision 3b5cc3a0277570a12df2ec7d5f6a6b54ce70f40b)
@@ -75,9 +75,9 @@
         self.dialysate_delivery_in_progress = struct.unpack('I', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
         self.dialysate_good_to_deliver = struct.unpack('I', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
+            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
         self.targetQd = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0]
+            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
         self.dd_gen_dialysate_timestamp = timestamp
 
     def cmd_gen_dialysate_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: