Index: tst_AlarmCleared/test.py
===================================================================
diff -u -r93fe289e1e33e4b2cf824e30f810490f073ecab3 -r932d63fb26cda19a65375d592e454836f8b2522e
--- tst_AlarmCleared/test.py	(.../test.py)	(revision 93fe289e1e33e4b2cf824e30f810490f073ecab3)
+++ tst_AlarmCleared/test.py	(.../test.py)	(revision 932d63fb26cda19a65375d592e454836f8b2522e)
@@ -14,32 +14,47 @@
 
 
 import names
-from dialin.ui import utils, hd_simulator
+from dialin.ui import utils
+from dialin import HDSimulator
 
-
 # ALARM_ID = (priority, alarmID, escalates in, silent_espires_in, flags)
-def test_values(vAlarmID):
+def test_values(hd_simulator: HDSimulator, alarm_id):
+    """
+    Once the component(s) have been implemented, this will test the alarm cleared functionality
+    
+    @param hd_simulator: (HDSimulator) the HD Simulator object
+    @param alarm_id: (int) the alarm id
+    @returns: None
+    """
+    hd_simulator.alarms_simulator.cmd_alarm_condition_cleared(alarm_id)
     test.compare(True, True, "No component has been implemented yet")
 
 def main():
     utils.tstStart(__file__)
     
     startApplication(names.AUT_NAME)
+    
+    hd_simulator = HDSimulator()
     utils.waitForGUI(1)
 
     for i in range(len(names.AlarmTextMap)):
-        hd_simulator.setAlarmCleared(i)
-        test_values                   (i)
- 
-    hd_simulator.setAlarmCleared(1)
-    test_values                   (1)
+        hd_simulator.alarms_simulator.cmd_set_alarm_cleared(i)
+        test_values(hd_simulator, i)
+
+    hd_simulator.alarms_simulator.cmd_set_alarm_cleared(1)
+    test_values(hd_simulator, 1)
   
     # Coverage
-    hd_simulator.setAlarmCleared(1)
-    test_values                   (1)
+    hd_simulator.alarms_simulator.cmd_set_alarm_cleared(1)
+    test_values(hd_simulator, 1)
  
-    hd_simulator.setAlarmCleared(0)
-    test_values                   (0)
-
+    hd_simulator.alarms_simulator.cmd_set_alarm_cleared(0)
+    test_values(hd_simulator, 0)
+    
+    mouseClick(waitForObject(names.o_mainMenu_settings))
+    mouseClick(waitForObject(names.o_settings_clear_alarm_condition))
+    utils.waitForGUI()
+    
+      
     utils.tstDone()