[orca] Updated test cases



commit dcc4edbf5277936505f2b06a15280c97246359b0
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri Nov 23 14:44:30 2018 -0500

    Updated test cases

 test/html/aria-landmarks.html                      | 16 ++--
 test/keystrokes/firefox/aria_alert.py              |  2 -
 test/keystrokes/firefox/aria_alert_dialog.py       |  6 +-
 test/keystrokes/firefox/aria_button_dojo.py        |  9 ++-
 test/keystrokes/firefox/aria_checkbox_dojo.py      |  1 +
 test/keystrokes/firefox/aria_combobox_dojo.py      | 20 +++--
 test/keystrokes/firefox/aria_dialog_dismissed.py   |  4 -
 test/keystrokes/firefox/aria_invalid.py            | 12 +--
 test/keystrokes/firefox/aria_list.py               |  3 +-
 test/keystrokes/firefox/aria_menu.py               |  4 +
 test/keystrokes/firefox/aria_radiobutton.py        | 19 +++--
 test/keystrokes/firefox/aria_slider.py             |  2 +-
 test/keystrokes/firefox/aria_slider_dojo.py        |  3 +-
 test/keystrokes/firefox/aria_slider_tpg.py         |  2 +-
 test/keystrokes/firefox/aria_sliders.py            |  6 +-
 test/keystrokes/firefox/aria_spinner_dojo.py       |  5 +-
 test/keystrokes/firefox/aria_tabpanel.py           | 20 ++---
 test/keystrokes/firefox/aria_tabpanel2.py          |  5 +-
 test/keystrokes/firefox/aria_tabpanel_text_dojo.py |  6 +-
 test/keystrokes/firefox/aria_tree.py               | 32 ++++----
 test/keystrokes/firefox/aria_tree_dojo.py          | 49 ++++++-------
 test/keystrokes/firefox/find_wiki.py               | 18 ++---
 .../keystrokes/firefox/flat_review_text_by_line.py | 30 ++++----
 .../firefox/flat_review_text_by_word_and_char.py   |  4 +
 .../firefox/focus_tracking_descriptions.py         |  6 --
 .../firefox/focus_tracking_input_type_number.py    |  6 +-
 .../firefox/focus_tracking_link_child_of_body.py   | 12 +--
 test/keystrokes/firefox/focus_tracking_links.py    |  4 -
 .../firefox/focus_tracking_roledescriptions.py     |  5 +-
 test/keystrokes/firefox/html_link_where_am_i.py    | 14 ++--
 test/keystrokes/firefox/html_role_combo_box.py     | 19 +++--
 test/keystrokes/firefox/html_role_links.py         | 10 +--
 .../firefox/html_role_list_item_where_am_i.py      | 12 ++-
 .../firefox/html_struct_nav_activate_link.py       | 19 ++---
 .../firefox/html_struct_nav_bug_554616.py          | 23 +++---
 .../firefox/html_struct_nav_bug_556470.py          |  4 +-
 .../html_struct_nav_clickable_text_change.py       |  6 +-
 .../firefox/html_struct_nav_containers.py          |  2 +-
 .../html_struct_nav_heading_in_div_with_text.py    |  2 -
 ...html_struct_nav_headings_with_hidden_anchors.py |  4 +-
 .../html_struct_nav_link_with_child_text.py        |  2 -
 test/keystrokes/firefox/html_struct_nav_links.py   |  2 -
 .../firefox/html_struct_nav_list_item.py           |  6 +-
 test/keystrokes/firefox/html_struct_nav_lists.py   |  4 +-
 test/keystrokes/firefox/line_nav_bug_577239.py     |  8 +-
 test/keystrokes/firefox/line_nav_bug_592383.py     |  2 +-
 .../firefox/line_nav_bugzilla_search_down.py       | 41 ++++++++---
 test/keystrokes/firefox/ui_doc_tabs.py             | 35 ++++++---
 test/keystrokes/firefox/ui_role_accel_label.py     |  8 +-
 test/keystrokes/firefox/ui_role_check_menu_item.py |  7 +-
 test/keystrokes/firefox/ui_role_entry.py           | 38 +---------
 test/keystrokes/firefox/ui_role_menu_bar.py        | 12 ++-
 .../keystrokes/firefox/ui_role_menu_flat_review.py |  5 +-
 test/keystrokes/firefox/ui_role_radio_button.py    |  2 +-
 test/keystrokes/firefox/ui_role_radio_menu_item.py | 12 +--
 test/keystrokes/firefox/ui_role_tree.py            | 73 +++++++++----------
 test/keystrokes/firefox/ui_role_tree_table.py      | 21 +++---
 test/keystrokes/firefox/ui_title_and_status_bar.py | 12 +--
 test/keystrokes/firefox/word_nav_list_items.py     |  2 +-
 .../gnome-clocks/stop_watch_flat_review.py         |  2 +-
 test/keystrokes/gnome-clocks/timer_flat_review.py  |  2 +-
 .../keystrokes/gnome-terminal/command_not_found.py |  5 +-
 test/keystrokes/gnome-terminal/man_page.py         |  6 +-
 test/keystrokes/gnome-terminal/nano.py             |  8 +-
 test/keystrokes/gnome-terminal/reverse_i_search.py | 14 ++--
 test/keystrokes/gnome-terminal/vim-append.py       | 79 +++++++++-----------
 test/keystrokes/gtk-demo/role_accel_label.py       |  1 -
 test/keystrokes/gtk-demo/role_check_box.py         |  4 +-
 test/keystrokes/gtk-demo/role_combo_box.py         | 30 ++++----
 test/keystrokes/gtk-demo/role_combo_box2.py        |  2 +-
 test/keystrokes/gtk-demo/role_dialog.py            |  9 +--
 test/keystrokes/gtk-demo/role_icon.py              | 14 ++--
 test/keystrokes/gtk-demo/role_icon_flat_review.py  | 74 +++++++++----------
 test/keystrokes/gtk-demo/role_label.py             | 40 ++++------
 test/keystrokes/gtk-demo/role_menu.py              |  1 -
 test/keystrokes/gtk-demo/role_push_button.py       |  2 +-
 test/keystrokes/gtk-demo/role_radio_button.py      |  3 +-
 test/keystrokes/gtk-demo/role_spin_button.py       | 12 +--
 test/keystrokes/gtk-demo/role_table.py             | 16 ++--
 test/keystrokes/gtk-demo/role_text_multiline.py    | 68 ++---------------
 .../gtk-demo/role_text_multiline_flat_review.py    |  2 +-
 .../gtk-demo/role_text_multiline_navigation.py     |  5 +-
 .../gtk-demo/role_text_multiline_navigation2.py    |  2 +-
 test/keystrokes/gtk-demo/role_tooltip.py           |  8 +-
 .../gtk3-demo/context_menu_flat_review.py          |  4 +-
 test/keystrokes/gtk3-demo/role_accel_label.py      |  1 -
 test/keystrokes/gtk3-demo/role_alert.py            |  3 +-
 test/keystrokes/gtk3-demo/role_check_box.py        |  4 +-
 test/keystrokes/gtk3-demo/role_check_menu_item.py  |  2 +
 test/keystrokes/gtk3-demo/role_color_chooser.py    |  1 +
 test/keystrokes/gtk3-demo/role_combo_box.py        | 25 ++++---
 test/keystrokes/gtk3-demo/role_combo_box2.py       |  6 +-
 test/keystrokes/gtk3-demo/role_dialog.py           |  4 +-
 .../gtk3-demo/role_dialog_flat_review.py           | 60 +++++++--------
 test/keystrokes/gtk3-demo/role_icon.py             | 14 ++--
 test/keystrokes/gtk3-demo/role_icon_flat_review.py |  2 +-
 test/keystrokes/gtk3-demo/role_info_bar.py         |  6 +-
 test/keystrokes/gtk3-demo/role_listbox.py          | 50 +++++--------
 test/keystrokes/gtk3-demo/role_menu.py             |  2 -
 test/keystrokes/gtk3-demo/role_menu_flat_review.py |  4 +-
 test/keystrokes/gtk3-demo/role_push_button.py      |  6 +-
 test/keystrokes/gtk3-demo/role_radio_button.py     |  5 +-
 test/keystrokes/gtk3-demo/role_spin_button.py      | 13 +---
 test/keystrokes/gtk3-demo/role_split_pane.py       | 24 +++---
 test/keystrokes/gtk3-demo/role_status_bar.py       | 10 ++-
 test/keystrokes/gtk3-demo/role_table.py            |  2 +
 .../keystrokes/gtk3-demo/role_table_flat_review.py | 32 ++++----
 test/keystrokes/gtk3-demo/role_text_multiline.py   | 66 ++---------------
 .../gtk3-demo/role_text_multiline_navigation.py    |  8 +-
 .../gtk3-demo/role_text_multiline_selection.py     |  9 ++-
 test/keystrokes/gtk3-demo/role_toggle_button.py    |  4 +-
 .../gtk3-demo/role_toggle_button_flat_review.py    | 18 ++---
 test/keystrokes/gtk3-demo/role_tooltip.py          |  2 +-
 .../oocalc/coordinate_announcement_off.py          |  9 ++-
 .../oocalc/coordinate_announcement_on.py           | 15 ++--
 test/keystrokes/oocalc/document_enter_text.py      | 23 +++---
 .../oocalc/document_enter_text_no_context.py       | 24 +++---
 .../oocalc/document_nav_dynamic_headers.py         | 30 ++++----
 test/keystrokes/oocalc/manage_names_combobox.py    | 29 +++++---
 .../oocalc/manage_names_combobox_no_context.py     | 32 +++++---
 test/keystrokes/oocalc/messages_dynamic_headers.py | 23 +++---
 test/keystrokes/oocalc/ui_role_check_menu_item.py  |  9 ++-
 test/keystrokes/oowriter/document_nav_line.py      |  4 +-
 .../oowriter/document_nav_line_bullets.py          |  2 +-
 test/keystrokes/oowriter/document_nav_word.py      | 22 +++---
 test/keystrokes/oowriter/document_new.py           |  8 +-
 .../oowriter/flat_review_context_menu.py           | 28 +++----
 .../oowriter/flat_review_line_columns.py           | 56 +++++++-------
 .../oowriter/flat_review_platform_menubar.py       | 32 ++++----
 test/keystrokes/oowriter/say_all.py                |  2 +-
 test/keystrokes/oowriter/selection_word.py         | 30 ++++----
 test/keystrokes/oowriter/spellcheck.py             | 30 ++++++--
 test/keystrokes/oowriter/spoken_indentation.py     |  1 +
 test/keystrokes/oowriter/structural_nav_table.py   | 13 ++--
 test/keystrokes/oowriter/table_cell_row.py         |  4 +
 test/keystrokes/oowriter/text_attributes.py        |  4 +
 test/keystrokes/oowriter/ui_find.py                | 13 ++--
 test/keystrokes/oowriter/ui_navigator.py           |  9 +--
 test/keystrokes/oowriter/ui_role_combo_box.py      | 11 ++-
 test/keystrokes/oowriter/ui_role_label.py          |  6 +-
 test/keystrokes/oowriter/ui_role_list_item.py      | 23 +++---
 test/keystrokes/oowriter/ui_role_menu.py           |  6 +-
 .../oowriter/ui_role_menu_flat_review.py           | 13 ++--
 test/keystrokes/oowriter/ui_role_toolbar.py        | 85 +++++++++++-----------
 144 files changed, 989 insertions(+), 1121 deletions(-)
---
diff --git a/test/html/aria-landmarks.html b/test/html/aria-landmarks.html
index 50c445d9d..119141795 100644
--- a/test/html/aria-landmarks.html
+++ b/test/html/aria-landmarks.html
@@ -30,16 +30,16 @@
 </head>
 
 <body>
-<div id="banner" role="banner">banner</div>
-<div id="navigation" role="navigation">navigation</div>
-<div id="main" role="main">main
-<div role="application" id="application">application</div>
+<div id="banner" role="banner">test 1</div>
+<div id="navigation" role="navigation">test 2</div>
+<div id="main" role="main">test 3
+<div role="application" id="application">test 4</div>
 </div>
-<div id="complementary" role="complementary"> complementary
-<div role="form" id="form"> form
-<div id="search" role="search">search</div>
+<div id="complementary" role="complementary"> test 5
+<div role="form" id="form"> test 6
+<div id="search" role="search">test 7</div>
 </div></div>
-<div id="contentinfo" role="contentinfo">contentinfo</div>
+<div id="contentinfo" role="contentinfo">test 8</div>
 
 </body>
 </html>
diff --git a/test/keystrokes/firefox/aria_alert.py b/test/keystrokes/firefox/aria_alert.py
index 832fc3366..18ef836f5 100644
--- a/test/keystrokes/firefox/aria_alert.py
+++ b/test/keystrokes/firefox/aria_alert.py
@@ -26,8 +26,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'This popup is created as a div i', cursor=0",
      "BRAILLE LINE:  'close'",
      "     VISIBLE:  'close', cursor=1",
-     "BRAILLE LINE:  'close'",
-     "     VISIBLE:  'close', cursor=1",
      "SPEECH OUTPUT: 'This popup is created as a div in the HTML content, rather than being created in the 
DOM at the time of use. The display style is changed from \"none\" to \"block\" to hide and show it. '",
      "SPEECH OUTPUT: 'close'",
      "SPEECH OUTPUT: 'link.'",     
diff --git a/test/keystrokes/firefox/aria_alert_dialog.py b/test/keystrokes/firefox/aria_alert_dialog.py
index a2903d538..3153f4489 100644
--- a/test/keystrokes/firefox/aria_alert_dialog.py
+++ b/test/keystrokes/firefox/aria_alert_dialog.py
@@ -44,8 +44,6 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Down arrow to read next line of message",
     ["BRAILLE LINE:  'Close push button'",
-     "     VISIBLE:  'Close push button', cursor=1",
-     "BRAILLE LINE:  'Close push button'",
      "     VISIBLE:  'Close push button', cursor=1",
      "SPEECH OUTPUT: 'Close push button'"]))
 
@@ -54,11 +52,9 @@ sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "5. Close Alert",
     ["BRAILLE LINE:  'Guess a number between 1 and 10 12 $l invalid'",
-     "     VISIBLE:  'ss a number between 1 and 10 12 ', cursor=32",
+     "     VISIBLE:  '12 $l invalid', cursor=3",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "BRAILLE LINE:  'Guess a number between 1 and 10 12 $l invalid'",
-     "     VISIBLE:  'ss a number between 1 and 10 12 ', cursor=32",
      "SPEECH OUTPUT: 'Guess a number between 1 and 10 entry 12 selected.'",
      "SPEECH OUTPUT: 'invalid entry'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
diff --git a/test/keystrokes/firefox/aria_button_dojo.py b/test/keystrokes/firefox/aria_button_dojo.py
index 4a6f4b051..c98035d14 100644
--- a/test/keystrokes/firefox/aria_button_dojo.py
+++ b/test/keystrokes/firefox/aria_button_dojo.py
@@ -85,13 +85,14 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction(" "))
 sequence.append(utils.AssertPresentationAction(
     "10. Open drop down menu on Create",
-    ["BRAILLE LINE:  'save options menu button'",
-     "     VISIBLE:  'save options menu button', cursor=1",
+    ["BRAILLE LINE:  'push button'",
+     "     VISIBLE:  'push button', cursor=1",
      "BRAILLE LINE:  'Create blank'",
      "     VISIBLE:  'Create blank', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "SPEECH OUTPUT: 'Create ▼ menu'",
+     "SPEECH OUTPUT: 'expanded'",
+     "SPEECH OUTPUT: 'Create save options menu'",
      "SPEECH OUTPUT: 'Create blank.'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
@@ -242,7 +243,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'white table cell', cursor=1",
      "BRAILLE LINE:  'white white lime lime green green blue blue table row'",
      "     VISIBLE:  'white white lime lime green gree', cursor=1",
-     "SPEECH OUTPUT: 'white white lime lime green green blue blue table row.'"]))
+     "SPEECH OUTPUT: 'white white lime lime green green blue blue.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Escape"))
diff --git a/test/keystrokes/firefox/aria_checkbox_dojo.py b/test/keystrokes/firefox/aria_checkbox_dojo.py
index d68eb4f9f..31f5a9a57 100644
--- a/test/keystrokes/firefox/aria_checkbox_dojo.py
+++ b/test/keystrokes/firefox/aria_checkbox_dojo.py
@@ -17,6 +17,7 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE: We are not presenting this in Nightly; we do with stable",
      "BRAILLE LINE:  '<x> cb0: Vanilla (non-dojo) checkbox (for comparison purposes) check box'",
      "     VISIBLE:  '<x> cb0: Vanilla (non-dojo) chec', cursor=1",
+     "SPEECH OUTPUT: 'form'",
      "SPEECH OUTPUT: 'cb0: Vanilla (non-dojo) checkbox (for comparison purposes) check box checked.'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/aria_combobox_dojo.py b/test/keystrokes/firefox/aria_combobox_dojo.py
index 538a76778..9d5aedbab 100644
--- a/test/keystrokes/firefox/aria_combobox_dojo.py
+++ b/test/keystrokes/firefox/aria_combobox_dojo.py
@@ -18,11 +18,9 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to the first combo box",
     ["BRAILLE LINE:  'US State test 1 (200% Courier font): California $l'",
-     "     VISIBLE:  '(200% Courier font): California ', cursor=32",
+     "     VISIBLE:  'font\): California $l', cursor=18",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "BRAILLE LINE:  'US State test 1 (200% Courier font): California $l'",
-     "     VISIBLE:  '(200% Courier font): California ', cursor=32",
      "SPEECH OUTPUT: 'collapsed'",
      "SPEECH OUTPUT: 'US State test 1 (200% Courier font): editable combo box California selected.'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
@@ -51,7 +49,7 @@ sequence.append(utils.AssertPresentationAction(
     "3. Down Arrow",
     ["BRAILLE LINE:  'C alifornia (CA)'",
      "     VISIBLE:  'C alifornia (CA)', cursor=1",
-     "SPEECH OUTPUT: 'C alifornia (CA).'"]))
+     "SPEECH OUTPUT: 'C alifornia (CA)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -59,7 +57,7 @@ sequence.append(utils.AssertPresentationAction(
     "4. Down Arrow",
     ["BRAILLE LINE:  'C olorado (CO)'",
      "     VISIBLE:  'C olorado (CO)', cursor=1",
-     "SPEECH OUTPUT: 'C olorado (CO).'"]))
+     "SPEECH OUTPUT: 'C olorado (CO)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -67,7 +65,7 @@ sequence.append(utils.AssertPresentationAction(
     "5. Down Arrow",
     ["BRAILLE LINE:  'C onnecticut (CT)'",
      "     VISIBLE:  'C onnecticut (CT)', cursor=1",
-     "SPEECH OUTPUT: 'C onnecticut (CT).'"]))
+     "SPEECH OUTPUT: 'C onnecticut (CT)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -75,7 +73,7 @@ sequence.append(utils.AssertPresentationAction(
     "6. Down Arrow",
     ["BRAILLE LINE:  'C alifornia (CA)'",
      "     VISIBLE:  'C alifornia (CA)', cursor=1",
-     "SPEECH OUTPUT: 'C alifornia (CA).'"]))
+     "SPEECH OUTPUT: 'C alifornia (CA)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -83,7 +81,7 @@ sequence.append(utils.AssertPresentationAction(
     "7. Up Arrow",
     ["BRAILLE LINE:  'C onnecticut (CT)'",
      "     VISIBLE:  'C onnecticut (CT)', cursor=1",
-     "SPEECH OUTPUT: 'C onnecticut (CT).'"]))
+     "SPEECH OUTPUT: 'C onnecticut (CT)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -91,7 +89,7 @@ sequence.append(utils.AssertPresentationAction(
     "8. Up Arrow",
     ["BRAILLE LINE:  'C olorado (CO)'",
      "     VISIBLE:  'C olorado (CO)', cursor=1",
-     "SPEECH OUTPUT: 'C olorado (CO).'"]))
+     "SPEECH OUTPUT: 'C olorado (CO)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -99,7 +97,7 @@ sequence.append(utils.AssertPresentationAction(
     "9. Up Arrow",
     ["BRAILLE LINE:  'C alifornia (CA)'",
      "     VISIBLE:  'C alifornia (CA)', cursor=1",
-     "SPEECH OUTPUT: 'C alifornia (CA).'"]))
+     "SPEECH OUTPUT: 'C alifornia (CA)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
@@ -108,7 +106,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'C alifornia (CA)'",
      "     VISIBLE:  'C alifornia (CA)', cursor=1",
      "SPEECH OUTPUT: 'expanded'",
-     "SPEECH OUTPUT: 'C alifornia (CA).'",
+     "SPEECH OUTPUT: 'C alifornia (CA)'",
      "SPEECH OUTPUT: '1 of 3'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/aria_dialog_dismissed.py 
b/test/keystrokes/firefox/aria_dialog_dismissed.py
index d7e3c6287..f16bd5392 100644
--- a/test/keystrokes/firefox/aria_dialog_dismissed.py
+++ b/test/keystrokes/firefox/aria_dialog_dismissed.py
@@ -14,8 +14,6 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to link",
     ["BRAILLE LINE:  'Display a dialog'",
-     "     VISIBLE:  'Display a dialog', cursor=1",
-     "BRAILLE LINE:  'Display a dialog'",
      "     VISIBLE:  'Display a dialog', cursor=1",
      "SPEECH OUTPUT: 'Display a dialog link.'"]))
 
@@ -33,8 +31,6 @@ sequence.append(utils.AssertPresentationAction(
     "3. Tab to dialog button",
     ["BRAILLE LINE:  'OK push button'",
      "     VISIBLE:  'OK push button', cursor=1",
-     "BRAILLE LINE:  'Just an example. dialog'",
-     "     VISIBLE:  'Just an example. dialog', cursor=1",
      "SPEECH OUTPUT: 'OK push button'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/aria_invalid.py b/test/keystrokes/firefox/aria_invalid.py
index f94b68c8f..16b11b926 100644
--- a/test/keystrokes/firefox/aria_invalid.py
+++ b/test/keystrokes/firefox/aria_invalid.py
@@ -17,8 +17,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'text 1 Hello wurld $l spelling', cursor=19",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "BRAILLE LINE:  'text 1 Hello wurld $l spelling'",
-     "     VISIBLE:  'text 1 Hello wurld $l spelling', cursor=19",
      "SPEECH OUTPUT: 'text 1 entry Hello wurld selected.'",
      "SPEECH OUTPUT: 'invalid spelling'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
@@ -28,6 +26,8 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. WhereAmI",
     ["BRAILLE LINE:  'text 1 Hello wurld $l spelling'",
+     "     VISIBLE:  'text 1 Hello wurld $l spelling', cursor=19",
+     "BRAILLE LINE:  'text 1 Hello wurld $l spelling'",
      "     VISIBLE:  'text 1 Hello wurld $l spelling', cursor=19",
      "SPEECH OUTPUT: 'text 1 entry Hello wurld selected.'",
      "SPEECH OUTPUT: 'invalid spelling'"]))
@@ -37,8 +37,6 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "3. Tab",
     ["BRAILLE LINE:  'text 2 World hello $l grammar'",
-     "     VISIBLE:  'text 2 World hello $l grammar', cursor=19",
-     "BRAILLE LINE:  'text 2 World hello $l grammar'",
      "     VISIBLE:  'text 2 World hello $l grammar', cursor=19",
      "SPEECH OUTPUT: 'text 2 entry World hello selected.'",
      "SPEECH OUTPUT: 'invalid grammar'"]))
@@ -57,8 +55,6 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "5. Tab",
     ["BRAILLE LINE:  'text 3 1234 $l invalid'",
-     "     VISIBLE:  'text 3 1234 $l invalid', cursor=12",
-     "BRAILLE LINE:  'text 3 1234 $l invalid'",
      "     VISIBLE:  'text 3 1234 $l invalid', cursor=12",
      "SPEECH OUTPUT: 'text 3 entry 1234 selected.'",
      "SPEECH OUTPUT: 'invalid entry'"]))
@@ -77,8 +73,6 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "7. Tab",
     ["BRAILLE LINE:  'text 4 Good $l'",
-     "     VISIBLE:  'text 4 Good $l', cursor=12",
-     "BRAILLE LINE:  'text 4 Good $l'",
      "     VISIBLE:  'text 4 Good $l', cursor=12",
      "SPEECH OUTPUT: 'text 4 entry Good selected.'"]))
 
@@ -139,8 +133,6 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "13. Tab",
     ["BRAILLE LINE:  'time 2 11:30 PM $l invalid'",
-     "     VISIBLE:  'time 2 11:30 PM $l invalid', cursor=16",
-     "BRAILLE LINE:  'time 2 11:30 PM $l invalid'",
      "     VISIBLE:  'time 2 11:30 PM $l invalid', cursor=16",
      "SPEECH OUTPUT: 'time 2 entry 11:30 PM selected.'",
      "SPEECH OUTPUT: 'invalid entry'"]))
diff --git a/test/keystrokes/firefox/aria_list.py b/test/keystrokes/firefox/aria_list.py
index 48b321208..479da1444 100644
--- a/test/keystrokes/firefox/aria_list.py
+++ b/test/keystrokes/firefox/aria_list.py
@@ -34,7 +34,8 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'sparrow'",
      "     VISIBLE:  'sparrow', cursor=1",
      "SPEECH OUTPUT: 'list item.'",
-     "SPEECH OUTPUT: 'sparrow.'"]))
+     "SPEECH OUTPUT: 'sparrow.'",
+     "SPEECH OUTPUT: '3 of 4.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/aria_menu.py b/test/keystrokes/firefox/aria_menu.py
index 4bda89a77..f39c72e6a 100644
--- a/test/keystrokes/firefox/aria_menu.py
+++ b/test/keystrokes/firefox/aria_menu.py
@@ -16,6 +16,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Move to the menu",
     ["BRAILLE LINE:  'Edit menu'",
      "     VISIBLE:  'Edit menu', cursor=1",
+     "SPEECH OUTPUT: 'leaving table.'",
      "SPEECH OUTPUT: 'Edit menu.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -42,6 +43,7 @@ sequence.append(utils.AssertPresentationAction(
     "4. Move to Themes",
     ["BRAILLE LINE:  'Themes          > menu'",
      "     VISIBLE:  'Themes          > menu', cursor=1",
+     "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: 'Themes          > menu.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -50,6 +52,7 @@ sequence.append(utils.AssertPresentationAction(
     "5. Move to basic grey",
     ["BRAILLE LINE:  'Basic Grey'",
      "     VISIBLE:  'Basic Grey', cursor=1",
+     "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: 'Basic Grey.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -122,6 +125,7 @@ sequence.append(utils.AssertPresentationAction(
     "14. Move to one",
     ["BRAILLE LINE:  'one'",
      "     VISIBLE:  'one', cursor=1",
+     "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: 'one.'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/aria_radiobutton.py b/test/keystrokes/firefox/aria_radiobutton.py
index 27423d4fd..0a6a634df 100644
--- a/test/keystrokes/firefox/aria_radiobutton.py
+++ b/test/keystrokes/firefox/aria_radiobutton.py
@@ -16,18 +16,15 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  '&=y Radio Maria radio button', cursor=1",
      "BRAILLE LINE:  'Browse mode'",
      "     VISIBLE:  'Browse mode', cursor=0",
-     "SPEECH OUTPUT: 'Lunch Options panel'",
+     "SPEECH OUTPUT: 'Lunch Options panel.'",
      "SPEECH OUTPUT: 'Radio Maria.'",
-     "SPEECH OUTPUT: 'selected radio button'",
-     "SPEECH OUTPUT: 'Browse mode' voice=system"]))
+     "SPEECH OUTPUT: 'selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. Basic whereamI",
     ["BRAILLE LINE:  '&=y Radio Maria radio button'",
-     "     VISIBLE:  '&=y Radio Maria radio button', cursor=1",
-     "BRAILLE LINE:  '&=y Radio Maria radio button'",
      "     VISIBLE:  '&=y Radio Maria radio button', cursor=1",
      "SPEECH OUTPUT: 'Lunch Options.'",
      "SPEECH OUTPUT: 'Radio Maria radio button.'",
@@ -55,10 +52,11 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "5. Move to next line",
-    ["BRAILLE LINE:  'Drink Options h3'",
-     "     VISIBLE:  'Drink Options h3', cursor=1",
-     "SPEECH OUTPUT: 'Drink Options heading level 3'"]))
+    "5. Down arrow within radio group",
+    ["BRAILLE LINE:  '&=y Thai radio button'",
+     "     VISIBLE:  '&=y Thai radio button', cursor=1",
+     "SPEECH OUTPUT: 'Thai.'",
+     "SPEECH OUTPUT: 'selected radio button'"]
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
@@ -66,7 +64,8 @@ sequence.append(utils.AssertPresentationAction(
     "6. Tab to second radio group",
     ["BRAILLE LINE:  '&=y Water radio button'",
      "     VISIBLE:  '&=y Water radio button', cursor=1",
-     "SPEECH OUTPUT: 'Drink Options panel'",
+     "SPEECH OUTPUT: 'leaving panel.'",
+     "SPEECH OUTPUT: 'Drink Options panel.'",
      "SPEECH OUTPUT: 'Water.'",
      "SPEECH OUTPUT: 'selected radio button'"]))
 
diff --git a/test/keystrokes/firefox/aria_slider.py b/test/keystrokes/firefox/aria_slider.py
index bf4f6bd18..6d9eff8df 100644
--- a/test/keystrokes/firefox/aria_slider.py
+++ b/test/keystrokes/firefox/aria_slider.py
@@ -18,7 +18,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'My slider 10% horizontal slider', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "SPEECH OUTPUT: 'My slider horizontal slider 10%.'",
+     "SPEECH OUTPUT: 'My slider horizontal slider 10%'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/aria_slider_dojo.py b/test/keystrokes/firefox/aria_slider_dojo.py
index f51c59405..aedbd4fe9 100644
--- a/test/keystrokes/firefox/aria_slider_dojo.py
+++ b/test/keystrokes/firefox/aria_slider_dojo.py
@@ -18,6 +18,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'slider 1 10 horizontal slider', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
+     "SPEECH OUTPUT: 'form'",
      "SPEECH OUTPUT: 'slider 1 horizontal slider 10.'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
@@ -61,8 +62,6 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "6. Move to entry",
     ["BRAILLE LINE:  'Slider1 Value: 10.[0-9]% rdonly'",
-     "     VISIBLE:  'Slider1 Value: 10.[0-9]% rdonly', cursor=21",
-     "BRAILLE LINE:  'Slider1 Value: 10.[0-9]% rdonly'",
      "     VISIBLE:  'Slider1 Value: 10.[0-9]% rdonly', cursor=21",
      "SPEECH OUTPUT: 'Slider1 Value: read only entry 10.[0-9]% selected.'"]))
 
diff --git a/test/keystrokes/firefox/aria_slider_tpg.py b/test/keystrokes/firefox/aria_slider_tpg.py
index 90fec4109..a2b08629a 100644
--- a/test/keystrokes/firefox/aria_slider_tpg.py
+++ b/test/keystrokes/firefox/aria_slider_tpg.py
@@ -18,7 +18,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Tab to Volume Horizontal Slider",
     ["BRAILLE LINE:  'Volume 0 % horizontal slider'",
      "     VISIBLE:  'Volume 0 % horizontal slider', cursor=1",
-     "SPEECH OUTPUT: 'Volume horizontal slider 0 %.'"]))
+     "SPEECH OUTPUT: 'Volume horizontal slider 0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
diff --git a/test/keystrokes/firefox/aria_sliders.py b/test/keystrokes/firefox/aria_sliders.py
index 9cfa0bc09..d5b1a25e6 100644
--- a/test/keystrokes/firefox/aria_sliders.py
+++ b/test/keystrokes/firefox/aria_sliders.py
@@ -7,14 +7,14 @@ sequence = MacroSequence()
 
 #sequence.append(WaitForDocLoad())
 sequence.append(PauseAction(5000))
-sequence.append(KeyComboAction("Tab"))
-sequence.append(KeyComboAction("<Shift>Tab"))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to slider 1",
-    ["BRAILLE LINE:  '30 horizontal slider'",
+    ["BRAILLE LINE:  'embedded'",
+     "     VISIBLE:  'embedded', cursor=1",
+     "BRAILLE LINE:  '30 horizontal slider'",
      "     VISIBLE:  '30 horizontal slider', cursor=1",
      "SPEECH OUTPUT: 'horizontal slider 30.'"]))
 
diff --git a/test/keystrokes/firefox/aria_spinner_dojo.py b/test/keystrokes/firefox/aria_spinner_dojo.py
index ef5184632..70137ffc4 100644
--- a/test/keystrokes/firefox/aria_spinner_dojo.py
+++ b/test/keystrokes/firefox/aria_spinner_dojo.py
@@ -19,8 +19,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Spinbox #1: 900 $l', cursor=16",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "BRAILLE LINE:  'Spinbox #1: 900 $l'",
-     "     VISIBLE:  'Spinbox #1: 900 $l', cursor=16",
+     "SPEECH OUTPUT: 'form'",
      "SPEECH OUTPUT: 'Spinbox #1: 900 selected spin button.'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
@@ -29,6 +28,8 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Decrement first spinner",
     ["BRAILLE LINE:  'Spinbox #1: 899 $l'",
+     "     VISIBLE:  'Spinbox #1: 899 $l', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 899 $l'",
      "     VISIBLE:  'Spinbox #1: 899 $l', cursor=16",
      "SPEECH OUTPUT: '899'"]))
 
diff --git a/test/keystrokes/firefox/aria_tabpanel.py b/test/keystrokes/firefox/aria_tabpanel.py
index c0ae93185..8ef36c6c7 100644
--- a/test/keystrokes/firefox/aria_tabpanel.py
+++ b/test/keystrokes/firefox/aria_tabpanel.py
@@ -21,7 +21,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'Tab Zero page tab'",
      "     VISIBLE:  'Tab Zero page tab', cursor=1",
      "SPEECH OUTPUT: 'page tab list.'",
-     "SPEECH OUTPUT: 'Tab Zero page tab.'",
+     "SPEECH OUTPUT: 'Tab Zero.'",
      "SPEECH OUTPUT: '1 of 5'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -46,32 +46,22 @@ sequence.append(utils.AssertPresentationAction(
     "4. Tab to contents",
     ["BRAILLE LINE:  '&=y Internal Portal Bookmark radio button'",
      "     VISIBLE:  '&=y Internal Portal Bookmark rad', cursor=1",
-     "BRAILLE LINE:  'Browse mode'",
-     "     VISIBLE:  'Browse mode', cursor=0",
      "SPEECH OUTPUT: 'Internal Portal Bookmark.'",
-     "SPEECH OUTPUT: 'selected radio button'",
-     "SPEECH OUTPUT: 'Browse mode' voice=system"]))
+     "SPEECH OUTPUT: 'selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Tab"))
 sequence.append(utils.AssertPresentationAction(
     "5. Shift+Tab out of contents",
-    ["BRAILLE LINE:  '&=y Internal Portal Bookmark radio button'",
-     "     VISIBLE:  '&=y Internal Portal Bookmark rad', cursor=1",
-     "BRAILLE LINE:  'Tab Two page tab'",
+    ["BRAILLE LINE:  'Tab Two page tab'",
      "     VISIBLE:  'Tab Two page tab', cursor=1",
-     "BRAILLE LINE:  'Focus mode'",
-     "     VISIBLE:  'Focus mode', cursor=0",
-     "SPEECH OUTPUT: 'Tab Two page tab.'",
-     "SPEECH OUTPUT: 'Focus mode' voice=system"]))
+     "SPEECH OUTPUT: 'Tab Two page tab.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "6. Right arrow to next tab",
-    ["BRAILLE LINE:  'Tab Two page tab'",
-     "     VISIBLE:  'Tab Two page tab', cursor=1",
-     "BRAILLE LINE:  'Tab Three page tab'",
+    ["BRAILLE LINE:  'Tab Three page tab'",
      "     VISIBLE:  'Tab Three page tab', cursor=1",
      "SPEECH OUTPUT: 'Tab Three page tab.'"]))
 
diff --git a/test/keystrokes/firefox/aria_tabpanel2.py b/test/keystrokes/firefox/aria_tabpanel2.py
index a18f60e00..c66d63fd6 100644
--- a/test/keystrokes/firefox/aria_tabpanel2.py
+++ b/test/keystrokes/firefox/aria_tabpanel2.py
@@ -20,10 +20,9 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  '&=y Thick and cheesy radio butto', cursor=1",
      "BRAILLE LINE:  'Browse mode'",
      "     VISIBLE:  'Browse mode', cursor=0",
-     "SPEECH OUTPUT: 'List with 4 items'",
+     "SPEECH OUTPUT: 'List with 4 items.'",
      "SPEECH OUTPUT: 'Thick and cheesy.'",
-     "SPEECH OUTPUT: 'selected radio button'",
-     "SPEECH OUTPUT: 'Browse mode' voice=system"]))
+     "SPEECH OUTPUT: 'selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Page_Down"))
diff --git a/test/keystrokes/firefox/aria_tabpanel_text_dojo.py 
b/test/keystrokes/firefox/aria_tabpanel_text_dojo.py
index 6841e6de2..2a8821132 100644
--- a/test/keystrokes/firefox/aria_tabpanel_text_dojo.py
+++ b/test/keystrokes/firefox/aria_tabpanel_text_dojo.py
@@ -47,8 +47,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'ipsum dolor sit amet', cursor=1",
      "BRAILLE LINE:  'Browse mode'",
      "     VISIBLE:  'Browse mode', cursor=0",
-     "BRAILLE LINE:  'ipsum dolor sit amet'",
-     "     VISIBLE:  'ipsum dolor sit amet', cursor=1",
      "SPEECH OUTPUT: 'ipsum dolor sit amet link.'",
      "SPEECH OUTPUT: 'Browse mode' voice=system"]))
 
@@ -56,7 +54,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Down Arrow in Browse Mode",
-    ["BRAILLE LINE:  'semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin porta rutrum'",
+    ["BRAILLE LINE:  'ipsum dolor sit amet'",
+     "     VISIBLE:  'ipsum dolor sit amet', cursor=1",
+     "BRAILLE LINE:  'semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin porta rutrum'",
      "     VISIBLE:  'semper sagittis velit. Cras in m', cursor=1",
      "SPEECH OUTPUT: 'semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin porta rutrum'"]))
 
diff --git a/test/keystrokes/firefox/aria_tree.py b/test/keystrokes/firefox/aria_tree.py
index 82477201f..5f208a2c3 100644
--- a/test/keystrokes/firefox/aria_tree.py
+++ b/test/keystrokes/firefox/aria_tree.py
@@ -18,8 +18,8 @@ sequence.append(utils.AssertPresentationAction(
     "1. Tab to tree",
     ["BRAILLE LINE:  'embedded'",
      "     VISIBLE:  'embedded', cursor=1",
-     "BRAILLE LINE:  'Fruits expanded list item'",
-     "     VISIBLE:  'Fruits expanded list item', cursor=1",
+     "BRAILLE LINE:  'Fruits expanded'",
+     "     VISIBLE:  'Fruits expanded', cursor=1",
      "SPEECH OUTPUT: 'Fruits.'",
      "SPEECH OUTPUT: 'expanded.'",
      "SPEECH OUTPUT: 'tree level 1'"]))
@@ -28,8 +28,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. Basic whereAmI",
-    ["BRAILLE LINE:  'Fruits expanded list item'",
-     "     VISIBLE:  'Fruits expanded list item', cursor=1",
+    ["BRAILLE LINE:  'Fruits expanded'",
+     "     VISIBLE:  'Fruits expanded', cursor=1",
      "SPEECH OUTPUT: 'list item.'",
      "SPEECH OUTPUT: 'Fruits.'",
      "SPEECH OUTPUT: '1 of 2.'",
@@ -56,8 +56,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Down arrow to apples",
-    ["BRAILLE LINE:  'Apples collapsed list item'",
-     "     VISIBLE:  'Apples collapsed list item', cursor=1",
+    ["BRAILLE LINE:  'Apples collapsed'",
+     "     VISIBLE:  'Apples collapsed', cursor=1",
      "SPEECH OUTPUT: 'Apples.'",
      "SPEECH OUTPUT: 'collapsed.'"]))
 
@@ -65,8 +65,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "6. Expand apples",
-    ["BRAILLE LINE:  'Apples expanded list item'",
-     "     VISIBLE:  'Apples expanded list item', cursor=1",
+    ["BRAILLE LINE:  'Apples expanded'",
+     "     VISIBLE:  'Apples expanded', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -82,8 +82,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "8. Down arrow to granny smith",
-    ["BRAILLE LINE:  'Granny Smith collapsed list item'",
-     "     VISIBLE:  'Granny Smith collapsed list item', cursor=1",
+    ["BRAILLE LINE:  'Granny Smith collapsed'",
+     "     VISIBLE:  'Granny Smith collapsed', cursor=1",
      "SPEECH OUTPUT: 'Granny Smith.'",
      "SPEECH OUTPUT: 'collapsed.'"]))
 
@@ -91,8 +91,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "9. Expand granny smith",
-    ["BRAILLE LINE:  'Granny Smith expanded list item'",
-     "     VISIBLE:  'Granny Smith expanded list item', cursor=1",
+    ["BRAILLE LINE:  'Granny Smith expanded'",
+     "     VISIBLE:  'Granny Smith expanded', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -150,8 +150,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "16. Down arrow to vegetables",
-    ["BRAILLE LINE:  'Vegetables expanded list item'",
-     "     VISIBLE:  'Vegetables expanded list item', cursor=1",
+    ["BRAILLE LINE:  'Vegetables expanded'",
+     "     VISIBLE:  'Vegetables expanded', cursor=1",
      "SPEECH OUTPUT: 'Vegetables.'",
      "SPEECH OUTPUT: 'expanded.'",
      "SPEECH OUTPUT: 'tree level 1'"]))
@@ -160,8 +160,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "17. Collapse vegetables",
-    ["BRAILLE LINE:  'Vegetables collapsed list item'",
-     "     VISIBLE:  'Vegetables collapsed list item', cursor=1",
+    ["BRAILLE LINE:  'Vegetables collapsed'",
+     "     VISIBLE:  'Vegetables collapsed', cursor=1",
      "SPEECH OUTPUT: 'collapsed'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/aria_tree_dojo.py b/test/keystrokes/firefox/aria_tree_dojo.py
index 67dec204a..64e724569 100644
--- a/test/keystrokes/firefox/aria_tree_dojo.py
+++ b/test/keystrokes/firefox/aria_tree_dojo.py
@@ -8,19 +8,17 @@ import utils
 sequence = MacroSequence()
 
 #sequence.append(WaitForDocLoad())
-sequence.append(PauseAction(5000))
-sequence.append(PauseAction(3000))
+sequence.append(PauseAction(8000))
 sequence.append(KeyComboAction("Tab"))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to continents",
-    ["KNOWN ISSUE: Nightly crashes when this test is run",
-     "BRAILLE LINE:  'before:  $l'",
+    ["BRAILLE LINE:  'before:  $l'",
      "     VISIBLE:  'before:  $l', cursor=9",
-     "BRAILLE LINE:  'Continents expanded list item'",
-     "     VISIBLE:  'Continents expanded list item', cursor=1",
+     "BRAILLE LINE:  'Continents expanded'",
+     "     VISIBLE:  'Continents expanded', cursor=1",
      "SPEECH OUTPUT: 'Continents.'",
      "SPEECH OUTPUT: 'expanded.'",
      "SPEECH OUTPUT: 'tree level 1'"]))
@@ -29,8 +27,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down arrow to Africa",
-    ["BRAILLE LINE:  'Africa collapsed list item'",
-     "     VISIBLE:  'Africa collapsed list item', cursor=1",
+    ["BRAILLE LINE:  'Africa collapsed'",
+     "     VISIBLE:  'Africa collapsed', cursor=1",
      "SPEECH OUTPUT: 'Africa.'",
      "SPEECH OUTPUT: 'collapsed.'",
      "SPEECH OUTPUT: 'tree level 2'"]))
@@ -39,19 +37,18 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "3. Basic whereAmI",
-    ["BRAILLE LINE:  'Africa collapsed list item'",
-     "     VISIBLE:  'Africa collapsed list item', cursor=1",
-     "SPEECH OUTPUT: 'list item.'",
+    ["BRAILLE LINE:  'Africa collapsed'",
+     "     VISIBLE:  'Africa collapsed', cursor=1",
      "SPEECH OUTPUT: 'Africa.'",
      "SPEECH OUTPUT: '1 of 6.'",
-     "SPEECH OUTPUT: 'collapsed tree level 2.'"]))
+     "SPEECH OUTPUT: 'collapsed tree level 2'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "4. Expand Africa",
-    ["BRAILLE LINE:  'Africa expanded list item'",
-     "     VISIBLE:  'Africa expanded list item', cursor=1",
+    ["BRAILLE LINE:  'Africa expanded'",
+     "     VISIBLE:  'Africa expanded', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -67,8 +64,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. Down arrow to Kenya",
-    ["BRAILLE LINE:  'Kenya collapsed list item'",
-     "     VISIBLE:  'Kenya collapsed list item', cursor=1",
+    ["BRAILLE LINE:  'Kenya collapsed'",
+     "     VISIBLE:  'Kenya collapsed', cursor=1",
      "SPEECH OUTPUT: 'Kenya.'",
      "SPEECH OUTPUT: 'collapsed.'"]))
 
@@ -76,24 +73,24 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "7. Expand Kenya",
-    ["BRAILLE LINE:  'Kenya expanded list item'",
-     "     VISIBLE:  'Kenya expanded list item', cursor=1",
+    ["BRAILLE LINE:  'Kenya expanded'",
+     "     VISIBLE:  'Kenya expanded', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "8. Collapse Kenya",
-    ["BRAILLE LINE:  'Kenya collapsed list item'",
-     "     VISIBLE:  'Kenya collapsed list item', cursor=1",
+    ["BRAILLE LINE:  'Kenya collapsed'",
+     "     VISIBLE:  'Kenya collapsed', cursor=1",
      "SPEECH OUTPUT: 'collapsed'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "9. Down arrow to Sudan",
-    ["BRAILLE LINE:  'Sudan collapsed list item'",
-     "     VISIBLE:  'Sudan collapsed list item', cursor=1",
+    ["BRAILLE LINE:  'Sudan collapsed'",
+     "     VISIBLE:  'Sudan collapsed', cursor=1",
      "SPEECH OUTPUT: 'Sudan.'",
      "SPEECH OUTPUT: 'collapsed.'"]))
 
@@ -101,8 +98,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "10. Down arrow to Asia",
-    ["BRAILLE LINE:  'Asia collapsed list item'",
-     "     VISIBLE:  'Asia collapsed list item', cursor=1",
+    ["BRAILLE LINE:  'Asia collapsed'",
+     "     VISIBLE:  'Asia collapsed', cursor=1",
      "SPEECH OUTPUT: 'Asia.'",
      "SPEECH OUTPUT: 'collapsed.'",
      "SPEECH OUTPUT: 'tree level 2'"]))
@@ -111,8 +108,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "11. Expand Asia",
-    ["BRAILLE LINE:  'Asia expanded list item'",
-     "     VISIBLE:  'Asia expanded list item', cursor=1",
+    ["BRAILLE LINE:  'Asia expanded'",
+     "     VISIBLE:  'Asia expanded', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/find_wiki.py b/test/keystrokes/firefox/find_wiki.py
index 9300442cd..b1f180822 100644
--- a/test/keystrokes/firefox/find_wiki.py
+++ b/test/keystrokes/firefox/find_wiki.py
@@ -20,9 +20,7 @@ sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "1. Return to next result",
     ["BRAILLE LINE:  'Welcome to Orca! h1'",
-     "     VISIBLE:  'Welcome to Orca! h1', cursor=12",
-     "BRAILLE LINE:  'Firefox application Orca - GNOME Live! - Nightly frame Find in page orca $l'",
-     "     VISIBLE:  'Find in page orca $l', cursor=18",
+     "     VISIBLE:  'Welcome to Orca! h1', cursor=16",
      "SPEECH OUTPUT: 'Welcome to Orca! heading level 1'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -31,8 +29,6 @@ sequence.append(utils.AssertPresentationAction(
     "2. Return to next result",
     ["BRAILLE LINE:  'Welcome to Orca!'",
      "     VISIBLE:  'Welcome to Orca!', cursor=1",
-     "BRAILLE LINE:  'Firefox application Orca - GNOME Live! - Nightly frame Find in page orca $l'",
-     "     VISIBLE:  'Find in page orca $l', cursor=18",
      "SPEECH OUTPUT: '1.'",
      "SPEECH OUTPUT: 'Welcome to Orca!'",
      "SPEECH OUTPUT: 'link.'"]))
@@ -42,19 +38,15 @@ sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "3. Return to next result",
     ["BRAILLE LINE:  'Orca is a free, open source, flexible, extensible, and '",
-     "     VISIBLE:  'Orca is a free, open source, fle', cursor=1",
-     "BRAILLE LINE:  'Firefox application Orca - GNOME Live! - Nightly frame Find in page orca $l'",
-     "     VISIBLE:  'Find in page orca $l', cursor=18",
+     "     VISIBLE:  'Orca is a free, open source, fle', cursor=5",
      "SPEECH OUTPUT: 'Orca is a free, open source, flexible, extensible, and'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "4. Return to next result",
-    ["BRAILLE LINE:  'Orca is a free, open source, flexible, extensible, and '",
-     "     VISIBLE:  'rce, flexible, extensible, and ', cursor=32",
-     "BRAILLE LINE:  'Firefox application Orca - GNOME Live! - Nightly frame Find in page orca $l'",
-     "     VISIBLE:  'Find in page orca $l', cursor=18",
+    ["BRAILLE LINE:  'synthesis, braille, and magnification, Orca helps provide '",
+     "     VISIBLE:  'magnification, Orca helps provid', cursor=20",
      "SPEECH OUTPUT: 'synthesis, braille, and magnification, Orca helps provide'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -62,7 +54,7 @@ sequence.append(KeyComboAction("Escape"))
 sequence.append(utils.AssertPresentationAction(
     "5. Escape to return to page content",
     ["BRAILLE LINE:  'synthesis, braille, and magnification, Orca helps provide '",
-     "     VISIBLE:  'raille, and magnification, Orca ', cursor=32",
+     "     VISIBLE:  'magnification, Orca helps provid', cursor=20",
      "SPEECH OUTPUT: 'synthesis, braille, and magnification, Orca helps provide  selected'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/flat_review_text_by_line.py 
b/test/keystrokes/firefox/flat_review_text_by_line.py
index fab7ea657..ea94e3e53 100644
--- a/test/keystrokes/firefox/flat_review_text_by_line.py
+++ b/test/keystrokes/firefox/flat_review_text_by_line.py
@@ -26,30 +26,22 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
     "2. Flat review next line",
-    ["BRAILLE LINE:  'NOBODY expects the Spanish Inquisition! Our chief weapon is surprise. Surprise and 
fear. Fear and  $l'",
-     "     VISIBLE:  'NOBODY expects the Spanish Inqui', cursor=1",
-     "SPEECH OUTPUT: 'NOBODY expects the Spanish Inquisition! Our chief weapon is surprise. Surprise and 
fear. Fear and '"]))
+    ["BRAILLE LINE:  'block quote $l'",
+     "     VISIBLE:  'block quote $l', cursor=1",
+     "SPEECH OUTPUT: 'block quote'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
     "3. Flat review next line",
-    ["BRAILLE LINE:  'surprise. Our two weapons are fear and surprise. And ruthless efficiency. Our three 
weapons are fear,  $l'",
-     "     VISIBLE:  'surprise. Our two weapons are fe', cursor=1",
-     "SPEECH OUTPUT: 'surprise. Our two weapons are fear and surprise. And ruthless efficiency. Our three 
weapons are fear, '"]))
+    ["BRAILLE LINE:  'NOBODY expects the Spanish Inquisition! Our chief weapon is surprise. Surprise and 
fear. Fear and  $l'",
+     "     VISIBLE:  'NOBODY expects the Spanish Inqui', cursor=1",
+     "SPEECH OUTPUT: 'NOBODY expects the Spanish Inquisition! Our chief weapon is surprise. Surprise and 
fear. Fear and '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
     "4. Flat review next line",
-    ["BRAILLE LINE:  'surprise, and ruthless efficiency. And an almost fanatical devotion to the Pope. Our 
four. No. Amongst our  $l'",
-     "     VISIBLE:  'surprise, and ruthless efficienc', cursor=1",
-     "SPEECH OUTPUT: 'surprise, and ruthless efficiency. And an almost fanatical devotion to the Pope. Our 
four. No. Amongst our '"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("KP_7"))
-sequence.append(utils.AssertPresentationAction(
-    "5. Flat review previous line",
     ["BRAILLE LINE:  'surprise. Our two weapons are fear and surprise. And ruthless efficiency. Our three 
weapons are fear,  $l'",
      "     VISIBLE:  'surprise. Our two weapons are fe', cursor=1",
      "SPEECH OUTPUT: 'surprise. Our two weapons are fear and surprise. And ruthless efficiency. Our three 
weapons are fear, '"]))
@@ -57,10 +49,18 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_7"))
 sequence.append(utils.AssertPresentationAction(
-    "6. Flat review previous line",
+    "5. Flat review previous line",
     ["BRAILLE LINE:  'NOBODY expects the Spanish Inquisition! Our chief weapon is surprise. Surprise and 
fear. Fear and  $l'",
      "     VISIBLE:  'NOBODY expects the Spanish Inqui', cursor=1",
      "SPEECH OUTPUT: 'NOBODY expects the Spanish Inquisition! Our chief weapon is surprise. Surprise and 
fear. Fear and '"]))
 
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("KP_7"))
+sequence.append(utils.AssertPresentationAction(
+    "6. Flat review previous line",
+    ["BRAILLE LINE:  'block quote $l'",
+     "     VISIBLE:  'block quote $l', cursor=1",
+     "SPEECH OUTPUT: 'block quote'"]))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/firefox/flat_review_text_by_word_and_char.py 
b/test/keystrokes/firefox/flat_review_text_by_word_and_char.py
index 0e740f0ec..53ea5699d 100644
--- a/test/keystrokes/firefox/flat_review_text_by_word_and_char.py
+++ b/test/keystrokes/firefox/flat_review_text_by_word_and_char.py
@@ -82,6 +82,8 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'yankee'",
      "SPEECH OUTPUT: ':'"]))
 
+sequence.append(KeyComboAction("KP_6"))
+
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
@@ -176,6 +178,8 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'NOBODY expects the Spanish Inqui', cursor=1",
      "SPEECH OUTPUT: 'NOBODY '"]))
 
+sequence.append(KeyComboAction("KP_4"))
+
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_4"))
 sequence.append(utils.AssertPresentationAction(
diff --git a/test/keystrokes/firefox/focus_tracking_descriptions.py 
b/test/keystrokes/firefox/focus_tracking_descriptions.py
index 6e33f3a83..2dad38edb 100644
--- a/test/keystrokes/firefox/focus_tracking_descriptions.py
+++ b/test/keystrokes/firefox/focus_tracking_descriptions.py
@@ -16,8 +16,6 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab",
     ["BRAILLE LINE:  'Foo'",
-     "     VISIBLE:  'Foo', cursor=1",
-     "BRAILLE LINE:  'Foo'",
      "     VISIBLE:  'Foo', cursor=1",
      "SPEECH OUTPUT: 'Foo link.'",
      "SPEECH OUTPUT: 'Title of the Foo link.'"]))
@@ -27,8 +25,6 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "2. Tab",
     ["BRAILLE LINE:  'Bar'",
-     "     VISIBLE:  'Bar', cursor=1",
-     "BRAILLE LINE:  'Bar'",
      "     VISIBLE:  'Bar', cursor=1",
      "SPEECH OUTPUT: 'Bar link.'",
      "SPEECH OUTPUT: 'ARIA description text.'"]))
@@ -38,8 +34,6 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "3. Tab",
     ["BRAILLE LINE:  'Baz'",
-     "     VISIBLE:  'Baz', cursor=1",
-     "BRAILLE LINE:  'Baz'",
      "     VISIBLE:  'Baz', cursor=1",
      "SPEECH OUTPUT: 'Baz link.'",
      "SPEECH OUTPUT: 'Title of the Baz link.'"]))
diff --git a/test/keystrokes/firefox/focus_tracking_input_type_number.py 
b/test/keystrokes/firefox/focus_tracking_input_type_number.py
index 8bbb63599..b1bc571ab 100644
--- a/test/keystrokes/firefox/focus_tracking_input_type_number.py
+++ b/test/keystrokes/firefox/focus_tracking_input_type_number.py
@@ -17,8 +17,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  '0 $l', cursor=2",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "BRAILLE LINE:  '0 $l'",
-     "     VISIBLE:  '0 $l', cursor=2",
      "SPEECH OUTPUT: 'entry 0 selected.'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
@@ -26,7 +24,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down",
-    ["BRAILLE LINE:  '-1 $l'",
+    ["BRAILLE LINE:  '0 $l'",
+     "     VISIBLE:  '0 $l', cursor=2",
+     "BRAILLE LINE:  '-1 $l'",
      "     VISIBLE:  '-1 $l', cursor=3",
      "BRAILLE LINE:  '-1 $l'",
      "     VISIBLE:  '-1 $l', cursor=3",
diff --git a/test/keystrokes/firefox/focus_tracking_link_child_of_body.py 
b/test/keystrokes/firefox/focus_tracking_link_child_of_body.py
index e6c49ee6e..f7c3e1cc8 100644
--- a/test/keystrokes/firefox/focus_tracking_link_child_of_body.py
+++ b/test/keystrokes/firefox/focus_tracking_link_child_of_body.py
@@ -8,10 +8,6 @@ sequence = MacroSequence()
 #sequence.append(WaitForDocLoad())
 sequence.append(PauseAction(5000))
 
-# Work around some new quirk in Gecko that causes this test to fail if
-# run via the test harness rather than manually.
-sequence.append(KeyComboAction("<Control>r"))
-
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
@@ -25,17 +21,15 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Tab"))
 sequence.append(utils.AssertPresentationAction(
     "2. Shift Tab",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'document frame'"]))
+    ["BRAILLE LINE:  'document web'",
+     "     VISIBLE:  'document web', cursor=1",
+     "SPEECH OUTPUT: 'document web'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "3. Tab",
     ["BRAILLE LINE:  'Foo'",
-     "     VISIBLE:  'Foo', cursor=1",
-     "BRAILLE LINE:  'Foo'",
      "     VISIBLE:  'Foo', cursor=1",
      "SPEECH OUTPUT: 'Foo link.'"]))
 
diff --git a/test/keystrokes/firefox/focus_tracking_links.py b/test/keystrokes/firefox/focus_tracking_links.py
index ba4bf6855..332493b5e 100644
--- a/test/keystrokes/firefox/focus_tracking_links.py
+++ b/test/keystrokes/firefox/focus_tracking_links.py
@@ -35,8 +35,6 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "3. Tab to the Bar link",
     ["BRAILLE LINE:  'Bar'",
-     "     VISIBLE:  'Bar', cursor=1",
-     "BRAILLE LINE:  'Bar'",
      "     VISIBLE:  'Bar', cursor=1",
      "SPEECH OUTPUT: 'Bar link.'"]))
 
@@ -45,8 +43,6 @@ sequence.append(KeyComboAction("<Shift>Tab"))
 sequence.append(utils.AssertPresentationAction(
     "4. Shift Tab back to the Foo link",
     ["BRAILLE LINE:  'Foo'",
-     "     VISIBLE:  'Foo', cursor=1",
-     "BRAILLE LINE:  'Foo'",
      "     VISIBLE:  'Foo', cursor=1",
      "SPEECH OUTPUT: 'Foo link.'"]))
 
diff --git a/test/keystrokes/firefox/focus_tracking_roledescriptions.py 
b/test/keystrokes/firefox/focus_tracking_roledescriptions.py
index 11b377b2a..79fdf6b45 100644
--- a/test/keystrokes/firefox/focus_tracking_roledescriptions.py
+++ b/test/keystrokes/firefox/focus_tracking_roledescriptions.py
@@ -14,8 +14,6 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to a div with no roledescription",
     ["BRAILLE LINE:  'Focus me 1'",
-     "     VISIBLE:  'Focus me 1', cursor=1",
-     "BRAILLE LINE:  'Focus me 1'",
      "     VISIBLE:  'Focus me 1', cursor=1",
      "SPEECH OUTPUT: 'Focus me 1'"]))
 
@@ -24,8 +22,6 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "2. Tab to a div with only a roledescription",
     ["BRAILLE LINE:  'Focus me 2 kill switch'",
-     "     VISIBLE:  'Focus me 2 kill switch', cursor=1",
-     "BRAILLE LINE:  'Focus me 2 kill switch'",
      "     VISIBLE:  'Focus me 2 kill switch', cursor=1",
      "SPEECH OUTPUT: 'Focus me 2 kill switch'"]))
 
@@ -91,6 +87,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Second Quarter 2015 slide', cursor=1",
      "BRAILLE LINE:  'Second Quarter 2015 h1'",
      "     VISIBLE:  'Second Quarter 2015 h1', cursor=1",
+     "SPEECH OUTPUT: 'leaving region.'",
      "SPEECH OUTPUT: 'Second Quarter 2015 slide'",
      "SPEECH OUTPUT: 'Second Quarter 2015 heading level 1'"]))
 
diff --git a/test/keystrokes/firefox/html_link_where_am_i.py b/test/keystrokes/firefox/html_link_where_am_i.py
index 6ac6e7497..44078c60b 100644
--- a/test/keystrokes/firefox/html_link_where_am_i.py
+++ b/test/keystrokes/firefox/html_link_where_am_i.py
@@ -17,9 +17,11 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "1. Title bar",
-    ["BRAILLE LINE:  'GNOME Bug Tracking System - Nightly'",
-     "     VISIBLE:  'GNOME Bug Tracking System - Nigh', cursor=0",
-     "SPEECH OUTPUT: 'GNOME Bug Tracking System - Nightly'"]))
+    ["BRAILLE LINE:  'Product summary'",
+     "     VISIBLE:  'Product summary', cursor=1",
+     "BRAILLE LINE:  'GNOME Bug Tracking System - Firefox Nightly'",
+     "     VISIBLE:  'GNOME Bug Tracking System - Fire', cursor=0",
+     "SPEECH OUTPUT: 'GNOME Bug Tracking System - Firefox Nightly'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
@@ -42,9 +44,9 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "3. Title bar",
-    ["BRAILLE LINE:  'GNOME Bug Tracking System - Nightly'",
-     "     VISIBLE:  'GNOME Bug Tracking System - Nigh', cursor=0",
-     "SPEECH OUTPUT: 'GNOME Bug Tracking System - Nightly'"]))
+    ["BRAILLE LINE:  'GNOME Bug Tracking System - Firefox Nightly'",
+     "     VISIBLE:  'GNOME Bug Tracking System - Fire', cursor=0",
+     "SPEECH OUTPUT: 'GNOME Bug Tracking System - Firefox Nightly'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
diff --git a/test/keystrokes/firefox/html_role_combo_box.py b/test/keystrokes/firefox/html_role_combo_box.py
index 2aeb26c44..fdaf4daa5 100644
--- a/test/keystrokes/firefox/html_role_combo_box.py
+++ b/test/keystrokes/firefox/html_role_combo_box.py
@@ -42,8 +42,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Priority', cursor=1",
      "BRAILLE LINE:  'Browse mode'",
      "     VISIBLE:  'Browse mode', cursor=0",
-     "BRAILLE LINE:  'Priority'",
-     "     VISIBLE:  'Priority', cursor=1",
      "SPEECH OUTPUT: 'Priority link.'",
      "SPEECH OUTPUT: 'Browse mode' voice=system"]))
 
@@ -51,7 +49,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "4. Tab to Priority combo box",
-    ["BRAILLE LINE:  'Priority: Normal combo box'",
+    ["BRAILLE LINE:  'Priority'",
+     "     VISIBLE:  'Priority', cursor=1",
+     "BRAILLE LINE:  'Priority: Normal combo box'",
      "     VISIBLE:  'Priority: Normal combo box', cursor=11",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
@@ -88,15 +88,20 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>Down"))
 sequence.append(utils.AssertPresentationAction(
     "8. Alt Down to Expand",
-    ["KNOWN ISSUE: We are presenting nothing here because we don't get the needed event from Gecko",
-     ""]))
+    ["BRAILLE LINE:  'Firefox application Combo Box Regression Test - Firefox Nightly frame FIXED combo box 
FIXED'",
+     "     VISIBLE:  'FIXED', cursor=1",
+     "BRAILLE LINE:  'Firefox application Combo Box Regression Test - Firefox Nightly frame FIXED combo 
box'",
+     "     VISIBLE:  'FIXED combo box', cursor=1",
+     "SPEECH OUTPUT: 'expanded'",
+     "SPEECH OUTPUT: 'FIXED.'",
+     "SPEECH OUTPUT: 'expanded'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "9. Change selection Down: WONTFIX",
-    ["BRAILLE LINE:  'Resolution: WONTFIX combo box'",
-     "     VISIBLE:  'Resolution: WONTFIX combo box', cursor=13",
+    ["BRAILLE LINE:  'Firefox application Combo Box Regression Test - Firefox Nightly frame FIXED combo box 
WONTFIX'",
+     "     VISIBLE:  'WONTFIX', cursor=1",
      "SPEECH OUTPUT: 'WONTFIX.'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/html_role_links.py b/test/keystrokes/firefox/html_role_links.py
index 4969783cd..c47347521 100644
--- a/test/keystrokes/firefox/html_role_links.py
+++ b/test/keystrokes/firefox/html_role_links.py
@@ -23,8 +23,6 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "2. Tab to anchors.html link",
     ["BRAILLE LINE:  'anchors.html'",
-     "     VISIBLE:  'anchors.html', cursor=1",
-     "BRAILLE LINE:  'anchors.html'",
      "     VISIBLE:  'anchors.html', cursor=1",
      "SPEECH OUTPUT: 'anchors.html link.'"]))
 
@@ -33,8 +31,6 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "3. Tab to blockquotes.html link",
     ["BRAILLE LINE:  'blockquotes.html'",
-     "     VISIBLE:  'blockquotes.html', cursor=1",
-     "BRAILLE LINE:  'blockquotes.html'",
      "     VISIBLE:  'blockquotes.html', cursor=1",
      "SPEECH OUTPUT: 'blockquotes.html link.'"]))
 
@@ -43,8 +39,6 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "4. Tab to bugzilla_top.html link",
     ["BRAILLE LINE:  'bugzilla_top.html'",
-     "     VISIBLE:  'bugzilla_top.html', cursor=1",
-     "BRAILLE LINE:  'bugzilla_top.html'",
      "     VISIBLE:  'bugzilla_top.html', cursor=1",
      "SPEECH OUTPUT: 'bugzilla_top.html link.'"]))
 
@@ -53,8 +47,6 @@ sequence.append(KeyComboAction("<Shift>Tab"))
 sequence.append(utils.AssertPresentationAction(
     "5. Shift Tab to blockquotes.html link",
     ["BRAILLE LINE:  'blockquotes.html'",
-     "     VISIBLE:  'blockquotes.html', cursor=1",
-     "BRAILLE LINE:  'blockquotes.html'",
      "     VISIBLE:  'blockquotes.html', cursor=1",
      "SPEECH OUTPUT: 'blockquotes.html link.'"]))
 
@@ -82,7 +74,7 @@ sequence.append(utils.AssertPresentationAction(
     "7. Line Up to anchors.html",
     ["BRAILLE LINE:  '• anchors.html'",
      "     VISIBLE:  '• anchors.html', cursor=1",
-     "SPEECH OUTPUT: '•.'",
+     "SPEECH OUTPUT: '•'",
      "SPEECH OUTPUT: 'anchors.html'",
      "SPEECH OUTPUT: 'link.'"]))
 
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 7c931c052..261941c57 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
@@ -26,7 +26,8 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  '• In a paragraph'",
      "     VISIBLE:  '• In a paragraph', cursor=1",
      "SPEECH OUTPUT: 'list item.'",
-     "SPEECH OUTPUT: '• In a paragraph.'"]))
+     "SPEECH OUTPUT: '• In a paragraph.'",
+     "SPEECH OUTPUT: '2 of 4.'"]))
 
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.StartRecordingAction())
@@ -36,7 +37,8 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  '• In a section'",
      "     VISIBLE:  '• In a section', cursor=1",
      "SPEECH OUTPUT: 'list item.'",
-     "SPEECH OUTPUT: '• In a section.'"]))
+     "SPEECH OUTPUT: '• In a section.'",
+     "SPEECH OUTPUT: '3 of 4.'"]))
 
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.StartRecordingAction())
@@ -47,6 +49,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  '1. A nested list item, not in a ', cursor=1",
      "SPEECH OUTPUT: 'list item.'",
      "SPEECH OUTPUT: '1. A nested list item, not in a paragraph.'",
+     "SPEECH OUTPUT: '1 of 3.'",
      "SPEECH OUTPUT: 'Nesting level 1.'"]))
 
 sequence.append(KeyComboAction("Down"))
@@ -58,6 +61,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  '2. A nested list item, in a para', cursor=1",
      "SPEECH OUTPUT: 'list item.'",
      "SPEECH OUTPUT: '2. A nested list item, in a paragraph.'",
+     "SPEECH OUTPUT: '2 of 3.'",
      "SPEECH OUTPUT: 'Nesting level 1.'"]))
 
 sequence.append(KeyComboAction("Down"))
@@ -69,6 +73,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  '3. A nested list item, in a sect', cursor=1",
      "SPEECH OUTPUT: 'list item.'",
      "SPEECH OUTPUT: '3. A nested list item, in a section.'",
+     "SPEECH OUTPUT: '3 of 3.'",
      "SPEECH OUTPUT: 'Nesting level 1.'"]))
 
 sequence.append(KeyComboAction("Down"))
@@ -79,7 +84,8 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  '• In a paragraph that's in a section'",
      "     VISIBLE:  '• In a paragraph that's in a sec', cursor=1",
      "SPEECH OUTPUT: 'list item.'",
-     "SPEECH OUTPUT: '• In a paragraph that's in a section.'"]))
+     "SPEECH OUTPUT: '• In a paragraph that's in a section.'",
+     "SPEECH OUTPUT: '4 of 4.'"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/firefox/html_struct_nav_activate_link.py 
b/test/keystrokes/firefox/html_struct_nav_activate_link.py
index b0a7babb4..05cfe31dd 100644
--- a/test/keystrokes/firefox/html_struct_nav_activate_link.py
+++ b/test/keystrokes/firefox/html_struct_nav_activate_link.py
@@ -16,8 +16,6 @@ sequence.append(KeyComboAction("3"))
 sequence.append(utils.AssertPresentationAction(
     "1. Press 3 to move to the heading at level 3",
     ["BRAILLE LINE:  'Anchors2.html h3'",
-     "     VISIBLE:  'Anchors2.html h3', cursor=1",
-     "BRAILLE LINE:  'Anchors2.html h3'",
      "     VISIBLE:  'Anchors2.html h3', cursor=1",
      "SPEECH OUTPUT: 'Anchors2.html'",
      "SPEECH OUTPUT: 'link heading level 3.'"]))
@@ -26,12 +24,14 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "2. Press Return to active the link",
-    ["BRAILLE LINE:  'Finished loading Links to test files.'",
-     "     VISIBLE:  'Finished loading Links to test f', cursor=0",
-     "BRAILLE LINE:  'Page has 16 unvisited links.'",
-     "     VISIBLE:  'Page has 16 unvisited links.', cursor=0",
-     "BRAILLE LINE:  'Here are some of our local test files:'",
-     "     VISIBLE:  'Here are some of our local test ', cursor=1",
+   ["BRAILLE LINE:  'Finished loading Links to test files.'",
+    "     VISIBLE:  'Finished loading Links to test f', cursor=0",
+    "BRAILLE LINE:  'Page has 16 unvisited links.'",
+    "     VISIBLE:  'Page has 16 unvisited links.', cursor=0",
+    "BRAILLE LINE:  'Here are some of our local test files:'",
+    "     VISIBLE:  'Here are some of our local test ', cursor=1",
+    "BRAILLE LINE:  'Here are some of our local test files:'",
+    "     VISIBLE:  'Here are some of our local test ', cursor=1",
     "SPEECH OUTPUT: 'Finished loading Links to test files.' voice=system",
     "SPEECH OUTPUT: 'Page has 16 unvisited links.' voice=system",
     "SPEECH OUTPUT: 'Here are some of our local test files:'",
@@ -83,7 +83,8 @@ sequence.append(utils.AssertPresentationAction(
     "SPEECH OUTPUT: 'link'",
     "SPEECH OUTPUT: '•'",
     "SPEECH OUTPUT: 'textattributes.html'",
-    "SPEECH OUTPUT: 'link'"]))
+    "SPEECH OUTPUT: 'link'",
+    "SPEECH OUTPUT: 'Here are some of our local test files:'"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/firefox/html_struct_nav_bug_554616.py 
b/test/keystrokes/firefox/html_struct_nav_bug_554616.py
index 738280216..0015efae7 100644
--- a/test/keystrokes/firefox/html_struct_nav_bug_554616.py
+++ b/test/keystrokes/firefox/html_struct_nav_bug_554616.py
@@ -24,7 +24,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Snapshot version', cursor=1",
      "SPEECH OUTPUT: 'Wrapping to top.' voice=system",
      "SPEECH OUTPUT: 'table with 4 rows 3 columns' voice=system",
-     "SPEECH OUTPUT: 'Snapshot version column header'"]))
+     "SPEECH OUTPUT: 'Snapshot version'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt><Shift>Down"))
@@ -68,23 +68,22 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'installer (10190 KB) portable ar', cursor=1",
      "BRAILLE LINE:  'Row 2, column 3.'",
      "     VISIBLE:  'Row 2, column 3.', cursor=0",
-     "BRAILLE LINE:  'installer (10190 KB)'",
-     "     VISIBLE:  'installer (10190 KB)', cursor=1",
      "SPEECH OUTPUT: 'Download'",
      "SPEECH OUTPUT: 'installer'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: '(10190 KB).'",
+     "SPEECH OUTPUT: 'Download column header (10190 KB)'",
      "SPEECH OUTPUT: 'portable archive'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: '(9154 KB).'",
-     "SPEECH OUTPUT: 'Row 2, column 3.' voice=system",
-     "SPEECH OUTPUT: 'blank' voice=system"]))
+     "SPEECH OUTPUT: 'Download column header (9154 KB)'",
+     "SPEECH OUTPUT: 'Row 2, column 3.' voice=system"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt><Shift>Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Alt Shift Down",
-    ["BRAILLE LINE:  'installer (10193 KB)'",
+    ["BRAILLE LINE:  'installer (10190 KB) portable archive (9154 KB)'",
+     "     VISIBLE:  'installer (10190 KB) portable ar', cursor=1",
+     "BRAILLE LINE:  'installer (10193 KB)'",
      "     VISIBLE:  'installer (10193 KB)', cursor=1",
      "BRAILLE LINE:  'installer (10193 KB) portable archive (9149 KB)'",
      "     VISIBLE:  'installer (10193 KB) portable ar', cursor=1",
@@ -92,10 +91,10 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Row 3, column 3.', cursor=0",
      "SPEECH OUTPUT: 'installer'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: '(10193 KB).'",
+     "SPEECH OUTPUT: 'Download column header (10193 KB)'",
      "SPEECH OUTPUT: 'portable archive'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: '(9149 KB).'",
+     "SPEECH OUTPUT: 'Download column header (9149 KB)'",
      "SPEECH OUTPUT: 'Row 3, column 3.' voice=system"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -144,10 +143,10 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'Download'",
      "SPEECH OUTPUT: 'installer'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: '(10186 KB).'",
+     "SPEECH OUTPUT: 'Download column header (10186 KB)'",
      "SPEECH OUTPUT: 'portable archive'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: '(9146 KB).'",
+     "SPEECH OUTPUT: 'Download column header (9146 KB)'",
      "SPEECH OUTPUT: 'Row 4, column 3.' voice=system"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/html_struct_nav_bug_556470.py 
b/test/keystrokes/firefox/html_struct_nav_bug_556470.py
index e51541d65..95037ac9e 100644
--- a/test/keystrokes/firefox/html_struct_nav_bug_556470.py
+++ b/test/keystrokes/firefox/html_struct_nav_bug_556470.py
@@ -20,7 +20,7 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  'col 1'",
      "     VISIBLE:  'col 1', cursor=0",
      "SPEECH OUTPUT: 'table with 2 rows 3 columns' voice=system",
-     "SPEECH OUTPUT: 'col 1 column header'"]))
+     "SPEECH OUTPUT: 'col 1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("t"))
@@ -45,7 +45,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'col 1', cursor=0",
      "SPEECH OUTPUT: 'Wrapping to top.' voice=system",
      "SPEECH OUTPUT: 'table with 2 rows 3 columns' voice=system",
-     "SPEECH OUTPUT: 'col 1 column header'"]))
+     "SPEECH OUTPUT: 'col 1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>t"))
diff --git a/test/keystrokes/firefox/html_struct_nav_clickable_text_change.py 
b/test/keystrokes/firefox/html_struct_nav_clickable_text_change.py
index d990011a7..1f1541e48 100644
--- a/test/keystrokes/firefox/html_struct_nav_clickable_text_change.py
+++ b/test/keystrokes/firefox/html_struct_nav_clickable_text_change.py
@@ -51,11 +51,11 @@ sequence.append(KeyComboAction("<Alt>a"))
 sequence.append(PauseAction(5000))
 sequence.append(utils.AssertPresentationAction(
     "4. Alt+a for Activate button",
-    ["BRAILLE LINE:  'Firefox application Nightly frame'",
-     "     VISIBLE:  'Nightly frame', cursor=1",
+    ["BRAILLE LINE:  'Firefox application Firefox Nightly frame'",
+     "     VISIBLE:  'Firefox Nightly frame', cursor=1",
      "BRAILLE LINE:  'Goodbye cruel'",
      "     VISIBLE:  'Goodbye cruel', cursor=1",
-     "SPEECH OUTPUT: 'Nightly frame'",
+     "SPEECH OUTPUT: 'Firefox Nightly frame'",
      "SPEECH OUTPUT: 'Hello clickable'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/html_struct_nav_containers.py 
b/test/keystrokes/firefox/html_struct_nav_containers.py
index 2da8744bf..5a4878ae4 100644
--- a/test/keystrokes/firefox/html_struct_nav_containers.py
+++ b/test/keystrokes/firefox/html_struct_nav_containers.py
@@ -161,7 +161,7 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  'Cell 3 Cell 4 (it's the last one)'",
      "     VISIBLE:  'Cell 3 Cell 4 (it's the last one', cursor=1",
      "SPEECH OUTPUT: 'Cell 3.'",
-     "SPEECH OUTPUT: 'Cell 4 (it's the last one).'"]))
+     "SPEECH OUTPUT: 'Cell 4 (it's the last one)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>comma"))
diff --git a/test/keystrokes/firefox/html_struct_nav_heading_in_div_with_text.py 
b/test/keystrokes/firefox/html_struct_nav_heading_in_div_with_text.py
index e2ee64ce9..3140612f2 100644
--- a/test/keystrokes/firefox/html_struct_nav_heading_in_div_with_text.py
+++ b/test/keystrokes/firefox/html_struct_nav_heading_in_div_with_text.py
@@ -17,8 +17,6 @@ sequence.append(KeyComboAction("2"))
 sequence.append(utils.AssertPresentationAction(
     "1. 2 for first Heading",
     ["BRAILLE LINE:  'First Heading  h2'",
-     "     VISIBLE:  'First Heading  h2', cursor=1",
-     "BRAILLE LINE:  'First Heading  h2'",
      "     VISIBLE:  'First Heading  h2', cursor=1",
      "SPEECH OUTPUT: 'First Heading'",
      "SPEECH OUTPUT: 'link heading level 2.'"]))
diff --git a/test/keystrokes/firefox/html_struct_nav_headings_with_hidden_anchors.py 
b/test/keystrokes/firefox/html_struct_nav_headings_with_hidden_anchors.py
index 55d3b7e97..80f62e4b1 100644
--- a/test/keystrokes/firefox/html_struct_nav_headings_with_hidden_anchors.py
+++ b/test/keystrokes/firefox/html_struct_nav_headings_with_hidden_anchors.py
@@ -21,7 +21,7 @@ sequence.append(KeyComboAction("h"))
 sequence.append(utils.AssertPresentationAction(
     "1. h for next heading",
     ["BRAILLE LINE:  'line 2 h1'",
-     "     VISIBLE:  'line 2 h1', cursor=0",
+     "     VISIBLE:  'line 2 h1', cursor=1",
      "SPEECH OUTPUT: 'line 2 heading level 1'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -29,7 +29,7 @@ sequence.append(KeyComboAction("h"))
 sequence.append(utils.AssertPresentationAction(
     "2. h for next heading",
     ["BRAILLE LINE:  'line 3 h1'",
-     "     VISIBLE:  'line 3 h1', cursor=0",
+     "     VISIBLE:  'line 3 h1', cursor=1",
      "SPEECH OUTPUT: 'line 3 heading level 1'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/html_struct_nav_link_with_child_text.py 
b/test/keystrokes/firefox/html_struct_nav_link_with_child_text.py
index 8b3164190..b67d345d0 100644
--- a/test/keystrokes/firefox/html_struct_nav_link_with_child_text.py
+++ b/test/keystrokes/firefox/html_struct_nav_link_with_child_text.py
@@ -14,8 +14,6 @@ sequence.append(KeyComboAction("k"))
 sequence.append(utils.AssertPresentationAction(
     "1. k for next link",
     ["BRAILLE LINE:  'line 2'",
-     "     VISIBLE:  'line 2', cursor=1",
-     "BRAILLE LINE:  'line 2'",
      "     VISIBLE:  'line 2', cursor=1",
      "SPEECH OUTPUT: 'line 2'",
      "SPEECH OUTPUT: 'link.'"]))
diff --git a/test/keystrokes/firefox/html_struct_nav_links.py 
b/test/keystrokes/firefox/html_struct_nav_links.py
index 1858f3bb3..66b77ba4a 100644
--- a/test/keystrokes/firefox/html_struct_nav_links.py
+++ b/test/keystrokes/firefox/html_struct_nav_links.py
@@ -17,8 +17,6 @@ sequence.append(KeyComboAction("u"))
 sequence.append(utils.AssertPresentationAction(
     "1. u to anchors.html link",
     ["BRAILLE LINE:  'anchors.html'",
-     "     VISIBLE:  'anchors.html', cursor=1",
-     "BRAILLE LINE:  'anchors.html'",
      "     VISIBLE:  'anchors.html', cursor=1",
      "SPEECH OUTPUT: 'anchors.html'",
      "SPEECH OUTPUT: 'link.'"]))
diff --git a/test/keystrokes/firefox/html_struct_nav_list_item.py 
b/test/keystrokes/firefox/html_struct_nav_list_item.py
index 2426d3004..ef785da7f 100644
--- a/test/keystrokes/firefox/html_struct_nav_list_item.py
+++ b/test/keystrokes/firefox/html_struct_nav_list_item.py
@@ -28,7 +28,7 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  '6. And use roman numerals,'",
      "     VISIBLE:  '6. And use roman numerals,', cursor=1",
      "SPEECH OUTPUT: 'List with 6 items' voice=system",
-     "SPEECH OUTPUT: '6. And use roman numerals,.'"]))
+     "SPEECH OUTPUT: '6. And use roman numerals,'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("l"))
@@ -92,7 +92,7 @@ sequence.append(KeyComboAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "10. i to next list item, which is nested (3.1.2.1)",
     ["BRAILLE LINE:  '◦ if your TYPE is circle'",
-     "     VISIBLE:  '◦ if your TYPE is circle', cursor=1",
+     "     VISIBLE:  '◦ if your TYPE is circle', cursor=25",
      "SPEECH OUTPUT: '◦ if your TYPE is circle.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -116,7 +116,7 @@ sequence.append(KeyComboAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "13. i to next list item which is nested (3.2.1)",
     ["BRAILLE LINE:  '◦ was a composer who was not square'",
-     "     VISIBLE:  '◦ was a composer who was not squ', cursor=1",
+     "     VISIBLE:  'square', cursor=7",
      "SPEECH OUTPUT: '◦ was a composer who was not square.'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/html_struct_nav_lists.py 
b/test/keystrokes/firefox/html_struct_nav_lists.py
index 0db482a58..6beb5d1d6 100644
--- a/test/keystrokes/firefox/html_struct_nav_lists.py
+++ b/test/keystrokes/firefox/html_struct_nav_lists.py
@@ -29,7 +29,7 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  '6. And use roman numerals,'",
      "     VISIBLE:  '6. And use roman numerals,', cursor=1",
      "SPEECH OUTPUT: 'List with 6 items' voice=system",
-     "SPEECH OUTPUT: '6. And use roman numerals,.'"]))
+     "SPEECH OUTPUT: '6. And use roman numerals,'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("l"))
@@ -180,7 +180,7 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  '6. And use roman numerals,'",
      "     VISIBLE:  '6. And use roman numerals,', cursor=1",
      "SPEECH OUTPUT: 'List with 6 items' voice=system",
-     "SPEECH OUTPUT: '6. And use roman numerals,.'"]))
+     "SPEECH OUTPUT: '6. And use roman numerals,'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>l"))
diff --git a/test/keystrokes/firefox/line_nav_bug_577239.py b/test/keystrokes/firefox/line_nav_bug_577239.py
index 4f5941dfb..09a18f946 100644
--- a/test/keystrokes/firefox/line_nav_bug_577239.py
+++ b/test/keystrokes/firefox/line_nav_bug_577239.py
@@ -32,7 +32,7 @@ sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
     ["BRAILLE LINE:  '1. This is a short list item.'",
      "     VISIBLE:  '1. This is a short list item.', cursor=1",
-     "SPEECH OUTPUT: 'List with 2 items'",
+     "SPEECH OUTPUT: 'List with 2 items.'",
      "SPEECH OUTPUT: '1. This is a short list item.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -73,8 +73,8 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "8. Line Down",
     ["BRAILLE LINE:  '• This is a short list item.'",
-     "     VISIBLE:  '• This is a short list item.', cursor=1",
-     "SPEECH OUTPUT: 'List with 2 items'",
+     "     VISIBLE:  '• This is a short list item.', cursor=30",
+     "SPEECH OUTPUT: 'List with 2 items.'",
      "SPEECH OUTPUT: '• This is a short list item.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -124,7 +124,7 @@ sequence.append(utils.AssertPresentationAction(
     "14. Line Up",
     ["BRAILLE LINE:  'should probably be put out of its misery.'",
      "     VISIBLE:  'should probably be put out of it', cursor=1",
-     "SPEECH OUTPUT: 'List with 2 items'",
+     "SPEECH OUTPUT: 'List with 2 items.'",
      "SPEECH OUTPUT: 'should probably be put out of its misery.'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_bug_592383.py b/test/keystrokes/firefox/line_nav_bug_592383.py
index 27e66847c..73787dc5d 100644
--- a/test/keystrokes/firefox/line_nav_bug_592383.py
+++ b/test/keystrokes/firefox/line_nav_bug_592383.py
@@ -63,7 +63,7 @@ sequence.append(KeyComboAction("<Control>End"))
 sequence.append(utils.AssertPresentationAction(
     "7. End of file", 
     ["BRAILLE LINE:  'Here's another normal paragraph.'",
-     "     VISIBLE:  'Here's another normal paragraph.', cursor=0",
+     "     VISIBLE:  'ere's another normal paragraph.', cursor=32",
      "SPEECH OUTPUT: 'Here's another normal paragraph.'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_bugzilla_search_down.py 
b/test/keystrokes/firefox/line_nav_bugzilla_search_down.py
index ac8aa718c..472742dda 100644
--- a/test/keystrokes/firefox/line_nav_bugzilla_search_down.py
+++ b/test/keystrokes/firefox/line_nav_bugzilla_search_down.py
@@ -76,7 +76,9 @@ sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
     ["BRAILLE LINE:  'Summary: contains all of the words/strings combo box $l Search push button'",
      "     VISIBLE:  'Summary: contains all of the wor', cursor=1",
-     "SPEECH OUTPUT: 'Summary: row header'",
+     "SPEECH OUTPUT: 'form'",
+     "SPEECH OUTPUT: 'table with 5 rows 4 columns'",
+     "SPEECH OUTPUT: 'Summary:'",
      "SPEECH OUTPUT: 'contains all of the words/strings combo box.'",
      "SPEECH OUTPUT: 'entry.'",
      "SPEECH OUTPUT: 'Search push button'"]))
@@ -87,6 +89,7 @@ sequence.append(utils.AssertPresentationAction(
     "5. Line Down",
     ["BRAILLE LINE:  'Classification:'",
      "     VISIBLE:  'Classification:', cursor=1",
+     "SPEECH OUTPUT: 'table with 2 rows 1 column'",
      "SPEECH OUTPUT: 'Classification: column header'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -103,6 +106,8 @@ sequence.append(utils.AssertPresentationAction(
     "7. Line Down",
     ["BRAILLE LINE:  'Product:'",
      "     VISIBLE:  'Product:', cursor=1",
+     "SPEECH OUTPUT: 'leaving table.'",
+     "SPEECH OUTPUT: 'table with 2 rows 1 column'",
      "SPEECH OUTPUT: 'Product: column header'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -137,6 +142,8 @@ sequence.append(utils.AssertPresentationAction(
     "11. Line Down",
     ["BRAILLE LINE:  'Version:'",
      "     VISIBLE:  'Version:', cursor=1",
+     "SPEECH OUTPUT: 'leaving table.'",
+     "SPEECH OUTPUT: 'table with 2 rows 1 column'",
      "SPEECH OUTPUT: 'Version: column header'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -153,6 +160,8 @@ sequence.append(utils.AssertPresentationAction(
     "13. Line Down",
     ["BRAILLE LINE:  'Target Milestone:'",
      "     VISIBLE:  'Target Milestone:', cursor=1",
+     "SPEECH OUTPUT: 'leaving table.'",
+     "SPEECH OUTPUT: 'table with 2 rows 1 column'",
      "SPEECH OUTPUT: 'Target Milestone: column header'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -169,7 +178,8 @@ sequence.append(utils.AssertPresentationAction(
     "15. Line Down",
     ["BRAILLE LINE:  'A Comment: contains the string combo box $l'",
      "     VISIBLE:  'A Comment: contains the string c', cursor=1",
-     "SPEECH OUTPUT: 'A Comment: row header'",
+     "SPEECH OUTPUT: 'leaving table.'",
+     "SPEECH OUTPUT: 'A Comment:'",
      "SPEECH OUTPUT: 'contains the string combo box.'",
      "SPEECH OUTPUT: 'entry.'"]))
 
@@ -179,7 +189,7 @@ sequence.append(utils.AssertPresentationAction(
     "16. Line Down",
     ["BRAILLE LINE:  'Whiteboard: contains all of the words/strings combo box $l'",
      "     VISIBLE:  'Whiteboard: contains all of the ', cursor=1",
-     "SPEECH OUTPUT: 'Whiteboard: row header'",
+     "SPEECH OUTPUT: 'Whiteboard:'",
      "SPEECH OUTPUT: 'contains all of the words/strings combo box.'",
      "SPEECH OUTPUT: 'entry.'"]))
 
@@ -191,7 +201,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Keywords: contains all of the ke', cursor=1",
      "SPEECH OUTPUT: 'Keywords'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: ': row header'",
+     "SPEECH OUTPUT: ':'",
      "SPEECH OUTPUT: 'contains all of the keywords combo box.'",
      "SPEECH OUTPUT: 'entry.'"]))
 
@@ -201,6 +211,7 @@ sequence.append(utils.AssertPresentationAction(
     "18. Line Down",
     ["BRAILLE LINE:  'separator'",
      "     VISIBLE:  'separator', cursor=1",
+     "SPEECH OUTPUT: 'leaving table.'",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -209,6 +220,7 @@ sequence.append(utils.AssertPresentationAction(
     "19. Line Down",
     ["BRAILLE LINE:  'Status:'",
      "     VISIBLE:  'Status:', cursor=1",
+     "SPEECH OUTPUT: 'table with 2 rows 1 column'",
      "SPEECH OUTPUT: 'Status: column header'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -227,6 +239,8 @@ sequence.append(utils.AssertPresentationAction(
     "21. Line Down",
     ["BRAILLE LINE:  'Resolution:'",
      "     VISIBLE:  'Resolution:', cursor=1",
+     "SPEECH OUTPUT: 'leaving table.'",
+     "SPEECH OUTPUT: 'table with 2 rows 1 column'",
      "SPEECH OUTPUT: 'Resolution: column header'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -243,6 +257,8 @@ sequence.append(utils.AssertPresentationAction(
     "23. Line Down",
     ["BRAILLE LINE:  'Severity:'",
      "     VISIBLE:  'Severity:', cursor=1",
+     "SPEECH OUTPUT: 'leaving table.'",
+     "SPEECH OUTPUT: 'table with 2 rows 1 column'",
      "SPEECH OUTPUT: 'Severity: column header'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -259,6 +275,8 @@ sequence.append(utils.AssertPresentationAction(
     "25. Line Down",
     ["BRAILLE LINE:  'Priority:'",
      "     VISIBLE:  'Priority:', cursor=1",
+     "SPEECH OUTPUT: 'leaving table.'",
+     "SPEECH OUTPUT: 'table with 2 rows 1 column'",
      "SPEECH OUTPUT: 'Priority: column header'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -275,6 +293,8 @@ sequence.append(utils.AssertPresentationAction(
     "27. Line Down",
     ["BRAILLE LINE:  'OS:'",
      "     VISIBLE:  'OS:', cursor=1",
+     "SPEECH OUTPUT: 'leaving table.'",
+     "SPEECH OUTPUT: 'table with 2 rows 1 column'",
      "SPEECH OUTPUT: 'OS: column header'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -291,7 +311,8 @@ sequence.append(utils.AssertPresentationAction(
     "29. Line Down",
     ["BRAILLE LINE:  'Email and Numbering'",
      "     VISIBLE:  'Email and Numbering', cursor=1",
-     "SPEECH OUTPUT: 'Email and Numbering'"]))
+     "SPEECH OUTPUT: 'leaving table.'",
+     "SPEECH OUTPUT: 'Email and Numbering panel.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -299,7 +320,7 @@ sequence.append(utils.AssertPresentationAction(
     "30. Line Down",
     ["BRAILLE LINE:  'Any one of:'",
      "     VISIBLE:  'Any one of:', cursor=1",
-     "SPEECH OUTPUT: 'Any one of:.'"]))
+     "SPEECH OUTPUT: 'Any one of:'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -363,7 +384,7 @@ sequence.append(utils.AssertPresentationAction(
     "38. Line Down",
     ["BRAILLE LINE:  'Any one of:'",
      "     VISIBLE:  'Any one of:', cursor=1",
-     "SPEECH OUTPUT: 'Any one of:.'"]))
+     "SPEECH OUTPUT: 'Any one of:'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -436,7 +457,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'Only include combo box bugs numbered:  $l'",
      "     VISIBLE:  'Only include combo box bugs numb', cursor=1",
      "SPEECH OUTPUT: 'Only include combo box.'",
-     "SPEECH OUTPUT: 'bugs numbered:.'",
+     "SPEECH OUTPUT: 'bugs numbered:'",
      "SPEECH OUTPUT: 'entry.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -445,7 +466,7 @@ sequence.append(utils.AssertPresentationAction(
     "48. Line Down",
     ["BRAILLE LINE:  '(comma-separated list)'",
      "     VISIBLE:  '(comma-separated list)', cursor=1",
-     "SPEECH OUTPUT: '(comma-separated list).'"]))
+     "SPEECH OUTPUT: '(comma-separated list)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -453,7 +474,7 @@ sequence.append(utils.AssertPresentationAction(
     "49. Line Down",
     ["BRAILLE LINE:  'Bug Changes'",
      "     VISIBLE:  'Bug Changes', cursor=1",
-     "SPEECH OUTPUT: 'Bug Changes'"]))
+     "SPEECH OUTPUT: 'Bug Changes panel.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
diff --git a/test/keystrokes/firefox/ui_doc_tabs.py b/test/keystrokes/firefox/ui_doc_tabs.py
index f66bd67e3..5156209fe 100644
--- a/test/keystrokes/firefox/ui_doc_tabs.py
+++ b/test/keystrokes/firefox/ui_doc_tabs.py
@@ -8,16 +8,18 @@ import utils
 sequence = MacroSequence()
 
 #sequence.append(WaitForDocLoad())
-sequence.append(PauseAction(15000))
+sequence.append(PauseAction(10000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>2"))
 sequence.append(utils.AssertPresentationAction(
     "1. Switch to second page tab - Orca wiki",
-    ["KNOWN ISSUE: We are not presenting the page tab",
+    ["BRAILLE LINE:  'Firefox application Orca - GNOME Live! - Firefox Nightly frame Browser tabs tool bar 
Orca - GNOME Live! page tab'",
+     "     VISIBLE:  'Orca - GNOME Live! page tab', cursor=1",
      "BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'document frame'"]))
+     "SPEECH OUTPUT: 'Orca - GNOME Live! page tab.'",
+     "SPEECH OUTPUT: 'document web'"]))
 
 sequence.append(PauseAction(3000))
 
@@ -25,35 +27,46 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>1"))
 sequence.append(utils.AssertPresentationAction(
     "2. Switch to first page tab - Test page",
-    ["BRAILLE LINE:  ''",
+    ["BRAILLE LINE:  'Firefox application HTML test page - Firefox Nightly frame Browser tabs tool bar HTML 
test page page tab'",
+     "     VISIBLE:  'HTML test page page tab', cursor=1",
+     "BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=0",
-     "SPEECH OUTPUT: 'document frame blank'"]))
+     "SPEECH OUTPUT: 'HTML test page page tab.'",
+     "SPEECH OUTPUT: 'document web blank'"]))
 
-sequence.append(PauseAction(5000))
+sequence.append(PauseAction(3000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>3"))
 sequence.append(utils.AssertPresentationAction(
     "3. Switch to third page tab - Bugzilla",
-    ["BRAILLE LINE:  'Enter a bug # or some search terms:  $l'",
-     "     VISIBLE:  ' a bug # or some search terms:  ', cursor=32",
+    ["BRAILLE LINE:  'Firefox application GNOME Bug Tracking System - Firefox Nightly frame Browser tabs 
tool bar GNOME Bug Tracking System page tab'",
+     "     VISIBLE:  'GNOME Bug Tracking System page t', cursor=1",
+     "BRAILLE LINE:  'Enter a bug # or some search terms:  $l'",
+     "     VISIBLE:  'terms:  $l', cursor=8",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "SPEECH OUTPUT: 'Enter a bug # or some search terms: entry'",
+     "SPEECH OUTPUT: 'GNOME Bug Tracking System page tab.'",
+     "SPEECH OUTPUT: 'form'",
+     "SPEECH OUTPUT: 'Enter a bug # or some search terms: entry.'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
-sequence.append(PauseAction(5000))
+sequence.append(PauseAction(3000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Ctrl>w"))
 sequence.append(utils.AssertPresentationAction(
     "4. Close third page tab - land in second page",
     ["KNOWN ISSUE: EOCs",
+     "BRAILLE LINE:  'Firefox application Orca - GNOME Live! - Firefox Nightly frame Browser tabs tool bar 
Orca - GNOME Live! page tab'",
+     "     VISIBLE:  'Orca - GNOME Live! page tab', cursor=1",
      "BRAILLE LINE:  '\ufffc\ufffc'",
      "     VISIBLE:  '\ufffc\ufffc', cursor=1",
      "BRAILLE LINE:  'Browse mode'",
      "     VISIBLE:  'Browse mode', cursor=0",
-     "SPEECH OUTPUT: 'document frame'",
+     "SPEECH OUTPUT: 'Orca - GNOME Live! page tab.'",
+     "SPEECH OUTPUT: 'leaving form.'",
+     "SPEECH OUTPUT: 'document web'",
      "SPEECH OUTPUT: 'Browse mode' voice=system"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/ui_role_accel_label.py b/test/keystrokes/firefox/ui_role_accel_label.py
index ddcd5b7a1..cfc12c949 100644
--- a/test/keystrokes/firefox/ui_role_accel_label.py
+++ b/test/keystrokes/firefox/ui_role_accel_label.py
@@ -16,7 +16,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Down Arrow in File menu",
-    ["BRAILLE LINE:  'Firefox application (Mozilla Firefox|Nightly) frame Menu Bar tool bar Application menu 
bar New Window\\(Ctrl\\+N\\)'",
+    ["BRAILLE LINE:  'Firefox application Firefox Nightly frame Menu Bar tool bar Application menu bar New 
Window\\(Ctrl\\+N\\)'",
      "     VISIBLE:  'New Window(Ctrl+N)', cursor=1",
      "SPEECH OUTPUT: 'New Window Ctrl+N.'"]))
 
@@ -24,7 +24,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down Arrow in File menu",
-    ["BRAILLE LINE:  'Firefox application (Mozilla Firefox|Nightly) frame Menu Bar tool bar Application menu 
bar New Private Window\\(Shift\\+Ctrl\\+P\\)'",
+    ["BRAILLE LINE:  'Firefox application Firefox Nightly frame Menu Bar tool bar Application menu bar New 
Private Window\\(Shift\\+Ctrl\\+P\\)'",
      "     VISIBLE:  'New Private Window(Shift+Ctrl+P)', cursor=1",
      "SPEECH OUTPUT: 'New Private Window Shift+Ctrl+P.'"]))
 
@@ -32,10 +32,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "3. Basic Where Am I",
-    ["BRAILLE LINE:  'Firefox application (Mozilla Firefox|Nightly) frame Menu Bar tool bar Application menu 
bar New Private Window\\(Shift\\+Ctrl\\+P\\)'",
+    ["BRAILLE LINE:  'Firefox application Firefox Nightly frame Menu Bar tool bar Application menu bar New 
Private Window\\(Shift\\+Ctrl\\+P\\)'",
      "     VISIBLE:  'New Private Window(Shift+Ctrl+P)', cursor=1",
-     "SPEECH OUTPUT: '(Mozilla Firefox|Nightly) frame'",
-     "SPEECH OUTPUT: 'Menu Bar tool bar'",
      "SPEECH OUTPUT: 'File menu'",
      "SPEECH OUTPUT: 'Menu Bar tool bar.'",
      "SPEECH OUTPUT: 'New Private Window.'",
diff --git a/test/keystrokes/firefox/ui_role_check_menu_item.py 
b/test/keystrokes/firefox/ui_role_check_menu_item.py
index 2a9d3efe6..051038eb7 100644
--- a/test/keystrokes/firefox/ui_role_check_menu_item.py
+++ b/test/keystrokes/firefox/ui_role_check_menu_item.py
@@ -7,13 +7,14 @@ import utils
 
 sequence = MacroSequence()
 
+sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("<Alt>v"))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "1. Up Arrow in View menu",
-    ["BRAILLE LINE:  'Firefox application (Mozilla Firefox|Nightly) frame Menu Bar tool bar Application menu 
bar < > Full Screen check menu item'",
+    ["BRAILLE LINE:  'Firefox application Firefox Nightly frame Menu Bar tool bar Application menu bar < > 
Full Screen check menu item'",
      "     VISIBLE:  '< > Full Screen check menu item', cursor=1",
      "SPEECH OUTPUT: 'Full Screen check menu item not checked.'"]))
 
@@ -21,10 +22,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. Basic Where Am I",
-    ["BRAILLE LINE:  'Firefox application (Mozilla Firefox|Nightly) frame Menu Bar tool bar Application menu 
bar < > Full Screen check menu item'",
+    ["BRAILLE LINE:  'Firefox application Firefox Nightly frame Menu Bar tool bar Application menu bar < > 
Full Screen check menu item'",
      "     VISIBLE:  '< > Full Screen check menu item', cursor=1",
-     "SPEECH OUTPUT: '(Mozilla Firefox|Nightly) frame'",
-     "SPEECH OUTPUT: 'Menu Bar tool bar'",
      "SPEECH OUTPUT: 'View menu'",
      "SPEECH OUTPUT: 'Menu Bar tool bar.'",
      "SPEECH OUTPUT: 'Full Screen check menu item not checked.'",
diff --git a/test/keystrokes/firefox/ui_role_entry.py b/test/keystrokes/firefox/ui_role_entry.py
index 47efc506b..4102e8ac6 100644
--- a/test/keystrokes/firefox/ui_role_entry.py
+++ b/test/keystrokes/firefox/ui_role_entry.py
@@ -112,43 +112,7 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE: The mnemonic seems to have gone missing",
      "BRAILLE LINE:  'Firefox application New Bookmark dialog Name: this s  $l'",
      "     VISIBLE:  'Name: this s  $l', cursor=12",
-     "SPEECH OUTPUT: 'Name: entry this s .'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("<Alt>d"))
-sequence.append(utils.AssertPresentationAction(
-    "10. Alt+D to Description",
-    ["BRAILLE LINE:  'Firefox application New Bookmark dialog Description:  $l'",
-     "     VISIBLE:  'Description:  $l', cursor=14",
-     "SPEECH OUTPUT: 'Description: entry.'"]))
-
-sequence.append(TypeAction("Here is the first line."))
-sequence.append(KeyComboAction("Return"))
-sequence.append(TypeAction("Here is the second line."))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "11. Up Arrow",
-    ["BRAILLE LINE:  'Firefox application New Bookmark dialog Description: Here is the first line. $l'",
-     "     VISIBLE:  'iption: Here is the first line. ', cursor=32",
-     "SPEECH OUTPUT: 'Here is the first line.'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "12. Down Arrow",
-    ["BRAILLE LINE:  'Description: Here is the second line. $l'",
-     "     VISIBLE:  'ption: Here is the second line. ', cursor=32",
-     "SPEECH OUTPUT: 'Here is the second line.'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("KP_Enter"))
-sequence.append(utils.AssertPresentationAction(
-    "13. Basic Where Am I",
-    ["BRAILLE LINE:  'Description: Here is the second line. $l'",
-     "     VISIBLE:  'ption: Here is the second line. ', cursor=32",
-     "SPEECH OUTPUT: 'Description: entry Here is the second line.'"]))
+     "SPEECH OUTPUT: 'Name: entry this s '"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/firefox/ui_role_menu_bar.py b/test/keystrokes/firefox/ui_role_menu_bar.py
index c317e5bae..f9f0de059 100644
--- a/test/keystrokes/firefox/ui_role_menu_bar.py
+++ b/test/keystrokes/firefox/ui_role_menu_bar.py
@@ -14,9 +14,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "1. Right Arrow on menu bar",
-    ["BRAILLE LINE:  'Firefox application (Mozilla Firefox|Nightly) frame Menu Bar tool bar Edit menu'",
+    ["BRAILLE LINE:  'Firefox application Firefox Nightly frame Menu Bar tool bar Edit menu'",
      "     VISIBLE:  'Edit menu', cursor=1",
-     "BRAILLE LINE:  'Firefox application (Mozilla Firefox|Nightly) frame Menu Bar tool bar Application menu 
bar Undo grayed\\(Ctrl\\+Z\\)'",
+     "BRAILLE LINE:  'Firefox application Firefox Nightly frame Menu Bar tool bar Application menu bar Undo 
grayed\\(Ctrl\\+Z\\)'",
      "     VISIBLE:  'Undo grayed(Ctrl+Z)', cursor=1",
      "SPEECH OUTPUT: 'Edit menu.'",
      "SPEECH OUTPUT: 'Undo grayed Ctrl+Z.'"]))
@@ -25,9 +25,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "2. Left Arrow on menu bar",
-    ["BRAILLE LINE:  'Firefox application (Mozilla Firefox|Nightly) frame Menu Bar tool bar File menu'",
+    ["BRAILLE LINE:  'Firefox application Firefox Nightly frame Menu Bar tool bar File menu'",
      "     VISIBLE:  'File menu', cursor=1",
-     "BRAILLE LINE:  'Firefox application (Mozilla Firefox|Nightly) frame Menu Bar tool bar Application menu 
bar New Tab\\(Ctrl\\+T\\)'",
+     "BRAILLE LINE:  'Firefox application Firefox Nightly frame Menu Bar tool bar Application menu bar New 
Tab\\(Ctrl\\+T\\)'",
      "     VISIBLE:  'New Tab(Ctrl+T)', cursor=1",
      "SPEECH OUTPUT: 'File menu.'",
      "SPEECH OUTPUT: 'New Tab Ctrl+T.'"]))
@@ -36,10 +36,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "3. Basic Where Am I",
-    ["BRAILLE LINE:  'Firefox application (Mozilla Firefox|Nightly) frame Menu Bar tool bar Application menu 
bar New Tab\\(Ctrl\\+T\\)'",
+    ["BRAILLE LINE:  'Firefox application Firefox Nightly frame Menu Bar tool bar Application menu bar New 
Tab\\(Ctrl\\+T\\)'",
      "     VISIBLE:  'New Tab(Ctrl+T)', cursor=1",
-     "SPEECH OUTPUT: '(Mozilla Firefox|Nightly) frame'",
-     "SPEECH OUTPUT: 'Menu Bar tool bar'",
      "SPEECH OUTPUT: 'File menu'",
      "SPEECH OUTPUT: 'Menu Bar tool bar.'",
      "SPEECH OUTPUT: 'New Tab.'",
diff --git a/test/keystrokes/firefox/ui_role_menu_flat_review.py 
b/test/keystrokes/firefox/ui_role_menu_flat_review.py
index 2ee23b64e..245b4c11b 100644
--- a/test/keystrokes/firefox/ui_role_menu_flat_review.py
+++ b/test/keystrokes/firefox/ui_role_menu_flat_review.py
@@ -13,9 +13,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>v"))
 sequence.append(utils.AssertPresentationAction(
     "1. Initial menu and menu item",
-    ["BRAILLE LINE:  'Firefox application Nightly frame Menu Bar tool bar Application menu bar Toolbars 
menu'",
+    ["BRAILLE LINE:  'Firefox application Firefox Nightly frame Menu Bar tool bar Application menu bar 
Toolbars menu'",
      "     VISIBLE:  'Toolbars menu', cursor=1",
-     "SPEECH OUTPUT: 'Menu Bar tool bar'",
      "SPEECH OUTPUT: 'View menu'",
      "SPEECH OUTPUT: 'Toolbars menu.'"]))
 
@@ -25,7 +24,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down",
-    ["BRAILLE LINE:  'Firefox application Nightly frame Menu Bar tool bar Application menu bar Sidebar 
menu'",
+    ["BRAILLE LINE:  'Firefox application Firefox Nightly frame Menu Bar tool bar Application menu bar 
Sidebar menu'",
      "     VISIBLE:  'Sidebar menu', cursor=1",
      "SPEECH OUTPUT: 'Sidebar menu.'"]))
 
diff --git a/test/keystrokes/firefox/ui_role_radio_button.py b/test/keystrokes/firefox/ui_role_radio_button.py
index c31671e8d..03fd938b8 100644
--- a/test/keystrokes/firefox/ui_role_radio_button.py
+++ b/test/keystrokes/firefox/ui_role_radio_button.py
@@ -17,7 +17,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Alt a to radio button group",
     ["BRAILLE LINE:  'Firefox application Print dialog General page tab Range Range &=y All Pages radio 
button'",
      "     VISIBLE:  '&=y All Pages radio button', cursor=1",
-     "SPEECH OUTPUT: 'Range panel'",
+     "SPEECH OUTPUT: 'Range panel.'",
      "SPEECH OUTPUT: 'All Pages.'",
      "SPEECH OUTPUT: 'selected radio button'"]))
 
diff --git a/test/keystrokes/firefox/ui_role_radio_menu_item.py 
b/test/keystrokes/firefox/ui_role_radio_menu_item.py
index 5547d7494..a6e95f13e 100644
--- a/test/keystrokes/firefox/ui_role_radio_menu_item.py
+++ b/test/keystrokes/firefox/ui_role_radio_menu_item.py
@@ -14,7 +14,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("y"))
 sequence.append(utils.AssertPresentationAction(
     "1. y for the Page Style menu",
-    ["BRAILLE LINE:  'Firefox application Nightly frame Menu Bar tool bar Application menu bar View menu & y 
No Style radio menu item'",
+    ["BRAILLE LINE:  'Firefox application Firefox Nightly frame Menu Bar tool bar Application menu bar View 
menu & y No Style radio menu item'",
      "     VISIBLE:  '& y No Style radio menu item', cursor=1",
      "SPEECH OUTPUT: 'Page Style menu'",
      "SPEECH OUTPUT: 'No Style not selected radio menu item'"]))
@@ -23,10 +23,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. Basic Where Am I",
-    ["BRAILLE LINE:  'Firefox application Nightly frame Menu Bar tool bar Application menu bar View menu & y 
No Style radio menu item'",
+    ["BRAILLE LINE:  'Firefox application Firefox Nightly frame Menu Bar tool bar Application menu bar View 
menu & y No Style radio menu item'",
      "     VISIBLE:  '& y No Style radio menu item', cursor=1",
-     "SPEECH OUTPUT: 'Nightly frame'",
-     "SPEECH OUTPUT: 'Menu Bar tool bar'",
      "SPEECH OUTPUT: 'View menu'",
      "SPEECH OUTPUT: 'Page Style menu'",
      "SPEECH OUTPUT: 'Menu Bar tool bar No Style radio menu item not selected 1 of 2.'",
@@ -36,7 +34,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Down Arrow in menu",
-    ["BRAILLE LINE:  'Firefox application Nightly frame Menu Bar tool bar Application menu bar View menu &=y 
Basic Page Style radio menu item'",
+    ["BRAILLE LINE:  'Firefox application Firefox Nightly frame Menu Bar tool bar Application menu bar View 
menu &=y Basic Page Style radio menu item'",
      "     VISIBLE:  '&=y Basic Page Style radio menu ', cursor=1",
      "SPEECH OUTPUT: 'Basic Page Style selected radio menu item'"]))
 
@@ -44,10 +42,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "4. Basic Where Am I",
-    ["BRAILLE LINE:  'Firefox application Nightly frame Menu Bar tool bar Application menu bar View menu &=y 
Basic Page Style radio menu item'",
+    ["BRAILLE LINE:  'Firefox application Firefox Nightly frame Menu Bar tool bar Application menu bar View 
menu &=y Basic Page Style radio menu item'",
      "     VISIBLE:  '&=y Basic Page Style radio menu ', cursor=1",
-     "SPEECH OUTPUT: 'Nightly frame'",
-     "SPEECH OUTPUT: 'Menu Bar tool bar'",
      "SPEECH OUTPUT: 'View menu'",
      "SPEECH OUTPUT: 'Page Style menu'",
      "SPEECH OUTPUT: 'Menu Bar tool bar Basic Page Style radio menu item selected 2 of 2.'",
diff --git a/test/keystrokes/firefox/ui_role_tree.py b/test/keystrokes/firefox/ui_role_tree.py
index b62504ee1..7ff5e866c 100644
--- a/test/keystrokes/firefox/ui_role_tree.py
+++ b/test/keystrokes/firefox/ui_role_tree.py
@@ -22,8 +22,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Shift Tab for tree",
-    ["BRAILLE LINE:  'Firefox application Library frame All Bookmarks expanded list item TREE LEVEL 1'",
-     "     VISIBLE:  'All Bookmarks expanded list item', cursor=1",
+    ["BRAILLE LINE:  'Firefox application Library frame All Bookmarks expanded TREE LEVEL 1'",
+     "     VISIBLE:  'All Bookmarks expanded TREE LEVE', cursor=1",
      "SPEECH OUTPUT: 'All Bookmarks.'",
      "SPEECH OUTPUT: 'expanded.'"]))
 
@@ -31,18 +31,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down Arrow in tree",
-    ["BRAILLE LINE:  'Firefox application Library frame Bookmarks Toolbar collapsed list item TREE LEVEL 2'",
-     "     VISIBLE:  'Bookmarks Toolbar collapsed list', cursor=1",
+    ["BRAILLE LINE:  'Firefox application Library frame Bookmarks Toolbar TREE LEVEL 2'",
+     "     VISIBLE:  'Bookmarks Toolbar TREE LEVEL 2', cursor=1",
      "SPEECH OUTPUT: 'Bookmarks Toolbar.'",
-     "SPEECH OUTPUT: 'collapsed.'",
      "SPEECH OUTPUT: 'tree level 2'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Down Arrow in tree",
-    ["BRAILLE LINE:  'Firefox application Library frame Bookmarks Menu collapsed list item TREE LEVEL 2'",
-     "     VISIBLE:  'Bookmarks Menu collapsed list it', cursor=1",
+    ["BRAILLE LINE:  'Firefox application Library frame Bookmarks Menu collapsed TREE LEVEL 2'",
+     "     VISIBLE:  'Bookmarks Menu collapsed TREE LE', cursor=1",
      "SPEECH OUTPUT: 'Bookmarks Menu.'",
      "SPEECH OUTPUT: 'collapsed.'"]))
 
@@ -50,58 +49,55 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "4. Basic Where Am I", 
-    ["BRAILLE LINE:  'Firefox application Library frame Bookmarks Menu collapsed list item TREE LEVEL 2'",
-     "     VISIBLE:  'Bookmarks Menu collapsed list it', cursor=1",
-     "SPEECH OUTPUT: 'list item.'",
-     "SPEECH OUTPUT: 'Bookmarks Menu.'",
+    ["BRAILLE LINE:  'Firefox application Library frame Bookmarks Menu collapsed TREE LEVEL 2'",
+     "     VISIBLE:  'Bookmarks Menu collapsed TREE LE', cursor=1",
+     "SPEECH OUTPUT: 'Bookmarks Menu tree item.'",
      "SPEECH OUTPUT: '2 of 3.'",
-     "SPEECH OUTPUT: 'collapsed tree level 2.'"]))
+     "SPEECH OUTPUT: 'collapsed tree level 2'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "5. Right Arrow to expand folder", 
-    ["BRAILLE LINE:  'Firefox application Library frame Bookmarks Menu expanded list item TREE LEVEL 2'",
-     "     VISIBLE:  'Bookmarks Menu expanded list ite', cursor=1",
+    ["BRAILLE LINE:  'Firefox application Library frame Bookmarks Menu expanded TREE LEVEL 2'",
+     "     VISIBLE:  'Bookmarks Menu expanded TREE LEV', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "6. Basic Where Am I", 
-    ["BRAILLE LINE:  'Firefox application Library frame Bookmarks Menu expanded list item TREE LEVEL 2'",
-     "     VISIBLE:  'Bookmarks Menu expanded list ite', cursor=1",
-     "SPEECH OUTPUT: 'list item.'",
-     "SPEECH OUTPUT: 'Bookmarks Menu.'",
+    ["BRAILLE LINE:  'Firefox application Library frame Bookmarks Menu expanded TREE LEVEL 2'",
+     "     VISIBLE:  'Bookmarks Menu expanded TREE LEV', cursor=1",
+     "SPEECH OUTPUT: 'Bookmarks Menu tree item.'",
      "SPEECH OUTPUT: '2 of 3.'",
-     "SPEECH OUTPUT: 'expanded tree level 2.'"]))
+     "SPEECH OUTPUT: 'expanded tree level 2'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "7. Down Arrow in tree",
-    ["BRAILLE LINE:  'Firefox application Library frame Recent Tags list item TREE LEVEL 3'",
-     "     VISIBLE:  'Recent Tags list item TREE LEVEL', cursor=1",
-     "SPEECH OUTPUT: 'Recent Tags.'",
+    ["BRAILLE LINE:  'Firefox application Library frame GNOME TREE LEVEL 3'",
+     "     VISIBLE:  'GNOME TREE LEVEL 3', cursor=1",
+     "SPEECH OUTPUT: 'GNOME.'",
      "SPEECH OUTPUT: 'tree level 3'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "8. Basic Where Am I", 
-    ["BRAILLE LINE:  'Firefox application Library frame Recent Tags list item TREE LEVEL 3'",
-     "     VISIBLE:  'Recent Tags list item TREE LEVEL', cursor=1",
-     "SPEECH OUTPUT: 'list item.'",
-     "SPEECH OUTPUT: 'Recent Tags.'",
-     "SPEECH OUTPUT: '1 of 3.'",
-     "SPEECH OUTPUT: 'tree level 3.'"]))
+    ["BRAILLE LINE:  'Firefox application Library frame GNOME TREE LEVEL 3'",
+     "     VISIBLE:  'GNOME TREE LEVEL 3', cursor=1",
+     "SPEECH OUTPUT: 'GNOME tree item.'",
+     "SPEECH OUTPUT: '1 of 2.'",
+     "SPEECH OUTPUT: 'tree level 3'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "9. Up Arrow in tree",
-    ["BRAILLE LINE:  'Firefox application Library frame Bookmarks Menu expanded list item TREE LEVEL 2'",
-     "     VISIBLE:  'Bookmarks Menu expanded list ite', cursor=1",
+    ["BRAILLE LINE:  'Firefox application Library frame Bookmarks Menu expanded TREE LEVEL 2'",
+     "     VISIBLE:  'Bookmarks Menu expanded TREE LEV', cursor=1",
      "SPEECH OUTPUT: 'Bookmarks Menu.'",
      "SPEECH OUTPUT: 'expanded.'",
      "SPEECH OUTPUT: 'tree level 2'"]))
@@ -110,25 +106,24 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "10. Left Arrow to collapse folder", 
-    ["BRAILLE LINE:  'Firefox application Library frame Bookmarks Menu collapsed list item TREE LEVEL 2'",
-     "     VISIBLE:  'Bookmarks Menu collapsed list it', cursor=1",
+    ["BRAILLE LINE:  'Firefox application Library frame Bookmarks Menu collapsed TREE LEVEL 2'",
+     "     VISIBLE:  'Bookmarks Menu collapsed TREE LE', cursor=1",
      "SPEECH OUTPUT: 'collapsed'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "11. Up Arrow in tree",
-    ["BRAILLE LINE:  'Firefox application Library frame Bookmarks Toolbar collapsed list item TREE LEVEL 2'",
-     "     VISIBLE:  'Bookmarks Toolbar collapsed list', cursor=1",
-     "SPEECH OUTPUT: 'Bookmarks Toolbar.'",
-     "SPEECH OUTPUT: 'collapsed.'"]))
+    ["BRAILLE LINE:  'Firefox application Library frame Bookmarks Toolbar TREE LEVEL 2'",
+     "     VISIBLE:  'Bookmarks Toolbar TREE LEVEL 2', cursor=1",
+     "SPEECH OUTPUT: 'Bookmarks Toolbar.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "12. Up Arrow in tree",
-    ["BRAILLE LINE:  'Firefox application Library frame All Bookmarks expanded list item TREE LEVEL 1'",
-     "     VISIBLE:  'All Bookmarks expanded list item', cursor=1",
+    ["BRAILLE LINE:  'Firefox application Library frame All Bookmarks expanded TREE LEVEL 1'",
+     "     VISIBLE:  'All Bookmarks expanded TREE LEVE', cursor=1",
      "SPEECH OUTPUT: 'All Bookmarks.'",
      "SPEECH OUTPUT: 'expanded.'",
      "SPEECH OUTPUT: 'tree level 1'"]))
@@ -139,7 +134,7 @@ sequence.append(utils.AssertPresentationAction(
     "13. Tab back to tree table",
     ["BRAILLE LINE:  'Firefox application Library frame tree table Bookmarks Toolbar   table row TREE LEVEL 
1'",
      "     VISIBLE:  'Bookmarks Toolbar   table row TR', cursor=1",
-     "SPEECH OUTPUT: 'Bookmarks Toolbar   table row'"]))
+     "SPEECH OUTPUT: 'Bookmarks Toolbar  '"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
 
diff --git a/test/keystrokes/firefox/ui_role_tree_table.py b/test/keystrokes/firefox/ui_role_tree_table.py
index a14b553fe..d6fc59d7d 100644
--- a/test/keystrokes/firefox/ui_role_tree_table.py
+++ b/test/keystrokes/firefox/ui_role_tree_table.py
@@ -15,31 +15,32 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyComboAction("Up"))
 sequence.append(KeyComboAction("Tab"))
-sequence.append(KeyComboAction("Down"))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Down Arrow in tree table",
-    ["BRAILLE LINE:  'Firefox application Library frame tree table GNOME   table row TREE LEVEL 1'",
-     "     VISIBLE:  'GNOME   table row TREE LEVEL 1', cursor=1",
-     "SPEECH OUTPUT: 'GNOME   table row'"]))
+    ["BRAILLE LINE:  'Firefox application Library frame tree table Mozilla   table row TREE LEVEL 1'",
+     "     VISIBLE:  'Mozilla   table row TREE LEVEL 1', cursor=1",
+     "SPEECH OUTPUT: 'Mozilla  '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. Basic Where Am I",
-    ["BRAILLE LINE:  'Firefox application Library frame tree table GNOME   table row TREE LEVEL 1'",
-     "     VISIBLE:  'GNOME   table row TREE LEVEL 1', cursor=1",
-     "SPEECH OUTPUT: 'GNOME   table row'"]))
+    ["BRAILLE LINE:  'Firefox application Library frame tree table Mozilla   table row TREE LEVEL 1'",
+     "     VISIBLE:  'Mozilla   table row TREE LEVEL 1', cursor=1",
+     "SPEECH OUTPUT: 'Mozilla   table row.'",
+     "SPEECH OUTPUT: '2 of 3.'",
+     "SPEECH OUTPUT: 'tree level 1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "3. Up Arrow in tree table",
-    ["BRAILLE LINE:  'Firefox application Library frame tree table table row TREE LEVEL 1'",
-     "     VISIBLE:  'table row TREE LEVEL 1', cursor=1",
-     "SPEECH OUTPUT: 'table row'"]))
+    ["BRAILLE LINE:  'Firefox application Library frame tree table GNOME   table row TREE LEVEL 1'",
+     "     VISIBLE:  'GNOME   table row TREE LEVEL 1', cursor=1",
+     "SPEECH OUTPUT: 'GNOME  '"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
 
diff --git a/test/keystrokes/firefox/ui_title_and_status_bar.py 
b/test/keystrokes/firefox/ui_title_and_status_bar.py
index 0061727b1..a493a0e0d 100644
--- a/test/keystrokes/firefox/ui_title_and_status_bar.py
+++ b/test/keystrokes/firefox/ui_title_and_status_bar.py
@@ -14,9 +14,9 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "1. Title bar",
-    ["BRAILLE LINE:  'Links to test files - Nightly'",
-     "     VISIBLE:  'Links to test files - Nightly', cursor=0",
-     "SPEECH OUTPUT: 'Links to test files - Nightly'"]))
+    ["BRAILLE LINE:  'Links to test files - Firefox Nightly'",
+     "     VISIBLE:  'Links to test files - Firefox Ni', cursor=0",
+     "SPEECH OUTPUT: 'Links to test files - Firefox Nightly'"]))
 
 sequence.append(PauseAction(5000))
 
@@ -27,13 +27,13 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "2. Status bar",
-    ["BRAILLE LINE:  'Links to test files - Nightly'",
-     "     VISIBLE:  'Links to test files - Nightly', cursor=0",
+    ["BRAILLE LINE:  'Links to test files - Firefox Nightly'",
+     "     VISIBLE:  'Links to test files - Firefox Ni', cursor=0",
      "BRAILLE LINE:  'anchors.html'",
      "     VISIBLE:  'anchors.html', cursor=1",
      "BRAILLE LINE:  'anchors.html'",
      "     VISIBLE:  'anchors.html', cursor=1",
-     "SPEECH OUTPUT: 'Links to test files - Nightly'",
+     "SPEECH OUTPUT: 'Links to test files - Firefox Nightly'",
      "SPEECH OUTPUT: 'file:///.+/anchors.html'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/word_nav_list_items.py b/test/keystrokes/firefox/word_nav_list_items.py
index 29d107a27..4508eef1d 100644
--- a/test/keystrokes/firefox/word_nav_list_items.py
+++ b/test/keystrokes/firefox/word_nav_list_items.py
@@ -17,7 +17,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Line Down",
     ["BRAILLE LINE:  '1. This is a short list item.'",
-     "     VISIBLE:  '1. This is a short list item.', cursor=1",
+     "     VISIBLE:  '1. This is a short list item.', cursor=31",
      "SPEECH OUTPUT: '1. This is a short list item.'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/gnome-clocks/stop_watch_flat_review.py 
b/test/keystrokes/gnome-clocks/stop_watch_flat_review.py
index cc9a217b2..747db7e7e 100644
--- a/test/keystrokes/gnome-clocks/stop_watch_flat_review.py
+++ b/test/keystrokes/gnome-clocks/stop_watch_flat_review.py
@@ -6,7 +6,7 @@ import utils
 sequence = MacroSequence()
 
 sequence.append(PauseAction(3000))
-sequence.append(KeyComboAction("Tab"))
+sequence.append(KeyComboAction("F10"))
 sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyComboAction("Tab"))
diff --git a/test/keystrokes/gnome-clocks/timer_flat_review.py 
b/test/keystrokes/gnome-clocks/timer_flat_review.py
index cd8aec493..08a0a2b85 100644
--- a/test/keystrokes/gnome-clocks/timer_flat_review.py
+++ b/test/keystrokes/gnome-clocks/timer_flat_review.py
@@ -6,7 +6,7 @@ import utils
 sequence = MacroSequence()
 
 sequence.append(PauseAction(3000))
-sequence.append(KeyComboAction("Tab"))
+sequence.append(KeyComboAction("F10"))
 sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyComboAction("Tab"))
diff --git a/test/keystrokes/gnome-terminal/command_not_found.py 
b/test/keystrokes/gnome-terminal/command_not_found.py
index 1788f026d..4df5f2fa7 100644
--- a/test/keystrokes/gnome-terminal/command_not_found.py
+++ b/test/keystrokes/gnome-terminal/command_not_found.py
@@ -13,10 +13,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Return after typing 'foo'",
     ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
-     "BRAILLE LINE:  '$ '",
-     "     VISIBLE:  '$ ', cursor=3",
-     "SPEECH OUTPUT: 'bash: foo: command not found...'",
-     "SPEECH OUTPUT: '$ '"]))
+     "SPEECH OUTPUT: 'bash: foo: command not found...'"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/gnome-terminal/man_page.py b/test/keystrokes/gnome-terminal/man_page.py
index d423e160b..93faed802 100644
--- a/test/keystrokes/gnome-terminal/man_page.py
+++ b/test/keystrokes/gnome-terminal/man_page.py
@@ -16,6 +16,10 @@ sequence.append(utils.AssertPresentationAction(
     "1. Return",
     ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
+     "BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1",
+     "BRAILLE LINE:  ' Manual page orca(1) line 1 (press h for help or q to quit)'",
+     "     VISIBLE:  '(press h for help or q to quit)', cursor=32",
      "BRAILLE LINE:  ' Manual page orca(1) line 1 (press h for help or q to quit)'",
      "     VISIBLE:  '(press h for help or q to quit)', cursor=32",
      "SPEECH OUTPUT: 'orca(1)                     General Commands Manual                    orca(1)",
@@ -230,7 +234,7 @@ sequence.append(KeyComboAction("<Shift>g"))
 sequence.append(utils.AssertPresentationAction(
     "8. Shift+g",
     ["BRAILLE LINE:  ' Manual page orca(1) line 240/262 (END) (press h for help or q to quit)'",
-     "     VISIBLE:  '(press h for help or q to quit)', cursor=32",
+     "     VISIBLE:  'or q to quit\)', cursor=14",
      "SPEECH OUTPUT: '       ~/.local/share/orca/orca-scripts",
      "              Orca user orca scripts directory",
      "",
diff --git a/test/keystrokes/gnome-terminal/nano.py b/test/keystrokes/gnome-terminal/nano.py
index fd1d5c561..e16571bdf 100644
--- a/test/keystrokes/gnome-terminal/nano.py
+++ b/test/keystrokes/gnome-terminal/nano.py
@@ -15,7 +15,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Launch Nano",
     ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: '  nano [\\d\\.]+\\s+New Buffer\\s*",
+     "SPEECH OUTPUT: '  GNU nano [\d\.]+\s+New Buffer\s*",
      "",
      "'"]))
 
@@ -29,8 +29,7 @@ sequence.append(TypeAction("Done."))
 sequence.append(utils.AssertPresentationAction(
     "2.Typing text",
     ["KNOWN ISSUE: We should be able to do less braille updating here",
-     "BRAILLE LINE:  'D'",
-     "     VISIBLE:  'D', cursor=2",
+     "KNOWN ISSUE: We're speaking the initial D due to imperfect heuristics",
      "BRAILLE LINE:  'D'",
      "     VISIBLE:  'D', cursor=2",
      "BRAILLE LINE:  'Do'",
@@ -48,7 +47,8 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  'Done.'",
      "     VISIBLE:  'Done.', cursor=6",
      "BRAILLE LINE:  'Done.'",
-     "     VISIBLE:  'Done.', cursor=6"]))
+     "     VISIBLE:  'Done.', cursor=6",
+     "SPEECH OUTPUT: 'D'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
diff --git a/test/keystrokes/gnome-terminal/reverse_i_search.py 
b/test/keystrokes/gnome-terminal/reverse_i_search.py
index a6d093a21..83a1066a3 100644
--- a/test/keystrokes/gnome-terminal/reverse_i_search.py
+++ b/test/keystrokes/gnome-terminal/reverse_i_search.py
@@ -54,11 +54,13 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("BackSpace"))
 sequence.append(utils.AssertPresentationAction(
     "5. BackSpace",
-    ["BRAILLE LINE:  '(reverse-i-search)`': cat foo'",
-     "     VISIBLE:  '(reverse-i-search)`': cat foo', cursor=23",
-     "BRAILLE LINE:  '(reverse-i-search)`': cat foo'",
-     "     VISIBLE:  '(reverse-i-search)`': cat foo', cursor=23",
-     "SPEECH OUTPUT: 'c'"]))
+    ["BRAILLE LINE:  '(failed reverse-i-search)`': cat foo'",
+     "     VISIBLE:  '(failed reverse-i-search)`': cat', cursor=30",
+     "BRAILLE LINE:  '(failed reverse-i-search)`': cat foo'",
+     "     VISIBLE:  '(failed reverse-i-search)`': cat', cursor=30",
+     "BRAILLE LINE:  '(failed reverse-i-search)`': cat foo'",
+     "     VISIBLE:  '(failed reverse-i-search)`': cat', cursor=30",
+     "SPEECH OUTPUT: 'reverse-i-search)`c'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction("e"))
@@ -66,7 +68,7 @@ sequence.append(utils.AssertPresentationAction(
     "6. Type 'e'",
     ["BRAILLE LINE:  '(reverse-i-search)`e': echo goodbye world'",
      "     VISIBLE:  'verse-i-search)`e': echo goodbye', cursor=32",
-     "SPEECH OUTPUT: 'e': echo goodbye world'"]))
+     "SPEECH OUTPUT: 'reverse-i-search)`e': echo goodbye world'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction("cho "))
diff --git a/test/keystrokes/gnome-terminal/vim-append.py b/test/keystrokes/gnome-terminal/vim-append.py
index 75e003954..a63a4864c 100644
--- a/test/keystrokes/gnome-terminal/vim-append.py
+++ b/test/keystrokes/gnome-terminal/vim-append.py
@@ -10,81 +10,72 @@ sequence.append(TypeAction("vim"))
 sequence.append(KeyComboAction("Return"))
 sequence.append(PauseAction(3000))
 
+# KNOWN ISSUE: Sometimes we display the frame and sometimes we don't.
+# It seems to be a timing issue.
+
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("a"))
 sequence.append(utils.AssertPresentationAction(
     "1. A to append text",
-    ["BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame '",
-     "     VISIBLE:  '', cursor=1",
+    ["BRAILLE LINE:  'gnome-terminal-server application \w+@\w+:/tmp/gnome-terminal-wd frame '",
+     "     VISIBLE:  '(frame |)', cursor=1",
      "SPEECH OUTPUT: '-- INSERT --                                                  0,1  '"]))
 
+sequence.append(TypeAction("Hi H"))
 sequence.append(utils.StartRecordingAction())
-sequence.append(TypeAction("Hi Hi"))
+sequence.append(TypeAction("i"))
 sequence.append(utils.AssertPresentationAction(
-    "2. Type 'Hi Hi'",
-    ["BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame H'",
-     "     VISIBLE:  'H', cursor=2",
-     "BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame H'",
-     "     VISIBLE:  'H', cursor=2",
-     "BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi'",
-     "     VISIBLE:  'Hi', cursor=3",
-     "BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi'",
-     "     VISIBLE:  'Hi', cursor=3",
-     "BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi'",
-     "     VISIBLE:  'Hi', cursor=3",
-     "BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi H'",
-     "     VISIBLE:  'Hi H', cursor=5",
-     "BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi H'",
-     "     VISIBLE:  'Hi H', cursor=5",
-     "BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi Hi'",
-     "     VISIBLE:  'Hi Hi', cursor=6",
-     "BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi Hi'",
-     "     VISIBLE:  'Hi Hi', cursor=6"]))
+    "2. Finish typing 'Hi Hi'",
+    ["BRAILLE LINE:  'gnome-terminal-server application \w+@\w+:/tmp/gnome-terminal-wd frame Hi Hi'",
+     "     VISIBLE:  '(frame |)Hi Hi', cursor=(6|12)",
+     "BRAILLE LINE:  'gnome-terminal-server application \w+@\w+:/tmp/gnome-terminal-wd frame Hi Hi'",
+     "     VISIBLE:  '(frame |)Hi Hi', cursor=(6|12)"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("BackSpace"))
 sequence.append(utils.AssertPresentationAction(
     "3. BackSpace",
-    ["BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi H'",
-     "     VISIBLE:  'Hi H', cursor=5",
-     "BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi H'",
-     "     VISIBLE:  'Hi H', cursor=5",
-     "BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi H'",
-     "     VISIBLE:  'Hi H', cursor=5",
+    ["BRAILLE LINE:  'gnome-terminal-server application \w+@\w+:/tmp/gnome-terminal-wd frame Hi H'",
+     "     VISIBLE:  '(frame |)Hi H', cursor=(5|11)",
+     "BRAILLE LINE:  'gnome-terminal-server application \w+@\w+:/tmp/gnome-terminal-wd frame Hi H'",
+     "     VISIBLE:  '(frame |)Hi H', cursor=(5|11)",
+     "BRAILLE LINE:  'gnome-terminal-server application \w+@\w+:/tmp/gnome-terminal-wd frame Hi H'",
+     "     VISIBLE:  '(frame |)Hi H', cursor=(5|11)",
      "SPEECH OUTPUT: 'i'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("BackSpace"))
 sequence.append(utils.AssertPresentationAction(
     "4. BackSpace",
-    ["BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi '",
-     "     VISIBLE:  'Hi ', cursor=4",
-     "BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi '",
-     "     VISIBLE:  'Hi ', cursor=4",
-     "BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi '",
-     "     VISIBLE:  'Hi ', cursor=4",
+    ["BRAILLE LINE:  'gnome-terminal-server application \w+@\w+:/tmp/gnome-terminal-wd frame Hi '",
+     "     VISIBLE:  '(frame |)Hi ', cursor=(4|10)",
+     "BRAILLE LINE:  'gnome-terminal-server application \w+@\w+:/tmp/gnome-terminal-wd frame Hi '",
+     "     VISIBLE:  '(frame |)Hi ', cursor=(4|10)",
+     "BRAILLE LINE:  'gnome-terminal-server application \w+@\w+:/tmp/gnome-terminal-wd frame Hi '",
+     "     VISIBLE:  '(frame |)Hi ', cursor=(4|10)",
      "SPEECH OUTPUT: 'H'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("BackSpace"))
 sequence.append(utils.AssertPresentationAction(
     "5. BackSpace",
-    ["BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi '",
-     "     VISIBLE:  'Hi ', cursor=3",
-     "BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi '",
-     "     VISIBLE:  'Hi ', cursor=3",
-     "BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi '",
-     "     VISIBLE:  'Hi ', cursor=3",
+    ["KNOWN ISSUE: We're speaking '4', possibly due to a heuristic",
+     "BRAILLE LINE:  'gnome-terminal-server application \w+@\w+:/tmp/gnome-terminal-wd frame Hi '",
+     "     VISIBLE:  '(frame |)Hi ', cursor=(3|9)",
+     "BRAILLE LINE:  'gnome-terminal-server application \w+@\w+:/tmp/gnome-terminal-wd frame Hi '",
+     "     VISIBLE:  '(frame |)Hi ', cursor=(3|9)",
+     "BRAILLE LINE:  'gnome-terminal-server application \w+@\w+:/tmp/gnome-terminal-wd frame Hi '",
+     "     VISIBLE:  '(frame |)Hi ', cursor=(3|9)",
      "SPEECH OUTPUT: '4'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction("!"))
 sequence.append(utils.AssertPresentationAction(
     "6. Type '!'",
-    ["BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi!'",
-     "     VISIBLE:  'Hi!', cursor=4",
-     "BRAILLE LINE:  'gnome-terminal-server application \\w+@\\w+:/tmp/gnome-terminal-wd frame Hi!'",
-     "     VISIBLE:  'Hi!', cursor=4"]))
+    ["BRAILLE LINE:  'gnome-terminal-server application \w+@\w+:/tmp/gnome-terminal-wd frame Hi!'",
+     "     VISIBLE:  '(frame |)Hi!', cursor=(4|10)",
+     "BRAILLE LINE:  'gnome-terminal-server application \w+@\w+:/tmp/gnome-terminal-wd frame Hi!'",
+     "     VISIBLE:  '(frame |)Hi!', cursor=(4|10)"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
diff --git a/test/keystrokes/gtk-demo/role_accel_label.py b/test/keystrokes/gtk-demo/role_accel_label.py
index 1bac23fa3..e8458d4a4 100644
--- a/test/keystrokes/gtk-demo/role_accel_label.py
+++ b/test/keystrokes/gtk-demo/role_accel_label.py
@@ -29,7 +29,6 @@ sequence.append(utils.AssertPresentationAction(
     "2. Where Am I",
     ["BRAILLE LINE:  'gtk-demo application Application Window frame Color menu'",
      "     VISIBLE:  'Color menu', cursor=1",
-     "SPEECH OUTPUT: 'Application Window frame'",
      "SPEECH OUTPUT: 'Preferences menu'",
      "SPEECH OUTPUT: 'Color menu.'",
      "SPEECH OUTPUT: '1 of 4.'",
diff --git a/test/keystrokes/gtk-demo/role_check_box.py b/test/keystrokes/gtk-demo/role_check_box.py
index 769f05883..c80655983 100644
--- a/test/keystrokes/gtk-demo/role_check_box.py
+++ b/test/keystrokes/gtk-demo/role_check_box.py
@@ -20,7 +20,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Tab to first checkbox",
     ["BRAILLE LINE:  'gtk-demo application Panes frame Horizontal panel < > Resize check box'",
      "     VISIBLE:  '< > Resize check box', cursor=1",
-     "SPEECH OUTPUT: 'Horizontal panel'",
+     "SPEECH OUTPUT: 'Horizontal panel.'",
      "SPEECH OUTPUT: 'Resize check box not checked.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -67,7 +67,7 @@ sequence.append(utils.AssertPresentationAction(
     "6. Tab to first checkbox in next panel",
     ["BRAILLE LINE:  'gtk-demo application Panes frame Vertical panel < > Resize check box'",
      "     VISIBLE:  '< > Resize check box', cursor=1",
-     "SPEECH OUTPUT: 'Vertical panel'",
+     "SPEECH OUTPUT: 'Vertical panel.'",
      "SPEECH OUTPUT: 'Resize check box not checked.'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
diff --git a/test/keystrokes/gtk-demo/role_combo_box.py b/test/keystrokes/gtk-demo/role_combo_box.py
index e3914f5c4..feb939a6c 100644
--- a/test/keystrokes/gtk-demo/role_combo_box.py
+++ b/test/keystrokes/gtk-demo/role_combo_box.py
@@ -15,11 +15,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction(" "))
 sequence.append(utils.AssertPresentationAction(
     "1. Warning combo box item",
-    ["BRAILLE LINE:  'gtk-demo application window'",
-     "     VISIBLE:  'gtk-demo application window', cursor=22",
+    ["BRAILLE LINE:  'gtk-demo application Combo boxes frame Some stock icons panel menu'",
+     "     VISIBLE:  'menu', cursor=1",
      "BRAILLE LINE:  'gtk-demo application Combo boxes frame Some stock icons panel Warning combo box 
Warning'",
      "     VISIBLE:  'Warning', cursor=1",
-     "SPEECH OUTPUT: 'window'",
+     "SPEECH OUTPUT: 'combo box.'",
      "SPEECH OUTPUT: 'Warning.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -29,7 +29,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'gtk-demo application Combo boxes frame Some stock icons panel Warning combo box 
Warning'",
      "     VISIBLE:  'Warning', cursor=1",
      "SPEECH OUTPUT: 'Combo boxes frame'",
-     "SPEECH OUTPUT: 'Some stock icons panel'",
+     "SPEECH OUTPUT: 'Some stock icons panel.'",
      "SPEECH OUTPUT: 'Warning.'",
      "SPEECH OUTPUT: '1 of 5'"]))
 
@@ -48,7 +48,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'gtk-demo application Combo boxes frame Some stock icons panel Warning combo box New'",
      "     VISIBLE:  'New', cursor=1",
      "SPEECH OUTPUT: 'Combo boxes frame'",
-     "SPEECH OUTPUT: 'Some stock icons panel'",
+     "SPEECH OUTPUT: 'Some stock icons panel.'",
      "SPEECH OUTPUT: 'New.'",
      "SPEECH OUTPUT: '3 of 5'"]))
 
@@ -60,8 +60,8 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "5. Editable text combo box",
     ["BRAILLE LINE:  'gtk-demo application Combo boxes frame Editable panel  $l'",
-     "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'Editable panel'",
+     "     VISIBLE:  'boxes frame Editable panel  $l', cursor=28",
+     "SPEECH OUTPUT: 'Editable panel.'",
      "SPEECH OUTPUT: 'editable combo box.'"]))
 
 sequence.append(TypeAction("Fou"))
@@ -70,16 +70,16 @@ sequence.append(TypeAction("r"))
 sequence.append(utils.AssertPresentationAction(
     "6. Editable text combo box typing",
     ["BRAILLE LINE:  'gtk-demo application Combo boxes frame Editable panel Fou $l'",
-     "     VISIBLE:  'Fou $l', cursor=5",
+     "     VISIBLE:  'boxes frame Editable panel Fou $', cursor=32",
      "BRAILLE LINE:  'gtk-demo application Combo boxes frame Editable panel Four $l'",
-     "     VISIBLE:  'Four $l', cursor=5"]))
+     "     VISIBLE:  'boxes frame Editable panel Four ', cursor=32"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "7. Editable text combo box Where Am I",
     ["BRAILLE LINE:  'gtk-demo application Combo boxes frame Editable panel Four $l'",
-     "     VISIBLE:  'Four $l', cursor=5",
+     "     VISIBLE:  'boxes frame Editable panel Four ', cursor=32",
      "SPEECH OUTPUT: 'editable combo box.'",
      "SPEECH OUTPUT: 'Four.'"]))
 
@@ -88,7 +88,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "8. Editable text combo box open button",
     ["BRAILLE LINE:  'gtk-demo application Combo boxes frame Editable panel Four $l combo box'",
-     "     VISIBLE:  'Four $l combo box', cursor=5",
+     "     VISIBLE:  'boxes frame Editable panel Four ', cursor=32",
      "SPEECH OUTPUT: 'Four editable combo box.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -96,9 +96,9 @@ sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
 sequence.append(utils.AssertPresentationAction(
     "9. Editable text combo box with selected text",
     ["BRAILLE LINE:  'gtk-demo application Combo boxes frame Editable panel Four $l'",
-     "     VISIBLE:  'Four $l', cursor=5",
+     "     VISIBLE:  'boxes frame Editable panel Four ', cursor=32",
      "BRAILLE LINE:  'gtk-demo application Combo boxes frame Editable panel Four $l'",
-     "     VISIBLE:  'Four $l', cursor=5",
+     "     VISIBLE:  'boxes frame Editable panel Four ', cursor=32",
      "SPEECH OUTPUT: 'editable combo box.'",
      "SPEECH OUTPUT: 'Four selected'"]))
 
@@ -107,7 +107,7 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "10. Editable text combo box with selected text Where Am I",
     ["BRAILLE LINE:  'gtk-demo application Combo boxes frame Editable panel Four $l'",
-     "     VISIBLE:  'Four $l', cursor=5",
+     "     VISIBLE:  'boxes frame Editable panel Four ', cursor=32",
      "SPEECH OUTPUT: 'editable combo box.'",
      "SPEECH OUTPUT: 'Four selected.'"]))
 
@@ -121,7 +121,7 @@ sequence.append(utils.AssertPresentationAction(
     "11. Combo box with multiple levels",
     ["BRAILLE LINE:  'gtk-demo application Combo boxes frame Where are we ? panel Boston combo box'",
      "     VISIBLE:  'Boston combo box', cursor=1",
-     "SPEECH OUTPUT: 'Where are we ? panel'",
+     "SPEECH OUTPUT: 'Where are we ? panel.'",
      "SPEECH OUTPUT: 'Boston combo box.'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/gtk-demo/role_combo_box2.py b/test/keystrokes/gtk-demo/role_combo_box2.py
index d731882ce..f3f713d15 100644
--- a/test/keystrokes/gtk-demo/role_combo_box2.py
+++ b/test/keystrokes/gtk-demo/role_combo_box2.py
@@ -46,7 +46,7 @@ sequence.append(utils.AssertPresentationAction(
     "4. Where Am I",
     ["BRAILLE LINE:  'gtk-demo application Print dialog Page Setup page tab Only print: Even sheets combo 
box Even sheets'",
      "     VISIBLE:  'Even sheets', cursor=1",
-     "SPEECH OUTPUT: 'Print'",
+     "SPEECH OUTPUT: 'Print dialog'",
      "SPEECH OUTPUT: 'Page Setup page tab.'",
      "SPEECH OUTPUT: 'Even sheets.'",
      "SPEECH OUTPUT: '2 of 3'"]))
diff --git a/test/keystrokes/gtk-demo/role_dialog.py b/test/keystrokes/gtk-demo/role_dialog.py
index 0a7f7e834..81618c477 100644
--- a/test/keystrokes/gtk-demo/role_dialog.py
+++ b/test/keystrokes/gtk-demo/role_dialog.py
@@ -9,17 +9,14 @@ sequence = MacroSequence()
 
 sequence.append(KeyComboAction("<Control>f"))
 sequence.append(TypeAction("Expander"))
+sequence.append(PauseAction(3000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "1. Dialog automatic reading",
-    ["BRAILLE LINE:  'gtk-demo application window  $l'",
-     "     VISIBLE:  'gtk-demo application window  $l', cursor=29",
-     "BRAILLE LINE:  'gtk-demo application window  $l'",
-     "     VISIBLE:  'gtk-demo application window  $l', cursor=29",
-     "BRAILLE LINE:  'gtk-demo application window  $l'",
-     "     VISIBLE:  'gtk-demo application window  $l', cursor=29",
+    ["BRAILLE LINE:  'gtk-demo application window Expander $l'",
+     "     VISIBLE:  'Expander $l', cursor=1",
      "BRAILLE LINE:  'gtk-demo application GtkExpander dialog'",
      "     VISIBLE:  'GtkExpander dialog', cursor=1",
      "BRAILLE LINE:  'gtk-demo application GtkExpander dialog & y Details collapsed toggle button'",
diff --git a/test/keystrokes/gtk-demo/role_icon.py b/test/keystrokes/gtk-demo/role_icon.py
index 3b0f30c91..7ead4cf33 100644
--- a/test/keystrokes/gtk-demo/role_icon.py
+++ b/test/keystrokes/gtk-demo/role_icon.py
@@ -19,7 +19,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. bin icon",
-    ["BRAILLE LINE:  'gtk-demo application GtkIconView demo frame bin icon'",
+    ["BRAILLE LINE:  'gtk-demo application GtkIconView demo frame layered pane bin icon'",
      "     VISIBLE:  'bin icon', cursor=1",
      "SPEECH OUTPUT: 'bin icon.'"]))
 
@@ -27,17 +27,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. bin icon Where Am I",
-    ["BRAILLE LINE:  'gtk-demo application GtkIconView demo frame bin icon'",
+    ["BRAILLE LINE:  'gtk-demo application GtkIconView demo frame layered pane bin icon'",
      "     VISIBLE:  'bin icon', cursor=1",
      "SPEECH OUTPUT: 'Icon panel.'",
      "SPEECH OUTPUT: 'bin.'",
-     "SPEECH OUTPUT: '1 of 22 items selected on 1 of 22.'"]))
+     "SPEECH OUTPUT: '1 of 20 items selected on 1 of 20.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "3. boot icon",
-    ["BRAILLE LINE:  'gtk-demo application GtkIconView demo frame boot icon'",
+    ["BRAILLE LINE:  'gtk-demo application GtkIconView demo frame layered pane boot icon'",
      "     VISIBLE:  'boot icon', cursor=1",
      "SPEECH OUTPUT: 'boot icon.'"]))
 
@@ -45,7 +45,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Left"))
 sequence.append(utils.AssertPresentationAction(
     "4. icon selection",
-    ["BRAILLE LINE:  'gtk-demo application GtkIconView demo frame bin icon'",
+    ["BRAILLE LINE:  'gtk-demo application GtkIconView demo frame layered pane bin icon'",
      "     VISIBLE:  'bin icon', cursor=1",
      "SPEECH OUTPUT: 'bin icon.'"]))
 
@@ -53,11 +53,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "5. icon selection Where Am I",
-    ["BRAILLE LINE:  'gtk-demo application GtkIconView demo frame bin icon'",
+    ["BRAILLE LINE:  'gtk-demo application GtkIconView demo frame layered pane bin icon'",
      "     VISIBLE:  'bin icon', cursor=1",
      "SPEECH OUTPUT: 'Icon panel.'",
      "SPEECH OUTPUT: 'bin.'",
-     "SPEECH OUTPUT: '2 of 22 items selected on 1 of 22.'"]))
+     "SPEECH OUTPUT: '2 of 20 items selected on 1 of 20.'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
 
diff --git a/test/keystrokes/gtk-demo/role_icon_flat_review.py 
b/test/keystrokes/gtk-demo/role_icon_flat_review.py
index e95acdd17..67ad5d1b7 100644
--- a/test/keystrokes/gtk-demo/role_icon_flat_review.py
+++ b/test/keystrokes/gtk-demo/role_icon_flat_review.py
@@ -20,7 +20,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. bin icon",
-    ["BRAILLE LINE:  'gtk-demo application GtkIconView demo frame bin icon'",
+    ["BRAILLE LINE:  'gtk-demo application GtkIconView demo frame layered pane bin icon'",
      "     VISIBLE:  'bin icon', cursor=1",
      "SPEECH OUTPUT: 'bin icon.'"]))
 
@@ -28,32 +28,32 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_8"))
 sequence.append(utils.AssertPresentationAction(
     "2. Review current line",
-    ["BRAILLE LINE:  'bin boot dev etc home lib $l'",
-     "     VISIBLE:  'bin boot dev etc home lib $l', cursor=1",
-     "SPEECH OUTPUT: 'bin boot dev etc home lib'"]))
+    ["BRAILLE LINE:  'bin boot dev etc home lib lib64 $l'",
+     "     VISIBLE:  'bin boot dev etc home lib lib64 ', cursor=1",
+     "SPEECH OUTPUT: 'bin boot dev etc home lib lib64'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_5"))
 sequence.append(utils.AssertPresentationAction(
     "3. Review current word",
-    ["BRAILLE LINE:  'bin boot dev etc home lib $l'",
-     "     VISIBLE:  'bin boot dev etc home lib $l', cursor=1",
+    ["BRAILLE LINE:  'bin boot dev etc home lib lib64 $l'",
+     "     VISIBLE:  'bin boot dev etc home lib lib64 ', cursor=1",
      "SPEECH OUTPUT: 'bin'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "4. Review next word",
-    ["BRAILLE LINE:  'bin boot dev etc home lib $l'",
-     "     VISIBLE:  'bin boot dev etc home lib $l', cursor=5",
+    ["BRAILLE LINE:  'bin boot dev etc home lib lib64 $l'",
+     "     VISIBLE:  'boot dev etc home lib lib64 $l', cursor=1",
      "SPEECH OUTPUT: 'boot'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_2"))
 sequence.append(utils.AssertPresentationAction(
     "5. Review current char",
-    ["BRAILLE LINE:  'bin boot dev etc home lib $l'",
-     "     VISIBLE:  'bin boot dev etc home lib $l', cursor=5",
+    ["BRAILLE LINE:  'bin boot dev etc home lib lib64 $l'",
+     "     VISIBLE:  'boot dev etc home lib lib64 $l', cursor=1",
      "SPEECH OUTPUT: 'boot'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -62,9 +62,9 @@ sequence.append(KeyComboAction("KP_6"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "6. Review item below",
-    ["BRAILLE LINE:  'lib64 lost+found media mnt opt proc $l'",
-     "     VISIBLE:  'b64 lost+found media mnt opt pro', cursor=5",
-     "SPEECH OUTPUT: 'lost+found'"]))
+    ["BRAILLE LINE:  'lost+found media mnt opt proc root run $l'",
+     "     VISIBLE:  'media mnt opt proc root run $l', cursor=1",
+     "SPEECH OUTPUT: 'media'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyPressAction(0, None, "KP_Insert"))
@@ -72,9 +72,9 @@ sequence.append(KeyComboAction("KP_6"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "7. Review item below",
-    ["BRAILLE LINE:  'root run sbin srv sys tmp $l'",
-     "     VISIBLE:  'root run sbin srv sys tmp $l', cursor=6",
-     "SPEECH OUTPUT: 'run'"]))
+    ["BRAILLE LINE:  'sbin srv sys tmp usr var $l'",
+     "     VISIBLE:  'sbin srv sys tmp usr var $l', cursor=6",
+     "SPEECH OUTPUT: 'srv'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyPressAction(0, None, "KP_Insert"))
@@ -82,9 +82,9 @@ sequence.append(KeyComboAction("KP_4"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "8. Review item above",
-    ["BRAILLE LINE:  'lib64 lost+found media mnt opt proc $l'",
-     "     VISIBLE:  'b64 lost+found media mnt opt pro', cursor=5",
-     "SPEECH OUTPUT: 'lost+found'"]))
+    ["BRAILLE LINE:  'lost+found media mnt opt proc root run $l'",
+     "     VISIBLE:  'media mnt opt proc root run $l', cursor=1",
+     "SPEECH OUTPUT: 'media'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyPressAction(0, None, "KP_Insert"))
@@ -92,54 +92,46 @@ sequence.append(KeyComboAction("KP_4"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "9. Review item above",
-    ["BRAILLE LINE:  'bin boot dev etc home lib $l'",
-     "     VISIBLE:  'bin boot dev etc home lib $l', cursor=5",
+    ["BRAILLE LINE:  'bin boot dev etc home lib lib64 $l'",
+     "     VISIBLE:  'boot dev etc home lib lib64 $l', cursor=1",
      "SPEECH OUTPUT: 'boot'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
     "10. Review next line",
-    ["BRAILLE LINE:  'lib64 lost+found media mnt opt proc $l'",
-     "     VISIBLE:  'lib64 lost+found media mnt opt p', cursor=1",
-     "SPEECH OUTPUT: 'lib64 lost+found media mnt opt proc'"]))
+    ["BRAILLE LINE:  'lost+found media mnt opt proc root run $l'",
+     "     VISIBLE:  'lost+found media mnt opt proc ro', cursor=1",
+     "SPEECH OUTPUT: 'lost+found media mnt opt proc root run'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "11. Review next word",
-    ["BRAILLE LINE:  'lib64 lost+found media mnt opt proc $l'",
-     "     VISIBLE:  'lib64 lost+found media mnt opt p', cursor=7",
-     "SPEECH OUTPUT: 'lost+found'"]))
+    ["BRAILLE LINE:  'lost+found media mnt opt proc root run $l'",
+     "     VISIBLE:  'media mnt opt proc root run $l', cursor=1",
+     "SPEECH OUTPUT: 'media'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_3"))
 sequence.append(utils.AssertPresentationAction(
     "12. Review next char",
-    ["BRAILLE LINE:  'lib64 lost+found media mnt opt proc $l'",
-     "     VISIBLE:  'lib64 lost+found media mnt opt p', cursor=18",
-     "SPEECH OUTPUT: 'media'"]))
+    ["BRAILLE LINE:  'lost+found media mnt opt proc root run $l'",
+     "     VISIBLE:  'mnt opt proc root run $l', cursor=1",
+     "SPEECH OUTPUT: 'mnt'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_7"))
 sequence.append(utils.AssertPresentationAction(
     "13. Review previous line",
-    ["BRAILLE LINE:  'bin boot dev etc home lib $l'",
-     "     VISIBLE:  'bin boot dev etc home lib $l', cursor=1",
-     "SPEECH OUTPUT: 'bin boot dev etc home lib'"]))
+    ["BRAILLE LINE:  'bin boot dev etc home lib lib64 $l'",
+     "     VISIBLE:  'bin boot dev etc home lib lib64 ', cursor=1",
+     "SPEECH OUTPUT: 'bin boot dev etc home lib lib64'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_7"))
 sequence.append(utils.AssertPresentationAction(
     "14. Review previous line",
-    ["BRAILLE LINE:  'vertical scroll bar 0% $l'",
-     "     VISIBLE:  'vertical scroll bar 0% $l', cursor=1",
-     "SPEECH OUTPUT: 'vertical scroll bar 0 percent.'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("KP_7"))
-sequence.append(utils.AssertPresentationAction(
-    "15. Review previous line",
     ["BRAILLE LINE:  'Up Home $l'",
      "     VISIBLE:  'Up Home $l', cursor=1",
      "SPEECH OUTPUT: 'Up Home'"]))
diff --git a/test/keystrokes/gtk-demo/role_label.py b/test/keystrokes/gtk-demo/role_label.py
index 56bf94f41..534ec56c1 100644
--- a/test/keystrokes/gtk-demo/role_label.py
+++ b/test/keystrokes/gtk-demo/role_label.py
@@ -18,10 +18,10 @@ sequence.append(utils.AssertPresentationAction(
     "1. This message box label",
     ["BRAILLE LINE:  'This message box has been popped up the following",
      "number of times: number of times:'",
-     "     VISIBLE:  'mber of times: number of times:', cursor=32",
+     "     VISIBLE:  'of times: number of times:', cursor=27",
      "BRAILLE LINE:  'This message box has been popped up the following",
      "number of times: number of times:'",
-     "     VISIBLE:  'mber of times: number of times:', cursor=32",
+     "     VISIBLE:  'of times: number of times:', cursor=27",
      "SPEECH OUTPUT: 'This message box has been popped up the following",
      "number of times: selected label'"]))
 
@@ -31,7 +31,7 @@ sequence.append(utils.AssertPresentationAction(
     "2. This message box label Where Am I",
     ["BRAILLE LINE:  'This message box has been popped up the following",
      "number of times: number of times:'",
-     "     VISIBLE:  'mber of times: number of times:', cursor=32",
+     "     VISIBLE:  'of times: number of times:', cursor=27",
      "SPEECH OUTPUT: 'This message box has been popped up the following",
      "number of times: selected label'"]))
 
@@ -42,10 +42,10 @@ sequence.append(utils.AssertPresentationAction(
     "3. This message box label Extended Where Am I",
     ["BRAILLE LINE:  'This message box has been popped up the following",
      "number of times: number of times:'",
-     "     VISIBLE:  'mber of times: number of times:', cursor=32",
+     "     VISIBLE:  'of times: number of times:', cursor=27",
      "BRAILLE LINE:  'This message box has been popped up the following",
      "number of times: number of times:'",
-     "     VISIBLE:  'mber of times: number of times:', cursor=32",
+     "     VISIBLE:  'of times: number of times:', cursor=27",
      "SPEECH OUTPUT: 'This message box has been popped up the following",
      "number of times: selected label'",
      "SPEECH OUTPUT: 'This message box has been popped up the following",
@@ -55,10 +55,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Home"))
 sequence.append(utils.AssertPresentationAction(
     "4. Press Home to unselect the label and move to the first character'",
-    ["BRAILLE LINE:  'gtk-demo application Information alert This message box has been popped up the 
following",
+    ["KNOWN ISSUE: The message text is being duplicated.",
+     "BRAILLE LINE:  'gtk-demo application Information alert This message box has been popped up the 
following",
      "number of times: This message box has been popped up the following'",
-     "     VISIBLE:  'the following",
-     "number of times: T', cursor=32",
+     "     VISIBLE:  'of times: This message box has b', cursor=11",
      "SPEECH OUTPUT: 'This message box has been popped up the following",
      "number of times:'",
      "SPEECH OUTPUT: 'unselected' voice=system"]))
@@ -69,8 +69,7 @@ sequence.append(utils.AssertPresentationAction(
     "5. This message box label caret movement to 'h'",
     ["BRAILLE LINE:  'gtk-demo application Information alert This message box has been popped up the 
following",
      "number of times: This message box has been popped up the following'",
-     "     VISIBLE:  'he following",
-     "number of times: Th', cursor=32",
+     "     VISIBLE:  'of times: This message box has b', cursor=12",
      "SPEECH OUTPUT: 'h'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -79,8 +78,7 @@ sequence.append(utils.AssertPresentationAction(
     "6. This message box label caret select 'his' of 'This'",
     ["BRAILLE LINE:  'gtk-demo application Information alert This message box has been popped up the 
following",
      "number of times: This message box has been popped up the following'",
-     "     VISIBLE:  'following",
-     "number of times: This ', cursor=32",
+     "     VISIBLE:  'of times: This message box has b', cursor=15",
      "SPEECH OUTPUT: 'his'",
      "SPEECH OUTPUT: 'selected' voice=system"]))
 
@@ -90,8 +88,7 @@ sequence.append(utils.AssertPresentationAction(
     "7. This message box label caret selection Where Am I",
     ["BRAILLE LINE:  'gtk-demo application Information alert This message box has been popped up the 
following",
      "number of times: This message box has been popped up the following'",
-     "     VISIBLE:  'following",
-     "number of times: This ', cursor=32",
+     "     VISIBLE:  'of times: This message box has b', cursor=15",
      "SPEECH OUTPUT: 'This message box has been popped up the following",
      "number of times: selected label'"]))
 
@@ -102,12 +99,10 @@ sequence.append(utils.AssertPresentationAction(
     "8. This message box label caret selection Extended Where Am I",
     ["BRAILLE LINE:  'gtk-demo application Information alert This message box has been popped up the 
following",
      "number of times: This message box has been popped up the following'",
-     "     VISIBLE:  'following",
-     "number of times: This ', cursor=32",
+     "     VISIBLE:  'of times: This message box has b', cursor=15",
      "BRAILLE LINE:  'gtk-demo application Information alert This message box has been popped up the 
following",
      "number of times: This message box has been popped up the following'",
-     "     VISIBLE:  'following",
-     "number of times: This ', cursor=32",
+     "     VISIBLE:  'of times: This message box has b', cursor=15",
      "SPEECH OUTPUT: 'This message box has been popped up the following",
      "number of times: selected label'",
      "SPEECH OUTPUT: 'This message box has been popped up the following",
@@ -119,8 +114,7 @@ sequence.append(utils.AssertPresentationAction(
     "9. Left Arrow to move to h unselecting his'",
     ["BRAILLE LINE:  'gtk-demo application Information alert This message box has been popped up the 
following",
      "number of times: This message box has been popped up the following'",
-     "     VISIBLE:  'following",
-     "number of times: This ', cursor=29",
+     "     VISIBLE:  'of times: This message box has b', cursor=12",
      "SPEECH OUTPUT: 'his'",
      "SPEECH OUTPUT: 'unselected' voice=system"]))
 
@@ -130,8 +124,7 @@ sequence.append(utils.AssertPresentationAction(
     "10. This message box label caret select 'T' in 'This'",
     ["BRAILLE LINE:  'gtk-demo application Information alert This message box has been popped up the 
following",
      "number of times: This message box has been popped up the following'",
-     "     VISIBLE:  'following",
-     "number of times: This ', cursor=28",
+     "     VISIBLE:  'of times: This message box has b', cursor=11",
      "SPEECH OUTPUT: 'T'",
      "SPEECH OUTPUT: 'selected' voice=system"]))
 
@@ -141,8 +134,7 @@ sequence.append(utils.AssertPresentationAction(
     "11. This message box label caret unselect 'T' and select rest of 'This'",
     ["BRAILLE LINE:  'gtk-demo application Information alert This message box has been popped up the 
following",
      "number of times: This message box has been popped up the following'",
-     "     VISIBLE:  'following",
-     "number of times: This ', cursor=32",
+     "     VISIBLE:  'of times: This message box has b', cursor=15",
      "SPEECH OUTPUT: 'T'",
      "SPEECH OUTPUT: 'unselected' voice=system",
      "SPEECH OUTPUT: 'his'",
diff --git a/test/keystrokes/gtk-demo/role_menu.py b/test/keystrokes/gtk-demo/role_menu.py
index ad738ad37..a82a663e7 100644
--- a/test/keystrokes/gtk-demo/role_menu.py
+++ b/test/keystrokes/gtk-demo/role_menu.py
@@ -37,7 +37,6 @@ sequence.append(utils.AssertPresentationAction(
     "3. Where Am I",
     ["BRAILLE LINE:  'gtk-demo application Application Window frame Preferences menu <x> Red check menu 
item(Ctrl+R)'",
      "     VISIBLE:  '<x> Red check menu item(Ctrl+R)', cursor=1",
-     "SPEECH OUTPUT: 'Application Window frame'",
      "SPEECH OUTPUT: 'Preferences menu'",
      "SPEECH OUTPUT: 'Color menu'",
      "SPEECH OUTPUT: 'Red check menu item checked.'",
diff --git a/test/keystrokes/gtk-demo/role_push_button.py b/test/keystrokes/gtk-demo/role_push_button.py
index 1c671c0ce..c05ca2178 100644
--- a/test/keystrokes/gtk-demo/role_push_button.py
+++ b/test/keystrokes/gtk-demo/role_push_button.py
@@ -36,7 +36,7 @@ sequence.append(utils.AssertPresentationAction(
     "3. OK Edge button",
     ["BRAILLE LINE:  'gtk-demo application Button Boxes frame Horizontal Button Boxes panel Edge panel OK 
push button'",
      "     VISIBLE:  'OK push button', cursor=1",
-     "SPEECH OUTPUT: 'Edge panel'",
+     "SPEECH OUTPUT: 'Edge panel.'",
      "SPEECH OUTPUT: 'OK push button'"]))
 
 sequence.append(KeyComboAction("<Alt>F4", 500))
diff --git a/test/keystrokes/gtk-demo/role_radio_button.py b/test/keystrokes/gtk-demo/role_radio_button.py
index fa1cf4792..bd780c845 100644
--- a/test/keystrokes/gtk-demo/role_radio_button.py
+++ b/test/keystrokes/gtk-demo/role_radio_button.py
@@ -18,7 +18,6 @@ sequence.append(utils.AssertPresentationAction(
     "1. All Pages radio button",
     ["BRAILLE LINE:  'gtk-demo application Print dialog General page tab &=y All Pages radio button'",
      "     VISIBLE:  '&=y All Pages radio button', cursor=1",
-     "SPEECH OUTPUT: 'General page tab.'",
      "SPEECH OUTPUT: 'All Pages.'",
      "SPEECH OUTPUT: 'selected radio button'"]))
 
@@ -40,7 +39,7 @@ sequence.append(utils.AssertPresentationAction(
     "3. Range radio button",
     ["BRAILLE LINE:  'gtk-demo application Print dialog General page tab &=y Pages: radio button'",
      "     VISIBLE:  '&=y Pages: radio button', cursor=1",
-     "SPEECH OUTPUT: 'Pages:.'",
+     "SPEECH OUTPUT: 'Pages:'",
      "SPEECH OUTPUT: 'selected radio button'",
      "SPEECH OUTPUT: 'Specify one or more page ranges,",
      " e.g. 1-3,7,11'"]))
diff --git a/test/keystrokes/gtk-demo/role_spin_button.py b/test/keystrokes/gtk-demo/role_spin_button.py
index aeed6f75c..994072805 100644
--- a/test/keystrokes/gtk-demo/role_spin_button.py
+++ b/test/keystrokes/gtk-demo/role_spin_button.py
@@ -10,6 +10,9 @@ sequence = MacroSequence()
 sequence.append(KeyComboAction("<Control>f"))
 sequence.append(TypeAction("Printing"))
 sequence.append(KeyComboAction("Return"))
+sequence.append(KeyComboAction("<Alt>s"))
+sequence.append(KeyComboAction("Tab"))
+sequence.append(PauseAction(2000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>s"))
@@ -17,9 +20,6 @@ sequence.append(utils.AssertPresentationAction(
     "1. Give focus to spin button",
     ["BRAILLE LINE:  'gtk-demo application Print dialog General page tab Copies: 1 $l'",
      "     VISIBLE:  'Copies: 1 $l', cursor=10",
-     "BRAILLE LINE:  'gtk-demo application Print dialog General page tab Copies: 1 $l'",
-     "     VISIBLE:  'Copies: 1 $l', cursor=10",
-     "SPEECH OUTPUT: 'General page tab.'",
      "SPEECH OUTPUT: 'Copies: 1 selected spin button.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -37,12 +37,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "3. Increment value",
-    ["KNOWN ISSUE: We are double-presenting this",
-     "BRAILLE LINE:  'gtk-demo application Print dialog General page tab Copies: 16 $l'",
-     "     VISIBLE:  'Copies: 16 $l', cursor=9",
-     "BRAILLE LINE:  'gtk-demo application Print dialog General page tab Copies: 16 $l'",
+    ["BRAILLE LINE:  'gtk-demo application Print dialog General page tab Copies: 16 $l'",
      "     VISIBLE:  'Copies: 16 $l', cursor=9",
-     "SPEECH OUTPUT: '16'",
      "SPEECH OUTPUT: '16'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/gtk-demo/role_table.py b/test/keystrokes/gtk-demo/role_table.py
index 7babf33e6..74b0fe7ac 100644
--- a/test/keystrokes/gtk-demo/role_table.py
+++ b/test/keystrokes/gtk-demo/role_table.py
@@ -19,8 +19,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "1. Table Where Am I",
-    ["BRAILLE LINE:  'gtk-demo application Shopping list frame table Number column header 3 bottles of 
coke'",
-     "     VISIBLE:  '3 bottles of coke', cursor=1",
+    ["BRAILLE LINE:  'gtk-demo application Shopping list frame table Number column header 3 bottles of coke 
'",
+     "     VISIBLE:  '3 bottles of coke ', cursor=1",
      "SPEECH OUTPUT: 'table.'",
      "SPEECH OUTPUT: 'Number.'",
      "SPEECH OUTPUT: 'table cell.'",
@@ -32,8 +32,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Next row",
-    ["BRAILLE LINE:  'gtk-demo application Shopping list frame table Number column header 5 packages of 
noodles'",
-     "     VISIBLE:  '5 packages of noodles', cursor=1",
+    ["BRAILLE LINE:  'gtk-demo application Shopping list frame table Number column header 5 packages of 
noodles '",
+     "     VISIBLE:  '5 packages of noodles ', cursor=1",
      "SPEECH OUTPUT: '5.'",
      "SPEECH OUTPUT: 'packages of noodles.'"]))
 
@@ -41,8 +41,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "3. Table Where Am I (again)",
-    ["BRAILLE LINE:  'gtk-demo application Shopping list frame table Number column header 5 packages of 
noodles'",
-     "     VISIBLE:  '5 packages of noodles', cursor=1",
+    ["BRAILLE LINE:  'gtk-demo application Shopping list frame table Number column header 5 packages of 
noodles '",
+     "     VISIBLE:  '5 packages of noodles ', cursor=1",
      "SPEECH OUTPUT: 'table.'",
      "SPEECH OUTPUT: 'Number.'",
      "SPEECH OUTPUT: 'table cell.'",
@@ -64,8 +64,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "5. Table Right to the Product column in the packages of noodles row",
-    ["BRAILLE LINE:  'gtk-demo application Shopping list frame table Number column header 5 packages of 
noodles'",
-     "     VISIBLE:  '5 packages of noodles', cursor=1",
+    ["BRAILLE LINE:  'gtk-demo application Shopping list frame table Number column header 5 packages of 
noodles '",
+     "     VISIBLE:  '5 packages of noodles ', cursor=1",
      "BRAILLE LINE:  'gtk-demo application Shopping list frame table Product column header packages of 
noodles table cell'",
      "     VISIBLE:  'packages of noodles table cell', cursor=1",
      "SPEECH OUTPUT: 'Product column header packages of noodles.'"]))
diff --git a/test/keystrokes/gtk-demo/role_text_multiline.py b/test/keystrokes/gtk-demo/role_text_multiline.py
index 01b6977c0..5dc8b714b 100644
--- a/test/keystrokes/gtk-demo/role_text_multiline.py
+++ b/test/keystrokes/gtk-demo/role_text_multiline.py
@@ -14,72 +14,14 @@ sequence.append(KeyComboAction("Return"))
 sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("Tab"))
 
-sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction("This is a test."))
+sequence.append(PauseAction(3000))
+
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
-    "1. Typing",
-    ["BRAILLE LINE:  'gtk-demo application Application Window frame T $l'",
-     "     VISIBLE:  'T $l', cursor=2",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame T $l'",
-     "     VISIBLE:  'T $l', cursor=2",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame Th $l'",
-     "     VISIBLE:  'Th $l', cursor=3",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame Th $l'",
-     "     VISIBLE:  'Th $l', cursor=3",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame Thi $l'",
-     "     VISIBLE:  'Thi $l', cursor=4",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame Thi $l'",
-     "     VISIBLE:  'Thi $l', cursor=4",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This $l'",
-     "     VISIBLE:  'This $l', cursor=5",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This $l'",
-     "     VISIBLE:  'This $l', cursor=5",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This  $l'",
-     "     VISIBLE:  'This  $l', cursor=6",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This  $l'",
-     "     VISIBLE:  'This  $l', cursor=6",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This i $l'",
-     "     VISIBLE:  'This i $l', cursor=7",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This i $l'",
-     "     VISIBLE:  'This i $l', cursor=7",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is $l'",
-     "     VISIBLE:  'This is $l', cursor=8",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is $l'",
-     "     VISIBLE:  'This is $l', cursor=8",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is  $l'",
-     "     VISIBLE:  'This is  $l', cursor=9",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is  $l'",
-     "     VISIBLE:  'This is  $l', cursor=9",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is a $l'",
-     "     VISIBLE:  'This is a $l', cursor=10",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is a $l'",
-     "     VISIBLE:  'This is a $l', cursor=10",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is a  $l'",
-     "     VISIBLE:  'This is a  $l', cursor=11",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is a  $l'",
-     "     VISIBLE:  'This is a  $l', cursor=11",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is a t $l'",
-     "     VISIBLE:  'This is a t $l', cursor=12",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is a t $l'",
-     "     VISIBLE:  'This is a t $l', cursor=12",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is a te $l'",
-     "     VISIBLE:  'This is a te $l', cursor=13",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is a te $l'",
-     "     VISIBLE:  'This is a te $l', cursor=13",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is a tes $l'",
-     "     VISIBLE:  'This is a tes $l', cursor=14",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is a tes $l'",
-     "     VISIBLE:  'This is a tes $l', cursor=14",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is a test $l'",
-     "     VISIBLE:  'This is a test $l', cursor=15",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is a test $l'",
-     "     VISIBLE:  'This is a test $l', cursor=15",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is a test. $l'",
-     "     VISIBLE:  'This is a test. $l', cursor=16",
-     "BRAILLE LINE:  'gtk-demo application Application Window frame This is a test. $l'",
-     "     VISIBLE:  'This is a test. $l', cursor=16",
-     "BRAILLE LINE:  ' $l'",
+    "1. Press Return after typing",
+    ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1"]))
diff --git a/test/keystrokes/gtk-demo/role_text_multiline_flat_review.py 
b/test/keystrokes/gtk-demo/role_text_multiline_flat_review.py
index 8bd6c79c9..9ca88e09e 100644
--- a/test/keystrokes/gtk-demo/role_text_multiline_flat_review.py
+++ b/test/keystrokes/gtk-demo/role_text_multiline_flat_review.py
@@ -298,7 +298,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "20. Insert+KP_9 to flat review end",
     ["BRAILLE LINE:  'Cursor at row 1 column 0 - 60 chars in document $l'",
-     "     VISIBLE:  'ars in document $l', cursor=15",
+     "     VISIBLE:  'chars in document $l', cursor=17",
      "SPEECH OUTPUT: 'Cursor at row 1 column 0 - 60 chars in document'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/gtk-demo/role_text_multiline_navigation.py 
b/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
index e7afc12b3..bd69b4d2b 100644
--- a/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
+++ b/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
@@ -37,6 +37,7 @@ sequence.append(KeyComboAction("Return"))
 sequence.append(TypeAction("time in the lab and not enough time"))
 sequence.append(KeyComboAction("Return"))
 sequence.append(TypeAction("in the wild."))
+sequence.append(PauseAction(3000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
@@ -91,7 +92,7 @@ sequence.append(KeyComboAction("<Control>Left"))
 sequence.append(utils.AssertPresentationAction(
     "7. Ctrl+Left to beginning of 'time' at end of previous line",
     ["BRAILLE LINE:  'time in the lab and not enough time $l'",
-     "     VISIBLE:  'time in the lab and not enough t', cursor=32",
+     "     VISIBLE:  'time $l', cursor=1",
      "SPEECH OUTPUT: 'newline'",
      "SPEECH OUTPUT: 'time",
      "'"]))
@@ -255,7 +256,7 @@ sequence.append(TypeAction("f"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "27. Insert+f for text attributes",
-    ["SPEECH OUTPUT: 'size: 11' voice=system",
+    ["SPEECH OUTPUT: 'size: 10' voice=system",
      "SPEECH OUTPUT: 'family name: Cantarell' voice=system",
      "SPEECH OUTPUT: 'foreground color: black' voice=system",
      "SPEECH OUTPUT: 'background color: white' voice=system"]))
diff --git a/test/keystrokes/gtk-demo/role_text_multiline_navigation2.py 
b/test/keystrokes/gtk-demo/role_text_multiline_navigation2.py
index 63dac3028..9aad62359 100644
--- a/test/keystrokes/gtk-demo/role_text_multiline_navigation2.py
+++ b/test/keystrokes/gtk-demo/role_text_multiline_navigation2.py
@@ -32,7 +32,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Shift+Ctrl+Page_Up to select text to beginning of line",
     ["BRAILLE LINE:  'This is only a test. $l'",
      "     VISIBLE:  'This is only a test. $l', cursor=1",
-     "SPEECH OUTPUT: 'line selected from start to previous cursor position'"]))
+     "SPEECH OUTPUT: 'line selected from start to previous cursor position' voice=system"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift><Control>Page_Down"))
diff --git a/test/keystrokes/gtk-demo/role_tooltip.py b/test/keystrokes/gtk-demo/role_tooltip.py
index 60771dbf4..7852f67ef 100644
--- a/test/keystrokes/gtk-demo/role_tooltip.py
+++ b/test/keystrokes/gtk-demo/role_tooltip.py
@@ -18,9 +18,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>F1"))
 sequence.append(utils.AssertPresentationAction(
     "1. Show tooltip",
-    ["BRAILLE LINE:  'Specify one or more page ranges,",
-     " e.g. 1-3,7,11'",
-     "     VISIBLE:  'Specify one or more page ranges,', cursor=0",
+    ["BRAILLE LINE:  ' Specify one or more page ranges,",
+     " e.g. 1-3,7,11 tool tip'",
+     "     VISIBLE:  'Specify one or more page ranges,', cursor=1",
      "SPEECH OUTPUT: 'Specify one or more page ranges,",
      " e.g. 1-3,7,11'"]))
 
@@ -30,7 +30,7 @@ sequence.append(utils.AssertPresentationAction(
     "2. Hide tooltip",
     ["BRAILLE LINE:  'gtk-demo application Print dialog General page tab &=y Pages: radio button'",
      "     VISIBLE:  '&=y Pages: radio button', cursor=1",
-     "SPEECH OUTPUT: 'Pages:.'",
+     "SPEECH OUTPUT: 'Pages:'",
      "SPEECH OUTPUT: 'selected radio button'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
diff --git a/test/keystrokes/gtk3-demo/context_menu_flat_review.py 
b/test/keystrokes/gtk3-demo/context_menu_flat_review.py
index 6d0b8b766..8491792b2 100644
--- a/test/keystrokes/gtk3-demo/context_menu_flat_review.py
+++ b/test/keystrokes/gtk3-demo/context_menu_flat_review.py
@@ -72,7 +72,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
     "8. Review next line",
-    [""]))
+    ["BRAILLE LINE:  'Insert Emoji $l'",
+     "     VISIBLE:  'Insert Emoji $l', cursor=1",
+     "SPEECH OUTPUT: 'Insert Emoji'"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/gtk3-demo/role_accel_label.py b/test/keystrokes/gtk3-demo/role_accel_label.py
index 85840d146..bc72e716c 100644
--- a/test/keystrokes/gtk3-demo/role_accel_label.py
+++ b/test/keystrokes/gtk3-demo/role_accel_label.py
@@ -46,7 +46,6 @@ sequence.append(utils.AssertPresentationAction(
     "4. Where Am I",
     ["BRAILLE LINE:  'gtk3-demo-application application Application Class frame Color menu'",
      "     VISIBLE:  'Color menu', cursor=1",
-     "SPEECH OUTPUT: 'Application Class frame'",
      "SPEECH OUTPUT: 'Preferences menu'",
      "SPEECH OUTPUT: 'Color menu.'",
      "SPEECH OUTPUT: '3 of 5.'",
diff --git a/test/keystrokes/gtk3-demo/role_alert.py b/test/keystrokes/gtk3-demo/role_alert.py
index 5803df0e7..844532c67 100644
--- a/test/keystrokes/gtk3-demo/role_alert.py
+++ b/test/keystrokes/gtk3-demo/role_alert.py
@@ -8,6 +8,7 @@ import utils
 sequence = MacroSequence()
 
 sequence.append(KeyComboAction("<Control>f"))
+sequence.append(PauseAction(1000))
 sequence.append(TypeAction("Dialog and Message Boxes"))
 sequence.append(KeyComboAction("Return"))
 sequence.append(PauseAction(3000))
@@ -21,7 +22,7 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  'gtk3-demo application Dialogs and Message Boxes frame Dialogs panel Message Dialog 
push button'",
      "     VISIBLE:  'Message Dialog push button', cursor=1",
      "SPEECH OUTPUT: 'Dialogs and Message Boxes frame'",
-     "SPEECH OUTPUT: 'Dialogs panel'",
+     "SPEECH OUTPUT: 'Dialogs panel.'",
      "SPEECH OUTPUT: 'Message Dialog push button'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/gtk3-demo/role_check_box.py b/test/keystrokes/gtk3-demo/role_check_box.py
index a28a10692..c128be0e6 100644
--- a/test/keystrokes/gtk3-demo/role_check_box.py
+++ b/test/keystrokes/gtk3-demo/role_check_box.py
@@ -19,7 +19,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Tab to first checkbox",
     ["BRAILLE LINE:  'gtk3-demo application Paned Widgets frame Horizontal panel < > Resize check box'",
      "     VISIBLE:  '< > Resize check box', cursor=1",
-     "SPEECH OUTPUT: 'Horizontal panel'",
+     "SPEECH OUTPUT: 'Horizontal panel.'",
      "SPEECH OUTPUT: 'Resize check box not checked.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -66,7 +66,7 @@ sequence.append(utils.AssertPresentationAction(
     "6. Tab to first checkbox in next panel",
     ["BRAILLE LINE:  'gtk3-demo application Paned Widgets frame Vertical panel < > Resize check box'",
      "     VISIBLE:  '< > Resize check box', cursor=1",
-     "SPEECH OUTPUT: 'Vertical panel'",
+     "SPEECH OUTPUT: 'Vertical panel.'",
      "SPEECH OUTPUT: 'Resize check box not checked.'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
diff --git a/test/keystrokes/gtk3-demo/role_check_menu_item.py 
b/test/keystrokes/gtk3-demo/role_check_menu_item.py
index 379da4f94..eb4b9562c 100644
--- a/test/keystrokes/gtk3-demo/role_check_menu_item.py
+++ b/test/keystrokes/gtk3-demo/role_check_menu_item.py
@@ -25,6 +25,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(KeyComboAction("Return"))
 sequence.append(KeyComboAction("Escape"))
 sequence.append(KeyComboAction("<Alt>p"))
+sequence.append(PauseAction(3000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -37,6 +38,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(KeyComboAction("Return"))
 sequence.append(KeyComboAction("Escape"))
 sequence.append(KeyComboAction("<Alt>p"))
+sequence.append(PauseAction(3000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
diff --git a/test/keystrokes/gtk3-demo/role_color_chooser.py b/test/keystrokes/gtk3-demo/role_color_chooser.py
index ac297ef58..6da16325b 100644
--- a/test/keystrokes/gtk3-demo/role_color_chooser.py
+++ b/test/keystrokes/gtk3-demo/role_color_chooser.py
@@ -37,6 +37,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(KeyComboAction("Down"))
 sequence.append(KeyComboAction("Left"))
 sequence.append(KeyComboAction("space"))
+sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("Tab"))
 sequence.append(PauseAction(3000))
 
diff --git a/test/keystrokes/gtk3-demo/role_combo_box.py b/test/keystrokes/gtk3-demo/role_combo_box.py
index 4085f1b12..0264e1135 100644
--- a/test/keystrokes/gtk3-demo/role_combo_box.py
+++ b/test/keystrokes/gtk3-demo/role_combo_box.py
@@ -21,7 +21,7 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  'gtk3-demo application Combo Boxes frame Items with icons panel Warning combo box'",
      "     VISIBLE:  'Warning combo box', cursor=1",
      "SPEECH OUTPUT: 'Combo Boxes frame'",
-     "SPEECH OUTPUT: 'Items with icons panel'",
+     "SPEECH OUTPUT: 'Items with icons panel.'",
      "SPEECH OUTPUT: 'Warning combo box.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -48,7 +48,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'gtk3-demo application Combo Boxes frame Items with icons panel New combo box New'",
      "     VISIBLE:  'New', cursor=1",
      "SPEECH OUTPUT: 'Combo Boxes frame'",
-     "SPEECH OUTPUT: 'Items with icons panel'",
+     "SPEECH OUTPUT: 'Items with icons panel.'",
      "SPEECH OUTPUT: 'New.'",
      "SPEECH OUTPUT: '3 of 5'"]))
 
@@ -60,7 +60,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "5. Editable text combo box",
     ["BRAILLE LINE:  'gtk3-demo application Combo Boxes frame Editable panel  $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  'Boxes frame Editable panel  $l', cursor=28",
      "SPEECH OUTPUT: 'editable combo box.'"]))
 
 sequence.append(TypeAction("Fou"))
@@ -69,16 +69,16 @@ sequence.append(TypeAction("r"))
 sequence.append(utils.AssertPresentationAction(
     "6. Editable text combo box typing",
     ["BRAILLE LINE:  'gtk3-demo application Combo Boxes frame Editable panel Four $l'",
-     "     VISIBLE:  'Four $l', cursor=5",
+     "     VISIBLE:  'Boxes frame Editable panel Four ', cursor=32",
      "BRAILLE LINE:  'gtk3-demo application Combo Boxes frame Editable panel Four $l'",
-     "     VISIBLE:  'Four $l', cursor=5"]))
+     "     VISIBLE:  'Boxes frame Editable panel Four ', cursor=32"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "7. Editable text combo box Where Am I",
     ["BRAILLE LINE:  'gtk3-demo application Combo Boxes frame Editable panel Four $l'",
-     "     VISIBLE:  'Four $l', cursor=5",
+     "     VISIBLE:  'Boxes frame Editable panel Four ', cursor=32",
      "SPEECH OUTPUT: 'editable combo box.'",
      "SPEECH OUTPUT: 'Four.'"]))
 
@@ -87,7 +87,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "8. Editable text combo box open button",
     ["BRAILLE LINE:  'gtk3-demo application Combo Boxes frame Editable panel Four $l combo box'",
-     "     VISIBLE:  'Four $l combo box', cursor=5",
+     "     VISIBLE:  'Boxes frame Editable panel Four ', cursor=32",
      "SPEECH OUTPUT: 'Four editable combo box.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -95,9 +95,9 @@ sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
 sequence.append(utils.AssertPresentationAction(
     "9. Editable text combo box with selected text",
     ["BRAILLE LINE:  'gtk3-demo application Combo Boxes frame Editable panel Four $l'",
-     "     VISIBLE:  'Four $l', cursor=5",
+     "     VISIBLE:  'Boxes frame Editable panel Four ', cursor=32",
      "BRAILLE LINE:  'gtk3-demo application Combo Boxes frame Editable panel Four $l'",
-     "     VISIBLE:  'Four $l', cursor=5",
+     "     VISIBLE:  'Boxes frame Editable panel Four ', cursor=32",
      "SPEECH OUTPUT: 'editable combo box.'",
      "SPEECH OUTPUT: 'Four selected'"]))
 
@@ -106,7 +106,7 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "10. Editable text combo box with selected text Where Am I",
     ["BRAILLE LINE:  'gtk3-demo application Combo Boxes frame Editable panel Four $l'",
-     "     VISIBLE:  'Four $l', cursor=5",
+     "     VISIBLE:  'Boxes frame Editable panel Four ', cursor=32",
      "SPEECH OUTPUT: 'editable combo box.'",
      "SPEECH OUTPUT: 'Four selected.'"]))
 
@@ -118,7 +118,7 @@ sequence.append(utils.AssertPresentationAction(
     "11. Combo box with multiple levels",
     ["BRAILLE LINE:  'gtk3-demo application Combo Boxes frame Where are we ? panel Boston combo box'",
      "     VISIBLE:  'Boston combo box', cursor=1",
-     "SPEECH OUTPUT: 'Where are we ? panel'",
+     "SPEECH OUTPUT: 'Where are we ? panel.'",
      "SPEECH OUTPUT: 'Boston combo box.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -127,6 +127,7 @@ sequence.append(utils.AssertPresentationAction(
     "12. Down arrow",
     ["BRAILLE LINE:  'gtk3-demo application Combo Boxes frame Where are we ? panel Carson City combo box 
Carson City'",
      "     VISIBLE:  'Carson City', cursor=1",
+     "SPEECH OUTPUT: 'C - D menu'",
      "SPEECH OUTPUT: 'Carson City.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -136,7 +137,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'gtk3-demo application Combo Boxes frame Where are we ? panel Carson City combo box 
Carson City'",
      "     VISIBLE:  'Carson City', cursor=1",
      "SPEECH OUTPUT: 'Combo Boxes frame'",
-     "SPEECH OUTPUT: 'Where are we ? panel'",
+     "SPEECH OUTPUT: 'Where are we ? panel.'",
      "SPEECH OUTPUT: 'C - D menu'",
      "SPEECH OUTPUT: 'Carson City.'",
      "SPEECH OUTPUT: '1 of 9'"]))
diff --git a/test/keystrokes/gtk3-demo/role_combo_box2.py b/test/keystrokes/gtk3-demo/role_combo_box2.py
index d0269aee6..9f5da64ed 100644
--- a/test/keystrokes/gtk3-demo/role_combo_box2.py
+++ b/test/keystrokes/gtk3-demo/role_combo_box2.py
@@ -25,7 +25,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Combo box",
     ["BRAILLE LINE:  'gtk3-demo application Print dialog Page Setup page tab Layout panel Only print: All 
sheets combo box'",
      "     VISIBLE:  'Only print: All sheets combo box', cursor=13",
-     "SPEECH OUTPUT: 'Layout panel'",
+     "SPEECH OUTPUT: 'Layout panel.'",
      "SPEECH OUTPUT: 'Only print: All sheets combo box.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -52,9 +52,9 @@ sequence.append(utils.AssertPresentationAction(
     "4. Where Am I",
     ["BRAILLE LINE:  'gtk3-demo application Print dialog Page Setup page tab Layout panel Only print: Even 
sheets combo box Even sheets'",
      "     VISIBLE:  'Even sheets', cursor=1",
-     "SPEECH OUTPUT: 'Print'",
+     "SPEECH OUTPUT: 'Print dialog'",
      "SPEECH OUTPUT: 'Page Setup page tab.'",
-     "SPEECH OUTPUT: 'Layout panel'",
+     "SPEECH OUTPUT: 'Layout panel.'",
      "SPEECH OUTPUT: 'Even sheets.'",
      "SPEECH OUTPUT: '2 of 3'"]))
 
diff --git a/test/keystrokes/gtk3-demo/role_dialog.py b/test/keystrokes/gtk3-demo/role_dialog.py
index f904dc82f..da2a7daa9 100644
--- a/test/keystrokes/gtk3-demo/role_dialog.py
+++ b/test/keystrokes/gtk3-demo/role_dialog.py
@@ -15,7 +15,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "1. Dialog automatic reading",
-    ["BRAILLE LINE:  'gtk3-demo application Error alert'",
+    ["BRAILLE LINE:  'gtk3-demo application window Expander $l'",
+     "     VISIBLE:  'Expander $l', cursor=1",
+     "BRAILLE LINE:  'gtk3-demo application Error alert'",
      "     VISIBLE:  'Error alert', cursor=1",
      "BRAILLE LINE:  'gtk3-demo application Error alert & y Details: collapsed toggle button'",
      "     VISIBLE:  '& y Details: collapsed toggle bu', cursor=1",
diff --git a/test/keystrokes/gtk3-demo/role_dialog_flat_review.py 
b/test/keystrokes/gtk3-demo/role_dialog_flat_review.py
index f5d7a5bfa..b2dbfa6a3 100644
--- a/test/keystrokes/gtk3-demo/role_dialog_flat_review.py
+++ b/test/keystrokes/gtk3-demo/role_dialog_flat_review.py
@@ -80,7 +80,7 @@ sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "8. Review next word",
     ["BRAILLE LINE:  'File: ~/Documents/gtk-demo.pdf Output format: &=y PDF & y Postscript & y SVG $l'",
-     "     VISIBLE:  'File: ~/Documents/gtk-demo.pdf O', cursor=7",
+     "     VISIBLE:  '~/Documents/gtk-demo.pdf Output ', cursor=1",
      "SPEECH OUTPUT: '~/Documents/gtk-demo.pdf'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -88,7 +88,7 @@ sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "9. Review next word",
     ["BRAILLE LINE:  'File: ~/Documents/gtk-demo.pdf Output format: &=y PDF & y Postscript & y SVG $l'",
-     "     VISIBLE:  'File: ~/Documents/gtk-demo.pdf O', cursor=32",
+     "     VISIBLE:  'Output format: &=y PDF & y Posts', cursor=1",
      "SPEECH OUTPUT: 'Output '"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -96,7 +96,7 @@ sequence.append(KeyComboAction("KP_3"))
 sequence.append(utils.AssertPresentationAction(
     "10. Review next char",
     ["BRAILLE LINE:  'File: ~/Documents/gtk-demo.pdf Output format: &=y PDF & y Postscript & y SVG $l'",
-     "     VISIBLE:  'utput format: &=y PDF & y Postsc', cursor=1",
+     "     VISIBLE:  'Output format: &=y PDF & y Posts', cursor=2",
      "SPEECH OUTPUT: 'u'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -104,7 +104,7 @@ sequence.append(KeyComboAction("KP_3"))
 sequence.append(utils.AssertPresentationAction(
     "11. Review next char",
     ["BRAILLE LINE:  'File: ~/Documents/gtk-demo.pdf Output format: &=y PDF & y Postscript & y SVG $l'",
-     "     VISIBLE:  'utput format: &=y PDF & y Postsc', cursor=2",
+     "     VISIBLE:  'Output format: &=y PDF & y Posts', cursor=3",
      "SPEECH OUTPUT: 't'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -112,7 +112,7 @@ sequence.append(KeyComboAction("KP_3"))
 sequence.append(utils.AssertPresentationAction(
     "12. Review next char",
     ["BRAILLE LINE:  'File: ~/Documents/gtk-demo.pdf Output format: &=y PDF & y Postscript & y SVG $l'",
-     "     VISIBLE:  'utput format: &=y PDF & y Postsc', cursor=3",
+     "     VISIBLE:  'Output format: &=y PDF & y Posts', cursor=4",
      "SPEECH OUTPUT: 'p'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -120,7 +120,7 @@ sequence.append(KeyComboAction("KP_3"))
 sequence.append(utils.AssertPresentationAction(
     "13. Review next char",
     ["BRAILLE LINE:  'File: ~/Documents/gtk-demo.pdf Output format: &=y PDF & y Postscript & y SVG $l'",
-     "     VISIBLE:  'utput format: &=y PDF & y Postsc', cursor=4",
+     "     VISIBLE:  'Output format: &=y PDF & y Posts', cursor=5",
      "SPEECH OUTPUT: 'u'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -128,7 +128,7 @@ sequence.append(KeyComboAction("KP_3"))
 sequence.append(utils.AssertPresentationAction(
     "14. Review next char",
     ["BRAILLE LINE:  'File: ~/Documents/gtk-demo.pdf Output format: &=y PDF & y Postscript & y SVG $l'",
-     "     VISIBLE:  'utput format: &=y PDF & y Postsc', cursor=5",
+     "     VISIBLE:  'Output format: &=y PDF & y Posts', cursor=6",
      "SPEECH OUTPUT: 't'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -136,7 +136,7 @@ sequence.append(KeyComboAction("KP_3"))
 sequence.append(utils.AssertPresentationAction(
     "15. Review next char",
     ["BRAILLE LINE:  'File: ~/Documents/gtk-demo.pdf Output format: &=y PDF & y Postscript & y SVG $l'",
-     "     VISIBLE:  'utput format: &=y PDF & y Postsc', cursor=6",
+     "     VISIBLE:  'Output format: &=y PDF & y Posts', cursor=7",
      "SPEECH OUTPUT: 'space'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -144,7 +144,7 @@ sequence.append(KeyComboAction("KP_3"))
 sequence.append(utils.AssertPresentationAction(
     "16. Review next char",
     ["BRAILLE LINE:  'File: ~/Documents/gtk-demo.pdf Output format: &=y PDF & y Postscript & y SVG $l'",
-     "     VISIBLE:  'utput format: &=y PDF & y Postsc', cursor=7",
+     "     VISIBLE:  'Output format: &=y PDF & y Posts', cursor=8",
      "SPEECH OUTPUT: 'f'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -152,7 +152,7 @@ sequence.append(KeyComboAction("KP_1"))
 sequence.append(utils.AssertPresentationAction(
     "17. Review previous char",
     ["BRAILLE LINE:  'File: ~/Documents/gtk-demo.pdf Output format: &=y PDF & y Postscript & y SVG $l'",
-     "     VISIBLE:  'utput format: &=y PDF & y Postsc', cursor=6",
+     "     VISIBLE:  'Output format: &=y PDF & y Posts', cursor=7",
      "SPEECH OUTPUT: 'space'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -160,7 +160,7 @@ sequence.append(KeyComboAction("KP_1"))
 sequence.append(utils.AssertPresentationAction(
     "18. Review previous char",
     ["BRAILLE LINE:  'File: ~/Documents/gtk-demo.pdf Output format: &=y PDF & y Postscript & y SVG $l'",
-     "     VISIBLE:  'utput format: &=y PDF & y Postsc', cursor=5",
+     "     VISIBLE:  'Output format: &=y PDF & y Posts', cursor=6",
      "SPEECH OUTPUT: 't'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -175,56 +175,56 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
     "20. Review next line",
-    ["BRAILLE LINE:  '&=y All Pages Copies: 1 $l'",
-     "     VISIBLE:  '&=y All Pages Copies: 1 $l', cursor=1",
-     "SPEECH OUTPUT: 'selected All Pages Copies: 1'"]))
+    ["BRAILLE LINE:  '&=y All Pages $l'",
+     "     VISIBLE:  '&=y All Pages $l', cursor=1",
+     "SPEECH OUTPUT: 'selected All Pages'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_5"))
 sequence.append(utils.AssertPresentationAction(
     "21. Review current word",
-    ["BRAILLE LINE:  '&=y All Pages Copies: 1 $l'",
-     "     VISIBLE:  '&=y All Pages Copies: 1 $l', cursor=1",
+    ["BRAILLE LINE:  '&=y All Pages $l'",
+     "     VISIBLE:  '&=y All Pages $l', cursor=1",
      "SPEECH OUTPUT: 'selected'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_2"))
 sequence.append(utils.AssertPresentationAction(
     "22. Review current char",
-    ["BRAILLE LINE:  '&=y All Pages Copies: 1 $l'",
-     "     VISIBLE:  '&=y All Pages Copies: 1 $l', cursor=1",
+    ["BRAILLE LINE:  '&=y All Pages $l'",
+     "     VISIBLE:  '&=y All Pages $l', cursor=1",
      "SPEECH OUTPUT: 'selected'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "23. Review next word",
-    ["BRAILLE LINE:  '&=y All Pages Copies: 1 $l'",
-     "     VISIBLE:  '&=y All Pages Copies: 1 $l', cursor=5",
+    ["BRAILLE LINE:  '&=y All Pages $l'",
+     "     VISIBLE:  '&=y All Pages $l', cursor=5",
      "SPEECH OUTPUT: 'All Pages'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "24. Review next word",
-    ["BRAILLE LINE:  '&=y All Pages Copies: 1 $l'",
-     "     VISIBLE:  '&=y All Pages Copies: 1 $l', cursor=15",
+    ["BRAILLE LINE:  'Copies: 1 $l'",
+     "     VISIBLE:  'Copies: 1 $l', cursor=1",
      "SPEECH OUTPUT: 'Copies:'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_3"))
 sequence.append(utils.AssertPresentationAction(
     "25. Review next char",
-    ["BRAILLE LINE:  '&=y All Pages Copies: 1 $l'",
-     "     VISIBLE:  '&=y All Pages Copies: 1 $l', cursor=16",
+    ["BRAILLE LINE:  'Copies: 1 $l'",
+     "     VISIBLE:  'Copies: 1 $l', cursor=2",
      "SPEECH OUTPUT: 'o'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "26. Review next word",
-    ["BRAILLE LINE:  '&=y All Pages Copies: 1 $l'",
-     "     VISIBLE:  '&=y All Pages Copies: 1 $l', cursor=23",
+    ["BRAILLE LINE:  'Copies: 1 $l'",
+     "     VISIBLE:  'Copies: 1 $l', cursor=9",
      "SPEECH OUTPUT: '1'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -280,15 +280,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "33. Review next word",
-    ["BRAILLE LINE:  '& y Pages: Pages < > Reverse $l'",
-     "     VISIBLE:  '& y Pages: Pages < > Reverse $l', cursor=1",
+    ["BRAILLE LINE:  '& y Pages: Pages $l'",
+     "     VISIBLE:  '& y Pages: Pages $l', cursor=1",
      "SPEECH OUTPUT: 'not selected'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
     "34. Review next line",
-    [""]))
+    ["BRAILLE LINE:  '< > Reverse $l'",
+     "     VISIBLE:  '< > Reverse $l', cursor=1",
+     "SPEECH OUTPUT: 'not checked Reverse'"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/gtk3-demo/role_icon.py b/test/keystrokes/gtk3-demo/role_icon.py
index 59c6ff037..3d24e4542 100644
--- a/test/keystrokes/gtk3-demo/role_icon.py
+++ b/test/keystrokes/gtk3-demo/role_icon.py
@@ -20,7 +20,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. bin icon",
-    ["BRAILLE LINE:  'gtk3-demo application Icon View Basics frame bin icon'",
+    ["BRAILLE LINE:  'gtk3-demo application Icon View Basics frame layered pane bin icon'",
      "     VISIBLE:  'bin icon', cursor=1",
      "SPEECH OUTPUT: 'bin icon.'"]))
 
@@ -28,17 +28,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. bin icon Where Am I",
-    ["BRAILLE LINE:  'gtk3-demo application Icon View Basics frame bin icon'",
+    ["BRAILLE LINE:  'gtk3-demo application Icon View Basics frame layered pane bin icon'",
      "     VISIBLE:  'bin icon', cursor=1",
      "SPEECH OUTPUT: 'Icon panel.'",
      "SPEECH OUTPUT: 'bin.'",
-     "SPEECH OUTPUT: '1 of 22 items selected on 1 of 22.'"]))
+     "SPEECH OUTPUT: '1 of 20 items selected on 1 of 20.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "3. boot icon",
-    ["BRAILLE LINE:  'gtk3-demo application Icon View Basics frame boot icon'",
+    ["BRAILLE LINE:  'gtk3-demo application Icon View Basics frame layered pane boot icon'",
      "     VISIBLE:  'boot icon', cursor=1",
      "SPEECH OUTPUT: 'boot icon.'"]))
 
@@ -46,7 +46,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Left"))
 sequence.append(utils.AssertPresentationAction(
     "4. icon selection",
-    ["BRAILLE LINE:  'gtk3-demo application Icon View Basics frame bin icon'",
+    ["BRAILLE LINE:  'gtk3-demo application Icon View Basics frame layered pane bin icon'",
      "     VISIBLE:  'bin icon', cursor=1",
      "SPEECH OUTPUT: 'bin icon.'"]))
 
@@ -54,11 +54,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "5. icon selection Where Am I",
-    ["BRAILLE LINE:  'gtk3-demo application Icon View Basics frame bin icon'",
+    ["BRAILLE LINE:  'gtk3-demo application Icon View Basics frame layered pane bin icon'",
      "     VISIBLE:  'bin icon', cursor=1",
      "SPEECH OUTPUT: 'Icon panel.'",
      "SPEECH OUTPUT: 'bin.'",
-     "SPEECH OUTPUT: '2 of 22 items selected on 1 of 22.'"]))
+     "SPEECH OUTPUT: '2 of 20 items selected on 1 of 20.'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
 
diff --git a/test/keystrokes/gtk3-demo/role_icon_flat_review.py 
b/test/keystrokes/gtk3-demo/role_icon_flat_review.py
index 3f30aac38..a2f4091f4 100644
--- a/test/keystrokes/gtk3-demo/role_icon_flat_review.py
+++ b/test/keystrokes/gtk3-demo/role_icon_flat_review.py
@@ -20,7 +20,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. bin icon",
-    ["BRAILLE LINE:  'gtk3-demo application Icon View Basics frame bin icon'",
+    ["BRAILLE LINE:  'gtk3-demo application Icon View Basics frame layered pane bin icon'",
      "     VISIBLE:  'bin icon', cursor=1",
      "SPEECH OUTPUT: 'bin icon.'"]))
 
diff --git a/test/keystrokes/gtk3-demo/role_info_bar.py b/test/keystrokes/gtk3-demo/role_info_bar.py
index 07568399e..f6edefb9d 100644
--- a/test/keystrokes/gtk3-demo/role_info_bar.py
+++ b/test/keystrokes/gtk3-demo/role_info_bar.py
@@ -46,9 +46,9 @@ sequence.append(KeyComboAction("KP_7"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "2. Flat review the home position to read the message",
-    ["BRAILLE LINE:  'Info bars This is an info bar with message type GTK_MESSAGE_INFO $l'",
-     "     VISIBLE:  'Info bars This is an info bar wi', cursor=1",
-     "SPEECH OUTPUT: 'Info bars This is an info bar with message type GTK_MESSAGE_INFO'"]))
+    ["BRAILLE LINE:  'This is an info bar with message type GTK_MESSAGE_INFO $l'",
+     "     VISIBLE:  'This is an info bar with message', cursor=1",
+     "SPEECH OUTPUT: 'This is an info bar with message type GTK_MESSAGE_INFO'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
 
diff --git a/test/keystrokes/gtk3-demo/role_listbox.py b/test/keystrokes/gtk3-demo/role_listbox.py
index a711e1bd4..1ae5de29d 100644
--- a/test/keystrokes/gtk3-demo/role_listbox.py
+++ b/test/keystrokes/gtk3-demo/role_listbox.py
@@ -17,48 +17,34 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "1. Where Am I",
-    ["KNOWN ISSUE: The order of presentation can vary. Seems to be a timing issue.",
-     "BRAILLE LINE:  'gtk3-demo application List Box frame list box 2",
-     "Reshares 4",
-     "Favorites 23:00:00 - 26 Mar 2013 Resent by @GTKtoolkit 26 Mar 13 GTK+ 3.8.0 (STABLE) released: 
wayland, Multi-application Broadway, improved CSS support and more ... http://ur1.ca/d6yms  #gtk #gtk3 
Details push button'",
-     "     VISIBLE:  '2",
-     "Reshares 4",
-     "Favorites 23:00:00 ', cursor=1",
-     "SPEECH OUTPUT: '2",
-     "Reshares 4",
-     "Favorites 23:00:00 - 26 Mar 2013 Resent by @GTKtoolkit 26 Mar 13 GTK+ 3.8.0 (STABLE) released: 
wayland, Multi-application Broadway, improved CSS support and more ... http://ur1.ca/d6yms  #gtk #gtk3'",
-     "SPEECH OUTPUT: '1 of 8'"]))
+    ["BRAILLE LINE:  'gtk3-demo application List Box frame GTKtoolkit 23 Nov 14 @breizhodrome yeah, that's 
for the OpenGL support that has been added recently list box GTKtoolkit 23 Nov 14 @breizhodrome yeah, that's 
for the OpenGL support that has been added recently Details push button Expand push button Reply push button 
Reshare push button Favorite push button & y More... toggle button reshareer push button GTK+ and friends 
push button '",
+     "     VISIBLE:  'GTKtoolkit 23 Nov 14 @breizhodro', cursor=1",
+     "SPEECH OUTPUT: 'GTKtoolkit 23 Nov 14 @breizhodrome yeah, that's for the OpenGL support that has been 
added recently.'",
+     "SPEECH OUTPUT: '1 of 388.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Next item",
-    ["KNOWN ISSUE: The order of presentation can vary. Seems to be a timing issue.",
-     "BRAILLE LINE:  'gtk3-demo application List Box frame list box 0",
-     "Favorites 0",
-     "Reshares 20:20:00 - 11 Oct 2013 @GTKtoolkit 11 Oct 13 GLib 2.34.0 (STABLE) released: 
http://ur1.ca/aj4du  #glib Details push button'",
-     "     VISIBLE:  'Resent by 0",
-     "Favorites 0",
-     "Reshares', cursor=1",
-     "SPEECH OUTPUT: 'Resent by 0",
-     "Favorites 0",
-     "Reshares 20:20:00 - 11 Oct 2013 @GTKtoolkit 11 Oct 13 GLib 2.34.0 (STABLE) released: 
http://ur1.ca/aj4du  #glib Details push button'"]))
+    ["BRAILLE LINE:  'gtk3-demo application List Box frame ebassi 15 Nov 14 RT @ebassi: embloggeration 
happened: http://t.co/9ukkNuSzuc \u2014 help out supporting GL on windows and macos in GTK+ 3.16. Resent by 
list box ebassi 15 Nov 14 RT @ebassi: embloggeration happened: http://t.co/9ukkNuSzuc \u2014 help out 
supporting GL on windows and macos in GTK+ 3.16. Resent by Details push button Expand push button Reply push 
button Reshare push button Favorite push button & y More... toggle button GTKtoolkit push button Emmanuele 
Bassi push button '",
+     "     VISIBLE:  'ebassi 15 Nov 14 RT @ebassi: emb', cursor=1",
+     "SPEECH OUTPUT: 'ebassi 15 Nov 14 RT @ebassi: embloggeration happened: http://t.co/9ukkNuSzuc \u2014 
help out supporting GL on windows and macos in GTK+ 3.16. Resent by.'",
+     "SPEECH OUTPUT: 'Expand push button'",
+     "SPEECH OUTPUT: 'Reply push button'",
+     "SPEECH OUTPUT: 'Reshare push button'",
+     "SPEECH OUTPUT: 'Favorite push button'",
+     "SPEECH OUTPUT: 'More... toggle button not pressed'",
+     "SPEECH OUTPUT: 'GTKtoolkit push button'",
+     "SPEECH OUTPUT: 'Emmanuele Bassi push button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "3. Where Am I",
-    ["KNOWN ISSUE: The order of presentation can vary. Seems to be a timing issue.",
-     "BRAILLE LINE:  'gtk3-demo application List Box frame list box Resent by 0",
-     "Favorites 0",
-     "Reshares 20:20:00 - 11 Oct 2013 @GTKtoolkit 11 Oct 13 GLib 2.34.0 (STABLE) released: 
http://ur1.ca/aj4du  #glib Details push button'",
-     "     VISIBLE:  'Resent by 0",
-     "Favorites 0",
-     "Reshares', cursor=1",
-     "SPEECH OUTPUT: 'Resent by 0",
-     "Favorites 0",
-     "Reshares 20:20:00 - 11 Oct 2013 @GTKtoolkit 11 Oct 13 GLib 2.34.0 (STABLE) released: 
http://ur1.ca/aj4du  #glib'",
-     "SPEECH OUTPUT: '2 of 8'"]))
+    ["BRAILLE LINE:  'gtk3-demo application List Box frame ebassi 15 Nov 14 RT @ebassi: embloggeration 
happened: http://t.co/9ukkNuSzuc \u2014 help out supporting GL on windows and macos in GTK+ 3.16. Resent by 
list box ebassi 15 Nov 14 RT @ebassi: embloggeration happened: http://t.co/9ukkNuSzuc \u2014 help out 
supporting GL on windows and macos in GTK+ 3.16. Resent by Details push button Expand push button Reply push 
button Reshare push button Favorite push button & y More... toggle button GTKtoolkit push button Emmanuele 
Bassi push button '",
+     "     VISIBLE:  'ebassi 15 Nov 14 RT @ebassi: emb', cursor=1",
+     "SPEECH OUTPUT: 'ebassi 15 Nov 14 RT @ebassi: embloggeration happened: http://t.co/9ukkNuSzuc \u2014 
help out supporting GL on windows and macos in GTK+ 3.16. Resent by.'",
+     "SPEECH OUTPUT: '2 of 388.'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
 
diff --git a/test/keystrokes/gtk3-demo/role_menu.py b/test/keystrokes/gtk3-demo/role_menu.py
index a83bb3ae5..505ef3955 100644
--- a/test/keystrokes/gtk3-demo/role_menu.py
+++ b/test/keystrokes/gtk3-demo/role_menu.py
@@ -46,7 +46,6 @@ sequence.append(utils.AssertPresentationAction(
     "4. Where Am I",
     ["BRAILLE LINE:  'gtk3-demo-application application Application Class frame Color menu'",
      "     VISIBLE:  'Color menu', cursor=1",
-     "SPEECH OUTPUT: 'Application Class frame'",
      "SPEECH OUTPUT: 'Preferences menu'",
      "SPEECH OUTPUT: 'Color menu.'",
      "SPEECH OUTPUT: '3 of 5.'",
@@ -66,7 +65,6 @@ sequence.append(utils.AssertPresentationAction(
     "6. Where Am I",
     ["BRAILLE LINE:  'gtk3-demo-application application Application Class frame Preferences menu &=y Red 
radio menu item(Ctrl+R)'",
      "     VISIBLE:  '&=y Red radio menu item(Ctrl+R)', cursor=1",
-     "SPEECH OUTPUT: 'Application Class frame'",
      "SPEECH OUTPUT: 'Preferences menu'",
      "SPEECH OUTPUT: 'Color menu'",
      "SPEECH OUTPUT: 'Red radio menu item selected Ctrl+R 1 of 3.'",
diff --git a/test/keystrokes/gtk3-demo/role_menu_flat_review.py 
b/test/keystrokes/gtk3-demo/role_menu_flat_review.py
index 725cd5629..f60567d6b 100644
--- a/test/keystrokes/gtk3-demo/role_menu_flat_review.py
+++ b/test/keystrokes/gtk3-demo/role_menu_flat_review.py
@@ -60,7 +60,7 @@ sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "6. Review next word",
     ["BRAILLE LINE:  '< > Hide Titlebar when maximized $l'",
-     "     VISIBLE:  '< > Hide Titlebar when maximized', cursor=5",
+     "     VISIBLE:  'Hide Titlebar when maximized $l', cursor=1",
      "SPEECH OUTPUT: 'Hide '"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -68,7 +68,7 @@ sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "7. Review next word",
     ["BRAILLE LINE:  '< > Hide Titlebar when maximized $l'",
-     "     VISIBLE:  '< > Hide Titlebar when maximized', cursor=10",
+     "     VISIBLE:  'Hide Titlebar when maximized $l', cursor=6",
      "SPEECH OUTPUT: 'Titlebar '"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/gtk3-demo/role_push_button.py b/test/keystrokes/gtk3-demo/role_push_button.py
index 32b556b03..f3dce8aa1 100644
--- a/test/keystrokes/gtk3-demo/role_push_button.py
+++ b/test/keystrokes/gtk3-demo/role_push_button.py
@@ -21,8 +21,8 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  'gtk3-demo application Button Boxes frame Horizontal Button Boxes panel Spread panel OK 
push button'",
      "     VISIBLE:  'OK push button', cursor=1",
      "SPEECH OUTPUT: 'Button Boxes frame'",
-     "SPEECH OUTPUT: 'Horizontal Button Boxes panel'",
-     "SPEECH OUTPUT: 'Spread panel'",
+     "SPEECH OUTPUT: 'Horizontal Button Boxes panel.'",
+     "SPEECH OUTPUT: 'Spread panel.'",
      "SPEECH OUTPUT: 'OK push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -49,7 +49,7 @@ sequence.append(utils.AssertPresentationAction(
     "4. OK Edge button",
     ["BRAILLE LINE:  'gtk3-demo application Button Boxes frame Horizontal Button Boxes panel Edge panel OK 
push button'",
      "     VISIBLE:  'OK push button', cursor=1",
-     "SPEECH OUTPUT: 'Edge panel'",
+     "SPEECH OUTPUT: 'Edge panel.'",
      "SPEECH OUTPUT: 'OK push button'"]))
 
 sequence.append(KeyComboAction("<Alt>F4", 500))
diff --git a/test/keystrokes/gtk3-demo/role_radio_button.py b/test/keystrokes/gtk3-demo/role_radio_button.py
index 51ad69caa..7c914cb4a 100644
--- a/test/keystrokes/gtk3-demo/role_radio_button.py
+++ b/test/keystrokes/gtk3-demo/role_radio_button.py
@@ -23,8 +23,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. All Pages radio button",
     ["BRAILLE LINE:  'gtk3-demo application Print dialog General page tab Range panel Range &=y All Pages 
radio button'",
      "     VISIBLE:  '&=y All Pages radio button', cursor=1",
-     "SPEECH OUTPUT: 'General page tab.'",
-     "SPEECH OUTPUT: 'Range panel'",
+     "SPEECH OUTPUT: 'Range panel.'",
      "SPEECH OUTPUT: 'All Pages.'",
      "SPEECH OUTPUT: 'selected radio button'"]))
 
@@ -47,7 +46,7 @@ sequence.append(utils.AssertPresentationAction(
     "3. Range radio button",
     ["BRAILLE LINE:  'gtk3-demo application Print dialog General page tab Range panel Range &=y Pages: radio 
button'",
      "     VISIBLE:  '&=y Pages: radio button', cursor=1",
-     "SPEECH OUTPUT: 'Pages:.'",
+     "SPEECH OUTPUT: 'Pages:'",
      "SPEECH OUTPUT: 'selected radio button'",
      "SPEECH OUTPUT: 'Specify one or more page ranges,",
      " e.g. 1–3, 7, 11'"]))
diff --git a/test/keystrokes/gtk3-demo/role_spin_button.py b/test/keystrokes/gtk3-demo/role_spin_button.py
index 314c5d758..1c6489494 100644
--- a/test/keystrokes/gtk3-demo/role_spin_button.py
+++ b/test/keystrokes/gtk3-demo/role_spin_button.py
@@ -17,6 +17,9 @@ sequence.append(KeyComboAction("<Shift>Right"))
 sequence.append(KeyComboAction("Down"))
 sequence.append(KeyComboAction("Return"))
 sequence.append(PauseAction(3000))
+sequence.append(KeyComboAction("<Alt>s"))
+sequence.append(KeyComboAction("Tab"))
+sequence.append(PauseAction(2000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>s"))
@@ -24,10 +27,6 @@ sequence.append(utils.AssertPresentationAction(
     "1. Give focus to spin button",
     ["BRAILLE LINE:  'gtk3-demo application Print dialog General page tab Copies panel Copies: 1 $l'",
      "     VISIBLE:  'Copies: 1 $l', cursor=10",
-     "BRAILLE LINE:  'gtk3-demo application Print dialog General page tab Copies panel Copies: 1 $l'",
-     "     VISIBLE:  'Copies: 1 $l', cursor=10",
-     "SPEECH OUTPUT: 'General page tab.'",
-     "SPEECH OUTPUT: 'Copies panel'",
      "SPEECH OUTPUT: 'Copies: 1 selected spin button.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -45,12 +44,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "3. Increment value",
-    ["KNOWN ISSUE: We are double-presenting this",
-     "BRAILLE LINE:  'gtk3-demo application Print dialog General page tab Copies panel Copies: 16 $l'",
-     "     VISIBLE:  'Copies: 16 $l', cursor=9",
-     "BRAILLE LINE:  'gtk3-demo application Print dialog General page tab Copies panel Copies: 16 $l'",
+    ["BRAILLE LINE:  'gtk3-demo application Print dialog General page tab Copies panel Copies: 16 $l'",
      "     VISIBLE:  'Copies: 16 $l', cursor=9",
-     "SPEECH OUTPUT: '16'",
      "SPEECH OUTPUT: '16'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/gtk3-demo/role_split_pane.py b/test/keystrokes/gtk3-demo/role_split_pane.py
index 9d3cfcf9a..0e226c861 100644
--- a/test/keystrokes/gtk3-demo/role_split_pane.py
+++ b/test/keystrokes/gtk3-demo/role_split_pane.py
@@ -17,33 +17,33 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("F8"))
 sequence.append(utils.AssertPresentationAction(
     "1. vertical splitter",
-    ["BRAILLE LINE:  'gtk3-demo application Paned Widgets frame 88 vertical splitter'",
-     "     VISIBLE:  '88 vertical splitter', cursor=1",
-     "SPEECH OUTPUT: 'vertical splitter 88'"]))
+    ["BRAILLE LINE:  'gtk3-demo application Paned Widgets frame 84 vertical splitter'",
+     "     VISIBLE:  '84 vertical splitter', cursor=1",
+     "SPEECH OUTPUT: 'vertical splitter 84'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "2. vertical splitter increment value",
-    ["BRAILLE LINE:  'gtk3-demo application Paned Widgets frame 89 vertical splitter'",
-     "     VISIBLE:  '89 vertical splitter', cursor=1",
-     "SPEECH OUTPUT: '89'"]))
+    ["BRAILLE LINE:  'gtk3-demo application Paned Widgets frame 85 vertical splitter'",
+     "     VISIBLE:  '85 vertical splitter', cursor=1",
+     "SPEECH OUTPUT: '85'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "3. vertical splitter Where Am I",
-    ["BRAILLE LINE:  'gtk3-demo application Paned Widgets frame 89 vertical splitter'",
-     "     VISIBLE:  '89 vertical splitter', cursor=1",
-     "SPEECH OUTPUT: 'vertical splitter 89'"]))
+    ["BRAILLE LINE:  'gtk3-demo application Paned Widgets frame 85 vertical splitter'",
+     "     VISIBLE:  '85 vertical splitter', cursor=1",
+     "SPEECH OUTPUT: 'vertical splitter 85'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "4. vertical splitter decrement value",
-    ["BRAILLE LINE:  'gtk3-demo application Paned Widgets frame 88 vertical splitter'",
-     "     VISIBLE:  '88 vertical splitter', cursor=1",
-     "SPEECH OUTPUT: '88'"]))
+    ["BRAILLE LINE:  'gtk3-demo application Paned Widgets frame 84 vertical splitter'",
+     "     VISIBLE:  '84 vertical splitter', cursor=1",
+     "SPEECH OUTPUT: '84'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("F8"))
diff --git a/test/keystrokes/gtk3-demo/role_status_bar.py b/test/keystrokes/gtk3-demo/role_status_bar.py
index 46ad5a44e..b5e08b2e6 100644
--- a/test/keystrokes/gtk3-demo/role_status_bar.py
+++ b/test/keystrokes/gtk3-demo/role_status_bar.py
@@ -23,14 +23,16 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "1. Status bar Where Am I",
-    ["BRAILLE LINE:  'Application Class'",
+    ["KNOWN ISSUE: We might not want the 'frame' visible",
+     "BRAILLE LINE:  'Application Class'",
      "     VISIBLE:  'Application Class', cursor=0",
      "BRAILLE LINE:  'gtk3-demo-application application Application Class frame  $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  'frame  $l', cursor=7",
      "BRAILLE LINE:  'gtk3-demo-application application Application Class frame  $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  'frame  $l', cursor=7",
      "SPEECH OUTPUT: 'Application Class'",
-     "SPEECH OUTPUT: 'Cursor at row 0 column 0 - 0 chars in document'"]))
+     "SPEECH OUTPUT: 'Cursor at row 0 column 0 - 0 chars in document'",
+     "SPEECH OUTPUT: 'Information'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
 
diff --git a/test/keystrokes/gtk3-demo/role_table.py b/test/keystrokes/gtk3-demo/role_table.py
index 570710c87..05e110450 100644
--- a/test/keystrokes/gtk3-demo/role_table.py
+++ b/test/keystrokes/gtk3-demo/role_table.py
@@ -12,6 +12,8 @@ sequence.append(KeyComboAction("<Shift>Right"))
 sequence.append(KeyComboAction("Down"))
 sequence.append(KeyComboAction("Return"))
 sequence.append(PauseAction(3000))
+sequence.append(KeyComboAction("Down"))
+sequence.append(KeyComboAction("Up"))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
diff --git a/test/keystrokes/gtk3-demo/role_table_flat_review.py 
b/test/keystrokes/gtk3-demo/role_table_flat_review.py
index 2135e4e12..1ae441b1e 100644
--- a/test/keystrokes/gtk3-demo/role_table_flat_review.py
+++ b/test/keystrokes/gtk3-demo/role_table_flat_review.py
@@ -69,7 +69,7 @@ sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "7. Review next word'",
     ["BRAILLE LINE:  '2 packages of chocolate chip cookies $l'",
-     "     VISIBLE:  '2 packages of chocolate chip coo', cursor=3",
+     "     VISIBLE:  'packages of chocolate chip cooki', cursor=1",
      "SPEECH OUTPUT: 'packages '"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -77,7 +77,7 @@ sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "8. Review next word'",
     ["BRAILLE LINE:  '2 packages of chocolate chip cookies $l'",
-     "     VISIBLE:  '2 packages of chocolate chip coo', cursor=12",
+     "     VISIBLE:  'packages of chocolate chip cooki', cursor=10",
      "SPEECH OUTPUT: 'of '"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -85,7 +85,7 @@ sequence.append(KeyComboAction("KP_3"))
 sequence.append(utils.AssertPresentationAction(
     "9. Review next char'",
     ["BRAILLE LINE:  '2 packages of chocolate chip cookies $l'",
-     "     VISIBLE:  '2 packages of chocolate chip coo', cursor=13",
+     "     VISIBLE:  'packages of chocolate chip cooki', cursor=11",
      "SPEECH OUTPUT: 'f'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -93,7 +93,7 @@ sequence.append(KeyComboAction("KP_3"))
 sequence.append(utils.AssertPresentationAction(
     "10. Review next char'",
     ["BRAILLE LINE:  '2 packages of chocolate chip cookies $l'",
-     "     VISIBLE:  '2 packages of chocolate chip coo', cursor=14",
+     "     VISIBLE:  'packages of chocolate chip cooki', cursor=12",
      "SPEECH OUTPUT: 'space'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -101,7 +101,7 @@ sequence.append(KeyComboAction("KP_1"))
 sequence.append(utils.AssertPresentationAction(
     "11. Review previous char'",
     ["BRAILLE LINE:  '2 packages of chocolate chip cookies $l'",
-     "     VISIBLE:  '2 packages of chocolate chip coo', cursor=13",
+     "     VISIBLE:  'packages of chocolate chip cooki', cursor=11",
      "SPEECH OUTPUT: 'f'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -109,7 +109,7 @@ sequence.append(KeyComboAction("KP_1"))
 sequence.append(utils.AssertPresentationAction(
     "12. Review previous char'",
     ["BRAILLE LINE:  '2 packages of chocolate chip cookies $l'",
-     "     VISIBLE:  '2 packages of chocolate chip coo', cursor=12",
+     "     VISIBLE:  'packages of chocolate chip cooki', cursor=10",
      "SPEECH OUTPUT: 'o'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -117,7 +117,7 @@ sequence.append(KeyComboAction("KP_4"))
 sequence.append(utils.AssertPresentationAction(
     "13. Review previous word'",
     ["BRAILLE LINE:  '2 packages of chocolate chip cookies $l'",
-     "     VISIBLE:  '2 packages of chocolate chip coo', cursor=3",
+     "     VISIBLE:  'packages of chocolate chip cooki', cursor=1",
      "SPEECH OUTPUT: 'packages '"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -148,25 +148,25 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
     "17. Review next line",
-    ["BRAILLE LINE:  'horizontal scroll bar 0% $l'",
-     "     VISIBLE:  'horizontal scroll bar 0% $l', cursor=1",
-     "SPEECH OUTPUT: 'horizontal scroll bar 0 percent.'"]))
+    ["BRAILLE LINE:  '1 can vanilla ice cream $l'",
+     "     VISIBLE:  '1 can vanilla ice cream $l', cursor=1",
+     "SPEECH OUTPUT: '1 can vanilla ice cream'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
     "18. Review next line",
-    ["BRAILLE LINE:  'Add item Remove item $l'",
-     "     VISIBLE:  'Add item Remove item $l', cursor=1",
-     "SPEECH OUTPUT: 'Add item Remove item"]))
+    ["BRAILLE LINE:  'horizontal scroll bar 0% $l'",
+     "     VISIBLE:  'horizontal scroll bar 0% $l', cursor=1",
+     "SPEECH OUTPUT: 'horizontal scroll bar 0 percent.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_7"))
 sequence.append(utils.AssertPresentationAction(
     "19. Review previous line",
-    ["BRAILLE LINE:  'horizontal scroll bar 0% $l'",
-     "     VISIBLE:  'horizontal scroll bar 0% $l', cursor=1",
-     "SPEECH OUTPUT: 'horizontal scroll bar 0 percent.'"]))
+    ["BRAILLE LINE:  '1 can vanilla ice cream $l'",
+     "     VISIBLE:  '1 can vanilla ice cream $l', cursor=1",
+     "SPEECH OUTPUT: '1 can vanilla ice cream'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_7"))
diff --git a/test/keystrokes/gtk3-demo/role_text_multiline.py 
b/test/keystrokes/gtk3-demo/role_text_multiline.py
index 6091c33d8..a6e6e5e54 100644
--- a/test/keystrokes/gtk3-demo/role_text_multiline.py
+++ b/test/keystrokes/gtk3-demo/role_text_multiline.py
@@ -14,71 +14,21 @@ sequence.append(KeyComboAction("Return"))
 sequence.append(KeyComboAction("Tab"))
 sequence.append(PauseAction(3000))
 
+sequence.append(TypeAction("This is a tes"))
+
 sequence.append(utils.StartRecordingAction())
-sequence.append(TypeAction("This is a test."))
+sequence.append(TypeAction("t."))
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "1. Typing",
-    ["BRAILLE LINE:  'gtk3-demo-application application Application Class frame T $l'",
-     "     VISIBLE:  'T $l', cursor=2",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame T $l'",
-     "     VISIBLE:  'T $l', cursor=2",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame Th $l'",
-     "     VISIBLE:  'Th $l', cursor=3",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame Th $l'",
-     "     VISIBLE:  'Th $l', cursor=3",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame Thi $l'",
-     "     VISIBLE:  'Thi $l', cursor=4",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame Thi $l'",
-     "     VISIBLE:  'Thi $l', cursor=4",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This $l'",
-     "     VISIBLE:  'This $l', cursor=5",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This $l'",
-     "     VISIBLE:  'This $l', cursor=5",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This  $l'",
-     "     VISIBLE:  'This  $l', cursor=6",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This  $l'",
-     "     VISIBLE:  'This  $l', cursor=6",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This i $l'",
-     "     VISIBLE:  'This i $l', cursor=7",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This i $l'",
-     "     VISIBLE:  'This i $l', cursor=7",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is $l'",
-     "     VISIBLE:  'This is $l', cursor=8",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is $l'",
-     "     VISIBLE:  'This is $l', cursor=8",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is  $l'",
-     "     VISIBLE:  'This is  $l', cursor=9",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is  $l'",
-     "     VISIBLE:  'This is  $l', cursor=9",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is a $l'",
-     "     VISIBLE:  'This is a $l', cursor=10",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is a $l'",
-     "     VISIBLE:  'This is a $l', cursor=10",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is a  $l'",
-     "     VISIBLE:  'This is a  $l', cursor=11",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is a  $l'",
-     "     VISIBLE:  'This is a  $l', cursor=11",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is a t $l'",
-     "     VISIBLE:  'This is a t $l', cursor=12",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is a t $l'",
-     "     VISIBLE:  'This is a t $l', cursor=12",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is a te $l'",
-     "     VISIBLE:  'This is a te $l', cursor=13",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is a te $l'",
-     "     VISIBLE:  'This is a te $l', cursor=13",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is a tes $l'",
-     "     VISIBLE:  'This is a tes $l', cursor=14",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is a tes $l'",
-     "     VISIBLE:  'This is a tes $l', cursor=14",
-     "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is a test $l'",
-     "     VISIBLE:  'This is a test $l', cursor=15",
+    ["BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is a test $l'",
+     "     VISIBLE:  'frame This is a test $l', cursor=21",
      "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is a test $l'",
-     "     VISIBLE:  'This is a test $l', cursor=15",
+     "     VISIBLE:  'frame This is a test $l', cursor=21",
      "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is a test. $l'",
-     "     VISIBLE:  'This is a test. $l', cursor=16",
+     "     VISIBLE:  'frame This is a test. $l', cursor=22",
      "BRAILLE LINE:  'gtk3-demo-application application Application Class frame This is a test. $l'",
-     "     VISIBLE:  'This is a test. $l', cursor=16",
+     "     VISIBLE:  'frame This is a test. $l', cursor=22",
      "BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  ' $l'",
diff --git a/test/keystrokes/gtk3-demo/role_text_multiline_navigation.py 
b/test/keystrokes/gtk3-demo/role_text_multiline_navigation.py
index 251881030..54b5ab534 100644
--- a/test/keystrokes/gtk3-demo/role_text_multiline_navigation.py
+++ b/test/keystrokes/gtk3-demo/role_text_multiline_navigation.py
@@ -91,7 +91,7 @@ sequence.append(KeyComboAction("<Control>Left"))
 sequence.append(utils.AssertPresentationAction(
     "7. Ctrl+Left to beginning of 'time' at end of previous line",
     ["BRAILLE LINE:  'time in the lab and not enough time $l'",
-     "     VISIBLE:  'time in the lab and not enough t', cursor=32",
+     "     VISIBLE:  'time $l', cursor=1",
      "SPEECH OUTPUT: 'newline'",
      "SPEECH OUTPUT: 'time",
      "'"]))
@@ -255,7 +255,7 @@ sequence.append(TypeAction("f"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "27. Insert+f for text attributes",
-    ["SPEECH OUTPUT: 'size: 11' voice=system",
+    ["SPEECH OUTPUT: 'size: 10' voice=system",
      "SPEECH OUTPUT: 'family name: Cantarell' voice=system",
      "SPEECH OUTPUT: 'foreground color: white' voice=system",
      "SPEECH OUTPUT: 'background color: dark slate gray' voice=system"]))
@@ -345,6 +345,8 @@ sequence.append(KeyComboAction("BackSpace"))
 sequence.append(utils.AssertPresentationAction(
     "38. BackSpace '.' after 'test'",
     ["BRAILLE LINE:  'This is only a test $l'",
+     "     VISIBLE:  'This is only a test $l', cursor=20",
+     "BRAILLE LINE:  'This is only a test $l'",
      "     VISIBLE:  'This is only a test $l', cursor=20",
      "SPEECH OUTPUT: 'dot'"]))
 
@@ -363,6 +365,8 @@ sequence.append(KeyComboAction("<Control>BackSpace"))
 sequence.append(utils.AssertPresentationAction(
     "40. Ctrl+BackSpace to delete 'a'",
     ["BRAILLE LINE:  'This is only  $l'",
+     "     VISIBLE:  'This is only  $l', cursor=14",
+     "BRAILLE LINE:  'This is only  $l'",
      "     VISIBLE:  'This is only  $l', cursor=14",
      "SPEECH OUTPUT: 'a '"]))
 
diff --git a/test/keystrokes/gtk3-demo/role_text_multiline_selection.py 
b/test/keystrokes/gtk3-demo/role_text_multiline_selection.py
index e9b5da96c..130e2c13d 100644
--- a/test/keystrokes/gtk3-demo/role_text_multiline_selection.py
+++ b/test/keystrokes/gtk3-demo/role_text_multiline_selection.py
@@ -21,7 +21,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>a"))
 sequence.append(utils.AssertPresentationAction(
     "1. Select all'",
-    ["BRAILLE LINE:  'gtk3-demo application Hypertext frame Some text to show that simple hyper text can 
easily be realized  $l'",
+    ["BRAILLE LINE:  'gtk3-demo application Hypertext frame Some text to show that simple hyper text can 
easily be realized with  $l'",
      "     VISIBLE:  'Some text to show that simple hy', cursor=1",
      "SPEECH OUTPUT: 'entire document selected' voice=system"]))
 
@@ -33,6 +33,8 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  'Selection deleted.'",
      "     VISIBLE:  'Selection deleted.', cursor=0",
+     "BRAILLE LINE:  'gtk3-demo application Hypertext frame  $l'",
+     "     VISIBLE:  'frame  $l', cursor=7",
      "SPEECH OUTPUT: 'Selection deleted.' voice=system"]))
 
 sequence.append(TypeAction("This is a test."))
@@ -123,14 +125,15 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  'Cut selection to clipboard.'",
      "     VISIBLE:  'Cut selection to clipboard.', cursor=0",
+     "BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Cut selection to clipboard.' voice=system"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>x"))
 sequence.append(utils.AssertPresentationAction(
     "11. Cut with nothing selected",
-    ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1"]))
+    [""]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/gtk3-demo/role_toggle_button.py b/test/keystrokes/gtk3-demo/role_toggle_button.py
index c821b8305..3de827c7e 100644
--- a/test/keystrokes/gtk3-demo/role_toggle_button.py
+++ b/test/keystrokes/gtk3-demo/role_toggle_button.py
@@ -26,7 +26,9 @@ sequence.append(utils.AssertPresentationAction(
     "2. Toggle button state changed to expanded",
     ["BRAILLE LINE:  'gtk3-demo application Error alert &=y Details: expanded toggle button'",
      "     VISIBLE:  '&=y Details: expanded toggle but', cursor=1",
-     "SPEECH OUTPUT: 'expanded'"]))
+     "SPEECH OUTPUT: 'expanded'",
+     "SPEECH OUTPUT: 'Finally, the full story with all details. And all the inside information, including 
error codes, etc etc. Pages of information, you might have to scroll down to read it all, or even resize the 
window - it works !",
+     "A second paragraph will contain even more innuendo, just to make you scroll down or resize the window. 
Do it already !' voice=system"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
diff --git a/test/keystrokes/gtk3-demo/role_toggle_button_flat_review.py 
b/test/keystrokes/gtk3-demo/role_toggle_button_flat_review.py
index b07dcb228..98cb4f639 100644
--- a/test/keystrokes/gtk3-demo/role_toggle_button_flat_review.py
+++ b/test/keystrokes/gtk3-demo/role_toggle_button_flat_review.py
@@ -121,7 +121,7 @@ sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "14. Review next word",
     ["BRAILLE LINE:  'Here are some more details but not the full story. $l'",
-     "     VISIBLE:  'Here are some more details but n', cursor=32",
+     "     VISIBLE:  'not the full story. $l', cursor=1",
      "SPEECH OUTPUT: 'not '"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -129,7 +129,7 @@ sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "15. Review next word",
     ["BRAILLE LINE:  'Here are some more details but not the full story. $l'",
-     "     VISIBLE:  'ot the full story. $l', cursor=4",
+     "     VISIBLE:  'not the full story. $l', cursor=5",
      "SPEECH OUTPUT: 'the '"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -137,7 +137,7 @@ sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "16. Review next word",
     ["BRAILLE LINE:  'Here are some more details but not the full story. $l'",
-     "     VISIBLE:  'ot the full story. $l', cursor=8",
+     "     VISIBLE:  'not the full story. $l', cursor=9",
      "SPEECH OUTPUT: 'full '"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -145,7 +145,7 @@ sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "17. Review next word",
     ["BRAILLE LINE:  'Here are some more details but not the full story. $l'",
-     "     VISIBLE:  'ot the full story. $l', cursor=13",
+     "     VISIBLE:  'not the full story. $l', cursor=14",
      "SPEECH OUTPUT: 'story.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -153,12 +153,12 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "18. Tab to change focus",
     ["KNOWN ISSUE: This is not on screen. But we don't control focus.",
-     "BRAILLE LINE:  'already ! $l rdonly'",
-     "     VISIBLE:  'already ! $l rdonly', cursor=10",
-     "BRAILLE LINE:  'already ! $l rdonly'",
-     "     VISIBLE:  'already ! $l rdonly', cursor=10",
+     "BRAILLE LINE:  'the window. Do it already ! $l rdonly'",
+     "     VISIBLE:  'the window. Do it already ! $l r', cursor=28",
+     "BRAILLE LINE:  'the window. Do it already ! $l rdonly'",
+     "     VISIBLE:  'the window. Do it already ! $l r', cursor=28",
      "SPEECH OUTPUT: 'read only text.'",
-     "SPEECH OUTPUT: 'already !'"]))
+     "SPEECH OUTPUT: 'the window. Do it already !'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_8"))
diff --git a/test/keystrokes/gtk3-demo/role_tooltip.py b/test/keystrokes/gtk3-demo/role_tooltip.py
index 3a7184685..13d07f08c 100644
--- a/test/keystrokes/gtk3-demo/role_tooltip.py
+++ b/test/keystrokes/gtk3-demo/role_tooltip.py
@@ -34,7 +34,7 @@ sequence.append(utils.AssertPresentationAction(
     "2. Hide tooltip",
     ["BRAILLE LINE:  'gtk3-demo application Print dialog General page tab Range panel Range &=y Pages: radio 
button'",
      "     VISIBLE:  '&=y Pages: radio button', cursor=1",
-     "SPEECH OUTPUT: 'Pages:.'",
+     "SPEECH OUTPUT: 'Pages:'",
      "SPEECH OUTPUT: 'selected radio button'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
diff --git a/test/keystrokes/oocalc/coordinate_announcement_off.py 
b/test/keystrokes/oocalc/coordinate_announcement_off.py
index d906e3d2b..c55606bd2 100644
--- a/test/keystrokes/oocalc/coordinate_announcement_off.py
+++ b/test/keystrokes/oocalc/coordinate_announcement_off.py
@@ -14,7 +14,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Down to A2 - don't speak cell coordinates",
-    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Good in Pies A2'",
+    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table Good in 
Pies A2'",
      "     VISIBLE:  'Good in Pies A2', cursor=1",
      "SPEECH OUTPUT: 'Good in Pies.'"]))
 
@@ -22,7 +22,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "2. Right to B2 - don't speak cell coordinates",
-    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Yes B2'",
+    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table Yes B2'",
      "     VISIBLE:  'Yes B2', cursor=1",
      "SPEECH OUTPUT: 'Yes.'"]))
 
@@ -30,8 +30,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "3. Control+Home to A1 - don't speak cell coordinates",
-    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table  A1'",
-     "     VISIBLE:  ' A1', cursor=1",
+    ["KNOWN ISSUE: We don't want to show the sheet.",
+     "BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table  A1'",
+     "     VISIBLE:  'Sheet Sheet1 table  A1', cursor=20",
      "SPEECH OUTPUT: 'blank.'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/oocalc/coordinate_announcement_on.py 
b/test/keystrokes/oocalc/coordinate_announcement_on.py
index f0b456c4d..f20f524bb 100644
--- a/test/keystrokes/oocalc/coordinate_announcement_on.py
+++ b/test/keystrokes/oocalc/coordinate_announcement_on.py
@@ -13,25 +13,26 @@ sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "2. Down to A2 - don't speak cell coordinates",
-    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Good in Pies A2'",
+    "2. Down to A2 - speak cell coordinates",
+    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table Good in 
Pies A2'",
      "     VISIBLE:  'Good in Pies A2', cursor=1",
      "SPEECH OUTPUT: 'Good in Pies A2.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
-    "3. Right to B2 - don't speak cell coordinates",
-    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Yes B2'",
+    "3. Right to B2 - speak cell coordinates",
+    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table Yes B2'",
      "     VISIBLE:  'Yes B2', cursor=1",
      "SPEECH OUTPUT: 'Yes B2.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
-    "4. Control+Home to A1 - don't speak cell coordinates",
-    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table  A1'",
-     "     VISIBLE:  ' A1', cursor=1",
+    "4. Control+Home to A1 - speak cell coordinates",
+    ["KNOWN ISSUE: We don't want to show the sheet.",
+     "BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table  A1'",
+     "     VISIBLE:  'Sheet Sheet1 table  A1', cursor=20",
      "SPEECH OUTPUT: 'blank A1.'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/oocalc/document_enter_text.py b/test/keystrokes/oocalc/document_enter_text.py
index c91053413..883e1bcf3 100644
--- a/test/keystrokes/oocalc/document_enter_text.py
+++ b/test/keystrokes/oocalc/document_enter_text.py
@@ -7,35 +7,34 @@ import utils
 
 sequence = MacroSequence()
 
+sequence.append(PauseAction(3000))
+sequence.append(KeyComboAction("Tab"))
+sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
 sequence.append(PauseAction(3000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction("h"))
 sequence.append(utils.AssertPresentationAction(
     "1. Type 'h' - keyecho is off",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Untitled1 
- LibreOffice Spreadsheets Cell A1 panel Paragraph 0 h $l'",
-     "     VISIBLE:  'Paragraph 0 h $l', cursor=14",
-     "SPEECH OUTPUT: 'Cell A1 panel'",
-     "SPEECH OUTPUT: 'Paragraph 0 h'"]))
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Untitled 1 - LibreOffice 
Spreadsheets Cell A1 panel h $l'",
+     "     VISIBLE:  'h $l', cursor=2",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Formula Tool Bar tool bar 
Input line Input line $l h $l'",
+     "     VISIBLE:  'h $l', cursor=1"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "2. Type 'i' - keyecho is off",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Untitled1 
- LibreOffice Spreadsheets Cell A1 panel Paragraph 0 hi $l'",
-     "     VISIBLE:  'Paragraph 0 hi $l', cursor=15",
-     "BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Untitled1 
- LibreOffice Spreadsheets Cell A1 panel Paragraph 0 hi $l'",
-     "     VISIBLE:  'Paragraph 0 hi $l', cursor=15"]))
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Untitled 1 - LibreOffice 
Spreadsheets Cell A1 panel hi $l'",
+     "     VISIBLE:  'hi $l', cursor=3"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "3. Press Return",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Untitled1 
- LibreOffice Spreadsheets Sheet Sheet1 table  A2'",
-     "     VISIBLE:  ' A2', cursor=1",
-     "SPEECH OUTPUT: 'Sheet Sheet1.'",
-     "SPEECH OUTPUT: 'table with 1048576 rows 1024 columns'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Untitled 1 - LibreOffice 
Spreadsheets Sheet Sheet1 table  A2'",
+     "     VISIBLE:  'table  A2', cursor=7",
      "SPEECH OUTPUT: 'blank A2.'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/oocalc/document_enter_text_no_context.py 
b/test/keystrokes/oocalc/document_enter_text_no_context.py
index 630bfdc14..cc64c33ba 100644
--- a/test/keystrokes/oocalc/document_enter_text_no_context.py
+++ b/test/keystrokes/oocalc/document_enter_text_no_context.py
@@ -13,27 +13,31 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction("h"))
 sequence.append(utils.AssertPresentationAction(
     "1. Type 'h' - keyecho is off",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Untitled1 
- LibreOffice Spreadsheets Cell A1 panel Paragraph 0 h $l'",
-     "     VISIBLE:  'Paragraph 0 h $l', cursor=14",
-     "SPEECH OUTPUT: 'Cell A1 panel'",
-     "SPEECH OUTPUT: 'Paragraph 0 h'"]))
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc frame'",
+     "     VISIBLE:  'Untitled 1 - LibreOffice Calc fr', cursor=1",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Untitled 1 - LibreOffice 
Spreadsheets Cell A1 panel h $l'",
+     "     VISIBLE:  'h $l', cursor=2",
+     "SPEECH OUTPUT: 'Untitled 1 - LibreOffice Calc frame'",
+     "SPEECH OUTPUT: 'Cell A1 panel.'",
+     "SPEECH OUTPUT: 'h'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "2. Type 'i' - keyecho is off",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Untitled1 
- LibreOffice Spreadsheets Cell A1 panel Paragraph 0 hi $l'",
-     "     VISIBLE:  'Paragraph 0 hi $l', cursor=15",
-     "BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Untitled1 
- LibreOffice Spreadsheets Cell A1 panel Paragraph 0 hi $l'",
-     "     VISIBLE:  'Paragraph 0 hi $l', cursor=15"]))
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Untitled 1 - LibreOffice 
Spreadsheets Cell A1 panel hi $l'",
+     "     VISIBLE:  'hi $l', cursor=3",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Untitled 1 - LibreOffice 
Spreadsheets Cell A1 panel hi $l'",
+     "     VISIBLE:  'hi $l', cursor=3"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "3. Press Return",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Untitled1 
- LibreOffice Spreadsheets Sheet Sheet1 table  A2'",
-     "     VISIBLE:  ' A2', cursor=1",
+    ["KNOWN ISSUE: We don't want to include the table",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Untitled 1 - LibreOffice 
Spreadsheets Sheet Sheet1 table  A2'",
+     "     VISIBLE:  'table  A2', cursor=7",
      "SPEECH OUTPUT: 'blank A2.'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/oocalc/document_nav_dynamic_headers.py 
b/test/keystrokes/oocalc/document_nav_dynamic_headers.py
index 8f758e642..8a2178cf2 100644
--- a/test/keystrokes/oocalc/document_nav_dynamic_headers.py
+++ b/test/keystrokes/oocalc/document_nav_dynamic_headers.py
@@ -15,7 +15,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Down Arrow to cell A2",
-    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Good in Pies A2'",
+    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table Good in 
Pies A2'",
      "     VISIBLE:  'Good in Pies A2', cursor=1",
      "SPEECH OUTPUT: 'Good in Pies A2.'"]))
 
@@ -23,7 +23,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "2. Right Arrow to cell B2",
-    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Yes B2'",
+    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table Yes B2'",
      "     VISIBLE:  'Yes B2', cursor=1",
      "SPEECH OUTPUT: 'Yes B2.'"]))
 
@@ -31,7 +31,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Down Arrow to cell B3",
-    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Yes B3'",
+    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table Yes B3'",
      "     VISIBLE:  'Yes B3', cursor=1",
      "SPEECH OUTPUT: 'Yes B3.'"]))
 
@@ -39,7 +39,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "4. Right Arrow to cell C3",
-    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Yes C3'",
+    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table Yes C3'",
      "     VISIBLE:  'Yes C3', cursor=1",
      "SPEECH OUTPUT: 'Yes C3.'"]))
 
@@ -47,7 +47,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "5. Basic where am I with no dynamic headers set",
-    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Yes C3'",
+    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table Yes C3'",
      "     VISIBLE:  'Yes C3', cursor=1",
      "SPEECH OUTPUT: 'table cell.'",
      "SPEECH OUTPUT: 'column 3.'",
@@ -72,8 +72,9 @@ sequence.append(KeyComboAction("c"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "7. Set dynamic row headers",
-    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table  A1'",
-     "     VISIBLE:  ' A1', cursor=1",
+    ["KNOWN ISSUE - We don't want to show the sheet here",
+     "BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table  A1'",
+     "     VISIBLE:  'Sheet Sheet1 table  A1', cursor=20",
      "BRAILLE LINE:  'Dynamic row header set for column A'",
      "     VISIBLE:  'Dynamic row header set for colum', cursor=0",
      "SPEECH OUTPUT: 'Dynamic row header set for column A' voice=system"]))
@@ -82,9 +83,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "8. Down Arrow to cell A2",
-    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table  A1'",
-     "     VISIBLE:  ' A1', cursor=1",
-     "BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Good in Pies A2'",
+    ["KNOWN ISSUE - We don't want to show the sheet here",
+     "BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table  A1'",
+     "     VISIBLE:  'Sheet Sheet1 table  A1', cursor=20",
+     "BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table Good in 
Pies A2'",
      "     VISIBLE:  'Good in Pies A2', cursor=1",
      "SPEECH OUTPUT: 'Good in Pies A2.'"]))
 
@@ -92,7 +94,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "9. Right Arrow to cell B2",
-    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Good in Pies Apples Yes B2'",
+    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table Good in 
Pies Apples Yes B2'",
      "     VISIBLE:  'Yes B2', cursor=1",
      "SPEECH OUTPUT: 'Apples Yes B2.'"]))
 
@@ -100,7 +102,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "10. Down Arrow to cell B3",
-    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Juiceable Apples Yes B3'",
+    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table 
Juiceable Apples Yes B3'",
      "     VISIBLE:  'Yes B3', cursor=1",
      "SPEECH OUTPUT: 'Juiceable Yes B3.'"]))
 
@@ -108,7 +110,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "11. Right Arrow to cell C3",
-    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Juiceable Pears Yes C3'",
+    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table 
Juiceable Pears Yes C3'",
      "     VISIBLE:  'Yes C3', cursor=1",
      "SPEECH OUTPUT: 'Pears Yes C3.'"]))
 
@@ -116,7 +118,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "12. Basic where am I with dynamic headers set",
-    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Juiceable Pears Yes C3'",
+    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc root pane Sheet Sheet1 table 
Juiceable Pears Yes C3'",
      "     VISIBLE:  'Yes C3', cursor=1",
      "SPEECH OUTPUT: 'table cell.'",
      "SPEECH OUTPUT: 'column 3.'",
diff --git a/test/keystrokes/oocalc/manage_names_combobox.py b/test/keystrokes/oocalc/manage_names_combobox.py
index 1b0f391d9..a4d65c4fd 100644
--- a/test/keystrokes/oocalc/manage_names_combobox.py
+++ b/test/keystrokes/oocalc/manage_names_combobox.py
@@ -12,10 +12,14 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift><Control>t"))
 sequence.append(utils.AssertPresentationAction(
     "1. Shift+Ctrl+T",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Formula 
Tool Bar tool bar A1 $l combo box'",
-     "     VISIBLE:  'A1 $l combo box', cursor=3",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Formula Tool Bar tool bar 
Name Box A1 $l'",
+     "     VISIBLE:  'Name Box A1 $l', cursor=12",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Formula Tool Bar tool bar 
A1 $l combo box'",
+     "     VISIBLE:  'tool bar A1 $l combo box', cursor=12",
+     "SPEECH OUTPUT: 'A1'",
+     "SPEECH OUTPUT: 'selected'",
      "SPEECH OUTPUT: 'Formula Tool Bar tool bar'",
-     "SPEECH OUTPUT: 'Name Box editable combo box.'",
+     "SPEECH OUTPUT: 'Name Box Name Box editable combo box.'",
      "SPEECH OUTPUT: 'A1 selected'"]))
 
 sequence.append(KeyComboAction("<Control>a"))
@@ -26,17 +30,24 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction("C3"))
 sequence.append(utils.AssertPresentationAction(
     "2. Type 'C3' - keyecho is disabled",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Formula 
Tool Bar tool bar Name Box C $l'",
-     "     VISIBLE:  'C $l', cursor=2",
-     "BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Formula 
Tool Bar tool bar Name Box C3 $l'",
-     "     VISIBLE:  'C3 $l', cursor=3"]))
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Formula Tool Bar tool bar 
Name Box C $l'",
+     "     VISIBLE:  'Name Box C $l', cursor=11",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Formula Tool Bar tool bar 
Name Box C $l'",
+     "     VISIBLE:  'Name Box C $l', cursor=11",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Formula Tool Bar tool bar 
Name Box C3 $l'",
+     "     VISIBLE:  'Name Box C3 $l', cursor=12",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Formula Tool Bar tool bar 
Name Box C3 $l'",
+     "     VISIBLE:  'Name Box C3 $l', cursor=12"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "3. Press Return to jump to C3",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Untitled1 
- LibreOffice Spreadsheets Sheet Sheet1 table  C3'",
-     "     VISIBLE:  ' C3', cursor=1",
+    ["KNOWN ISSUE: We don't want to show the table here",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Untitled 1 - LibreOffice 
Spreadsheets Sheet Sheet1 table'",
+     "     VISIBLE:  'Sheet Sheet1 table', cursor=1",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Untitled 1 - LibreOffice 
Spreadsheets Sheet Sheet1 table  C3'",
+     "     VISIBLE:  'table  C3', cursor=7",
      "SPEECH OUTPUT: 'Sheet Sheet1.'",
      "SPEECH OUTPUT: 'table with 1048576 rows 1024 columns'",
      "SPEECH OUTPUT: 'blank C3.'"]))
diff --git a/test/keystrokes/oocalc/manage_names_combobox_no_context.py 
b/test/keystrokes/oocalc/manage_names_combobox_no_context.py
index 9e2fd7b0b..0f3add60a 100644
--- a/test/keystrokes/oocalc/manage_names_combobox_no_context.py
+++ b/test/keystrokes/oocalc/manage_names_combobox_no_context.py
@@ -12,10 +12,15 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift><Control>t"))
 sequence.append(utils.AssertPresentationAction(
     "1. Shift+Ctrl+T",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Formula 
Tool Bar tool bar A1 $l combo box'",
-     "     VISIBLE:  'A1 $l combo box', cursor=3",
+    ["KNOWN ISSUE: We're speaking the name box twice",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Formula Tool Bar tool bar 
Name Box A1 $l'",
+     "     VISIBLE:  'Name Box A1 $l', cursor=12",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Formula Tool Bar tool bar 
A1 $l combo box'",
+     "     VISIBLE:  'tool bar A1 $l combo box', cursor=12",
+     "SPEECH OUTPUT: 'A1'",
+     "SPEECH OUTPUT: 'selected'",
      "SPEECH OUTPUT: 'Formula Tool Bar tool bar'",
-     "SPEECH OUTPUT: 'Name Box editable combo box.'",
+     "SPEECH OUTPUT: 'Name Box Name Box editable combo box.'",
      "SPEECH OUTPUT: 'A1 selected'"]))
 
 sequence.append(KeyComboAction("<Control>a"))
@@ -26,17 +31,26 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction("C3"))
 sequence.append(utils.AssertPresentationAction(
     "2. Type 'C3' - keyecho is disabled",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Formula 
Tool Bar tool bar Name Box C $l'",
-     "     VISIBLE:  'C $l', cursor=2",
-     "BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Formula 
Tool Bar tool bar Name Box C3 $l'",
-     "     VISIBLE:  'C3 $l', cursor=3"]))
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Formula Tool Bar tool bar 
Name Box C $l'",
+     "     VISIBLE:  'Name Box C $l', cursor=11",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Formula Tool Bar tool bar 
Name Box C $l'",
+     "     VISIBLE:  'Name Box C $l', cursor=11",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Formula Tool Bar tool bar 
Name Box C3 $l'",
+     "     VISIBLE:  'Name Box C3 $l', cursor=12",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Formula Tool Bar tool bar 
Name Box C3 $l'",
+     "     VISIBLE:  'Name Box C3 $l', cursor=12"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "3. Press Return to jump to C3",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Untitled1 
- LibreOffice Spreadsheets Sheet Sheet1 table  C3'",
-     "     VISIBLE:  ' C3', cursor=1",
+    ["KNOWN ISSUE: We don't want to show the table here",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Untitled 1 - LibreOffice 
Spreadsheets Sheet Sheet1 table'",
+     "     VISIBLE:  'Sheet Sheet1 table', cursor=1",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Untitled 1 - LibreOffice 
Spreadsheets Sheet Sheet1 table  C3'",
+     "     VISIBLE:  'table  C3', cursor=7",
+     "SPEECH OUTPUT: 'Sheet Sheet1.'",
+     "SPEECH OUTPUT: 'table with 1048576 rows 1024 columns'",
      "SPEECH OUTPUT: 'blank C3.'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/oocalc/messages_dynamic_headers.py 
b/test/keystrokes/oocalc/messages_dynamic_headers.py
index 07394d1dc..e5e376b5a 100644
--- a/test/keystrokes/oocalc/messages_dynamic_headers.py
+++ b/test/keystrokes/oocalc/messages_dynamic_headers.py
@@ -29,12 +29,13 @@ sequence.append(KeyComboAction("r"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "2. Clear column headers",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Untitled1 
- LibreOffice Spreadsheets Sheet Sheet1 table  A1'",
-     "     VISIBLE:  ' A1', cursor=1",
+    ["KNOWN ISSUE: We don't want to show the table here",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Untitled 1 - LibreOffice 
Spreadsheets Sheet Sheet1 table  A1'",
+     "     VISIBLE:  'table  A1', cursor=7",
      "BRAILLE LINE:  'Dynamic column header set for row 1'",
      "     VISIBLE:  'Dynamic column header set for ro', cursor=0",
-     "BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Untitled1 
- LibreOffice Spreadsheets Sheet Sheet1 table  A1'",
-     "     VISIBLE:  ' A1', cursor=1",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Untitled 1 - LibreOffice 
Spreadsheets Sheet Sheet1 table  A1'",
+     "     VISIBLE:  'table  A1', cursor=7",
      "BRAILLE LINE:  'Dynamic column header cleared.'",
      "     VISIBLE:  'Dynamic column header cleared.', cursor=0",
      "SPEECH OUTPUT: 'Dynamic column header set for row 1' voice=system",
@@ -46,8 +47,9 @@ sequence.append(KeyComboAction("c"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "3. Set row headers",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Untitled1 
- LibreOffice Spreadsheets Sheet Sheet1 table  A1'",
-     "     VISIBLE:  ' A1', cursor=1",
+    ["KNOWN ISSUE: We don't want to show the table here",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Untitled 1 - LibreOffice 
Spreadsheets Sheet Sheet1 table  A1'",
+     "     VISIBLE:  'table  A1', cursor=7",
      "BRAILLE LINE:  'Dynamic row header set for column A'",
      "     VISIBLE:  'Dynamic row header set for colum', cursor=0",
      "SPEECH OUTPUT: 'Dynamic row header set for column A' voice=system"]))
@@ -59,12 +61,13 @@ sequence.append(KeyComboAction("c"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "4. Clear row headers",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Untitled1 
- LibreOffice Spreadsheets Sheet Sheet1 table  A1'",
-     "     VISIBLE:  ' A1', cursor=1",
+    ["KNOWN ISSUE: We don't want to show the table here",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Untitled 1 - LibreOffice 
Spreadsheets Sheet Sheet1 table  A1'",
+     "     VISIBLE:  'table  A1', cursor=7",
      "BRAILLE LINE:  'Dynamic row header set for column A'",
      "     VISIBLE:  'Dynamic row header set for colum', cursor=0",
-     "BRAILLE LINE:  'Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc root pane Untitled1 
- LibreOffice Spreadsheets Sheet Sheet1 table  A1'",
-     "     VISIBLE:  ' A1', cursor=1",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc root pane Untitled 1 - LibreOffice 
Spreadsheets Sheet Sheet1 table  A1'",
+     "     VISIBLE:  'table  A1', cursor=7",
      "BRAILLE LINE:  'Dynamic row header cleared.'",
      "     VISIBLE:  'Dynamic row header cleared.', cursor=0",
      "SPEECH OUTPUT: 'Dynamic row header set for column A' voice=system",
diff --git a/test/keystrokes/oocalc/ui_role_check_menu_item.py 
b/test/keystrokes/oocalc/ui_role_check_menu_item.py
index 62ae134bc..0e1578efb 100644
--- a/test/keystrokes/oocalc/ui_role_check_menu_item.py
+++ b/test/keystrokes/oocalc/ui_role_check_menu_item.py
@@ -11,12 +11,14 @@ sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("<Alt>v"))
 sequence.append(KeyComboAction("Down"))
 sequence.append(KeyComboAction("Down"))
+sequence.append(KeyComboAction("Down"))
+sequence.append(PauseAction(3000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Arrow to the check menu item (checked)",
-    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc frame <x> Formula Bar check menu 
item'",
+    ["BRAILLE LINE:  'soffice application <x> Formula Bar check menu item'",
      "     VISIBLE:  '<x> Formula Bar check menu item', cursor=1",
      "SPEECH OUTPUT: 'Formula Bar check menu item checked.'"]))
 
@@ -24,13 +26,16 @@ sequence.append(KeyComboAction("Return"))
 sequence.append(KeyComboAction("<Alt>v"))
 sequence.append(KeyComboAction("Down"))
 sequence.append(KeyComboAction("Down"))
+sequence.append(KeyComboAction("Down"))
+sequence.append(PauseAction(3000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Arrow to the check menu item (unchecked)",
-    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc frame < > Formula Bar check menu 
item'",
+    ["BRAILLE LINE:  'soffice application View menu < > Formula Bar check menu item'",
      "     VISIBLE:  '< > Formula Bar check menu item', cursor=1",
+     "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: 'Formula Bar check menu item not checked.'"]))
 
 sequence.append(KeyComboAction("Return"))
diff --git a/test/keystrokes/oowriter/document_nav_line.py b/test/keystrokes/oowriter/document_nav_line.py
index 6a1944b82..3580e863f 100644
--- a/test/keystrokes/oowriter/document_nav_line.py
+++ b/test/keystrokes/oowriter/document_nav_line.py
@@ -18,7 +18,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "1. Return to top of document",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document Line 1 $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document Line 1 $l'",
      "     VISIBLE:  'Line 1 $l', cursor=1",
      "SPEECH OUTPUT: 'Line 1'"]))
 
@@ -50,7 +50,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "5. Arrow up to 'Line 1'",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document Line 1 $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document Line 1 $l'",
      "     VISIBLE:  'Line 1 $l', cursor=1",
      "SPEECH OUTPUT: 'Line 1'"]))
 
diff --git a/test/keystrokes/oowriter/document_nav_line_bullets.py 
b/test/keystrokes/oowriter/document_nav_line_bullets.py
index 0b728b48c..7b913b425 100644
--- a/test/keystrokes/oowriter/document_nav_line_bullets.py
+++ b/test/keystrokes/oowriter/document_nav_line_bullets.py
@@ -44,7 +44,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "4. Up to previous bulleted line",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document • Line 1 $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document • Line 1 $l'",
      "     VISIBLE:  '• Line 1 $l', cursor=3",
      "SPEECH OUTPUT: '• Line 1'"]))
 
diff --git a/test/keystrokes/oowriter/document_nav_word.py b/test/keystrokes/oowriter/document_nav_word.py
index d2aede378..87baecaec 100644
--- a/test/keystrokes/oowriter/document_nav_word.py
+++ b/test/keystrokes/oowriter/document_nav_word.py
@@ -19,7 +19,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Right"))
 sequence.append(utils.AssertPresentationAction(
     "1. Next Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=6",
      "SPEECH OUTPUT: 'is '"]))
 
@@ -27,7 +27,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Right"))
 sequence.append(utils.AssertPresentationAction(
     "2. Next Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=9",
      "SPEECH OUTPUT: 'a '"]))
 
@@ -35,7 +35,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Right"))
 sequence.append(utils.AssertPresentationAction(
     "3. Next Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=11",
      "SPEECH OUTPUT: 'test.'"]))
 
@@ -43,7 +43,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Right"))
 sequence.append(utils.AssertPresentationAction(
     "4. Next Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=15",
      "SPEECH OUTPUT: '.'"]))
 
@@ -51,7 +51,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Right"))
 sequence.append(utils.AssertPresentationAction(
     "5. Next Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=16",
      "SPEECH OUTPUT: 'blank' voice=system"]))
 
@@ -67,7 +67,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Left"))
 sequence.append(utils.AssertPresentationAction(
     "7. Previous Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=16",
      "SPEECH OUTPUT: 'blank' voice=system"]))
 
@@ -75,7 +75,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Left"))
 sequence.append(utils.AssertPresentationAction(
     "8. Previous Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=15",
      "SPEECH OUTPUT: '.'"]))
 
@@ -83,7 +83,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Left"))
 sequence.append(utils.AssertPresentationAction(
     "9. Previous Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=11",
      "SPEECH OUTPUT: 'test.'"]))
 
@@ -91,7 +91,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Left"))
 sequence.append(utils.AssertPresentationAction(
     "10. Previous Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=9",
      "SPEECH OUTPUT: 'a '"]))
 
@@ -99,7 +99,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Left"))
 sequence.append(utils.AssertPresentationAction(
     "11. Previous Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=6",
      "SPEECH OUTPUT: 'is '"]))
 
@@ -107,7 +107,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Left"))
 sequence.append(utils.AssertPresentationAction(
     "12. Previous Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=1",
      "SPEECH OUTPUT: 'This '"]))
 
diff --git a/test/keystrokes/oowriter/document_new.py b/test/keystrokes/oowriter/document_new.py
index 3adc9892e..71eb8aee2 100644
--- a/test/keystrokes/oowriter/document_new.py
+++ b/test/keystrokes/oowriter/document_new.py
@@ -6,17 +6,17 @@ from macaroon.playback import *
 import utils
 
 sequence = MacroSequence()
-sequence.append(PauseAction(3000))
+sequence.append(PauseAction(5000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>N"))
-sequence.append(PauseAction(3000))
+sequence.append(PauseAction(5000))
 sequence.append(utils.AssertPresentationAction(
     "New text document",
     ["BRAILLE LINE:  'soffice application Untitled 2 - LibreOffice Writer frame'",
      "     VISIBLE:  'Untitled 2 - LibreOffice Writer ', cursor=1",
-     "BRAILLE LINE:  'Untitled 2 - LibreOffice Writer frame Untitled 2 - LibreOffice Writer root pane 
Untitled2 - LibreOffice Document  $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "BRAILLE LINE:  'soffice application Untitled 2 - LibreOffice Writer root pane Untitled 2 - LibreOffice 
Document  $l'",
+     "     VISIBLE:  'Document  $l', cursor=10",
      "SPEECH OUTPUT: 'Untitled 2 - LibreOffice Writer frame'",
      "SPEECH OUTPUT: 'blank'"]))
 
diff --git a/test/keystrokes/oowriter/flat_review_context_menu.py 
b/test/keystrokes/oowriter/flat_review_context_menu.py
index 2aba4d369..89c8343ed 100644
--- a/test/keystrokes/oowriter/flat_review_context_menu.py
+++ b/test/keystrokes/oowriter/flat_review_context_menu.py
@@ -34,14 +34,6 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
     "4. Review next line",
-    ["BRAILLE LINE:  'Paste Special $l'",
-     "     VISIBLE:  'Paste Special $l', cursor=1",
-     "SPEECH OUTPUT: 'Paste Special'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("KP_9"))
-sequence.append(utils.AssertPresentationAction(
-    "5. Review next line",
     ["BRAILLE LINE:  'separator $l'",
      "     VISIBLE:  'separator $l', cursor=1",
      "SPEECH OUTPUT: 'separator'"]))
@@ -49,7 +41,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
-    "6. Review next line",
+    "5. Review next line",
     ["BRAILLE LINE:  'Character... $l'",
      "     VISIBLE:  'Character... $l', cursor=1",
      "SPEECH OUTPUT: 'Character...'"]))
@@ -57,7 +49,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
-    "7. Review next line",
+    "6. Review next line",
     ["BRAILLE LINE:  'Paragraph... $l'",
      "     VISIBLE:  'Paragraph... $l', cursor=1",
      "SPEECH OUTPUT: 'Paragraph...'"]))
@@ -65,7 +57,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
-    "8. Review next line",
+    "7. Review next line",
     ["BRAILLE LINE:  'Bullets and Numbering... $l'",
      "     VISIBLE:  'Bullets and Numbering... $l', cursor=1",
      "SPEECH OUTPUT: 'Bullets and Numbering...'"]))
@@ -73,7 +65,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
-    "9. Review next line",
+    "8. Review next line",
     ["BRAILLE LINE:  'Page... $l'",
      "     VISIBLE:  'Page... $l', cursor=1",
      "SPEECH OUTPUT: 'Page...'"]))
@@ -81,7 +73,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
-    "10. Review next line",
+    "9. Review next line",
     ["BRAILLE LINE:  'separator $l'",
      "     VISIBLE:  'separator $l', cursor=1",
      "SPEECH OUTPUT: 'separator'"]))
@@ -89,15 +81,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
-    "11. Review next line",
-    ["BRAILLE LINE:  'Edit Style... $l'",
-     "     VISIBLE:  'Edit Style... $l', cursor=1",
-     "SPEECH OUTPUT: 'Edit Style...'"]))
+    "10. Review next line",
+    ["BRAILLE LINE:  'Styles $l'",
+     "     VISIBLE:  'Styles $l', cursor=1",
+     "SPEECH OUTPUT: 'Styles'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
-    "12. Review next line",
+    "11. Review next line",
     [""]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
diff --git a/test/keystrokes/oowriter/flat_review_line_columns.py 
b/test/keystrokes/oowriter/flat_review_line_columns.py
index 7d04f8bd8..50f5ca957 100644
--- a/test/keystrokes/oowriter/flat_review_line_columns.py
+++ b/test/keystrokes/oowriter/flat_review_line_columns.py
@@ -30,7 +30,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Down to menu item",
-    ["BRAILLE LINE:  'soffice application column-example.odt - LibreOffice Writer frame <x> Sidebar check 
menu item'",
+    ["BRAILLE LINE:  'soffice application View menu <x> Sidebar check menu item'",
      "     VISIBLE:  '<x> Sidebar check menu item', cursor=1",
      "SPEECH OUTPUT: 'Sidebar check menu item checked.'"]))
 
@@ -38,10 +38,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "2. Return on menu item",
-    ["KNOWN ISSUE: We're not getting anything other than the window:activate event",
-     "BRAILLE LINE:  'soffice application column-example.odt - LibreOffice Writer frame'",
-     "     VISIBLE:  'column-example.odt - LibreOffice', cursor=1",
-     "SPEECH OUTPUT: 'column-example.odt - LibreOffice Writer frame'"]))
+    ["KNOWN ISSUE: We're not presenting anything here",
+    ""]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -55,7 +53,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "4. Top of file.",
-    ["BRAILLE LINE:  'column-example.odt - LibreOffice Writer frame column-example.odt - LibreOffice Writer 
root pane column-example - LibreOffice Document EFFector Vol. 19, No. 38  October  $l'",
+    ["BRAILLE LINE:  'soffice application column-example.odt - LibreOffice Writer root pane column-example - 
LibreOffice Document EFFector Vol. 19, No. 38  October  $l'",
      "     VISIBLE:  'EFFector Vol. 19, No. 38  Octobe', cursor=1",
      "SPEECH OUTPUT: 'EFFector Vol. 19, No. 38  October '"]))
 
@@ -63,71 +61,73 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_8"))
 sequence.append(utils.AssertPresentationAction(
     "5. Review current line.",
-    ["BRAILLE LINE:  'EFFector Vol. 19, No. 38  October  Intercept Personal  $l'",
+    ["BRAILLE LINE:  'EFFector Vol. 19, No. 38  October  first lawsuit against  $l'",
      "     VISIBLE:  'EFFector Vol. 19, No. 38  Octobe', cursor=1",
-     "SPEECH OUTPUT: 'EFFector Vol. 19, No. 38  October  Intercept Personal ",
+     "SPEECH OUTPUT: 'EFFector Vol. 19, No. 38  October  first lawsuit against ",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_8"))
 sequence.append(utils.AssertPresentationAction(
     "6. Review current line.",
-    ["BRAILLE LINE:  'EFFector Vol. 19, No. 38  October  Intercept Personal  $l'",
+    ["BRAILLE LINE:  'EFFector Vol. 19, No. 38  October  first lawsuit against  $l'",
      "     VISIBLE:  'EFFector Vol. 19, No. 38  Octobe', cursor=1",
-     "SPEECH OUTPUT: 'EFFector Vol. 19, No. 38  October  Intercept Personal ",
+     "SPEECH OUTPUT: 'EFFector Vol. 19, No. 38  October  first lawsuit against ",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
     "7. Review next line.",
-    ["BRAILLE LINE:  '10, 2006  editor eff org Communications $l'",
-     "     VISIBLE:  '10, 2006  editor eff org Communi', cursor=1",
+    ["BRAILLE LINE:  '10, 2006  editor eff org the Department of Justice last  $l'",
+     "     VISIBLE:  '10, 2006  editor eff org the Dep', cursor=1",
      "SPEECH OUTPUT: '10, 2006  editor eff org",
-     " Communications",
-     "'"]))
+     " the Department of Justice last '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
     "8. Review next line.",
-    ["BRAILLE LINE:  '  $l'",
-     "     VISIBLE:  '  $l', cursor=1",
-     "SPEECH OUTPUT: 'white space'"]))
+    ["BRAILLE LINE:  ' week after the FBI failed to  $l'",
+     "     VISIBLE:  ' week after the FBI failed to  $', cursor=1",
+     "SPEECH OUTPUT: '",
+     " week after the FBI failed to ",
+     "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
     "9. Review next line.",
-    ["BRAILLE LINE:  'A Publication of the Electronic  Washington, D.C. - The FLAG  $l'",
+    ["BRAILLE LINE:  'A Publication of the Electronic  respond to a Freedom of  $l'",
      "     VISIBLE:  'A Publication of the Electronic ', cursor=1",
-     "SPEECH OUTPUT: 'A Publication of the Electronic  Washington, D.C. - The FLAG '"]))
+     "SPEECH OUTPUT: 'A Publication of the Electronic  respond to a Freedom of '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_7"))
 sequence.append(utils.AssertPresentationAction(
     "10. Review previous line.",
-    ["BRAILLE LINE:  '  $l'",
-     "     VISIBLE:  '  $l', cursor=1",
-     "SPEECH OUTPUT: 'white space'"]))
+    ["BRAILLE LINE:  ' week after the FBI failed to  $l'",
+     "     VISIBLE:  ' week after the FBI failed to  $', cursor=1",
+     "SPEECH OUTPUT: '",
+     " week after the FBI failed to ",
+     "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_7"))
 sequence.append(utils.AssertPresentationAction(
     "11. Review previous line.",
-    ["BRAILLE LINE:  '10, 2006  editor eff org Communications $l'",
-     "     VISIBLE:  '10, 2006  editor eff org Communi', cursor=1",
+    ["BRAILLE LINE:  '10, 2006  editor eff org the Department of Justice last  $l'",
+     "     VISIBLE:  '10, 2006  editor eff org the Dep', cursor=1",
      "SPEECH OUTPUT: '10, 2006  editor eff org",
-     " Communications",
-     "'"]))
+     " the Department of Justice last '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_7"))
 sequence.append(utils.AssertPresentationAction(
     "12. Review previous line.",
-    ["BRAILLE LINE:  'EFFector Vol. 19, No. 38  October  Intercept Personal  $l'",
+    ["BRAILLE LINE:  'EFFector Vol. 19, No. 38  October  first lawsuit against  $l'",
      "     VISIBLE:  'EFFector Vol. 19, No. 38  Octobe', cursor=1",
-     "SPEECH OUTPUT: 'EFFector Vol. 19, No. 38  October  Intercept Personal ",
+     "SPEECH OUTPUT: 'EFFector Vol. 19, No. 38  October  first lawsuit against ",
      "'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
diff --git a/test/keystrokes/oowriter/flat_review_platform_menubar.py 
b/test/keystrokes/oowriter/flat_review_platform_menubar.py
index c9468ca97..3dd9812e0 100644
--- a/test/keystrokes/oowriter/flat_review_platform_menubar.py
+++ b/test/keystrokes/oowriter/flat_review_platform_menubar.py
@@ -16,13 +16,15 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_7"))
 sequence.append(utils.AssertPresentationAction(
     "1. Review previous line.",
-    [""]))
+    ["BRAILLE LINE:  'File Edit View Insert Format Styles Table Form Tools Window Help $l'",
+     "     VISIBLE:  'File Edit View Insert Format Sty', cursor=1",
+     "SPEECH OUTPUT: 'File Edit View Insert Format Styles Table Form Tools Window Help'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_5"))
 sequence.append(utils.AssertPresentationAction(
     "2. Review current word.",
-    ["BRAILLE LINE:  'File Edit View Insert Format Styles Table Tools Window Help $l'",
+    ["BRAILLE LINE:  'File Edit View Insert Format Styles Table Form Tools Window Help $l'",
      "     VISIBLE:  'File Edit View Insert Format Sty', cursor=1",
      "SPEECH OUTPUT: 'File'"]))
 
@@ -30,31 +32,31 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "3. Review next word.",
-    ["BRAILLE LINE:  'File Edit View Insert Format Styles Table Tools Window Help $l'",
-     "     VISIBLE:  'File Edit View Insert Format Sty', cursor=6",
+    ["BRAILLE LINE:  'File Edit View Insert Format Styles Table Form Tools Window Help $l'",
+     "     VISIBLE:  'Edit View Insert Format Styles T', cursor=1",
      "SPEECH OUTPUT: 'Edit'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_6"))
 sequence.append(utils.AssertPresentationAction(
     "4. Review next word.",
-    ["BRAILLE LINE:  'File Edit View Insert Format Styles Table Tools Window Help $l'",
-     "     VISIBLE:  'File Edit View Insert Format Sty', cursor=11",
+    ["BRAILLE LINE:  'File Edit View Insert Format Styles Table Form Tools Window Help $l'",
+     "     VISIBLE:  'View Insert Format Styles Table ', cursor=1",
      "SPEECH OUTPUT: 'View'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_4"))
 sequence.append(utils.AssertPresentationAction(
     "5. Review previous word.",
-    ["BRAILLE LINE:  'File Edit View Insert Format Styles Table Tools Window Help $l'",
-     "     VISIBLE:  'File Edit View Insert Format Sty', cursor=6",
+    ["BRAILLE LINE:  'File Edit View Insert Format Styles Table Form Tools Window Help $l'",
+     "     VISIBLE:  'Edit View Insert Format Styles T', cursor=1",
      "SPEECH OUTPUT: 'Edit'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_4"))
 sequence.append(utils.AssertPresentationAction(
     "6. Review previous word.",
-    ["BRAILLE LINE:  'File Edit View Insert Format Styles Table Tools Window Help $l'",
+    ["BRAILLE LINE:  'File Edit View Insert Format Styles Table Form Tools Window Help $l'",
      "     VISIBLE:  'File Edit View Insert Format Sty', cursor=1",
      "SPEECH OUTPUT: 'File'"]))
 
@@ -62,7 +64,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_2"))
 sequence.append(utils.AssertPresentationAction(
     "7. Review current char.",
-    ["BRAILLE LINE:  'File Edit View Insert Format Styles Table Tools Window Help $l'",
+    ["BRAILLE LINE:  'File Edit View Insert Format Styles Table Form Tools Window Help $l'",
      "     VISIBLE:  'File Edit View Insert Format Sty', cursor=1",
      "SPEECH OUTPUT: 'F'"]))
 
@@ -71,9 +73,9 @@ sequence.append(KeyComboAction("KP_2"))
 sequence.append(KeyComboAction("KP_2"))
 sequence.append(utils.AssertPresentationAction(
     "8. Spell current char.",
-    ["BRAILLE LINE:  'File Edit View Insert Format Styles Table Tools Window Help $l'",
+    ["BRAILLE LINE:  'File Edit View Insert Format Styles Table Form Tools Window Help $l'",
      "     VISIBLE:  'File Edit View Insert Format Sty', cursor=1",
-     "BRAILLE LINE:  'File Edit View Insert Format Styles Table Tools Window Help $l'",
+     "BRAILLE LINE:  'File Edit View Insert Format Styles Table Form Tools Window Help $l'",
      "     VISIBLE:  'File Edit View Insert Format Sty', cursor=1",
      "SPEECH OUTPUT: 'F'",
      "SPEECH OUTPUT: 'foxtrot'"]))
@@ -84,11 +86,11 @@ sequence.append(KeyComboAction("KP_2"))
 sequence.append(KeyComboAction("KP_2"))
 sequence.append(utils.AssertPresentationAction(
     "9. Unicode for current char.",
-    ["BRAILLE LINE:  'File Edit View Insert Format Styles Table Tools Window Help $l'",
+    ["BRAILLE LINE:  'File Edit View Insert Format Styles Table Form Tools Window Help $l'",
      "     VISIBLE:  'File Edit View Insert Format Sty', cursor=1",
-     "BRAILLE LINE:  'File Edit View Insert Format Styles Table Tools Window Help $l'",
+     "BRAILLE LINE:  'File Edit View Insert Format Styles Table Form Tools Window Help $l'",
      "     VISIBLE:  'File Edit View Insert Format Sty', cursor=1",
-     "BRAILLE LINE:  'File Edit View Insert Format Styles Table Tools Window Help $l'",
+     "BRAILLE LINE:  'File Edit View Insert Format Styles Table Form Tools Window Help $l'",
      "     VISIBLE:  'File Edit View Insert Format Sty', cursor=1",
      "SPEECH OUTPUT: 'F'",
      "SPEECH OUTPUT: 'foxtrot'",
diff --git a/test/keystrokes/oowriter/say_all.py b/test/keystrokes/oowriter/say_all.py
index c1de7b982..8f2a9d1e0 100644
--- a/test/keystrokes/oowriter/say_all.py
+++ b/test/keystrokes/oowriter/say_all.py
@@ -20,7 +20,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "1. Return to top of document",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document Line 1 $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document Line 1 $l'",
      "     VISIBLE:  'Line 1 $l', cursor=1",
      "SPEECH OUTPUT: 'Line 1'"]))
 
diff --git a/test/keystrokes/oowriter/selection_word.py b/test/keystrokes/oowriter/selection_word.py
index 917da3982..5dda0f7c3 100644
--- a/test/keystrokes/oowriter/selection_word.py
+++ b/test/keystrokes/oowriter/selection_word.py
@@ -17,7 +17,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control><Shift>Right"))
 sequence.append(utils.AssertPresentationAction(
     "1. Select Next Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=6",
      "SPEECH OUTPUT: 'This '",
      "SPEECH OUTPUT: 'selected' voice=system"]))
@@ -26,7 +26,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control><Shift>Right"))
 sequence.append(utils.AssertPresentationAction(
     "2. Select Next Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=9",
      "SPEECH OUTPUT: 'is '",
      "SPEECH OUTPUT: 'selected' voice=system"]))
@@ -35,7 +35,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control><Shift>Right"))
 sequence.append(utils.AssertPresentationAction(
     "3. Select Next Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=11",
      "SPEECH OUTPUT: 'a '",
      "SPEECH OUTPUT: 'selected' voice=system"]))
@@ -44,7 +44,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control><Shift>Right"))
 sequence.append(utils.AssertPresentationAction(
     "4. Select Next Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=15",
      "SPEECH OUTPUT: 'test'",
      "SPEECH OUTPUT: 'selected' voice=system"]))
@@ -53,7 +53,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control><Shift>Right"))
 sequence.append(utils.AssertPresentationAction(
     "5. Select Next Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=16",
      "SPEECH OUTPUT: 'dot'",
      "SPEECH OUTPUT: 'selected' voice=system"]))
@@ -62,7 +62,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control><Shift>Left"))
 sequence.append(utils.AssertPresentationAction(
     "6. Unselect Previous Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=15",
      "SPEECH OUTPUT: 'dot'",
      "SPEECH OUTPUT: 'unselected' voice=system"]))
@@ -71,7 +71,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control><Shift>Left"))
 sequence.append(utils.AssertPresentationAction(
     "7. Unselect Previous Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=11",
      "SPEECH OUTPUT: 'test'",
      "SPEECH OUTPUT: 'unselected' voice=system"]))
@@ -80,7 +80,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control><Shift>Left"))
 sequence.append(utils.AssertPresentationAction(
     "8. Unselect Previous Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=9",
      "SPEECH OUTPUT: 'a '",
      "SPEECH OUTPUT: 'unselected' voice=system"]))
@@ -89,7 +89,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control><Shift>Left"))
 sequence.append(utils.AssertPresentationAction(
     "9. Unselect Previous Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=6",
      "SPEECH OUTPUT: 'is '",
      "SPEECH OUTPUT: 'unselected' voice=system"]))
@@ -98,7 +98,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control><Shift>Left"))
 sequence.append(utils.AssertPresentationAction(
     "10. Unselect Previous Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=1",
      "SPEECH OUTPUT: 'This '",
      "SPEECH OUTPUT: 'unselected' voice=system"]))
@@ -107,7 +107,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>End"))
 sequence.append(utils.AssertPresentationAction(
     "11. Move to end of document",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  ' This is a test. $l', cursor=1",
      "BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
@@ -157,7 +157,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control><Shift>Left"))
 sequence.append(utils.AssertPresentationAction(
     "16. Select Previous Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=15",
      "SPEECH OUTPUT: 'dot'",
      "SPEECH OUTPUT: 'selected' voice=system"]))
@@ -166,7 +166,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control><Shift>Left"))
 sequence.append(utils.AssertPresentationAction(
     "17. Select Previous Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=11",
      "SPEECH OUTPUT: 'test'",
      "SPEECH OUTPUT: 'selected' voice=system"]))
@@ -175,7 +175,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control><Shift>Right"))
 sequence.append(utils.AssertPresentationAction(
     "18. Unselect Next Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=15",
      "SPEECH OUTPUT: 'test'",
      "SPEECH OUTPUT: 'unselected' voice=system"]))
@@ -184,7 +184,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control><Shift>Right"))
 sequence.append(utils.AssertPresentationAction(
     "19. Unselect Next Word",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Untitled 1 - LibreOffice 
Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=16",
      "SPEECH OUTPUT: 'dot'",
      "SPEECH OUTPUT: 'unselected' voice=system"]))
diff --git a/test/keystrokes/oowriter/spellcheck.py b/test/keystrokes/oowriter/spellcheck.py
index 8ad53f00c..09500f90b 100644
--- a/test/keystrokes/oowriter/spellcheck.py
+++ b/test/keystrokes/oowriter/spellcheck.py
@@ -19,9 +19,24 @@ sequence.append(KeyComboAction("F7"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "1. Enter F7 to bring up the spell checking dialog",
-    ["KNOWN ISSUE: LibreOffice broke accessibility for multiline text fields so we don't present the error.",
-     "SPEECH OUTPUT: 'Spelling: English (USA) frame'",
-     "SPEECH OUTPUT: 'Spelling: English (USA)'",
+    ["SPEECH OUTPUT: 'Spelling: English (USA) frame'",
+     "SPEECH OUTPUT: 'Misspelled word: quuuiick'",
+     "SPEECH OUTPUT: 'q'",
+     "SPEECH OUTPUT: 'u'",
+     "SPEECH OUTPUT: 'u'",
+     "SPEECH OUTPUT: 'u'",
+     "SPEECH OUTPUT: 'i'",
+     "SPEECH OUTPUT: 'i'",
+     "SPEECH OUTPUT: 'c'",
+     "SPEECH OUTPUT: 'k'",
+     "SPEECH OUTPUT: 'Suggestions quick'",
+     "SPEECH OUTPUT: 'q'",
+     "SPEECH OUTPUT: 'u'",
+     "SPEECH OUTPUT: 'i'",
+     "SPEECH OUTPUT: 'c'",
+     "SPEECH OUTPUT: 'k'",
+     "SPEECH OUTPUT: 'Context is The quuuiick brown fox'",
+     "SPEECH OUTPUT: 'Spelling: English (USA) dialog'",
      "SPEECH OUTPUT: 'Correct push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -29,10 +44,13 @@ sequence.append(KeyComboAction("<Alt>I"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "2. Alt I to ignore the first error and present the next",
-    ["SPEECH OUTPUT: 'Suggestions'",
-     "SPEECH OUTPUT: 'overt.'"]))
+    ["SPEECH OUTPUT: 'Suggestions overt'",
+     "SPEECH OUTPUT: 'o'",
+     "SPEECH OUTPUT: 'v'",
+     "SPEECH OUTPUT: 'e'",
+     "SPEECH OUTPUT: 'r'",
+     "SPEECH OUTPUT: 't'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
-
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/spoken_indentation.py b/test/keystrokes/oowriter/spoken_indentation.py
index 2970765a2..98b92cef3 100644
--- a/test/keystrokes/oowriter/spoken_indentation.py
+++ b/test/keystrokes/oowriter/spoken_indentation.py
@@ -9,6 +9,7 @@ sequence = MacroSequence()
 
 sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("<Control>Home"))
+sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyComboAction("Tab"))
 sequence.append(TypeAction("   This is a test."))
diff --git a/test/keystrokes/oowriter/structural_nav_table.py 
b/test/keystrokes/oowriter/structural_nav_table.py
index 8f24da0a1..895b23ace 100644
--- a/test/keystrokes/oowriter/structural_nav_table.py
+++ b/test/keystrokes/oowriter/structural_nav_table.py
@@ -85,8 +85,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Row 3, column 4.', cursor=0",
      "BRAILLE LINE:  'Cell spans 2 columns'",
      "     VISIBLE:  'Cell spans 2 columns', cursor=0",
-     "SPEECH OUTPUT: '6",
-     "7.'",
+     "SPEECH OUTPUT: '6 7.'",
      "SPEECH OUTPUT: 'Row 3, column 4.' voice=system",
      "SPEECH OUTPUT: 'Cell spans 2 columns' voice=system"]))
 
@@ -94,7 +93,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt><Shift>Up"))
 sequence.append(utils.AssertPresentationAction(
     "7. Alt Shift Up.",
-    ["BRAILLE LINE:  '6 $l'",
+    ["KNOWN ISSUE: We're not presenting the 'blank'",
+     "BRAILLE LINE:  '6 $l'",
      "     VISIBLE:  '6 $l', cursor=1",
      "BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
@@ -130,7 +130,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt><Shift>End"))
 sequence.append(utils.AssertPresentationAction(
     "10. Alt Shift End.",
-    ["BRAILLE LINE:  'Wed $l'",
+    ["KNOWN ISSUE: We're not presenting the 'blank'",
+     "BRAILLE LINE:  'Wed $l'",
      "     VISIBLE:  'Wed $l', cursor=1",
      "BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
@@ -188,7 +189,7 @@ sequence.append(utils.AssertPresentationAction(
     "15. Up Arrow out of table.",
     ["BRAILLE LINE:  'Sun $l'",
      "     VISIBLE:  'Sun $l', cursor=1",
-     "BRAILLE LINE:  'table-sample2.odt - LibreOffice Writer frame table-sample2.odt - LibreOffice Writer 
root pane table-sample2 - LibreOffice Document This is a test. $l'",
+     "BRAILLE LINE:  'soffice application table-sample2.odt - LibreOffice Writer root pane table-sample2 - 
LibreOffice Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=16",
      "SPEECH OUTPUT: 'leaving table.'",
      "SPEECH OUTPUT: 'This is a test.'"]))
@@ -207,7 +208,7 @@ sequence.append(KeyComboAction("z"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "17. Toggle structural navigation off",
-    ["BRAILLE LINE:  'table-sample2.odt - LibreOffice Writer frame table-sample2.odt - LibreOffice Writer 
root pane table-sample2 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'soffice application table-sample2.odt - LibreOffice Writer root pane table-sample2 - 
LibreOffice Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=16",
      "BRAILLE LINE:  'Structural navigation keys off.'",
      "     VISIBLE:  'Structural navigation keys off.', cursor=0",
diff --git a/test/keystrokes/oowriter/table_cell_row.py b/test/keystrokes/oowriter/table_cell_row.py
index 270cf5d69..bbb2787a6 100644
--- a/test/keystrokes/oowriter/table_cell_row.py
+++ b/test/keystrokes/oowriter/table_cell_row.py
@@ -11,6 +11,10 @@ sequence.append(PauseAction(5000))
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(KeyComboAction("Down"))
 sequence.append(KeyComboAction("Down"))
+sequence.append(KeyComboAction("Down"))
+sequence.append(KeyComboAction("Down"))
+sequence.append(KeyComboAction("Up"))
+sequence.append(KeyComboAction("Up"))
 sequence.append(PauseAction(5000))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/oowriter/text_attributes.py b/test/keystrokes/oowriter/text_attributes.py
index bda0c4435..a2df9760c 100644
--- a/test/keystrokes/oowriter/text_attributes.py
+++ b/test/keystrokes/oowriter/text_attributes.py
@@ -7,6 +7,7 @@ from macaroon.playback import *
 sequence = MacroSequence()
 import utils
 
+sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("<Control>b"))
 sequence.append(TypeAction("Bold"))
 sequence.append(KeyComboAction("<Control>b"))
@@ -16,6 +17,7 @@ sequence.append(TypeAction("Italic"))
 sequence.append(KeyComboAction("<Control>i"))
 sequence.append(TypeAction(" Normal"))
 sequence.append(KeyComboAction("<Control>Home"))
+sequence.append(PauseAction(3000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyPressAction(0, None, "KP_Insert"))
@@ -30,6 +32,7 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'foreground color: black' voice=system",
      "SPEECH OUTPUT: 'background color: white' voice=system"]))
 
+sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("<Control>Right"))
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyPressAction(0, None, "KP_Insert"))
@@ -44,6 +47,7 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'foreground color: black' voice=system",
      "SPEECH OUTPUT: 'background color: white' voice=system"]))
 
+sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("<Control>Right"))
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyPressAction(0, None, "KP_Insert"))
diff --git a/test/keystrokes/oowriter/ui_find.py b/test/keystrokes/oowriter/ui_find.py
index a307b0a18..ce359e71a 100644
--- a/test/keystrokes/oowriter/ui_find.py
+++ b/test/keystrokes/oowriter/ui_find.py
@@ -12,10 +12,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>f"))
 sequence.append(utils.AssertPresentationAction(
     "1. Ctrl+F",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane Find 
tool bar  $l combo box'",
-     "     VISIBLE:  ' $l combo box', cursor=1",
+    ["KNOWN ISSUE: We're double-presenting the combobox name",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Find tool bar  $l combo 
box'",
+     "     VISIBLE:  'Find tool bar  $l combo box', cursor=15",
      "SPEECH OUTPUT: 'Find tool bar'",
-     "SPEECH OUTPUT: 'Find Text editable combo box.'"]))
+     "SPEECH OUTPUT: 'Find Text Find Text editable combo box.'"]))
 
 sequence.append(TypeAction("foo"))
 
@@ -23,7 +24,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "2. Tab",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane Find 
tool bar Find Previous push button'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Find tool bar  $l combo 
box'",
      "     VISIBLE:  'Find Previous push button', cursor=1",
      "SPEECH OUTPUT: 'Find Previous push button'"]))
 
@@ -31,9 +32,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
 sequence.append(utils.AssertPresentationAction(
     "3. Shift+Tab",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane Find 
tool bar foo $l combo box'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Find tool bar Find 
Previous push button'",
      "     VISIBLE:  'foo $l combo box', cursor=4",
-     "SPEECH OUTPUT: 'Find Text editable combo box.'",
+     "SPEECH OUTPUT: 'Find Text Find Text editable combo box.'",
      "SPEECH OUTPUT: 'foo selected'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
diff --git a/test/keystrokes/oowriter/ui_navigator.py b/test/keystrokes/oowriter/ui_navigator.py
index da8cb0621..177cae9c8 100644
--- a/test/keystrokes/oowriter/ui_navigator.py
+++ b/test/keystrokes/oowriter/ui_navigator.py
@@ -15,9 +15,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Down arrow to the next item",
-    ["BRAILLE LINE:  'Navigator frame Navigator panel Content Navigation View tree Tables collapsed'",
+    ["BRAILLE LINE:  'soffice application Navigator panel Content Navigation View tree Tables collapsed'",
      "     VISIBLE:  'Tables collapsed', cursor=1",
-     "SPEECH OUTPUT: 'Navigator panel'",
      "SPEECH OUTPUT: 'Tables.'",
      "SPEECH OUTPUT: 'collapsed.'"]))
 
@@ -25,7 +24,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Right"))
 sequence.append(utils.AssertPresentationAction(
     "2. Expand it",
-    ["BRAILLE LINE:  'Navigator frame Navigator panel Content Navigation View tree Tables expanded'",
+    ["BRAILLE LINE:  'soffice application Navigator panel Content Navigation View tree Tables expanded'",
      "     VISIBLE:  'Tables expanded', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
@@ -33,7 +32,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Left"))
 sequence.append(utils.AssertPresentationAction(
     "3. Collapse it",
-    ["BRAILLE LINE:  'Navigator frame Navigator panel Content Navigation View tree Tables collapsed'",
+    ["BRAILLE LINE:  'soffice application Navigator panel Content Navigation View tree Tables collapsed'",
      "     VISIBLE:  'Tables collapsed', cursor=1",
      "SPEECH OUTPUT: 'collapsed'"]))
 
@@ -41,7 +40,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Down arrow to the next item",
-    ["BRAILLE LINE:  'Navigator frame Navigator panel Content Navigation View tree Text frames'",
+    ["BRAILLE LINE:  'soffice application Navigator panel Content Navigation View tree Text frames'",
      "     VISIBLE:  'Text frames', cursor=1",
      "SPEECH OUTPUT: 'Text frames.'"]))
 
diff --git a/test/keystrokes/oowriter/ui_role_combo_box.py b/test/keystrokes/oowriter/ui_role_combo_box.py
index af81328bd..20d932ea8 100644
--- a/test/keystrokes/oowriter/ui_role_combo_box.py
+++ b/test/keystrokes/oowriter/ui_role_combo_box.py
@@ -30,7 +30,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Move to Strikethrough",
-    ["BRAILLE LINE:  'Character dialog Font Effects page tab Strikethrough: (Without) combo box'",
+    ["BRAILLE LINE:  'soffice application Character dialog Font Effects page tab Strikethrough: (Without) 
combo box'",
      "     VISIBLE:  'Strikethrough: (Without) combo b', cursor=16",
      "SPEECH OUTPUT: 'Strikethrough: (Without) combo box.'"]))
 
@@ -38,17 +38,20 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down Arrow",
-    ["BRAILLE LINE:  'Character dialog Font Effects page tab Strikethrough: Single combo box Single list 
item'",
+    ["KNOWN ISSUE: We seem to be presenting extra context here",
+     "BRAILLE LINE:  'soffice application Character dialog Font Effects page tab Strikethrough: Single combo 
box Single list item'",
      "     VISIBLE:  'Single list item', cursor=1",
+     "SPEECH OUTPUT: 'Character dialog'",
+     "SPEECH OUTPUT: 'Font Effects page tab.'",
      "SPEECH OUTPUT: 'Single.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "3. Up Arrow",
-    ["BRAILLE LINE:  'Character dialog Font Effects page tab Strikethrough: (Without) combo box (Without) 
list item'",
+    ["BRAILLE LINE:  'soffice application Character dialog Font Effects page tab Strikethrough: (Without) 
combo box (Without) list item'",
      "     VISIBLE:  '(Without) list item', cursor=1",
-     "SPEECH OUTPUT: '(Without).'"]))
+     "SPEECH OUTPUT: '(Without)'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
 
diff --git a/test/keystrokes/oowriter/ui_role_label.py b/test/keystrokes/oowriter/ui_role_label.py
index 4d487936c..a55d927b8 100644
--- a/test/keystrokes/oowriter/ui_role_label.py
+++ b/test/keystrokes/oowriter/ui_role_label.py
@@ -19,7 +19,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Down arrow to the first item",
-    ["BRAILLE LINE:  'Agenda Wizard dialog Steps panel General information'",
+    ["BRAILLE LINE:  'soffice application Agenda Wizard dialog Steps panel General information'",
      "     VISIBLE:  'General information', cursor=1",
      "SPEECH OUTPUT: 'General information.'"]))
 
@@ -27,7 +27,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down arrow to the next item",
-    ["BRAILLE LINE:  'Agenda Wizard dialog Steps panel Headings to include'",
+    ["BRAILLE LINE:  'soffice application Agenda Wizard dialog Steps panel Headings to include'",
      "     VISIBLE:  'Headings to include', cursor=1",
      "SPEECH OUTPUT: 'Headings to include.'"]))
 
@@ -35,7 +35,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Down arrow to the next item",
-    ["BRAILLE LINE:  'Agenda Wizard dialog Steps panel Names'",
+    ["BRAILLE LINE:  'soffice application Agenda Wizard dialog Steps panel Names'",
      "     VISIBLE:  'Names', cursor=1",
      "SPEECH OUTPUT: 'Names.'"]))
 
diff --git a/test/keystrokes/oowriter/ui_role_list_item.py b/test/keystrokes/oowriter/ui_role_list_item.py
index 629004472..ecaf43739 100644
--- a/test/keystrokes/oowriter/ui_role_list_item.py
+++ b/test/keystrokes/oowriter/ui_role_list_item.py
@@ -17,32 +17,35 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to combo box",
-    ["BRAILLE LINE:  'Templates dialog All Categories combo box'",
+    ["BRAILLE LINE:  'soffice application Templates dialog All Categories combo box'",
      "     VISIBLE:  'All Categories combo box', cursor=1",
-     "SPEECH OUTPUT: 'All Categories combo box.'"]))
+     "SPEECH OUTPUT: 'Filter by Category All Categories combo box.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "2. Tab to list item",
-    ["KNOWN ISSUE: When the list gains focus, we get no events for it or the selected list item.",
-     ""]))
+    ["BRAILLE LINE:  'soffice application Templates dialog Template List panel list Modern business letter 
sans-serif list item'",
+     "     VISIBLE:  'Modern business letter sans-seri', cursor=1",
+     "SPEECH OUTPUT: 'Template List panel.'",
+     "SPEECH OUTPUT: 'List with 7 items.'",
+     "SPEECH OUTPUT: 'Modern business letter sans-serif.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "3. Right to next list item",
-    ["BRAILLE LINE:  'Templates dialog list \"Modern\" business letter list item'",
-     "     VISIBLE:  '\"Modern\" business letter list it', cursor=1",
-     "SPEECH OUTPUT: '\"Modern\" business letter.'"]))
+    ["BRAILLE LINE:  'soffice application Templates dialog Template List panel list Modern business letter 
serif list item'",
+     "     VISIBLE:  'Modern business letter serif lis', cursor=1",
+     "SPEECH OUTPUT: 'Modern business letter serif.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "4. Left to previous list item",
-    ["BRAILLE LINE:  'Templates dialog list \"Moderate\" business letter list item'",
-     "     VISIBLE:  '\"Moderate\" business letter list ', cursor=1",
-     "SPEECH OUTPUT: '\"Moderate\" business letter.'"]))
+    ["BRAILLE LINE:  'soffice application Templates dialog Template List panel list Modern business letter 
sans-serif list item'",
+     "     VISIBLE:  'Modern business letter sans-seri', cursor=1",
+     "SPEECH OUTPUT: 'Modern business letter sans-serif.'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
 
diff --git a/test/keystrokes/oowriter/ui_role_menu.py b/test/keystrokes/oowriter/ui_role_menu.py
index 61537163b..9c521ccef 100644
--- a/test/keystrokes/oowriter/ui_role_menu.py
+++ b/test/keystrokes/oowriter/ui_role_menu.py
@@ -14,9 +14,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction("w"))
 sequence.append(utils.AssertPresentationAction(
     "1. Open the Wizards submenu",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Wizards menu'",
-     "     VISIBLE:  'Wizards menu', cursor=1",
-     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame File menu Letter...'",
+    ["BRAILLE LINE:  'soffice application Wizards menu'",
+     "     VISIBLE:  'soffice application Wizards menu', cursor=21",
+     "BRAILLE LINE:  'soffice application File menu Letter...'",
      "     VISIBLE:  'Letter...', cursor=1",
      "SPEECH OUTPUT: 'Wizards menu.'",
      "SPEECH OUTPUT: 'Letter...'"]))
diff --git a/test/keystrokes/oowriter/ui_role_menu_flat_review.py 
b/test/keystrokes/oowriter/ui_role_menu_flat_review.py
index b01ff629a..4d8e634ac 100644
--- a/test/keystrokes/oowriter/ui_role_menu_flat_review.py
+++ b/test/keystrokes/oowriter/ui_role_menu_flat_review.py
@@ -7,24 +7,25 @@ import utils
 
 sequence = MacroSequence()
 
-sequence.append(PauseAction(3000))
+sequence.append(PauseAction(5000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>v"))
 sequence.append(utils.AssertPresentationAction(
     "1. Initial menu and menu item",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame View menu'",
-     "     VISIBLE:  'View menu', cursor=1",
-     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame &=y Normal radio menu item'",
+    ["BRAILLE LINE:  'soffice application View menu'",
+     "     VISIBLE:  'soffice application View menu', cursor=21",
+     "BRAILLE LINE:  'soffice application View menu &=y Normal radio menu item'",
      "     VISIBLE:  '&=y Normal radio menu item', cursor=1",
      "SPEECH OUTPUT: 'View menu.'",
+     "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: 'Normal selected radio menu item'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame & y Web radio menu item'",
+    ["BRAILLE LINE:  'soffice application View menu & y Web radio menu item'",
      "     VISIBLE:  '& y Web radio menu item', cursor=1",
      "SPEECH OUTPUT: 'Web not selected radio menu item'"]))
 
@@ -44,6 +45,8 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'separator $l', cursor=1",
      "SPEECH OUTPUT: 'separator'"]))
 
+sequence.append(KeyComboAction("KP_9"))
+
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
diff --git a/test/keystrokes/oowriter/ui_role_toolbar.py b/test/keystrokes/oowriter/ui_role_toolbar.py
index 34a370b8c..996f56fdc 100644
--- a/test/keystrokes/oowriter/ui_role_toolbar.py
+++ b/test/keystrokes/oowriter/ui_role_toolbar.py
@@ -8,12 +8,13 @@ import utils
 sequence = MacroSequence()
 sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("F6"))
+sequence.append(PauseAction(3000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("F6"))
 sequence.append(utils.AssertPresentationAction(
     "1. F6 to Standard toolbar",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Standard tool bar New push button'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Standard tool bar New 
push button'",
      "     VISIBLE:  'New push button', cursor=1",
      "SPEECH OUTPUT: 'Standard tool bar'",
      "SPEECH OUTPUT: 'New push button'"]))
@@ -22,7 +23,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "2. Right Arrow to Open button",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Standard tool bar Open push button'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Standard tool bar Open 
push button'",
      "     VISIBLE:  'Open push button', cursor=1",
      "SPEECH OUTPUT: 'Open push button'"]))
 
@@ -30,7 +31,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "3. Right Arrow to Save button",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Standard tool bar Save push button'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Standard tool bar Save 
push button'",
      "     VISIBLE:  'Save push button', cursor=1",
      "SPEECH OUTPUT: 'Save push button'"]))
 
@@ -38,10 +39,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("F6"))
 sequence.append(utils.AssertPresentationAction(
     "4. F6 to next toolbar",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar Default Style $l combo box'",
+    ["KNOWN ISSUE: We're double-speaking the combobox name",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar 
Default Style $l combo box'",
      "     VISIBLE:  'Default Style $l combo box', cursor=1",
      "SPEECH OUTPUT: 'Formatting tool bar'",
-     "SPEECH OUTPUT: 'Apply Paragraph Style editable combo box.'",
+     "SPEECH OUTPUT: 'Paragraph Style Paragraph Style editable combo box.'",
      "SPEECH OUTPUT: 'Default Style'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -49,24 +51,25 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "5. Tab to next item",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar Update Style push button'",
-     "     VISIBLE:  'Update Style push button', cursor=1",
-     "SPEECH OUTPUT: 'Update Style push button'"]))
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar 
Update push button'",
+     "     VISIBLE:  'Update push button', cursor=1",
+     "SPEECH OUTPUT: 'Update push button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
 sequence.append(utils.AssertPresentationAction(
     "6. Shift+Tab to return to the former widget",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar Default Style $l combo box'",
+    ["KNOWN ISSUE: We're double-speaking the combobox name",
+     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar 
Default Style $l combo box'",
      "     VISIBLE:  'Default Style $l combo box', cursor=1",
-     "SPEECH OUTPUT: 'Apply Paragraph Style editable combo box.'",
+     "SPEECH OUTPUT: 'Paragraph Style Paragraph Style editable combo box.'",
      "SPEECH OUTPUT: 'Default Style'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "7. Down in Apply Style (Collapsed)",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar Text Body list item'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar Text 
Body list item'",
      "     VISIBLE:  'Text Body list item', cursor=1",
      "SPEECH OUTPUT: 'Text Body.'"]))
 
@@ -74,7 +77,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "8. Down in Apply Style (Collapsed)",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar Quotations list item'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar 
Quotations list item'",
      "     VISIBLE:  'Quotations list item', cursor=1",
      "SPEECH OUTPUT: 'Quotations.'"]))
 
@@ -89,7 +92,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "10. Down in Apply Style (Expanded)",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar  combo boxTitle $l Title list item'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar  
combo boxTitle $l Title list item'",
      "     VISIBLE:  'Title list item', cursor=1",
      "SPEECH OUTPUT: 'Title.'"]))
 
@@ -97,7 +100,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "11. Down in Apply Style (Expanded)",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar  combo boxSubtitle $l Subtitle list item'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar  
combo boxSubtitle $l Subtitle list item'",
      "     VISIBLE:  'Subtitle list item', cursor=1",
      "SPEECH OUTPUT: 'Subtitle.'"]))
 
@@ -105,7 +108,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "12. Up in Apply Style (Expanded)",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar  combo boxTitle $l Title list item'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar  
combo boxTitle $l Title list item'",
      "     VISIBLE:  'Title list item', cursor=1",
      "SPEECH OUTPUT: 'Title.'"]))
 
@@ -120,74 +123,74 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "14. Tab to next widget",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar Update Style push button'",
-     "     VISIBLE:  'Update Style push button', cursor=1",
-     "SPEECH OUTPUT: 'Update Style push button'"]))
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar 
Update push button'",
+     "     VISIBLE:  'Update push button', cursor=1",
+     "SPEECH OUTPUT: 'Update push button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "15. Tab to next widget",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar New Style push button'",
-     "     VISIBLE:  'New Style push button', cursor=1",
-     "SPEECH OUTPUT: 'New Style push button'"]))
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar New 
push button'",
+     "     VISIBLE:  'New push button', cursor=1",
+     "SPEECH OUTPUT: 'New push button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "16. Tab to next widget",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar Liberation Sans $l combo box'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar 
Liberation Sans $l combo box'",
      "     VISIBLE:  'Liberation Sans $l combo box', cursor=1",
-     "SPEECH OUTPUT: 'Font Name editable combo box.'",
+     "SPEECH OUTPUT: 'Font Name Liberation Sans editable combo box.'",
      "SPEECH OUTPUT: 'Liberation Sans'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
 sequence.append(utils.AssertPresentationAction(
     "17. Shift+Tab to return to the previous widget",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar New Style push button'",
-     "     VISIBLE:  'New Style push button', cursor=1",
-     "SPEECH OUTPUT: 'New Style push button'"]))
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar New 
push button'",
+     "     VISIBLE:  'New push button', cursor=1",
+     "SPEECH OUTPUT: 'New push button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
 sequence.append(utils.AssertPresentationAction(
     "18. Shift+Tab to return to the previous widget",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar Update Style push button'",
-     "     VISIBLE:  'Update Style push button', cursor=1",
-     "SPEECH OUTPUT: 'Update Style push button'"]))
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar 
Update push button'",
+     "     VISIBLE:  'Update push button', cursor=1",
+     "SPEECH OUTPUT: 'Update push button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "19. Tab to next widget",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar New Style push button'",
-     "     VISIBLE:  'New Style push button', cursor=1",
-     "SPEECH OUTPUT: 'New Style push button'"]))
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar New 
push button'",
+     "     VISIBLE:  'New push button', cursor=1",
+     "SPEECH OUTPUT: 'New push button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "20. Tab to next widget",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar Liberation Sans $l combo box'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar 
Liberation Sans $l combo box'",
      "     VISIBLE:  'Liberation Sans $l combo box', cursor=1",
-     "SPEECH OUTPUT: 'Font Name editable combo box.'",
+     "SPEECH OUTPUT: 'Font Name Liberation Sans editable combo box.'",
      "SPEECH OUTPUT: 'Liberation Sans'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "21. Tab to next widget",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar 28 $l combo box'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar 28 
$l combo box'",
      "     VISIBLE:  '28 $l combo box', cursor=1",
-     "SPEECH OUTPUT: 'Font Size editable combo box.'",
+     "SPEECH OUTPUT: 'Font Size 28 editable combo box.'",
      "SPEECH OUTPUT: '28'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "22. Tab to next widget",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar &=y Bold toggle button'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar &=y 
Bold toggle button'",
      "     VISIBLE:  '&=y Bold toggle button', cursor=1",
      "SPEECH OUTPUT: 'Bold on'"]))
 
@@ -195,7 +198,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "23. Tab to next widget",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar & y Italic toggle button'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar & y 
Italic toggle button'",
      "     VISIBLE:  '& y Italic toggle button', cursor=1",
      "SPEECH OUTPUT: 'Italic off'"]))
 
@@ -203,7 +206,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "24. Tab to next widget",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar & y Underline toggle button'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar & y 
Underline toggle button'",
      "     VISIBLE:  '& y Underline toggle button', cursor=1",
      "SPEECH OUTPUT: 'Underline off'"]))
 
@@ -217,7 +220,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "26. Tab to next widget",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar & y Strikethrough toggle button'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar & y 
Strikethrough toggle button'",
      "     VISIBLE:  '& y Strikethrough toggle button', cursor=1",
      "SPEECH OUTPUT: 'Strikethrough off'"]))
 
@@ -225,7 +228,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
 sequence.append(utils.AssertPresentationAction(
     "27. Shift Tab to previous widget",
-    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar &=y Underline toggle button'",
+    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer root pane Formatting tool bar &=y 
Underline toggle button'",
      "     VISIBLE:  '&=y Underline toggle button', cursor=1",
      "SPEECH OUTPUT: 'Underline on'"]))
 


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