[orca] Updated XUL tests

From: Joanmarie Diggs <joanied src gnome org>
To: commits-list gnome org
Cc:
Subject: [orca] Updated XUL tests
Date: Thu, 30 Dec 2010 14:50:28 +0000 (UTC)
commit da7e43969a4790e1477d45db1e5fc6c8864e0c7f
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Thu Dec 30 06:10:49 2010 -0500

    Updated XUL tests

 test/keystrokes/firefox/xul_role_accel_label.py    |   24 ++--
 test/keystrokes/firefox/xul_role_alert.py          |    1 +
 .../keystrokes/firefox/xul_role_check_menu_item.py |   16 +-
 test/keystrokes/firefox/xul_role_combo_box.py      |   40 ++---
 test/keystrokes/firefox/xul_role_entry.py          |  143 +++++++++--------
 test/keystrokes/firefox/xul_role_list_item.py      |   12 +-
 test/keystrokes/firefox/xul_role_menu_bar.py       |   56 +++----
 test/keystrokes/firefox/xul_role_radio_button.py   |   26 +---
 .../keystrokes/firefox/xul_role_radio_menu_item.py |   27 ++--
 test/keystrokes/firefox/xul_role_tree.py           |   28 ++--
 test/keystrokes/firefox/xul_role_tree_table.py     |   27 ++--
 test/keystrokes/firefox/xul_where_am_i_dialog.py   |   17 ++-
 .../firefox/xul_where_am_i_status_bar.py           |  164 --------------------
 13 files changed, 196 insertions(+), 385 deletions(-)
---
diff --git a/test/keystrokes/firefox/xul_role_accel_label.py b/test/keystrokes/firefox/xul_role_accel_label.py
index 519aac1..7287d53 100755
--- a/test/keystrokes/firefox/xul_role_accel_label.py
+++ b/test/keystrokes/firefox/xul_role_accel_label.py
@@ -26,12 +26,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>f"))
 sequence.append(utils.AssertPresentationAction(
     "File menu",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar File Menu'",
-     "     VISIBLE:  'File Menu', cursor=1",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar New Window\(Control N\)'",
-     "     VISIBLE:  'New Window(Control N)', cursor=1",
-     "SPEECH OUTPUT: 'File menu'",
-     "SPEECH OUTPUT: 'New Window Control N'"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar New Tab\(Control T\)'",
+     "     VISIBLE:  'New Tab(Control T)', cursor=1",
+     "SPEECH OUTPUT: 'File menu New Tab Control T'"]))
 
 ########################################################################
 # Now, continue on down the menu.
@@ -40,15 +37,15 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Down Arrow in File menu",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar New Tab\(Control T\)'",
-     "     VISIBLE:  'New Tab\(Control T\)', cursor=1",
-     "SPEECH OUTPUT: 'New Tab Control T'"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar New Window\(Control N\)'",
+     "     VISIBLE:  'New Window\(Control N\)', cursor=1",
+     "SPEECH OUTPUT: 'New Window Control N'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Down Arrow in File menu",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Open Location...\(Control L\)'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar Open Location...\(Control L\)'",
      "     VISIBLE:  'Open Location...(Control L)', cursor=1",
      "SPEECH OUTPUT: 'Open Locationâ?¦ Control L'"]))
 
@@ -56,7 +53,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Down Arrow in File menu",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Open File...\(Control O\)'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar Open File...\(Control O\)'",
      "     VISIBLE:  'Open File...(Control O)', cursor=1",
      "SPEECH OUTPUT: 'Open Fileâ?¦ Control O'"]))
 
@@ -68,9 +65,10 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Open File...\(Control O\)'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar Open File...\(Control O\)'",
      "     VISIBLE:  'Open File...(Control O)', cursor=1",
-     "SPEECH OUTPUT: 'tool bar File menu Open Fileâ?¦ Control O 4 of [0-9]+'"]))
+     "SPEECH OUTPUT: 'tool bar File menu Open Fileâ?¦ Control O 4 of [0-9]+.'",
+     "SPEECH OUTPUT: 'O'"]))
 
 ########################################################################
 # Dismiss the menu by pressing Escape and wait for the location bar
diff --git a/test/keystrokes/firefox/xul_role_alert.py b/test/keystrokes/firefox/xul_role_alert.py
index 648f756..6946823 100644
--- a/test/keystrokes/firefox/xul_role_alert.py
+++ b/test/keystrokes/firefox/xul_role_alert.py
@@ -24,6 +24,7 @@ sequence.append(TypeAction("javascript:alert('I am an alert')"))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
+sequence.append(PauseAction(2000))
 sequence.append(utils.AssertPresentationAction(
     "Press Return to make the alert appear",
     ["BRAILLE LINE:  'about:blank HtmlPane'",
diff --git a/test/keystrokes/firefox/xul_role_check_menu_item.py b/test/keystrokes/firefox/xul_role_check_menu_item.py
index 5190c21..4336f3c 100755
--- a/test/keystrokes/firefox/xul_role_check_menu_item.py
+++ b/test/keystrokes/firefox/xul_role_check_menu_item.py
@@ -20,22 +20,22 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>v"))
 sequence.append(utils.AssertPresentationAction(
     "View menu",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar View Menu'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar View Menu'",
      "     VISIBLE:  'View Menu', cursor=1",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Toolbars Menu'",
-     "     VISIBLE:  'Toolbars Menu', cursor=1",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar Tab Groups\(Control E\)'",
+     "     VISIBLE:  'Tab Groups(Control E)', cursor=1",
      "SPEECH OUTPUT: 'View menu'",
-     "SPEECH OUTPUT: 'Toolbars menu'"]))
+     "SPEECH OUTPUT: 'Tab Groups Control E'"]))
 
 ########################################################################
-# When focus is on Toolbars, Up Arrow to the "Full Screen" check menu
-# item. The following should be presented in speech and braille:
+# Up Arrow to the "Full Screen" check menu item. The following should be
+# presented in speech and braille:
 #
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Up Arrow in View menu",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar < > Full Screen CheckItem\(F11\)'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar < > Full Screen CheckItem\(F11\)'",
      "     VISIBLE:  '< > Full Screen CheckItem(F11)', cursor=1",
      "SPEECH OUTPUT: 'Full Screen check item not checked F11'"]))
 
@@ -47,7 +47,7 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar < > Full Screen CheckItem\(F11\)'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar < > Full Screen CheckItem\(F11\)'",
      "     VISIBLE:  '< > Full Screen CheckItem(F11)', cursor=1",
      "SPEECH OUTPUT: 'tool bar View menu Full Screen check item not checked F11 10 of 10.'",
      "SPEECH OUTPUT: 'F'"]))
diff --git a/test/keystrokes/firefox/xul_role_combo_box.py b/test/keystrokes/firefox/xul_role_combo_box.py
index 4e1c993..c47890e 100644
--- a/test/keystrokes/firefox/xul_role_combo_box.py
+++ b/test/keystrokes/firefox/xul_role_combo_box.py
@@ -34,9 +34,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to combobox",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame General ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo'",
      "     VISIBLE:  'When " + utils.firefoxAppNames + " starts: Show a blan', cursor=22",
-     "SPEECH OUTPUT: 'Main scroll pane Startup panel When " + utils.firefoxAppNames + " starts: Show a blank page combo box'"]))
+     "SPEECH OUTPUT: 'General scroll pane Startup panel When " + utils.firefoxAppNames + " starts: Show a blank page combo box'"]))
 
 ########################################################################
 # Now that focus is on the combo box, arrow down to "Show my windows
@@ -46,11 +46,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Down Arrow in combobox",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show my windows and tabs from last time Combo'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame General ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show my windows and tabs from last time Combo'",
      "     VISIBLE:  'When " + utils.firefoxAppNames + " starts: Show my win', cursor=22",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show my windows and tabs from last time Combo'",
-     "     VISIBLE:  'When " + utils.firefoxAppNames + " starts: Show my win', cursor=22",
-     "SPEECH OUTPUT: 'Show a blank page'",
      "SPEECH OUTPUT: 'Show my windows and tabs from last time'"]))
 
 ########################################################################
@@ -60,7 +57,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Down Arrow in combobox",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show my home page Combo'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame General ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show my home page Combo'",
      "     VISIBLE:  'When " + utils.firefoxAppNames + " starts: Show my hom', cursor=22",
      "SPEECH OUTPUT: 'Show my home page'"]))
 
@@ -71,7 +68,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Up Arrow in combobox",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show my windows and tabs from last time Combo'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame General ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show my windows and tabs from last time Combo'",
      "     VISIBLE:  'When " + utils.firefoxAppNames + " starts: Show my win', cursor=22",
      "SPEECH OUTPUT: 'Show my windows and tabs from last time'"]))
 
@@ -82,7 +79,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Up Arrow in combobox",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame General ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo'",
      "     VISIBLE:  'When " + utils.firefoxAppNames + " starts: Show a blan', cursor=22",
      "SPEECH OUTPUT: 'Show a blank page'"]))
 
@@ -103,7 +100,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Down Arrow in expanded combobox",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo Show my windows and tabs from last time'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame General ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo Show my windows and tabs from last time'",
      "     VISIBLE:  'Show my windows and tabs from la', cursor=1",
      "SPEECH OUTPUT: 'Show my windows and tabs from last time'"]))
 
@@ -114,7 +111,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Up Arrow in expanded combobox",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo Show a blank page'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame General ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo Show a blank page'",
      "     VISIBLE:  'Show a blank page', cursor=1",
      "SPEECH OUTPUT: 'Show a blank page'"]))
 
@@ -125,9 +122,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "Return to collapse combobox",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame General ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo'",
      "     VISIBLE:  'When " + utils.firefoxAppNames + " starts: Show a blan', cursor=22",
-     "SPEECH OUTPUT: '" + utils.firefoxAppNames + " application " + utils.firefoxAppNames + " Preferences frame Main scroll pane Startup panel When " + utils.firefoxAppNames + " starts: Show a blank page combo box'"]))
+     "SPEECH OUTPUT: '" + utils.firefoxAppNames + " application " + utils.firefoxAppNames + " Preferences frame General scroll pane Startup panel When " + utils.firefoxAppNames + " starts: Show a blank page combo box'"]))
 
 ########################################################################
 # Now try first letter navigation.  All of the items begin with S.
@@ -136,18 +133,15 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction("s"))
 sequence.append(utils.AssertPresentationAction(
     "First letter navigation with s",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show my home page Combo'",
-     "     VISIBLE:  'When " + utils.firefoxAppNames + " starts: Show my hom', cursor=22",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show my home page Combo'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame General ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show my home page Combo'",
      "     VISIBLE:  'When " + utils.firefoxAppNames + " starts: Show my hom', cursor=22",
-     "SPEECH OUTPUT: 'Show a blank page'",
      "SPEECH OUTPUT: 'Show my home page'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction("s"))
 sequence.append(utils.AssertPresentationAction(
     "First letter navigation with s",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame General ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo'",
      "     VISIBLE:  'When " + utils.firefoxAppNames + " starts: Show a blan', cursor=22",
      "SPEECH OUTPUT: 'Show a blank page'"]))
 
@@ -159,8 +153,8 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
-    ["BUG? - We claim this is 1 of 1. This is how it was before the refactor as well.",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo'",
+    ["BUG? - We claim this is 1 of 1.",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame General ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo'",
      "     VISIBLE:  'When " + utils.firefoxAppNames + " starts: Show a blan', cursor=22",
      "SPEECH OUTPUT: 'When " + utils.firefoxAppNames + " starts: combo box Show a blank page 1 of 1'"]))
 
@@ -171,9 +165,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Shift+Tab to list item",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame List Main ListItem'",
-     "     VISIBLE:  'Main ListItem', cursor=1",
-     "SPEECH OUTPUT: 'Main'"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame List General ListItem'",
+     "     VISIBLE:  'General ListItem', cursor=1",
+     "SPEECH OUTPUT: 'General'"]))
 
 ########################################################################
 # Dismiss the dialog by pressing Escape and wait for the location bar
diff --git a/test/keystrokes/firefox/xul_role_entry.py b/test/keystrokes/firefox/xul_role_entry.py
index cc7a7ea..bd57d1e 100644
--- a/test/keystrokes/firefox/xul_role_entry.py
+++ b/test/keystrokes/firefox/xul_role_entry.py
@@ -63,42 +63,52 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("BackSpace"))
 sequence.append(utils.AssertPresentationAction(
     "Backspace",
-    ["BUG? - Braille is not updating correctly - it's off by one character. This is true for the next four assertions as well.",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog this is a test \$l'",
-     "     VISIBLE:  'this is a test $l', cursor=15",
-     "SPEECH OUTPUT: 't'"]))
+    ["BUG? - For some reason we're not speaking the BackSpaced Character. At all.",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: this is a tes \$l'",
+     "     VISIBLE:  'Name: this is a tes $l', cursor=20",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: this is a tes \$l'",
+     "     VISIBLE:  'Name: this is a tes $l', cursor=20",
+     "SPEECH OUTPUT: ''"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("BackSpace"))
 sequence.append(utils.AssertPresentationAction(
     "Backspace",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog this is a tes \$l'",
-     "     VISIBLE:  'this is a tes $l', cursor=14",
-     "SPEECH OUTPUT: 's'"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: this is a te \$l'",
+     "     VISIBLE:  'Name: this is a te $l', cursor=19",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: this is a te \$l'",
+     "     VISIBLE:  'Name: this is a te $l', cursor=19",
+     "SPEECH OUTPUT: ''"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("BackSpace"))
 sequence.append(utils.AssertPresentationAction(
     "Backspace",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog this is a te \$l'",
-     "     VISIBLE:  'this is a te $l', cursor=13",
-     "SPEECH OUTPUT: 'e'"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: this is a t \$l'",
+     "     VISIBLE:  'Name: this is a t $l', cursor=18",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: this is a t \$l'",
+     "     VISIBLE:  'Name: this is a t $l', cursor=18",
+     "SPEECH OUTPUT: ''"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("BackSpace"))
 sequence.append(utils.AssertPresentationAction(
     "Backspace",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog this is a t \$l'",
-     "     VISIBLE:  'this is a t $l', cursor=12",
-     "SPEECH OUTPUT: 't'"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: this is a  \$l'",
+     "     VISIBLE:  'Name: this is a  $l', cursor=17",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: this is a  \$l'",
+     "     VISIBLE:  'Name: this is a  $l', cursor=17",
+     "SPEECH OUTPUT: ''"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("BackSpace"))
 sequence.append(utils.AssertPresentationAction(
     "Backspace",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog this is a  \$l'",
-     "     VISIBLE:  'this is a  $l', cursor=11",
-     "SPEECH OUTPUT: 'space'"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: this is a \$l'",
+     "     VISIBLE:  'Name: this is a $l', cursor=16",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: this is a \$l'",
+     "     VISIBLE:  'Name: this is a $l', cursor=16",
+     "SPEECH OUTPUT: ''"]))
 
 ########################################################################
 # Control Backspace 3 times thus removing "this is a" word by word from
@@ -108,26 +118,31 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>BackSpace"))
 sequence.append(utils.AssertPresentationAction(
     "Control Backspace",
-    ["BUG? - Braille is not updating correctly - it's off by one word. This is true for the next two assertions as well.",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog this is a \$l'",
-     "     VISIBLE:  'this is a $l', cursor=9",
-     "SPEECH OUTPUT: 'a'"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: this is  \$l'",
+     "     VISIBLE:  'Name: this is  $l', cursor=15",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: this is  \$l'",
+     "     VISIBLE:  'Name: this is  $l', cursor=15",
+     "SPEECH OUTPUT: ''"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>BackSpace"))
 sequence.append(utils.AssertPresentationAction(
     "Control Backspace",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog this is  \$l'",
-     "     VISIBLE:  'this is  $l', cursor=6",
-     "SPEECH OUTPUT: 'is '"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: this  \$l'",
+     "     VISIBLE:  'Name: this  $l', cursor=12",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: this  \$l'",
+     "     VISIBLE:  'Name: this  $l', cursor=12",
+     "SPEECH OUTPUT: ''"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>BackSpace"))
 sequence.append(utils.AssertPresentationAction(
     "Control Backspace",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog this  \$l'",
-     "     VISIBLE:  'this  $l', cursor=1",
-     "SPEECH OUTPUT: 'this '"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name:  \$l'",
+     "     VISIBLE:  'Name:  $l', cursor=7",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name:  \$l'",
+     "     VISIBLE:  'Name:  $l', cursor=7",
+     "SPEECH OUTPUT: ''"]))
 
 ########################################################################
 # Due to a bug, we'll stop getting caret-moved events if we don't move
@@ -145,32 +160,32 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Left",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog so is this \$l'",
-     "     VISIBLE:  'so is this $l', cursor=10",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: so is this \$l'",
+     "     VISIBLE:  'Name: so is this $l', cursor=16",
      "SPEECH OUTPUT: 's'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Left",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog so is this \$l'",
-     "     VISIBLE:  'so is this $l', cursor=9",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: so is this \$l'",
+     "     VISIBLE:  'Name: so is this $l', cursor=15",
      "SPEECH OUTPUT: 'i'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Left",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog so is this \$l'",
-     "     VISIBLE:  'so is this $l', cursor=8",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: so is this \$l'",
+     "     VISIBLE:  'Name: so is this $l', cursor=14",
      "SPEECH OUTPUT: 'h'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Left",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog so is this \$l'",
-     "     VISIBLE:  'so is this $l', cursor=7",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: so is this \$l'",
+     "     VISIBLE:  'Name: so is this $l', cursor=13",
      "SPEECH OUTPUT: 't'"]))
 
 ########################################################################
@@ -181,16 +196,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Left"))
 sequence.append(utils.AssertPresentationAction(
     "Control Left",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog so is this \$l'",
-     "     VISIBLE:  'so is this $l', cursor=4",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: so is this \$l'",
+     "     VISIBLE:  'Name: so is this $l', cursor=10",
      "SPEECH OUTPUT: 'is '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Left"))
 sequence.append(utils.AssertPresentationAction(
     "Control Left",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog so is this \$l'",
-     "     VISIBLE:  'so is this $l', cursor=1",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: so is this \$l'",
+     "     VISIBLE:  'Name: so is this $l', cursor=7",
      "SPEECH OUTPUT: 'so '"]))
 
 ########################################################################
@@ -200,17 +215,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Delete"))
 sequence.append(utils.AssertPresentationAction(
     "Control Delete",
-    ["BUG? - We are speaking the new caret location -- we land on a space -- rather than the word that was just deleted. This is true for the next assertion as well.",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog so is this \$l'",
-     "     VISIBLE:  'so is this $l', cursor=3",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name:  is this \$l'",
+     "     VISIBLE:  'Name:  is this $l', cursor=7",
      "SPEECH OUTPUT: 'space'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Delete"))
 sequence.append(utils.AssertPresentationAction(
     "Control Delete",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog  is this \$l'",
-     "     VISIBLE:  ' is this $l', cursor=4",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name:  this \$l'",
+     "     VISIBLE:  'Name:  this $l', cursor=7",
      "SPEECH OUTPUT: 'space'"]))
 
 ########################################################################
@@ -220,33 +234,32 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Delete", 500))
 sequence.append(utils.AssertPresentationAction(
     "Delete",
-    ["BUG? - Braille is not updating correctly - it's off by one character. This is true for the next three assertions as well.",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog  this \$l'",
-     "     VISIBLE:  ' this $l', cursor=2",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: this \$l'",
+     "     VISIBLE:  'Name: this $l', cursor=7",
      "SPEECH OUTPUT: 't'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Delete", 500))
 sequence.append(utils.AssertPresentationAction(
     "Delete",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog this \$l'",
-     "     VISIBLE:  'this $l', cursor=2",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: his \$l'",
+     "     VISIBLE:  'Name: his $l', cursor=7",
      "SPEECH OUTPUT: 'h'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Delete", 500))
 sequence.append(utils.AssertPresentationAction(
     "Delete",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog his \$l'",
-     "     VISIBLE:  'his $l', cursor=2",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: is \$l'",
+     "     VISIBLE:  'Name: is $l', cursor=7",
      "SPEECH OUTPUT: 'i'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Delete", 500))
 sequence.append(utils.AssertPresentationAction(
     "Delete",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog is \$l'",
-     "     VISIBLE:  'is $l', cursor=2",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Name: s \$l'",
+     "     VISIBLE:  'Name: s $l', cursor=7",
      "SPEECH OUTPUT: 's'"]))
 
 ########################################################################
@@ -256,9 +269,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>d"))
 sequence.append(utils.AssertPresentationAction(
     "Alt+D to Description",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog  \$l'",
-     "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'Description: text '"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Description:  \$l'",
+     "     VISIBLE:  'Description:  $l', cursor=14",
+     "SPEECH OUTPUT: 'Description: text'"]))
 
 ########################################################################
 # Type "Here is the first line."  Press Return.  
@@ -268,10 +281,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "Return for new line'",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog  \$l'",
-     "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog  \$l'",
-     "     VISIBLE:  ' $l', cursor=1"]))
+    ["BRAILLE LINE:  'Description:  $l'",
+     "     VISIBLE:  'Description:  $l', cursor=14",
+     "BRAILLE LINE:  'Description:  $l'",
+     "     VISIBLE:  'Description:  $l', cursor=14"]))
 
 ########################################################################
 # Type "Here is the second line."
@@ -285,8 +298,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Up Arrow",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Here is the first line. \$l'",
-     "     VISIBLE:  'Here is the first line. $l', cursor=24",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Description: Here is the first line. \$l'",
+     "     VISIBLE:  'iption: Here is the first line. ', cursor=32",
      "SPEECH OUTPUT: 'Here is the first line.'"]))
 
 ########################################################################
@@ -296,8 +309,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Down Arrow",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Here is the second line. \$l'",
-     "     VISIBLE:  'Here is the second line. $l', cursor=25",
+    ["BRAILLE LINE:  'Description: Here is the second line. \$l'",
+     "     VISIBLE:  'ption: Here is the second line. ', cursor=32",
      "SPEECH OUTPUT: 'Here is the second line.'"]))
 
 ########################################################################
@@ -308,8 +321,8 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Here is the second line. \$l'",
-     "     VISIBLE:  'Here is the second line. $l', cursor=25",
+    ["BRAILLE LINE:  'Description: Here is the second line. \$l'",
+     "     VISIBLE:  'ption: Here is the second line. ', cursor=32",
      "SPEECH OUTPUT: 'text Here is the second line.",
      "'"]))
 
diff --git a/test/keystrokes/firefox/xul_role_list_item.py b/test/keystrokes/firefox/xul_role_list_item.py
index 643b6d0..80768f7 100755
--- a/test/keystrokes/firefox/xul_role_list_item.py
+++ b/test/keystrokes/firefox/xul_role_list_item.py
@@ -41,9 +41,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Left Arrow in list",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame List Main ListItem'",
-     "     VISIBLE:  'Main ListItem', cursor=1",
-     "SPEECH OUTPUT: 'Main'"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame List General ListItem'",
+     "     VISIBLE:  'General ListItem', cursor=1",
+     "SPEECH OUTPUT: 'General'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter. 
@@ -53,9 +53,9 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame List Main ListItem'",
-     "     VISIBLE:  'Main ListItem', cursor=1",
-     "SPEECH OUTPUT: 'list item Main 1 of 7'"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame List General ListItem'",
+     "     VISIBLE:  'General ListItem', cursor=1",
+     "SPEECH OUTPUT: 'list item General 1 of 8'"]))
 
 ########################################################################
 # Dismiss the dialog by pressing Escape and wait for the location bar
diff --git a/test/keystrokes/firefox/xul_role_menu_bar.py b/test/keystrokes/firefox/xul_role_menu_bar.py
index 0182fb8..6f51e6e 100644
--- a/test/keystrokes/firefox/xul_role_menu_bar.py
+++ b/test/keystrokes/firefox/xul_role_menu_bar.py
@@ -21,16 +21,15 @@ sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
 ########################################################################
 # Open the "File" menu.
 #
+sequence.append(PauseAction(3000))
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>f"))
+sequence.append(PauseAction(1000))
 sequence.append(utils.AssertPresentationAction(
     "File menu",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar File Menu'",
-     "     VISIBLE:  'File Menu', cursor=1",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar New Window\(Control N\)'",
-     "     VISIBLE:  'New Window(Control N)', cursor=1",
-     "SPEECH OUTPUT: 'File menu'",
-     "SPEECH OUTPUT: 'New Window Control N'"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar New Tab\(Control T\)'",
+     "     VISIBLE:  'New Tab(Control T)', cursor=1",
+     "SPEECH OUTPUT: 'File menu New Tab Control T'"]))
 
 ########################################################################
 # Press Right Arrow to move forward menu by menu
@@ -39,9 +38,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Right Arrow on menu bar",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Edit Menu'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Edit Menu'",
      "     VISIBLE:  'Edit Menu', cursor=1",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Undo( grayed|)\(Control Z\)'",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar Undo( grayed|)\(Control Z\)'",
      "     VISIBLE:  'Undo( grayed|)\(Control Z\)', cursor=1",
      "SPEECH OUTPUT: 'Edit menu'",
      "SPEECH OUTPUT: 'Undo( grayed|) Control Z'"]))
@@ -50,42 +49,37 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Right Arrow on menu bar",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar View Menu'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar View Menu'",
      "     VISIBLE:  'View Menu', cursor=1",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Toolbars Menu'",
-     "     VISIBLE:  'Toolbars Menu', cursor=1",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar Tab Groups\(Control E\)'",
+     "     VISIBLE:  'Tab Groups(Control E)', cursor=1",
      "SPEECH OUTPUT: 'View menu'",
-     "SPEECH OUTPUT: 'Toolbars menu'"]))
+     "SPEECH OUTPUT: 'Tab Groups Control E'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Right Arrow on menu bar",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar View Menu <x> Navigation Toolbar CheckItem'",
-     "     VISIBLE:  '<x> Navigation Toolbar CheckItem', cursor=1",
-     "SPEECH OUTPUT: 'Navigation Toolbar check item checked'"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar History Menu'",
+     "     VISIBLE:  'History Menu', cursor=1",
+"BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar Back grayed\(Alt Left Arrow\)'",
+     "     VISIBLE:  'Back grayed(Alt Left Arrow)', cursor=1",
+     "SPEECH OUTPUT: 'History menu'",
+     "SPEECH OUTPUT: 'Back grayed Alt Left Arrow'"]))
 
 ########################################################################
 # Press Left Arrow to move backward menu by menu
 #
-
-# The location bar has different names. Where the cursor is will depend
-# on the length of the name.
-#
-cursorPosition = utils.firefoxLocationBarNames
-for name in cursorPosition[1:-1].split("|"):
-    cursorPosition = cursorPosition.replace(name, "%s" % (len(name) + 2))
-
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Left Arrow on menu bar",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar AutoComplete " + utils.firefoxLocationBarNames + "  \$l'",
-     "     VISIBLE:  '" + utils.firefoxLocationBarNames + "  \$l', cursor=%s" % cursorPosition,
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Toolbars Menu'",
-     "     VISIBLE:  'Toolbars Menu', cursor=1",
-     "SPEECH OUTPUT: '" + utils.firefoxLocationBarNames + " text '",
-     "SPEECH OUTPUT: 'View menu Toolbars menu'",]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar View Menu",
+     "     VISIBLE:  'View Menu', cursor=1",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar Tab Groups\(Control E\)'",
+     "     VISIBLE:  'Tab Groups(Control E)', cursor=1",
+     "SPEECH OUTPUT: 'View menu'",
+     "SPEECH OUTPUT: 'Tab Groups Control E'"]))
 
 # This seems to vary depending on whether or not something is in the
 # clipboard. Therefore, we'll check for either.
@@ -97,9 +91,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Left Arrow on menu bar",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Edit Menu'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Edit Menu'",
      "     VISIBLE:  'Edit Menu', cursor=1",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar " + menuItem + "\(Control " + itemShortcut + "\)'",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar " + menuItem + "\(Control " + itemShortcut + "\)'",
      "     VISIBLE:  '" + menuItem + "\(Control " + itemShortcut + "\)', cursor=1",
      "SPEECH OUTPUT: 'Edit menu'",
      "SPEECH OUTPUT: '" + menuItem + " Control " + itemShortcut + "'"]))
diff --git a/test/keystrokes/firefox/xul_role_radio_button.py b/test/keystrokes/firefox/xul_role_radio_button.py
index 325b4f3..e7b657c 100755
--- a/test/keystrokes/firefox/xul_role_radio_button.py
+++ b/test/keystrokes/firefox/xul_role_radio_button.py
@@ -43,34 +43,10 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page Range &=y All Pages RadioButton'",
      "     VISIBLE:  '&=y All Pages RadioButton', cursor=1",
-     "SPEECH OUTPUT: 'Range All Pages radio button selected 1 of 3.'",
+     "SPEECH OUTPUT: 'Range All Pages radio button selected 1 of 4.'",
      "SPEECH OUTPUT: 'Alt a'"]))
 
 ########################################################################
-# Down Arrow to the next radio button.
-#
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "Down Arrow to next radio button",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page Range & y Pages: RadioButton'",
-     "     VISIBLE:  '& y Pages: RadioButton', cursor=1",
-     "SPEECH OUTPUT: 'Pages: not selected radio button'"]))
-
-########################################################################
-# Do a basic "Where Am I" via KP_Enter. 
-#
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("KP_Enter"))
-sequence.append(PauseAction(3000))
-sequence.append(utils.AssertPresentationAction(
-    "Basic Where Am I", 
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page Range &=y Pages: RadioButton'",
-     "     VISIBLE:  '&=y Pages: RadioButton', cursor=1",
-     "SPEECH OUTPUT: 'Range Pages: radio button selected 3 of 3.'",
-     "SPEECH OUTPUT: 'Alt e'"]))
-
-########################################################################
 # Dismiss the dialog by pressing Escape and wait for the location bar
 # to regain focus.
 sequence.append(KeyComboAction("Escape"))
diff --git a/test/keystrokes/firefox/xul_role_radio_menu_item.py b/test/keystrokes/firefox/xul_role_radio_menu_item.py
index 1d01cac..552f4f4 100755
--- a/test/keystrokes/firefox/xul_role_radio_menu_item.py
+++ b/test/keystrokes/firefox/xul_role_radio_menu_item.py
@@ -21,23 +21,20 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>v"))
 sequence.append(utils.AssertPresentationAction(
     "View menu",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar View Menu'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar View Menu'",
      "     VISIBLE:  'View Menu', cursor=1",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Toolbars Menu'",
-     "     VISIBLE:  'Toolbars Menu', cursor=1",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar Tab Groups\(Control E\)'",
+     "     VISIBLE:  'Tab Groups\(Control E\)', cursor=1",
      "SPEECH OUTPUT: 'View menu'",
-     "SPEECH OUTPUT: 'Toolbars menu'"]))
+     "SPEECH OUTPUT: 'Tab Groups Control E'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("y"))
 sequence.append(utils.AssertPresentationAction(
     "y for Page Style menu",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Page Style Menu'",
-     "     VISIBLE:  'Page Style Menu', cursor=1",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar View Menu & y No Style RadioItem'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar View Menu & y No Style RadioItem'",
      "     VISIBLE:  '& y No Style RadioItem', cursor=1",
-     "SPEECH OUTPUT: 'Page Style menu'",
-     "SPEECH OUTPUT: 'No Style not selected radio menu item'"]))
+     "SPEECH OUTPUT: 'Page Style menu No Style not selected radio menu item'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter. 
@@ -47,9 +44,10 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar View Menu & y No Style RadioItem'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar View Menu & y No Style RadioItem'",
      "     VISIBLE:  '& y No Style RadioItem', cursor=1",
-     "SPEECH OUTPUT: 'tool bar View menu Page Style menu No Style radio menu item not selected 1 of 2'"]))
+     "SPEECH OUTPUT: 'tool bar View menu Page Style menu No Style radio menu item not selected 1 of 2.'",
+     "SPEECH OUTPUT: 'n'"]))
 
 ########################################################################
 # Down Arrow to the "Basic Page Style" radio menu item.
@@ -58,7 +56,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Down Arrow in menu",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar View Menu &=y Basic Page Style RadioItem'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar View Menu &=y Basic Page Style RadioItem'",
      "     VISIBLE:  '&=y Basic Page Style RadioItem', cursor=1",
      "SPEECH OUTPUT: 'Basic Page Style selected radio menu item'"]))
 
@@ -70,9 +68,10 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar View Menu &=y Basic Page Style RadioItem'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar View Menu &=y Basic Page Style RadioItem'",
      "     VISIBLE:  '&=y Basic Page Style RadioItem', cursor=1",
-     "SPEECH OUTPUT: 'tool bar View menu Page Style menu Basic Page Style radio menu item selected 2 of 2'"]))
+     "SPEECH OUTPUT: 'tool bar View menu Page Style menu Basic Page Style radio menu item selected 2 of 2.'",
+     "SPEECH OUTPUT: 'b'"]))
 
 ########################################################################
 # Dismiss the "Page Style" menu by pressing Escape.
diff --git a/test/keystrokes/firefox/xul_role_tree.py b/test/keystrokes/firefox/xul_role_tree.py
index 926624f..d3a36d7 100644
--- a/test/keystrokes/firefox/xul_role_tree.py
+++ b/test/keystrokes/firefox/xul_role_tree.py
@@ -23,12 +23,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>b"))
 sequence.append(utils.AssertPresentationAction(
     "Bookmarks menu",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Bookmarks Menu'",
-     "     VISIBLE:  'Bookmarks Menu', cursor=1",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Bookmark This Page\(Control D\)'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar Bookmark This Page\(Control D\)'",
      "     VISIBLE:  'Bookmark This Page(Control D)', cursor=1",
-     "SPEECH OUTPUT: 'Bookmarks menu'",
-     "SPEECH OUTPUT: 'Bookmark This Page Control D'"]))
+     "SPEECH OUTPUT: 'Bookmarks menu Bookmark This Page Control D'"]))
 
 # Firefox 3.5 introduces a shortcut (Control Shift O) that was not present
 # in earlier versions.
@@ -38,9 +35,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Down Arrow in Bookmarks menu",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Organize Bookmarks...(\(Control Shift O\)|)'",
-     "     VISIBLE:  'Organize Bookmarks...(\(Control Sh|)', cursor=1",
-     "SPEECH OUTPUT: 'Organize Bookmarksâ?¦( Control Shift O|)'"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar Show All Bookmarks...(\(Control Shift O\)|)'",
+     "     VISIBLE:  'Show All Bookmarks...(\(Control Sh|)', cursor=1",
+     "SPEECH OUTPUT: 'Show All Bookmarksâ?¦( Control Shift O|)'"]))
 sequence.append(KeyComboAction("Return"))
 sequence.append(PauseAction(3000))
 
@@ -51,8 +48,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Tab", 1000))
 sequence.append(utils.AssertPresentationAction(
     "Shift Tab for tree",
-    ["BUG? - We are no longer speaking the Level",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree All Bookmarks expanded ListItem TREE LEVEL 1'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree All Bookmarks expanded ListItem TREE LEVEL 1'",
      "     VISIBLE:  'All Bookmarks expanded ListItem ', cursor=1",
      "SPEECH OUTPUT: 'All Bookmarks expanded'"]))
 
@@ -85,7 +81,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu collapsed ListItem TREE LEVEL 2'",
      "     VISIBLE:  'Bookmarks Menu collapsed ListIte', cursor=1",
-     "SPEECH OUTPUT: 'list item Bookmarks Menu 2 of 3 collapsed tree level 2'"]))
+     "SPEECH OUTPUT: 'list item Bookmarks Menu 5 of 6 collapsed tree level 2'"]))
 
 ########################################################################
 # Press Right Arrow to expand this item.
@@ -108,7 +104,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu expanded ListItem TREE LEVEL 2'",
      "     VISIBLE:  'Bookmarks Menu expanded ListItem', cursor=1",
-     "SPEECH OUTPUT: 'list item Bookmarks Menu 2 of 3 expanded tree level 2'"]))
+     "SPEECH OUTPUT: 'list item Bookmarks Menu 5 of 10 expanded tree level 2'"]))
 
 ########################################################################
 # Press Down Arrow to give focus to the next item, Recently Bookmarked.
@@ -131,7 +127,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Recently Bookmarked ListItem TREE LEVEL 3'",
      "     VISIBLE:  'Recently Bookmarked ListItem TRE', cursor=1",
-     "SPEECH OUTPUT: 'list item Recently Bookmarked 1 of 4 tree level 3'"]))
+     "SPEECH OUTPUT: 'list item Recently Bookmarked 6 of 10 tree level 3'"]))
 
 ########################################################################
 # Press Up Arrow to work back to the Bookmarks Toolbar list item.
@@ -181,9 +177,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab back to tree table",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Toolbar   TREE LEVEL 1'",
-     "     VISIBLE:  'Bookmarks Toolbar   TREE LEVEL 1', cursor=1",
-     "SPEECH OUTPUT: 'Name column header Bookmarks Toolbar not selected'"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Tags ColumnHeader Bookmarks Toolbar ListItem TREE LEVEL 1'",
+     "     VISIBLE:  'Bookmarks Toolbar ListItem TREE ', cursor=1",
+     "SPEECH OUTPUT: 'Bookmarks Toolbar'"]))
 
 ########################################################################
 # Now that the Places Manager is back to its pre-explored state,
diff --git a/test/keystrokes/firefox/xul_role_tree_table.py b/test/keystrokes/firefox/xul_role_tree_table.py
index ca3d775..a6692d3 100644
--- a/test/keystrokes/firefox/xul_role_tree_table.py
+++ b/test/keystrokes/firefox/xul_role_tree_table.py
@@ -23,12 +23,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>b"))
 sequence.append(utils.AssertPresentationAction(
     "Bookmarks menu",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Bookmarks Menu'",
-     "     VISIBLE:  'Bookmarks Menu', cursor=1",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Bookmark This Page\(Control D\)'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar Bookmark This Page\(Control D\)'",
      "     VISIBLE:  'Bookmark This Page(Control D)', cursor=1",
-     "SPEECH OUTPUT: 'Bookmarks menu'",
-     "SPEECH OUTPUT: 'Bookmark This Page Control D'"]))
+     "SPEECH OUTPUT: 'Bookmarks menu Bookmark This Page Control D'"]))
 
 # Firefox 3.5 introduces a shortcut (Control Shift O) that was not present
 # in earlier versions.
@@ -38,9 +35,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Down Arrow in Bookmarks menu",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Organize Bookmarks...(\(Control Shift O\)|)'",
-     "     VISIBLE:  'Organize Bookmarks...(\(Control Sh|)', cursor=1",
-     "SPEECH OUTPUT: 'Organize Bookmarksâ?¦( Control Shift O|)'"]))
+   ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Application MenuBar Show All Bookmarks...(\(Control Shift O\)|)'",
+     "     VISIBLE:  'Show All Bookmarks...(\(Control Sh|)', cursor=1",
+     "SPEECH OUTPUT: 'Show All Bookmarksâ?¦( Control Shift O|)'"]))
 sequence.append(KeyComboAction("Return"))
 sequence.append(PauseAction(3000))
 
@@ -51,8 +48,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Down Arrow in tree table",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Menu   TREE LEVEL 1'",
-     "     VISIBLE:  'Bookmarks Menu   TREE LEVEL 1', cursor=1",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Location ColumnHeader Bookmarks Menu ListItem TREE LEVEL 1'",
+     "     VISIBLE:  'Bookmarks Menu ListItem TREE LEV', cursor=1",
      "SPEECH OUTPUT: 'Bookmarks Menu'"]))
 
 ########################################################################
@@ -63,9 +60,9 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Menu   TREE LEVEL 1'",
-     "     VISIBLE:  'Bookmarks Menu   TREE LEVEL 1', cursor=1",
-     "SPEECH OUTPUT: 'tree table Name cell Bookmarks Menu column 1 of 3 row 2 of 3 tree level 1'"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Location ColumnHeader Bookmarks Menu ListItem TREE LEVEL 1'",
+     "     VISIBLE:  'Bookmarks Menu ListItem TREE LEV', cursor=1",
+     "SPEECH OUTPUT: 'list item Bookmarks Menu 2 of 3 tree level 1'"]))
 
 ########################################################################
 # Press Up Arrow to return to the previous item.
@@ -74,8 +71,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Up Arrow in tree table",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Toolbar   TREE LEVEL 1'",
-     "     VISIBLE:  'Bookmarks Toolbar   TREE LEVEL 1', cursor=1",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Tags ColumnHeader Bookmarks Toolbar ListItem TREE LEVEL 1'",
+     "     VISIBLE:  'Bookmarks Toolbar ListItem TREE ', cursor=1",
      "SPEECH OUTPUT: 'Bookmarks Toolbar'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/xul_where_am_i_dialog.py b/test/keystrokes/firefox/xul_where_am_i_dialog.py
index e8c12ed..64e8ae8 100755
--- a/test/keystrokes/firefox/xul_where_am_i_dialog.py
+++ b/test/keystrokes/firefox/xul_where_am_i_dialog.py
@@ -33,8 +33,8 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Title Bar", 
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog General Page'",
-     "     VISIBLE:  'General Page', cursor=1",
+    ["BRAILLE LINE:  'Print'",
+     "     VISIBLE:  'Print', cursor=0",
      "SPEECH OUTPUT: 'Print'"]))
 
 ########################################################################
@@ -55,12 +55,19 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Default button", 
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page ScrollPane Table  Print to File  '",
-     "     VISIBLE:  ' Print to File  ', cursor=1",
+    ["BRAILLE LINE:  'Print'",
+     "     VISIBLE:  'Print', cursor=0",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page ScrollPane Table'",
+     "     VISIBLE:  'Table', cursor=1",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page ScrollPane Table'",
+     "     VISIBLE:  'Table', cursor=1",
+     "BRAILLE LINE:  'Default button is Print'",
+     "     VISIBLE:  'Default button is Print', cursor=0",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page ScrollPane Table  Print to File  '",
      "     VISIBLE:  ' Print to File  ', cursor=1",
      "SPEECH OUTPUT: 'Print'",
-     "SPEECH OUTPUT: 'Default button is Print'"]))
+     "SPEECH OUTPUT: 'Default button is Print'",
+     "SPEECH OUTPUT: 'image Print to File'"]))
 
 ########################################################################
 # Dismiss the dialog by pressing Escape and wait for the location bar
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]