Index: suite_leahi/tst_feature_options/test.py
===================================================================
diff -u -r4bb18bc3f78928923b799a3a80e67c9751e53a05 -r296879f9309c86f2ac2852d3c9d76ebb4115f42c
--- suite_leahi/tst_feature_options/test.py	(.../test.py)	(revision 4bb18bc3f78928923b799a3a80e67c9751e53a05)
+++ suite_leahi/tst_feature_options/test.py	(.../test.py)	(revision 296879f9309c86f2ac2852d3c9d76ebb4115f42c)
@@ -16,7 +16,7 @@
 #    Enable Switch and Verify Enabled state then Click Back Button and Navigate to Create Rx Screen and Verify Heparin containers are visible
 #    Navigate to Main Treatment Screen and Verify that In HeaderBar Heparin is Visible and Navigate back to Feature Configurations Screen
 #    And Log Heparin Syringe Pump switch state and Disable it and Verify Disable state then Click Back Button
-#    Navigate to Create Rx Screen and Verify Heparin containers are not Visible, Navigate to Main Treatment Screen and
+#    Navigate to Create Rx Screen and Verify Heparin Rx container is not Visible, Navigate to Main Treatment Screen and
 #    Verify that In HeaderBar Heparin tab is not Visible
 
 
@@ -35,8 +35,6 @@
     main_menu_container = waitForObject(names.o_mainMenu_MainMenu, 2000)
     mouseClick(utility.findChildByText(main_menu_container, config.TREATMENT))
             
-    mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect, 3000))
-
     td_simulator.td_operation_mode(TDOpModes.MODE_TREA.value, 0)
     td_simulator.td_tx_state(
         TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value, 0, 0, 0, 0, 0, 0, 0, 0, 0
@@ -220,30 +218,47 @@
 
     mouseClick(utility.findChildByText(main_menu_container, config.TREATMENT))
 
-    mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect, 2000))
     td_simulator.td_operation_mode(TDOpModes.MODE_PRET.value)
     navigation.navigation_pageIndicator_step(config.CREATERX)
-    create_rx_container = waitForObjectExists(
-        names.o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, 3000
+    right_obj = utility.get_object_from_names(names.o_PreTreatmentCreate_rightColumn_Column)
+    heparin_rx_container = utility.findObjectById(
+        right_obj, "_heparinRx"
     )
+    test.verify(
+        heparin_rx_container.visible,
+        "Verify Heparin Rx Container is Visible",
+    )
+    
+    heparin_right_arrow = utility.findObjectById(heparin_rx_container, "_rightArrow")
+    mouseClick(heparin_right_arrow)
+    popup_object = utility.get_object_from_names(names.o_Overlay)
+    
+    heparin_type_container = utility.findObjectById(
+        popup_object, "_heparinType"
+    )
+    test.verify(
+        heparin_type_container.visible,
+        "Verify Heparin Type Container is Visible",
+    )
+    
     heparin_bolus_volume_container = utility.findObjectById(
-        create_rx_container, "_heparinBolusVolume"
+        popup_object, "_heparinBolusVolume"
     )
     test.verify(
         heparin_bolus_volume_container.visible,
         "Verify Heparin Bolus Volume Container is Visible",
     )
 
     heparin_dispensing_rate_container = utility.findObjectById(
-        create_rx_container, "_heparinDispensingRate"
+        popup_object, "_heparinDispensingRate"
     )
     test.verify(
         heparin_dispensing_rate_container.visible,
         "Verify Heparin Dispensing Rate Container is Visible",
     )
 
     heparin_delivery_duration_container = utility.findObjectById(
-        create_rx_container, "_heparinStopTime"
+        popup_object, "_heparinDeliveryDuration"
     )
     test.verify(
         heparin_delivery_duration_container.visible,
@@ -291,37 +306,18 @@
     mouseClick(waitForObject(utility.findChildByText(main_menu_container, config.PRESCRIPTIONS)), 2000 )
     mouseClick(utility.findChildByText(main_menu_container, config.TREATMENT))
 
-    mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect, 2000))
     td_simulator.td_operation_mode(TDOpModes.MODE_PRET.value)
     navigation.navigation_pageIndicator_step(config.CREATERX)
 
-    create_rx_container = waitForObjectExists(
-        names.o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, 3000
+    right_obj = utility.get_object_from_names(names.o_PreTreatmentCreate_rightColumn_Column)
+    heparin_rx_container = utility.findObjectById(
+        right_obj, "_heparinRx"
     )
-    heparin_bolus_volume_container = utility.findObjectById(
-        create_rx_container, "_heparinBolusVolume"
-    )
     test.verify(
-        not heparin_bolus_volume_container.visible,
-        "Verify Heparin Bolus Volume Container is Not Visible",
+        not heparin_rx_container.visible,
+        "Verify Heparin Rx Container is Not Visible",
     )
 
-    heparin_dispensing_rate_container = utility.findObjectById(
-        create_rx_container, "_heparinDispensingRate"
-    )
-    test.verify(
-        not heparin_dispensing_rate_container.visible,
-        "Verify Heparin Dispensing Rate Container is Not Visible",
-    )
-
-    heparin_delivery_duration_container = utility.findObjectById(
-        create_rx_container, "_heparinStopTime"
-    )
-    test.verify(
-        not heparin_delivery_duration_container.visible,
-        "Verify Heparin Delivery Duration Container is Not Visible",
-    )
-
     td_simulator.td_tx_state(
         TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value, 0, 0, 0, 0, 0, 0, 0, 0, 0
     )