Index: tst_pre_treatment_consumables/test.py
===================================================================
diff -u -r449937e26fc05c312a66825e313ef3f95cc7eb79 -rb91950206b980ebbbf5c8fdbe786acdd01b848d3
--- tst_pre_treatment_consumables/test.py	(.../test.py)	(revision 449937e26fc05c312a66825e313ef3f95cc7eb79)
+++ tst_pre_treatment_consumables/test.py	(.../test.py)	(revision b91950206b980ebbbf5c8fdbe786acdd01b848d3)
@@ -108,17 +108,15 @@
         Self Test Complete.
     """
     test.startSection("Check and busy indicator shouldn't be present initially")
-    for states in range (PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE.value):
+    for states in range (PreTreatmentConsumableSelfTestStates.NUM_OF_CONSUMABLE_SELF_TESTS_STATES.value):
         test.startSection("consumable self test state =" + PreTreatmentConsumableSelfTestStates(states).name)  
         hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE.value,
                                                     no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value,
                                                     prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value)         
         bicarb_indicator=utility.get_indicators(SCREEN_OBJ,config.BICARB_PUMP_CHECK_TEXT)
         acid_indicator=utility.get_indicators(SCREEN_OBJ,config.ACID_PUMP_CHECK_TEXT)
-        test.verify(not bicarb_indicator[0].visible, "busy indicator for bicarb pump must not be present")
-        test.verify(not bicarb_indicator[1].visible, "check indicator for bicarb pump must not be present")
-        test.verify(not acid_indicator[0].visible , "busy indicator for acid pump must not be present")
-        test.verify(not acid_indicator[1].visible, "check indicator for acid pump must not be present")
+        test.verify(bicarb_indicator[0].visible, "indicator for bicarb pump should be be present")
+        test.verify(not acid_indicator[0].visible , "indicator for acid pump should not be present")
         test.endSection()
     test.endSection()   
     
@@ -130,8 +128,8 @@
     bicarb_indicator=utility.get_indicators(SCREEN_OBJ,config.BICARB_PUMP_CHECK_TEXT)
     acid_indicator=utility.get_indicators(SCREEN_OBJ,config.ACID_PUMP_CHECK_TEXT)
     test.verify(waitForObject(bicarb_indicator[0]).visible,"The Busy indicator for BiCarb Pump must be visible")
-    test.verify(not acid_indicator[0].visible,"busy indicator for acid pump must not be present")
-    test.verify(not acid_indicator[1].visible,"check indicator for acid pump must not be present")
+    test.verify(acid_indicator[0].visible,"busy indicator for acid pump should be present")
+    test.verify(acid_indicator[1].visible,"check indicator for acid pump should be present")
     
     test.log("consumable self test state =" + PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_COMPLETE_STATE.name) 
     hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_COMPLETE_STATE.value,
@@ -145,10 +143,6 @@
     test.verify(waitForObject(acid_indicator[0]).visible,"The Busy indicator for Acid Pump must be visible")      
     test.log("consumable self test state = " + PreTreatmentConsumableSelfTestStates.NUM_OF_CONSUMABLE_SELF_TESTS_STATES.name) 
     
-    hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.NUM_OF_CONSUMABLE_SELF_TESTS_STATES.value,
-                                                    no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value,
-                                                    prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value)
-         
     test.log("Verification for Acid Pump check is done")    
     bicarb_indicator=utility.get_indicators(SCREEN_OBJ,config.BICARB_PUMP_CHECK_TEXT)
     acid_indicator=utility.get_indicators(SCREEN_OBJ,config.ACID_PUMP_CHECK_TEXT)
@@ -159,7 +153,9 @@
     test.compare(waitForObjectExists(names.o_PreTreatmentBase_Self_Test_Complete_Text).text,config.SELF_TEST_COMPLETE_TEXT,"text must be" + config.SELF_TEST_COMPLETE_TEXT )
     test.endSection() 
 
+
 def main():
+    
     global num_of_instructions
     utils.tstStart(__file__)
     startApplication(config.AUT_NAME)
@@ -189,4 +185,3 @@
     utils.tstDone()    
     
 
-