[orca] Updated tests



commit c6ed41f7fe328d1b30bdff7f15a35380794a9829
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Oct 17 14:21:28 2016 -0400

    Updated tests

 test/keystrokes/firefox/aria_button_dojo.py        |    8 +-
 test/keystrokes/firefox/aria_button_toggle.py      |    8 ++-
 test/keystrokes/firefox/aria_radiobutton.py        |    4 +-
 test/keystrokes/firefox/aria_slider.py             |   36 ++++----
 test/keystrokes/firefox/aria_slider_dojo.py        |   51 +++++-----
 test/keystrokes/firefox/aria_slider_tpg.py         |  106 ++++++++++----------
 test/keystrokes/firefox/aria_sliders.py            |   62 ++++++------
 test/keystrokes/firefox/aria_tree.py               |   11 +--
 test/keystrokes/firefox/aria_treegrid.py           |   59 ++++++------
 test/keystrokes/firefox/find_wiki.py               |   12 ++-
 .../firefox/label_inference_bugzilla_search.py     |    4 +-
 test/keystrokes/firefox/line_nav_simple_form.py    |   26 +++--
 test/keystrokes/firefox/line_nav_wiki_down.py      |    4 +-
 .../keystrokes/firefox/object_nav_links_in_text.py |    1 +
 .../firefox/object_nav_simple_form_down.py         |   10 +-
 .../firefox/object_nav_simple_form_up.py           |   10 +-
 test/keystrokes/firefox/say_all_nested_tables.py   |    2 +-
 test/keystrokes/firefox/ui_role_accel_label.py     |    1 -
 test/keystrokes/gtk-demo/role_combo_box.py         |   10 +-
 test/keystrokes/gtk-demo/role_drawing_area.py      |    6 +-
 test/keystrokes/gtk-demo/role_icon.py              |    4 +-
 test/keystrokes/gtk3-demo/role_color_chooser.py    |    4 +-
 test/keystrokes/gtk3-demo/role_combo_box.py        |   10 +-
 test/keystrokes/gtk3-demo/role_icon.py             |    4 +-
 test/keystrokes/gtk3-demo/role_info_bar.py         |    4 +-
 .../gtk3-demo/role_text_multiline_selection.py     |    3 +-
 .../oocalc/coordinate_announcement_off.py          |    6 +-
 .../oocalc/coordinate_announcement_on.py           |    6 +-
 test/keystrokes/oocalc/document_enter_text.py      |   25 +++--
 .../oocalc/document_nav_dynamic_headers.py         |   24 ++--
 test/keystrokes/oocalc/manage_names_combobox.py    |   25 ++---
 test/keystrokes/oocalc/messages_dynamic_headers.py |   12 ++-
 test/keystrokes/oowriter/document_nav_cell.py      |    2 +
 test/keystrokes/oowriter/document_nav_line.py      |    6 +-
 .../oowriter/document_nav_line_bullets.py          |    4 +-
 test/keystrokes/oowriter/document_nav_paragraph.py |    2 +
 test/keystrokes/oowriter/document_nav_word.py      |   24 +++--
 test/keystrokes/oowriter/document_new.py           |    2 +
 .../oowriter/flat_review_context_menu.py           |   54 +++-------
 test/keystrokes/oowriter/flat_review_line.py       |    2 +
 .../oowriter/flat_review_line_columns.py           |    5 +-
 .../oowriter/flat_review_platform_menubar.py       |    6 +-
 test/keystrokes/oowriter/flat_review_word.py       |    2 +
 test/keystrokes/oowriter/messages_table.py         |    7 +-
 test/keystrokes/oowriter/say_all.py                |    4 +-
 test/keystrokes/oowriter/say_all_no_sentences.py   |    2 +
 test/keystrokes/oowriter/selection_word.py         |   32 +++---
 test/keystrokes/oowriter/spellcheck.py             |    2 +
 test/keystrokes/oowriter/spoken_indentation.py     |    2 +
 test/keystrokes/oowriter/structural_nav_table.py   |    7 +-
 test/keystrokes/oowriter/table_cell_row.py         |    5 +-
 test/keystrokes/oowriter/text_attributes.py        |    2 +
 test/keystrokes/oowriter/ui_navigator.py           |   11 ++-
 test/keystrokes/oowriter/ui_role_combo_box.py      |   13 ++-
 test/keystrokes/oowriter/ui_role_label.py          |    8 +-
 test/keystrokes/oowriter/ui_role_list_item.py      |   33 ++++--
 test/keystrokes/oowriter/ui_role_menu.py           |    2 +
 .../oowriter/ui_role_menu_flat_review.py           |    2 +
 test/keystrokes/oowriter/ui_role_toolbar.py        |   66 +++++++------
 test/keystrokes/oowriter/where_am_i_document.py    |    3 +-
 60 files changed, 464 insertions(+), 404 deletions(-)
---
diff --git a/test/keystrokes/firefox/aria_button_dojo.py b/test/keystrokes/firefox/aria_button_dojo.py
index e5ac3ab..745a408 100644
--- a/test/keystrokes/firefox/aria_button_dojo.py
+++ b/test/keystrokes/firefox/aria_button_dojo.py
@@ -85,8 +85,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction(" "))
 sequence.append(utils.AssertPresentationAction(
     "10. Open drop down menu on Create",
-    ["BRAILLE LINE:  'save options push button'",
-     "     VISIBLE:  'save options push button', cursor=1",
+    ["BRAILLE LINE:  'save options menu button'",
+     "     VISIBLE:  'save options menu button', cursor=1",
      "BRAILLE LINE:  'Create blank'",
      "     VISIBLE:  'Create blank', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
@@ -129,8 +129,8 @@ sequence.append(utils.AssertPresentationAction(
     "14. Open the Edit! menu",
     ["BRAILLE LINE:  'Edit! push button'",
      "     VISIBLE:  'Edit! push button', cursor=1",
-     "BRAILLE LINE:  'Edit! push button'",
-     "     VISIBLE:  'Edit! push button', cursor=1",
+     "BRAILLE LINE:  'Edit! menu button'",
+     "     VISIBLE:  'Edit! menu button', cursor=1",
      "BRAILLE LINE:  'Cut'",
      "     VISIBLE:  'Cut', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
diff --git a/test/keystrokes/firefox/aria_button_toggle.py b/test/keystrokes/firefox/aria_button_toggle.py
index 46b6e29..3be5ede 100644
--- a/test/keystrokes/firefox/aria_button_toggle.py
+++ b/test/keystrokes/firefox/aria_button_toggle.py
@@ -18,7 +18,11 @@ sequence.append(utils.AssertPresentationAction(
     "1. Tab to first button",
     ["BRAILLE LINE:  '& y Font Larger toggle button'",
      "     VISIBLE:  '& y Font Larger toggle button', cursor=1",
-     "SPEECH OUTPUT: 'Font Larger toggle button not pressed'"]))
+     "BRAILLE LINE:  'Browse mode'",
+     "     VISIBLE:  'Browse mode', cursor=0",
+
+     "SPEECH OUTPUT: 'Font Larger toggle button not pressed'",
+     "SPEECH OUTPUT: 'Browse mode' voice=system"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
@@ -26,6 +30,8 @@ sequence.append(utils.AssertPresentationAction(
     "2. Basic whereamI",
     ["BRAILLE LINE:  '& y Font Larger toggle button'",
      "     VISIBLE:  '& y Font Larger toggle button', cursor=1",
+     "BRAILLE LINE:  '& y Font Larger toggle button'",
+     "     VISIBLE:  '& y Font Larger toggle button', cursor=1",
      "SPEECH OUTPUT: 'Font Larger toggle button not pressed'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/aria_radiobutton.py b/test/keystrokes/firefox/aria_radiobutton.py
index 36692e3..27423d4 100644
--- a/test/keystrokes/firefox/aria_radiobutton.py
+++ b/test/keystrokes/firefox/aria_radiobutton.py
@@ -12,9 +12,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to first radio button",
-    ["BRAILLE LINE:  'embedded'",
-     "     VISIBLE:  'embedded', cursor=1",
-     "BRAILLE LINE:  '&=y Radio Maria radio button'",
+    ["BRAILLE LINE:  '&=y Radio Maria radio button'",
      "     VISIBLE:  '&=y Radio Maria radio button', cursor=1",
      "BRAILLE LINE:  'Browse mode'",
      "     VISIBLE:  'Browse mode', cursor=0",
diff --git a/test/keystrokes/firefox/aria_slider.py b/test/keystrokes/firefox/aria_slider.py
index c55c3d8..6d9eff8 100644
--- a/test/keystrokes/firefox/aria_slider.py
+++ b/test/keystrokes/firefox/aria_slider.py
@@ -14,61 +14,61 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. tab to slider",
-    ["BRAILLE LINE:  'My slider 10% slider'",
-     "     VISIBLE:  'My slider 10% slider', cursor=1",
+    ["BRAILLE LINE:  'My slider 10% horizontal slider'",
+     "     VISIBLE:  'My slider 10% horizontal slider', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "SPEECH OUTPUT: 'My slider slider 10%'",
+     "SPEECH OUTPUT: 'My slider horizontal slider 10%'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. basic whereAmI",
-    ["BRAILLE LINE:  'My slider 10% slider'",
-     "     VISIBLE:  'My slider 10% slider', cursor=1",
-     "BRAILLE LINE:  'My slider 10% slider'",
-     "     VISIBLE:  'My slider 10% slider', cursor=1",
-     "SPEECH OUTPUT: 'My slider slider 10%'"]))
+    ["BRAILLE LINE:  'My slider 10% horizontal slider'",
+     "     VISIBLE:  'My slider 10% horizontal slider', cursor=1",
+     "BRAILLE LINE:  'My slider 10% horizontal slider'",
+     "     VISIBLE:  'My slider 10% horizontal slider', cursor=1",
+     "SPEECH OUTPUT: 'My slider horizontal slider 10% 10 percent.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "3. move slider right",
-    ["BRAILLE LINE:  'My slider $15.00 slider'",
-     "     VISIBLE:  'My slider $15.00 slider', cursor=1",
+    ["BRAILLE LINE:  'My slider $15.00 horizontal slider'",
+     "     VISIBLE:  'My slider $15.00 horizontal slid', cursor=1",
      "SPEECH OUTPUT: '$15.00'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "4. move slider right",
-    ["BRAILLE LINE:  'My slider $20.00 slider'",
-     "     VISIBLE:  'My slider $20.00 slider', cursor=1",
+    ["BRAILLE LINE:  'My slider $20.00 horizontal slider'",
+     "     VISIBLE:  'My slider $20.00 horizontal slid', cursor=1",
      "SPEECH OUTPUT: '$20.00'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "5. move slider left",
-    ["BRAILLE LINE:  'My slider $15.00 slider'",
-     "     VISIBLE:  'My slider $15.00 slider', cursor=1",
+    ["BRAILLE LINE:  'My slider $15.00 horizontal slider'",
+     "     VISIBLE:  'My slider $15.00 horizontal slid', cursor=1",
      "SPEECH OUTPUT: '$15.00'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("End"))
 sequence.append(utils.AssertPresentationAction(
     "6. move slider end",
-    ["BRAILLE LINE:  'My slider $100.00 slider'",
-     "     VISIBLE:  'My slider $100.00 slider', cursor=1",
+    ["BRAILLE LINE:  'My slider $100.00 horizontal slider'",
+     "     VISIBLE:  'My slider $100.00 horizontal sli', cursor=1",
      "SPEECH OUTPUT: '$100.00'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Home"))
 sequence.append(utils.AssertPresentationAction(
     "7. move slider home",
-    ["BRAILLE LINE:  'My slider $0.00 slider'",
-     "     VISIBLE:  'My slider $0.00 slider', cursor=1",
+    ["BRAILLE LINE:  'My slider $0.00 horizontal slider'",
+     "     VISIBLE:  'My slider $0.00 horizontal slide', cursor=1",
      "SPEECH OUTPUT: '$0.00'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/aria_slider_dojo.py b/test/keystrokes/firefox/aria_slider_dojo.py
index cd67ae4..1f401a5 100644
--- a/test/keystrokes/firefox/aria_slider_dojo.py
+++ b/test/keystrokes/firefox/aria_slider_dojo.py
@@ -14,9 +14,12 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to first slider",
-    ["BRAILLE LINE:  'slider 1 10 slider'",
-     "     VISIBLE:  'slider 1 10 slider', cursor=1",
-     "SPEECH OUTPUT: 'slider 1 slider 10'"]))
+    ["BRAILLE LINE:  'slider 1 10 horizontal slider'",
+     "     VISIBLE:  'slider 1 10 horizontal slider', cursor=1",
+     "BRAILLE LINE:  'Focus mode'",
+     "     VISIBLE:  'Focus mode', cursor=0",
+     "SPEECH OUTPUT: 'slider 1 horizontal slider 10'",
+     "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
 sequence.append(KeyComboAction("Right"))
 
@@ -25,32 +28,32 @@ sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "2. Increment first slider",
     ["KNOWN ISSUE: This is the value exposed to us so we're passing it along as-is.",
-     "BRAILLE LINE:  'slider 1 10.[0-9]+ slider'",
-     "     VISIBLE:  'slider 1 10.[0-9]+ slid[er]*', cursor=1",
+     "BRAILLE LINE:  'slider 1 10.[0-9]+ horizontal slider'",
+     "     VISIBLE:  'slider 1 10.[0-9]+ hori[a-z]*', cursor=1",
      "SPEECH OUTPUT: '10.[0-9]+'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "3. Increment first slider",
-    ["BRAILLE LINE:  'slider 1 10.[0-9]+ slider'",
-     "     VISIBLE:  'slider 1 10.[0-9]+ slid[er]*', cursor=1",
+    ["BRAILLE LINE:  'slider 1 10.[0-9]+ horizontal slider'",
+     "     VISIBLE:  'slider 1 10.[0-9]+ hori[a-z]*', cursor=1",
      "SPEECH OUTPUT: '10.[0-9]+'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "4. Decrement first slider",
-    ["BRAILLE LINE:  'slider 1 10.[0-9]+ slider'",
-     "     VISIBLE:  'slider 1 10.[0-9]+ slid[er]*', cursor=1",
+    ["BRAILLE LINE:  'slider 1 10.[0-9]+ horizontal slider'",
+     "     VISIBLE:  'slider 1 10.[0-9]+ hori[a-z]*', cursor=1",
      "SPEECH OUTPUT: '10.[0-9]+'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "5. Decrement first slider",
-    ["BRAILLE LINE:  'slider 1 10.[0-9]+ slider'",
-     "     VISIBLE:  'slider 1 10.[0-9]+ slid[er]*', cursor=1",
+    ["BRAILLE LINE:  'slider 1 10.[0-9]+ horizontal slider'",
+     "     VISIBLE:  'slider 1 10.[0-9]+ hori[a-z]*', cursor=1",
      "SPEECH OUTPUT: '10.[0-9]+'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -80,45 +83,45 @@ sequence.append(utils.AssertPresentationAction(
     "8. Tab to second slider",
     ["BRAILLE LINE:  'Disable previous slider push button'",
      "     VISIBLE:  'Disable previous slider push but', cursor=1",
-     "BRAILLE LINE:  'slider 2 10 slider'",
-     "     VISIBLE:  'slider 2 10 slider', cursor=1",
+     "BRAILLE LINE:  'slider 2 10 horizontal slider'",
+     "     VISIBLE:  'slider 2 10 horizontal slider', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "SPEECH OUTPUT: 'slider 2 slider 10'",
+     "SPEECH OUTPUT: 'slider 2 horizontal slider 10'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "9. Increment second slider",
-    ["BRAILLE LINE:  'slider 2 10 slider'",
-     "     VISIBLE:  'slider 2 10 slider', cursor=1",
-     "BRAILLE LINE:  'slider 2 20 slider'",
-     "     VISIBLE:  'slider 2 20 slider', cursor=1",
+    ["BRAILLE LINE:  'slider 2 10 horizontal slider'",
+     "     VISIBLE:  'slider 2 10 horizontal slider', cursor=1",
+     "BRAILLE LINE:  'slider 2 20 horizontal slider'",
+     "     VISIBLE:  'slider 2 20 horizontal slider', cursor=1",
      "SPEECH OUTPUT: '20'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "10. Increment second slider",
-    ["BRAILLE LINE:  'slider 2 30 slider'",
-     "     VISIBLE:  'slider 2 30 slider', cursor=1",
+    ["BRAILLE LINE:  'slider 2 30 horizontal slider'",
+     "     VISIBLE:  'slider 2 30 horizontal slider', cursor=1",
      "SPEECH OUTPUT: '30'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "11. Decrement second slider",
-    ["BRAILLE LINE:  'slider 2 20 slider'",
-     "     VISIBLE:  'slider 2 20 slider', cursor=1",
+    ["BRAILLE LINE:  'slider 2 20 horizontal slider'",
+     "     VISIBLE:  'slider 2 20 horizontal slider', cursor=1",
      "SPEECH OUTPUT: '20'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "12. Decrement second slider",
-    ["BRAILLE LINE:  'slider 2 10 slider'",
-     "     VISIBLE:  'slider 2 10 slider', cursor=1",
+    ["BRAILLE LINE:  'slider 2 10 horizontal slider'",
+     "     VISIBLE:  'slider 2 10 horizontal slider', cursor=1",
      "SPEECH OUTPUT: '10'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/aria_slider_tpg.py b/test/keystrokes/firefox/aria_slider_tpg.py
index fc9606d..a456a55 100644
--- a/test/keystrokes/firefox/aria_slider_tpg.py
+++ b/test/keystrokes/firefox/aria_slider_tpg.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-"""Test of ARIA sliders using Firefox."""
+"""Test of ARIA horizontal sliders using Firefox."""
 
 from macaroon.playback import *
 import utils
@@ -15,194 +15,194 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
-    "1. Tab to Volume Slider",
-    ["BRAILLE LINE:  'Volume 0 % slider'",
-     "     VISIBLE:  'Volume 0 % slider', cursor=1",
-     "SPEECH OUTPUT: 'Volume slider 0 %'"]))
+    "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 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "2. Volume Right Arrow",
-    ["BRAILLE LINE:  'Volume 1 % slider'",
-     "     VISIBLE:  'Volume 1 % slider', cursor=1",
+    ["BRAILLE LINE:  'Volume 1 % horizontal slider'",
+     "     VISIBLE:  'Volume 1 % horizontal slider', cursor=1",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "3. Volume Right Arrow",
-    ["BRAILLE LINE:  'Volume 2 % slider'",
-     "     VISIBLE:  'Volume 2 % slider', cursor=1",
+    ["BRAILLE LINE:  'Volume 2 % horizontal slider'",
+     "     VISIBLE:  'Volume 2 % horizontal slider', cursor=1",
      "SPEECH OUTPUT: '2 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "4. Volume Left Arrow",
-    ["BRAILLE LINE:  'Volume 1 % slider'",
-     "     VISIBLE:  'Volume 1 % slider', cursor=1",
+    ["BRAILLE LINE:  'Volume 1 % horizontal slider'",
+     "     VISIBLE:  'Volume 1 % horizontal slider', cursor=1",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "5. Volume Left Arrow",
-    ["BRAILLE LINE:  'Volume 0 % slider'",
-     "     VISIBLE:  'Volume 0 % slider', cursor=1",
+    ["BRAILLE LINE:  'Volume 0 % horizontal slider'",
+     "     VISIBLE:  'Volume 0 % horizontal slider', cursor=1",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "6. Volume Up Arrow",
-    ["BRAILLE LINE:  'Volume 1 % slider'",
-     "     VISIBLE:  'Volume 1 % slider', cursor=1",
+    ["BRAILLE LINE:  'Volume 1 % horizontal slider'",
+     "     VISIBLE:  'Volume 1 % horizontal slider', cursor=1",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "7. Volume Up Arrow",
-    ["BRAILLE LINE:  'Volume 2 % slider'",
-     "     VISIBLE:  'Volume 2 % slider', cursor=1",
+    ["BRAILLE LINE:  'Volume 2 % horizontal slider'",
+     "     VISIBLE:  'Volume 2 % horizontal slider', cursor=1",
      "SPEECH OUTPUT: '2 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "8. Volume Down Arrow",
-    ["BRAILLE LINE:  'Volume 1 % slider'",
-     "     VISIBLE:  'Volume 1 % slider', cursor=1",
+    ["BRAILLE LINE:  'Volume 1 % horizontal slider'",
+     "     VISIBLE:  'Volume 1 % horizontal slider', cursor=1",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "9. Volume Down Arrow",
-    ["BRAILLE LINE:  'Volume 0 % slider'",
-     "     VISIBLE:  'Volume 0 % slider', cursor=1",
+    ["BRAILLE LINE:  'Volume 0 % horizontal slider'",
+     "     VISIBLE:  'Volume 0 % horizontal slider', cursor=1",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Up"))
 sequence.append(utils.AssertPresentationAction(
     "10. Volume Page Up",
-    ["BRAILLE LINE:  'Volume 25 % slider'",
-     "     VISIBLE:  'Volume 25 % slider', cursor=1",
+    ["BRAILLE LINE:  'Volume 25 % horizontal slider'",
+     "     VISIBLE:  'Volume 25 % horizontal slider', cursor=1",
      "SPEECH OUTPUT: '25 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Down"))
 sequence.append(utils.AssertPresentationAction(
     "11. Volume Page Down",
-    ["BRAILLE LINE:  'Volume 0 % slider'",
-     "     VISIBLE:  'Volume 0 % slider', cursor=1",
+    ["BRAILLE LINE:  'Volume 0 % horizontal slider'",
+     "     VISIBLE:  'Volume 0 % horizontal slider', cursor=1",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("End"))
 sequence.append(utils.AssertPresentationAction(
     "12. Volume End",
-    ["BRAILLE LINE:  'Volume 100 % slider'",
-     "     VISIBLE:  'Volume 100 % slider', cursor=1",
+    ["BRAILLE LINE:  'Volume 100 % horizontal slider'",
+     "     VISIBLE:  'Volume 100 % horizontal slider', cursor=1",
      "SPEECH OUTPUT: '100 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Home"))
 sequence.append(utils.AssertPresentationAction(
     "13. Volume Home",
-    ["BRAILLE LINE:  'Volume 0 % slider'",
-     "     VISIBLE:  'Volume 0 % slider', cursor=1",
+    ["BRAILLE LINE:  'Volume 0 % horizontal slider'",
+     "     VISIBLE:  'Volume 0 % horizontal slider', cursor=1",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
-    "14. Tab to Food Quality Slider",
+    "14. Tab to Food Quality Horizontal Slider",
     ["KNOWN ISSUE: The double-presentation is because of the authoring, putting the name and value into the 
description",
-     "BRAILLE LINE:  'Food Quality terrible slider'",
-     "     VISIBLE:  'Food Quality terrible slider', cursor=1",
-     "SPEECH OUTPUT: 'Food Quality slider terrible Food Quality: terrible (1 of 5)'"]))
+     "BRAILLE LINE:  'Food Quality terrible horizontal slider'",
+     "     VISIBLE:  'Food Quality terrible horizontal', cursor=1",
+     "SPEECH OUTPUT: 'Food Quality horizontal slider terrible Food Quality: terrible (1 of 5)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "15. Food Quality Right Arrow",
-    ["BRAILLE LINE:  'Food Quality bad slider'",
-     "     VISIBLE:  'Food Quality bad slider', cursor=1",
+    ["BRAILLE LINE:  'Food Quality bad horizontal slider'",
+     "     VISIBLE:  'Food Quality bad horizontal slid', cursor=1",
      "SPEECH OUTPUT: 'bad'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "16. Food Quality Right Arrow",
-    ["BRAILLE LINE:  'Food Quality decent slider'",
-     "     VISIBLE:  'Food Quality decent slider', cursor=1",
+    ["BRAILLE LINE:  'Food Quality decent horizontal slider'",
+     "     VISIBLE:  'Food Quality decent horizontal s', cursor=1",
      "SPEECH OUTPUT: 'decent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "17. Food Quality Left Arrow",
-    ["BRAILLE LINE:  'Food Quality bad slider'",
-     "     VISIBLE:  'Food Quality bad slider', cursor=1",
+    ["BRAILLE LINE:  'Food Quality bad horizontal slider'",
+     "     VISIBLE:  'Food Quality bad horizontal slid', cursor=1",
      "SPEECH OUTPUT: 'bad'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "18. Food Quality Up Arrow",
-    ["BRAILLE LINE:  'Food Quality decent slider'",
-     "     VISIBLE:  'Food Quality decent slider', cursor=1",
+    ["BRAILLE LINE:  'Food Quality decent horizontal slider'",
+     "     VISIBLE:  'Food Quality decent horizontal s', cursor=1",
      "SPEECH OUTPUT: 'decent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "19. Food Quality Down Arrow",
-    ["BRAILLE LINE:  'Food Quality bad slider'",
-     "     VISIBLE:  'Food Quality bad slider', cursor=1",
+    ["BRAILLE LINE:  'Food Quality bad horizontal slider'",
+     "     VISIBLE:  'Food Quality bad horizontal slid', cursor=1",
      "SPEECH OUTPUT: 'bad'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "20. Food Quality Down Arrow",
-    ["BRAILLE LINE:  'Food Quality terrible slider'",
-     "     VISIBLE:  'Food Quality terrible slider', cursor=1",
+    ["BRAILLE LINE:  'Food Quality terrible horizontal slider'",
+     "     VISIBLE:  'Food Quality terrible horizontal', cursor=1",
      "SPEECH OUTPUT: 'terrible'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Up"))
 sequence.append(utils.AssertPresentationAction(
     "21. Food Quality Page Up",
-    ["BRAILLE LINE:  'Food Quality bad slider'",
-     "     VISIBLE:  'Food Quality bad slider', cursor=1",
+    ["BRAILLE LINE:  'Food Quality bad horizontal slider'",
+     "     VISIBLE:  'Food Quality bad horizontal slid', cursor=1",
      "SPEECH OUTPUT: 'bad'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Down"))
 sequence.append(utils.AssertPresentationAction(
     "22. Food Quality Page Down",
-    ["BRAILLE LINE:  'Food Quality terrible slider'",
-     "     VISIBLE:  'Food Quality terrible slider', cursor=1",
+    ["BRAILLE LINE:  'Food Quality terrible horizontal slider'",
+     "     VISIBLE:  'Food Quality terrible horizontal', cursor=1",
      "SPEECH OUTPUT: 'terrible'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("End"))
 sequence.append(utils.AssertPresentationAction(
     "23. Food Quality End",
-    ["BRAILLE LINE:  'Food Quality excellent slider'",
-     "     VISIBLE:  'Food Quality excellent slider', cursor=1",
+    ["BRAILLE LINE:  'Food Quality excellent horizontal slider'",
+     "     VISIBLE:  'Food Quality excellent horizonta', cursor=1",
      "SPEECH OUTPUT: 'excellent'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Home"))
 sequence.append(utils.AssertPresentationAction(
     "24. Food Quality Home",
-    ["BRAILLE LINE:  'Food Quality terrible slider'",
-     "     VISIBLE:  'Food Quality terrible slider', cursor=1",
+    ["BRAILLE LINE:  'Food Quality terrible horizontal slider'",
+     "     VISIBLE:  'Food Quality terrible horizontal', cursor=1",
      "SPEECH OUTPUT: 'terrible'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/aria_sliders.py b/test/keystrokes/firefox/aria_sliders.py
index 4e7d857..7de014b 100644
--- a/test/keystrokes/firefox/aria_sliders.py
+++ b/test/keystrokes/firefox/aria_sliders.py
@@ -12,106 +12,104 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to slider 1",
-    ["BRAILLE LINE:  'embedded'",
-     "     VISIBLE:  'embedded', cursor=1",
-     "BRAILLE LINE:  '30 slider'",
-     "     VISIBLE:  '30 slider', cursor=1",
-     "SPEECH OUTPUT: 'slider 30'"]))
+    ["BRAILLE LINE:  '30 horizontal slider'",
+     "     VISIBLE:  '30 horizontal slider', cursor=1",
+     "SPEECH OUTPUT: 'horizontal slider 30'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. Basic whereAmI on slider 1",
-    ["BRAILLE LINE:  '30 slider'",
-     "     VISIBLE:  '30 slider', cursor=1",
-     "SPEECH OUTPUT: 'slider 30'"]))
+    ["BRAILLE LINE:  '30 horizontal slider'",
+     "     VISIBLE:  '30 horizontal slider', cursor=1",
+     "SPEECH OUTPUT: 'horizontal slider 30 30 percent.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "3. Increment slider 1",
-    ["BRAILLE LINE:  '35 slider'",
-     "     VISIBLE:  '35 slider', cursor=1",
+    ["BRAILLE LINE:  '35 horizontal slider'",
+     "     VISIBLE:  '35 horizontal slider', cursor=1",
      "SPEECH OUTPUT: '35'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "4. Increment slider 1",
-    ["BRAILLE LINE:  '40 slider'",
-     "     VISIBLE:  '40 slider', cursor=1",
+    ["BRAILLE LINE:  '40 horizontal slider'",
+     "     VISIBLE:  '40 horizontal slider', cursor=1",
      "SPEECH OUTPUT: '40'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "5. Decrement slider 1",
-    ["BRAILLE LINE:  '35 slider'",
-     "     VISIBLE:  '35 slider', cursor=1",
+    ["BRAILLE LINE:  '35 horizontal slider'",
+     "     VISIBLE:  '35 horizontal slider', cursor=1",
      "SPEECH OUTPUT: '35'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "6. Tab to slider 2's left range",
-    ["BRAILLE LINE:  '1950 slider'",
-     "     VISIBLE:  '1950 slider', cursor=1",
-     "SPEECH OUTPUT: 'slider 1950'"]))
+    ["BRAILLE LINE:  '1950 horizontal slider'",
+     "     VISIBLE:  '1950 horizontal slider', cursor=1",
+     "SPEECH OUTPUT: 'horizontal slider 1950'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "7. Increment slider 2's left range",
-    ["BRAILLE LINE:  '1951 slider'",
-     "     VISIBLE:  '1951 slider', cursor=1",
+    ["BRAILLE LINE:  '1951 horizontal slider'",
+     "     VISIBLE:  '1951 horizontal slider', cursor=1",
      "SPEECH OUTPUT: '1951'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "8. Increment slider 2's left range",
-    ["BRAILLE LINE:  '1952 slider'",
-     "     VISIBLE:  '1952 slider', cursor=1",
+    ["BRAILLE LINE:  '1952 horizontal slider'",
+     "     VISIBLE:  '1952 horizontal slider', cursor=1",
      "SPEECH OUTPUT: '1952'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "9. Decrement slider 2's left range",
-    ["BRAILLE LINE:  '1951 slider'",
-     "     VISIBLE:  '1951 slider', cursor=1",
+    ["BRAILLE LINE:  '1951 horizontal slider'",
+     "     VISIBLE:  '1951 horizontal slider', cursor=1",
      "SPEECH OUTPUT: '1951'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "10. Tab to slider 2's right range",
-    ["BRAILLE LINE:  '2000 slider'",
-     "     VISIBLE:  '2000 slider', cursor=1",
-     "SPEECH OUTPUT: 'slider 2000'"]))
+    ["BRAILLE LINE:  '2000 horizontal slider'",
+     "     VISIBLE:  '2000 horizontal slider', cursor=1",
+     "SPEECH OUTPUT: 'horizontal slider 2000'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "11. Increment slider 2's right range",
-    ["BRAILLE LINE:  '2001 slider'",
-     "     VISIBLE:  '2001 slider', cursor=1",
+    ["BRAILLE LINE:  '2001 horizontal slider'",
+     "     VISIBLE:  '2001 horizontal slider', cursor=1",
      "SPEECH OUTPUT: '2001'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "12. Increment slider 2's right range",
-    ["BRAILLE LINE:  '2002 slider'",
-     "     VISIBLE:  '2002 slider', cursor=1",
+    ["BRAILLE LINE:  '2002 horizontal slider'",
+     "     VISIBLE:  '2002 horizontal slider', cursor=1",
      "SPEECH OUTPUT: '2002'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "13. Decrement slider 2's right range",
-    ["BRAILLE LINE:  '2001 slider'",
-     "     VISIBLE:  '2001 slider', cursor=1",
+    ["BRAILLE LINE:  '2001 horizontal slider'",
+     "     VISIBLE:  '2001 horizontal slider', cursor=1",
      "SPEECH OUTPUT: '2001'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/aria_tree.py b/test/keystrokes/firefox/aria_tree.py
index 7689a46..8247720 100644
--- a/test/keystrokes/firefox/aria_tree.py
+++ b/test/keystrokes/firefox/aria_tree.py
@@ -16,14 +16,13 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to tree",
-    ["BRAILLE LINE:  'Fruits expanded list item'",
+    ["BRAILLE LINE:  'embedded'",
+     "     VISIBLE:  'embedded', cursor=1",
+     "BRAILLE LINE:  'Fruits expanded list item'",
      "     VISIBLE:  'Fruits expanded list item', cursor=1",
-     "BRAILLE LINE:  'Focus mode'",
-     "     VISIBLE:  'Focus mode', cursor=0",
      "SPEECH OUTPUT: 'Fruits.'",
      "SPEECH OUTPUT: 'expanded.'",
-     "SPEECH OUTPUT: 'tree level 1'",
-     "SPEECH OUTPUT: 'Focus mode' voice=system"]))
+     "SPEECH OUTPUT: 'tree level 1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
@@ -31,8 +30,6 @@ sequence.append(utils.AssertPresentationAction(
     "2. Basic whereAmI",
     ["BRAILLE LINE:  'Fruits expanded list item'",
      "     VISIBLE:  'Fruits expanded list item', cursor=1",
-     "BRAILLE LINE:  'Fruits expanded list item'",
-     "     VISIBLE:  'Fruits expanded list item', cursor=1",
      "SPEECH OUTPUT: 'list item.'",
      "SPEECH OUTPUT: 'Fruits.'",
      "SPEECH OUTPUT: '1 of 2.'",
diff --git a/test/keystrokes/firefox/aria_treegrid.py b/test/keystrokes/firefox/aria_treegrid.py
index 6dfbb93..3b2e547 100644
--- a/test/keystrokes/firefox/aria_treegrid.py
+++ b/test/keystrokes/firefox/aria_treegrid.py
@@ -15,7 +15,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Navigate to the treegrid",
     ["BRAILLE LINE:  '+A Question of Love table cell'",
-     "     VISIBLE:  '+A Question of Love table row', cursor=1",
+     "     VISIBLE:  '+A Question of Love table cell', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "SPEECH OUTPUT: 'collapsed'",
@@ -27,44 +27,44 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down Arrow",
     ["BRAILLE LINE:  '+A Question of Love table cell'",
-     "     VISIBLE:  '+A Question of Love table row', cursor=1",
-     "BRAILLE LINE:  '+ Piece of Peace table cell'",
+     "     VISIBLE:  '+A Question of Love table cell', cursor=1",
+     "BRAILLE LINE:  '+ Piece of Peace table row'",
      "     VISIBLE:  '+ Piece of Peace table row', cursor=1",
      "SPEECH OUTPUT: 'collapsed'",
-     "SPEECH OUTPUT: '+ Piece of Peace.'"]))
+     "SPEECH OUTPUT: '+ Piece of Peace table row tree level 1 not selected.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Down Arrow",
-    ["BRAILLE LINE:  '+ International Law table cell'",
+    ["BRAILLE LINE:  '+ International Law table row'",
      "     VISIBLE:  '+ International Law table row', cursor=1",
      "SPEECH OUTPUT: 'collapsed'",
-     "SPEECH OUTPUT: '+ International Law.'"]))
+     "SPEECH OUTPUT: '+ International Law table row tree level 1 not selected.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "4. Up Arrow",
-    ["BRAILLE LINE:  '+ Piece of Peace table cell'",
+    ["BRAILLE LINE:  '+ Piece of Peace table row'",
      "     VISIBLE:  '+ Piece of Peace table row', cursor=1",
      "SPEECH OUTPUT: 'collapsed'",
-     "SPEECH OUTPUT: '+ Piece of Peace.'"]))
+     "SPEECH OUTPUT: '+ Piece of Peace table row tree level 1 not selected.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "5. Up Arrow",
-    ["BRAILLE LINE:  '+A Question of Love table cell'",
+    ["BRAILLE LINE:  '+A Question of Love table row'",
      "     VISIBLE:  '+A Question of Love table row', cursor=1",
      "SPEECH OUTPUT: 'collapsed'",
-     "SPEECH OUTPUT: '+A Question of Love.'"]))
+     "SPEECH OUTPUT: '+A Question of Love table row tree level 1 not selected.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "6. basic whereAmI",
-    ["BRAILLE LINE:  '+A Question of Love table cell'",
+    ["BRAILLE LINE:  '+A Question of Love table row'",
      "     VISIBLE:  '+A Question of Love table row', cursor=1",
      "SPEECH OUTPUT: 'table row.'",
      "SPEECH OUTPUT: 'ISBN.'",
@@ -82,7 +82,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "8. basic whereAmI",
-    ["BRAILLE LINE:  '-A Question of Love table cell'",
+    ["BRAILLE LINE:  '-A Question of Love table row'",
      "     VISIBLE:  '-A Question of Love table row', cursor=1",
      "SPEECH OUTPUT: 'table row.'",
      "SPEECH OUTPUT: 'ISBN.'",
@@ -92,50 +92,51 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "9. Down Arrow into child",
-    ["BRAILLE LINE:  '978-3-453-40540-0 table cell'",
-     "     VISIBLE:  '978-3-453-40540-0 table row', cursor=1",
-     "SPEECH OUTPUT: '978-3-453-40540-0.'"]))
+    ["BRAILLE LINE:  '978-3-453-40540-0 Nora Roberts $ 9.99 table row'",
+     "     VISIBLE:  '978-3-453-40540-0 Nora Roberts $', cursor=1",
+     "SPEECH OUTPUT: '978-3-453-40540-0 Nora Roberts $ 9.99 table row tree level 2 not selected.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "10. Right Arrow in child",
-    ["BRAILLE LINE:  'Nora Roberts table cell'",
-     "     VISIBLE:  'Nora Roberts table row', cursor=1",
-     "SPEECH OUTPUT: 'Nora Roberts.'"]))
+    ["KNOWN ISSUE: We should only be presenting the cell",
+     "BRAILLE LINE:  '978-3-453-40540-0 Nora Roberts $ 9.99 table row'",
+     "     VISIBLE:  '978-3-453-40540-0 Nora Roberts $', cursor=1",
+     "SPEECH OUTPUT: '978-3-453-40540-0 Nora Roberts $ 9.99 table row tree level 2.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "11. Right Arrow in child",
-    ["BRAILLE LINE:  '$ 9.99 table cell'",
-     "     VISIBLE:  '$ 9.99 table row', cursor=1",
-     "SPEECH OUTPUT: '$ 9.99.'"]))
+    ["BRAILLE LINE:  '978-3-453-40540-0 Nora Roberts $ 9.99 table row'",
+     "     VISIBLE:  '978-3-453-40540-0 Nora Roberts $', cursor=1",
+     "SPEECH OUTPUT: '978-3-453-40540-0 Nora Roberts $ 9.99 table row tree level 2.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "12. Left Arrow in child",
-    ["BRAILLE LINE:  'Nora Roberts table cell'",
-     "     VISIBLE:  'Nora Roberts table row', cursor=1",
-     "SPEECH OUTPUT: 'Nora Roberts.'"]))
+    ["BRAILLE LINE:  '978-3-453-40540-0 Nora Roberts $ 9.99 table row'",
+     "     VISIBLE:  '978-3-453-40540-0 Nora Roberts $', cursor=1",
+     "SPEECH OUTPUT: '978-3-453-40540-0 Nora Roberts $ 9.99 table row tree level 2.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "13. Left Arrow in child",
-    ["BRAILLE LINE:  '978-3-453-40540-0 table cell'",
-     "     VISIBLE:  '978-3-453-40540-0 table row', cursor=1",
-     "SPEECH OUTPUT: '978-3-453-40540-0.'"]))
+    ["BRAILLE LINE:  '978-3-453-40540-0 Nora Roberts $ 9.99 table row'",
+     "     VISIBLE:  '978-3-453-40540-0 Nora Roberts $', cursor=1",
+     "SPEECH OUTPUT: '978-3-453-40540-0 Nora Roberts $ 9.99 table row tree level 2.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "14. Up Arrow back to parent",
-    ["BRAILLE LINE:  '-A Question of Love table cell'",
+    ["BRAILLE LINE:  '-A Question of Love table row'",
      "     VISIBLE:  '-A Question of Love table row', cursor=1",
      "SPEECH OUTPUT: 'expanded'",
-     "SPEECH OUTPUT: '-A Question of Love.'"]))
+     "SPEECH OUTPUT: '-A Question of Love table row tree level 1 not selected.'"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/firefox/find_wiki.py b/test/keystrokes/firefox/find_wiki.py
index 8b74dfe..9300442 100644
--- a/test/keystrokes/firefox/find_wiki.py
+++ b/test/keystrokes/firefox/find_wiki.py
@@ -21,6 +21,8 @@ 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",
      "SPEECH OUTPUT: 'Welcome to Orca! heading level 1'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -29,6 +31,8 @@ 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.'"]))
@@ -39,14 +43,18 @@ 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",
      "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:  'synthesis, braille, and magnification, Orca helps provide '",
-     "     VISIBLE:  's, braille, and magnification, O', cursor=32",
+    ["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",
      "SPEECH OUTPUT: 'synthesis, braille, and magnification, Orca helps provide'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/label_inference_bugzilla_search.py 
b/test/keystrokes/firefox/label_inference_bugzilla_search.py
index b17e052..7d96255 100644
--- a/test/keystrokes/firefox/label_inference_bugzilla_search.py
+++ b/test/keystrokes/firefox/label_inference_bugzilla_search.py
@@ -19,8 +19,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Shift Tab",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
+    ["BRAILLE LINE:  'S ummary: contains all of the words/strings Search table row'",
+     "     VISIBLE:  'S ummary: contains all of the wo', cursor=1",
      "BRAILLE LINE:  'Summary: contains all of the words/strings combo box'",
      "     VISIBLE:  'Summary: contains all of the wor', cursor=10",
      "SPEECH OUTPUT: 'Summary: contains all of the words/strings combo box.'"]))
diff --git a/test/keystrokes/firefox/line_nav_simple_form.py b/test/keystrokes/firefox/line_nav_simple_form.py
index 5050373..d56bba7 100644
--- a/test/keystrokes/firefox/line_nav_simple_form.py
+++ b/test/keystrokes/firefox/line_nav_simple_form.py
@@ -62,17 +62,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. line Down",
-    ["BRAILLE LINE:  'I've recently taken up typing and plan  $l'",
+    ["BRAILLE LINE:  'I've recently taken up typing and plan to  $l'",
      "     VISIBLE:  'I've recently taken up typing an', cursor=1",
-     "SPEECH OUTPUT: 'I've recently taken up typing and plan '"]))
+     "SPEECH OUTPUT: 'I've recently taken up typing and plan to '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "7. line Down",
-    ["BRAILLE LINE:  'to write my memoirs. $l'",
-     "     VISIBLE:  'to write my memoirs. $l', cursor=1",
-     "SPEECH OUTPUT: 'to write my memoirs.",
+    ["BRAILLE LINE:  'write my memoirs. $l'",
+     "     VISIBLE:  'write my memoirs. $l', cursor=1",
+     "SPEECH OUTPUT: 'write my memoirs.",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -123,13 +123,15 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "13. line Down",
-    ["BRAILLE LINE:  'Ain't he handsome (please say yes)? & y Yes radio button & y No radio button'",
+    ["BRAILLE LINE:  'Ain't he handsome (please say yes)? & y Yes radio button Yes & y No radio button No'",
      "     VISIBLE:  'Ain't he handsome (please say ye', cursor=1",
      "SPEECH OUTPUT: 'Ain't he handsome (please say yes)?'",
      "SPEECH OUTPUT: 'Yes.'",
      "SPEECH OUTPUT: 'not selected radio button'",
+     "SPEECH OUTPUT: 'Yes'",
      "SPEECH OUTPUT: 'No.'",
-     "SPEECH OUTPUT: 'not selected radio button'"]))
+     "SPEECH OUTPUT: 'not selected radio button'",
+     "SPEECH OUTPUT: 'No'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -179,18 +181,18 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "19. line Up",
-    ["BRAILLE LINE:  'to write my memoirs. $l'",
-     "     VISIBLE:  'to write my memoirs. $l', cursor=1",
-     "SPEECH OUTPUT: 'to write my memoirs.",
+    ["BRAILLE LINE:  'write my memoirs. $l'",
+     "     VISIBLE:  'write my memoirs. $l', cursor=1",
+     "SPEECH OUTPUT: 'write my memoirs.",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "20. line Up",
-    ["BRAILLE LINE:  'I've recently taken up typing and plan  $l'",
+    ["BRAILLE LINE:  'I've recently taken up typing and plan to  $l'",
      "     VISIBLE:  'I've recently taken up typing an', cursor=1",
-     "SPEECH OUTPUT: 'I've recently taken up typing and plan '"]))
+     "SPEECH OUTPUT: 'I've recently taken up typing and plan to '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_wiki_down.py b/test/keystrokes/firefox/line_nav_wiki_down.py
index 67f1c00..6479ac6 100644
--- a/test/keystrokes/firefox/line_nav_wiki_down.py
+++ b/test/keystrokes/firefox/line_nav_wiki_down.py
@@ -201,7 +201,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "16. Line Down",
     ["BRAILLE LINE:  '6. Accessible Applications'",
-     "     VISIBLE:  '6. Accessible Applications', cursor=4",
+     "     VISIBLE:  '6. Accessible Applications', cursor=1",
      "SPEECH OUTPUT: '6.'",
      "SPEECH OUTPUT: 'Accessible Applications'",
      "SPEECH OUTPUT: 'link.'"]))
@@ -850,7 +850,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "84. Line Down",
     ["BRAILLE LINE:  '• Python Pocket Reference, Mark Lutz'",
-     "     VISIBLE:  '• Python Pocket Reference, Mark ', cursor=3",
+     "     VISIBLE:  '• Python Pocket Reference, Mark ', cursor=1",
      "SPEECH OUTPUT: '•.'",
      "SPEECH OUTPUT: 'Python Pocket Reference, Mark Lutz'",
      "SPEECH OUTPUT: 'link.'"]))
diff --git a/test/keystrokes/firefox/object_nav_links_in_text.py 
b/test/keystrokes/firefox/object_nav_links_in_text.py
index 34b2ad1..f682113 100644
--- a/test/keystrokes/firefox/object_nav_links_in_text.py
+++ b/test/keystrokes/firefox/object_nav_links_in_text.py
@@ -13,6 +13,7 @@ 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(PauseAction(5000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
diff --git a/test/keystrokes/firefox/object_nav_simple_form_down.py 
b/test/keystrokes/firefox/object_nav_simple_form_down.py
index ebc4a3d..2fe1ddd 100644
--- a/test/keystrokes/firefox/object_nav_simple_form_down.py
+++ b/test/keystrokes/firefox/object_nav_simple_form_down.py
@@ -94,17 +94,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "10. line Down",
-    ["BRAILLE LINE:  'I've recently taken up typing and plan  $l'",
+    ["BRAILLE LINE:  'I've recently taken up typing and plan to  $l'",
      "     VISIBLE:  'I've recently taken up typing an', cursor=1",
-     "SPEECH OUTPUT: 'I've recently taken up typing and plan '"]))
+     "SPEECH OUTPUT: 'I've recently taken up typing and plan to '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "11. line Down",
-    ["BRAILLE LINE:  'to write my memoirs. $l'",
-     "     VISIBLE:  'to write my memoirs. $l', cursor=1",
-     "SPEECH OUTPUT: 'to write my memoirs.",
+    ["BRAILLE LINE:  'write my memoirs. $l'",
+     "     VISIBLE:  'write my memoirs. $l', cursor=1",
+     "SPEECH OUTPUT: 'write my memoirs.",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/object_nav_simple_form_up.py 
b/test/keystrokes/firefox/object_nav_simple_form_up.py
index 3851cc7..2462e22 100644
--- a/test/keystrokes/firefox/object_nav_simple_form_up.py
+++ b/test/keystrokes/firefox/object_nav_simple_form_up.py
@@ -156,18 +156,18 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "18. line Up",
-    ["BRAILLE LINE:  'to write my memoirs. $l'",
-     "     VISIBLE:  'to write my memoirs. $l', cursor=1",
-     "SPEECH OUTPUT: 'to write my memoirs.",
+    ["BRAILLE LINE:  'write my memoirs. $l'",
+     "     VISIBLE:  'write my memoirs. $l', cursor=1",
+     "SPEECH OUTPUT: 'write my memoirs.",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "19. line Up",
-    ["BRAILLE LINE:  'I've recently taken up typing and plan  $l'",
+    ["BRAILLE LINE:  'I've recently taken up typing and plan to  $l'",
      "     VISIBLE:  'I've recently taken up typing an', cursor=1",
-     "SPEECH OUTPUT: 'I've recently taken up typing and plan '"]))
+     "SPEECH OUTPUT: 'I've recently taken up typing and plan to '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/say_all_nested_tables.py 
b/test/keystrokes/firefox/say_all_nested_tables.py
index 1a9de49..8a44761 100644
--- a/test/keystrokes/firefox/say_all_nested_tables.py
+++ b/test/keystrokes/firefox/say_all_nested_tables.py
@@ -16,7 +16,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. KP_Add to do a SayAll",
     ["SPEECH OUTPUT: 'nested-tables'",
      "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'visited link'",
      "SPEECH OUTPUT: 'Campus'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: '.'",
diff --git a/test/keystrokes/firefox/ui_role_accel_label.py b/test/keystrokes/firefox/ui_role_accel_label.py
index 26e7173..0588b67 100644
--- a/test/keystrokes/firefox/ui_role_accel_label.py
+++ b/test/keystrokes/firefox/ui_role_accel_label.py
@@ -9,7 +9,6 @@ sequence = MacroSequence()
 
 sequence.append(KeyComboAction("<Alt>f"))
 sequence.append(KeyComboAction("Down"))
-sequence.append(KeyComboAction("Down"))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
diff --git a/test/keystrokes/gtk-demo/role_combo_box.py b/test/keystrokes/gtk-demo/role_combo_box.py
index d190808..e3914f5 100644
--- a/test/keystrokes/gtk-demo/role_combo_box.py
+++ b/test/keystrokes/gtk-demo/role_combo_box.py
@@ -62,7 +62,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'gtk-demo application Combo boxes frame Editable panel  $l'",
      "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Editable panel'",
-     "SPEECH OUTPUT: 'text.'"]))
+     "SPEECH OUTPUT: 'editable combo box.'"]))
 
 sequence.append(TypeAction("Fou"))
 sequence.append(utils.StartRecordingAction())
@@ -80,7 +80,7 @@ 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",
-     "SPEECH OUTPUT: 'text.'",
+     "SPEECH OUTPUT: 'editable combo box.'",
      "SPEECH OUTPUT: 'Four.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -89,7 +89,7 @@ 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",
-     "SPEECH OUTPUT: 'Four combo box.'"]))
+     "SPEECH OUTPUT: 'Four editable combo box.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
@@ -99,7 +99,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Four $l', cursor=5",
      "BRAILLE LINE:  'gtk-demo application Combo boxes frame Editable panel Four $l'",
      "     VISIBLE:  'Four $l', cursor=5",
-     "SPEECH OUTPUT: 'text.'",
+     "SPEECH OUTPUT: 'editable combo box.'",
      "SPEECH OUTPUT: 'Four selected'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -108,7 +108,7 @@ 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",
-     "SPEECH OUTPUT: 'text.'",
+     "SPEECH OUTPUT: 'editable combo box.'",
      "SPEECH OUTPUT: 'Four selected.'"]))
 
 sequence.append(KeyComboAction("Escape"))
diff --git a/test/keystrokes/gtk-demo/role_drawing_area.py b/test/keystrokes/gtk-demo/role_drawing_area.py
index dfc7593..06359a6 100644
--- a/test/keystrokes/gtk-demo/role_drawing_area.py
+++ b/test/keystrokes/gtk-demo/role_drawing_area.py
@@ -25,9 +25,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
     "2. Flat review next line",
-    ["BRAILLE LINE:  'unknown $l'",
-     "     VISIBLE:  'unknown $l', cursor=1",
-     "SPEECH OUTPUT: 'unknown'"]))
+    ["BRAILLE LINE:  'Scribble area $l'",
+     "     VISIBLE:  'Scribble area $l', cursor=1",
+     "SPEECH OUTPUT: 'Scribble area'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
 
diff --git a/test/keystrokes/gtk-demo/role_icon.py b/test/keystrokes/gtk-demo/role_icon.py
index 00de5f2..3b0f30c 100644
--- a/test/keystrokes/gtk-demo/role_icon.py
+++ b/test/keystrokes/gtk-demo/role_icon.py
@@ -31,7 +31,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'bin icon', cursor=1",
      "SPEECH OUTPUT: 'Icon panel.'",
      "SPEECH OUTPUT: 'bin.'",
-     "SPEECH OUTPUT: '1 of 20 items selected on 1 of 20.'"]))
+     "SPEECH OUTPUT: '1 of 22 items selected on 1 of 22.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
@@ -57,7 +57,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'bin icon', cursor=1",
      "SPEECH OUTPUT: 'Icon panel.'",
      "SPEECH OUTPUT: 'bin.'",
-     "SPEECH OUTPUT: '2 of 20 items selected on 1 of 20.'"]))
+     "SPEECH OUTPUT: '2 of 22 items selected on 1 of 22.'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
 
diff --git a/test/keystrokes/gtk3-demo/role_color_chooser.py b/test/keystrokes/gtk3-demo/role_color_chooser.py
index 58d8878..ac297ef 100644
--- a/test/keystrokes/gtk3-demo/role_color_chooser.py
+++ b/test/keystrokes/gtk3-demo/role_color_chooser.py
@@ -70,7 +70,7 @@ sequence.append(utils.AssertPresentationAction(
     "6. Hue Where Am I",
     ["BRAILLE LINE:  'gtk3-demo application Changing color dialog Hue 0.02 color chooser'",
      "     VISIBLE:  'Hue 0.02 color chooser', cursor=1",
-     "SPEECH OUTPUT: 'color chooser 0.02'"]))
+     "SPEECH OUTPUT: 'color chooser 0.02 2 percent.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
@@ -125,7 +125,7 @@ sequence.append(utils.AssertPresentationAction(
     "13. Alpha Where Am I",
     ["BRAILLE LINE:  'gtk3-demo application Changing color dialog Alpha 0.99 color chooser'",
      "     VISIBLE:  'Alpha 0.99 color chooser', cursor=1",
-     "SPEECH OUTPUT: 'color chooser 0.99'"]))
+     "SPEECH OUTPUT: 'color chooser 0.99 99 percent.'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
 
diff --git a/test/keystrokes/gtk3-demo/role_combo_box.py b/test/keystrokes/gtk3-demo/role_combo_box.py
index 853574a..4085f1b 100644
--- a/test/keystrokes/gtk3-demo/role_combo_box.py
+++ b/test/keystrokes/gtk3-demo/role_combo_box.py
@@ -61,7 +61,7 @@ sequence.append(utils.AssertPresentationAction(
     "5. Editable text combo box",
     ["BRAILLE LINE:  'gtk3-demo application Combo Boxes frame Editable panel  $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'text.'"]))
+     "SPEECH OUTPUT: 'editable combo box.'"]))
 
 sequence.append(TypeAction("Fou"))
 sequence.append(utils.StartRecordingAction())
@@ -79,7 +79,7 @@ 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",
-     "SPEECH OUTPUT: 'text.'",
+     "SPEECH OUTPUT: 'editable combo box.'",
      "SPEECH OUTPUT: 'Four.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -88,7 +88,7 @@ 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",
-     "SPEECH OUTPUT: 'Four combo box.'"]))
+     "SPEECH OUTPUT: 'Four editable combo box.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
@@ -98,7 +98,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Four $l', cursor=5",
      "BRAILLE LINE:  'gtk3-demo application Combo Boxes frame Editable panel Four $l'",
      "     VISIBLE:  'Four $l', cursor=5",
-     "SPEECH OUTPUT: 'text.'",
+     "SPEECH OUTPUT: 'editable combo box.'",
      "SPEECH OUTPUT: 'Four selected'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -107,7 +107,7 @@ 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",
-     "SPEECH OUTPUT: 'text.'",
+     "SPEECH OUTPUT: 'editable combo box.'",
      "SPEECH OUTPUT: 'Four selected.'"]))
 
 sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
diff --git a/test/keystrokes/gtk3-demo/role_icon.py b/test/keystrokes/gtk3-demo/role_icon.py
index d84f778..59c6ff0 100644
--- a/test/keystrokes/gtk3-demo/role_icon.py
+++ b/test/keystrokes/gtk3-demo/role_icon.py
@@ -32,7 +32,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'bin icon', cursor=1",
      "SPEECH OUTPUT: 'Icon panel.'",
      "SPEECH OUTPUT: 'bin.'",
-     "SPEECH OUTPUT: '1 of 20 items selected on 1 of 20.'"]))
+     "SPEECH OUTPUT: '1 of 22 items selected on 1 of 22.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
@@ -58,7 +58,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'bin icon', cursor=1",
      "SPEECH OUTPUT: 'Icon panel.'",
      "SPEECH OUTPUT: 'bin.'",
-     "SPEECH OUTPUT: '2 of 20 items selected on 1 of 20.'"]))
+     "SPEECH OUTPUT: '2 of 22 items selected on 1 of 22.'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
 
diff --git a/test/keystrokes/gtk3-demo/role_info_bar.py b/test/keystrokes/gtk3-demo/role_info_bar.py
index d58693d..0756839 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 filler $l'",
+    ["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 filler'"]))
+     "SPEECH OUTPUT: 'Info bars This is an info bar with message type GTK_MESSAGE_INFO'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
 
diff --git a/test/keystrokes/gtk3-demo/role_text_multiline_selection.py 
b/test/keystrokes/gtk3-demo/role_text_multiline_selection.py
index fcb8609..e9b5da9 100644
--- a/test/keystrokes/gtk3-demo/role_text_multiline_selection.py
+++ b/test/keystrokes/gtk3-demo/role_text_multiline_selection.py
@@ -11,6 +11,7 @@ sequence.append(KeyComboAction("End"))
 sequence.append(KeyComboAction("Up"))
 sequence.append(KeyComboAction("Up"))
 sequence.append(KeyComboAction("Up"))
+sequence.append(KeyComboAction("Up"))
 sequence.append(KeyComboAction("<Shift><Control>Right"))
 sequence.append(KeyComboAction("Down"))
 sequence.append(KeyComboAction("Return"))
@@ -20,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  $l'",
+    ["BRAILLE LINE:  'gtk3-demo application Hypertext frame Some text to show that simple hyper text can 
easily be realized  $l'",
      "     VISIBLE:  'Some text to show that simple hy', cursor=1",
      "SPEECH OUTPUT: 'entire document selected' voice=system"]))
 
diff --git a/test/keystrokes/oocalc/coordinate_announcement_off.py 
b/test/keystrokes/oocalc/coordinate_announcement_off.py
index 6eae6a4..d906e3d 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:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table Good in Pies A2'",
+    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame 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:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table Yes B2'",
+    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Yes B2'",
      "     VISIBLE:  'Yes B2', cursor=1",
      "SPEECH OUTPUT: 'Yes.'"]))
 
@@ -30,7 +30,7 @@ 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:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table  A1'",
+    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table  A1'",
      "     VISIBLE:  ' A1', cursor=1",
      "SPEECH OUTPUT: 'blank.'"]))
 
diff --git a/test/keystrokes/oocalc/coordinate_announcement_on.py 
b/test/keystrokes/oocalc/coordinate_announcement_on.py
index f84f4dd..f0b456c 100644
--- a/test/keystrokes/oocalc/coordinate_announcement_on.py
+++ b/test/keystrokes/oocalc/coordinate_announcement_on.py
@@ -14,7 +14,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down to A2 - don't speak cell coordinates",
-    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table Good in Pies A2'",
+    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame 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.'"]))
 
@@ -22,7 +22,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "3. Right to B2 - don't speak cell coordinates",
-    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table Yes B2'",
+    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Yes B2'",
      "     VISIBLE:  'Yes B2', cursor=1",
      "SPEECH OUTPUT: 'Yes B2.'"]))
 
@@ -30,7 +30,7 @@ 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:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table  A1'",
+    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table  A1'",
      "     VISIBLE:  ' A1', cursor=1",
      "SPEECH OUTPUT: 'blank A1.'"]))
 
diff --git a/test/keystrokes/oocalc/document_enter_text.py b/test/keystrokes/oocalc/document_enter_text.py
index f83c85c..c910534 100644
--- a/test/keystrokes/oocalc/document_enter_text.py
+++ b/test/keystrokes/oocalc/document_enter_text.py
@@ -10,22 +10,29 @@ sequence = MacroSequence()
 sequence.append(PauseAction(3000))
 
 sequence.append(utils.StartRecordingAction())
-sequence.append(TypeAction("hi"))
+sequence.append(TypeAction("h"))
 sequence.append(utils.AssertPresentationAction(
-    "1. Type 'hi' - keyecho is off",
-    ["BRAILLE LINE:  'soffice application 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 frame Untitled 1 - LibreOffice Calc 
root pane Untitled1 - LibreOffice Spreadsheets Cell A1 panel Paragraph 0 hi $l'",
-     "     VISIBLE:  'Paragraph 0 hi $l', cursor=15",
+    "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 hi'"]))
+     "SPEECH OUTPUT: 'Paragraph 0 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"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
-    "2. Press Return",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc 
root pane Untitled1 - LibreOffice Spreadsheets Sheet Sheet1 table  A2'",
+    "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'",
diff --git a/test/keystrokes/oocalc/document_nav_dynamic_headers.py 
b/test/keystrokes/oocalc/document_nav_dynamic_headers.py
index 3ac1ca6..37fcc7f 100644
--- a/test/keystrokes/oocalc/document_nav_dynamic_headers.py
+++ b/test/keystrokes/oocalc/document_nav_dynamic_headers.py
@@ -14,7 +14,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Down Arrow to cell A2",
-    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table Good in Pies A2'",
+    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame 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.'"]))
 
@@ -22,7 +22,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "2. Right Arrow to cell B2",
-    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table Yes B2'",
+    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Yes B2'",
      "     VISIBLE:  'Yes B2', cursor=1",
      "SPEECH OUTPUT: 'Yes B2.'"]))
 
@@ -30,7 +30,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Down Arrow to cell B3",
-    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table Yes B3'",
+    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Yes B3'",
      "     VISIBLE:  'Yes B3', cursor=1",
      "SPEECH OUTPUT: 'Yes B3.'"]))
 
@@ -38,7 +38,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "4. Right Arrow to cell C3",
-    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table Yes C3'",
+    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Yes C3'",
      "     VISIBLE:  'Yes C3', cursor=1",
      "SPEECH OUTPUT: 'Yes C3.'"]))
 
@@ -46,7 +46,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:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table Yes C3'",
+    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Yes C3'",
      "     VISIBLE:  'Yes C3', cursor=1",
      "SPEECH OUTPUT: 'table cell.'",
      "SPEECH OUTPUT: 'column 3.'",
@@ -71,7 +71,7 @@ sequence.append(KeyComboAction("c"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "7. Set dynamic row headers",
-    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table  A1'",
+    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table  A1'",
      "     VISIBLE:  ' A1', cursor=1",
      "BRAILLE LINE:  'Dynamic row header set for column A'",
      "     VISIBLE:  'Dynamic row header set for colum', cursor=0",
@@ -81,9 +81,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "8. Down Arrow to cell A2",
-    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table  A1'",
+    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table  A1'",
      "     VISIBLE:  ' A1', cursor=1",
-     "BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table Good in Pies A2'",
+     "BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame 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.'"]))
 
@@ -91,7 +91,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "9. Right Arrow to cell B2",
-    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table Good in Pies Apples Yes B2'",
+    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame 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.'"]))
 
@@ -99,7 +99,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "10. Down Arrow to cell B3",
-    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table Juiceable Apples Yes B3'",
+    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Juiceable Apples Yes B3'",
      "     VISIBLE:  'Yes B3', cursor=1",
      "SPEECH OUTPUT: 'Juiceable Yes B3.'"]))
 
@@ -107,7 +107,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "11. Right Arrow to cell C3",
-    ["BRAILLE LINE:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table Juiceable Pears Yes C3'",
+    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc root pane Sheet Sheet1 
table Juiceable Pears Yes C3'",
      "     VISIBLE:  'Yes C3', cursor=1",
      "SPEECH OUTPUT: 'Pears Yes C3.'"]))
 
@@ -115,7 +115,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:  'soffice application fruit.ods - LibreOffice Calc frame fruit.ods - LibreOffice Calc 
root pane Sheet Sheet1 table Juiceable Pears Yes C3'",
+    ["BRAILLE LINE:  'fruit.ods - LibreOffice Calc frame 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 4720b8d..1b0f391 100644
--- a/test/keystrokes/oocalc/manage_names_combobox.py
+++ b/test/keystrokes/oocalc/manage_names_combobox.py
@@ -12,14 +12,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift><Control>t"))
 sequence.append(utils.AssertPresentationAction(
     "1. Shift+Ctrl+T",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc frame 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 frame 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' voice=system",
+    ["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",
      "SPEECH OUTPUT: 'Formula Tool Bar tool bar'",
-     "SPEECH OUTPUT: 'Name Box combo box.'"]))
+     "SPEECH OUTPUT: 'Name Box editable combo box.'",
+     "SPEECH OUTPUT: 'A1 selected'"]))
 
 sequence.append(KeyComboAction("<Control>a"))
 sequence.append(KeyComboAction("BackSpace"))
@@ -29,20 +26,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction("C3"))
 sequence.append(utils.AssertPresentationAction(
     "2. Type 'C3' - keyecho is disabled",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc frame 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 frame 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 frame 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 frame Untitled 1 - LibreOffice Calc 
root pane Formula Tool Bar tool bar Name Box C3 $l'",
-     "     VISIBLE:  'Name Box C3 $l', cursor=12"]))
+    ["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"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "3. Press Return to jump to C3",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc 
root pane Untitled1 - LibreOffice Spreadsheets Sheet Sheet1 table  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",
      "SPEECH OUTPUT: 'Sheet Sheet1.'",
      "SPEECH OUTPUT: 'table with 1048576 rows 1024 columns'",
diff --git a/test/keystrokes/oocalc/messages_dynamic_headers.py 
b/test/keystrokes/oocalc/messages_dynamic_headers.py
index 5da87cc..07394d1 100644
--- a/test/keystrokes/oocalc/messages_dynamic_headers.py
+++ b/test/keystrokes/oocalc/messages_dynamic_headers.py
@@ -8,6 +8,8 @@ import utils
 sequence = MacroSequence()
 
 sequence.append(PauseAction(3000))
+sequence.append(KeyComboAction("Down"))
+sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("<Control>Home"))
 
 sequence.append(utils.StartRecordingAction())
@@ -27,11 +29,11 @@ sequence.append(KeyComboAction("r"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "2. Clear column headers",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc 
root pane Untitled1 - LibreOffice Spreadsheets Sheet Sheet1 table  A1'",
+    ["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:  'Dynamic column header set for row 1'",
      "     VISIBLE:  'Dynamic column header set for ro', cursor=0",
-     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc 
root pane Untitled1 - LibreOffice Spreadsheets Sheet Sheet1 table  A1'",
+     "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:  'Dynamic column header cleared.'",
      "     VISIBLE:  'Dynamic column header cleared.', cursor=0",
@@ -44,7 +46,7 @@ sequence.append(KeyComboAction("c"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "3. Set row headers",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc 
root pane Untitled1 - LibreOffice Spreadsheets Sheet Sheet1 table  A1'",
+    ["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:  'Dynamic row header set for column A'",
      "     VISIBLE:  'Dynamic row header set for colum', cursor=0",
@@ -57,11 +59,11 @@ sequence.append(KeyComboAction("c"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "4. Clear row headers",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc 
root pane Untitled1 - LibreOffice Spreadsheets Sheet Sheet1 table  A1'",
+    ["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:  'Dynamic row header set for column A'",
      "     VISIBLE:  'Dynamic row header set for colum', cursor=0",
-     "BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Calc frame Untitled 1 - LibreOffice Calc 
root pane Untitled1 - LibreOffice Spreadsheets Sheet Sheet1 table  A1'",
+     "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:  'Dynamic row header cleared.'",
      "     VISIBLE:  'Dynamic row header cleared.', cursor=0",
diff --git a/test/keystrokes/oowriter/document_nav_cell.py b/test/keystrokes/oowriter/document_nav_cell.py
index b558f13..6ebe586 100644
--- a/test/keystrokes/oowriter/document_nav_cell.py
+++ b/test/keystrokes/oowriter/document_nav_cell.py
@@ -60,5 +60,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'blank A2.'"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/document_nav_line.py b/test/keystrokes/oowriter/document_nav_line.py
index f6a3bd9..6a1944b 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document Line 1 $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document Line 1 $l'",
      "     VISIBLE:  'Line 1 $l', cursor=1",
      "SPEECH OUTPUT: 'Line 1'"]))
 
@@ -50,9 +50,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "5. Arrow up to 'Line 1'",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document Line 1 $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document Line 1 $l'",
      "     VISIBLE:  'Line 1 $l', cursor=1",
      "SPEECH OUTPUT: 'Line 1'"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/document_nav_line_bullets.py 
b/test/keystrokes/oowriter/document_nav_line_bullets.py
index 118eb2a..0b728b4 100644
--- a/test/keystrokes/oowriter/document_nav_line_bullets.py
+++ b/test/keystrokes/oowriter/document_nav_line_bullets.py
@@ -44,9 +44,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "4. Up to previous bulleted line",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document • Line 1 $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document • Line 1 $l'",
      "     VISIBLE:  '• Line 1 $l', cursor=3",
      "SPEECH OUTPUT: '• Line 1'"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/document_nav_paragraph.py 
b/test/keystrokes/oowriter/document_nav_paragraph.py
index b49967c..e71f89d 100644
--- a/test/keystrokes/oowriter/document_nav_paragraph.py
+++ b/test/keystrokes/oowriter/document_nav_paragraph.py
@@ -82,5 +82,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'NOBODY expects the Spanish Inqui', cursor=1",
      "SPEECH OUTPUT: 'NOBODY expects the Spanish Inquisition! Amongst our weaponry are such diverse elements 
as: fear, surprise, ruthless efficiency, an almost fanatical devotion to the Pope, and nice red uniforms - Oh 
damn!'"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/document_nav_word.py b/test/keystrokes/oowriter/document_nav_word.py
index 22a4c46..d2aede3 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=6",
      "SPEECH OUTPUT: 'is '"]))
 
@@ -107,9 +107,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Left"))
 sequence.append(utils.AssertPresentationAction(
     "12. Previous Word",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=1",
      "SPEECH OUTPUT: 'This '"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/document_new.py b/test/keystrokes/oowriter/document_new.py
index 7897540..3adc989 100644
--- a/test/keystrokes/oowriter/document_new.py
+++ b/test/keystrokes/oowriter/document_new.py
@@ -20,5 +20,7 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'Untitled 2 - LibreOffice Writer frame'",
      "SPEECH OUTPUT: 'blank'"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/flat_review_context_menu.py 
b/test/keystrokes/oowriter/flat_review_context_menu.py
index 849797a..2aba4d3 100644
--- a/test/keystrokes/oowriter/flat_review_context_menu.py
+++ b/test/keystrokes/oowriter/flat_review_context_menu.py
@@ -23,12 +23,12 @@ sequence.append(utils.AssertPresentationAction(
     [""]))
 
 sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("KP_9"))
+sequence.append(KeyComboAction("KP_8"))
 sequence.append(utils.AssertPresentationAction(
-    "3. Review next line",
-    ["BRAILLE LINE:  'separator $l'",
-     "     VISIBLE:  'separator $l', cursor=1",
-     "SPEECH OUTPUT: 'separator'"]))
+    "3. Review current line",
+    ["BRAILLE LINE:  'Paste $l'",
+     "     VISIBLE:  'Paste $l', cursor=1",
+     "SPEECH OUTPUT: 'Paste'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
@@ -50,22 +50,6 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
     "6. Review next line",
-    ["BRAILLE LINE:  'Clear Direct Formatting $l'",
-     "     VISIBLE:  'Clear Direct Formatting $l', cursor=1",
-     "SPEECH OUTPUT: 'Clear Direct Formatting'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("KP_9"))
-sequence.append(utils.AssertPresentationAction(
-    "7. Review next line",
-    ["BRAILLE LINE:  'separator $l'",
-     "     VISIBLE:  'separator $l', cursor=1",
-     "SPEECH OUTPUT: 'separator'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("KP_9"))
-sequence.append(utils.AssertPresentationAction(
-    "8. Review next line",
     ["BRAILLE LINE:  'Character... $l'",
      "     VISIBLE:  'Character... $l', cursor=1",
      "SPEECH OUTPUT: 'Character...'"]))
@@ -73,7 +57,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
-    "9. Review next line",
+    "7. Review next line",
     ["BRAILLE LINE:  'Paragraph... $l'",
      "     VISIBLE:  'Paragraph... $l', cursor=1",
      "SPEECH OUTPUT: 'Paragraph...'"]))
@@ -81,7 +65,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
-    "10. Review next line",
+    "8. Review next line",
     ["BRAILLE LINE:  'Bullets and Numbering... $l'",
      "     VISIBLE:  'Bullets and Numbering... $l', cursor=1",
      "SPEECH OUTPUT: 'Bullets and Numbering...'"]))
@@ -89,7 +73,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
-    "11. Review next line",
+    "9. Review next line",
     ["BRAILLE LINE:  'Page... $l'",
      "     VISIBLE:  'Page... $l', cursor=1",
      "SPEECH OUTPUT: 'Page...'"]))
@@ -97,15 +81,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
-    "12. Review next line",
-    ["BRAILLE LINE:  'Change Case $l'",
-     "     VISIBLE:  'Change Case $l', cursor=1",
-     "SPEECH OUTPUT: 'Change Case'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("KP_9"))
-sequence.append(utils.AssertPresentationAction(
-    "13. Review next line",
+    "10. Review next line",
     ["BRAILLE LINE:  'separator $l'",
      "     VISIBLE:  'separator $l', cursor=1",
      "SPEECH OUTPUT: 'separator'"]))
@@ -113,17 +89,19 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
-    "14. Review next line",
-    ["BRAILLE LINE:  'Edit Paragraph Style... $l'",
-     "     VISIBLE:  'Edit Paragraph Style... $l', cursor=1",
-     "SPEECH OUTPUT: 'Edit Paragraph Style...'"]))
+    "11. Review next line",
+    ["BRAILLE LINE:  'Edit Style... $l'",
+     "     VISIBLE:  'Edit Style... $l', cursor=1",
+     "SPEECH OUTPUT: 'Edit Style...'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
-    "15. Review next line",
+    "12. Review next line",
     [""]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
 
diff --git a/test/keystrokes/oowriter/flat_review_line.py b/test/keystrokes/oowriter/flat_review_line.py
index cbdd204..a490cce 100644
--- a/test/keystrokes/oowriter/flat_review_line.py
+++ b/test/keystrokes/oowriter/flat_review_line.py
@@ -91,5 +91,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Line 1 $l', cursor=1",
      "SPEECH OUTPUT: 'Line 1'"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/flat_review_line_columns.py 
b/test/keystrokes/oowriter/flat_review_line_columns.py
index 31088f8..f7b7c2a 100644
--- a/test/keystrokes/oowriter/flat_review_line_columns.py
+++ b/test/keystrokes/oowriter/flat_review_line_columns.py
@@ -46,7 +46,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "4. Top of file.",
-    ["BRAILLE LINE:  'soffice application 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:  'column-example.odt - LibreOffice Writer frame 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 '"]))
 
@@ -121,6 +121,7 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'EFFector Vol. 19, No. 38  October  Intercept Personal ",
      "'"]))
 
-sequence.append(KeyComboAction("<Control>w"))
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/flat_review_platform_menubar.py 
b/test/keystrokes/oowriter/flat_review_platform_menubar.py
index 6919db1..3115a0c 100644
--- a/test/keystrokes/oowriter/flat_review_platform_menubar.py
+++ b/test/keystrokes/oowriter/flat_review_platform_menubar.py
@@ -16,9 +16,7 @@ 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 Tools Window Help $l'",
-     "     VISIBLE:  'File Edit View Insert Format Sty', cursor=1",
-     "SPEECH OUTPUT: 'File Edit View Insert Format Styles Table Tools Window Help'"]))
+    []))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_5"))
@@ -96,5 +94,7 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'foxtrot'",
      "SPEECH OUTPUT: 'Unicode 0046'"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/flat_review_word.py b/test/keystrokes/oowriter/flat_review_word.py
index 9a431bc..8438e56 100644
--- a/test/keystrokes/oowriter/flat_review_word.py
+++ b/test/keystrokes/oowriter/flat_review_word.py
@@ -120,5 +120,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Line 1 $l', cursor=1",
      "SPEECH OUTPUT: 'Line '"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/messages_table.py b/test/keystrokes/oowriter/messages_table.py
index a58629d..a37e1ff 100644
--- a/test/keystrokes/oowriter/messages_table.py
+++ b/test/keystrokes/oowriter/messages_table.py
@@ -75,7 +75,7 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Row inserted at the end of the table.' voice=system",
-     "SPEECH OUTPUT: 'blank'"]))
+     "SPEECH OUTPUT: 'blank A3.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Z"))
@@ -89,7 +89,10 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'undo' voice=system",
      "SPEECH OUTPUT: 'Last row deleted.' voice=system",
-     "SPEECH OUTPUT: 'blank'"]))
+     "SPEECH OUTPUT: 'End of table.'",
+     "SPEECH OUTPUT: 'A2 B2.'"]))
+
+sequence.append(KeyComboAction("<Alt>F4"))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/say_all.py b/test/keystrokes/oowriter/say_all.py
index 7320ab6..c1de7b9 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document Line 1 $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document Line 1 $l'",
      "     VISIBLE:  'Line 1 $l', cursor=1",
      "SPEECH OUTPUT: 'Line 1'"]))
 
@@ -33,5 +33,7 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'Line 3'",
      "SPEECH OUTPUT: 'Line 4'"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/say_all_no_sentences.py 
b/test/keystrokes/oowriter/say_all_no_sentences.py
index 747687d..732335c 100644
--- a/test/keystrokes/oowriter/say_all_no_sentences.py
+++ b/test/keystrokes/oowriter/say_all_no_sentences.py
@@ -25,5 +25,7 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'fox jumps over'",
      "SPEECH OUTPUT: 'the lazy dog'"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/selection_word.py b/test/keystrokes/oowriter/selection_word.py
index 288e560..917da39 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Untitled1 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Untitled1 - LibreOffice Document This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=16",
      "SPEECH OUTPUT: 'dot'",
      "SPEECH OUTPUT: 'unselected' voice=system"]))
@@ -218,5 +218,7 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'this'",
      "SPEECH OUTPUT: 'unselected' voice=system"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/spellcheck.py b/test/keystrokes/oowriter/spellcheck.py
index 9cbfa88..8ad53f0 100644
--- a/test/keystrokes/oowriter/spellcheck.py
+++ b/test/keystrokes/oowriter/spellcheck.py
@@ -32,5 +32,7 @@ sequence.append(utils.AssertPresentationAction(
     ["SPEECH OUTPUT: 'Suggestions'",
      "SPEECH OUTPUT: 'overt.'"]))
 
+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 24fb8e3..2970765 100644
--- a/test/keystrokes/oowriter/spoken_indentation.py
+++ b/test/keystrokes/oowriter/spoken_indentation.py
@@ -21,5 +21,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Up Arrow to typed line",
     ["SPEECH OUTPUT: '2 tabs 3 spaces                     This is a test.'"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/structural_nav_table.py 
b/test/keystrokes/oowriter/structural_nav_table.py
index 812fd91..8f24da0 100644
--- a/test/keystrokes/oowriter/structural_nav_table.py
+++ b/test/keystrokes/oowriter/structural_nav_table.py
@@ -188,7 +188,7 @@ sequence.append(utils.AssertPresentationAction(
     "15. Up Arrow out of table.",
     ["BRAILLE LINE:  'Sun $l'",
      "     VISIBLE:  'Sun $l', cursor=1",
-     "BRAILLE LINE:  'soffice application table-sample2.odt - LibreOffice Writer frame table-sample2.odt - 
LibreOffice Writer root pane table-sample2 - LibreOffice Document This is a test. $l'",
+     "BRAILLE LINE:  'table-sample2.odt - LibreOffice Writer frame 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,12 +207,13 @@ sequence.append(KeyComboAction("z"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "17. Toggle structural navigation off",
-    ["BRAILLE LINE:  'soffice application table-sample2.odt - LibreOffice Writer frame table-sample2.odt - 
LibreOffice Writer root pane table-sample2 - LibreOffice Document This is a test. $l'",
+    ["BRAILLE LINE:  'table-sample2.odt - LibreOffice Writer frame 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",
      "SPEECH OUTPUT: 'Structural navigation keys off.' voice=system"]))
 
-sequence.append(KeyComboAction("<Control>W"))
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/table_cell_row.py b/test/keystrokes/oowriter/table_cell_row.py
index 8a54474..270cf5d 100644
--- a/test/keystrokes/oowriter/table_cell_row.py
+++ b/test/keystrokes/oowriter/table_cell_row.py
@@ -7,10 +7,11 @@ import utils
 
 sequence = MacroSequence()
 
+sequence.append(PauseAction(5000))
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(KeyComboAction("Down"))
 sequence.append(KeyComboAction("Down"))
-sequence.append(PauseAction(10000))
+sequence.append(PauseAction(5000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyPressAction(0, None, "KP_Insert"))
@@ -69,5 +70,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Mon $l', cursor=4",
      "SPEECH OUTPUT: 'Sun A1 Mon B1 Tue C1 Wed D1 Thu E1 Fri F1 Sat G1.'"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/text_attributes.py b/test/keystrokes/oowriter/text_attributes.py
index f331eb5..bda0c44 100644
--- a/test/keystrokes/oowriter/text_attributes.py
+++ b/test/keystrokes/oowriter/text_attributes.py
@@ -57,5 +57,7 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'foreground color: black' voice=system",
      "SPEECH OUTPUT: 'background color: white' voice=system"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/ui_navigator.py b/test/keystrokes/oowriter/ui_navigator.py
index e68ca3f..50183ca 100644
--- a/test/keystrokes/oowriter/ui_navigator.py
+++ b/test/keystrokes/oowriter/ui_navigator.py
@@ -23,8 +23,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Down arrow to the next item",
-    ["BRAILLE LINE:  'soffice application Navigator frame Navigator frame Navigator panel Content View tree 
Tables collapsed'",
+    ["BRAILLE LINE:  'Navigator frame Navigator panel Content Navigation View tree Tables collapsed'",
      "     VISIBLE:  'Tables collapsed', cursor=1",
+     "SPEECH OUTPUT: 'Navigator panel'",
      "SPEECH OUTPUT: 'Tables.'",
      "SPEECH OUTPUT: 'collapsed.'"]))
 
@@ -32,7 +33,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Right"))
 sequence.append(utils.AssertPresentationAction(
     "2. Expand it",
-    ["BRAILLE LINE:  'soffice application Navigator frame Navigator frame Navigator panel Content View tree 
Tables expanded'",
+    ["BRAILLE LINE:  'Navigator frame Navigator panel Content Navigation View tree Tables expanded'",
      "     VISIBLE:  'Tables expanded', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
@@ -40,7 +41,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Left"))
 sequence.append(utils.AssertPresentationAction(
     "3. Collapse it",
-    ["BRAILLE LINE:  'soffice application Navigator frame Navigator frame Navigator panel Content View tree 
Tables collapsed'",
+    ["BRAILLE LINE:  'Navigator frame Navigator panel Content Navigation View tree Tables collapsed'",
      "     VISIBLE:  'Tables collapsed', cursor=1",
      "SPEECH OUTPUT: 'collapsed'"]))
 
@@ -48,9 +49,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Down arrow to the next item",
-    ["BRAILLE LINE:  'soffice application Navigator frame Navigator frame Navigator panel Content View tree 
Text frames'",
+    ["BRAILLE LINE:  'Navigator frame Navigator panel Content Navigation View tree Text frames'",
      "     VISIBLE:  'Text frames', cursor=1",
      "SPEECH OUTPUT: 'Text frames.'"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/ui_role_combo_box.py b/test/keystrokes/oowriter/ui_role_combo_box.py
index 339877f..af81328 100644
--- a/test/keystrokes/oowriter/ui_role_combo_box.py
+++ b/test/keystrokes/oowriter/ui_role_combo_box.py
@@ -18,6 +18,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(KeyComboAction("Down"))
 sequence.append(KeyComboAction("Down"))
 sequence.append(KeyComboAction("Down"))
+sequence.append(KeyComboAction("Down"))
 sequence.append(KeyComboAction("Return"))
 sequence.append(PauseAction(3000))
 
@@ -29,15 +30,15 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Move to Strikethrough",
-    ["BRAILLE LINE:  'soffice application Character frame Character dialog Font Effects page tab (Without) 
combo box'",
-     "     VISIBLE:  '(Without) combo box', cursor=1",
-     "SPEECH OUTPUT: '(Without) combo box.'"]))
+    ["BRAILLE LINE:  'Character dialog Font Effects page tab Strikethrough: (Without) combo box'",
+     "     VISIBLE:  'Strikethrough: (Without) combo b', cursor=16",
+     "SPEECH OUTPUT: 'Strikethrough: (Without) combo box.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down Arrow",
-    ["BRAILLE LINE:  'soffice application Character frame Character dialog Font Effects page tab Single list 
item'",
+    ["BRAILLE LINE:  'Character dialog Font Effects page tab Strikethrough: Single combo box Single list 
item'",
      "     VISIBLE:  'Single list item', cursor=1",
      "SPEECH OUTPUT: 'Single.'"]))
 
@@ -45,9 +46,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "3. Up Arrow",
-    ["BRAILLE LINE:  'soffice application Character frame Character dialog Font Effects page tab (Without) 
list item'",
+    ["BRAILLE LINE:  'Character dialog Font Effects page tab Strikethrough: (Without) combo box (Without) 
list item'",
      "     VISIBLE:  '(Without) list item', cursor=1",
      "SPEECH OUTPUT: '(Without).'"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/ui_role_label.py b/test/keystrokes/oowriter/ui_role_label.py
index 034e106..4d48793 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:  'soffice application Agenda Wizard frame Agenda Wizard dialog Steps panel General 
information'",
+    ["BRAILLE LINE:  '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:  'soffice application Agenda Wizard frame Agenda Wizard dialog Steps panel Headings to 
include'",
+    ["BRAILLE LINE:  'Agenda Wizard dialog Steps panel Headings to include'",
      "     VISIBLE:  'Headings to include', cursor=1",
      "SPEECH OUTPUT: 'Headings to include.'"]))
 
@@ -35,9 +35,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Down arrow to the next item",
-    ["BRAILLE LINE:  'soffice application Agenda Wizard frame Agenda Wizard dialog Steps panel Names'",
+    ["BRAILLE LINE:  'Agenda Wizard dialog Steps panel Names'",
      "     VISIBLE:  'Names', cursor=1",
      "SPEECH OUTPUT: 'Names.'"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/ui_role_list_item.py b/test/keystrokes/oowriter/ui_role_list_item.py
index f67d621..6290044 100644
--- a/test/keystrokes/oowriter/ui_role_list_item.py
+++ b/test/keystrokes/oowriter/ui_role_list_item.py
@@ -16,26 +16,35 @@ sequence.append(PauseAction(3000))
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
-    "1. Tab to list item",
-    ["BRAILLE LINE:  'soffice application Template Manager frame Template Manager dialog Drawings page tab 
list My Templates list item'",
-     "     VISIBLE:  'My Templates list item', cursor=1",
-     "SPEECH OUTPUT: 'My Templates.'"]))
+    "1. Tab to combo box",
+    ["BRAILLE LINE:  'Templates dialog All Categories combo box'",
+     "     VISIBLE:  'All Categories combo box', cursor=1",
+     "SPEECH OUTPUT: '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.",
+     ""]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
-    "2. Right to next list item",
-    ["BRAILLE LINE:  'soffice application Template Manager frame Template Manager dialog Drawings page tab 
list Business Correspondence list item'",
-     "     VISIBLE:  'Business Correspondence list ite', cursor=1",
-     "SPEECH OUTPUT: 'Business Correspondence.'"]))
+    "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.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
-    "3. Left to previous list item",
-    ["BRAILLE LINE:  'soffice application Template Manager frame Template Manager dialog Drawings page tab 
list My Templates list item'",
-     "     VISIBLE:  'My Templates list item', cursor=1",
-     "SPEECH OUTPUT: 'My Templates.'"]))
+    "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.'"]))
+
+sequence.append(KeyComboAction("<Alt>F4"))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/ui_role_menu.py b/test/keystrokes/oowriter/ui_role_menu.py
index 3523ae4..6153716 100644
--- a/test/keystrokes/oowriter/ui_role_menu.py
+++ b/test/keystrokes/oowriter/ui_role_menu.py
@@ -29,5 +29,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Untitled 1 - LibreOffice Writer ', cursor=1",
      "SPEECH OUTPUT: 'Untitled 1 - LibreOffice Writer frame'"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/ui_role_menu_flat_review.py 
b/test/keystrokes/oowriter/ui_role_menu_flat_review.py
index 062ecb3..b01ff62 100644
--- a/test/keystrokes/oowriter/ui_role_menu_flat_review.py
+++ b/test/keystrokes/oowriter/ui_role_menu_flat_review.py
@@ -156,5 +156,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  '<x> Status Bar $l', cursor=1",
      "SPEECH OUTPUT: 'checked Status Bar'"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/ui_role_toolbar.py b/test/keystrokes/oowriter/ui_role_toolbar.py
index 38372bf..34a370b 100644
--- a/test/keystrokes/oowriter/ui_role_toolbar.py
+++ b/test/keystrokes/oowriter/ui_role_toolbar.py
@@ -7,12 +7,13 @@ import utils
 
 sequence = MacroSequence()
 sequence.append(PauseAction(3000))
+sequence.append(KeyComboAction("F6"))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("F6"))
 sequence.append(utils.AssertPresentationAction(
     "1. F6 to Standard toolbar",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Standard tool bar New push button'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame 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'"]))
@@ -21,7 +22,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "2. Right Arrow to Open button",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Standard tool bar Open push button'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Standard tool bar Open push button'",
      "     VISIBLE:  'Open push button', cursor=1",
      "SPEECH OUTPUT: 'Open push button'"]))
 
@@ -29,7 +30,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "3. Right Arrow to Save button",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Standard tool bar Save push button'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Standard tool bar Save push button'",
      "     VISIBLE:  'Save push button', cursor=1",
      "SPEECH OUTPUT: 'Save push button'"]))
 
@@ -37,17 +38,18 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("F6"))
 sequence.append(utils.AssertPresentationAction(
     "4. F6 to next toolbar",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar Default Style $l combo box'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame 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 combo box.'"]))
+     "SPEECH OUTPUT: 'Apply Paragraph Style editable combo box.'",
+     "SPEECH OUTPUT: 'Default Style'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "5. Tab to next item",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar Update Style push button'",
+    ["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'"]))
 
@@ -55,15 +57,16 @@ 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar Default Style $l combo box'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar Default Style $l combo box'",
      "     VISIBLE:  'Default Style $l combo box', cursor=1",
-     "SPEECH OUTPUT: 'Default Style combo box.'"]))
+     "SPEECH OUTPUT: 'Apply 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar Text Body list item'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar Text Body list item'",
      "     VISIBLE:  'Text Body list item', cursor=1",
      "SPEECH OUTPUT: 'Text Body.'"]))
 
@@ -71,7 +74,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "8. Down in Apply Style (Collapsed)",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar Quotations list item'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar Quotations list item'",
      "     VISIBLE:  'Quotations list item', cursor=1",
      "SPEECH OUTPUT: 'Quotations.'"]))
 
@@ -86,7 +89,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "10. Down in Apply Style (Expanded)",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar  combo boxTitle $l Title list item'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar  combo boxTitle $l Title list item'",
      "     VISIBLE:  'Title list item', cursor=1",
      "SPEECH OUTPUT: 'Title.'"]))
 
@@ -94,7 +97,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "11. Down in Apply Style (Expanded)",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar  combo boxSubtitle $l Subtitle list item'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar  combo boxSubtitle $l Subtitle list item'",
      "     VISIBLE:  'Subtitle list item', cursor=1",
      "SPEECH OUTPUT: 'Subtitle.'"]))
 
@@ -102,7 +105,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "12. Up in Apply Style (Expanded)",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar  combo boxTitle $l Title list item'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar  combo boxTitle $l Title list item'",
      "     VISIBLE:  'Title list item', cursor=1",
      "SPEECH OUTPUT: 'Title.'"]))
 
@@ -117,7 +120,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "14. Tab to next widget",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar Update Style push button'",
+    ["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'"]))
 
@@ -125,7 +128,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "15. Tab to next widget",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar New Style push button'",
+    ["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'"]))
 
@@ -133,15 +136,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "16. Tab to next widget",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar Liberation Sans $l combo box'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar Liberation Sans $l combo box'",
      "     VISIBLE:  'Liberation Sans $l combo box', cursor=1",
-     "SPEECH OUTPUT: 'Liberation Sans combo box.'"]))
+     "SPEECH OUTPUT: 'Font Name 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar New Style push button'",
+    ["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'"]))
 
@@ -149,7 +153,7 @@ 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar Update Style push button'",
+    ["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'"]))
 
@@ -157,7 +161,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "19. Tab to next widget",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar New Style push button'",
+    ["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'"]))
 
@@ -165,23 +169,25 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "20. Tab to next widget",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar Liberation Sans $l combo box'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar Liberation Sans $l combo box'",
      "     VISIBLE:  'Liberation Sans $l combo box', cursor=1",
-     "SPEECH OUTPUT: 'Liberation Sans combo box.'"]))
+     "SPEECH OUTPUT: 'Font Name 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar 28 $l combo box'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar 28 $l combo box'",
      "     VISIBLE:  '28 $l combo box', cursor=1",
-     "SPEECH OUTPUT: '28 combo box.'"]))
+     "SPEECH OUTPUT: 'Font Size 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:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar &=y Bold toggle button'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar &=y Bold toggle button'",
      "     VISIBLE:  '&=y Bold toggle button', cursor=1",
      "SPEECH OUTPUT: 'Bold on'"]))
 
@@ -189,7 +195,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "23. Tab to next widget",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar & y Italic toggle button'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar & y Italic toggle button'",
      "     VISIBLE:  '& y Italic toggle button', cursor=1",
      "SPEECH OUTPUT: 'Italic off'"]))
 
@@ -197,7 +203,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "24. Tab to next widget",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar & y Underline toggle button'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar & y Underline toggle button'",
      "     VISIBLE:  '& y Underline toggle button', cursor=1",
      "SPEECH OUTPUT: 'Underline off'"]))
 
@@ -211,7 +217,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "26. Tab to next widget",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar & y Strikethrough toggle button'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar & y Strikethrough toggle button'",
      "     VISIBLE:  '& y Strikethrough toggle button', cursor=1",
      "SPEECH OUTPUT: 'Strikethrough off'"]))
 
@@ -219,7 +225,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
 sequence.append(utils.AssertPresentationAction(
     "27. Shift Tab to previous widget",
-    ["BRAILLE LINE:  'soffice application Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice 
Writer root pane Formatting tool bar &=y Underline toggle button'",
+    ["BRAILLE LINE:  'Untitled 1 - LibreOffice Writer frame Untitled 1 - LibreOffice Writer root pane 
Formatting tool bar &=y Underline toggle button'",
      "     VISIBLE:  '&=y Underline toggle button', cursor=1",
      "SPEECH OUTPUT: 'Underline on'"]))
 
@@ -229,5 +235,7 @@ sequence.append(utils.AssertPresentationAction(
     "28. Toggle its state",
     ["SPEECH OUTPUT: 'Underline off'"]))
 
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/oowriter/where_am_i_document.py b/test/keystrokes/oowriter/where_am_i_document.py
index fc4b9ec..0784609 100644
--- a/test/keystrokes/oowriter/where_am_i_document.py
+++ b/test/keystrokes/oowriter/where_am_i_document.py
@@ -36,6 +36,7 @@ sequence.append(utils.AssertPresentationAction(
     "2. Basic WhereAmI with multiple paragraphs selected",
     ["SPEECH OUTPUT: 'Spanish Inquisition! Our chief weapon is surprise. Surprise and fear. Fear and 
surprise. Our two weapons are fear and surprise. And ruthless efficiency. Our three weapons are fear, 
surprise, and ruthless efficiency. And an almost fanatical devotion to the Pope. Our four. No. Amongst our 
weapons. Amongst our weaponry, are such elements as fear, surprise. I'll come in again. NOBODY expects the 
Spanish Inquisition! Amongst our weaponry are such diverse elements as: fear, surprise, ruthless efficiency, 
an almost fanatical devotion to the Pope, and nice red uniforms - Oh damn! Now old lady, you have one last 
chance. Confess the heinous sin of heresy, reject the works of the ungodly. Two last chances. And you shall 
be free. Three last chances. You have three last chances, the nature of which I have divulged in my previous 
utterance. Hm! She is made  selected'"]))
 
-sequence.append(KeyComboAction("<Control>w"))
+sequence.append(KeyComboAction("<Alt>F4"))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()


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