[orca/570658-whereami] Regression test updates.



commit b7ee0df651ee2a7072bed4c018d647caf81733ad
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Sat Jun 6 23:33:22 2009 -0400

    Regression test updates.
---
 test/keystrokes/firefox/bug_552887a.py             |   80 +++++++--------
 test/keystrokes/firefox/codetalks_panel_text.py    |   54 +++++-----
 test/keystrokes/firefox/codetalks_treegrid.py      |   24 +++--
 test/keystrokes/firefox/dojo_button.py             |    4 +-
 test/keystrokes/firefox/dojo_checkbox.py           |   12 +-
 test/keystrokes/firefox/dojo_combo_box.py          |    5 +-
 test/keystrokes/firefox/dojo_dialog.py             |   28 +++--
 test/keystrokes/firefox/dojo_panel_text.py         |   22 +++--
 test/keystrokes/firefox/dojo_slider.py             |   60 ++++++------
 test/keystrokes/firefox/dojo_spinner.py            |  109 ++++++++++----------
 test/keystrokes/firefox/dojo_tabcontainer.py       |   25 +++--
 test/keystrokes/firefox/dojo_tree.py               |    4 +-
 test/keystrokes/firefox/find_wiki.py               |   12 ++-
 test/keystrokes/firefox/html_role_combo_box.py     |    5 +-
 .../firefox/html_role_list_item_where_am_i.py      |    3 +-
 test/keystrokes/firefox/line_nav_bug_547573.py     |   56 +++++-----
 test/keystrokes/firefox/line_nav_bug_549128.py     |   27 +++---
 test/keystrokes/firefox/line_nav_bug_570757.py     |    6 +-
 test/keystrokes/firefox/line_nav_bug_577239.py     |   10 +-
 test/keystrokes/firefox/line_nav_bug_577979.py     |    2 +
 .../keystrokes/firefox/line_nav_bugzilla_search.py |    8 +-
 test/keystrokes/firefox/line_nav_enter_bug.py      |    8 +-
 .../keystrokes/firefox/line_nav_multi_line_text.py |   24 ++--
 test/keystrokes/firefox/line_nav_slash_test.py     |   27 ++---
 test/keystrokes/firefox/line_nav_wiki.py           |   77 +++++++-------
 test/keystrokes/firefox/link_where_am_i.py         |    9 +-
 test/keystrokes/firefox/moz_menu.py                |    2 +-
 test/keystrokes/firefox/page_summary.py            |    3 +-
 test/keystrokes/firefox/tpg_aria_slider.py         |   76 +++++++-------
 test/keystrokes/firefox/uiuc_button.py             |    2 +-
 test/keystrokes/firefox/uiuc_grid.py               |    7 +-
 test/keystrokes/firefox/uiuc_radiobutton.py        |    2 +-
 test/keystrokes/firefox/uiuc_tabpanel.py           |    2 +-
 test/keystrokes/firefox/uiuc_tree.py               |    2 +-
 test/keystrokes/firefox/xul_role_tree_table.py     |    8 +-
 .../firefox/xul_where_am_i_status_bar.py           |    6 +-
 test/keystrokes/firefox/yahoo_tab_view.py          |    2 +-
 37 files changed, 417 insertions(+), 396 deletions(-)

diff --git a/test/keystrokes/firefox/bug_552887a.py b/test/keystrokes/firefox/bug_552887a.py
index 3cd26c8..d0e7756 100644
--- a/test/keystrokes/firefox/bug_552887a.py
+++ b/test/keystrokes/firefox/bug_552887a.py
@@ -31,12 +31,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "Top of file",
-    ["BUG? - In this test, the text is extremely small and probably appears to be on the same line, so we're speaking more than we should be",
-     "BRAILLE LINE:  ''",
+    ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: '",
-     " Line 1",
-     "'"]))
+     "SPEECH OUTPUT: 'blank'"]))
 
 ########################################################################
 # Down Arrow to the bottom.
@@ -46,9 +43,8 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Line Down",
     ["BRAILLE LINE:  'Line 1'",
-     "     VISIBLE:  'Line 1', cursor=7",
-     "SPEECH OUTPUT: '",
-     " Line 1",
+     "     VISIBLE:  'Line 1', cursor=1",
+     "SPEECH OUTPUT: 'Line 1",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -100,7 +96,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "7. Line Down",
     ["BRAILLE LINE:  'This text comes before the box section'",
-     "     VISIBLE:  'xt comes before the box section', cursor=32",
+     "     VISIBLE:  'This text comes before the box s', cursor=1",
      "SPEECH OUTPUT: 'This text comes before the box section",
      "'"]))
 
@@ -140,17 +136,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "12. Line Down",
-    ["BRAILLE LINE:  'This text comes after the'",
-     "     VISIBLE:  'This text comes after the', cursor=1",
-     "SPEECH OUTPUT: 'This text comes after the'"]))
+    ["BRAILLE LINE:  'This text comes after'",
+     "     VISIBLE:  'This text comes after', cursor=1",
+     "SPEECH OUTPUT: 'This text comes after'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "13. Line Down",
-    ["BRAILLE LINE:  'box section.'",
-     "     VISIBLE:  'box section.', cursor=1",
-     "SPEECH OUTPUT: 'box section.",
+    ["BRAILLE LINE:  'the box section.'",
+     "     VISIBLE:  'the box section.', cursor=1",
+     "SPEECH OUTPUT: 'the box section.",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -174,18 +170,18 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "1. Line Up",
-    ["BRAILLE LINE:  'box section.'",
-     "     VISIBLE:  'box section.', cursor=1",
-     "SPEECH OUTPUT: 'box section.",
+    ["BRAILLE LINE:  'the box section.'",
+     "     VISIBLE:  'the box section.', cursor=1",
+     "SPEECH OUTPUT: 'the box section.",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Up",
-    ["BRAILLE LINE:  'This text comes after the'",
-     "     VISIBLE:  'This text comes after the', cursor=1",
-     "SPEECH OUTPUT: 'This text comes after the'"]))
+    ["BRAILLE LINE:  'This text comes after'",
+     "     VISIBLE:  'This text comes after', cursor=1",
+     "SPEECH OUTPUT: 'This text comes after'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -228,24 +224,24 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'This text comes before the box section",
      "'"]))
 
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "8. Line Up",
-    ["BRAILLE LINE:  'text?'",
-     "     VISIBLE:  'text?', cursor=1",
-     "SPEECH OUTPUT: 'text?",
-     "'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "9. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
-     "SPEECH OUTPUT: '",
-     " link image'"]))
-
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("Up"))
+#sequence.append(utils.AssertPresentationAction(
+#    "8. Line Up",
+#    ["BRAILLE LINE:  'text?'",
+#     "     VISIBLE:  'text?', cursor=1",
+#     "SPEECH OUTPUT: 'text?",
+#     "'"]))
+#
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("Up"))
+#sequence.append(utils.AssertPresentationAction(
+#    "9. Line Up",
+#    ["BRAILLE LINE:  ''",
+#     "     VISIBLE:  '', cursor=0",
+#     "SPEECH OUTPUT: '",
+#     " link image'"]))
+#
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
@@ -253,7 +249,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'The Orca logo Image'",
      "     VISIBLE:  'The Orca logo Image', cursor=1",
      "SPEECH OUTPUT: 'The Orca logo link image ",
-     " link ",
+     " link image",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -287,7 +283,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "14. Line Up",
-    [""]))
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1",
+     "SPEECH OUTPUT: 'blank'"]))
 
 ########################################################################
 # Move to the location bar by pressing Control+L.  When it has focus
diff --git a/test/keystrokes/firefox/codetalks_panel_text.py b/test/keystrokes/firefox/codetalks_panel_text.py
index efdc100..9af2c66 100644
--- a/test/keystrokes/firefox/codetalks_panel_text.py
+++ b/test/keystrokes/firefox/codetalks_panel_text.py
@@ -35,17 +35,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down Arrow", 
-    ["BRAILLE LINE:  'This example requires Firefox 3 or later to work with screen readers -- it uses ARIA properties without namespaces, which is now'",
+    ["BRAILLE LINE:  'This example requires Firefox 3 or later to work with screen readers -- it uses ARIA properties without'",
      "     VISIBLE:  'This example requires Firefox 3 ', cursor=4",
-     "SPEECH OUTPUT: 'This example requires Firefox 3 or later to work with screen readers -- it uses ARIA properties without namespaces, which is now'"]))
+     "SPEECH OUTPUT: 'This example requires Firefox 3 or later to work with screen readers -- it uses ARIA properties without'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Down Arrow", 
-    ["BRAILLE LINE:  'the correct markup.'",
-     "     VISIBLE:  'the correct markup.', cursor=1",
-     "SPEECH OUTPUT: 'the correct markup.'"]))
+    ["BRAILLE LINE:  'namespaces, which is now the correct markup.'",
+     "     VISIBLE:  'namespaces, which is now the cor', cursor=1",
+     "SPEECH OUTPUT: 'namespaces, which is now the correct markup.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -59,17 +59,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Down Arrow", 
-    ["BRAILLE LINE:  'â?¢ left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do not cycle around the'",
+    ["BRAILLE LINE:  'â?¢ left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do'",
      "     VISIBLE:  'â?¢ left and right arrows to move ', cursor=1",
-     "SPEECH OUTPUT: 'bullet left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do not cycle around the'"]))
+     "SPEECH OUTPUT: 'bullet left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. Down Arrow", 
-    ["BRAILLE LINE:  'tabs'",
-     "     VISIBLE:  'tabs', cursor=1",
-     "SPEECH OUTPUT: 'tabs'"]))
+    ["BRAILLE LINE:  'not cycle around the tabs'",
+     "     VISIBLE:  'not cycle around the tabs', cursor=1",
+     "SPEECH OUTPUT: 'not cycle around the tabs'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -83,17 +83,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "8. Down Arrow", 
-    ["BRAILLE LINE:  'â?¢ ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab order \(shift was added'",
+    ["BRAILLE LINE:  'â?¢ ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab'",
      "     VISIBLE:  'â?¢ ctrl-shift-pageup / ctrl-shift', cursor=1",
-     "SPEECH OUTPUT: 'bullet ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab order \(shift was added'"]))
+     "SPEECH OUTPUT: 'bullet ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "9. Down Arrow", 
-    ["BRAILLE LINE:  'as a modifier so as not to conflict with the Firefox tabbing keys\)'",
-     "     VISIBLE:  'as a modifier so as not to confl', cursor=1",
-     "SPEECH OUTPUT: 'as a modifier so as not to conflict with the Firefox tabbing keys\)'"]))
+    ["BRAILLE LINE:  'order \(shift was added as a modifier so as not to conflict with the Firefox tabbing keys\)'",
+     "     VISIBLE:  'order \(shift was added as a modi', cursor=1",
+     "SPEECH OUTPUT: 'order \(shift was added as a modifier so as not to conflict with the Firefox tabbing keys\)'"]))
 
 ########################################################################
 # Up Arrow through the panel text back to the page tab.
@@ -102,9 +102,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "1. Up Arrow", 
-    ["BRAILLE LINE:  'â?¢ ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab order \(shift was added'",
+    ["BRAILLE LINE:  'â?¢ ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab'",
      "     VISIBLE:  'â?¢ ctrl-shift-pageup / ctrl-shift', cursor=1",
-     "SPEECH OUTPUT: 'bullet ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab order \(shift was added'"]))
+     "SPEECH OUTPUT: 'bullet ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -118,17 +118,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "3. Up Arrow", 
-    ["BRAILLE LINE:  'tabs'",
-     "     VISIBLE:  'tabs', cursor=1",
-     "SPEECH OUTPUT: 'tabs'"]))
+    ["BRAILLE LINE:  'not cycle around the tabs'",
+     "     VISIBLE:  'not cycle around the tabs', cursor=1",
+     "SPEECH OUTPUT: 'not cycle around the tabs'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "4. Up Arrow", 
-    ["BRAILLE LINE:  'â?¢ left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do not cycle around the'",
+    ["BRAILLE LINE:  'â?¢ left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do'",
      "     VISIBLE:  'â?¢ left and right arrows to move ', cursor=1",
-     "SPEECH OUTPUT: 'bullet left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do not cycle around the'"]))
+     "SPEECH OUTPUT: 'bullet left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -142,17 +142,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "6. Up Arrow", 
-    ["BRAILLE LINE:  'the correct markup.'",
-     "     VISIBLE:  'the correct markup.', cursor=1",
-     "SPEECH OUTPUT: 'the correct markup.'"]))
+    ["BRAILLE LINE:  'namespaces, which is now the correct markup.'",
+     "     VISIBLE:  'namespaces, which is now the cor', cursor=1",
+     "SPEECH OUTPUT: 'namespaces, which is now the correct markup.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "7. Up Arrow", 
-    ["BRAILLE LINE:  'This example requires Firefox 3 or later to work with screen readers -- it uses ARIA properties without namespaces, which is now'",
+    ["BRAILLE LINE:  'This example requires Firefox 3 or later to work with screen readers -- it uses ARIA properties without'",
      "     VISIBLE:  'This example requires Firefox 3 ', cursor=1",
-     "SPEECH OUTPUT: 'This example requires Firefox 3 or later to work with screen readers -- it uses ARIA properties without namespaces, which is now'"]))
+     "SPEECH OUTPUT: 'This example requires Firefox 3 or later to work with screen readers -- it uses ARIA properties without'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/codetalks_treegrid.py b/test/keystrokes/firefox/codetalks_treegrid.py
index 204f32f..82a7b2e 100644
--- a/test/keystrokes/firefox/codetalks_treegrid.py
+++ b/test/keystrokes/firefox/codetalks_treegrid.py
@@ -30,11 +30,13 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Navigate to the treegrid",
     ["KNOWN ISSUE - This output and the output of all the assertions that follow are merely designed to illustrate the current state of affairs, namely that Orca's caret navigation is not stomping on the built-in navigation of this treegrid, and to ensure that subsequent changes to Orca do not change that. This output should NOT be seen as what we think is an ideal presentation of a treegrid. See http://bugzilla.gnome.org/show_bug.cgi?id=570556 for more information.",
-     "BRAILLE LINE:  'Selectable Grid with Text with 9 Rows Selectable Grid with Text with 9 Rows TreeTable'",
-     "     VISIBLE:  'Selectable Grid with Text with 9', cursor=1",
+#     "BRAILLE LINE:  'Selectable Grid with Text with 9 Rows Selectable Grid with Text with 9 Rows TreeTable'",
+#     "     VISIBLE:  'Selectable Grid with Text with 9', cursor=1",
+     "BRAILLE LINE:  'Title Title TreeTable'",
+     "     VISIBLE:  'Title Title TreeTable', cursor=1",
      "BRAILLE LINE:  '+A Question of Love'",
      "     VISIBLE:  '+A Question of Love', cursor=0",
-     "SPEECH OUTPUT: 'Selectable Grid with Text with 9 Rows tree table'",
+#     "SPEECH OUTPUT: 'Selectable Grid with Text with 9 Rows tree table'",
      "SPEECH OUTPUT: 'Title tree table'",
      "SPEECH OUTPUT: '+A Question of Love'"]))
 
@@ -45,16 +47,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Down Arrow", 
-    ["BRAILLE LINE:  'Title + Piece of Peace Cell'",
-     "     VISIBLE:  'Title + Piece of Peace Cell', cursor=1",
+    ["BRAILLE LINE:  '+ Piece of Peace Cell'",
+     "     VISIBLE:  '+ Piece of Peace Cell', cursor=1",
      "SPEECH OUTPUT: '+ Piece of Peace'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down Arrow", 
-    ["BRAILLE LINE:  'Title + International Law Cell'",
-     "     VISIBLE:  'Title + International Law Cell', cursor=1",
+    ["BRAILLE LINE:  '+ International Law Cell'",
+     "     VISIBLE:  '+ International Law Cell', cursor=1",
      "SPEECH OUTPUT: '+ International Law'"]))
 
 ########################################################################
@@ -64,8 +66,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "1. Up Arrow", 
-    ["BRAILLE LINE:  'Title + Piece of Peace Cell'",
-     "     VISIBLE:  'Title + Piece of Peace Cell', cursor=1",
+    ["BRAILLE LINE:  '+ Piece of Peace Cell'",
+     "     VISIBLE:  '+ Piece of Peace Cell', cursor=1",
      "SPEECH OUTPUT: '+ Piece of Peace'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -86,7 +88,7 @@ sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
     ["BRAILLE LINE:  '+A Question of Love'",
      "     VISIBLE:  '+A Question of Love', cursor=0",
-     "SPEECH OUTPUT: 'Title +A Question of Love '"]))
+     "SPEECH OUTPUT: '+A Question of Love'"]))
 
 ########################################################################
 # Space to expand the current item.
@@ -110,7 +112,7 @@ sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
     ["BRAILLE LINE:  '-A Question of Love'",
      "     VISIBLE:  '-A Question of Love', cursor=0",
-     "SPEECH OUTPUT: 'Title -A Question of Love '"]))
+     "SPEECH OUTPUT: '-A Question of Love'"]))
 
 ########################################################################
 # Down Arrow to the child item.
diff --git a/test/keystrokes/firefox/dojo_button.py b/test/keystrokes/firefox/dojo_button.py
index 7d744f2..b6830aa 100644
--- a/test/keystrokes/firefox/dojo_button.py
+++ b/test/keystrokes/firefox/dojo_button.py
@@ -440,8 +440,8 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(WaitForFocus("Save", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the third unlabelled button ('Save')", 
-    ["BRAILLE LINE:  'Save Button â?? Menu'",
-     "     VISIBLE:  'Save Button â?? Menu', cursor=1",
+    ["BRAILLE LINE:  'Save Button'",
+     "     VISIBLE:  'Save Button', cursor=1",
      "SPEECH OUTPUT: 'Save button'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/dojo_checkbox.py b/test/keystrokes/firefox/dojo_checkbox.py
index f7eb357..e0eef80 100644
--- a/test/keystrokes/firefox/dojo_checkbox.py
+++ b/test/keystrokes/firefox/dojo_checkbox.py
@@ -19,7 +19,7 @@ sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
 #
 sequence.append(KeyComboAction("<Control>l"))
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-sequence.append(TypeAction(utils.DojoURLPrefix + "form/test_CheckBox.html"))
+sequence.append(TypeAction(utils.DojoNightlyURLPrefix + "form/test_CheckBox.html"))
 sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForDocLoad())
 sequence.append(WaitForFocus("CheckBox Widget Demo", 
@@ -59,7 +59,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the cb1 checkbox", 
-    ["BRAILLE LINE:  '< > CheckBox cb1: normal checkbox, with value=foo, clicking generates console log messages getValue()'",
+    ["BRAILLE LINE:  '< > CheckBox cb1: normal checkbox, with value=foo, clicking generates console log messages attr('value')'",
      "     VISIBLE:  '< > CheckBox cb1: normal checkbo', cursor=1",
      "SPEECH OUTPUT: 'cb1: normal checkbox, with value=foo, clicking generates console log messages check box not checked'"]))
 
@@ -70,7 +70,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction(" "))
 sequence.append(utils.AssertPresentationAction(
     "change state on cb1 checkbox", 
-    ["BRAILLE LINE:  '<x> CheckBox cb1: normal checkbox, with value=foo, clicking generates console log messages getValue()'",
+    ["BRAILLE LINE:  '<x> CheckBox cb1: normal checkbox, with value=foo, clicking generates console log messages attr('value')'",
      "     VISIBLE:  '<x> CheckBox cb1: normal checkbo', cursor=1",
      "SPEECH OUTPUT: 'checked'"]))
 
@@ -82,7 +82,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the cb2 checkbox", 
-    ["BRAILLE LINE:  '<x> CheckBox cb2: normal checkbox, with default value, initially turned on. \"onChange\" handler updates: [] getValue()'",
+    ["BRAILLE LINE:  '<x> CheckBox cb2: normal checkbox, with default value, initially turned on. \"onChange\" handler updates: [] attr('value')'",
      "     VISIBLE:  '<x> CheckBox cb2: normal checkbo', cursor=1",
      "SPEECH OUTPUT: 'cb2: normal checkbox, with default value, initially turned on. check box checked'"]))
 
@@ -94,7 +94,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the cb5 checkbox", 
-    ["BRAILLE LINE:  '< > CheckBox cb5: normal checkbox, with specified value=\"\", clicking generates console log messages getValue()'",
+    ["BRAILLE LINE:  '< > CheckBox cb5: normal checkbox, with specified value=\"\", clicking generates console log messages attr('value')'",
      "     VISIBLE:  '< > CheckBox cb5: normal checkbo', cursor=1",
      "SPEECH OUTPUT: 'cb5: normal checkbox, with specified value=\"\", clicking generates console log messages check box not checked'"]))
 
@@ -131,7 +131,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '< > CheckBox cb7: normal checkbox. disable Button enable Button set value to \"fish\" Button Reset value+checked Button \"onChange\" handler updates: []'",
      "     VISIBLE:  '< > CheckBox cb7: normal checkbo', cursor=1",
-     "SPEECH OUTPUT: 'cb7: normal checkbox. check box not checked '"]))
+     "SPEECH OUTPUT: 'cb7: normal checkbox. check box not checked'"]))
 
 ########################################################################
 # Close the demo
diff --git a/test/keystrokes/firefox/dojo_combo_box.py b/test/keystrokes/firefox/dojo_combo_box.py
index 4f39b04..10c02cb 100644
--- a/test/keystrokes/firefox/dojo_combo_box.py
+++ b/test/keystrokes/firefox/dojo_combo_box.py
@@ -67,7 +67,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Down Arrow", 
     ["BRAILLE LINE:  'â?? US State test 1 C $l'",
      "     VISIBLE:  'â?? US State test 1 C $l', cursor=0",
-     "BRAILLE LINE:  'bullet California'",
+     "BRAILLE LINE:  'â?¢ California'",
      "     VISIBLE:  'â?¢ California', cursor=1",
      "SPEECH OUTPUT: 'bullet California'"]))
 
@@ -158,8 +158,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I - Combo box collapsed back into an entry", 
     ["BRAILLE LINE:  'â?? US State test 1 California $l'",
      "     VISIBLE:  'â?? US State test 1 California $l', cursor=0",
-     "SPEECH OUTPUT: 'US State test 1 text alifornia'",
-     "SPEECH OUTPUT: 'selected'"]))
+     "SPEECH OUTPUT: 'US State test 1 text alifornia selected'"]))
 
 ########################################################################
 # Close the demo
diff --git a/test/keystrokes/firefox/dojo_dialog.py b/test/keystrokes/firefox/dojo_dialog.py
index cb3bd45..b8f1d64 100644
--- a/test/keystrokes/firefox/dojo_dialog.py
+++ b/test/keystrokes/firefox/dojo_dialog.py
@@ -19,7 +19,7 @@ sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
 #
 sequence.append(KeyComboAction("<Control>l"))
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-sequence.append(TypeAction(utils.DojoURLPrefix + "test_Dialog.html"))
+sequence.append(TypeAction(utils.DojoNightlyURLPrefix + "test_Dialog.html"))
 sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForDocLoad())
 
@@ -36,8 +36,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to show dialog button", 
-    ["BRAILLE LINE:  'Show Dialog Button Programatic Dialog \(3 second delay\) Button Show TabContainer Dialog Button Test slow loading HREF Dialog Button Show File Dialog Button'",
-     "     VISIBLE:  'Show Dialog Button Programatic D', cursor=1",
+    ["BRAILLE LINE:  'Show Dialog Button'",
+     "     VISIBLE:  'Show Dialog Button', cursor=1",
      "SPEECH OUTPUT: 'Show Dialog button'"]))
      
 ########################################################################
@@ -47,7 +47,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to programatic dialog button", 
-    ["BRAILLE LINE:  'Show Dialog Button Programatic Dialog \(3 second delay\) Button Show TabContainer Dialog Button Test slow loading HREF Dialog Button Show File Dialog Button'",
+    ["BRAILLE LINE:  'Programatic Dialog \(3 second delay\) Button'",
      "     VISIBLE:  'Programatic Dialog \(3 second del', cursor=1",
      "SPEECH OUTPUT: 'Programatic Dialog \(3 second delay\) button'"]))
      
@@ -58,8 +58,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to tabcontainer dialog button", 
-    ["BRAILLE LINE:  'Show Dialog Button Programatic Dialog \(3 second delay\) Button Show TabContainer Dialog Button Test slow loading HREF Dialog Button Show File Dialog Button'",
-     "     VISIBLE:  'Show TabContainer Dialog Button ', cursor=1",
+    ["BRAILLE LINE:  'Show TabContainer Dialog Button'",
+     "     VISIBLE:  'Show TabContainer Dialog Button', cursor=1",
      "SPEECH OUTPUT: 'Show TabContainer Dialog button'"]))
 
 ########################################################################
@@ -70,9 +70,11 @@ sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForFocus("First tab", acc_role=pyatspi.ROLE_PAGE_TAB))
 sequence.append(utils.AssertPresentationAction(
     "Launch dialog", 
-    ["BRAILLE LINE:  'First tab Page Second tab Page'",
+    ["BUG? - Garbage speech at the end??",
+     "BRAILLE LINE:  'First tab Page Second tab Page'",
      "     VISIBLE:  'First tab Page Second tab Page', cursor=1",
-     "SPEECH OUTPUT: 'TabContainer Dialog dialog First tab page'"]))
+     "SPEECH OUTPUT: 'TabContainer Dialog dialog First tab page'",
+     "SPEECH OUTPUT: 'focused on dijit_layout_TabContainer_0_tablist_dijit_layout_ContentPane_0'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.  
@@ -85,7 +87,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic whereAmI", 
     ["BRAILLE LINE:  'First tab Page Second tab Page'",
      "     VISIBLE:  'First tab Page Second tab Page', cursor=1",
-     "SPEECH OUTPUT: 'tab list First tab page item 1 of 2 '"]))
+     "SPEECH OUTPUT: 'tab list First tab page item 1 of 2'"]))
 
 ########################################################################
 # Close the dialog, focus goes back to button.  
@@ -95,9 +97,11 @@ sequence.append(KeyComboAction("Escape"))
 sequence.append(WaitForFocus("Show TabContainer Dialog", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "close dialog", 
-    ["BRAILLE LINE:  'Show Dialog Button Programatic Dialog \(3 second delay\) Button Show TabContainer Dialog Button Test slow loading HREF Dialog Button Show File Dialog Button'",
-     "     VISIBLE:  'Show TabContainer Dialog Button ', cursor=1",
-     "SPEECH OUTPUT: 'Show TabContainer Dialog button'"]))
+    ["BUG? - Garbage speech at the end??",
+     "BRAILLE LINE:  'Show TabContainer Dialog Button'",
+     "     VISIBLE:  'Show TabContainer Dialog Button', cursor=1",
+     "SPEECH OUTPUT: 'Show TabContainer Dialog button'",
+     "SPEECH OUTPUT: 'focused on dijit_form_Button_1'"]))
 
 ########################################################################
 # Close the demo
diff --git a/test/keystrokes/firefox/dojo_panel_text.py b/test/keystrokes/firefox/dojo_panel_text.py
index ed4bb7f..f1708e9 100644
--- a/test/keystrokes/firefox/dojo_panel_text.py
+++ b/test/keystrokes/firefox/dojo_panel_text.py
@@ -32,9 +32,11 @@ sequence.append(TypeAction(" "))
 sequence.append(WaitForFocus("First tab"))
 sequence.append(utils.AssertPresentationAction(
     "Space to press the Show TabContainer Dialog", 
-    ["BRAILLE LINE:  'First tab Page Image Second tab Page Image'",
-     "     VISIBLE:  'First tab Page Image Second tab ', cursor=1",
-     "SPEECH OUTPUT: 'TabContainer Dialog dialog First tab page'"]))
+    ["BUG? - Garbage speech at the end??",
+     "BRAILLE LINE:  'First tab Page Second tab Page'",
+     "     VISIBLE:  'First tab Page Second tab Page', cursor=1",
+     "SPEECH OUTPUT: 'TabContainer Dialog dialog First tab page'",
+     "SPEECH OUTPUT: 'focused on dijit_layout_TabContainer_0_tablist_dijit_layout_ContentPane_0'"]))
 
 ########################################################################
 # Right Arrow to the Second tab page
@@ -43,8 +45,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Right Arrow to the Second tab page", 
-    ["BRAILLE LINE:  'First tab Page Image Second tab Page Image'",
-     "     VISIBLE:  'Second tab Page Image', cursor=1",
+    ["BRAILLE LINE:  'First tab Page Second tab Page'",
+     "     VISIBLE:  'First tab Page Second tab Page', cursor=16",
      "SPEECH OUTPUT: 'Second tab page'"]))
 
 ########################################################################
@@ -155,9 +157,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "6. Up Arrow", 
-    ["BRAILLE LINE:  'First tab Page Image Second tab Page Image'",
-     "     VISIBLE:  'First tab Page Image Second tab ', cursor=1",
-     "SPEECH OUTPUT: 'First tab page Second tab page'"]))
+    ["BRAILLE LINE:  'First tab Page Second tab Page'",
+     "     VISIBLE:  'First tab Page Second tab Page', cursor=1",
+     "SPEECH OUTPUT: 'First tab page Second tab page'",
+     "SPEECH OUTPUT: 'focused on dijit_layout_TabContainer_0_tablist_dijit_layout_ContentPane_0'"]))
 
 ########################################################################
 # Escape to dismiss the dialog.
@@ -168,7 +171,8 @@ sequence.append(utils.AssertPresentationAction(
     "Escape to dismiss the dialog", 
     ["BRAILLE LINE:  'Show TabContainer Dialog Button'",
      "     VISIBLE:  'Show TabContainer Dialog Button', cursor=1",
-     "SPEECH OUTPUT: 'Show TabContainer Dialog button'"]))
+     "SPEECH OUTPUT: 'Show TabContainer Dialog button'",
+     "SPEECH OUTPUT: 'focused on dijit_form_Button_1'"]))
 
 ########################################################################
 # Close the demo
diff --git a/test/keystrokes/firefox/dojo_slider.py b/test/keystrokes/firefox/dojo_slider.py
index 0dea599..0478f91 100644
--- a/test/keystrokes/firefox/dojo_slider.py
+++ b/test/keystrokes/firefox/dojo_slider.py
@@ -19,7 +19,7 @@ sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
 #
 sequence.append(KeyComboAction("<Control>l"))
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-sequence.append(TypeAction(utils.DojoURLPrefix + "form/test_Slider.html"))
+sequence.append(TypeAction(utils.DojoNightlyURLPrefix + "form/test_Slider.html"))
 sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForDocLoad())
 sequence.append(WaitForFocus("Dojo Slider Widget Demo", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
@@ -69,9 +69,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
 sequence.append(utils.AssertPresentationAction(
     "1 move first slider", 
     ["KNOWN ISSUE - crazy valuetext http://bugs.dojotoolkit.org/ticket/8539";,
-     "BRAILLE LINE:  'Horizontal Slider Example 10.242130750605327 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10.242', cursor=1",
-     "SPEECH OUTPUT: '10.242130750605327'"]))
+     "BRAILLE LINE:  'Horizontal Slider Example 10.223713646532438 Slider'",
+     "     VISIBLE:  'Horizontal Slider Example 10.223', cursor=1",
+     "SPEECH OUTPUT: '10.223713646532438'"]))
                             
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
@@ -82,9 +82,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "2 move first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 10.484261501210653 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10.484', cursor=1",
-     "SPEECH OUTPUT: '10.484261501210653'"]))
+    ["BRAILLE LINE:  'Horizontal Slider Example 10.447427293064877 Slider'",
+     "     VISIBLE:  'Horizontal Slider Example 10.447', cursor=1",
+     "SPEECH OUTPUT: '10.447427293064877'"]))
                                
 sequence.append(utils.StartRecordingAction())                      
 sequence.append(KeyComboAction("Right"))
@@ -95,9 +95,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "3 move first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 10.72639225181598 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10.726', cursor=1",
-     "SPEECH OUTPUT: '10.72639225181598'"]))
+    ["BRAILLE LINE:  'Horizontal Slider Example 10.671140939597315 Slider'",
+     "     VISIBLE:  'Horizontal Slider Example 10.671', cursor=1",
+     "SPEECH OUTPUT: '10.671140939597315'"]))
                            
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
@@ -108,9 +108,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "4 move first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 10.968523002421307 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10.968', cursor=1",
-     "SPEECH OUTPUT: '10.968523002421307'"]))
+    ["BRAILLE LINE:  'Horizontal Slider Example 10.894854586129753 Slider'",
+     "     VISIBLE:  'Horizontal Slider Example 10.894', cursor=1",
+     "SPEECH OUTPUT: '10.894854586129753'"]))
                                
 sequence.append(utils.StartRecordingAction())                  
 sequence.append(KeyComboAction("Right"))
@@ -121,9 +121,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "5 move first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 11.210653753026634 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 11.210', cursor=1",
-     "SPEECH OUTPUT: '11.210653753026634'"]))
+    ["BRAILLE LINE:  'Horizontal Slider Example 11.118568232662192 Slider'",
+     "     VISIBLE:  'Horizontal Slider Example 11.118', cursor=1",
+     "SPEECH OUTPUT: '11.118568232662192'"]))
                                   
 sequence.append(utils.StartRecordingAction())                    
 sequence.append(KeyComboAction("Left"))
@@ -134,9 +134,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "6 move first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 10.968523002421307 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10.968', cursor=1",
-     "SPEECH OUTPUT: '10.968523002421307'"]))
+    ["BRAILLE LINE:  'Horizontal Slider Example 10.894854586129753 Slider'",
+     "     VISIBLE:  'Horizontal Slider Example 10.894', cursor=1",
+     "SPEECH OUTPUT: '10.894854586129753'"]))
                                  
 sequence.append(utils.StartRecordingAction())                     
 sequence.append(KeyComboAction("Left"))
@@ -147,9 +147,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "7 move first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 10.72639225181598 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10.726', cursor=1",
-     "SPEECH OUTPUT: '10.72639225181598'"]))
+    ["BRAILLE LINE:  'Horizontal Slider Example 10.671140939597315 Slider'",
+     "     VISIBLE:  'Horizontal Slider Example 10.671', cursor=1",
+     "SPEECH OUTPUT: '10.671140939597315'"]))
                                   
 sequence.append(utils.StartRecordingAction())                    
 sequence.append(KeyComboAction("Left"))
@@ -160,9 +160,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "8 move first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 10.484261501210653 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10.484', cursor=1",
-     "SPEECH OUTPUT: '10.484261501210653'"]))
+    ["BRAILLE LINE:  'Horizontal Slider Example 10.447427293064877 Slider'",
+     "     VISIBLE:  'Horizontal Slider Example 10.447', cursor=1",
+     "SPEECH OUTPUT: '10.447427293064877'"]))
                              
 sequence.append(utils.StartRecordingAction())                     
 sequence.append(KeyComboAction("Left"))
@@ -173,9 +173,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "9 move first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 10.242130750605327 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10.242', cursor=1",
-     "SPEECH OUTPUT: '10.242130750605327'"]))
+    ["BRAILLE LINE:  'Horizontal Slider Example 10.223713646532438 Slider'",
+     "     VISIBLE:  'Horizontal Slider Example 10.223', cursor=1",
+     "SPEECH OUTPUT: '10.223713646532438'"]))
                             
 sequence.append(utils.StartRecordingAction())                       
 sequence.append(KeyComboAction("Left"))
@@ -212,8 +212,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "move to button", 
-    ["BRAILLE LINE:  'Disable previous slider Button Enable previous slider Button'",
-     "     VISIBLE:  'Disable previous slider Button E', cursor=1",
+    ["BRAILLE LINE:  'Disable previous slider Button'",
+     "     VISIBLE:  'Disable previous slider Button', cursor=1",
      "SPEECH OUTPUT: 'Disable previous slider button'"]))
      
 ########################################################################
diff --git a/test/keystrokes/firefox/dojo_spinner.py b/test/keystrokes/firefox/dojo_spinner.py
index 474821d..f4b3103 100644
--- a/test/keystrokes/firefox/dojo_spinner.py
+++ b/test/keystrokes/firefox/dojo_spinner.py
@@ -19,7 +19,7 @@ sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
 #
 sequence.append(KeyComboAction("<Control>l"))
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-sequence.append(TypeAction(utils.DojoURLPrefix + "form/test_Spinner.html"))
+sequence.append(TypeAction(utils.DojoNightlyURLPrefix + "form/test_Spinner.html"))
 sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForDocLoad())
 sequence.append(WaitForFocus("Dojo Spinner Widget Test", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
@@ -39,9 +39,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the first spinner",
-    ["BUG? - The spinbox is followed by some text - 'onChange:' followed by a grayed out entry containing the text 'not fired yet!'. Either the 'on change' text should be present or, in my opinion, this 'not fired yet!' removed. This is true for all assertions.",
-     "BRAILLE LINE:  'Spinbox #1: 900 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 900 $l not fired yet', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 900 $l'",
+     "     VISIBLE:  'Spinbox #1: 900 $l', cursor=16",
      "SPEECH OUTPUT: 'Spinbox #1: 900 selected spin button required'"]))
 
 ########################################################################
@@ -51,10 +50,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 1", 
-    ["BRAILLE LINE:  'Spinbox #1: 900 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 900 $l not fired yet', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 899 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 899 $l not fired yet', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 900 $l'",
+     "     VISIBLE:  'Spinbox #1: 900 $l', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 899 $l'",
+     "     VISIBLE:  'Spinbox #1: 899 $l', cursor=16",
      "SPEECH OUTPUT: '899'"]))
 
 ########################################################################
@@ -64,10 +63,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 2", 
-    ["BRAILLE LINE:  'Spinbox #1: 899 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 899 $l not fired yet', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 898 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 898 $l not fired yet', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 899 $l'",
+     "     VISIBLE:  'Spinbox #1: 899 $l', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 898 $l'",
+     "     VISIBLE:  'Spinbox #1: 898 $l', cursor=16",
      "SPEECH OUTPUT: '898'"]))
 
 ########################################################################
@@ -77,10 +76,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 3", 
-    ["BRAILLE LINE:  'Spinbox #1: 898 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 898 $l not fired yet', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 897 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 897 $l not fired yet', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 898 $l'",
+     "     VISIBLE:  'Spinbox #1: 898 $l', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 897 $l'",
+     "     VISIBLE:  'Spinbox #1: 897 $l', cursor=16",
      "SPEECH OUTPUT: '897'"]))
 
 ########################################################################
@@ -90,10 +89,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 4", 
-    ["BRAILLE LINE:  'Spinbox #1: 897 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 897 $l not fired yet', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 896 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 896 $l not fired yet', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 897 $l'",
+     "     VISIBLE:  'Spinbox #1: 897 $l', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 896 $l'",
+     "     VISIBLE:  'Spinbox #1: 896 $l', cursor=16",
      "SPEECH OUTPUT: '896'"]))
 
 ########################################################################
@@ -103,10 +102,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 5", 
-    ["BRAILLE LINE:  'Spinbox #1: 896 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 896 $l not fired yet', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 895 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 895 $l not fired yet', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 896 $l'",
+     "     VISIBLE:  'Spinbox #1: 896 $l', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 895 $l'",
+     "     VISIBLE:  'Spinbox #1: 895 $l', cursor=16",
      "SPEECH OUTPUT: '895'"]))
 
 ########################################################################
@@ -116,10 +115,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 1", 
-    ["BRAILLE LINE:  'Spinbox #1: 895 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 895 $l not fired yet', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 896 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 896 $l not fired yet', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 895 $l'",
+     "     VISIBLE:  'Spinbox #1: 895 $l', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 896 $l'",
+     "     VISIBLE:  'Spinbox #1: 896 $l', cursor=16",
      "SPEECH OUTPUT: '896'"]))
 
 ########################################################################
@@ -129,10 +128,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 2", 
-    ["BRAILLE LINE:  'Spinbox #1: 896 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 896 $l not fired yet', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 897 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 897 $l not fired yet', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 896 $l'",
+     "     VISIBLE:  'Spinbox #1: 896 $l', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 897 $l'",
+     "     VISIBLE:  'Spinbox #1: 897 $l', cursor=16",
      "SPEECH OUTPUT: '897'"]))
 
 ########################################################################
@@ -142,10 +141,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 3", 
-    ["BRAILLE LINE:  'Spinbox #1: 897 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 897 $l not fired yet', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 898 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 898 $l not fired yet', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 897 $l'",
+     "     VISIBLE:  'Spinbox #1: 897 $l', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 898 $l'",
+     "     VISIBLE:  'Spinbox #1: 898 $l', cursor=16",
      "SPEECH OUTPUT: '898'"]))
 
 ########################################################################
@@ -155,10 +154,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 4", 
-    ["BRAILLE LINE:  'Spinbox #1: 898 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 898 $l not fired yet', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 899 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 899 $l not fired yet', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 898 $l'",
+     "     VISIBLE:  'Spinbox #1: 898 $l', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 899 $l'",
+     "     VISIBLE:  'Spinbox #1: 899 $l', cursor=16",
      "SPEECH OUTPUT: '899'"]))
 
 ########################################################################
@@ -168,10 +167,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 5", 
-    ["BRAILLE LINE:  'Spinbox #1: 899 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 899 $l not fired yet', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 900 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 900 $l not fired yet', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 899 $l'",
+     "     VISIBLE:  'Spinbox #1: 899 $l', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 900 $l'",
+     "     VISIBLE:  'Spinbox #1: 900 $l', cursor=16",
      "SPEECH OUTPUT: '900'"]))
 
 ########################################################################
@@ -181,10 +180,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 6", 
-    ["BRAILLE LINE:  'Spinbox #1: 900 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 900 $l not fired yet', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 901 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 901 $l not fired yet', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 900 $l'",
+     "     VISIBLE:  'Spinbox #1: 900 $l', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 901 $l'",
+     "     VISIBLE:  'Spinbox #1: 901 $l', cursor=16",
      "SPEECH OUTPUT: '901'"]))
 
 ########################################################################
@@ -194,10 +193,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 7", 
-    ["BRAILLE LINE:  'Spinbox #1: 901 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 901 $l not fired yet', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 902 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 902 $l not fired yet', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 901 $l'",
+     "     VISIBLE:  'Spinbox #1: 901 $l', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 902 $l'",
+     "     VISIBLE:  'Spinbox #1: 902 $l', cursor=16",
      "SPEECH OUTPUT: '902'"]))
 
 ########################################################################
@@ -208,9 +207,9 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  'Spinbox #1: 902 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 902 $l not fired yet', cursor=16",
-     "SPEECH OUTPUT: 'Spinbox #1: spin button 902 '"]))
+    ["BRAILLE LINE:  'Spinbox #1: 902 $l'",
+     "     VISIBLE:  'Spinbox #1: 902 $l', cursor=16",
+     "SPEECH OUTPUT: 'Spinbox #1: spin button 902 required'"]))
 
 ########################################################################
 # Close the demo
diff --git a/test/keystrokes/firefox/dojo_tabcontainer.py b/test/keystrokes/firefox/dojo_tabcontainer.py
index aeaea24..34336ce 100644
--- a/test/keystrokes/firefox/dojo_tabcontainer.py
+++ b/test/keystrokes/firefox/dojo_tabcontainer.py
@@ -19,7 +19,7 @@ sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
 #
 sequence.append(KeyComboAction("<Control>l"))
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-sequence.append(TypeAction(utils.DojoURLPrefix + "layout/test_TabContainer.html"))
+sequence.append(TypeAction(utils.DojoNightlyURLPrefix + "layout/test_TabContainer.html"))
 sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForDocLoad())
 sequence.append(WaitForFocus("TabContainer Demo", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
@@ -30,15 +30,15 @@ sequence.append(WaitForFocus("TabContainer Demo", acc_role=pyatspi.ROLE_DOCUMENT
 sequence.append(PauseAction(5000))
 
 ########################################################################
-# Tab to 'Tab 2'.  
+# Tab to 'Tab 1'.  
 #
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
-    "tab to tab 2", 
+    "tab to tab 1", 
     ["BRAILLE LINE:  'Tab 1 Page Tab 2 Page Tab 3 Page Inlined Sub TabContainer Page Sub TabContainer from href Page SplitContainer from href Page'",
-     "     VISIBLE:  'Tab 2 Page Tab 3 Page Inlined Su', cursor=1",
-     "SPEECH OUTPUT: 'Tab 2 page'"]))
+     "     VISIBLE:  'Tab 1 Page Tab 2 Page Tab 3 Page', cursor=1",
+     "SPEECH OUTPUT: 'Tab 1 page'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.  
@@ -49,8 +49,19 @@ sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
     ["BRAILLE LINE:  'Tab 1 Page Tab 2 Page Tab 3 Page Inlined Sub TabContainer Page Sub TabContainer from href Page SplitContainer from href Page'",
+     "     VISIBLE:  'Tab 1 Page Tab 2 Page Tab 3 Page', cursor=1",
+     "SPEECH OUTPUT: 'tab list Tab 1 page item 1 of 7'"]))
+
+########################################################################
+# Use arrows to move between tabs: 'Tab 2'.  The following will be presented.
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "arrow to tab 2", 
+    ["BRAILLE LINE:  'Tab 1 Page Tab 2 Page Tab 3 Page Inlined Sub TabContainer Page Sub TabContainer from href Page SplitContainer from href Page'",
      "     VISIBLE:  'Tab 2 Page Tab 3 Page Inlined Su', cursor=1",
-     "SPEECH OUTPUT: 'tab list Tab 2 page item 2 of 6 '"]))
+     "SPEECH OUTPUT: 'Tab 2 page'"]))
 
 ########################################################################
 # Use arrows to move between tabs: 'Tab 3'.  The following will be presented.
@@ -85,7 +96,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'Tab 1 Page Tab 2 Page Tab 3 Page Inlined Sub TabContainer Page Sub TabContainer from href Page SplitContainer from href Page'",
      "     VISIBLE:  'Sub TabContainer from href Page ', cursor=1",
      "SPEECH OUTPUT: 'Sub TabContainer from href page'",
-     "SPEECH OUTPUT: 'Subtab #1  This is a nested tab container BUT loaded via an href.'"]))
+     "SPEECH OUTPUT: ' Subtab #1  Subtab #2 This is a nested tab container BUT loaded via an href.'"]))
 
 ########################################################################
 # Tab to 'SubTab2'.  The following will be presented.
diff --git a/test/keystrokes/firefox/dojo_tree.py b/test/keystrokes/firefox/dojo_tree.py
index 359b804..bc11932 100644
--- a/test/keystrokes/firefox/dojo_tree.py
+++ b/test/keystrokes/firefox/dojo_tree.py
@@ -20,7 +20,7 @@ sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
 #
 sequence.append(KeyComboAction("<Control>l"))
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-sequence.append(TypeAction(utils.DojoURLPrefix + "test_Tree.html"))
+sequence.append(TypeAction(utils.DojoNightlyURLPrefix + "test_Tree.html"))
 sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForDocLoad())
 sequence.append(WaitForFocus("Dijit Tree Test", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
@@ -62,7 +62,7 @@ sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
     ["BRAILLE LINE:  'Africa ListItem'",
      "     VISIBLE:  'Africa ListItem', cursor=1",
-     "SPEECH OUTPUT: 'list item Africa  collapsed tree level 2'"]))
+     "SPEECH OUTPUT: 'list item Africa collapsed item 1 of 6 tree level 2'"]))
 
 ########################################################################
 # Use arrows to expand/collapse/navigate tree.  
diff --git a/test/keystrokes/firefox/find_wiki.py b/test/keystrokes/firefox/find_wiki.py
index bfa47ea..c6ad8fd 100644
--- a/test/keystrokes/firefox/find_wiki.py
+++ b/test/keystrokes/firefox/find_wiki.py
@@ -95,25 +95,29 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "6. Return",
-    ["SPEECH OUTPUT: 'Please join and participate on the Orca mailing list link  ( archives link ): it's a helpful, kind, and productive'"]))
+    ["BUG? - We are speaking the parens here.",
+     "SPEECH OUTPUT: 'Please join and participate on the Orca mailing list link  left paren archives link right paren: it's a helpful, kind, and productive'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "7. Return",
-    ["SPEECH OUTPUT: 'Darragh � Héiligh link  has created several audio guides for Orca. This is a fantastic contribution'"]))
+    ["BUG? - Should we be doing this?",
+     "SPEECH OUTPUT: 'Darragh O ACUTE Héiligh link  has created several audio guides for Orca. This is a fantastic contribution'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "8. Return",
-    ["SPEECH OUTPUT: 'â?¢ Review of Fedora 7 and the Orca screen reader for the Gnome graphical desktop link'"]))
+    ["BUG? - We are speaking the bullet here. I think we should be, but marking just in case.",
+     "SPEECH OUTPUT: 'bullet Review of Fedora 7 and the Orca screen reader for the Gnome graphical desktop link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "9. Return",
-    ["SPEECH OUTPUT: '(â?¢ |)Guide to installing the latest versions of Firefox and Orca link'"]))
+    ["BUG? - We are speaking the bullet here. I think we should be, but marking just in case.",
+     "SPEECH OUTPUT: '(bullet |)Guide to installing the latest versions of Firefox and Orca link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
diff --git a/test/keystrokes/firefox/html_role_combo_box.py b/test/keystrokes/firefox/html_role_combo_box.py
index 0d1ae86..3e12c0b 100644
--- a/test/keystrokes/firefox/html_role_combo_box.py
+++ b/test/keystrokes/firefox/html_role_combo_box.py
@@ -246,9 +246,10 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
-    ["BRAILLE LINE:  'Braille Combo'",
+    ["BUG? - The item count appears to be incorrect",
+     "BRAILLE LINE:  'Braille Combo'",
      "     VISIBLE:  'Braille Combo', cursor=1",
-     "SPEECH OUTPUT: 'combo box   '"]))
+     "SPEECH OUTPUT: 'Component combo box Braille item 1 of 1'"]))
 
 ########################################################################
 # Press Shift Tab once to return to the Version combo box.  
diff --git a/test/keystrokes/firefox/html_role_list_item_where_am_i.py b/test/keystrokes/firefox/html_role_list_item_where_am_i.py
index 667a3a9..9628f98 100644
--- a/test/keystrokes/firefox/html_role_list_item_where_am_i.py
+++ b/test/keystrokes/firefox/html_role_list_item_where_am_i.py
@@ -70,8 +70,7 @@ sequence.append(utils.AssertPresentationAction(
     "3. Basic Where Am I",
     ["BRAILLE LINE:  '1. A nested list item, not in a paragraph'",
      "     VISIBLE:  '1. A nested list item, not in a ', cursor=1",
-     "SPEECH OUTPUT: 'list item 1. A nested list item, not in a paragraph item 1 of 3'",
-     "SPEECH OUTPUT: 'Nesting level 1'"]))
+     "SPEECH OUTPUT: 'list item 1. A nested list item, not in a paragraph item 1 of 3 Nesting level 1'"]))
 
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_bug_547573.py b/test/keystrokes/firefox/line_nav_bug_547573.py
index 91beb74..1368cae 100644
--- a/test/keystrokes/firefox/line_nav_bug_547573.py
+++ b/test/keystrokes/firefox/line_nav_bug_547573.py
@@ -466,17 +466,18 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "52. Line Down",
-    ["BRAILLE LINE:  'Execute the downloaded file, prepended by the path to it. For example, if the file is in the current directory, prepend it with \"./\" (necessary if \".\" is not in the PATH'",
+    ["BUG? - We're speaking the quotes here",
+     "BRAILLE LINE:  'Execute the downloaded file, prepended by the path to it. For example, if the file is in the current directory, prepend it with \"./\" \(necessary if \".\" is not in the PATH'",
      "     VISIBLE:  'Execute the downloaded file, pre', cursor=1",
-     "SPEECH OUTPUT: 'Execute the downloaded file, prepended by the path to it. For example, if the file is in the current directory, prepend it with \"./\" (necessary if \".\" is not in the PATH'"]))
+     "SPEECH OUTPUT: 'Execute the downloaded file, prepended by the path to it. For example, if the file is in the current directory, prepend it with quote./quote \(necessary if quote.quote is not in the PATH'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "53. Line Down",
-    ["BRAILLE LINE:  'environment variable):'",
-     "     VISIBLE:  'environment variable):', cursor=1",
-     "SPEECH OUTPUT: 'environment variable):'"]))
+    ["BRAILLE LINE:  'environment variable\):'",
+     "     VISIBLE:  'environment variable\):', cursor=1",
+     "SPEECH OUTPUT: 'environment variable\):'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -498,17 +499,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "56. Line Down",
-    ["BRAILLE LINE:  'The JDK files are installed in a directory called jdk1.6.0_<version> in the current directory. Follow this link to see its directory structure. The JDK documentation'",
+    ["BRAILLE LINE:  'The JDK files are installed in a directory called jdk1.6.0_<version> in the current directory. Follow this link to see its directory structure. The JDK'",
      "     VISIBLE:  'The JDK files are installed in a', cursor=1",
-     "SPEECH OUTPUT: 'The JDK files are installed in a directory called jdk1.6.0_<version> in the current directory. Follow this link to see its directory structure link . The JDK documentation'"]))
+     "SPEECH OUTPUT: 'The JDK files are installed in a directory called jdk1.6.0_<version> in the current directory. Follow this link to see its directory structure link . The JDK'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "57. Line Down",
-    ["BRAILLE LINE:  'is a separate download.'",
-     "     VISIBLE:  'is a separate download.', cursor=1",
-     "SPEECH OUTPUT: 'is a separate download.'"]))
+    ["BRAILLE LINE:  'documentation is a separate download.'",
+     "     VISIBLE:  'documentation is a separate down', cursor=1",
+     "SPEECH OUTPUT: 'documentation is a separate download.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -700,9 +701,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "81. Line Down",
-    ["BRAILLE LINE:  'Note that the initial \"./\" is required if you do not have \".\" in your PATH environment variable.'",
+    ["BUG? - We're speaking the quotes here.",
+     "BRAILLE LINE:  'Note that the initial \"./\" is required if you do not have \".\" in your PATH environment variable.'",
      "     VISIBLE:  'Note that the initial \"./\" is re', cursor=1",
-     "SPEECH OUTPUT: 'Note that the initial \"./\" is required if you do not have \".\" in your PATH environment variable.'"]))
+     "SPEECH OUTPUT: 'Note that the initial quote./quote is required if you do not have quote.quote in your PATH environment variable.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -760,7 +762,7 @@ sequence.append(utils.AssertPresentationAction(
     "88. Line Down",
     ["BRAILLE LINE:  '� The /usr/java/latest link will always point to the version of Java that Sun Microsystems considers the latest version.  Subsequent upgrades of the packages will overwrite this'",
      "     VISIBLE:  'â?¢ The /usr/java/latest link will', cursor=1",
-     "SPEECH OUTPUT: '� The /usr/java/latest link will always point to the version of Java that Sun Microsystems considers the latest version.  Subsequent upgrades of the packages will overwrite this'"]))
+     "SPEECH OUTPUT: 'bullet The /usr/java/latest link will always point to the version of Java that Sun Microsystems considers the latest version.  Subsequent upgrades of the packages will overwrite this'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -776,7 +778,7 @@ sequence.append(utils.AssertPresentationAction(
     "90. Line Down",
     ["BRAILLE LINE:  '� By default, /usr/java/default points to /usr/java/latest. However, if administrators change /usr/java/default to  point to another version of Java, subsequent package upgrades'",
      "     VISIBLE:  'â?¢ By default, /usr/java/default ', cursor=1",
-     "SPEECH OUTPUT: '� By default, /usr/java/default points to /usr/java/latest. However, if administrators change /usr/java/default to  point to another version of Java, subsequent package upgrades'"]))
+     "SPEECH OUTPUT: 'bullet By default, /usr/java/default points to /usr/java/latest. However, if administrators change /usr/java/default to  point to another version of Java, subsequent package upgrades'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -933,7 +935,7 @@ sequence.append(utils.AssertPresentationAction(
     "9. Line Up",
     ["BRAILLE LINE:  '� By default, /usr/java/default points to /usr/java/latest. However, if administrators change /usr/java/default to  point to another version of Java, subsequent package upgrades'",
      "     VISIBLE:  'â?¢ By default, /usr/java/default ', cursor=1",
-     "SPEECH OUTPUT: '� By default, /usr/java/default points to /usr/java/latest. However, if administrators change /usr/java/default to  point to another version of Java, subsequent package upgrades'"]))
+     "SPEECH OUTPUT: 'bullet By default, /usr/java/default points to /usr/java/latest. However, if administrators change /usr/java/default to  point to another version of Java, subsequent package upgrades'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -1008,7 +1010,7 @@ sequence.append(utils.AssertPresentationAction(
     "17. Line Up",
     ["BRAILLE LINE:  'Note that the initial \"./\" is required if you do not have \".\" in your PATH environment variable.'",
      "     VISIBLE:  'Note that the initial \"./\" is re', cursor=1",
-     "SPEECH OUTPUT: 'Note that the initial \"./\" is required if you do not have \".\" in your PATH environment variable.'"]))
+     "SPEECH OUTPUT: 'Note that the initial quote./quote is required if you do not have quote.quote in your PATH environment variable.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -1200,17 +1202,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "38. Line Up",
-    ["BRAILLE LINE:  'is a separate download.'",
-     "     VISIBLE:  'is a separate download.', cursor=1",
-     "SPEECH OUTPUT: 'is a separate download.'"]))
+    ["BRAILLE LINE:  'documentation is a separate download.'",
+     "     VISIBLE:  'documentation is a separate down', cursor=1",
+     "SPEECH OUTPUT: 'documentation is a separate download.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "39. Line Up",
-    ["BRAILLE LINE:  'The JDK files are installed in a directory called jdk1.6.0_<version> in the current directory. Follow this link to see its directory structure. The JDK documentation'",
+    ["BRAILLE LINE:  'The JDK files are installed in a directory called jdk1.6.0_<version> in the current directory. Follow this link to see its directory structure. The JDK'",
      "     VISIBLE:  'The JDK files are installed in a', cursor=1",
-     "SPEECH OUTPUT: 'The JDK files are installed in a directory called jdk1.6.0_<version> in the current directory. Follow this link to see its directory structure link . The JDK documentation'"]))
+     "SPEECH OUTPUT: 'The JDK files are installed in a directory called jdk1.6.0_<version> in the current directory. Follow this link to see its directory structure link . The JDK'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -1232,17 +1234,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "42. Line Up",
-    ["BRAILLE LINE:  'environment variable):'",
-     "     VISIBLE:  'environment variable):', cursor=1",
-     "SPEECH OUTPUT: 'environment variable):'"]))
+    ["BRAILLE LINE:  'environment variable\):'",
+     "     VISIBLE:  'environment variable\):', cursor=1",
+     "SPEECH OUTPUT: 'environment variable\):'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "43. Line Up",
-    ["BRAILLE LINE:  'Execute the downloaded file, prepended by the path to it. For example, if the file is in the current directory, prepend it with \"./\" (necessary if \".\" is not in the PATH'",
+    ["BRAILLE LINE:  'Execute the downloaded file, prepended by the path to it. For example, if the file is in the current directory, prepend it with \"./\" \(necessary if \".\" is not in the PATH'",
      "     VISIBLE:  'Execute the downloaded file, pre', cursor=1",
-     "SPEECH OUTPUT: 'Execute the downloaded file, prepended by the path to it. For example, if the file is in the current directory, prepend it with \"./\" (necessary if \".\" is not in the PATH'"]))
+     "SPEECH OUTPUT: 'Execute the downloaded file, prepended by the path to it. For example, if the file is in the current directory, prepend it with quote./quote \(necessary if quote.quote is not in the PATH'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -1650,7 +1652,7 @@ sequence.append(utils.AssertPresentationAction(
     "93. Line Up",
     ["BRAILLE LINE:  '» search tips  Search $l Submit Search Button Home Page Image'",
      "     VISIBLE:  '» search tips  Search $l Submit ', cursor=1",
-     "SPEECH OUTPUT: '»  search tips link   text Search Submit Search button Home Page link image'"]))
+     "SPEECH OUTPUT: 'right double angle bracket  search tips link   text Search Submit Search button Home Page link image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_bug_549128.py b/test/keystrokes/firefox/line_nav_bug_549128.py
index da19322..b02ec43 100644
--- a/test/keystrokes/firefox/line_nav_bug_549128.py
+++ b/test/keystrokes/firefox/line_nav_bug_549128.py
@@ -72,9 +72,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
-    ["BRAILLE LINE:  '  2 (5 oz.) Filet Mignons'",
+    ["BUG? - We're speaking the right paren throughout this test.",
+     "BRAILLE LINE:  '  2 (5 oz.) Filet Mignons'",
      "     VISIBLE:  '  2 (5 oz.) Filet Mignons', cursor=1",
-     "SPEECH OUTPUT: '  2 (5 oz.) Filet Mignons",
+     "SPEECH OUTPUT: '  2 (5 oz.right paren Filet Mignons",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -83,7 +84,7 @@ sequence.append(utils.AssertPresentationAction(
     "5. Line Down",
     ["BRAILLE LINE:  '  2 (5 oz.) Top Sirloins'",
      "     VISIBLE:  '  2 (5 oz.) Top Sirloins', cursor=2",
-     "SPEECH OUTPUT: '  2 (5 oz.) Top Sirloins",
+     "SPEECH OUTPUT: '  2 (5 oz.right paren Top Sirloins",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -92,7 +93,7 @@ sequence.append(utils.AssertPresentationAction(
     "6. Line Down",
     ["BRAILLE LINE:  '  4 (4 oz.) Foobar Steaks Burgers'",
      "     VISIBLE:  '  4 (4 oz.) Foobar Steaks Burger', cursor=2",
-     "SPEECH OUTPUT: '  4 (4 oz.) Foobar Steaks Burgers",
+     "SPEECH OUTPUT: '  4 (4 oz.right paren Foobar Steaks Burgers",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -101,7 +102,7 @@ sequence.append(utils.AssertPresentationAction(
     "7. Line Down",
     ["BRAILLE LINE:  '  6 (5.75 oz.) Stuffed Baked Potatoes'",
      "     VISIBLE:  '  6 (5.75 oz.) Stuffed Baked Pot', cursor=2",
-     "SPEECH OUTPUT: '  6 (5.75 oz.) Stuffed Baked Potatoes",
+     "SPEECH OUTPUT: '  6 (5.75 oz.right paren Stuffed Baked Potatoes",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -110,7 +111,7 @@ sequence.append(utils.AssertPresentationAction(
     "8. Line Down",
     ["BRAILLE LINE:  '  2 (4.5 oz.) Stuffed Sole with Scallops and Crab'",
      "     VISIBLE:  '  2 (4.5 oz.) Stuffed Sole with ', cursor=2",
-     "SPEECH OUTPUT: '  2 (4.5 oz.) Stuffed Sole with Scallops and Crab",
+     "SPEECH OUTPUT: '  2 (4.5 oz.right paren Stuffed Sole with Scallops and Crab",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -119,7 +120,7 @@ sequence.append(utils.AssertPresentationAction(
     "9. Line Down",
     ["BRAILLE LINE:  '  1 (6 in.) Chocolate Lover's Cake'",
      "     VISIBLE:  '  1 (6 in.) Chocolate Lover's Ca', cursor=2",
-     "SPEECH OUTPUT: '  1 (6 in.) Chocolate Lover's Cake",
+     "SPEECH OUTPUT: '  1 (6 in.right paren Chocolate Lover's Cake",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -163,7 +164,7 @@ sequence.append(utils.AssertPresentationAction(
     "2. Line Up",
     ["BRAILLE LINE:  '  1 (6 in.) Chocolate Lover's Cake'",
      "     VISIBLE:  '  1 (6 in.) Chocolate Lover's Ca', cursor=1",
-     "SPEECH OUTPUT: '  1 (6 in.) Chocolate Lover's Cake",
+     "SPEECH OUTPUT: '  1 (6 in.right paren Chocolate Lover's Cake",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -172,7 +173,7 @@ sequence.append(utils.AssertPresentationAction(
     "3. Line Up",
     ["BRAILLE LINE:  '  2 (4.5 oz.) Stuffed Sole with Scallops and Crab'",
      "     VISIBLE:  '  2 (4.5 oz.) Stuffed Sole with ', cursor=1",
-     "SPEECH OUTPUT: '  2 (4.5 oz.) Stuffed Sole with Scallops and Crab",
+     "SPEECH OUTPUT: '  2 (4.5 oz.right paren Stuffed Sole with Scallops and Crab",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -181,7 +182,7 @@ sequence.append(utils.AssertPresentationAction(
     "4. Line Up",
     ["BRAILLE LINE:  '  6 (5.75 oz.) Stuffed Baked Potatoes'",
      "     VISIBLE:  '  6 (5.75 oz.) Stuffed Baked Pot', cursor=1",
-     "SPEECH OUTPUT: '  6 (5.75 oz.) Stuffed Baked Potatoes",
+     "SPEECH OUTPUT: '  6 (5.75 oz.right paren Stuffed Baked Potatoes",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -190,7 +191,7 @@ sequence.append(utils.AssertPresentationAction(
     "5. Line Up",
     ["BRAILLE LINE:  '  4 (4 oz.) Foobar Steaks Burgers'",
      "     VISIBLE:  '  4 (4 oz.) Foobar Steaks Burger', cursor=1",
-     "SPEECH OUTPUT: '  4 (4 oz.) Foobar Steaks Burgers",
+     "SPEECH OUTPUT: '  4 (4 oz.right paren Foobar Steaks Burgers",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -199,7 +200,7 @@ sequence.append(utils.AssertPresentationAction(
     "6. Line Up",
     ["BRAILLE LINE:  '  2 (5 oz.) Top Sirloins'",
      "     VISIBLE:  '  2 (5 oz.) Top Sirloins', cursor=1",
-     "SPEECH OUTPUT: '  2 (5 oz.) Top Sirloins",
+     "SPEECH OUTPUT: '  2 (5 oz.right paren Top Sirloins",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -208,7 +209,7 @@ sequence.append(utils.AssertPresentationAction(
     "7. Line Up",
     ["BRAILLE LINE:  '  2 (5 oz.) Filet Mignons'",
      "     VISIBLE:  '  2 (5 oz.) Filet Mignons', cursor=1",
-     "SPEECH OUTPUT: '  2 (5 oz.) Filet Mignons",
+     "SPEECH OUTPUT: '  2 (5 oz.right paren Filet Mignons",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_bug_570757.py b/test/keystrokes/firefox/line_nav_bug_570757.py
index 183fe3d..fd2a91a 100644
--- a/test/keystrokes/firefox/line_nav_bug_570757.py
+++ b/test/keystrokes/firefox/line_nav_bug_570757.py
@@ -65,7 +65,7 @@ sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
     ["BRAILLE LINE:  'â?¢ Do this thing'",
      "     VISIBLE:  'â?¢ Do this thing', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Do this thing'"]))
+     "SPEECH OUTPUT: 'bullet Do this thing'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -73,7 +73,7 @@ sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
     ["BRAILLE LINE:  'â?¢ Do this other thing'",
      "     VISIBLE:  'â?¢ Do this other thing', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Do this other thing'"]))
+     "SPEECH OUTPUT: 'bullet Do this other thing'"]))
 
 ########################################################################
 # Up Arrow.
@@ -84,7 +84,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Line Up",
     ["BRAILLE LINE:  'â?¢ Do this thing'",
      "     VISIBLE:  'â?¢ Do this thing', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Do this thing'"]))
+     "SPEECH OUTPUT: 'bullet Do this thing'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_bug_577239.py b/test/keystrokes/firefox/line_nav_bug_577239.py
index a2c3bfc..16e2c0f 100644
--- a/test/keystrokes/firefox/line_nav_bug_577239.py
+++ b/test/keystrokes/firefox/line_nav_bug_577239.py
@@ -41,6 +41,7 @@ sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("<Alt>p"))
 sequence.append(WaitForFocus("Position cursor at start of line when navigating vertically", acc_role=pyatspi.ROLE_CHECK_BOX))
 sequence.append(KeyComboAction("<Alt>o"))
+sequence.append(PauseAction(1000))
 sequence.append(TypeAction(" "))
 sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
 
@@ -104,7 +105,7 @@ sequence.append(utils.AssertPresentationAction(
     "6. Line Down",
     ["BRAILLE LINE:  'â?¢ This is a short list item.'",
      "     VISIBLE:  'â?¢ This is a short list item.', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ This is a short list item.'"]))
+     "SPEECH OUTPUT: 'bullet This is a short list item.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -112,7 +113,7 @@ sequence.append(utils.AssertPresentationAction(
     "7. Line Down",
     ["BRAILLE LINE:  'â?¢ This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
      "     VISIBLE:  'â?¢ This is a list item that spans', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'"]))
+     "SPEECH OUTPUT: 'bullet This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -131,7 +132,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Line Up",
     ["BRAILLE LINE:  'â?¢ This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
      "     VISIBLE:  'â?¢ This is a list item that spans', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'"]))
+     "SPEECH OUTPUT: 'bullet This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -139,7 +140,7 @@ sequence.append(utils.AssertPresentationAction(
     "2. Line Up",
     ["BRAILLE LINE:  'â?¢ This is a short list item.'",
      "     VISIBLE:  'â?¢ This is a short list item.', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ This is a short list item.'"]))
+     "SPEECH OUTPUT: 'bullet This is a short list item.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -202,6 +203,7 @@ sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("<Alt>p"))
 sequence.append(WaitForFocus("Position cursor at start of line when navigating vertically", acc_role=pyatspi.ROLE_CHECK_BOX))
 sequence.append(KeyComboAction("<Alt>o"))
+sequence.append(PauseAction(1000))
 sequence.append(TypeAction(" "))
 sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
 
diff --git a/test/keystrokes/firefox/line_nav_bug_577979.py b/test/keystrokes/firefox/line_nav_bug_577979.py
index 16fe00a..5e9bb9b 100644
--- a/test/keystrokes/firefox/line_nav_bug_577979.py
+++ b/test/keystrokes/firefox/line_nav_bug_577979.py
@@ -41,6 +41,7 @@ sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("<Alt>p"))
 sequence.append(WaitForFocus("Position cursor at start of line when navigating vertically", acc_role=pyatspi.ROLE_CHECK_BOX))
 sequence.append(KeyComboAction("<Alt>o"))
+sequence.append(PauseAction(1000))
 sequence.append(TypeAction(" "))
 sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
 
@@ -149,6 +150,7 @@ sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("<Alt>p"))
 sequence.append(WaitForFocus("Position cursor at start of line when navigating vertically", acc_role=pyatspi.ROLE_CHECK_BOX))
 sequence.append(KeyComboAction("<Alt>o"))
+sequence.append(PauseAction(1000))
 sequence.append(TypeAction(" "))
 sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
 
diff --git a/test/keystrokes/firefox/line_nav_bugzilla_search.py b/test/keystrokes/firefox/line_nav_bugzilla_search.py
index 4373f15..8978548 100644
--- a/test/keystrokes/firefox/line_nav_bugzilla_search.py
+++ b/test/keystrokes/firefox/line_nav_bugzilla_search.py
@@ -52,7 +52,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'New bug · Browse · Search · Reports · Account · Admin · Help Logged In joanmarie diggs gmail com | Log Out'",
      "     VISIBLE:  'New bug · Browse · Search · Repo', cursor=1",
-     "SPEECH OUTPUT: 'New bug link  · Browse link  · Search link  · Reports link  · Account link  · Admin link  · Help link Logged In joanmarie diggs gmail com | Log Out link'"]))
+     "SPEECH OUTPUT: 'New bug link  middle dot Browse link  middle dot Search link  middle dot Reports link  middle dot Account link  middle dot Admin link  middle dot Help link Logged In joanmarie diggs gmail com | Log Out link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -68,7 +68,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'Give me some help (reloads page.)'",
      "     VISIBLE:  'Give me some help (reloads page.', cursor=1",
-     "SPEECH OUTPUT: 'Give me some help link  (reloads page.)'"]))
+     "SPEECH OUTPUT: 'Give me some help link  (reloads page.right paren'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -1149,7 +1149,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'Give me some help (reloads page.)'",
      "     VISIBLE:  'Give me some help (reloads page.', cursor=1",
-     "SPEECH OUTPUT: 'Give me some help link  (reloads page.)'"]))
+     "SPEECH OUTPUT: 'Give me some help link  (reloads page.right paren'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -1165,7 +1165,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'New bug · Browse · Search · Reports · Account · Admin · Help Logged In joanmarie diggs gmail com | Log Out'",
      "     VISIBLE:  'New bug · Browse · Search · Repo', cursor=1",
-     "SPEECH OUTPUT: 'New bug link  · Browse link  · Search link  · Reports link  · Account link  · Admin link  · Help link Logged In joanmarie diggs gmail com | Log Out link'"]))
+     "SPEECH OUTPUT: 'New bug link  middle dot Browse link  middle dot Search link  middle dot Reports link  middle dot Account link  middle dot Admin link  middle dot Help link Logged In joanmarie diggs gmail com | Log Out link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_enter_bug.py b/test/keystrokes/firefox/line_nav_enter_bug.py
index 59e2eaa..88f405b 100644
--- a/test/keystrokes/firefox/line_nav_enter_bug.py
+++ b/test/keystrokes/firefox/line_nav_enter_bug.py
@@ -49,7 +49,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'New bug · Browse · Search · Reports · Account · Admin · Help Logged In joanmarie diggs gmail com | Log Out'",
      "     VISIBLE:  'New bug · Browse · Search · Repo', cursor=1",
-     "SPEECH OUTPUT: 'New bug link  · Browse link  · Search link  · Reports link  · Account link  · Admin link  · Help link Logged In joanmarie diggs gmail com | Log Out link'"]))
+     "SPEECH OUTPUT: 'New bug link  middle dot Browse link  middle dot Search link  middle dot Reports link  middle dot Account link  middle dot Admin link  middle dot Help link Logged In joanmarie diggs gmail com | Log Out link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -57,7 +57,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'Enter Bug: orca â?? This page lets you enter a new bug into Bugzilla. h1'",
      "     VISIBLE:  'Enter Bug: orca â?? This page lets', cursor=1",
-     "SPEECH OUTPUT: 'Enter Bug: orca â?? This page lets you enter a new bug into Bugzilla. heading level 1'"]))
+     "SPEECH OUTPUT: 'Enter Bug: orca en dash This page lets you enter a new bug into Bugzilla. heading level 1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -478,7 +478,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'Enter Bug: orca â?? This page lets you enter a new bug into Bugzilla. h1'",
      "     VISIBLE:  'Enter Bug: orca â?? This page lets', cursor=1",
-     "SPEECH OUTPUT: 'Enter Bug: orca â?? This page lets you enter a new bug into Bugzilla. heading level 1'"]))
+     "SPEECH OUTPUT: 'Enter Bug: orca en dash This page lets you enter a new bug into Bugzilla. heading level 1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -486,7 +486,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'New bug · Browse · Search · Reports · Account · Admin · Help Logged In joanmarie diggs gmail com | Log Out'",
      "     VISIBLE:  'New bug · Browse · Search · Repo', cursor=1",
-     "SPEECH OUTPUT: 'New bug link  · Browse link  · Search link  · Reports link  · Account link  · Admin link  · Help link Logged In joanmarie diggs gmail com | Log Out link'"]))
+     "SPEECH OUTPUT: 'New bug link  middle dot Browse link  middle dot Search link  middle dot Reports link  middle dot Account link  middle dot Admin link  middle dot Help link Logged In joanmarie diggs gmail com | Log Out link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_multi_line_text.py b/test/keystrokes/firefox/line_nav_multi_line_text.py
index f8049a6..29d3854 100644
--- a/test/keystrokes/firefox/line_nav_multi_line_text.py
+++ b/test/keystrokes/firefox/line_nav_multi_line_text.py
@@ -99,7 +99,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢ This is a test that is not very interesting.'",
      "     VISIBLE:  'â?¢ This is a test that is not ver', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ This is a test link  that is not very interesting.'"]))
+     "SPEECH OUTPUT: 'bullet This is a test link  that is not very interesting.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -107,7 +107,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢ But it looks like a real-world example.'",
      "     VISIBLE:  'â?¢ But it looks like a real-world', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ But it looks like link  a real-world example.'"]))
+     "SPEECH OUTPUT: 'bullet But it looks like link  a real-world example.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -115,7 +115,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢ And that's why this silly test is here.'",
      "     VISIBLE:  'â?¢ And that's why this silly test', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ And that's link  why this silly test is here.'"]))
+     "SPEECH OUTPUT: 'bullet And that's link  why this silly test is here.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -139,7 +139,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢ The thing is we can't copy content.'",
      "     VISIBLE:  'â?¢ The thing is we can't copy con', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ The thing is link  we can't copy content.'"]))
+     "SPEECH OUTPUT: 'bullet The thing is link  we can't copy content.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -147,7 +147,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢ So we must create silly tests.'",
      "     VISIBLE:  'â?¢ So we must create silly tests.', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ So we must link  create silly tests.'"]))
+     "SPEECH OUTPUT: 'bullet So we must link  create silly tests.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -155,7 +155,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢ Oh well.'",
      "     VISIBLE:  'â?¢ Oh well.', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Oh link  well.'"]))
+     "SPEECH OUTPUT: 'bullet Oh link  well.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -174,7 +174,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'â?¢ Oh well.'",
      "     VISIBLE:  'â?¢ Oh well.', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Oh link  well.'"]))
+     "SPEECH OUTPUT: 'bullet Oh link  well.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -182,7 +182,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'â?¢ So we must create silly tests.'",
      "     VISIBLE:  'â?¢ So we must create silly tests.', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ So we must link  create silly tests.'"]))
+     "SPEECH OUTPUT: 'bullet So we must link  create silly tests.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -190,7 +190,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'â?¢ The thing is we can't copy content.'",
      "     VISIBLE:  'â?¢ The thing is we can't copy con', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ The thing is link  we can't copy content.'"]))
+     "SPEECH OUTPUT: 'bullet The thing is link  we can't copy content.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -214,7 +214,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'â?¢ And that's why this silly test is here.'",
      "     VISIBLE:  'â?¢ And that's why this silly test', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ And that's link  why this silly test is here.'"]))
+     "SPEECH OUTPUT: 'bullet And that's link  why this silly test is here.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -222,7 +222,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'â?¢ But it looks like a real-world example.'",
      "     VISIBLE:  'â?¢ But it looks like a real-world', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ But it looks like link  a real-world example.'"]))
+     "SPEECH OUTPUT: 'bullet But it looks like link  a real-world example.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -230,7 +230,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'â?¢ This is a test that is not very interesting.'",
      "     VISIBLE:  'â?¢ This is a test that is not ver', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ This is a test link  that is not very interesting.'"]))
+     "SPEECH OUTPUT: 'bullet This is a test link  that is not very interesting.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_slash_test.py b/test/keystrokes/firefox/line_nav_slash_test.py
index 4e826c8..243fa45 100644
--- a/test/keystrokes/firefox/line_nav_slash_test.py
+++ b/test/keystrokes/firefox/line_nav_slash_test.py
@@ -69,21 +69,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
-    ["BUG? - We're speaking the object which just gave up focus",
-     "BRAILLE LINE:  'Recent Tags h4'",
+    ["BRAILLE LINE:  'Recent Tags h4'",
      "     VISIBLE:  'Recent Tags h4', cursor=1",
-     "SPEECH OUTPUT: 'Recent Tags link heading level 4'",
-     "SPEECH OUTPUT: 'Science'"]))
+     "SPEECH OUTPUT: 'Recent Tags link heading level 4'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Line Down",
-    ["BUG? - We're speaking the object which just gave up focus",
-     "BRAILLE LINE:  'Slashdot Login h4'",
+    ["BRAILLE LINE:  'Slashdot Login h4'",
      "     VISIBLE:  'Slashdot Login h4', cursor=1",
-     "SPEECH OUTPUT: 'Slashdot Login heading level 4'",
-     "SPEECH OUTPUT: 'Recent Tags'"]))
+     "SPEECH OUTPUT: 'Slashdot Login heading level 4'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -135,8 +131,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Line Up",
     ["BRAILLE LINE:  '& y RadioButton Some polls'",
      "     VISIBLE:  '& y RadioButton Some polls', cursor=1",
-     "SPEECH OUTPUT: 'Some polls not selected radio button'",
-     "SPEECH OUTPUT: 'Book Reviews'"]))
+     "SPEECH OUTPUT: 'Some polls not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -183,21 +178,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "7. Line Up",
-    ["BUG? - We're speaking the object which just gave up focus",
-     "BRAILLE LINE:  'Science h4'",
+    ["BRAILLE LINE:  'Science h4'",
      "     VISIBLE:  'Science h4', cursor=1",
-     "SPEECH OUTPUT: 'Science link heading level 4'",
-     "SPEECH OUTPUT: 'Recent Tags'"]))
+     "SPEECH OUTPUT: 'Science link heading level 4'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "8. Line Up",
-    ["BUG? - We're speaking the object which just gave up focus",
-     "BRAILLE LINE:  'Services h4'",
+    ["BRAILLE LINE:  'Services h4'",
      "     VISIBLE:  'Services h4', cursor=1",
-     "SPEECH OUTPUT: 'Services heading level 4'",
-     "SPEECH OUTPUT: 'Science'"]))
+     "SPEECH OUTPUT: 'Services heading level 4'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_wiki.py b/test/keystrokes/firefox/line_nav_wiki.py
index 21ec12c..383e026 100644
--- a/test/keystrokes/firefox/line_nav_wiki.py
+++ b/test/keystrokes/firefox/line_nav_wiki.py
@@ -77,9 +77,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
-    ["BRAILLE LINE:  'Home | Download/Installation | Configuration/Use | Accessible Applications | Mailing List (Archives) |'",
-     "     VISIBLE:  'Home | Download/Installation | Co', cursor=1",
-     "SPEECH OUTPUT: 'Home link | Download/Installation link  | Configuration/Use link  | Accessible Applications link  | Mailing List link  ( Archives link ) |'"]))
+    ["BUG? - We are speaking/verbalizing the parens",
+     "BRAILLE LINE:  'Home | Download/Installation | Configuration/Use | Accessible Applications | Mailing List (Archives) |'",
+     "     VISIBLE:  'Home | Download/Installation | C', cursor=1",
+     "SPEECH OUTPUT: 'Home link  | Download/Installation link  | Configuration/Use link  | Accessible Applications link  | Mailing List link  left paren Archives link right paren |'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -279,7 +280,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down", 
     ["BRAILLE LINE:  '" + bugzillaStringBraille + "( |)" + "how we use Bugzilla\).'",
      "     VISIBLE:  '" + bugzillaStringVisible + "', cursor=1",
-     "SPEECH OUTPUT: '" + bugzillaStringSpeech + "( |)" + "how we use Bugzilla link \).'"]))
+     "SPEECH OUTPUT: '" + bugzillaStringSpeech + "( |)" + "how we use Bugzilla link right paren.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -287,7 +288,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down", 
     ["BRAILLE LINE:  'Please join and participate on the Orca mailing list (archives): it's a helpful, kind, and productive'",
      "     VISIBLE:  'Please join and participate on t', cursor=1",
-     "SPEECH OUTPUT: 'Please join and participate on the Orca mailing list link  ( archives link ): it's a helpful, kind, and productive'"]))
+     "SPEECH OUTPUT: 'Please join and participate on the Orca mailing list link  left paren archives link right paren: it's a helpful, kind, and productive'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -309,9 +310,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
-    ["BRAILLE LINE:  'Darragh � Héiligh has created several audio guides for Orca. This is a fantastic contribution'",
+    ["BUG? - Should we be doing this?",
+     "BRAILLE LINE:  'Darragh � Héiligh has created several audio guides for Orca. This is a fantastic contribution'",
      "     VISIBLE:  'Darragh � Héiligh has created se', cursor=1",
-     "SPEECH OUTPUT: 'Darragh � Héiligh link  has created several audio guides for Orca. This is a fantastic contribution'"]))
+     "SPEECH OUTPUT: 'Darragh O ACUTE Héiligh link  has created several audio guides for Orca. This is a fantastic contribution'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -319,7 +321,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down", 
     ["BRAILLE LINE:  '(THANKS!)!!! The audio guides can be found at http://www.digitaldarragh.com/linuxat.asp and'",
      "     VISIBLE:  '(THANKS!)!!! The audio guides ca', cursor=1",
-     "SPEECH OUTPUT: '(THANKS!)!!! The audio guides can be found at http://www.digitaldarragh.com/linuxat.asp link  and'"]))
+     "SPEECH OUTPUT: '\(THANKS!right paren!!! The audio guides can be found at http://www.digitaldarragh.com/linuxat.asp link  and'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -335,7 +337,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down", 
     ["BRAILLE LINE:  'â?¢ Walk through of the installation of Ubuntu 7.4. Very helpful tutorial'",
      "     VISIBLE:  'â?¢ Walk through of the installati', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Walk through of the installation of Ubuntu 7.4. Very helpful tutorial link'"]))
+     "SPEECH OUTPUT: 'bullet Walk through of the installation of Ubuntu 7.4. Very helpful tutorial link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -343,7 +345,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down", 
     ["BRAILLE LINE:  'â?¢ Review of Fedora 7 and the Orca screen reader for the Gnome graphical desktop'",
      "     VISIBLE:  'â?¢ Review of Fedora 7 and the Orc', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Review of Fedora 7 and the Orca screen reader for the Gnome graphical desktop link'"]))
+     "SPEECH OUTPUT: 'bullet Review of Fedora 7 and the Orca screen reader for the Gnome graphical desktop link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -351,7 +353,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down", 
     ["BRAILLE LINE:  'â?¢ Guide to installing the latest versions of Firefox and Orca'",
      "     VISIBLE:  'â?¢ Guide to installing the latest', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Guide to installing the latest versions of Firefox and Orca link'"]))
+     "SPEECH OUTPUT: 'bullet Guide to installing the latest versions of Firefox and Orca link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -607,7 +609,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢ Frequently Asked Questions: FAQ'",
      "     VISIBLE:  'â?¢ Frequently Asked Questions: FA', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Frequently Asked Questions: FAQ link'"]))
+     "SPEECH OUTPUT: 'bullet Frequently Asked Questions: FAQ link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -615,7 +617,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢ Mailing list: orca-list gnome org (Archives)'",
      "     VISIBLE:  'â?¢ Mailing list: orca-list gnome ', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Mailing list: orca-list gnome org link  ( Archives link )'"]))
+     "SPEECH OUTPUT: 'bullet Mailing list: orca-list gnome org link  left paren Archives link right paren'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -623,7 +625,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢ Bug database: GNOME Bug Tracking System (Bugzilla) (current bug list)'",
      "     VISIBLE:  'â?¢ Bug database: GNOME Bug Tracki', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Bug database: GNOME Bug Tracking System (Bugzilla) link  ( current bug list link )'"]))
+     "SPEECH OUTPUT: 'bullet Bug database: GNOME Bug Tracking System (Bugzilla) link  left paren current bug list link right paren'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -631,7 +633,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢ Design documents: Orca Documentation Series'",
      "     VISIBLE:  'â?¢ Design documents: Orca Documen', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Design documents: Orca Documentation Series link'"]))
+     "SPEECH OUTPUT: 'bullet Design documents: Orca Documentation Series link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -639,7 +641,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢ Dive Into Python, Mark Pilgrim'",
      "     VISIBLE:  'â?¢ Dive Into Python, Mark Pilgrim', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Dive Into Python, Mark Pilgrim link'"]))
+     "SPEECH OUTPUT: 'bullet Dive Into Python, Mark Pilgrim link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -647,7 +649,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢ Python in a Nutshell, Alex Martelli'",
      "     VISIBLE:  'â?¢ Python in a Nutshell, Alex Mar', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Python in a Nutshell, Alex Martelli link'"]))
+     "SPEECH OUTPUT: 'bullet Python in a Nutshell, Alex Martelli link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -655,7 +657,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢ Python Pocket Reference, Mark Lutz'",
      "     VISIBLE:  'â?¢ Python Pocket Reference, Mark ', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Python Pocket Reference, Mark Lutz link'"]))
+     "SPEECH OUTPUT: 'bullet Python Pocket Reference, Mark Lutz link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -711,7 +713,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'Orca (last edited 2007-12-07 22:09:22 by WillieWalker)'",
      "     VISIBLE:  'Orca (last edited 2007-12-07 22:', cursor=1",
-     "SPEECH OUTPUT: 'Orca (last edited 2007-12-07 22:09:22 by WillieWalker link )'"]))
+     "SPEECH OUTPUT: 'Orca \(last edited 2007-12-07 22:09:22 by WillieWalker link right paren'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -844,7 +846,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'Orca (last edited 2007-12-07 22:09:22 by WillieWalker)'",
      "     VISIBLE:  'Orca (last edited 2007-12-07 22:', cursor=1",
-     "SPEECH OUTPUT: 'Orca (last edited 2007-12-07 22:09:22 by WillieWalker link )'"]))
+     "SPEECH OUTPUT: 'Orca \(last edited 2007-12-07 22:09:22 by WillieWalker link right paren'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -900,7 +902,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'â?¢ Python Pocket Reference, Mark Lutz'",
      "     VISIBLE:  'â?¢ Python Pocket Reference, Mark ', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Python Pocket Reference, Mark Lutz link'"]))
+     "SPEECH OUTPUT: 'bullet Python Pocket Reference, Mark Lutz link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -908,7 +910,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'â?¢ Python in a Nutshell, Alex Martelli'",
      "     VISIBLE:  'â?¢ Python in a Nutshell, Alex Mar', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Python in a Nutshell, Alex Martelli link'"]))
+     "SPEECH OUTPUT: 'bullet Python in a Nutshell, Alex Martelli link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -916,7 +918,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'â?¢ Dive Into Python, Mark Pilgrim'",
      "     VISIBLE:  'â?¢ Dive Into Python, Mark Pilgrim', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Dive Into Python, Mark Pilgrim link'"]))
+     "SPEECH OUTPUT: 'bullet Dive Into Python, Mark Pilgrim link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -924,7 +926,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'â?¢ Design documents: Orca Documentation Series'",
      "     VISIBLE:  'â?¢ Design documents: Orca Documen', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Design documents: Orca Documentation Series link'"]))
+     "SPEECH OUTPUT: 'bullet Design documents: Orca Documentation Series link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -932,7 +934,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'â?¢ Bug database: GNOME Bug Tracking System (Bugzilla) (current bug list)'",
      "     VISIBLE:  'â?¢ Bug database: GNOME Bug Tracki', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Bug database: GNOME Bug Tracking System (Bugzilla) link  ( current bug list link )'"]))
+     "SPEECH OUTPUT: 'bullet Bug database: GNOME Bug Tracking System (Bugzilla) link  left paren current bug list link right paren'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -940,7 +942,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'â?¢ Mailing list: orca-list gnome org (Archives)'",
      "     VISIBLE:  'â?¢ Mailing list: orca-list gnome ', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Mailing list: orca-list gnome org link  ( Archives link )'"]))
+     "SPEECH OUTPUT: 'bullet Mailing list: orca-list gnome org link  left paren Archives link right paren'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -948,7 +950,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'â?¢ Frequently Asked Questions: FAQ'",
      "     VISIBLE:  'â?¢ Frequently Asked Questions: FA', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Frequently Asked Questions: FAQ link'"]))
+     "SPEECH OUTPUT: 'bullet Frequently Asked Questions: FAQ link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -1204,7 +1206,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up", 
     ["BRAILLE LINE:  'â?¢ Guide to installing the latest versions of Firefox and Orca'",
      "     VISIBLE:  'â?¢ Guide to installing the latest', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Guide to installing the latest versions of Firefox and Orca link'"]))
+     "SPEECH OUTPUT: 'bullet Guide to installing the latest versions of Firefox and Orca link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -1212,7 +1214,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up", 
     ["BRAILLE LINE:  'â?¢ Review of Fedora 7 and the Orca screen reader for the Gnome graphical desktop'",
      "     VISIBLE:  'â?¢ Review of Fedora 7 and the Orc', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Review of Fedora 7 and the Orca screen reader for the Gnome graphical desktop link'"]))
+     "SPEECH OUTPUT: 'bullet Review of Fedora 7 and the Orca screen reader for the Gnome graphical desktop link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -1220,7 +1222,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up", 
     ["BRAILLE LINE:  'â?¢ Walk through of the installation of Ubuntu 7.4. Very helpful tutorial'",
      "     VISIBLE:  'â?¢ Walk through of the installati', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Walk through of the installation of Ubuntu 7.4. Very helpful tutorial link'"]))
+     "SPEECH OUTPUT: 'bullet Walk through of the installation of Ubuntu 7.4. Very helpful tutorial link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -1236,15 +1238,16 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up", 
     ["BRAILLE LINE:  '(THANKS!)!!! The audio guides can be found at http://www.digitaldarragh.com/linuxat.asp and'",
      "     VISIBLE:  '(THANKS!)!!! The audio guides ca', cursor=1",
-     "SPEECH OUTPUT: '(THANKS!)!!! The audio guides can be found at http://www.digitaldarragh.com/linuxat.asp link  and'"]))
+     "SPEECH OUTPUT: '\(THANKS!right paren!!! The audio guides can be found at http://www.digitaldarragh.com/linuxat.asp link  and'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up", 
-    ["BRAILLE LINE:  'Darragh � Héiligh has created several audio guides for Orca. This is a fantastic contribution'",
-     "     VISIBLE:  'Darragh � Héiligh has created se', cursor=1",
-     "SPEECH OUTPUT: 'Darragh � Héiligh link  has created several audio guides for Orca. This is a fantastic contribution'"]))
+    ["BUG? - Should we be doing this?",
+     "BRAILLE LINE:  'Darragh � Héiligh has created several audio guides for Orca. This is a fantastic contribution'",
+     "     VISIBLE:  'Darragh � Héiligh has created se', cursor=1",
+     "SPEECH OUTPUT: 'Darragh O ACUTE Héiligh link  has created several audio guides for Orca. This is a fantastic contribution'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -1268,7 +1271,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up", 
     ["BRAILLE LINE:  'Please join and participate on the Orca mailing list (archives): it's a helpful, kind, and productive'",
      "     VISIBLE:  'Please join and participate on t', cursor=1",
-     "SPEECH OUTPUT: 'Please join and participate on the Orca mailing list link  ( archives link ): it's a helpful, kind, and productive'"]))
+     "SPEECH OUTPUT: 'Please join and participate on the Orca mailing list link  left paren archives link right paren: it's a helpful, kind, and productive'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -1276,7 +1279,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up", 
     ["BRAILLE LINE:  '" + bugzillaStringBraille + "( |)" + "how we use Bugzilla\).'",
      "     VISIBLE:  '" + bugzillaStringVisible + "', cursor=1",
-     "SPEECH OUTPUT: '" + bugzillaStringSpeech + "( |)" + "how we use Bugzilla link \).'"]))
+     "SPEECH OUTPUT: '" + bugzillaStringSpeech + "( |)" + "how we use Bugzilla link right paren.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -1468,7 +1471,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up", 
     ["BRAILLE LINE:  'Home | Download/Installation | Configuration/Use | Accessible Applications | Mailing List (Archives) |'",
      "     VISIBLE:  'Home | Download/Installation | Co', cursor=1",
-     "SPEECH OUTPUT: 'Home link  | Download/Installation link  | Configuration/Use link  | Accessible Applications link  | Mailing List link  ( Archives link ) |'"]))
+     "SPEECH OUTPUT: 'Home link  | Download/Installation link  | Configuration/Use link  | Accessible Applications link  | Mailing List link  left paren archives link right paren |'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/link_where_am_i.py b/test/keystrokes/firefox/link_where_am_i.py
index 5725797..9f9cf5c 100644
--- a/test/keystrokes/firefox/link_where_am_i.py
+++ b/test/keystrokes/firefox/link_where_am_i.py
@@ -39,7 +39,7 @@ sequence.append(utils.AssertPresentationAction(
     "Where Am I on Product summary link", 
     ["BRAILLE LINE:  '3. Product summary (designed for maintainers)'",
      "     VISIBLE:  'Product summary (designed for ma', cursor=1",
-     "SPEECH OUTPUT: 'http link Product summary different site '"]))
+     "SPEECH OUTPUT: 'http link Product summary different site'"]))
 
 ########################################################################
 # Go home tab and do a Where Am I
@@ -55,7 +55,7 @@ sequence.append(utils.AssertPresentationAction(
     "Where Am I on New bug link", 
     ["BRAILLE LINE:  'New bug · Browse · Search · Reports · Account · Admin · Help Logged In william walker sun com | Log Out'",
      "     VISIBLE:  'New bug · Browse · Search · Repo', cursor=1",
-     "SPEECH OUTPUT: 'http link New bug different site '"]))
+     "SPEECH OUTPUT: 'http link New bug different site'"]))
 
 ########################################################################
 # Shift+Tab back to the footprint
@@ -67,9 +67,10 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Where Am I on footprint", 
-    ["BRAILLE LINE:  'Home Image Bugzilla'",
+    ["BUG? - Is it redundant to speak link twice?",
+     "BRAILLE LINE:  'Home Image Bugzilla'",
      "     VISIBLE:  'Home Image Bugzilla', cursor=1",
-     "SPEECH OUTPUT: 'http link Home image different site '"]))
+     "SPEECH OUTPUT: 'http link Home link image different site'"]))
 
 ########################################################################
 # Move to the location bar by pressing Control+L.  When it has focus
diff --git a/test/keystrokes/firefox/moz_menu.py b/test/keystrokes/firefox/moz_menu.py
index 507fc10..247c3c7 100644
--- a/test/keystrokes/firefox/moz_menu.py
+++ b/test/keystrokes/firefox/moz_menu.py
@@ -47,7 +47,7 @@ sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
     ["BRAILLE LINE:  'Edit'",
      "     VISIBLE:  'Edit', cursor=1",
-     "SPEECH OUTPUT: 'Edit section Edit  item 1 of 1'"]))
+     "SPEECH OUTPUT: 'ARIA Spreadsheet and Menubar embedded component Edit item 1 of 1'"]))
 
 ########################################################################
 # Use arrows to navigate menu structure.
diff --git a/test/keystrokes/firefox/page_summary.py b/test/keystrokes/firefox/page_summary.py
index 110b948..b230a04 100644
--- a/test/keystrokes/firefox/page_summary.py
+++ b/test/keystrokes/firefox/page_summary.py
@@ -50,8 +50,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'This is a Heading 6. h6', cursor=1",
      "BRAILLE LINE:  'This is a Heading 6. h6'",
      "     VISIBLE:  'This is a Heading 6. h6', cursor=1",
-     "SPEECH OUTPUT: 'heading level 6'",
-     "SPEECH OUTPUT: 'This is a Heading 6.'",
+     "SPEECH OUTPUT: 'heading level 6 This is a Heading 6.'",
      "SPEECH OUTPUT: '14 headings 3 forms 47 tables 19 unvisited links'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/tpg_aria_slider.py b/test/keystrokes/firefox/tpg_aria_slider.py
index 79cd61b..7353ba6 100644
--- a/test/keystrokes/firefox/tpg_aria_slider.py
+++ b/test/keystrokes/firefox/tpg_aria_slider.py
@@ -36,7 +36,7 @@ sequence.append(utils.AssertPresentationAction(
     "Tab to Volume Slider", 
     ["BRAILLE LINE:  'Volume 0 % Slider'",
      "     VISIBLE:  'Volume 0 % Slider', cursor=1",
-     "SPEECH OUTPUT: 'Volume slider 0 %'"]))
+     "SPEECH OUTPUT: 'Volume slider 0 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
@@ -49,7 +49,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 0 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 1 % Slider'",
      "     VISIBLE:  'Volume 1 % Slider', cursor=1",
-     "SPEECH OUTPUT: '1 %'"]))
+     "SPEECH OUTPUT: '1 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
@@ -61,7 +61,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 1 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 2 % Slider'",
      "     VISIBLE:  'Volume 2 % Slider', cursor=1",
-     "SPEECH OUTPUT: '2 %'"]))
+     "SPEECH OUTPUT: '2 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
@@ -73,7 +73,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 2 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 3 % Slider'",
      "     VISIBLE:  'Volume 3 % Slider', cursor=1",
-     "SPEECH OUTPUT: '3 %'"]))
+     "SPEECH OUTPUT: '3 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
@@ -85,7 +85,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 3 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 2 % Slider'",
      "     VISIBLE:  'Volume 2 % Slider', cursor=1",
-     "SPEECH OUTPUT: '2 %'"]))
+     "SPEECH OUTPUT: '2 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
@@ -97,7 +97,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 2 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 1 % Slider'",
      "     VISIBLE:  'Volume 1 % Slider', cursor=1",
-     "SPEECH OUTPUT: '1 %'"]))
+     "SPEECH OUTPUT: '1 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
@@ -109,7 +109,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 1 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 0 % Slider'",
      "     VISIBLE:  'Volume 0 % Slider', cursor=1",
-     "SPEECH OUTPUT: '0 %'"]))
+     "SPEECH OUTPUT: '0 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -121,7 +121,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 0 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 1 % Slider'",
      "     VISIBLE:  'Volume 1 % Slider', cursor=1",
-     "SPEECH OUTPUT: '1 %'"]))
+     "SPEECH OUTPUT: '1 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -133,7 +133,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 1 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 2 % Slider'",
      "     VISIBLE:  'Volume 2 % Slider', cursor=1",
-     "SPEECH OUTPUT: '2 %'"]))
+     "SPEECH OUTPUT: '2 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -145,7 +145,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 2 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 3 % Slider'",
      "     VISIBLE:  'Volume 3 % Slider', cursor=1",
-     "SPEECH OUTPUT: '3 %'"]))
+     "SPEECH OUTPUT: '3 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -157,7 +157,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 3 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 2 % Slider'",
      "     VISIBLE:  'Volume 2 % Slider', cursor=1",
-     "SPEECH OUTPUT: '2 %'"]))
+     "SPEECH OUTPUT: '2 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -169,7 +169,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 2 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 1 % Slider'",
      "     VISIBLE:  'Volume 1 % Slider', cursor=1",
-     "SPEECH OUTPUT: '1 %'"]))
+     "SPEECH OUTPUT: '1 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -181,7 +181,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 1 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 0 % Slider'",
      "     VISIBLE:  'Volume 0 % Slider', cursor=1",
-     "SPEECH OUTPUT: '0 %'"]))
+     "SPEECH OUTPUT: '0 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Up"))
@@ -193,7 +193,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 0 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 25 % Slider'",
      "     VISIBLE:  'Volume 25 % Slider', cursor=1",
-     "SPEECH OUTPUT: '25 %'"]))
+     "SPEECH OUTPUT: '25 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Up"))
@@ -205,7 +205,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 25 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 50 % Slider'",
      "     VISIBLE:  'Volume 50 % Slider', cursor=1",
-     "SPEECH OUTPUT: '50 %'"]))
+     "SPEECH OUTPUT: '50 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Down"))
@@ -217,7 +217,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 50 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 25 % Slider'",
      "     VISIBLE:  'Volume 25 % Slider', cursor=1",
-     "SPEECH OUTPUT: '25 %'"]))
+     "SPEECH OUTPUT: '25 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Down"))
@@ -229,7 +229,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 25 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 0 % Slider'",
      "     VISIBLE:  'Volume 0 % Slider', cursor=1",
-     "SPEECH OUTPUT: '0 %'"]))
+     "SPEECH OUTPUT: '0 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("End"))
@@ -241,7 +241,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 0 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 100 % Slider'",
      "     VISIBLE:  'Volume 100 % Slider', cursor=1",
-     "SPEECH OUTPUT: '100 %'"]))
+     "SPEECH OUTPUT: '100 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Home"))
@@ -253,7 +253,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Volume 100 % Slider', cursor=1",
      "BRAILLE LINE:  'Volume 0 % Slider'",
      "     VISIBLE:  'Volume 0 % Slider', cursor=1",
-     "SPEECH OUTPUT: '0 %'"]))
+     "SPEECH OUTPUT: '0 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
@@ -719,7 +719,7 @@ sequence.append(utils.AssertPresentationAction(
     "Tab to Red Slider", 
     ["BRAILLE LINE:  'Red 0 % Slider'",
      "     VISIBLE:  'Red 0 % Slider', cursor=1",
-     "SPEECH OUTPUT: 'Red slider 0 %'"]))
+     "SPEECH OUTPUT: 'Red slider 0 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
@@ -732,7 +732,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 0 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 1 % Slider'",
      "     VISIBLE:  'Red 1 % Slider', cursor=1",
-     "SPEECH OUTPUT: '1 %'"]))
+     "SPEECH OUTPUT: '1 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
@@ -744,7 +744,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 1 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 2 % Slider'",
      "     VISIBLE:  'Red 2 % Slider', cursor=1",
-     "SPEECH OUTPUT: '2 %'"]))
+     "SPEECH OUTPUT: '2 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
@@ -756,7 +756,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 2 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 3 % Slider'",
      "     VISIBLE:  'Red 3 % Slider', cursor=1",
-     "SPEECH OUTPUT: '3 %'"]))
+     "SPEECH OUTPUT: '3 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
@@ -768,7 +768,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 3 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 2 % Slider'",
      "     VISIBLE:  'Red 2 % Slider', cursor=1",
-     "SPEECH OUTPUT: '2 %'"]))
+     "SPEECH OUTPUT: '2 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
@@ -780,7 +780,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 2 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 1 % Slider'",
      "     VISIBLE:  'Red 1 % Slider', cursor=1",
-     "SPEECH OUTPUT: '1 %'"]))
+     "SPEECH OUTPUT: '1 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
@@ -792,7 +792,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 1 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 0 % Slider'",
      "     VISIBLE:  'Red 0 % Slider', cursor=1",
-     "SPEECH OUTPUT: '0 %'"]))
+     "SPEECH OUTPUT: '0 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -804,7 +804,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 0 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 1 % Slider'",
      "     VISIBLE:  'Red 1 % Slider', cursor=1",
-     "SPEECH OUTPUT: '1 %'"]))
+     "SPEECH OUTPUT: '1 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -816,7 +816,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 1 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 2 % Slider'",
      "     VISIBLE:  'Red 2 % Slider', cursor=1",
-     "SPEECH OUTPUT: '2 %'"]))
+     "SPEECH OUTPUT: '2 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -828,7 +828,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 2 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 3 % Slider'",
      "     VISIBLE:  'Red 3 % Slider', cursor=1",
-     "SPEECH OUTPUT: '3 %'"]))
+     "SPEECH OUTPUT: '3 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -840,7 +840,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 3 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 2 % Slider'",
      "     VISIBLE:  'Red 2 % Slider', cursor=1",
-     "SPEECH OUTPUT: '2 %'"]))
+     "SPEECH OUTPUT: '2 percent'"]))
 
 
 sequence.append(utils.StartRecordingAction())
@@ -853,7 +853,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 2 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 1 % Slider'",
      "     VISIBLE:  'Red 1 % Slider', cursor=1",
-     "SPEECH OUTPUT: '1 %'"]))
+     "SPEECH OUTPUT: '1 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -865,7 +865,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 1 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 0 % Slider'",
      "     VISIBLE:  'Red 0 % Slider', cursor=1",
-     "SPEECH OUTPUT: '0 %'"]))
+     "SPEECH OUTPUT: '0 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Up"))
@@ -877,7 +877,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 0 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 20 % Slider'",
      "     VISIBLE:  'Red 20 % Slider', cursor=1",
-     "SPEECH OUTPUT: '20 %'"]))
+     "SPEECH OUTPUT: '20 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Up"))
@@ -889,7 +889,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 20 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 40 % Slider'",
      "     VISIBLE:  'Red 40 % Slider', cursor=1",
-     "SPEECH OUTPUT: '40 %'"]))
+     "SPEECH OUTPUT: '40 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Down"))
@@ -901,7 +901,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 40 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 20 % Slider'",
      "     VISIBLE:  'Red 20 % Slider', cursor=1",
-     "SPEECH OUTPUT: '20 %'"]))
+     "SPEECH OUTPUT: '20 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Down"))
@@ -913,7 +913,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 20 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 0 % Slider'",
      "     VISIBLE:  'Red 0 % Slider', cursor=1",
-     "SPEECH OUTPUT: '0 %'"]))
+     "SPEECH OUTPUT: '0 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("End"))
@@ -925,7 +925,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 0 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 55 % Slider'",
      "     VISIBLE:  'Red 55 % Slider', cursor=1",
-     "SPEECH OUTPUT: '55 %'"]))
+     "SPEECH OUTPUT: '55 percent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Home"))
@@ -937,7 +937,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Red 55 % Slider', cursor=1",
      "BRAILLE LINE:  'Red 0 % Slider'",
      "     VISIBLE:  'Red 0 % Slider', cursor=1",
-     "SPEECH OUTPUT: '0 %'"]))
+     "SPEECH OUTPUT: '0 percent'"]))
 
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/uiuc_button.py b/test/keystrokes/firefox/uiuc_button.py
index ae35b89..92529f9 100644
--- a/test/keystrokes/firefox/uiuc_button.py
+++ b/test/keystrokes/firefox/uiuc_button.py
@@ -48,7 +48,7 @@ sequence.append(utils.AssertPresentationAction(
     "basic whereamI", 
     ["BRAILLE LINE:  'Font Larger + Button Font Smaller - Button &=y Italic i ToggleButton Bold B Button'",
      "     VISIBLE:  'Font Larger + Button Font Smalle', cursor=1",
-     "SPEECH OUTPUT: 'Font Larger + button '"]))
+     "SPEECH OUTPUT: 'Font Larger + button'"]))
 
 ########################################################################
 # Now push the first button.  The following will be presented.
diff --git a/test/keystrokes/firefox/uiuc_grid.py b/test/keystrokes/firefox/uiuc_grid.py
index 7b98026..8e1841c 100644
--- a/test/keystrokes/firefox/uiuc_grid.py
+++ b/test/keystrokes/firefox/uiuc_grid.py
@@ -37,6 +37,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'E-mail List Sorted by Date Capti', cursor=1",
      "BRAILLE LINE:  'Email 0 Selected CheckBox 1 Cell Read message Image Attachment Image Lowest priority Image John Smith Cell Trip to Florida Cell 2007-10-03 Cell 2K Cell'",
      "     VISIBLE:  'Email 0 Selected CheckBox 1 Cell', cursor=1",
+     "SPEECH OUTPUT: 'E-mail List Sorted by Date table'",
      "SPEECH OUTPUT: '1 Read message Attachment Lowest priority From John Smith Subject Trip to Florida panel'"]))
   
 ########################################################################
@@ -47,10 +48,10 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  'Email 0 Selected CheckBox 1 Cell Read message Image Attachment Image Lowest priority Image John Smith Cell Trip to Florida Cell 2007-10-03 Cell 2K Cell'",
+    ["BUG? - This amount of verbosity in the speech is not the result of the refactor, but it would be nice to figure out why we're doing it",
+     "BRAILLE LINE:  'Email 0 Selected CheckBox 1 Cell Read message Image Attachment Image Lowest priority Image John Smith Cell Trip to Florida Cell 2007-10-03 Cell 2K Cell'",
      "     VISIBLE:  'Email 0 Selected CheckBox 1 Cell', cursor=1",
-     "SPEECH OUTPUT: '1 Read message Attachment Lowest priority From John Smith Subject Trip to Florida panel'",
-     "SPEECH OUTPUT: '1 Read message Attachment Lowest priority John Smith Trip to Florida'"]))
+     "SPEECH OUTPUT: '1 Read message Attachment Lowest priority From John Smith Subject Trip to Florida panel 1 Read message Attachment Lowest priority John Smith Trip to Florida'"]))
 
 ########################################################################
 # Move down grid
diff --git a/test/keystrokes/firefox/uiuc_radiobutton.py b/test/keystrokes/firefox/uiuc_radiobutton.py
index 372ee9c..1660b7f 100644
--- a/test/keystrokes/firefox/uiuc_radiobutton.py
+++ b/test/keystrokes/firefox/uiuc_radiobutton.py
@@ -47,7 +47,7 @@ sequence.append(utils.AssertPresentationAction(
     "basic whereamI", 
     ["BRAILLE LINE:  '& y Thai RadioButton'",
      "     VISIBLE:  '& y Thai RadioButton', cursor=1",
-     "SPEECH OUTPUT: 'Lunch Options Thai radio button not selected  '"]))
+     "SPEECH OUTPUT: 'Lunch Options Thai radio button not selected'"]))
 
 ########################################################################
 # Move to the second radio button.
diff --git a/test/keystrokes/firefox/uiuc_tabpanel.py b/test/keystrokes/firefox/uiuc_tabpanel.py
index 7035d9b..3d769d5 100644
--- a/test/keystrokes/firefox/uiuc_tabpanel.py
+++ b/test/keystrokes/firefox/uiuc_tabpanel.py
@@ -57,7 +57,7 @@ sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
     ["BRAILLE LINE:  'Crust Page Veges Page Carnivore Page Delivery Page'",
      "     VISIBLE:  'Carnivore Page Delivery Page', cursor=1",
-     "SPEECH OUTPUT: 'tab list Carnivore page item 3 of 4 '"]))
+     "SPEECH OUTPUT: 'tab list Carnivore page item 3 of 4'"]))
 
 ########################################################################
 # Navigate to fourth tab
diff --git a/test/keystrokes/firefox/uiuc_tree.py b/test/keystrokes/firefox/uiuc_tree.py
index 8d7e69e..0dbb552 100644
--- a/test/keystrokes/firefox/uiuc_tree.py
+++ b/test/keystrokes/firefox/uiuc_tree.py
@@ -51,7 +51,7 @@ sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
     ["BRAILLE LINE:  'Fruits ListItem'",
      "     VISIBLE:  'Fruits ListItem', cursor=1",
-     "SPEECH OUTPUT: 'list item Fruits item 1 of 2 expanded tree level 1'"]))
+     "SPEECH OUTPUT: 'list item Fruits expanded item 1 of 2 tree level 1'"]))
 
 ########################################################################
 # Navigate the tree using the arrows.  
diff --git a/test/keystrokes/firefox/xul_role_tree_table.py b/test/keystrokes/firefox/xul_role_tree_table.py
index 0fd3c88..dfb592e 100644
--- a/test/keystrokes/firefox/xul_role_tree_table.py
+++ b/test/keystrokes/firefox/xul_role_tree_table.py
@@ -51,7 +51,7 @@ 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",
-     "SPEECH OUTPUT: 'Bookmarks Menu blank blank'"]))
+     "SPEECH OUTPUT: 'Bookmarks Menu'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter. 
@@ -63,9 +63,7 @@ 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'",
-     "SPEECH OUTPUT: 'column 1 of 3 row 2 of 3'",
-     "SPEECH OUTPUT: 'tree level 1'"]))
+     "SPEECH OUTPUT: 'tree table Name cell Bookmarks Menu column 1 of 3 row 2 of 3 tree level 1'"]))
 
 ########################################################################
 # Press Up Arrow to return to the previous item.
@@ -76,7 +74,7 @@ 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",
-     "SPEECH OUTPUT: 'Bookmarks Toolbar blank blank'"]))
+     "SPEECH OUTPUT: 'Bookmarks Toolbar'"]))
 
 ########################################################################
 # Press Alt F4 to close the window.
diff --git a/test/keystrokes/firefox/xul_where_am_i_status_bar.py b/test/keystrokes/firefox/xul_where_am_i_status_bar.py
index 6139c9d..82cc88f 100644
--- a/test/keystrokes/firefox/xul_where_am_i_status_bar.py
+++ b/test/keystrokes/firefox/xul_where_am_i_status_bar.py
@@ -70,7 +70,7 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  'Who expects the Spanish Inquisition? Button'",
      "     VISIBLE:  'Who expects the Spanish Inquisit', cursor=1",
      "SPEECH OUTPUT: 'Status Bar Regression Test - " + utils.firefoxFrameNames + "'",
-     "SPEECH OUTPUT: 'NOBODY expects the Spanish Inquisition! '"]))
+     "SPEECH OUTPUT: 'NOBODY expects the Spanish Inquisition!'"]))
 
 ########################################################################
 # Press Tab to the second push button and press it with space bar.  
@@ -105,7 +105,7 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  'Our chief weapon is... Button'",
      "     VISIBLE:  'Our chief weapon is... Button', cursor=1",
      "SPEECH OUTPUT: 'Status Bar Regression Test - " + utils.firefoxFrameNames + "'",
-     "SPEECH OUTPUT: 'Surprise. Surprise and fear. Fear and surprise... And ruthless efficiency... And an almost fanatical devotion to the Pope... And nice red uniforms. '"]))
+     "SPEECH OUTPUT: 'Surprise. Surprise and fear. Fear and surprise... And ruthless efficiency... And an almost fanatical devotion to the Pope... And nice red uniforms.'"]))
 
 ########################################################################
 # Press Tab to the third push button and press it with space bar.  
@@ -140,7 +140,7 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  'Fetch the COMFY CHAIR (AKA clear out the status bar) Button'",
      "     VISIBLE:  'Fetch the COMFY CHAIR (AKA clear', cursor=1",
      "SPEECH OUTPUT: 'Status Bar Regression Test - " + utils.firefoxFrameNames + "'",
-     "SPEECH OUTPUT: 'Done '"]))
+     "SPEECH OUTPUT: 'Done'"]))
 
 ########################################################################
 # Move to the location bar by pressing Control+L.  When it has focus
diff --git a/test/keystrokes/firefox/yahoo_tab_view.py b/test/keystrokes/firefox/yahoo_tab_view.py
index b4e2f92..dec5be1 100644
--- a/test/keystrokes/firefox/yahoo_tab_view.py
+++ b/test/keystrokes/firefox/yahoo_tab_view.py
@@ -84,7 +84,7 @@ sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
     ["BRAILLE LINE:  'Opera Page Firefox Page Explorer Page Safari Page'",
      "     VISIBLE:  'Safari Page', cursor=1",
-     "SPEECH OUTPUT: 'tab list Safari page item 4 of 4 '"]))
+     "SPEECH OUTPUT: 'tab list Safari page item 4 of 4'"]))
 
 ########################################################################
 # Left Arrow back to the third tab



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]