Index: dialin/dg/calibration_record.py
===================================================================
diff -u -rc4776c1885f259b231532ef5ba7e904178cd0005 -r5a634c567871a6855667341464bac9e057cd2b93
--- dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision c4776c1885f259b231532ef5ba7e904178cd0005)
+++ dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision 5a634c567871a6855667341464bac9e057cd2b93)
@@ -69,7 +69,7 @@
 
         @return: True if successful, False otherwise
         """
-        self._prepare_dg_calibration_record()
+        self.dg_calibration_record = self._prepare_dg_calibration_record()
         self.dg_calibration_record = self._utilities.reset_fw_record(self.dg_calibration_record)
         status = self.cmd_set_dg_calibration_record(self.dg_calibration_record)
 
Index: dialin/dg/service_record.py
===================================================================
diff -u -r47eb368c929e01fbff7d7749a822ee0efb467ea5 -r5a634c567871a6855667341464bac9e057cd2b93
--- dialin/dg/service_record.py	(.../service_record.py)	(revision 47eb368c929e01fbff7d7749a822ee0efb467ea5)
+++ dialin/dg/service_record.py	(.../service_record.py)	(revision 5a634c567871a6855667341464bac9e057cd2b93)
@@ -64,7 +64,7 @@
 
         @return: True if successful, False otherwise
         """
-        self._prepare_dg_service_record()
+        self.dg_service_record = self._prepare_dg_service_record()
         self.dg_service_record = self._utilities.reset_fw_system_service_record(self.dg_service_record)
         status = self.cmd_set_dg_service_record(self.dg_service_record)
 
@@ -226,7 +226,7 @@
         groups_byte_size = 0
         service_records = OrderedDict({'service_record':
                                       {'service_location': ['<B', self._DEFAULT_SERVICE_LOCATION],
-                                       'last_service_date': ['<i', self._DEFAULT_TIME_VALUE],
+                                       'service_date': ['<i', self._DEFAULT_TIME_VALUE],
                                        'service_interval': ['<i', self._DEFAULT_SERVICE_INTERVAL_S],
                                        'crc': ['<H', self._DEFAULT_CRC_VALUE]}})
 
Index: dialin/dg/switches.py
===================================================================
diff -u -rc4776c1885f259b231532ef5ba7e904178cd0005 -r5a634c567871a6855667341464bac9e057cd2b93
--- dialin/dg/switches.py	(.../switches.py)	(revision c4776c1885f259b231532ef5ba7e904178cd0005)
+++ dialin/dg/switches.py	(.../switches.py)	(revision 5a634c567871a6855667341464bac9e057cd2b93)
@@ -12,8 +12,8 @@
 
 @unique
 class DGSwitchStatus(DialinEnum):
-    OFF = 0
-    ON = 1
+    CLOSED = 0
+    OPEN = 1
 
 
 @unique
@@ -43,9 +43,9 @@
             msg_id = MsgIds.MSG_ID_DG_SWITCHES_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_switches_sync)
 
-        self.dg_switches_status = {DGSwitchesName.CONCENTRATE_CAP.name: DGSwitchStatus.OFF.value,
-                                   DGSwitchesName.DIALYSATE_CAP.name: DGSwitchStatus.OFF.value,
-                                   DGSwitchesName.FLUID_DOOR.name: DGSwitchStatus.OFF.value}
+        self.dg_switches_status = {DGSwitchesName.CONCENTRATE_CAP.name: DGSwitchStatus.CLOSED.value,
+                                   DGSwitchesName.DIALYSATE_CAP.name: DGSwitchStatus.CLOSED.value,
+                                   DGSwitchesName.FLUID_DOOR.name: DGSwitchStatus.CLOSED.value}
 
     def get_switches_status(self) -> dict:
         """
Index: dialin/dg/system_record.py
===================================================================
diff -u -r47eb368c929e01fbff7d7749a822ee0efb467ea5 -r5a634c567871a6855667341464bac9e057cd2b93
--- dialin/dg/system_record.py	(.../system_record.py)	(revision 47eb368c929e01fbff7d7749a822ee0efb467ea5)
+++ dialin/dg/system_record.py	(.../system_record.py)	(revision 5a634c567871a6855667341464bac9e057cd2b93)
@@ -67,7 +67,7 @@
 
         @return: True if successful, False otherwise
         """
-        self._prepare_dg_system_record()
+        self.dg_system_record = self._prepare_dg_system_record()
         self.dg_system_record = self._utilities.reset_fw_system_service_record(self.dg_system_record)
         status = self.cmd_set_dg_system_record(self.dg_system_record)
 
Index: dialin/hd/calibration_record.py
===================================================================
diff -u -r47eb368c929e01fbff7d7749a822ee0efb467ea5 -r5a634c567871a6855667341464bac9e057cd2b93
--- dialin/hd/calibration_record.py	(.../calibration_record.py)	(revision 47eb368c929e01fbff7d7749a822ee0efb467ea5)
+++ dialin/hd/calibration_record.py	(.../calibration_record.py)	(revision 5a634c567871a6855667341464bac9e057cd2b93)
@@ -68,7 +68,7 @@
 
         @return: True if successful, False otherwise
         """
-        self._prepare_hd_calibration_record()
+        self.hd_calibration_record = self._prepare_hd_calibration_record()
         self.hd_calibration_record = self._utilities.reset_fw_record(self.hd_calibration_record)
         status = self.cmd_set_hd_calibration_record(self.hd_calibration_record)
 
Index: dialin/hd/service_record.py
===================================================================
diff -u -r47eb368c929e01fbff7d7749a822ee0efb467ea5 -r5a634c567871a6855667341464bac9e057cd2b93
--- dialin/hd/service_record.py	(.../service_record.py)	(revision 47eb368c929e01fbff7d7749a822ee0efb467ea5)
+++ dialin/hd/service_record.py	(.../service_record.py)	(revision 5a634c567871a6855667341464bac9e057cd2b93)
@@ -68,8 +68,7 @@
 
         @return: True if successful, False otherwise
         """
-        self._prepare_hd_service_record()
-        print(self.hd_service_record)
+        self.hd_service_record = self._prepare_hd_service_record()
         self.hd_service_record = self._utilities.reset_fw_system_service_record(self.hd_service_record)
         status = self.cmd_set_hd_service_record(self.hd_service_record)
 
Index: dialin/hd/switches.py
===================================================================
diff -u -r452264e8979100b5110f8629aee08168ad509fb0 -r5a634c567871a6855667341464bac9e057cd2b93
--- dialin/hd/switches.py	(.../switches.py)	(revision 452264e8979100b5110f8629aee08168ad509fb0)
+++ dialin/hd/switches.py	(.../switches.py)	(revision 5a634c567871a6855667341464bac9e057cd2b93)
@@ -12,13 +12,14 @@
 
 @unique
 class HDSwitchStatus(DialinEnum):
-    OFF = 0
-    ON = 1
+    CLOSED = 0
+    OPEN = 1
 
 
 @unique
 class HDSwitchesNames(DialinEnum):
     FRONT_DOOR = 0
+    PUMP_TRACK_SWITCH = 1
 
 
 class HDSwitches(_AbstractSubSystem):
@@ -42,7 +43,8 @@
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_switches_sync)
 
-        self.hd_switches_status = {HDSwitchesNames.FRONT_DOOR.name: HDSwitchStatus.OFF.value}
+        self.hd_switches_status = {HDSwitchesNames.FRONT_DOOR.name: HDSwitchStatus.CLOSED.value,
+                                   HDSwitchesNames.PUMP_TRACK_SWITCH.name: HDSwitchStatus.CLOSED.value}
 
     def get_switches_status(self) -> dict:
         """
@@ -62,8 +64,11 @@
         """
         front_door = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
+        pump_track = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
 
         self.hd_switches_status[HDSwitchesNames.FRONT_DOOR.name] = HDSwitchStatus(front_door).value
+        self.hd_switches_status[HDSwitchesNames.PUMP_TRACK_SWITCH.name] = HDSwitchStatus(pump_track).value
 
     def cmd_hd_switch_status_override(self, switch: int, status: int, reset: int = NO_RESET) -> int:
         """
Index: dialin/hd/system_record.py
===================================================================
diff -u -r5b95fe318aeec36597d8fbbdbba1d54b1d48f380 -r5a634c567871a6855667341464bac9e057cd2b93
--- dialin/hd/system_record.py	(.../system_record.py)	(revision 5b95fe318aeec36597d8fbbdbba1d54b1d48f380)
+++ dialin/hd/system_record.py	(.../system_record.py)	(revision 5a634c567871a6855667341464bac9e057cd2b93)
@@ -69,7 +69,7 @@
 
         @return: True if successful, False otherwise
         """
-        self._prepare_hd_system_record()
+        self.hd_system_record = self._prepare_hd_system_record()
         self.hd_system_record = self._utilities.reset_fw_system_service_record(self.hd_system_record)
         status = self.cmd_set_hd_system_record(self.hd_system_record)
 
Index: tests/dg_hd_switches_test.py
===================================================================
diff -u -rc4776c1885f259b231532ef5ba7e904178cd0005 -r5a634c567871a6855667341464bac9e057cd2b93
--- tests/dg_hd_switches_test.py	(.../dg_hd_switches_test.py)	(revision c4776c1885f259b231532ef5ba7e904178cd0005)
+++ tests/dg_hd_switches_test.py	(.../dg_hd_switches_test.py)	(revision 5a634c567871a6855667341464bac9e057cd2b93)
@@ -35,7 +35,7 @@
         while True:
 
             print(dg.switches.get_switches_status())
-            sleep(1)
+            sleep(0.1)
 
 
 if __name__ == "__main__":
Index: tests/test_hd_dg_fans.py
===================================================================
diff -u -r5b95fe318aeec36597d8fbbdbba1d54b1d48f380 -r5a634c567871a6855667341464bac9e057cd2b93
--- tests/test_hd_dg_fans.py	(.../test_hd_dg_fans.py)	(revision 5b95fe318aeec36597d8fbbdbba1d54b1d48f380)
+++ tests/test_hd_dg_fans.py	(.../test_hd_dg_fans.py)	(revision 5a634c567871a6855667341464bac9e057cd2b93)
@@ -1,6 +1,7 @@
 
 from dialin import HD
 from dialin.hd.temperatures import HDTemperaturesNames
+from time import sleep
 
 
 def test_fans_info():
@@ -23,5 +24,7 @@
     if hd.cmd_log_in_to_hd() == 0:
         exit(1)
 
-    fans = test_fans_info()
-    print(fans)
\ No newline at end of file
+    while True:
+        fans = test_fans_info()
+        print(fans)
+        sleep(1)
\ No newline at end of file