Index: simulator/plugins/pretreatmentstates/interface.ui
===================================================================
diff -u -reb6acf9c1a4748852875c350568192999be9d3dd -rad05ce7c5ed604813d9fd6ba1ad487096c9729b8
--- simulator/plugins/pretreatmentstates/interface.ui	(.../interface.ui)	(revision eb6acf9c1a4748852875c350568192999be9d3dd)
+++ simulator/plugins/pretreatmentstates/interface.ui	(.../interface.ui)	(revision ad05ce7c5ed604813d9fd6ba1ad487096c9729b8)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>991</width>
-    <height>1161</height>
+    <height>1685</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -60,8 +60,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>957</width>
-        <height>1339</height>
+        <width>971</width>
+        <height>1633</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
@@ -70,13 +70,13 @@
          <property name="minimumSize">
           <size>
            <width>295</width>
-           <height>200</height>
+           <height>215</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
            <width>16777215</width>
-           <height>200</height>
+           <height>215</height>
           </size>
          </property>
          <property name="font">
@@ -174,6 +174,11 @@
            <string>7</string>
           </property>
          </row>
+         <row>
+          <property name="text">
+           <string>8</string>
+          </property>
+         </row>
          <column>
           <property name="text">
            <string>Pre-Treatment States (subMode) [HD_Pre_Treatment_Mode_States]</string>
@@ -206,61 +211,71 @@
          </item>
          <item row="2" column="0">
           <property name="text">
-           <string>HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE</string>
+           <string>HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE</string>
           </property>
          </item>
          <item row="2" column="1">
           <property name="text">
-           <string>Self tests with no cartridge state</string>
+           <string>Consumable self-tests state</string>
           </property>
          </item>
          <item row="3" column="0">
           <property name="text">
-           <string>HD_PRE_TREATMENT_CART_INSTALL_STATE</string>
+           <string>HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE</string>
           </property>
          </item>
          <item row="3" column="1">
           <property name="text">
-           <string>Consumable and cartridge installation state</string>
+           <string>Self tests with no cartridge state</string>
           </property>
          </item>
          <item row="4" column="0">
           <property name="text">
-           <string>HD_PRE_TREATMENT_SELF_TEST_DRY_STATE</string>
+           <string>HD_PRE_TREATMENT_CART_INSTALL_STATE</string>
           </property>
          </item>
          <item row="4" column="1">
           <property name="text">
-           <string>Self tests dry state</string>
+           <string>Consumable and cartridge installation state</string>
           </property>
          </item>
          <item row="5" column="0">
           <property name="text">
-           <string>HD_PRE_TREATMENT_PRIME_STATE</string>
+           <string>HD_PRE_TREATMENT_SELF_TEST_DRY_STATE</string>
           </property>
          </item>
          <item row="5" column="1">
           <property name="text">
-           <string>Prime blood and dialysate circuits and run wet self-tests state</string>
+           <string>Self tests dry state</string>
           </property>
          </item>
          <item row="6" column="0">
           <property name="text">
-           <string>HD_PRE_TREATMENT_RECIRCULATE_STATE</string>
+           <string>HD_PRE_TREATMENT_PRIME_STATE</string>
           </property>
          </item>
          <item row="6" column="1">
           <property name="text">
-           <string>Re-circulate blood and dialysate circuits state</string>
+           <string>Prime blood and dialysate circuits and run wet self-tests state</string>
           </property>
          </item>
          <item row="7" column="0">
           <property name="text">
-           <string>HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE</string>
+           <string>HD_PRE_TREATMENT_RECIRCULATE_STATE</string>
           </property>
          </item>
          <item row="7" column="1">
           <property name="text">
+           <string>Re-circulate blood and dialysate circuits state</string>
+          </property>
+         </item>
+         <item row="8" column="0">
+          <property name="text">
+           <string>HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE</string>
+          </property>
+         </item>
+         <item row="8" column="1">
+          <property name="text">
            <string>Patient connection state</string>
           </property>
          </item>
@@ -377,6 +392,148 @@
         </widget>
        </item>
        <item>
+        <widget class="QTableWidget" name="tblConsumablesSelfTestStates">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>131</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>131</height>
+          </size>
+         </property>
+         <property name="font">
+          <font>
+           <pointsize>8</pointsize>
+          </font>
+         </property>
+         <property name="verticalScrollBarPolicy">
+          <enum>Qt::ScrollBarAlwaysOff</enum>
+         </property>
+         <property name="horizontalScrollBarPolicy">
+          <enum>Qt::ScrollBarAlwaysOff</enum>
+         </property>
+         <property name="editTriggers">
+          <set>QAbstractItemView::NoEditTriggers</set>
+         </property>
+         <property name="alternatingRowColors">
+          <bool>true</bool>
+         </property>
+         <property name="selectionMode">
+          <enum>QAbstractItemView::SingleSelection</enum>
+         </property>
+         <property name="selectionBehavior">
+          <enum>QAbstractItemView::SelectRows</enum>
+         </property>
+         <property name="wordWrap">
+          <bool>false</bool>
+         </property>
+         <property name="columnCount">
+          <number>2</number>
+         </property>
+         <attribute name="horizontalHeaderVisible">
+          <bool>true</bool>
+         </attribute>
+         <attribute name="horizontalHeaderDefaultSectionSize">
+          <number>350</number>
+         </attribute>
+         <attribute name="horizontalHeaderStretchLastSection">
+          <bool>true</bool>
+         </attribute>
+         <attribute name="verticalHeaderDefaultSectionSize">
+          <number>21</number>
+         </attribute>
+         <row>
+          <property name="text">
+           <string>00</string>
+          </property>
+         </row>
+         <row>
+          <property name="text">
+           <string>1</string>
+          </property>
+         </row>
+         <row>
+          <property name="text">
+           <string>2</string>
+          </property>
+         </row>
+         <row>
+          <property name="text">
+           <string>3</string>
+          </property>
+         </row>
+         <row>
+          <property name="text">
+           <string>4</string>
+          </property>
+         </row>
+         <column>
+          <property name="text">
+           <string>HD_Pre_Treatment_Consumable_Self_Test_States</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Description</string>
+          </property>
+         </column>
+         <item row="0" column="0">
+          <property name="text">
+           <string>CONSUMABLE_SELF_TESTS_INSTALL_STATE</string>
+          </property>
+         </item>
+         <item row="0" column="1">
+          <property name="text">
+           <string>Consumable self-tests install state</string>
+          </property>
+         </item>
+         <item row="1" column="0">
+          <property name="text">
+           <string>CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE</string>
+          </property>
+         </item>
+         <item row="1" column="1">
+          <property name="text">
+           <string>Consumable self-tests water quality check state</string>
+          </property>
+         </item>
+         <item row="2" column="0">
+          <property name="text">
+           <string>CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE</string>
+          </property>
+         </item>
+         <item row="2" column="1">
+          <property name="text">
+           <string>Consumable self-tests bicarbonate concentrate pump check state</string>
+          </property>
+         </item>
+         <item row="3" column="0">
+          <property name="text">
+           <string>CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE</string>
+          </property>
+         </item>
+         <item row="3" column="1">
+          <property name="text">
+           <string>Consumable self-tests acid concentrate pump check state</string>
+          </property>
+         </item>
+         <item row="4" column="0">
+          <property name="text">
+           <string>CONSUMABLE_SELF_TESTS_COMPLETE_STATE</string>
+          </property>
+         </item>
+         <item row="4" column="1">
+          <property name="text">
+           <string>Consumable self-tests complete state</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item>
         <widget class="QTableWidget" name="tblNoCartridgeSelfTestStates">
          <property name="minimumSize">
           <size>
@@ -1363,23 +1520,37 @@
          </item>
         </widget>
        </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <tabstops>
+  <tabstop>tblSubMode</tabstop>
   <tabstop>tblWaterSampleStates</tabstop>
+  <tabstop>tblConsumablesSelfTestStates</tabstop>
   <tabstop>tblNoCartridgeSelfTestStates</tabstop>
   <tabstop>tblInstallationStates</tabstop>
   <tabstop>tblDrySelfTestStates</tabstop>
   <tabstop>tblPrimeStates</tabstop>
   <tabstop>tblRecirculateStates</tabstop>
   <tabstop>tblPatientConnectionStates</tabstop>
-  <tabstop>tbReset</tabstop>
-  <tabstop>tblSubMode</tabstop>
   <tabstop>scrollArea</tabstop>
+  <tabstop>tbReset</tabstop>
  </tabstops>
  <resources/>
  <connections/>
Index: simulator/plugins/pretreatmentstates/loader.py
===================================================================
diff -u -red2d7cb5c8c2059444fd17cd4e1c0975461a903c -rad05ce7c5ed604813d9fd6ba1ad487096c9729b8
--- simulator/plugins/pretreatmentstates/loader.py	(.../loader.py)	(revision ed2d7cb5c8c2059444fd17cd4e1c0975461a903c)
+++ simulator/plugins/pretreatmentstates/loader.py	(.../loader.py)	(revision ad05ce7c5ed604813d9fd6ba1ad487096c9729b8)
@@ -22,6 +22,7 @@
 
     tblSubMode: QtWidgets.QTableWidget
     tblWaterSampleStates: QtWidgets.QTableWidget
+    tblConsumablesSelfTestStates: QtWidgets.QTableWidget
     tblNoCartridgeSelfTestStates: QtWidgets.QTableWidget
     tblInstallationStates: QtWidgets.QTableWidget
     tblDrySelfTestStates: QtWidgets.QTableWidget
@@ -41,6 +42,7 @@
 
         self.tblSubMode = self.find_table_widget('tblSubMode')
         self.tblWaterSampleStates = self.find_table_widget('tblWaterSampleStates')
+        self.tblConsumablesSelfTestStates = self.find_table_widget('tblConsumablesSelfTestStates')
         self.tblNoCartridgeSelfTestStates = self.find_table_widget('tblNoCartridgeSelfTestStates')
         self.tblInstallationStates = self.find_table_widget('tblInstallationStates')
         self.tblDrySelfTestStates = self.find_table_widget('tblDrySelfTestStates')
@@ -59,6 +61,7 @@
 
         self.tblSubMode.cellClicked.connect(self.do_treatment_states)
         self.tblWaterSampleStates.cellClicked.connect(self.do_treatment_states)
+        self.tblConsumablesSelfTestStates.cellClicked.connect(self.do_treatment_states)
         self.tblNoCartridgeSelfTestStates.cellClicked.connect(self.do_treatment_states)
         self.tblInstallationStates.cellClicked.connect(self.do_treatment_states)
         self.tblDrySelfTestStates.cellClicked.connect(self.do_treatment_states)
@@ -74,6 +77,7 @@
         """
         self.tblSubMode.setCurrentCell(HD_Pre_Treatment_Mode_States.HD_PRE_TREATMENT_START_STATE.value, 0)
         self.tblWaterSampleStates.setCurrentCell(HD_Pre_Treatment_Sample_Water_States.SAMPLE_WATER_SETUP_STATE.value, 0)
+        self.tblConsumablesSelfTestStates.setCurrentCell(HD_Pre_Treatment_Consumable_Self_Test_States.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, 0)
         self.tblNoCartridgeSelfTestStates.setCurrentCell(HD_Pre_Treatment_No_Cart_Self_Tests_States.NO_CART_SELF_TESTS_START_STATE.value, 0)
         self.tblInstallationStates.setCurrentCell(HD_Pre_Treatment_Cartridge_Install_States.CARTRIDGE_INSTALL_STATE.value, 0)
         self.tblDrySelfTestStates.setCurrentCell(HD_Pre_Treatment_Dry_Self_Tests_States.DRY_SELF_TESTS_START_STATE.value, 0)
@@ -89,6 +93,7 @@
         """
         sub_mode = int(self.tblSubMode.verticalHeaderItem(self.tblSubMode.currentRow()).text())
         water_sample = int(self.tblWaterSampleStates.verticalHeaderItem(self.tblWaterSampleStates.currentRow()).text())
+        consumables_self_test = int(self.tblConsumablesSelfTestStates.verticalHeaderItem(self.tblConsumablesSelfTestStates.currentRow()).text())
         no_cartridge_self_test = int(self.tblNoCartridgeSelfTestStates.verticalHeaderItem(self.tblNoCartridgeSelfTestStates.currentRow()).text())
         installation = int(self.tblInstallationStates.verticalHeaderItem(self.tblInstallationStates.currentRow()).text())
         dry_self_test = int(self.tblDrySelfTestStates.verticalHeaderItem(self.tblDrySelfTestStates.currentRow()).text())
@@ -98,6 +103,7 @@
         self.hd_simulator.cmd_send_pre_treatment_state_data(
             sub_mode,
             water_sample,
+            consumables_self_test,
             no_cartridge_self_test,
             installation,
             dry_self_test,
Index: simulator/simulator/loader.py
===================================================================
diff -u -reb6acf9c1a4748852875c350568192999be9d3dd -rad05ce7c5ed604813d9fd6ba1ad487096c9729b8
--- simulator/simulator/loader.py	(.../loader.py)	(revision eb6acf9c1a4748852875c350568192999be9d3dd)
+++ simulator/simulator/loader.py	(.../loader.py)	(revision ad05ce7c5ed604813d9fd6ba1ad487096c9729b8)
@@ -8,7 +8,6 @@
 
 from PySide2 import QtWidgets
 from PySide2.QtCore import Qt
-from PySide2.QtCore import Slot
 
 from simulator.dynamicloader import DynamicLoader