[orca] Updating tests



commit 7cfe7f182b19dedde5c1ca88d07090148f211393
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Thu Apr 21 00:25:46 2016 -0400

    Updating tests

 test/harness/runone.sh                             |    3 +-
 test/html/FirefoxProfile/localstore.rdf            |   28 --
 test/html/FirefoxProfile/prefs.js                  |    6 +
 test/html/GnomeWorldWideSmall.jpg                  |  Bin 0 -> 7336 bytes
 test/html/accesskeys.html                          |   17 ++
 test/html/aria-landmarks.html                      |   45 ++++
 test/html/blockquotes.html                         |    9 +-
 test/html/orca-wiki.html                           |    2 +-
 test/keystrokes/firefox/aria_alert.py              |   72 ++----
 test/keystrokes/firefox/aria_alert_dialog.py       |    2 +
 test/keystrokes/firefox/aria_checkbox_dojo.py      |    3 +-
 test/keystrokes/firefox/aria_combobox_dojo.py      |    7 +
 test/keystrokes/firefox/aria_dialog_dismissed.py   |    2 +
 test/keystrokes/firefox/aria_dialog_dojo.py        |    2 +-
 .../firefox/aria_editor_navigation_dojo.py         |   10 +-
 test/keystrokes/firefox/aria_landmarks.params      |    2 +-
 test/keystrokes/firefox/aria_landmarks.py          |    4 +-
 test/keystrokes/firefox/aria_menu.py               |    4 -
 test/keystrokes/firefox/aria_slider.py             |    2 +-
 test/keystrokes/firefox/aria_slider_dojo.py        |   45 ++--
 test/keystrokes/firefox/aria_sliders.py            |    6 +-
 test/keystrokes/firefox/aria_spinner_dojo.py       |    6 -
 test/keystrokes/firefox/aria_tabcontainer_dojo.py  |    2 +-
 test/keystrokes/firefox/aria_tabpanel_text_dojo.py |    2 +-
 test/keystrokes/firefox/aria_toolbar_dojo.py       |    6 +-
 test/keystrokes/firefox/aria_tree_dojo.py          |    3 +-
 test/keystrokes/firefox/find_wiki.py               |    5 +-
 test/keystrokes/firefox/flat_review_combo_box.py   |    6 +-
 .../firefox/focus_tracking_roledescriptions.py     |    4 +-
 test/keystrokes/firefox/html_access_keys.params    |    1 +
 test/keystrokes/firefox/html_access_keys.py        |   62 +++++
 ...ere_am_i.params => html_link_where_am_i.params} |    0
 test/keystrokes/firefox/html_link_where_am_i.py    |   75 ++++++
 test/keystrokes/firefox/html_page_summary.py       |    3 +-
 test/keystrokes/firefox/html_role_links.py         |    2 +-
 .../firefox/html_struct_nav_activate_link.py       |    3 +
 .../firefox/html_struct_nav_bug_554616.py          |    4 +-
 .../firefox/html_struct_nav_bug_567984.py          |   12 +-
 .../html_struct_nav_heading_in_div_with_text.py    |   29 ++-
 .../firefox/html_struct_nav_large_obj.py           |   92 ++++----
 test/keystrokes/firefox/html_struct_nav_links.py   |    8 +-
 .../firefox/label_inference_bug_546815.py          |   14 +-
 .../firefox/label_inference_bugzilla_search.py     |   12 +-
 test/keystrokes/firefox/label_inference_entries.py |   74 +++---
 test/keystrokes/firefox/label_inference_mailman.py |   10 +-
 test/keystrokes/firefox/line_nav_bug_546815.py     |    8 +-
 test/keystrokes/firefox/line_nav_bug_552887a.py    |   48 ++--
 test/keystrokes/firefox/line_nav_bug_570757.py     |    4 +-
 test/keystrokes/firefox/line_nav_bug_577239.py     |   46 ++--
 test/keystrokes/firefox/line_nav_bug_592383.py     |   20 +-
 .../firefox/line_nav_bugzilla_search_down.py       |   10 +-
 .../firefox/line_nav_bugzilla_search_up.py         |   24 +-
 test/keystrokes/firefox/line_nav_empty_anchor.py   |    8 +-
 test/keystrokes/firefox/line_nav_empty_textarea.py |    8 +-
 test/keystrokes/firefox/line_nav_enter_bug.py      |  138 +++++------
 test/keystrokes/firefox/line_nav_entries.py        |   34 ++--
 .../firefox/line_nav_follow_same_page_link.py      |    4 +-
 .../firefox/line_nav_follow_same_page_link_2.py    |    3 +-
 .../firefox/line_nav_follow_same_page_link_3.py    |    3 +-
 .../keystrokes/firefox/line_nav_iframes_blogger.py |    9 +-
 .../keystrokes/firefox/line_nav_images_in_links.py |   40 ++--
 test/keystrokes/firefox/line_nav_lists.py          |   22 +-
 test/keystrokes/firefox/line_nav_slash_test.py     |    4 +-
 test/keystrokes/firefox/line_nav_sun_java.py       |   12 +-
 test/keystrokes/firefox/line_nav_wiki_down.py      |  249 ++++++++++---------
 test/keystrokes/firefox/line_nav_wiki_up.py        |  267 ++++++++++----------
 test/keystrokes/firefox/link_where_am_i.py         |   36 ---
 .../firefox/math_line_nav_torture_test.py          |    2 +-
 .../firefox/mouseover_javascript_alert.py          |    5 +-
 .../firefox/object_nav_descriptions_down.py        |    6 +-
 .../firefox/object_nav_descriptions_up.py          |    6 +-
 .../keystrokes/firefox/object_nav_links_in_text.py |   44 ++--
 .../keystrokes/firefox/object_nav_links_on_line.py |   14 +-
 .../firefox/object_nav_simple_form_down.py         |    6 +-
 .../firefox/object_nav_simple_form_down.settings   |    2 +-
 .../firefox/object_nav_simple_form_up.py           |    2 +-
 .../firefox/object_nav_simple_form_up.settings     |    2 +-
 test/keystrokes/firefox/say_all_bugzilla_search.py |    1 -
 test/keystrokes/firefox/say_all_nested_tables.py   |    1 -
 test/keystrokes/firefox/say_all_simple_form.py     |    3 +
 test/keystrokes/firefox/selection_wiki.py          |   34 ++--
 test/keystrokes/firefox/spelling_errors.py         |    4 +-
 test/keystrokes/firefox/ui_doc_tabs.py             |   39 +--
 test/keystrokes/firefox/ui_role_radio_menu_item.py |   14 +-
 test/keystrokes/firefox/ui_role_tree.py            |   21 +-
 test/keystrokes/firefox/ui_role_tree_table.py      |   24 ++-
 .../firefox/ui_title_and_status_bar.params         |    1 +
 test/keystrokes/firefox/ui_title_and_status_bar.py |   42 +++
 88 files changed, 1090 insertions(+), 886 deletions(-)
---
diff --git a/test/harness/runone.sh b/test/harness/runone.sh
index 5397fff..7702f99 100755
--- a/test/harness/runone.sh
+++ b/test/harness/runone.sh
@@ -97,10 +97,9 @@ then
     FF_PROFILE_DIR=/tmp/FirefoxProfile
     mkdir -p $FF_PROFILE_DIR
     cp $harnessDir/../html/FirefoxProfile/prefs.js $FF_PROFILE_DIR
-    cp $harnessDir/../html/FirefoxProfile/localstore.rdf $FF_PROFILE_DIR
     cp $harnessDir/../html/FirefoxProfile/bookmarks.html $FF_PROFILE_DIR
     cp $harnessDir/../html/FirefoxProfile/extensions.rdf $FF_PROFILE_DIR
-    ARGS="-profile $FF_PROFILE_DIR"
+    ARGS="-profile $FF_PROFILE_DIR -width 1000 -height 650"
 fi
 
 # Consistent profile for testing Epiphany.
diff --git a/test/html/FirefoxProfile/prefs.js b/test/html/FirefoxProfile/prefs.js
index a7fb4d2..b654461 100644
--- a/test/html/FirefoxProfile/prefs.js
+++ b/test/html/FirefoxProfile/prefs.js
@@ -42,9 +42,15 @@ user_pref("privacy.sanitize.promptOnSanitize", false);
 user_pref("privacy.sanitize.sanitizeOnShutdown", true);
 user_pref("signon.rememberSignons", false);
 user_pref("spellchecker.dictionary", "en-US");
+user_pref("lightweightThemes.persisted.footerURL", false);
+user_pref("lightweightThemes.persisted.headerURL", false);
+user_pref("lightweightThemes.selectedThemeID", "firefox-devedition mozilla org");
+user_pref("lightweightThemes.usedThemes", "[]");
 user_pref("font.size.variable.x-western", 16);
+user_pref("font.size.fixed.x-western", 16);
 user_pref("font.name.sans-serif.x-western", "DejaVu Sans");
 user_pref("font.name.serif.x-western", "DejaVu Serif");
+user_pref("font.name.monospace.x-western", "DejaVu Sans Mono");
 user_pref("xxx.legal.rights.seen", "0.0");
 user_pref("browser.rights.3.shown", true);
 user_pref("beagle.autoindex.active", false);
diff --git a/test/html/GnomeWorldWideSmall.jpg b/test/html/GnomeWorldWideSmall.jpg
new file mode 100644
index 0000000..70ff2f7
Binary files /dev/null and b/test/html/GnomeWorldWideSmall.jpg differ
diff --git a/test/html/accesskeys.html b/test/html/accesskeys.html
new file mode 100644
index 0000000..2027261
--- /dev/null
+++ b/test/html/accesskeys.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<title>Access Keys</title>
+</head>
+<body>
+<p>Line 1</p>
+<a href="#main" accesskey="1"></a>
+<div>
+<a name="main"></a>
+<h1>Form!</h1>
+<form name="search" title="Search Website" action="search.php" method="post">
+  <label>Search: <input accesskey="2" type="text"></label>
+  <input type="submit" value="I feel frightened">
+</form>
+</div>
+</body>
diff --git a/test/html/aria-landmarks.html b/test/html/aria-landmarks.html
new file mode 100644
index 0000000..50c445d
--- /dev/null
+++ b/test/html/aria-landmarks.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+       <title>ARIA landmark role use example</title>
+
+<style type="text/css">
+       div {
+               padding: 2%;
+               border: solid 2px #000000;
+               margin: 10px;
+               font: bold larger "Courier New", Courier, monospace;
+               white-space: inherit;
+       }
+       #banner {height:100px;background:#ff8c00 }
+       #navigation {float:left;
+               width:15%;
+               height:400px;
+               background:#7fff00}
+       #main {float:left;
+               width:50%;
+               height:400px;
+               background:#f0e68c}
+       #complementary {float:left;width:15%;height:400px;background:#4682b4}
+       #contentinfo {clear:both;height:100px;background:#ffb6c1}
+       #search {background:#ffff00;font-size:small;}
+       #form {background:#fafad2;font-size:medium;}
+       #application {background:#f5f5f5;font-size:medium;width:300px;height:200px}
+</style>
+
+</head>
+
+<body>
+<div id="banner" role="banner">banner</div>
+<div id="navigation" role="navigation">navigation</div>
+<div id="main" role="main">main
+<div role="application" id="application">application</div>
+</div>
+<div id="complementary" role="complementary"> complementary
+<div role="form" id="form"> form
+<div id="search" role="search">search</div>
+</div></div>
+<div id="contentinfo" role="contentinfo">contentinfo</div>
+
+</body>
+</html>
diff --git a/test/html/blockquotes.html b/test/html/blockquotes.html
index e76a58e..91daaeb 100644
--- a/test/html/blockquotes.html
+++ b/test/html/blockquotes.html
@@ -1,5 +1,12 @@
 <html>
-<head><title>Blockquote Regression Test</title></head>
+<head>
+<style>
+body {
+  font-size: 17px;
+}
+</style>
+<title>Blockquote Regression Test</title>
+</head>
 <body>
 <p>On weaponry:</p>
 <blockquote>
diff --git a/test/html/orca-wiki.html b/test/html/orca-wiki.html
index 23cf762..308d3e7 100644
--- a/test/html/orca-wiki.html
+++ b/test/html/orca-wiki.html
@@ -211,7 +211,7 @@ actionsMenuInit('More Actions:');
 </div>
 <div class="section">
 <h3>GNOME World Wide</h3>
-<a href="http://live.gnome.org/GnomeWorldWide";><img 
src="http://www.gnome.org/~jdub/random/GnomeWorldWideSmall.jpg"; alt=""></a>
+<a href="http://live.gnome.org/GnomeWorldWide";><img src="GnomeWorldWideSmall.jpg" alt=""></a>
 </div>
 </div>
 
diff --git a/test/keystrokes/firefox/aria_alert.py b/test/keystrokes/firefox/aria_alert.py
index 26db5b1..bdc1d7d 100644
--- a/test/keystrokes/firefox/aria_alert.py
+++ b/test/keystrokes/firefox/aria_alert.py
@@ -29,45 +29,37 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  'close'",
      "     VISIBLE:  'close', cursor=1",
      "SPEECH OUTPUT: 'alert.'",
-     "SPEECH OUTPUT: 'This popup is created as a div in the HTML content, rather than being created in the 
DOM at the time of use. The display style is changed from \"none\" to \"block\" to hide and show it.close'",
+     "SPEECH OUTPUT: 'This popup is created as a div in the HTML content, rather than being created in the 
DOM at the time of use. The display style is changed from \"none\" to \"block\" to hide and show it. close'",
      "SPEECH OUTPUT: 'close link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "2. Up Arrow",
-    ["BRAILLE LINE:  'show it.'",
-     "     VISIBLE:  'show it.', cursor=1",
-     "SPEECH OUTPUT: 'show it.'"]))
+    ["BRAILLE LINE:  '\"none\" to \"block\" to hide and show it.'",
+     "     VISIBLE:  '\"none\" to \"block\" to hide and sh', cursor=1",
+     "SPEECH OUTPUT: '\"none\" to \"block\" to hide and show it. '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "3. Up Arrow",
-    ["BRAILLE LINE:  'from \"none\" to \"block\" to hide and'",
-     "     VISIBLE:  'from \"none\" to \"block\" to hide a', cursor=1",
-     "SPEECH OUTPUT: 'from \"none\" to \"block\" to hide and '"]))
+    ["BRAILLE LINE:  'The display style is changed from'",
+     "     VISIBLE:  'The display style is changed fro', cursor=1",
+     "SPEECH OUTPUT: 'The display style is changed from '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "4. Up Arrow",
-    ["BRAILLE LINE:  'use. The display style is changed'",
-     "     VISIBLE:  'use. The display style is change', cursor=1",
-     "SPEECH OUTPUT: 'use. The display style is changed '"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "5. Up Arrow",
-    ["BRAILLE LINE:  'created in the DOM at the time of'",
+    ["BRAILLE LINE:  'created in the DOM at the time of use.'",
      "     VISIBLE:  'created in the DOM at the time o', cursor=1",
-     "SPEECH OUTPUT: 'created in the DOM at the time of '"]))
+     "SPEECH OUTPUT: 'created in the DOM at the time of use. '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "6. Up Arrow",
+    "5. Up Arrow",
     ["BRAILLE LINE:  'HTML content, rather than being'",
      "     VISIBLE:  'HTML content, rather than being', cursor=1",
      "SPEECH OUTPUT: 'HTML content, rather than being '"]))
@@ -75,7 +67,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "7. Up Arrow",
+    "6. Up Arrow",
     ["BRAILLE LINE:  'This popup is created as a div in the'",
      "     VISIBLE:  'This popup is created as a div i', cursor=1",
      "SPEECH OUTPUT: 'This popup is created as a div in the '"]))
@@ -83,7 +75,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "8. Up Arrow",
+    "7. Up Arrow",
     ["KNOWN ISSUE: You should not be able to arrow out of this alert.",
      "BRAILLE LINE:  'Show (via display style) and put focus inside alert (on link) push button'",
      "     VISIBLE:  'Show (via display style) and put', cursor=1",
@@ -92,7 +84,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "9. Down Arrow",
+    "8. Down Arrow",
     ["BRAILLE LINE:  'This popup is created as a div in the'",
      "     VISIBLE:  'This popup is created as a div i', cursor=1",
      "SPEECH OUTPUT: 'This popup is created as a div in the '"]))
@@ -100,7 +92,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "10. Down Arrow",
+    "9. Down Arrow",
     ["BRAILLE LINE:  'HTML content, rather than being'",
      "     VISIBLE:  'HTML content, rather than being', cursor=1",
      "SPEECH OUTPUT: 'HTML content, rather than being '"]))
@@ -108,39 +100,31 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "11. Down Arrow",
-    ["BRAILLE LINE:  'created in the DOM at the time of'",
+    "10. Down Arrow",
+    ["BRAILLE LINE:  'created in the DOM at the time of use.'",
      "     VISIBLE:  'created in the DOM at the time o', cursor=1",
-     "SPEECH OUTPUT: 'created in the DOM at the time of '"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "12. Down Arrow",
-    ["BRAILLE LINE:  'use. The display style is changed'",
-     "     VISIBLE:  'use. The display style is change', cursor=1",
-     "SPEECH OUTPUT: 'use. The display style is changed '"]))
+     "SPEECH OUTPUT: 'created in the DOM at the time of use. '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "13. Down Arrow",
-    ["BRAILLE LINE:  'from \"none\" to \"block\" to hide and'",
-     "     VISIBLE:  'from \"none\" to \"block\" to hide a', cursor=1",
-     "SPEECH OUTPUT: 'from \"none\" to \"block\" to hide and '"]))
+    "11. Down Arrow",
+    ["BRAILLE LINE:  'The display style is changed from'",
+     "     VISIBLE:  'The display style is changed fro', cursor=1",
+     "SPEECH OUTPUT: 'The display style is changed from '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "14. Down Arrow",
-    ["BRAILLE LINE:  'show it.'",
-     "     VISIBLE:  'show it.', cursor=1",
-     "SPEECH OUTPUT: 'show it.'"]))
+    "12. Down Arrow",
+    ["BRAILLE LINE:  '\"none\" to \"block\" to hide and show it.'",
+     "     VISIBLE:  '\"none\" to \"block\" to hide and sh', cursor=1",
+     "SPEECH OUTPUT: '\"none\" to \"block\" to hide and show it. '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "15. Down Arrow",
+    "13. Down Arrow",
     ["BRAILLE LINE:  'close'",
      "     VISIBLE:  'close', cursor=1",
      "SPEECH OUTPUT: 'close'",
@@ -149,7 +133,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "17. Down Arrow",
+    "14. Down Arrow",
     ["BRAILLE LINE:  'Some text after the alert to help with selection in order to view alert source'",
      "     VISIBLE:  'Some text after the alert to hel', cursor=1",
      "SPEECH OUTPUT: 'Some text after the alert to help with selection in order to view alert source'"]))
@@ -157,7 +141,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
-    "18. Return on close link",
+    "15. Return on close link",
     ["KNOWN ISSUE: We should present something here.",
      ""]))
 
diff --git a/test/keystrokes/firefox/aria_alert_dialog.py b/test/keystrokes/firefox/aria_alert_dialog.py
index 1651277..a7e4fbf 100644
--- a/test/keystrokes/firefox/aria_alert_dialog.py
+++ b/test/keystrokes/firefox/aria_alert_dialog.py
@@ -45,6 +45,8 @@ sequence.append(utils.AssertPresentationAction(
     "4. Down arrow to read next line of message",
     ["BRAILLE LINE:  'Close push button'",
      "     VISIBLE:  'Close push button', cursor=1",
+     "BRAILLE LINE:  'Close push button'",
+     "     VISIBLE:  'Close push button', cursor=1",
      "SPEECH OUTPUT: 'Close push button'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/aria_checkbox_dojo.py b/test/keystrokes/firefox/aria_checkbox_dojo.py
index cb2b1fc..194af1d 100644
--- a/test/keystrokes/firefox/aria_checkbox_dojo.py
+++ b/test/keystrokes/firefox/aria_checkbox_dojo.py
@@ -14,7 +14,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to the cb0 checkbox",
-    ["BRAILLE LINE:  '<x> cb0: Vanilla (non-dojo) checkbox (for comparison purposes) check box'",
+    ["KNOWN ISSUE: We are not presenting this in Nightly; we do with stable",
+     "BRAILLE LINE:  '<x> cb0: Vanilla (non-dojo) checkbox (for comparison purposes) check box'",
      "     VISIBLE:  '<x> cb0: Vanilla (non-dojo) chec', cursor=1",
      "SPEECH OUTPUT: 'cb0: Vanilla (non-dojo) checkbox (for comparison purposes) check box checked'"]))
 
diff --git a/test/keystrokes/firefox/aria_combobox_dojo.py b/test/keystrokes/firefox/aria_combobox_dojo.py
index 66f0c7a..67b0a63 100644
--- a/test/keystrokes/firefox/aria_combobox_dojo.py
+++ b/test/keystrokes/firefox/aria_combobox_dojo.py
@@ -34,8 +34,15 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE: The braille line is not quite right",
      "BRAILLE LINE:  'US State test 1 (200% Courier font): C $l'",
      "     VISIBLE:  '(200% Courier font): C $l', cursor=23",
+     "BRAILLE LINE:  'Selection deleted.'",
+     "     VISIBLE:  'Selection deleted.', cursor=0",
+     "BRAILLE LINE:  'US State test 1 (200% Courier font): C $l'",
+     "     VISIBLE:  'e test 1 (200% Courier font): C ', cursor=32",
+     "BRAILLE LINE:  'US State test 1 (200% Courier font): C $l'",
+     "     VISIBLE:  'e test 1 (200% Courier font): C ', cursor=32",
      "BRAILLE LINE:  'US State test 1 (200% Courier font): US State test 1 (200% Courier font): combo box'",
      "     VISIBLE:  'te test 1 (200% Courier font): U', cursor=32",
+     "SPEECH OUTPUT: 'Selection deleted.' voice=system",
      "SPEECH OUTPUT: 'expanded'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/aria_dialog_dismissed.py 
b/test/keystrokes/firefox/aria_dialog_dismissed.py
index 3591090..d7e3c62 100644
--- a/test/keystrokes/firefox/aria_dialog_dismissed.py
+++ b/test/keystrokes/firefox/aria_dialog_dismissed.py
@@ -33,6 +33,8 @@ sequence.append(utils.AssertPresentationAction(
     "3. Tab to dialog button",
     ["BRAILLE LINE:  'OK push button'",
      "     VISIBLE:  'OK push button', cursor=1",
+     "BRAILLE LINE:  'Just an example. dialog'",
+     "     VISIBLE:  'Just an example. dialog', cursor=1",
      "SPEECH OUTPUT: 'OK push button'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/aria_dialog_dojo.py b/test/keystrokes/firefox/aria_dialog_dojo.py
index e74415d..466808e 100644
--- a/test/keystrokes/firefox/aria_dialog_dojo.py
+++ b/test/keystrokes/firefox/aria_dialog_dojo.py
@@ -24,7 +24,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'First tab page tab', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "SPEECH OUTPUT: 'TabContainer Dialog This is the first tab. Lorem ipsum dolor sit amet, consectetuer 
adipiscing elit. Aenean semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin porta rutrum 
lacus. Etiam consequat scelerisque quam. Nulla facilisi. Maecenas luctus venenatis nulla. In sit amet dui non 
mi semper iaculis. Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae risus.'",
+     "SPEECH OUTPUT: 'TabContainer Dialog This is the first tab.  Lorem ipsum dolor sit amet, consectetuer 
adipiscing elit. Aenean semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin porta rutrum 
lacus. Etiam consequat scelerisque quam. Nulla facilisi. Maecenas luctus venenatis nulla. In sit amet dui non 
mi semper iaculis. Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae risus.'",
      "SPEECH OUTPUT: 'First tab page tab.'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
diff --git a/test/keystrokes/firefox/aria_editor_navigation_dojo.py 
b/test/keystrokes/firefox/aria_editor_navigation_dojo.py
index c6e1271..3aab393 100644
--- a/test/keystrokes/firefox/aria_editor_navigation_dojo.py
+++ b/test/keystrokes/firefox/aria_editor_navigation_dojo.py
@@ -15,7 +15,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "1. Up Arrow in Focus Mode - which should do nothing",
-    []))
+    [""]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyPressAction(0, None, "KP_Insert"))
@@ -45,5 +45,13 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'No plugins, initially empty h2', cursor=1",
      "SPEECH OUTPUT: 'No plugins, initially empty heading level 2'"]))
 
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "5. Up Arrow in Browse Mode",
+    ["BRAILLE LINE:  'Editor + Plugins Test h1'",
+     "     VISIBLE:  'Editor + Plugins Test h1', cursor=1",
+     "SPEECH OUTPUT: 'Editor + Plugins Test heading level 1'"]))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/firefox/aria_landmarks.params b/test/keystrokes/firefox/aria_landmarks.params
index ef70218..d7c3e93 100644
--- a/test/keystrokes/firefox/aria_landmarks.params
+++ b/test/keystrokes/firefox/aria_landmarks.params
@@ -1 +1 @@
-PARAMS=http://www.html5accessibility.com/tests/roles-land.html
\ No newline at end of file
+PARAMS=$TEST_DIR/../../html/aria-landmarks.html
diff --git a/test/keystrokes/firefox/aria_landmarks.py b/test/keystrokes/firefox/aria_landmarks.py
index 3c44f8b..0e3f6e7 100644
--- a/test/keystrokes/firefox/aria_landmarks.py
+++ b/test/keystrokes/firefox/aria_landmarks.py
@@ -43,7 +43,7 @@ sequence.append(utils.AssertPresentationAction(
     "4. m to next landmark",
     ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'form'"]))
+     "SPEECH OUTPUT: 'form '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("m"))
@@ -97,7 +97,7 @@ sequence.append(utils.AssertPresentationAction(
     "10. Shift+m to previous landmark",
     ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'form'"]))
+     "SPEECH OUTPUT: 'form '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>m"))
diff --git a/test/keystrokes/firefox/aria_menu.py b/test/keystrokes/firefox/aria_menu.py
index 49cf6f5..4bda89a 100644
--- a/test/keystrokes/firefox/aria_menu.py
+++ b/test/keystrokes/firefox/aria_menu.py
@@ -10,10 +10,6 @@ sequence = MacroSequence()
 #sequence.append(WaitForDocLoad())
 sequence.append(PauseAction(5000))
 
-# Work around some new quirk in Gecko that causes this test to fail if
-# run via the test harness rather than manually.
-sequence.append(KeyComboAction("<Control>r"))
-
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control><Alt>m"))
 sequence.append(utils.AssertPresentationAction(
diff --git a/test/keystrokes/firefox/aria_slider.py b/test/keystrokes/firefox/aria_slider.py
index e4ca98a..c55c3d8 100644
--- a/test/keystrokes/firefox/aria_slider.py
+++ b/test/keystrokes/firefox/aria_slider.py
@@ -29,7 +29,7 @@ sequence.append(utils.AssertPresentationAction(
      "     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% 10 percent.'"]))
+     "SPEECH OUTPUT: 'My slider slider 10%'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
diff --git a/test/keystrokes/firefox/aria_slider_dojo.py b/test/keystrokes/firefox/aria_slider_dojo.py
index 59d5908..cd67ae4 100644
--- a/test/keystrokes/firefox/aria_slider_dojo.py
+++ b/test/keystrokes/firefox/aria_slider_dojo.py
@@ -8,7 +8,7 @@ import utils
 sequence = MacroSequence()
 
 #sequence.append(WaitForDocLoad())
-sequence.append(PauseAction(5000))
+sequence.append(PauseAction(10000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
@@ -16,55 +16,52 @@ sequence.append(utils.AssertPresentationAction(
     "1. Tab to first slider",
     ["BRAILLE LINE:  'slider 1 10 slider'",
      "     VISIBLE:  'slider 1 10 slider', cursor=1",
-     "BRAILLE LINE:  'Focus mode'",
-     "     VISIBLE:  'Focus mode', cursor=0",
-     "SPEECH OUTPUT: 'slider 1 slider 10'",
-     "SPEECH OUTPUT: 'Focus mode' voice=system"]))
+     "SPEECH OUTPUT: 'slider 1 slider 10'"]))
+
+sequence.append(KeyComboAction("Right"))
 
 sequence.append(utils.StartRecordingAction())
 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 slider'",
-     "     VISIBLE:  'slider 1 10 slider', cursor=1",
-     "BRAILLE LINE:  'slider 1 10.2[0-9]+ slider'",
-     "     VISIBLE:  'slider 1 10.2[0-9]+ slid', cursor=1",
-     "SPEECH OUTPUT: '10.2[0-9]+'"]))
+     "BRAILLE LINE:  'slider 1 10.[0-9]+ slider'",
+     "     VISIBLE:  'slider 1 10.[0-9]+ slid[er]*', 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.(4|5)[0-9]+ slider'",
-     "     VISIBLE:  'slider 1 10.(4|5)[0-9]+ slid', cursor=1",
-     "SPEECH OUTPUT: '10.(4|5)[0-9]+'"]))
+    ["BRAILLE LINE:  'slider 1 10.[0-9]+ slider'",
+     "     VISIBLE:  'slider 1 10.[0-9]+ slid[er]*', 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.2[0-9]+ slider'",
-     "     VISIBLE:  'slider 1 10.2[0-9]+ slid', cursor=1",
-     "SPEECH OUTPUT: '10.2[0-9]+'"]))
+    ["BRAILLE LINE:  'slider 1 10.[0-9]+ slider'",
+     "     VISIBLE:  'slider 1 10.[0-9]+ slid[er]*', 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 slider'",
-     "     VISIBLE:  'slider 1 10 slider', cursor=1",
-     "SPEECH OUTPUT: '10'"]))
+    ["BRAILLE LINE:  'slider 1 10.[0-9]+ slider'",
+     "     VISIBLE:  'slider 1 10.[0-9]+ slid[er]*', cursor=1",
+     "SPEECH OUTPUT: '10.[0-9]+'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "6. Move to entry",
-    ["BRAILLE LINE:  'Slider1 Value: 10.0% rdonly'",
-     "     VISIBLE:  'Slider1 Value: 10.0% rdonly', cursor=21",
-     "BRAILLE LINE:  'Slider1 Value: 10.0% rdonly'",
-     "     VISIBLE:  'Slider1 Value: 10.0% rdonly', cursor=21",
-     "SPEECH OUTPUT: 'Slider1 Value: read only entry 10.0% selected'"]))
+    ["BRAILLE LINE:  'Slider1 Value: 10.[0-9]% rdonly'",
+     "     VISIBLE:  'Slider1 Value: 10.[0-9]% rdonly', cursor=21",
+     "BRAILLE LINE:  'Slider1 Value: 10.[0-9]% rdonly'",
+     "     VISIBLE:  'Slider1 Value: 10.[0-9]% rdonly', cursor=21",
+     "SPEECH OUTPUT: 'Slider1 Value: read only entry 10.[0-9]% selected'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
diff --git a/test/keystrokes/firefox/aria_sliders.py b/test/keystrokes/firefox/aria_sliders.py
index 82cf36c..7ceafa5 100644
--- a/test/keystrokes/firefox/aria_sliders.py
+++ b/test/keystrokes/firefox/aria_sliders.py
@@ -8,10 +8,6 @@ sequence = MacroSequence()
 #sequence.append(WaitForDocLoad())
 sequence.append(PauseAction(5000))
 
-# Work around some new quirk in Gecko that causes this test to fail if
-# run via the test harness rather than manually.
-sequence.append(KeyComboAction("<Control>r"))
-
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
@@ -31,7 +27,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  '30 slider', cursor=1",
      "BRAILLE LINE:  '30 slider'",
      "     VISIBLE:  '30 slider', cursor=1",
-     "SPEECH OUTPUT: 'slider 30 30 percent.'"]))
+     "SPEECH OUTPUT: 'slider 30'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
diff --git a/test/keystrokes/firefox/aria_spinner_dojo.py b/test/keystrokes/firefox/aria_spinner_dojo.py
index f2b8a94..8677021 100644
--- a/test/keystrokes/firefox/aria_spinner_dojo.py
+++ b/test/keystrokes/firefox/aria_spinner_dojo.py
@@ -30,8 +30,6 @@ sequence.append(utils.AssertPresentationAction(
     "2. Decrement first spinner",
     ["BRAILLE LINE:  'Spinbox #1: 899 $l'",
      "     VISIBLE:  'Spinbox #1: 899 $l', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 899 $l'",
-     "     VISIBLE:  'Spinbox #1: 899 $l', cursor=16",
      "SPEECH OUTPUT: '899'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -40,8 +38,6 @@ sequence.append(utils.AssertPresentationAction(
     "3. Decrement first spinner",
     ["BRAILLE LINE:  'Spinbox #1: 898 $l'",
      "     VISIBLE:  'Spinbox #1: 898 $l', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 898 $l'",
-     "     VISIBLE:  'Spinbox #1: 898 $l', cursor=16",
      "SPEECH OUTPUT: '898'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -50,8 +46,6 @@ sequence.append(utils.AssertPresentationAction(
     "4. Increment first spinner",
     ["BRAILLE LINE:  'Spinbox #1: 899 $l'",
      "     VISIBLE:  'Spinbox #1: 899 $l', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 899 $l'",
-     "     VISIBLE:  'Spinbox #1: 899 $l', cursor=16",
      "SPEECH OUTPUT: '899'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/aria_tabcontainer_dojo.py 
b/test/keystrokes/firefox/aria_tabcontainer_dojo.py
index 6b76dbc..a13128d 100644
--- a/test/keystrokes/firefox/aria_tabcontainer_dojo.py
+++ b/test/keystrokes/firefox/aria_tabcontainer_dojo.py
@@ -10,7 +10,7 @@ sequence = MacroSequence()
 #sequence.append(WaitForDocLoad())
 sequence.append(PauseAction(5000))
 sequence.append(KeyComboAction("Tab"))
-sequence.append(PauseAction(3000))
+sequence.append(PauseAction(5000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
diff --git a/test/keystrokes/firefox/aria_tabpanel_text_dojo.py 
b/test/keystrokes/firefox/aria_tabpanel_text_dojo.py
index 721a482..6841e6d 100644
--- a/test/keystrokes/firefox/aria_tabpanel_text_dojo.py
+++ b/test/keystrokes/firefox/aria_tabpanel_text_dojo.py
@@ -25,7 +25,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'First tab page tab', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "SPEECH OUTPUT: 'TabContainer Dialog This is the first tab. Lorem ipsum dolor sit amet, consectetuer 
adipiscing elit. Aenean semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin porta rutrum 
lacus. Etiam consequat scelerisque quam. Nulla facilisi. Maecenas luctus venenatis nulla. In sit amet dui non 
mi semper iaculis. Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae risus.'",
+     "SPEECH OUTPUT: 'TabContainer Dialog This is the first tab.  Lorem ipsum dolor sit amet, consectetuer 
adipiscing elit. Aenean semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin porta rutrum 
lacus. Etiam consequat scelerisque quam. Nulla facilisi. Maecenas luctus venenatis nulla. In sit amet dui non 
mi semper iaculis. Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae risus.'",
      "SPEECH OUTPUT: 'First tab page tab.'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
diff --git a/test/keystrokes/firefox/aria_toolbar_dojo.py b/test/keystrokes/firefox/aria_toolbar_dojo.py
index e306a2c..bacaf8f 100644
--- a/test/keystrokes/firefox/aria_toolbar_dojo.py
+++ b/test/keystrokes/firefox/aria_toolbar_dojo.py
@@ -8,8 +8,7 @@ import utils
 sequence = MacroSequence()
 
 #sequence.append(WaitForDocLoad())
-sequence.append(PauseAction(5000))
-sequence.append(PauseAction(3000))
+sequence.append(PauseAction(10000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
@@ -47,7 +46,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Down Arrow",
-    ["BRAILLE LINE:  'input after toolbar1 $l'",
+    ["KNOWN ISSUE: 'Sometimes it takes additional arrow presses to get here. Timing issue?",
+     "BRAILLE LINE:  'input after toolbar1 $l'",
      "     VISIBLE:  'input after toolbar1 $l', cursor=1",
      "SPEECH OUTPUT: 'entry input after toolbar1'"]))
 
diff --git a/test/keystrokes/firefox/aria_tree_dojo.py b/test/keystrokes/firefox/aria_tree_dojo.py
index 32da1fc..67dec20 100644
--- a/test/keystrokes/firefox/aria_tree_dojo.py
+++ b/test/keystrokes/firefox/aria_tree_dojo.py
@@ -16,7 +16,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to continents",
-    ["BRAILLE LINE:  'before:  $l'",
+    ["KNOWN ISSUE: Nightly crashes when this test is run",
+     "BRAILLE LINE:  'before:  $l'",
      "     VISIBLE:  'before:  $l', cursor=9",
      "BRAILLE LINE:  'Continents expanded list item'",
      "     VISIBLE:  'Continents expanded list item', cursor=1",
diff --git a/test/keystrokes/firefox/find_wiki.py b/test/keystrokes/firefox/find_wiki.py
index 26703a1..8b74dfe 100644
--- a/test/keystrokes/firefox/find_wiki.py
+++ b/test/keystrokes/firefox/find_wiki.py
@@ -8,11 +8,12 @@ import utils
 sequence = MacroSequence()
 
 #sequence.append(WaitForDocLoad())
-sequence.append(PauseAction(5000))
+sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("<Control>Home"))
+sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("<Control>F"))
-sequence.append(TypeAction("orca"))
 sequence.append(PauseAction(3000))
+sequence.append(TypeAction("orca"))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
diff --git a/test/keystrokes/firefox/flat_review_combo_box.py 
b/test/keystrokes/firefox/flat_review_combo_box.py
index 0e97522..f54f128 100644
--- a/test/keystrokes/firefox/flat_review_combo_box.py
+++ b/test/keystrokes/firefox/flat_review_combo_box.py
@@ -34,9 +34,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_9"))
 sequence.append(utils.AssertPresentationAction(
     "3. Flat review next line",
-    ["BRAILLE LINE:  'Resolution: $l'",
-     "     VISIBLE:  'Resolution: $l', cursor=1",
-     "SPEECH OUTPUT: 'Resolution:",
+    ["BRAILLE LINE:  'Resolution:  $l'",
+     "     VISIBLE:  'Resolution:  $l', cursor=1",
+     "SPEECH OUTPUT: 'Resolution: ",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/focus_tracking_roledescriptions.py 
b/test/keystrokes/firefox/focus_tracking_roledescriptions.py
index 77942cf..11b377b 100644
--- a/test/keystrokes/firefox/focus_tracking_roledescriptions.py
+++ b/test/keystrokes/firefox/focus_tracking_roledescriptions.py
@@ -69,7 +69,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Presentation slide set', cursor=1",
      "BRAILLE LINE:  'Here are some slides'",
      "     VISIBLE:  'Here are some slides', cursor=1",
-     "SPEECH OUTPUT: 'Presentation slide set'",
+     "SPEECH OUTPUT: 'Presentation slide set.'",
      "SPEECH OUTPUT: 'Here are some slides'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -80,7 +80,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'First Quarter 2015 slide', cursor=1",
      "BRAILLE LINE:  'First Quarter 2015 h1'",
      "     VISIBLE:  'First Quarter 2015 h1', cursor=1",
-     "SPEECH OUTPUT: 'First Quarter 2015 slide'",
+     "SPEECH OUTPUT: 'First Quarter 2015 slide.'",
      "SPEECH OUTPUT: 'First Quarter 2015 heading level 1'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/html_access_keys.params b/test/keystrokes/firefox/html_access_keys.params
new file mode 100644
index 0000000..cb39c01
--- /dev/null
+++ b/test/keystrokes/firefox/html_access_keys.params
@@ -0,0 +1 @@
+PARAMS=$TEST_DIR/../../html/accesskeys.html
diff --git a/test/keystrokes/firefox/html_access_keys.py b/test/keystrokes/firefox/html_access_keys.py
new file mode 100644
index 0000000..59c7e5a
--- /dev/null
+++ b/test/keystrokes/firefox/html_access_keys.py
@@ -0,0 +1,62 @@
+#!/usr/bin/python
+
+from macaroon.playback import *
+import utils
+
+sequence = MacroSequence()
+
+sequence.append(PauseAction(5000))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Home"))
+sequence.append(utils.AssertPresentationAction(
+    "1. Top of file",
+    ["BRAILLE LINE:  'Line 1'",
+     "     VISIBLE:  'Line 1', cursor=1",
+     "SPEECH OUTPUT: 'Line 1'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyPressAction(0, None, "KP_Insert"))
+sequence.append(KeyComboAction("BackSpace"))
+sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
+sequence.append(utils.AssertPresentationAction(
+    "2. Bypass mode",
+    ["BRAILLE LINE:  'Bypass mode enabled.'",
+     "     VISIBLE:  'Bypass mode enabled.', cursor=0",
+     "SPEECH OUTPUT: 'Bypass mode enabled.' voice=system"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Alt><Shift>1"))
+sequence.append(utils.AssertPresentationAction(
+    "3. Access key 1",
+    ["BRAILLE LINE:  'Line 1'",
+     "     VISIBLE:  'Line 1', cursor=1",
+     "BRAILLE LINE:  'accesskeys'",
+     "     VISIBLE:  'accesskeys', cursor=1",
+     "BRAILLE LINE:  'Form! h1'",
+     "     VISIBLE:  'Form! h1', cursor=1",
+     "SPEECH OUTPUT: 'accesskeys link.'",
+     "SPEECH OUTPUT: 'Form! heading level 1'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyPressAction(0, None, "KP_Insert"))
+sequence.append(KeyComboAction("BackSpace"))
+sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
+sequence.append(utils.AssertPresentationAction(
+    "4. Bypass mode",
+    ["BRAILLE LINE:  'Bypass mode enabled.'",
+     "     VISIBLE:  'Bypass mode enabled.', cursor=0",
+     "SPEECH OUTPUT: 'Bypass mode enabled.' voice=system"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Alt><Shift>2"))
+sequence.append(utils.AssertPresentationAction(
+    "5. Access key 2",
+    ["BRAILLE LINE:  'Form! h1'",
+     "     VISIBLE:  'Form! h1', cursor=1",
+     "BRAILLE LINE:  'Search:  $l I feel frightened push button'",
+     "     VISIBLE:  'Search:  $l I feel frightened pu', cursor=9",
+     "SPEECH OUTPUT: 'Search: entry'"]))
+
+sequence.append(utils.AssertionSummaryAction())
+sequence.start()
diff --git a/test/keystrokes/firefox/link_where_am_i.params 
b/test/keystrokes/firefox/html_link_where_am_i.params
similarity index 100%
rename from test/keystrokes/firefox/link_where_am_i.params
rename to test/keystrokes/firefox/html_link_where_am_i.params
diff --git a/test/keystrokes/firefox/html_link_where_am_i.py b/test/keystrokes/firefox/html_link_where_am_i.py
new file mode 100644
index 0000000..b104890
--- /dev/null
+++ b/test/keystrokes/firefox/html_link_where_am_i.py
@@ -0,0 +1,75 @@
+#!/usr/bin/python
+
+"""Test of Where am I for links."""
+
+from macaroon.playback import *
+import utils
+
+sequence = MacroSequence()
+
+#sequence.append(WaitForDocLoad())
+sequence.append(PauseAction(5000))
+sequence.append(KeyComboAction("<Shift>Tab"))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyPressAction(0, None, "KP_Insert"))
+sequence.append(KeyComboAction("KP_Enter"))
+sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
+sequence.append(utils.AssertPresentationAction(
+    "1. Title bar",
+    ["BRAILLE LINE:  'GNOME Bug Tracking System - Nightly'",
+     "     VISIBLE:  'GNOME Bug Tracking System - Nigh', cursor=0",
+     "SPEECH OUTPUT: 'GNOME Bug Tracking System - Nightly'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("KP_Enter"))
+sequence.append(utils.AssertPresentationAction(
+    "2. Where Am I on Product summary link", 
+    ["BRAILLE LINE:  'Product summary'",
+     "     VISIBLE:  'Product summary', cursor=1",
+     "BRAILLE LINE:  'Product summary'",
+     "     VISIBLE:  'Product summary', cursor=1",
+     "SPEECH OUTPUT: 'http link Product summary.'",
+     "SPEECH OUTPUT: 'different site.'"]))
+
+# This should time out because there shouldn't be a doc load.
+sequence.append(WaitForDocLoad())
+sequence.append(PauseAction(5000))
+
+sequence.append(KeyComboAction("<Control>Home"))
+sequence.append(KeyComboAction("Tab"))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyPressAction(0, None, "KP_Insert"))
+sequence.append(KeyComboAction("KP_Enter"))
+sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
+sequence.append(utils.AssertPresentationAction(
+    "3. Title bar",
+    ["KNOWN ISSUE: There seems to be some input event bleed through here",
+     "BRAILLE LINE:  'Choose the classification - Nightly'",
+     "     VISIBLE:  'Choose the classification - Nigh', cursor=0",
+     "SPEECH OUTPUT: 'Choose the classification - Nightly'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("KP_Enter"))
+sequence.append(utils.AssertPresentationAction(
+    "4. Where Am I on what should be the New bug link",
+    ["KNOWN ISSUE: There seems to be some input event bleed through here",
+     "BRAILLE LINE:  'Home'",
+     "     VISIBLE:  'Home', cursor=1",
+     "BRAILLE LINE:  'Home'",
+     "     VISIBLE:  'Home', cursor=1",
+     "BRAILLE LINE:  'Loading.  Please wait.'",
+     "     VISIBLE:  'Loading.  Please wait.', cursor=0",
+     "SPEECH OUTPUT: 'https link Home.'",
+     "SPEECH OUTPUT: 'same site.'",
+     "SPEECH OUTPUT: 'Loading.  Please wait.' voice=system"]))
+
+
+#    ["BRAILLE LINE:  'New bug'",
+#     "     VISIBLE:  'New bug', cursor=1",
+#     "SPEECH OUTPUT: 'http link New bug.'",
+#     "SPEECH OUTPUT: 'different site.'"]))
+
+sequence.append(utils.AssertionSummaryAction())
+sequence.start()
diff --git a/test/keystrokes/firefox/html_page_summary.py b/test/keystrokes/firefox/html_page_summary.py
index 11c8de4..94609ba 100644
--- a/test/keystrokes/firefox/html_page_summary.py
+++ b/test/keystrokes/firefox/html_page_summary.py
@@ -30,8 +30,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'This is a Heading 6. h6', cursor=1",
      "SPEECH OUTPUT: 'heading level 6.'",
      "SPEECH OUTPUT: 'This is a Heading 6.'",
-     "SPEECH OUTPUT: '14 headings 3 forms 43 tables'",
-     "SPEECH OUTPUT: '19 unvisited links'"]))
+     "SPEECH OUTPUT: 'Page has 0 landmarks, 14 headings, 3 forms, 43 tables, 0 visited links, 11 unvisited 
links.'"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/firefox/html_role_links.py b/test/keystrokes/firefox/html_role_links.py
index 8e58f6f..4969783 100644
--- a/test/keystrokes/firefox/html_role_links.py
+++ b/test/keystrokes/firefox/html_role_links.py
@@ -66,7 +66,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'blockquotes.html', cursor=1",
      "SPEECH OUTPUT: 'file link to blockquotes.html.'",
      "SPEECH OUTPUT: 'same site.'",
-     "SPEECH OUTPUT: '1188 bytes.'"]))
+     "SPEECH OUTPUT: '1235 bytes.'"]))
 
 sequence.append(KeyComboAction("Return"))
 #sequence.append(WaitForDocLoad())
diff --git a/test/keystrokes/firefox/html_struct_nav_activate_link.py 
b/test/keystrokes/firefox/html_struct_nav_activate_link.py
index 67d2e97..2a1b507 100644
--- a/test/keystrokes/firefox/html_struct_nav_activate_link.py
+++ b/test/keystrokes/firefox/html_struct_nav_activate_link.py
@@ -28,11 +28,14 @@ sequence.append(utils.AssertPresentationAction(
     "2. Press Return to active the link",
     ["BRAILLE LINE:  'Finished loading Links to test files.'",
      "     VISIBLE:  'Finished loading Links to test f', cursor=0",
+     "BRAILLE LINE:  'Page has 16 unvisited links.'",
+     "     VISIBLE:  'Page has 16 unvisited links.', cursor=0",
      "BRAILLE LINE:  'Here are some of our local test files:'",
      "     VISIBLE:  'Here are some of our local test ', cursor=1",
      "BRAILLE LINE:  'Here are some of our local test files:'",
      "     VISIBLE:  'Here are some of our local test ', cursor=1",
     "SPEECH OUTPUT: 'Finished loading Links to test files.' voice=system",
+    "SPEECH OUTPUT: 'Page has 16 unvisited links.' voice=system",
     "SPEECH OUTPUT: 'Here are some of our local test files:'",
     "SPEECH OUTPUT: '•'",
     "SPEECH OUTPUT: 'anchors.html'",
diff --git a/test/keystrokes/firefox/html_struct_nav_bug_554616.py 
b/test/keystrokes/firefox/html_struct_nav_bug_554616.py
index 39cf9db..7382802 100644
--- a/test/keystrokes/firefox/html_struct_nav_bug_554616.py
+++ b/test/keystrokes/firefox/html_struct_nav_bug_554616.py
@@ -68,8 +68,8 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'installer (10190 KB) portable ar', cursor=1",
      "BRAILLE LINE:  'Row 2, column 3.'",
      "     VISIBLE:  'Row 2, column 3.', cursor=0",
-     "BRAILLE LINE:  'installer'",
-     "     VISIBLE:  'installer', cursor=1",
+     "BRAILLE LINE:  'installer (10190 KB)'",
+     "     VISIBLE:  'installer (10190 KB)', cursor=1",
      "SPEECH OUTPUT: 'Download'",
      "SPEECH OUTPUT: 'installer'",
      "SPEECH OUTPUT: 'link.'",
diff --git a/test/keystrokes/firefox/html_struct_nav_bug_567984.py 
b/test/keystrokes/firefox/html_struct_nav_bug_567984.py
index 8ecc97d..2001198 100644
--- a/test/keystrokes/firefox/html_struct_nav_bug_567984.py
+++ b/test/keystrokes/firefox/html_struct_nav_bug_567984.py
@@ -30,13 +30,13 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("h"))
 sequence.append(utils.AssertPresentationAction(
     "3. h",
-    ["BRAILLE LINE:  'Izrael bejelentette az",
+    ["BRAILLE LINE:  'Izrael bejelentette az ",
      "egyoldalú tûzszünetet h3'",
-     "     VISIBLE:  'Izrael bejelentette az",
-     "egyoldalú', cursor=1",
-     "BRAILLE LINE:  'Izrael bejelentette az h3'",
-     "     VISIBLE:  'Izrael bejelentette az h3', cursor=1",
-     "SPEECH OUTPUT: 'Izrael bejelentette az",
+     "     VISIBLE:  'Izrael bejelentette az ",
+     "egyoldal', cursor=1",
+     "BRAILLE LINE:  'Izrael bejelentette az  h3'",
+     "     VISIBLE:  'Izrael bejelentette az  h3', cursor=1",
+     "SPEECH OUTPUT: 'Izrael bejelentette az ",
      "egyoldalú tûzszünetet'",
      "SPEECH OUTPUT: 'link heading level 3.'"]))
 
diff --git a/test/keystrokes/firefox/html_struct_nav_heading_in_div_with_text.py 
b/test/keystrokes/firefox/html_struct_nav_heading_in_div_with_text.py
index d52ad1c..e2ee64c 100644
--- a/test/keystrokes/firefox/html_struct_nav_heading_in_div_with_text.py
+++ b/test/keystrokes/firefox/html_struct_nav_heading_in_div_with_text.py
@@ -10,15 +10,16 @@ sequence = MacroSequence()
 #sequence.append(WaitForDocLoad())
 sequence.append(PauseAction(5000))
 sequence.append(KeyComboAction("<Control>Home"))
+sequence.append(PauseAction(3000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("2"))
 sequence.append(utils.AssertPresentationAction(
     "1. 2 for first Heading",
-    ["BRAILLE LINE:  'First Heading h2'",
-     "     VISIBLE:  'First Heading h2', cursor=1",
-     "BRAILLE LINE:  'First Heading h2'",
-     "     VISIBLE:  'First Heading h2', cursor=1",
+    ["BRAILLE LINE:  'First Heading  h2'",
+     "     VISIBLE:  'First Heading  h2', cursor=1",
+     "BRAILLE LINE:  'First Heading  h2'",
+     "     VISIBLE:  'First Heading  h2', cursor=1",
      "SPEECH OUTPUT: 'First Heading'",
      "SPEECH OUTPUT: 'link heading level 2.'"]))
 
@@ -34,8 +35,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("2"))
 sequence.append(utils.AssertPresentationAction(
     "3. 2 to move to the next heading",
-    ["BRAILLE LINE:  'Second Heading h2'",
-     "     VISIBLE:  'Second Heading h2', cursor=1",
+    ["BRAILLE LINE:  'Second Heading  h2'",
+     "     VISIBLE:  'Second Heading  h2', cursor=1",
      "SPEECH OUTPUT: 'Second Heading'",
      "SPEECH OUTPUT: 'link heading level 2.'"]))
 
@@ -51,8 +52,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>2"))
 sequence.append(utils.AssertPresentationAction(
     "5. Shift+2 to move to the previous heading",
-    ["BRAILLE LINE:  'Second Heading h2'",
-     "     VISIBLE:  'Second Heading h2', cursor=1",
+    ["BRAILLE LINE:  'Second Heading  h2'",
+     "     VISIBLE:  'Second Heading  h2', cursor=1",
      "SPEECH OUTPUT: 'Second Heading'",
      "SPEECH OUTPUT: 'link heading level 2.'"]))
 
@@ -68,8 +69,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>2"))
 sequence.append(utils.AssertPresentationAction(
     "7. Shift+2 to move to the previous heading",
-    ["BRAILLE LINE:  'First Heading h2'",
-     "     VISIBLE:  'First Heading h2', cursor=1",
+    ["BRAILLE LINE:  'First Heading  h2'",
+     "     VISIBLE:  'First Heading  h2', cursor=1",
      "SPEECH OUTPUT: 'First Heading'",
      "SPEECH OUTPUT: 'link heading level 2.'"]))
 
@@ -79,8 +80,8 @@ sequence.append(utils.AssertPresentationAction(
     "8. Shift+2 to move to the previous heading",
     ["BRAILLE LINE:  'Wrapping to bottom.'",
      "     VISIBLE:  'Wrapping to bottom.', cursor=0",
-     "BRAILLE LINE:  'Second Heading h2'",
-     "     VISIBLE:  'Second Heading h2', cursor=1",
+     "BRAILLE LINE:  'Second Heading  h2'",
+     "     VISIBLE:  'Second Heading  h2', cursor=1",
      "SPEECH OUTPUT: 'Wrapping to bottom.' voice=system",
      "SPEECH OUTPUT: 'Second Heading'",
      "SPEECH OUTPUT: 'link heading level 2.'"]))
@@ -91,8 +92,8 @@ sequence.append(utils.AssertPresentationAction(
     "9. 2 to move to the next heading",
     ["BRAILLE LINE:  'Wrapping to top.'",
      "     VISIBLE:  'Wrapping to top.', cursor=0",
-     "BRAILLE LINE:  'First Heading h2'",
-     "     VISIBLE:  'First Heading h2', cursor=1",
+     "BRAILLE LINE:  'First Heading  h2'",
+     "     VISIBLE:  'First Heading  h2', cursor=1",
      "SPEECH OUTPUT: 'Wrapping to top.' voice=system",
      "SPEECH OUTPUT: 'First Heading'",
      "SPEECH OUTPUT: 'link heading level 2.'"]))
diff --git a/test/keystrokes/firefox/html_struct_nav_large_obj.py 
b/test/keystrokes/firefox/html_struct_nav_large_obj.py
index ca6f9f5..8b6201b 100644
--- a/test/keystrokes/firefox/html_struct_nav_large_obj.py
+++ b/test/keystrokes/firefox/html_struct_nav_large_obj.py
@@ -138,57 +138,57 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("o"))
 sequence.append(utils.AssertPresentationAction(
     "4. o to fourth large chunk", 
-    ["BRAILLE LINE:  'I am a tranquilizer.",
-     "I am effective at home,",
-     "I work well at the office,",
-     "I take exams,",
-     "I appear in court,",
-     "I carefully mend broken crockery -",
-     "all you need do is take me,",
-     "dissolve me under the tongue,",
-     "all you need do is swallow me,",
-     "just wash me down with water. I know how to cope with misfortune,",
-     "how to endure bad news,",
-     "take the edge of injustice,",
-     "make up for the absence of God,",
-     "help pick out your widow's weeds.",
-     "What are you waiting for -",
-     "have faith in chemistry's compassion. You're still a young man/woman,",
-     "you really should settle down somehow.",
-     "Who said",
-     "life must be lived courageously? Hand your abyss over to me -",
-     "I will line it up with soft sleep,",
-     "you'll be grateful for",
-     "the four-footed landing. Sell me your soul.",
+    ["BRAILLE LINE:  'I am a tranquilizer. ",
+     "I am effective at home, ",
+     "I work well at the office, ",
+     "I take exams, ",
+     "I appear in court, ",
+     "I carefully mend broken crockery - ",
+     "all you need do is take me, ",
+     "dissolve me under the tongue, ",
+     "all you need do is swallow me, ",
+     "just wash me down with water. I know how to cope with misfortune, ",
+     "how to endure bad news, ",
+     "take the edge of injustice, ",
+     "make up for the absence of God, ",
+     "help pick out your widow's weeds. ",
+     "What are you waiting for - ",
+     "have faith in chemistry's compassion. You're still a young man/woman, ",
+     "you really should settle down somehow. ",
+     "Who said ",
+     "life must be lived courageously? Hand your abyss over to me - ",
+     "I will line it up with soft sleep, ",
+     "you'll be grateful for ",
+     "the four-footed landing. Sell me your soul. ",
      "There's no other buyer likely to turn up.'",
-     "     VISIBLE:  'I am a tranquilizer.",
-     "I am effect', cursor=1",
-     "SPEECH OUTPUT: 'I am a tranquilizer.",
-     "I am effective at home,",
-     "I work well at the office,",
-     "I take exams,",
-     "I appear in court,",
-     "I carefully mend broken crockery -",
-     "all you need do is take me,",
-     "dissolve me under the tongue,",
-     "all you need do is swallow me,",
+     "     VISIBLE:  'I am a tranquilizer. ",
+     "I am effec', cursor=1",
+     "SPEECH OUTPUT: 'I am a tranquilizer. ",
+     "I am effective at home, ",
+     "I work well at the office, ",
+     "I take exams, ",
+     "I appear in court, ",
+     "I carefully mend broken crockery - ",
+     "all you need do is take me, ",
+     "dissolve me under the tongue, ",
+     "all you need do is swallow me, ",
      "just wash me down with water.'",
-     "SPEECH OUTPUT: 'I know how to cope with misfortune,",
-     "how to endure bad news,",
-     "take the edge of injustice,",
-     "make up for the absence of God,",
-     "help pick out your widow's weeds.",
-     "What are you waiting for -",
+     "SPEECH OUTPUT: 'I know how to cope with misfortune, ",
+     "how to endure bad news, ",
+     "take the edge of injustice, ",
+     "make up for the absence of God, ",
+     "help pick out your widow's weeds. ",
+     "What are you waiting for - ",
      "have faith in chemistry's compassion.'",
-     "SPEECH OUTPUT: 'You're still a young man/woman,",
-     "you really should settle down somehow.",
-     "Who said",
+     "SPEECH OUTPUT: 'You're still a young man/woman, ",
+     "you really should settle down somehow. ",
+     "Who said ",
      "life must be lived courageously?'",
-     "SPEECH OUTPUT: 'Hand your abyss over to me -",
-     "I will line it up with soft sleep,",
-     "you'll be grateful for",
+     "SPEECH OUTPUT: 'Hand your abyss over to me - ",
+     "I will line it up with soft sleep, ",
+     "you'll be grateful for ",
      "the four-footed landing.'",
-     "SPEECH OUTPUT: 'Sell me your soul.",
+     "SPEECH OUTPUT: 'Sell me your soul. ",
      "There's no other buyer likely to turn up.'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/html_struct_nav_links.py 
b/test/keystrokes/firefox/html_struct_nav_links.py
index c3c1a48..1858f3b 100644
--- a/test/keystrokes/firefox/html_struct_nav_links.py
+++ b/test/keystrokes/firefox/html_struct_nav_links.py
@@ -9,8 +9,8 @@ sequence = MacroSequence()
 
 #sequence.append(WaitForDocLoad())
 sequence.append(PauseAction(5000))
-sequence.append(PauseAction(2000))
 sequence.append(KeyComboAction("<Control>Home"))
+sequence.append(PauseAction(3000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("u"))
@@ -110,7 +110,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'tables.html'",
      "     VISIBLE:  'tables.html', cursor=1",
      "SPEECH OUTPUT: 'tables.html'",
-     "SPEECH OUTPUT: 'link.'"]))
+     "SPEECH OUTPUT: 'visited link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("v"))
@@ -122,7 +122,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'anchors.html', cursor=1",
      "SPEECH OUTPUT: 'Wrapping to top.' voice=system",
      "SPEECH OUTPUT: 'anchors.html'",
-     "SPEECH OUTPUT: 'link.'"]))
+     "SPEECH OUTPUT: 'visited link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>v"))
@@ -134,7 +134,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'tables.html', cursor=1",
      "SPEECH OUTPUT: 'Wrapping to bottom.' voice=system",
      "SPEECH OUTPUT: 'tables.html'",
-     "SPEECH OUTPUT: 'link.'"]))
+     "SPEECH OUTPUT: 'visited link.'"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/firefox/label_inference_bug_546815.py 
b/test/keystrokes/firefox/label_inference_bug_546815.py
index 45a459b..c58424b 100644
--- a/test/keystrokes/firefox/label_inference_bug_546815.py
+++ b/test/keystrokes/firefox/label_inference_bug_546815.py
@@ -24,7 +24,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "1. Next form field",
     ["BRAILLE LINE:  'Enter your Name:  $l'",
-     "     VISIBLE:  'Enter your Name:  $l', cursor=18",
+     "     VISIBLE:  'Enter your Name:  $l', cursor=17",
      "SPEECH OUTPUT: 'Enter your Name: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -34,7 +34,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "2. Next form field",
     ["BRAILLE LINE:  '1. Enter your Address:  $l'",
-     "     VISIBLE:  '1. Enter your Address:  $l', cursor=24",
+     "     VISIBLE:  '1. Enter your Address:  $l', cursor=23",
      "SPEECH OUTPUT: '1. Enter your Address: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -44,7 +44,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "3. Next form field",
     ["BRAILLE LINE:  '2. Enter your City:  $l'",
-     "     VISIBLE:  '2. Enter your City:  $l', cursor=21",
+     "     VISIBLE:  '2. Enter your City:  $l', cursor=20",
      "SPEECH OUTPUT: '2. Enter your City: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -54,7 +54,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "4. Next form field",
     ["BRAILLE LINE:  '3. Enter your State:  $l'",
-     "     VISIBLE:  '3. Enter your State:  $l', cursor=22",
+     "     VISIBLE:  '3. Enter your State:  $l', cursor=21",
      "SPEECH OUTPUT: '3. Enter your State: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -75,7 +75,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "6. Next form field",
     ["BRAILLE LINE:  '5. Enter your Zip:  $l'",
-     "     VISIBLE:  '5. Enter your Zip:  $l', cursor=20",
+     "     VISIBLE:  '5. Enter your Zip:  $l', cursor=19",
      "SPEECH OUTPUT: '5. Enter your Zip: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -85,7 +85,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "7. Next form field",
     ["BRAILLE LINE:  'character:  $l'",
-     "     VISIBLE:  'character:  $l', cursor=12",
+     "     VISIBLE:  'character:  $l', cursor=11",
      "SPEECH OUTPUT: 'character: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -182,7 +182,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'Wrapping to top.'",
      "     VISIBLE:  'Wrapping to top.', cursor=0",
      "BRAILLE LINE:  'Enter your Name:  $l'",
-     "     VISIBLE:  'Enter your Name:  $l', cursor=18",
+     "     VISIBLE:  'Enter your Name:  $l', cursor=17",
      "SPEECH OUTPUT: 'Wrapping to top.' voice=system",
      "SPEECH OUTPUT: 'Enter your Name: entry'"]))
 
diff --git a/test/keystrokes/firefox/label_inference_bugzilla_search.py 
b/test/keystrokes/firefox/label_inference_bugzilla_search.py
index 2afcdd4..b17e052 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:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', 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.'"]))
@@ -50,8 +50,8 @@ sequence.append(utils.AssertPresentationAction(
     "4. Tab",
     ["BRAILLE LINE:  'Search push button'",
      "     VISIBLE:  'Search push button', cursor=1",
-     "BRAILLE LINE:  'Admin'",
-     "     VISIBLE:  'Admin', cursor=1",
+     "BRAILLE LINE:  'Admin '",
+     "     VISIBLE:  'Admin ', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "SPEECH OUTPUT: 'table with 2 rows 1 column'",
@@ -63,8 +63,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "5. Tab",
-    ["BRAILLE LINE:  'Admin'",
-     "     VISIBLE:  'Admin', cursor=1",
+    ["BRAILLE LINE:  'Admin '",
+     "     VISIBLE:  'Admin ', cursor=1",
      "BRAILLE LINE:  'accerciser'",
      "     VISIBLE:  'accerciser', cursor=1",
      "SPEECH OUTPUT: 'table with 2 rows 1 column'",
diff --git a/test/keystrokes/firefox/label_inference_entries.py 
b/test/keystrokes/firefox/label_inference_entries.py
index c4f5aa4..3b6f302 100644
--- a/test/keystrokes/firefox/label_inference_entries.py
+++ b/test/keystrokes/firefox/label_inference_entries.py
@@ -19,7 +19,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "1. Next form field",
     ["BRAILLE LINE:  'Type something rather amusing here:  $l'",
-     "     VISIBLE:  'something rather amusing here:  ', cursor=32",
+     "     VISIBLE:  ' something rather amusing here: ', cursor=32",
      "SPEECH OUTPUT: 'Type something rather amusing here: entry'"]))
 
 sequence.append(PauseAction(3000))
@@ -31,7 +31,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "2. Next form field",
     ["BRAILLE LINE:  'Amusing numbers fall between  $l'",
-     "     VISIBLE:  'Amusing numbers fall between  $l', cursor=30",
+     "     VISIBLE:  'Amusing numbers fall between  $l', cursor=29",
      "SPEECH OUTPUT: 'Amusing numbers fall between entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -41,7 +41,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "3. Next form field",
     ["BRAILLE LINE:  'and  $l'",
-     "     VISIBLE:  'and  $l', cursor=5",
+     "     VISIBLE:  'and  $l', cursor=4",
      "SPEECH OUTPUT: 'and entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -51,7 +51,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "4. Next form field",
     ["BRAILLE LINE:  'I'm a label  $l'",
-     "     VISIBLE:  'I'm a label  $l', cursor=13",
+     "     VISIBLE:  'I'm a label  $l', cursor=12",
      "SPEECH OUTPUT: 'I'm a label entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -61,7 +61,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "5. Next form field",
     ["BRAILLE LINE:  'Am I a label as well?  $l'",
-     "     VISIBLE:  'Am I a label as well?  $l', cursor=23",
+     "     VISIBLE:  'Am I a label as well?  $l', cursor=22",
      "SPEECH OUTPUT: 'Am I a label as well? entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -71,7 +71,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "6. Next form field",
     ["BRAILLE LINE:  'Looking at what follows visually, I'm not sure what I would type/i.e. what the labels 
are.  $l'",
-     "     VISIBLE:  'type/i.e. what the labels are.  ', cursor=32",
+     "     VISIBLE:  ' type/i.e. what the labels are. ', cursor=32",
      "SPEECH OUTPUT: 'Looking at what follows visually, I'm not sure what I would type/i.e. what the labels 
are. entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -81,7 +81,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "7. Next form field",
     ["BRAILLE LINE:  'Distance doesn't count on the left  $l'",
-     "     VISIBLE:  'ance doesn't count on the left  ', cursor=32",
+     "     VISIBLE:  'tance doesn't count on the left ', cursor=32",
      "SPEECH OUTPUT: 'Distance doesn't count on the left entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -91,7 +91,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "8. Next form field",
     ["BRAILLE LINE:  'First Name  $l'",
-     "     VISIBLE:  'First Name  $l', cursor=12",
+     "     VISIBLE:  'First Name  $l', cursor=11",
      "SPEECH OUTPUT: 'First Name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -101,7 +101,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "9. Next form field",
     ["BRAILLE LINE:  'M.I.  $l'",
-     "     VISIBLE:  'M.I.  $l', cursor=6",
+     "     VISIBLE:  'M.I.  $l', cursor=5",
      "SPEECH OUTPUT: 'M.I. entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -111,7 +111,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "10. Next form field",
     ["BRAILLE LINE:  'Last Name  $l'",
-     "     VISIBLE:  'Last Name  $l', cursor=11",
+     "     VISIBLE:  'Last Name  $l', cursor=10",
      "SPEECH OUTPUT: 'Last Name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -121,7 +121,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "11. Next form field",
     ["BRAILLE LINE:  'First name  $l'",
-     "     VISIBLE:  'First name  $l', cursor=12",
+     "     VISIBLE:  'First name  $l', cursor=11",
      "SPEECH OUTPUT: 'First name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -131,7 +131,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "12. Next form field",
     ["BRAILLE LINE:  'Middle initial  $l'",
-     "     VISIBLE:  'Middle initial  $l', cursor=16",
+     "     VISIBLE:  'Middle initial  $l', cursor=15",
      "SPEECH OUTPUT: 'Middle initial entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -141,7 +141,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "13. Next form field",
     ["BRAILLE LINE:  'Last name  $l'",
-     "     VISIBLE:  'Last name  $l', cursor=11",
+     "     VISIBLE:  'Last name  $l', cursor=10",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -151,7 +151,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "14. Next form field",
     ["BRAILLE LINE:  'First Name  $l'",
-     "     VISIBLE:  'First Name  $l', cursor=12",
+     "     VISIBLE:  'First Name  $l', cursor=11",
      "SPEECH OUTPUT: 'First Name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -161,7 +161,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "15. Next form field",
     ["BRAILLE LINE:  'Middle initial  $l'",
-     "     VISIBLE:  'Middle initial  $l', cursor=16",
+     "     VISIBLE:  'Middle initial  $l', cursor=15",
      "SPEECH OUTPUT: 'Middle initial entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -171,7 +171,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "16. Next form field",
     ["BRAILLE LINE:  'Last name  $l'",
-     "     VISIBLE:  'Last name  $l', cursor=11",
+     "     VISIBLE:  'Last name  $l', cursor=10",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -181,7 +181,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "17. Next form field",
     ["BRAILLE LINE:  'Given name  $l'",
-     "     VISIBLE:  'Given name  $l', cursor=12",
+     "     VISIBLE:  'Given name  $l', cursor=11",
      "SPEECH OUTPUT: 'Given name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -191,7 +191,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "18. Next form field",
     ["BRAILLE LINE:  'initial  $l'",
-     "     VISIBLE:  'initial  $l', cursor=9",
+     "     VISIBLE:  'initial  $l', cursor=8",
      "SPEECH OUTPUT: 'initial entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -201,7 +201,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "19. Next form field",
     ["BRAILLE LINE:  'Surname  $l'",
-     "     VISIBLE:  'Surname  $l', cursor=9",
+     "     VISIBLE:  'Surname  $l', cursor=8",
      "SPEECH OUTPUT: 'Surname entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -211,7 +211,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "20. Next form field",
     ["BRAILLE LINE:  'First name  $l'",
-     "     VISIBLE:  'First name  $l', cursor=12",
+     "     VISIBLE:  'First name  $l', cursor=11",
      "SPEECH OUTPUT: 'First name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -221,7 +221,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "21. Next form field",
     ["BRAILLE LINE:  'Middle initial  $l'",
-     "     VISIBLE:  'Middle initial  $l', cursor=16",
+     "     VISIBLE:  'Middle initial  $l', cursor=15",
      "SPEECH OUTPUT: 'Middle initial entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -231,7 +231,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "22. Next form field",
     ["BRAILLE LINE:  'Last name  $l'",
-     "     VISIBLE:  'Last name  $l', cursor=11",
+     "     VISIBLE:  'Last name  $l', cursor=10",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -241,7 +241,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "23. Next form field",
     ["BRAILLE LINE:  'First name  $l'",
-     "     VISIBLE:  'First name  $l', cursor=12",
+     "     VISIBLE:  'First name  $l', cursor=11",
      "SPEECH OUTPUT: 'First name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -251,7 +251,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "24. Next form field",
     ["BRAILLE LINE:  'Middle initial  $l'",
-     "     VISIBLE:  'Middle initial  $l', cursor=16",
+     "     VISIBLE:  'Middle initial  $l', cursor=15",
      "SPEECH OUTPUT: 'Middle initial entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -261,7 +261,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "25. Next form field",
     ["BRAILLE LINE:  'Last name  $l'",
-     "     VISIBLE:  'Last name  $l', cursor=11",
+     "     VISIBLE:  'Last name  $l', cursor=10",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -271,7 +271,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "26. Next form field",
     ["BRAILLE LINE:  'patched image  $l'",
-     "     VISIBLE:  'patched image  $l', cursor=15",
+     "     VISIBLE:  'patched image  $l', cursor=14",
      "SPEECH OUTPUT: 'patched image entry'"]))
 
 
@@ -282,7 +282,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "27. Next form field",
     ["BRAILLE LINE:  'First name  $l'",
-     "     VISIBLE:  'First name  $l', cursor=12",
+     "     VISIBLE:  'First name  $l', cursor=11",
      "SPEECH OUTPUT: 'First name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -292,7 +292,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "28. Next form field",
     ["BRAILLE LINE:  'Middle initial  $l'",
-     "     VISIBLE:  'Middle initial  $l', cursor=16",
+     "     VISIBLE:  'Middle initial  $l', cursor=15",
      "SPEECH OUTPUT: 'Middle initial entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -302,7 +302,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "29. Next form field",
     ["BRAILLE LINE:  'Last name  $l'",
-     "     VISIBLE:  'Last name  $l', cursor=11",
+     "     VISIBLE:  'Last name  $l', cursor=10",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -312,7 +312,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "30. Next form field",
     ["BRAILLE LINE:  'patched image  $l'",
-     "     VISIBLE:  'patched image  $l', cursor=15",
+     "     VISIBLE:  'patched image  $l', cursor=14",
      "SPEECH OUTPUT: 'patched image entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -322,7 +322,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "31. Next form field",
     ["BRAILLE LINE:  'First name  $l'",
-     "     VISIBLE:  'First name  $l', cursor=12",
+     "     VISIBLE:  'First name  $l', cursor=11",
      "SPEECH OUTPUT: 'First name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -332,7 +332,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "32. Next form field",
     ["BRAILLE LINE:  'Middle initial  $l'",
-     "     VISIBLE:  'Middle initial  $l', cursor=16",
+     "     VISIBLE:  'Middle initial  $l', cursor=15",
      "SPEECH OUTPUT: 'Middle initial entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -342,7 +342,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "33. Next form field",
     ["BRAILLE LINE:  'Last name  $l'",
-     "     VISIBLE:  'Last name  $l', cursor=11",
+     "     VISIBLE:  'Last name  $l', cursor=10",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -352,7 +352,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "34. Next form field",
     ["BRAILLE LINE:  'patched image  $l'",
-     "     VISIBLE:  'patched image  $l', cursor=15",
+     "     VISIBLE:  'patched image  $l', cursor=14",
      "SPEECH OUTPUT: 'patched image entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -362,7 +362,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "35. Next form field",
     ["BRAILLE LINE:  'bandaid graphic  $l'",
-     "     VISIBLE:  'bandaid graphic  $l', cursor=17",
+     "     VISIBLE:  'bandaid graphic  $l', cursor=16",
      "SPEECH OUTPUT: 'bandaid graphic entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -372,7 +372,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "36. Next form field",
     ["BRAILLE LINE:  'bandaid graphic redux  $l'",
-     "     VISIBLE:  'bandaid graphic redux  $l', cursor=23",
+     "     VISIBLE:  'bandaid graphic redux  $l', cursor=22",
      "SPEECH OUTPUT: 'bandaid graphic redux entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -419,7 +419,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'Wrapping to top.'",
      "     VISIBLE:  'Wrapping to top.', cursor=0",
      "BRAILLE LINE:  'Type something rather amusing here:  $l'",
-     "     VISIBLE:  'something rather amusing here:  ', cursor=32",
+     "     VISIBLE:  ' something rather amusing here: ', cursor=32",
      "SPEECH OUTPUT: 'Wrapping to top.' voice=system",
      "SPEECH OUTPUT: 'Type something rather amusing here: entry'"]))
 
diff --git a/test/keystrokes/firefox/label_inference_mailman.py 
b/test/keystrokes/firefox/label_inference_mailman.py
index c3dcda9..cf98a33 100644
--- a/test/keystrokes/firefox/label_inference_mailman.py
+++ b/test/keystrokes/firefox/label_inference_mailman.py
@@ -19,7 +19,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "1. Next form field",
     ["BRAILLE LINE:  'search mozilla:  $l'",
-     "     VISIBLE:  'search mozilla:  $l', cursor=17",
+     "     VISIBLE:  'search mozilla:  $l', cursor=16",
      "SPEECH OUTPUT: 'search mozilla: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -39,7 +39,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "3. Next form field",
     ["BRAILLE LINE:  'Your email address:  $l'",
-     "     VISIBLE:  'Your email address:  $l', cursor=21",
+     "     VISIBLE:  'Your email address:  $l', cursor=20",
      "SPEECH OUTPUT: 'Your email address: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -49,7 +49,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "4. Next form field",
     ["BRAILLE LINE:  'Your name (optional):  $l'",
-     "     VISIBLE:  'Your name (optional):  $l', cursor=23",
+     "     VISIBLE:  'Your name (optional):  $l', cursor=22",
      "SPEECH OUTPUT: 'Your name (optional): entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -111,7 +111,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "10. Next form field",
     ["BRAILLE LINE:  'Admin address:  $l'",
-     "     VISIBLE:  'Admin address:  $l', cursor=16",
+     "     VISIBLE:  'Admin address:  $l', cursor=15",
      "SPEECH OUTPUT: 'Admin address: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -141,7 +141,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "13. Next form field",
     ["BRAILLE LINE:  'subscription email address:  $l'",
-     "     VISIBLE:  'subscription email address:  $l', cursor=29",
+     "     VISIBLE:  'subscription email address:  $l', cursor=28",
      "SPEECH OUTPUT: 'subscription email address: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_bug_546815.py b/test/keystrokes/firefox/line_nav_bug_546815.py
index 88ed325..6d12314 100644
--- a/test/keystrokes/firefox/line_nav_bug_546815.py
+++ b/test/keystrokes/firefox/line_nav_bug_546815.py
@@ -71,7 +71,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "7. Line Down",
-    ["BRAILLE LINE:  '2. Enter your City:  $l 3. Enter your State:  $l 4. Enter your Country: US $l text 
field'",
+    ["BRAILLE LINE:  '2. Enter your City:  $l 3. Enter your State:  $l 4. Enter your Country: US $l text 
field using'",
      "     VISIBLE:  '2. Enter your City:  $l 3. Enter', cursor=1",
      "SPEECH OUTPUT: '2. Enter your City:'",
      "SPEECH OUTPUT: 'entry'",
@@ -80,7 +80,7 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: '4. Enter your Country:'",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'US'",
-     "SPEECH OUTPUT: 'text field'"]))
+     "SPEECH OUTPUT: 'text field using'"]))
 
 sequence.append(KeyComboAction("Down"))
 
@@ -367,7 +367,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "41. Line Up",
-    ["BRAILLE LINE:  '2. Enter your City:  $l 3. Enter your State:  $l 4. Enter your Country: US $l text 
field'",
+    ["BRAILLE LINE:  '2. Enter your City:  $l 3. Enter your State:  $l 4. Enter your Country: US $l text 
field using'",
      "     VISIBLE:  '2. Enter your City:  $l 3. Enter', cursor=1",
      "SPEECH OUTPUT: '2. Enter your City:'",
      "SPEECH OUTPUT: 'entry'",
@@ -376,7 +376,7 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: '4. Enter your Country:'",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'US'",
-     "SPEECH OUTPUT: 'text field'"]))
+     "SPEECH OUTPUT: 'text field using'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_bug_552887a.py b/test/keystrokes/firefox/line_nav_bug_552887a.py
index 9732490..1dc0cf6 100644
--- a/test/keystrokes/firefox/line_nav_bug_552887a.py
+++ b/test/keystrokes/firefox/line_nav_bug_552887a.py
@@ -58,33 +58,33 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Down",
-    ["BRAILLE LINE:  'Can an Orca really'",
-     "     VISIBLE:  'Can an Orca really', cursor=1",
-     "SPEECH OUTPUT: 'Can an Orca really link'"]))
+    ["BRAILLE LINE:  'Can an Orca really hold'",
+     "     VISIBLE:  'Can an Orca really hold', cursor=1",
+     "SPEECH OUTPUT: 'Can an Orca really hold link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "7. Line Down",
-    ["BRAILLE LINE:  'hold a white cane?'",
-     "     VISIBLE:  'hold a white cane?', cursor=1",
-     "SPEECH OUTPUT: 'hold a white cane? link'"]))
+    ["BRAILLE LINE:  'a white cane? (And'",
+     "     VISIBLE:  'a white cane? (And', cursor=1",
+     "SPEECH OUTPUT: 'a white cane? (And link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "8. Line Down",
-    ["BRAILLE LINE:  '\(And why aren't we'",
-     "     VISIBLE:  '\(And why aren't we', cursor=1",
-     "SPEECH OUTPUT: '\(And why aren't we link'"]))
+    ["BRAILLE LINE:  'why aren't we speaking'",
+     "     VISIBLE:  'why aren't we speaking', cursor=1",
+     "SPEECH OUTPUT: 'why aren't we speaking link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "9. Line Down",
-    ["BRAILLE LINE:  'speaking this text?'",
-     "     VISIBLE:  'speaking this text?', cursor=1",
-     "SPEECH OUTPUT: 'speaking this text? link'"]))
+    ["BRAILLE LINE:  'this text?'",
+     "     VISIBLE:  'this text?', cursor=1",
+     "SPEECH OUTPUT: 'this text? link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -178,33 +178,33 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "21. Line Up",
-    ["BRAILLE LINE:  'speaking this text?'",
-     "     VISIBLE:  'speaking this text?', cursor=1",
-     "SPEECH OUTPUT: 'speaking this text? link'"]))
+    ["BRAILLE LINE:  'this text?'",
+     "     VISIBLE:  'this text?', cursor=1",
+     "SPEECH OUTPUT: 'this text? link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "22. Line Up",
-    ["BRAILLE LINE:  '\(And why aren't we'",
-     "     VISIBLE:  '\(And why aren't we', cursor=1",
-     "SPEECH OUTPUT: '\(And why aren't we link'"]))
+    ["BRAILLE LINE:  'why aren't we speaking'",
+     "     VISIBLE:  'why aren't we speaking', cursor=1",
+     "SPEECH OUTPUT: 'why aren't we speaking link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "23. Line Up",
-    ["BRAILLE LINE:  'hold a white cane?'",
-     "     VISIBLE:  'hold a white cane?', cursor=1",
-     "SPEECH OUTPUT: 'hold a white cane? link'"]))
+    ["BRAILLE LINE:  'a white cane? (And'",
+     "     VISIBLE:  'a white cane? (And', cursor=1",
+     "SPEECH OUTPUT: 'a white cane? (And link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "24. Line Up",
-    ["BRAILLE LINE:  'Can an Orca really'",
-     "     VISIBLE:  'Can an Orca really', cursor=1",
-     "SPEECH OUTPUT: 'Can an Orca really link'"]))
+    ["BRAILLE LINE:  'Can an Orca really hold'",
+     "     VISIBLE:  'Can an Orca really hold', cursor=1",
+     "SPEECH OUTPUT: 'Can an Orca really hold link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_bug_570757.py b/test/keystrokes/firefox/line_nav_bug_570757.py
index 9f7c40d..68dd683 100644
--- a/test/keystrokes/firefox/line_nav_bug_570757.py
+++ b/test/keystrokes/firefox/line_nav_bug_570757.py
@@ -32,7 +32,7 @@ sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
     ["BRAILLE LINE:  'Solution  Here is a step-by-step tutorial:'",
      "     VISIBLE:  'Solution  Here is a step-by-step', cursor=11",
-     "SPEECH OUTPUT: 'Here is a step-by-step tutorial: panel'"]))
+     "SPEECH OUTPUT: 'Here is a step-by-step tutorial: panel.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -64,7 +64,7 @@ sequence.append(utils.AssertPresentationAction(
     "7. Line Up",
     ["BRAILLE LINE:  'Solution  Here is a step-by-step tutorial:'",
      "     VISIBLE:  'Solution  Here is a step-by-step', cursor=11",
-     "SPEECH OUTPUT: 'Here is a step-by-step tutorial: panel'"]))
+     "SPEECH OUTPUT: 'Here is a step-by-step tutorial: panel.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_bug_577239.py b/test/keystrokes/firefox/line_nav_bug_577239.py
index 38f6e0d..e28f2e8 100644
--- a/test/keystrokes/firefox/line_nav_bug_577239.py
+++ b/test/keystrokes/firefox/line_nav_bug_577239.py
@@ -38,25 +38,25 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
-    ["BRAILLE LINE:  '2. This is a list item that spans multiple lines. If Orca can successfully read to the 
end of this list item, it will have'",
+    ["BRAILLE LINE:  '2. This is a list item that spans multiple lines. If Orca can successfully read to the 
end of this list item, it will have read'",
      "     VISIBLE:  '2. This is a list item that span', cursor=1",
-     "SPEECH OUTPUT: '2. This is a list item that spans multiple lines. If Orca can successfully read to the 
end of this list item, it will have.'"]))
+     "SPEECH OUTPUT: '2. This is a list item that spans multiple lines. If Orca can successfully read to the 
end of this list item, it will have read.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Line Down",
-    ["BRAILLE LINE:  'read several lines of text within this single item. And, yes, I realize that this is 
not deathless prose. In fact, it is'",
-     "     VISIBLE:  'read several lines of text withi', cursor=1",
-     "SPEECH OUTPUT: 'read several lines of text within this single item. And, yes, I realize that this is 
not deathless prose. In fact, it is.'"]))
+    ["BRAILLE LINE:  'several lines of text within this single item. And, yes, I realize that this is not 
deathless prose. In fact, it is prose that'",
+     "     VISIBLE:  'several lines of text within thi', cursor=1",
+     "SPEECH OUTPUT: 'several lines of text within this single item. And, yes, I realize that this is not 
deathless prose. In fact, it is prose that.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Down",
-    ["BRAILLE LINE:  'prose that should probably be put out of its misery.'",
-     "     VISIBLE:  'prose that should probably be pu', cursor=1",
-     "SPEECH OUTPUT: 'prose that should probably be put out of its misery.'"]))
+    ["BRAILLE LINE:  'should probably be put out of its misery.'",
+     "     VISIBLE:  'should probably be put out of it', cursor=1",
+     "SPEECH OUTPUT: 'should probably be put out of its misery.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -78,25 +78,25 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "9. Line Down",
-    ["BRAILLE LINE:  '• This is a list item that spans multiple lines. If Orca can successfully read to the 
end of this list item, it will have'",
+    ["BRAILLE LINE:  '• This is a list item that spans multiple lines. If Orca can successfully read to the 
end of this list item, it will have read'",
      "     VISIBLE:  '• This is a list item that spans', cursor=1",
-     "SPEECH OUTPUT: '• This is a list item that spans multiple lines. If Orca can successfully read to the 
end of this list item, it will have.'"]))
+     "SPEECH OUTPUT: '• This is a list item that spans multiple lines. If Orca can successfully read to the 
end of this list item, it will have read.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "10. Line Down",
-    ["BRAILLE LINE:  'read several lines of text within this single item. And, yes, I realize that this is 
not deathless prose. In fact, it is'",
-     "     VISIBLE:  'read several lines of text withi', cursor=1",
-     "SPEECH OUTPUT: 'read several lines of text within this single item. And, yes, I realize that this is 
not deathless prose. In fact, it is.'"]))
+    ["BRAILLE LINE:  'several lines of text within this single item. And, yes, I realize that this is not 
deathless prose. In fact, it is prose that'",
+     "     VISIBLE:  'several lines of text within thi', cursor=1",
+     "SPEECH OUTPUT: 'several lines of text within this single item. And, yes, I realize that this is not 
deathless prose. In fact, it is prose that.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "11. Line Up",
-    ["BRAILLE LINE:  '• This is a list item that spans multiple lines. If Orca can successfully read to the 
end of this list item, it will have'",
+    ["BRAILLE LINE:  '• This is a list item that spans multiple lines. If Orca can successfully read to the 
end of this list item, it will have read'",
      "     VISIBLE:  '• This is a list item that spans', cursor=1",
-     "SPEECH OUTPUT: '• This is a list item that spans multiple lines. If Orca can successfully read to the 
end of this list item, it will have.'"]))
+     "SPEECH OUTPUT: '• This is a list item that spans multiple lines. If Orca can successfully read to the 
end of this list item, it will have read.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -118,25 +118,25 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "14. Line Up",
-    ["BRAILLE LINE:  'prose that should probably be put out of its misery.'",
-     "     VISIBLE:  'prose that should probably be pu', cursor=1",
-     "SPEECH OUTPUT: 'prose that should probably be put out of its misery.'"]))
+    ["BRAILLE LINE:  'should probably be put out of its misery.'",
+     "     VISIBLE:  'should probably be put out of it', cursor=1",
+     "SPEECH OUTPUT: 'should probably be put out of its misery.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "15. Line Up",
-    ["BRAILLE LINE:  'read several lines of text within this single item. And, yes, I realize that this is 
not deathless prose. In fact, it is'",
-     "     VISIBLE:  'read several lines of text withi', cursor=1",
-     "SPEECH OUTPUT: 'read several lines of text within this single item. And, yes, I realize that this is 
not deathless prose. In fact, it is.'"]))
+    ["BRAILLE LINE:  'several lines of text within this single item. And, yes, I realize that this is not 
deathless prose. In fact, it is prose that'",
+     "     VISIBLE:  'several lines of text within thi', cursor=1",
+     "SPEECH OUTPUT: 'several lines of text within this single item. And, yes, I realize that this is not 
deathless prose. In fact, it is prose that.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "16. Line Up",
-    ["BRAILLE LINE:  '2. This is a list item that spans multiple lines. If Orca can successfully read to the 
end of this list item, it will have'",
+    ["BRAILLE LINE:  '2. This is a list item that spans multiple lines. If Orca can successfully read to the 
end of this list item, it will have read'",
      "     VISIBLE:  '2. This is a list item that span', cursor=1",
-     "SPEECH OUTPUT: '2. This is a list item that spans multiple lines. If Orca can successfully read to the 
end of this list item, it will have.'"]))
+     "SPEECH OUTPUT: '2. This is a list item that spans multiple lines. If Orca can successfully read to the 
end of this list item, it will have read.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_bug_592383.py b/test/keystrokes/firefox/line_nav_bug_592383.py
index b2dd51c..27e6684 100644
--- a/test/keystrokes/firefox/line_nav_bug_592383.py
+++ b/test/keystrokes/firefox/line_nav_bug_592383.py
@@ -38,17 +38,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Down",
-    ["BRAILLE LINE:  '   hy did the chicken cross the road? Give up? It was to escape from the enormous 
capital letter at the'",
+    ["BRAILLE LINE:  '   hy did the chicken cross the road? Give up? It was to escape from the enormous 
capital letter at the beginning of'",
      "     VISIBLE:  '   hy did the chicken cross the ', cursor=1",
-     "SPEECH OUTPUT: 'hy did the chicken cross the road? Give up? It was to escape from the enormous capital 
letter at the'"]))
+     "SPEECH OUTPUT: 'hy did the chicken cross the road? Give up? It was to escape from the enormous capital 
letter at the beginning of'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Down",
-    ["BRAILLE LINE:  'beginning of this paragraph. These are the things that keep chickens up at night. No. 
Really.They are.'",
-     "     VISIBLE:  'beginning of this paragraph. The', cursor=1",
-     "SPEECH OUTPUT: 'beginning of this paragraph. These are the things that keep chickens up at night. No. 
Really.They are.'"]))
+    ["BRAILLE LINE:  'this paragraph. These are the things that keep chickens up at night. No. Really.They 
are.'",
+     "     VISIBLE:  'this paragraph. These are the th', cursor=1",
+     "SPEECH OUTPUT: 'this paragraph. These are the things that keep chickens up at night. No. Really.They 
are.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -70,17 +70,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "8. Up",
-    ["BRAILLE LINE:  'beginning of this paragraph. These are the things that keep chickens up at night. No. 
Really.They are.'",
-     "     VISIBLE:  'beginning of this paragraph. The', cursor=1",
-     "SPEECH OUTPUT: 'beginning of this paragraph. These are the things that keep chickens up at night. No. 
Really.They are.'"]))
+    ["BRAILLE LINE:  'this paragraph. These are the things that keep chickens up at night. No. Really.They 
are.'",
+     "     VISIBLE:  'this paragraph. These are the th', cursor=1",
+     "SPEECH OUTPUT: 'this paragraph. These are the things that keep chickens up at night. No. Really.They 
are.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "9. Up",
-    ["BRAILLE LINE:  '   hy did the chicken cross the road? Give up? It was to escape from the enormous 
capital letter at the'",
+    ["BRAILLE LINE:  '   hy did the chicken cross the road? Give up? It was to escape from the enormous 
capital letter at the beginning of'",
      "     VISIBLE:  '   hy did the chicken cross the ', cursor=1",
-     "SPEECH OUTPUT: 'hy did the chicken cross the road? Give up? It was to escape from the enormous capital 
letter at the'"]))
+     "SPEECH OUTPUT: 'hy did the chicken cross the road? Give up? It was to escape from the enormous capital 
letter at the beginning of'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_bugzilla_search_down.py 
b/test/keystrokes/firefox/line_nav_bugzilla_search_down.py
index 4b05d42..a012083 100644
--- a/test/keystrokes/firefox/line_nav_bugzilla_search_down.py
+++ b/test/keystrokes/firefox/line_nav_bugzilla_search_down.py
@@ -354,7 +354,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "37. Line Down",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -418,7 +418,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "45. Line Down",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -433,7 +433,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "47. Line Down",
-    ["BRAILLE LINE:  'Only include combo box bugs numbered: $l'",
+    ["BRAILLE LINE:  'Only include combo box bugs numbered:  $l'",
      "     VISIBLE:  'Only include combo box bugs numb', cursor=1",
      "SPEECH OUTPUT: 'Only include combo box.'",
      "SPEECH OUTPUT: 'bugs numbered:.'",
@@ -468,7 +468,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "51. Line Down",
     ["BRAILLE LINE:  ' $l and Now $l'",
-     "     VISIBLE:  ' $l and Now $l', cursor=1",
+     "     VISIBLE:  ' $l and Now $l', cursor=0",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'and'",
      "SPEECH OUTPUT: 'entry Now'"]))
@@ -510,7 +510,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "56. Line Down",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_bugzilla_search_up.py 
b/test/keystrokes/firefox/line_nav_bugzilla_search_up.py
index 41334bd..cd0ea00 100644
--- a/test/keystrokes/firefox/line_nav_bugzilla_search_up.py
+++ b/test/keystrokes/firefox/line_nav_bugzilla_search_up.py
@@ -135,7 +135,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "14. Line Up",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -175,7 +175,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "19. Line Up",
     ["BRAILLE LINE:  ' $l and Now $l'",
-     "     VISIBLE:  ' $l and Now $l', cursor=1",
+     "     VISIBLE:  ' $l and Now $l', cursor=0",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'and'",
      "SPEECH OUTPUT: 'entry Now'"]))
@@ -188,13 +188,13 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Only bugs changed between:', cursor=1",
      "SPEECH OUTPUT: 'Only bugs changed between:.'"]))
 
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "21. Line Up",
-    ["BRAILLE LINE:  'Bug Changes'",
-     "     VISIBLE:  'Bug Changes', cursor=1",
-     "SPEECH OUTPUT: 'Bug Changes'"]))
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("Up"))
+#sequence.append(utils.AssertPresentationAction(
+#    "21. Line Up",
+#    ["BRAILLE LINE:  'Bug Changes'",
+#     "     VISIBLE:  'Bug Changes', cursor=1",
+#     "SPEECH OUTPUT: 'Bug Changes'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -208,7 +208,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "23. Line Up",
-    ["BRAILLE LINE:  'Only include combo box bugs numbered: $l'",
+    ["BRAILLE LINE:  'Only include combo box bugs numbered:  $l'",
      "     VISIBLE:  'Only include combo box bugs numb', cursor=1",
      "SPEECH OUTPUT: 'Only include combo box.'",
      "SPEECH OUTPUT: 'bugs numbered:.'",
@@ -227,7 +227,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "25. Line Up",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -291,7 +291,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "33. Line Up",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_empty_anchor.py 
b/test/keystrokes/firefox/line_nav_empty_anchor.py
index 22e7701..9c1795a 100644
--- a/test/keystrokes/firefox/line_nav_empty_anchor.py
+++ b/test/keystrokes/firefox/line_nav_empty_anchor.py
@@ -18,8 +18,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "1. Top of file",
-    ["BRAILLE LINE:  'FAQ h1'",
-     "     VISIBLE:  'FAQ h1', cursor=1",
+    ["BRAILLE LINE:  'FAQ  h1'",
+     "     VISIBLE:  'FAQ  h1', cursor=1",
      "SPEECH OUTPUT: 'FAQ'",
      "SPEECH OUTPUT: 'heading level 1'"]))
 
@@ -255,8 +255,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "29. Line Up",
-    ["BRAILLE LINE:  'FAQ h1'",
-     "     VISIBLE:  'FAQ h1', cursor=1",
+    ["BRAILLE LINE:  'FAQ  h1'",
+     "     VISIBLE:  'FAQ  h1', cursor=1",
      "SPEECH OUTPUT: 'FAQ'",
      "SPEECH OUTPUT: 'heading level 1'"]))
 
diff --git a/test/keystrokes/firefox/line_nav_empty_textarea.py 
b/test/keystrokes/firefox/line_nav_empty_textarea.py
index 6d0cf3a..316b132 100644
--- a/test/keystrokes/firefox/line_nav_empty_textarea.py
+++ b/test/keystrokes/firefox/line_nav_empty_textarea.py
@@ -28,7 +28,7 @@ sequence.append(utils.AssertPresentationAction(
     "2. Line Down",
     ["BRAILLE LINE:  'Label:'",
      "     VISIBLE:  'Label:', cursor=1",
-     "SPEECH OUTPUT: 'Label'",
+     "SPEECH OUTPUT: 'Label clickable'",
      "SPEECH OUTPUT: ':'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -36,7 +36,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
     ["BRAILLE LINE:  'Label  $l'",
-     "     VISIBLE:  'Label  $l', cursor=7",
+     "     VISIBLE:  'Label  $l', cursor=6",
      "SPEECH OUTPUT: 'Label entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -52,7 +52,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "5. Line Up",
     ["BRAILLE LINE:  'Label  $l'",
-     "     VISIBLE:  'Label  $l', cursor=7",
+     "     VISIBLE:  'Label  $l', cursor=6",
      "SPEECH OUTPUT: 'Label entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -61,7 +61,7 @@ sequence.append(utils.AssertPresentationAction(
     "6. Line Up",
     ["BRAILLE LINE:  'Label:'",
      "     VISIBLE:  'Label:', cursor=1",
-     "SPEECH OUTPUT: 'Label'",
+     "SPEECH OUTPUT: 'Label clickable'",
      "SPEECH OUTPUT: ':'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_enter_bug.py b/test/keystrokes/firefox/line_nav_enter_bug.py
index c792634..12c11a7 100644
--- a/test/keystrokes/firefox/line_nav_enter_bug.py
+++ b/test/keystrokes/firefox/line_nav_enter_bug.py
@@ -70,30 +70,24 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Line Down",
-    ["BRAILLE LINE:  'Before reporting a bug, please read the bug writing guidelines,'",
+    ["BRAILLE LINE:  'Before reporting a bug, please read the bug writing guidelines, please look at the 
list of most'",
      "     VISIBLE:  'Before reporting a bug, please r', cursor=1",
      "SPEECH OUTPUT: 'Before reporting a bug, please read the.'",
      "SPEECH OUTPUT: 'bug writing guidelines'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: ',.'"]))
+     "SPEECH OUTPUT: ', please look at the list of.'",
+     "SPEECH OUTPUT: 'most'",
+     "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Down",
-    ["BRAILLE LINE:  'please look at the list of most frequently reported bugs, and please'",
-     "     VISIBLE:  'please look at the list of most ', cursor=1",
-     "SPEECH OUTPUT: 'please look at the list of.'",
-     "SPEECH OUTPUT: 'most frequently reported bugs'",
+    ["BRAILLE LINE:  'frequently reported bugs, and please search or browse for the bug.'",
+     "     VISIBLE:  'frequently reported bugs, and pl', cursor=1",
+     "SPEECH OUTPUT: 'frequently reported bugs'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: ', and please.'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "7. Line Down",
-    ["BRAILLE LINE:  'search or browse for the bug.'",
-     "     VISIBLE:  'search or browse for the bug.', cursor=1",
+     "SPEECH OUTPUT: ', and please.'",
      "SPEECH OUTPUT: 'search'",
      "SPEECH OUTPUT: 'link.'",
      "SPEECH OUTPUT: 'or.'",
@@ -104,7 +98,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "8. Line Down",
+    "7. Line Down",
     ["BRAILLE LINE:  'Reporter: joanmarie diggs gmail com Product: orca'",
      "     VISIBLE:  'Reporter: joanmarie diggs gmail ', cursor=1",
      "SPEECH OUTPUT: 'Reporter:.'",
@@ -115,7 +109,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "9. Line Down",
+    "8. Line Down",
     ["BRAILLE LINE:  'Version:'",
      "     VISIBLE:  'Version:', cursor=1",
      "SPEECH OUTPUT: 'Version:.'"]))
@@ -123,16 +117,16 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "10. Line Down",
-    ["BRAILLE LINE:  '2.21.x list box'",
-     "     VISIBLE:  '2.21.x list box', cursor=1",
+    "9. Line Down",
+    ["BRAILLE LINE:  '2.21.x  list box'",
+     "     VISIBLE:  '2.21.x  list box', cursor=1",
      "SPEECH OUTPUT: '2.21.x.'",
      "SPEECH OUTPUT: 'List with 9 items.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "11. Line Down",
+    "10. Line Down",
     ["BRAILLE LINE:  'Component:'",
      "     VISIBLE:  'Component:', cursor=1",
      "SPEECH OUTPUT: 'Component'",
@@ -142,7 +136,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "12. Line Down",
+    "11. Line Down",
     ["BRAILLE LINE:  'list box'",
      "     VISIBLE:  'list box', cursor=1",
      "SPEECH OUTPUT: 'List with 5 items.'"]))
@@ -150,7 +144,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "13. Line Down",
+    "12. Line Down",
     ["BRAILLE LINE:  'GNOME'",
      "     VISIBLE:  'GNOME', cursor=1",
      "SPEECH OUTPUT: 'GNOME'",
@@ -159,7 +153,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "14. Line Down",
+    "13. Line Down",
     ["BRAILLE LINE:  'version:'",
      "     VISIBLE:  'version:', cursor=1",
      "SPEECH OUTPUT: 'version'",
@@ -169,7 +163,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "15. Line Down",
+    "14. Line Down",
     ["BRAILLE LINE:  'Unspecified combo box'",
      "     VISIBLE:  'Unspecified combo box', cursor=1",
      "SPEECH OUTPUT: 'Unspecified combo box.'"]))
@@ -177,7 +171,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "16. Line Down",
+    "15. Line Down",
     ["BRAILLE LINE:  'OS: Linux combo box'",
      "     VISIBLE:  'OS: Linux combo box', cursor=1",
      "SPEECH OUTPUT: 'OS'",
@@ -188,7 +182,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "17. Line Down",
+    "16. Line Down",
     ["BRAILLE LINE:  'Severity: normal combo box'",
      "     VISIBLE:  'Severity: normal combo box', cursor=1",
      "SPEECH OUTPUT: 'Severity'",
@@ -199,7 +193,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "18. Line Down",
+    "17. Line Down",
     ["BRAILLE LINE:  'Summary: $l'",
      "     VISIBLE:  'Summary: $l', cursor=1",
      "SPEECH OUTPUT: 'Summary:.'",
@@ -208,7 +202,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "19. Line Down",
+    "18. Line Down",
     ["BRAILLE LINE:  'Description:'",
      "     VISIBLE:  'Description:', cursor=1",
      "SPEECH OUTPUT: 'Description:.'"]))
@@ -216,15 +210,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "20. Line Down",
+    "19. Line Down",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "21. Line Down",
+    "20. Line Down",
     ["BRAILLE LINE:  'Optional Fields'",
      "     VISIBLE:  'Optional Fields', cursor=1",
      "SPEECH OUTPUT: 'Optional Fields.'"]))
@@ -232,7 +226,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "22. Line Down",
+    "21. Line Down",
     ["BRAILLE LINE:  'Cc: $l'",
      "     VISIBLE:  'Cc: $l', cursor=1",
      "SPEECH OUTPUT: 'Cc:.'",
@@ -241,7 +235,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "23. Line Down",
+    "22. Line Down",
     ["BRAILLE LINE:  'Keywords:'",
      "     VISIBLE:  'Keywords:', cursor=1",
      "SPEECH OUTPUT: 'Keywords'",
@@ -251,15 +245,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "24. Line Down",
+    "23. Line Down",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "25. Line Up",
+    "24. Line Up",
     ["BRAILLE LINE:  'Keywords:'",
      "     VISIBLE:  'Keywords:', cursor=1",
      "SPEECH OUTPUT: 'Keywords'",
@@ -269,7 +263,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "26. Line Up",
+    "25. Line Up",
     ["BRAILLE LINE:  'Cc: $l'",
      "     VISIBLE:  'Cc: $l', cursor=1",
      "SPEECH OUTPUT: 'Cc:.'",
@@ -278,7 +272,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "27. Line Up",
+    "26. Line Up",
     ["BRAILLE LINE:  'Optional Fields'",
      "     VISIBLE:  'Optional Fields', cursor=1",
      "SPEECH OUTPUT: 'Optional Fields.'"]))
@@ -286,15 +280,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "28. Line Up",
+    "27. Line Up",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "29. Line Up",
+    "28. Line Up",
     ["BRAILLE LINE:  'Description:'",
      "     VISIBLE:  'Description:', cursor=1",
      "SPEECH OUTPUT: 'Description:.'"]))
@@ -302,7 +296,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "30. Line Up",
+    "29. Line Up",
     ["BRAILLE LINE:  'Summary: $l'",
      "     VISIBLE:  'Summary: $l', cursor=1",
      "SPEECH OUTPUT: 'Summary:.'",
@@ -311,7 +305,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "31. Line Up",
+    "30. Line Up",
     ["BRAILLE LINE:  'Severity: normal combo box'",
      "     VISIBLE:  'Severity: normal combo box', cursor=1",
      "SPEECH OUTPUT: 'Severity'",
@@ -322,7 +316,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "32. Line Up",
+    "31. Line Up",
     ["BRAILLE LINE:  'OS: Linux combo box'",
      "     VISIBLE:  'OS: Linux combo box', cursor=1",
      "SPEECH OUTPUT: 'OS'",
@@ -333,7 +327,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "33. Line Up",
+    "32. Line Up",
     ["BRAILLE LINE:  'Unspecified combo box'",
      "     VISIBLE:  'Unspecified combo box', cursor=1",
      "SPEECH OUTPUT: 'Unspecified combo box.'"]))
@@ -341,7 +335,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "34. Line Up",
+    "33. Line Up",
     ["BRAILLE LINE:  'version:'",
      "     VISIBLE:  'version:', cursor=1",
      "SPEECH OUTPUT: 'version'",
@@ -351,7 +345,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "35. Line Up",
+    "34. Line Up",
     ["BRAILLE LINE:  'GNOME'",
      "     VISIBLE:  'GNOME', cursor=1",
      "SPEECH OUTPUT: 'GNOME'",
@@ -360,7 +354,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "36. Line Up",
+    "35. Line Up",
     ["BRAILLE LINE:  'list box'",
      "     VISIBLE:  'list box', cursor=1",
      "SPEECH OUTPUT: 'List with 5 items.'"]))
@@ -368,7 +362,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "37. Line Up",
+    "36. Line Up",
     ["BRAILLE LINE:  'Component:'",
      "     VISIBLE:  'Component:', cursor=1",
      "SPEECH OUTPUT: 'Component'",
@@ -378,16 +372,16 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "38. Line Up",
-    ["BRAILLE LINE:  '2.21.x list box'",
-     "     VISIBLE:  '2.21.x list box', cursor=1",
+    "37. Line Up",
+    ["BRAILLE LINE:  '2.21.x  list box'",
+     "     VISIBLE:  '2.21.x  list box', cursor=1",
      "SPEECH OUTPUT: '2.21.x.'",
      "SPEECH OUTPUT: 'List with 9 items.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "39. Line Up",
+    "38. Line Up",
     ["BRAILLE LINE:  'Version:'",
      "     VISIBLE:  'Version:', cursor=1",
      "SPEECH OUTPUT: 'Version:.'"]))
@@ -395,7 +389,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "40. Line Up",
+    "39. Line Up",
     ["BRAILLE LINE:  'Reporter: joanmarie diggs gmail com Product: orca'",
      "     VISIBLE:  'Reporter: joanmarie diggs gmail ', cursor=1",
      "SPEECH OUTPUT: 'Reporter:.'",
@@ -406,9 +400,12 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "41. Line Up",
-    ["BRAILLE LINE:  'search or browse for the bug.'",
-     "     VISIBLE:  'search or browse for the bug.', cursor=1",
+    "40. Line Up",
+    ["BRAILLE LINE:  'frequently reported bugs, and please search or browse for the bug.'",
+     "     VISIBLE:  'frequently reported bugs, and pl', cursor=1",
+     "SPEECH OUTPUT: 'frequently reported bugs'",
+     "SPEECH OUTPUT: 'link.'",
+     "SPEECH OUTPUT: ', and please.'",
      "SPEECH OUTPUT: 'search'",
      "SPEECH OUTPUT: 'link.'",
      "SPEECH OUTPUT: 'or.'",
@@ -419,29 +416,20 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "42. Line Up",
-    ["BRAILLE LINE:  'please look at the list of most frequently reported bugs, and please'",
-     "     VISIBLE:  'please look at the list of most ', cursor=1",
-     "SPEECH OUTPUT: 'please look at the list of.'",
-     "SPEECH OUTPUT: 'most frequently reported bugs'",
-     "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: ', and please.'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "43. Line Up",
-    ["BRAILLE LINE:  'Before reporting a bug, please read the bug writing guidelines,'",
+    "41. Line Up",
+    ["BRAILLE LINE:  'Before reporting a bug, please read the bug writing guidelines, please look at the 
list of most'",
      "     VISIBLE:  'Before reporting a bug, please r', cursor=1",
      "SPEECH OUTPUT: 'Before reporting a bug, please read the.'",
      "SPEECH OUTPUT: 'bug writing guidelines'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: ',.'"]))
+     "SPEECH OUTPUT: ', please look at the list of.'",
+     "SPEECH OUTPUT: 'most'",
+     "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "44. Line Up",
+    "42. Line Up",
     ["BRAILLE LINE:  'into Bugzilla. h1'",
      "     VISIBLE:  'into Bugzilla. h1', cursor=1",
      "SPEECH OUTPUT: 'into Bugzilla. heading level 1'"]))
@@ -449,7 +437,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "45. Line Up",
+    "43. Line Up",
     ["BRAILLE LINE:  'Enter Bug: orca \u2013 This page lets you enter a new bug  h1'",
      "     VISIBLE:  'Enter Bug: orca – This page lets', cursor=1",
      "SPEECH OUTPUT: 'Enter Bug: orca \u2013 This page lets you enter a new bug heading level 1'"]))
@@ -457,7 +445,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "46. Line Up",
+    "44. Line Up",
     ["BRAILLE LINE:  'New bug · Browse · Search · Reports · Account · Admin · Help Logged In joanmarie diggs 
gmail com | Log Out'",
      "     VISIBLE:  'New bug · Browse · Search · Repo', cursor=1",
      "SPEECH OUTPUT: 'New bug'",
@@ -487,7 +475,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "47. Line Up",
+    "45. Line Up",
     ["BRAILLE LINE:  'Home Bugzilla'",
      "     VISIBLE:  'Home Bugzilla', cursor=1",
      "SPEECH OUTPUT: 'Home link.'",
diff --git a/test/keystrokes/firefox/line_nav_entries.py b/test/keystrokes/firefox/line_nav_entries.py
index f022ec9..634253d 100644
--- a/test/keystrokes/firefox/line_nav_entries.py
+++ b/test/keystrokes/firefox/line_nav_entries.py
@@ -54,7 +54,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
     ["BRAILLE LINE:  ' $l I'm a label'",
-     "     VISIBLE:  ' $l I'm a label', cursor=1",
+     "     VISIBLE:  ' $l I'm a label', cursor=0",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'I'm a label'"]))
 
@@ -63,7 +63,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Line Down",
     ["BRAILLE LINE:  ' $l Am I a label as well?'",
-     "     VISIBLE:  ' $l Am I a label as well?', cursor=1",
+     "     VISIBLE:  ' $l Am I a label as well?', cursor=0",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'Am I a label as well?.'"]))
 
@@ -88,7 +88,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "8. Line Down",
     ["BRAILLE LINE:  ' $l Too far away to be a label.'",
-     "     VISIBLE:  ' $l Too far away to be a label.', cursor=1",
+     "     VISIBLE:  ' $l Too far away to be a label.', cursor=0",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'Too far away to be a label.'"]))
 
@@ -114,7 +114,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "11. Line Down",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -130,7 +130,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "13. Line Down",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -146,7 +146,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "15. Line Down",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -170,7 +170,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "18. Line Down",
     ["BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=1",
+     "     VISIBLE:  ' $l $l $l', cursor=0",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'entry'"]))
@@ -256,7 +256,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "28. Line Down",
     ["BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=1",
+     "     VISIBLE:  ' $l $l $l', cursor=0",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'entry'"]))
@@ -291,7 +291,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "32. Line Up",
     ["BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=1",
+     "     VISIBLE:  ' $l $l $l', cursor=0",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'entry'"]))
@@ -377,7 +377,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "42. Line Up",
     ["BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=1",
+     "     VISIBLE:  ' $l $l $l', cursor=0",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'entry'"]))
@@ -403,7 +403,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "45. Line Up",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -419,7 +419,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "47. Line Up",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -435,7 +435,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "49. Line Up",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -460,7 +460,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "52. Line Up",
     ["BRAILLE LINE:  ' $l Too far away to be a label.'",
-     "     VISIBLE:  ' $l Too far away to be a label.', cursor=1",
+     "     VISIBLE:  ' $l Too far away to be a label.', cursor=0",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'Too far away to be a label.'"]))
 
@@ -485,7 +485,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "55. Line Up",
     ["BRAILLE LINE:  ' $l Am I a label as well?'",
-     "     VISIBLE:  ' $l Am I a label as well?', cursor=1",
+     "     VISIBLE:  ' $l Am I a label as well?', cursor=0",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'Am I a label as well?.'"]))
 
@@ -494,9 +494,9 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "56. Line Up",
     ["BRAILLE LINE:  ' $l I'm a label'",
-     "     VISIBLE:  ' $l I'm a label', cursor=1",
+     "     VISIBLE:  ' $l I'm a label', cursor=0",
      "SPEECH OUTPUT: 'entry'",
-     "SPEECH OUTPUT: 'I'm a label"]))
+     "SPEECH OUTPUT: 'I'm a label'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_follow_same_page_link.py 
b/test/keystrokes/firefox/line_nav_follow_same_page_link.py
index fc5cfcb..c45f763 100644
--- a/test/keystrokes/firefox/line_nav_follow_same_page_link.py
+++ b/test/keystrokes/firefox/line_nav_follow_same_page_link.py
@@ -50,9 +50,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Down",
-    ["BRAILLE LINE:  'Orca are versatile and opportunistic predators. Some populations feed mostly on fish, 
and other populations hunt'",
+    ["BRAILLE LINE:  'Orca are versatile and opportunistic predators. Some populations feed mostly on fish, 
and other populations hunt marine'",
      "     VISIBLE:  'Orca are versatile and opportuni', cursor=1",
-     "SPEECH OUTPUT: 'Orca are versatile and opportunistic predators. Some populations feed mostly on fish, 
and other populations hunt'"]))
+     "SPEECH OUTPUT: 'Orca are versatile and opportunistic predators. Some populations feed mostly on fish, 
and other populations hunt marine'"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/firefox/line_nav_follow_same_page_link_2.py 
b/test/keystrokes/firefox/line_nav_follow_same_page_link_2.py
index db1f9a0..7f7bf50 100644
--- a/test/keystrokes/firefox/line_nav_follow_same_page_link_2.py
+++ b/test/keystrokes/firefox/line_nav_follow_same_page_link_2.py
@@ -10,9 +10,10 @@ sequence = MacroSequence()
 #sequence.append(WaitForDocLoad())
 sequence.append(PauseAction(5000))
 sequence.append(KeyComboAction("<Control>Home"))
+sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("H"))
 sequence.append(KeyComboAction("H"))
-for i in range(5):
+for i in range(4):
     sequence.append(KeyComboAction("Tab"))
     sequence.append(PauseAction(1000))
 
diff --git a/test/keystrokes/firefox/line_nav_follow_same_page_link_3.py 
b/test/keystrokes/firefox/line_nav_follow_same_page_link_3.py
index 11515cb..caf9e77 100644
--- a/test/keystrokes/firefox/line_nav_follow_same_page_link_3.py
+++ b/test/keystrokes/firefox/line_nav_follow_same_page_link_3.py
@@ -14,7 +14,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Line Down to what should be the text below the About heading",
-    ["BRAILLE LINE:  'Orca is a free, open source, flexible, extensible, and'",
+    ["KNOWN ISSUE: This test sometimes fails when run as part of the full suite; but passes when run alone.",
+     "BRAILLE LINE:  'Orca is a free, open source, flexible, extensible, and'",
      "     VISIBLE:  'Orca is a free, open source, fle', cursor=1",
      "SPEECH OUTPUT: 'Orca is a free, open source, flexible, extensible, and'"]))
 
diff --git a/test/keystrokes/firefox/line_nav_iframes_blogger.py 
b/test/keystrokes/firefox/line_nav_iframes_blogger.py
index f524461..2c76495 100644
--- a/test/keystrokes/firefox/line_nav_iframes_blogger.py
+++ b/test/keystrokes/firefox/line_nav_iframes_blogger.py
@@ -9,7 +9,6 @@ sequence = MacroSequence()
 
 #sequence.append(WaitForDocLoad())
 sequence.append(PauseAction(5000))
-
 sequence.append(KeyComboAction("<Control>Home"))
 
 sequence.append(utils.StartRecordingAction())
@@ -17,7 +16,7 @@ sequence.append(KeyComboAction("e"))
 sequence.append(utils.AssertPresentationAction(
     "1. E for next entry",
     ["BRAILLE LINE:  'Search  $l'",
-     "     VISIBLE:  'Search  $l', cursor=8",
+     "     VISIBLE:  'Search  $l', cursor=7",
      "SPEECH OUTPUT: 'Search entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -57,14 +56,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "7. Line Up",
-    ["BRAILLE LINE:  'Go to Blogger.com Search  $l Search this blog & y Click here to publicly +1 this. 
toggle button 15 More Next Blog»Create Blog Sign In'",
+    ["KNOWN ISSUE: We're not presenting the '15'. Seems to be the result of a change in Nightly.",
+     "BRAILLE LINE:  'Go to Blogger.com Search  $l Search this blog & y Click here to publicly +1 this. 
toggle button More Next Blog»Create Blog Sign In'",
+#    "BRAILLE LINE:  'Go to Blogger.com Search  $l Search this blog & y Click here to publicly +1 this. 
toggle button 15 More Next Blog»Create Blog Sign In'",
      "     VISIBLE:  'Go to Blogger.com Search  $l Sea', cursor=1",
      "SPEECH OUTPUT: 'Go to Blogger.com link.'",
      "SPEECH OUTPUT: 'Search entry'",
      "SPEECH OUTPUT: 'Search this blog link.'",
      "SPEECH OUTPUT: 'clickable'",
      "SPEECH OUTPUT: 'Click here to publicly +1 this. toggle button not pressed'",
-     "SPEECH OUTPUT: '15'",
+#     "SPEECH OUTPUT: '15'",
      "SPEECH OUTPUT: 'More'",
      "SPEECH OUTPUT: 'link.'",
      "SPEECH OUTPUT: 'Next Blog»'",
diff --git a/test/keystrokes/firefox/line_nav_images_in_links.py 
b/test/keystrokes/firefox/line_nav_images_in_links.py
index 9ecf9ef..a5e0cfb 100644
--- a/test/keystrokes/firefox/line_nav_images_in_links.py
+++ b/test/keystrokes/firefox/line_nav_images_in_links.py
@@ -169,19 +169,19 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "19. Line Down",
-    ["BRAILLE LINE:  'Two \"useless\" images in a paragraph that is inside of a link along with text that is 
not in the paragraph: Before'",
+    ["BRAILLE LINE:  'Two \"useless\" images in a paragraph that is inside of a link along with text that is 
not in the paragraph: Before the'",
      "     VISIBLE:  'Two \"useless\" images in a paragr', cursor=1",
      "SPEECH OUTPUT: 'Two \"useless\" images in a paragraph that is inside of a link along with text that is 
not in the paragraph:'",
-     "SPEECH OUTPUT: 'Before'",
+     "SPEECH OUTPUT: 'Before the'",
      "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "20. Line Down",
-    ["BRAILLE LINE:  'the paragraph'",
-     "     VISIBLE:  'the paragraph', cursor=1",
-     "SPEECH OUTPUT: 'the paragraph'",
+    ["BRAILLE LINE:  'paragraph'",
+     "     VISIBLE:  'paragraph', cursor=1",
+     "SPEECH OUTPUT: 'paragraph'",
      "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -206,17 +206,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "23. Line Down",
-    ["BRAILLE LINE:  'Two \"useless\" images and some additional text in a paragraph that is inside of a 
link along with text that is not in'",
+    ["BRAILLE LINE:  'Two \"useless\" images and some additional text in a paragraph that is inside of a 
link along with text that is not in the'",
      "     VISIBLE:  'Two \"useless\" images and some ad', cursor=1",
-     "SPEECH OUTPUT: 'Two \"useless\" images and some additional text in a paragraph that is inside of a 
link along with text that is not in'"]))
+     "SPEECH OUTPUT: 'Two \"useless\" images and some additional text in a paragraph that is inside of a 
link along with text that is not in the'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "24. Line Down",
-    ["BRAILLE LINE:  'the paragraph: Before the paragraph'",
-     "     VISIBLE:  'the paragraph: Before the paragr', cursor=1",
-     "SPEECH OUTPUT: 'the paragraph:'",
+    ["BRAILLE LINE:  'paragraph: Before the paragraph'",
+     "     VISIBLE:  'paragraph: Before the paragraph', cursor=1",
+     "SPEECH OUTPUT: 'paragraph:'",
      "SPEECH OUTPUT: 'Before the paragraph'",
      "SPEECH OUTPUT: 'link.'"]))
 
@@ -283,9 +283,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "32. Line Up",
-    ["BRAILLE LINE:  'the paragraph: Before the paragraph'",
-     "     VISIBLE:  'the paragraph: Before the paragr', cursor=1",
-     "SPEECH OUTPUT: 'the paragraph:'",
+    ["BRAILLE LINE:  'paragraph: Before the paragraph'",
+     "     VISIBLE:  'paragraph: Before the paragraph', cursor=1",
+     "SPEECH OUTPUT: 'paragraph:'",
      "SPEECH OUTPUT: 'Before the paragraph'",
      "SPEECH OUTPUT: 'link.'"]))
 
@@ -293,9 +293,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "33. Line Up",
-    ["BRAILLE LINE:  'Two \"useless\" images and some additional text in a paragraph that is inside of a 
link along with text that is not in'",
+    ["BRAILLE LINE:  'Two \"useless\" images and some additional text in a paragraph that is inside of a 
link along with text that is not in the'",
      "     VISIBLE:  'Two \"useless\" images and some ad', cursor=1",
-     "SPEECH OUTPUT: 'Two \"useless\" images and some additional text in a paragraph that is inside of a 
link along with text that is not in'"]))
+     "SPEECH OUTPUT: 'Two \"useless\" images and some additional text in a paragraph that is inside of a 
link along with text that is not in the'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -319,19 +319,19 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "36. Line Up",
-    ["BRAILLE LINE:  'the paragraph'",
-     "     VISIBLE:  'the paragraph', cursor=1",
-     "SPEECH OUTPUT: 'the paragraph'",
+    ["BRAILLE LINE:  'paragraph'",
+     "     VISIBLE:  'paragraph', cursor=1",
+     "SPEECH OUTPUT: 'paragraph'",
      "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "37. Line Up",
-    ["BRAILLE LINE:  'Two \"useless\" images in a paragraph that is inside of a link along with text that is 
not in the paragraph: Before'",
+    ["BRAILLE LINE:  'Two \"useless\" images in a paragraph that is inside of a link along with text that is 
not in the paragraph: Before the'",
      "     VISIBLE:  'Two \"useless\" images in a paragr', cursor=1",
      "SPEECH OUTPUT: 'Two \"useless\" images in a paragraph that is inside of a link along with text that is 
not in the paragraph:'",
-     "SPEECH OUTPUT: 'Before'",
+     "SPEECH OUTPUT: 'Before the'",
      "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_lists.py b/test/keystrokes/firefox/line_nav_lists.py
index 0006416..bf3b199 100644
--- a/test/keystrokes/firefox/line_nav_lists.py
+++ b/test/keystrokes/firefox/line_nav_lists.py
@@ -42,17 +42,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
-    ["BRAILLE LINE:  '2. arrange long and arbitrary lines of text into ordered lists that are pleasing to 
the eye and suggest some'",
+    ["BRAILLE LINE:  '2. arrange long and arbitrary lines of text into ordered lists that are pleasing to 
the eye and suggest some sense of'",
      "     VISIBLE:  '2. arrange long and arbitrary li', cursor=1",
-     "SPEECH OUTPUT: '2. arrange long and arbitrary lines of text into ordered lists that are pleasing to 
the eye and suggest some.'"]))
+     "SPEECH OUTPUT: '2. arrange long and arbitrary lines of text into ordered lists that are pleasing to 
the eye and suggest some sense of.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Line Down",
-    ["BRAILLE LINE:  'sense of priority, even if it is artificial'",
-     "     VISIBLE:  'sense of priority, even if it is', cursor=1",
-     "SPEECH OUTPUT: 'sense of priority, even if it is artificial.'"]))
+    ["BRAILLE LINE:  'priority, even if it is artificial'",
+     "     VISIBLE:  'priority, even if it is artifici', cursor=1",
+     "SPEECH OUTPUT: 'priority, even if it is artificial.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -165,24 +165,24 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "19. Line Up",
-    ["BRAILLE LINE:  'sense of priority, even if it is artificial'",
-     "     VISIBLE:  'sense of priority, even if it is', cursor=1",
-     "SPEECH OUTPUT: 'sense of priority, even if it is artificial.'"]))
+    ["BRAILLE LINE:  'priority, even if it is artificial'",
+     "     VISIBLE:  'priority, even if it is artifici', cursor=1",
+     "SPEECH OUTPUT: 'priority, even if it is artificial.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "20. Line Up",
-    ["BRAILLE LINE:  '2. arrange long and arbitrary lines of text into ordered lists that are pleasing to 
the eye and suggest some'",
+    ["BRAILLE LINE:  '2. arrange long and arbitrary lines of text into ordered lists that are pleasing to 
the eye and suggest some sense of'",
      "     VISIBLE:  '2. arrange long and arbitrary li', cursor=1",
-     "SPEECH OUTPUT: '2. arrange long and arbitrary lines of text into ordered lists that are pleasing to 
the eye and suggest some.'"]))
+     "SPEECH OUTPUT: '2. arrange long and arbitrary lines of text into ordered lists that are pleasing to 
the eye and suggest some sense of.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "21. Line Up",
     ["BRAILLE LINE:  '1. remember what the heck we are doing each day'",
-     "     VISIBLE:  ' the heck we are doing each day', cursor=32",
+     "     VISIBLE:  '1. remember what the heck we are', cursor=1",
      "SPEECH OUTPUT: '1. remember what the heck we are doing each day.'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_slash_test.py b/test/keystrokes/firefox/line_nav_slash_test.py
index 24ef00c..8872ba7 100644
--- a/test/keystrokes/firefox/line_nav_slash_test.py
+++ b/test/keystrokes/firefox/line_nav_slash_test.py
@@ -85,7 +85,7 @@ sequence.append(utils.AssertPresentationAction(
     "8. Line Down",
     ["BRAILLE LINE:  'Poll What is your favorite poison?'",
      "     VISIBLE:  'Poll What is your favorite poiso', cursor=6",
-     "SPEECH OUTPUT: 'What is your favorite poison? panel'"]))
+     "SPEECH OUTPUT: 'What is your favorite poison? panel.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -120,7 +120,7 @@ sequence.append(utils.AssertPresentationAction(
     "12. Line Up",
     ["BRAILLE LINE:  'Poll What is your favorite poison?'",
      "     VISIBLE:  'Poll What is your favorite poiso', cursor=6",
-     "SPEECH OUTPUT: 'What is your favorite poison? panel'"]))
+     "SPEECH OUTPUT: 'What is your favorite poison? panel.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_sun_java.py b/test/keystrokes/firefox/line_nav_sun_java.py
index 8dac9d5..2f27d9b 100644
--- a/test/keystrokes/firefox/line_nav_sun_java.py
+++ b/test/keystrokes/firefox/line_nav_sun_java.py
@@ -246,17 +246,19 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "25. Line Down",
-    ["BRAILLE LINE:  'easily be installed in any location. As long as you are not root user, it cannot 
displace the system version of the Java platform suppled by Linux. To use this file, see'",
+    ["BRAILLE LINE:  'easily be installed in any location. As long as you are not root user, it cannot 
displace the system version of the Java platform suppled by Linux. To use this file, see Installation'",
      "     VISIBLE:  'easily be installed in any locat', cursor=1",
-     "SPEECH OUTPUT: 'easily be installed in any location. As long as you are not root user, it cannot 
displace the system version of the Java platform suppled by Linux. To use this file, see.'"]))
+     "SPEECH OUTPUT: 'easily be installed in any location. As long as you are not root user, it cannot 
displace the system version of the Java platform suppled by Linux. To use this file, see.'",
+     "SPEECH OUTPUT: 'Installation'",
+     "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "26. Line Down",
-    ["BRAILLE LINE:  'Installation of Self-Extracting Binary below.'",
-     "     VISIBLE:  'Installation of Self-Extracting ', cursor=1",
-     "SPEECH OUTPUT: 'Installation of Self-Extracting Binary'",
+    ["BRAILLE LINE:  'of Self-Extracting Binary below.'",
+     "     VISIBLE:  'of Self-Extracting Binary below.', cursor=1",
+     "SPEECH OUTPUT: 'of Self-Extracting Binary'",
      "SPEECH OUTPUT: 'link.'",
      "SPEECH OUTPUT: 'below.'"]))
 
diff --git a/test/keystrokes/firefox/line_nav_wiki_down.py b/test/keystrokes/firefox/line_nav_wiki_down.py
index 9c98ef8..6479ac6 100644
--- a/test/keystrokes/firefox/line_nav_wiki_down.py
+++ b/test/keystrokes/firefox/line_nav_wiki_down.py
@@ -16,12 +16,11 @@ sequence.append(KeyComboAction("<Control>r"))
 
 sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("Tab"))
-sequence.append(KeyComboAction("<Control>Home"))
 
 sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
+sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
-    "1. Line Down",
+    "1. Ctrl+Home",
     ["BRAILLE LINE:  'Home News Projects Art Support Development Community'",
      "     VISIBLE:  'Home News Projects Art Support D', cursor=1",
      "SPEECH OUTPUT: 'Home'",
@@ -43,8 +42,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Down",
-    ["BRAILLE LINE:  'live.gnome.org h1 Search $l Titles push button Text push button'",
-     "     VISIBLE:  'live.gnome.org h1 Search $l Titl', cursor=1",
+    ["BRAILLE LINE:  'live.gnome.org  h1 Search $l Titles push button Text push button'",
+     "     VISIBLE:  'live.gnome.org  h1 Search $l Tit', cursor=1",
      "SPEECH OUTPUT: 'live.gnome.org heading level 1'",
      "SPEECH OUTPUT: 'entry Search'",
      "SPEECH OUTPUT: 'Titles push button'",
@@ -327,22 +326,22 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "30. Line Down",
-    ["BRAILLE LINE:  'problems in other components, is maintained in Bugzilla \(please see our notes on how 
we'",
+    ["BRAILLE LINE:  'problems in other components, is maintained in Bugzilla \(please see our notes on 
how'",
      "     VISIBLE:  'problems in other components, is', cursor=1",
      "SPEECH OUTPUT: 'problems in other components, is maintained in'",
      "SPEECH OUTPUT: 'Bugzilla'",
      "SPEECH OUTPUT: 'link.'",
      "SPEECH OUTPUT: '\(please see our'",
-     "SPEECH OUTPUT: 'notes on how we'",
+     "SPEECH OUTPUT: 'notes on how'",
      "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "31. Line Down",
-    ["BRAILLE LINE:  'use Bugzilla\).'",
-     "     VISIBLE:  'use Bugzilla\).', cursor=1",
-     "SPEECH OUTPUT: 'use Bugzilla'",
+    ["BRAILLE LINE:  'we use Bugzilla\).'",
+     "     VISIBLE:  'we use Bugzilla\).', cursor=1",
+     "SPEECH OUTPUT: 'we use Bugzilla'",
      "SPEECH OUTPUT: 'link.'",
      "SPEECH OUTPUT: '\).'"]))
 
@@ -390,19 +389,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "36. Line Down",
-    ["BRAILLE LINE:  'contribution (THANKS!)!!! The audio guides can be found at 
http://www.digitaldarragh.com'",
+    ["BRAILLE LINE:  'contribution (THANKS!)!!! The audio guides can be found at'",
      "     VISIBLE:  'contribution (THANKS!)!!! The au', cursor=1",
-     "SPEECH OUTPUT: 'contribution (THANKS!)!!! The audio guides can be found at'",
-     "SPEECH OUTPUT: 'http://www.digitaldarragh.com'",
-     "SPEECH OUTPUT: 'link.'"]))
+     "SPEECH OUTPUT: 'contribution (THANKS!)!!! The audio guides can be found at'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "37. Line Down",
-    ["BRAILLE LINE:  '/linuxat.asp and include the following:'",
-     "     VISIBLE:  '/linuxat.asp and include the fol', cursor=1",
-     "SPEECH OUTPUT: '/linuxat.asp'",
+    ["BRAILLE LINE:  'http://www.digitaldarragh.com/linuxat.asp and include the following:'",
+     "     VISIBLE:  'http://www.digitaldarragh.com/li', cursor=1",
+     "SPEECH OUTPUT: 'http://www.digitaldarragh.com/linuxat.asp'",
      "SPEECH OUTPUT: 'link.'",
      "SPEECH OUTPUT: 'and include the following:'"]))
 
@@ -456,18 +453,20 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "43. Line Down",
-    ["BRAILLE LINE:  'provided by default on a number of operating system distributions, including Open 
Solaris'",
+    ["BRAILLE LINE:  'provided by default on a number of operating system distributions, including Open'",
      "     VISIBLE:  'provided by default on a number ', cursor=1",
      "SPEECH OUTPUT: 'provided by default on a number of operating system distributions, including'",
-     "SPEECH OUTPUT: 'Open Solaris'",
+     "SPEECH OUTPUT: 'Open'",
      "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "44. Line Down",
-    ["BRAILLE LINE:  'and Ubuntu.'",
-     "     VISIBLE:  'and Ubuntu.', cursor=1",
+    ["BRAILLE LINE:  'Solaris and Ubuntu.'",
+     "     VISIBLE:  'Solaris and Ubuntu.', cursor=1",
+     "SPEECH OUTPUT: 'Solaris'",
+     "SPEECH OUTPUT: 'link.'",
      "SPEECH OUTPUT: 'and'",
      "SPEECH OUTPUT: 'Ubuntu'",
      "SPEECH OUTPUT: 'link.'",
@@ -504,102 +503,110 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "48. Line Down",
-    ["BRAILLE LINE:  'The command to run orca is orca. You can enter this command by pressing Alt+F2 when'",
+    ["BRAILLE LINE:  'The command to run orca is orca. You can enter this command by pressing Alt+F2'",
      "     VISIBLE:  'The command to run orca is orca.', cursor=1",
-     "SPEECH OUTPUT: 'The command to run orca is orca. You can enter this command by pressing Alt+F2 
when'"]))
+     "SPEECH OUTPUT: 'The command to run orca is orca. You can enter this command by pressing Alt+F2'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "49. Line Down",
-    ["BRAILLE LINE:  'logged in, waiting for a second or so, then typing orca and pressing return. Orca is'",
-     "     VISIBLE:  'logged in, waiting for a second ', cursor=1",
-     "SPEECH OUTPUT: 'logged in, waiting for a second or so, then typing orca and pressing return. Orca 
is'"]))
+    ["BRAILLE LINE:  'when logged in, waiting for a second or so, then typing orca and pressing return. Orca 
is'",
+     "     VISIBLE:  'when logged in, waiting for a se', cursor=1",
+     "SPEECH OUTPUT: 'when logged in, waiting for a second or so, then typing orca and pressing return. Orca 
is'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "50. Line Down",
-    ["BRAILLE LINE:  'designed to present information as you navigate the desktop using the built-in 
navigation'",
+    ["BRAILLE LINE:  'designed to present information as you navigate the desktop using the built-in'",
      "     VISIBLE:  'designed to present information ', cursor=1",
      "SPEECH OUTPUT: 'designed to present information as you navigate the desktop using the'",
-     "SPEECH OUTPUT: 'built-in navigation'",
+     "SPEECH OUTPUT: 'built-in'",
      "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "51. Line Down",
-    ["BRAILLE LINE:  'mechanisms of GNOME. These navigation mechanisms are consistent across most'",
-     "     VISIBLE:  'mechanisms of GNOME. These navig', cursor=1",
-     "SPEECH OUTPUT: 'mechanisms of GNOME'",
+    ["BRAILLE LINE:  'navigation mechanisms of GNOME. These navigation mechanisms are consistent across'",
+     "     VISIBLE:  'navigation mechanisms of GNOME. ', cursor=1",
+     "SPEECH OUTPUT: 'navigation mechanisms of GNOME'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: '. These navigation mechanisms are consistent across most'"]))
+     "SPEECH OUTPUT: '. These navigation mechanisms are consistent across'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "52. Line Down",
-    ["BRAILLE LINE:  'desktop applications.'",
-     "     VISIBLE:  'desktop applications.', cursor=1",
-     "SPEECH OUTPUT: 'desktop applications.'"]))
+    ["BRAILLE LINE:  'most desktop applications.'",
+     "     VISIBLE:  'most desktop applications.', cursor=1",
+     "SPEECH OUTPUT: 'most desktop applications.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "53. Line Down",
-    ["BRAILLE LINE:  'You may sometimes wish to control Orca itself, such as bringing up the Orca 
Configuration'",
+    ["BRAILLE LINE:  'You may sometimes wish to control Orca itself, such as bringing up the Orca'",
      "     VISIBLE:  'You may sometimes wish to contro', cursor=1",
      "SPEECH OUTPUT: 'You may sometimes wish to control Orca itself, such as bringing up the'",
-     "SPEECH OUTPUT: 'Orca Configuration'",
+     "SPEECH OUTPUT: 'Orca'",
      "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "54. Line Down",
-    ["BRAILLE LINE:  'GUI (accessed by pressing Insert+Space when Orca is running) and for using flat 
review'",
-     "     VISIBLE:  'GUI (accessed by pressing Insert', cursor=1",
-     "SPEECH OUTPUT: 'GUI'",
+    ["BRAILLE LINE:  'Configuration GUI (accessed by pressing Insert+Space when Orca is running) and for'",
+     "     VISIBLE:  'Configuration GUI (accessed by p', cursor=1",
+     "SPEECH OUTPUT: 'Configuration GUI'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: '(accessed by pressing Insert+Space when Orca is running) and for using flat review'"]))
+     "SPEECH OUTPUT: '(accessed by pressing Insert+Space when Orca is running) and for'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "55. Line Down",
-    ["BRAILLE LINE:  'mode to examine a window. Refer to Orca Keyboard Commands (Laptop Layout) for more'",
-     "     VISIBLE:  'mode to examine a window. Refer ', cursor=1",
-     "SPEECH OUTPUT: 'mode to examine a window. Refer to'",
+    ["BRAILLE LINE:  'using flat review mode to examine a window. Refer to Orca Keyboard Commands'",
+     "     VISIBLE:  'using flat review mode to examin', cursor=1",
+     "SPEECH OUTPUT: 'using flat review mode to examine a window. Refer to'",
      "SPEECH OUTPUT: 'Orca Keyboard Commands'",
-     "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: '(Laptop Layout)'",
-     "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: 'for more'"]))
+     "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "56. Line Down",
-    ["BRAILLE LINE:  'information on Orca-specific keyboard commands. The Orca Configuration GUI also'",
-     "     VISIBLE:  'information on Orca-specific key', cursor=1",
-     "SPEECH OUTPUT: 'information on Orca-specific keyboard commands. The'",
-     "SPEECH OUTPUT: 'Orca Configuration GUI'",
+    ["BRAILLE LINE:  '(Laptop Layout) for more information on Orca-specific keyboard commands. The Orca'",
+     "     VISIBLE:  '(Laptop Layout) for more informa', cursor=1",
+     "SPEECH OUTPUT: '(Laptop Layout)'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: 'also'"]))
+     "SPEECH OUTPUT: 'for more information on Orca-specific keyboard commands. The'",
+     "SPEECH OUTPUT: 'Orca'",
+     "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "57. Line Down",
-    ["BRAILLE LINE:  'includes a \"Key Bindings\" tab that allows you to get a complete list of Orca key 
bindings.'",
-     "     VISIBLE:  'includes a \"Key Bindings\" tab th', cursor=1",
-     "SPEECH OUTPUT: 'includes a \"Key Bindings\" tab that allows you to get a complete list of Orca key 
bindings.'"]))
+    ["BRAILLE LINE:  'Configuration GUI also includes a \"Key Bindings\" tab that allows you to get a 
complete list'",
+     "     VISIBLE:  'Configuration GUI also includes ', cursor=1",
+     "SPEECH OUTPUT: 'Configuration GUI'",
+     "SPEECH OUTPUT: 'link.'",
+     "SPEECH OUTPUT: 'also includes a \"Key Bindings\" tab that allows you to get a complete list'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "58. Line Down",
+    ["BRAILLE LINE:  'of Orca key bindings.'",
+     "     VISIBLE:  'of Orca key bindings.', cursor=1",
+     "SPEECH OUTPUT: 'of Orca key bindings.'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "59. Line Down",
     ["BRAILLE LINE:  'Please also refer to the Configuration/Use page for detailed information.'",
      "     VISIBLE:  'Please also refer to the Configu', cursor=1",
      "SPEECH OUTPUT: 'Please also refer to the'",
@@ -610,7 +617,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "59. Line Down",
+    "60. Line Down",
     ["BRAILLE LINE:  'Accessible Applications h1'",
      "     VISIBLE:  'Accessible Applications h1', cursor=1",
      "SPEECH OUTPUT: 'Accessible Applications heading level 1'"]))
@@ -618,7 +625,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "60. Line Down",
+    "61. Line Down",
     ["BRAILLE LINE:  'Orca is designed to work with applications and toolkits that support the assistive'",
      "     VISIBLE:  'Orca is designed to work with ap', cursor=1",
      "SPEECH OUTPUT: 'Orca is designed to work with applications and toolkits that support the assistive'"]))
@@ -626,7 +633,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "61. Line Down",
+    "62. Line Down",
     ["BRAILLE LINE:  'technology service provider interface (AT-SPI). This includes the GNOME desktop and 
its'",
      "     VISIBLE:  'technology service provider inte', cursor=1",
      "SPEECH OUTPUT: 'technology service provider interface (AT-SPI). This includes the GNOME desktop and 
its'"]))
@@ -634,7 +641,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "62. Line Down",
+    "63. Line Down",
     ["BRAILLE LINE:  'applications, OpenOffice, Firefox, and the Java platform. Some applications work 
better'",
      "     VISIBLE:  'applications, OpenOffice, Firefo', cursor=1",
      "SPEECH OUTPUT: 'applications,'",
@@ -645,7 +652,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "63. Line Down",
+    "64. Line Down",
     ["BRAILLE LINE:  'than others, however, and the Orca community continually works to provide compelling'",
      "     VISIBLE:  'than others, however, and the Or', cursor=1",
      "SPEECH OUTPUT: 'than others, however, and the Orca community continually works to provide 
compelling'"]))
@@ -653,7 +660,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "64. Line Down",
+    "65. Line Down",
     ["BRAILLE LINE:  'access to more and more applications.'",
      "     VISIBLE:  'access to more and more applicat', cursor=1",
      "SPEECH OUTPUT: 'access to more and more applications.'"]))
@@ -661,7 +668,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "65. Line Down",
+    "66. Line Down",
     ["BRAILLE LINE:  'On the Accessible Applications page, you will find a growing list of information 
regarding'",
      "     VISIBLE:  'On the Accessible Applications p', cursor=1",
      "SPEECH OUTPUT: 'On the'",
@@ -672,7 +679,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "66. Line Down",
+    "67. Line Down",
     ["BRAILLE LINE:  'various applications that can be accessed with Orca as well as tips and tricks for 
using'",
      "     VISIBLE:  'various applications that can be', cursor=1",
      "SPEECH OUTPUT: 'various applications that can be accessed with Orca as well as tips and tricks for 
using'"]))
@@ -680,50 +687,50 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "67. Line Down",
-    ["BRAILLE LINE:  'them. The list is not to be a conclusive list of all applications. Rather, the goal is 
to provide a'",
+    "68. Line Down",
+    ["BRAILLE LINE:  'them. The list is not to be a conclusive list of all applications. Rather, the goal is 
to'",
      "     VISIBLE:  'them. The list is not to be a co', cursor=1",
-     "SPEECH OUTPUT: 'them. The list is not to be a conclusive list of all applications. Rather, the goal is 
to provide a'"]))
+     "SPEECH OUTPUT: 'them. The list is not to be a conclusive list of all applications. Rather, the goal is 
to'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "68. Line Down",
-    ["BRAILLE LINE:  'repository within which users can share experiences regarding applications they have'",
-     "     VISIBLE:  'repository within which users ca', cursor=1",
-     "SPEECH OUTPUT: 'repository within which users can share experiences regarding applications they 
have'"]))
+    "69. Line Down",
+    ["BRAILLE LINE:  'provide a repository within which users can share experiences regarding applications'",
+     "     VISIBLE:  'provide a repository within whic', cursor=1",
+     "SPEECH OUTPUT: 'provide a repository within which users can share experiences regarding 
applications'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "69. Line Down",
-    ["BRAILLE LINE:  'tested.'",
-     "     VISIBLE:  'tested.', cursor=1",
-     "SPEECH OUTPUT: 'tested.'"]))
+    "70. Line Down",
+    ["BRAILLE LINE:  'they have tested.'",
+     "     VISIBLE:  'they have tested.', cursor=1",
+     "SPEECH OUTPUT: 'they have tested.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "70. Line Down",
-    ["BRAILLE LINE:  'See also the Application Specific Settings page for how to configure settings specific 
to an'",
+    "71. Line Down",
+    ["BRAILLE LINE:  'See also the Application Specific Settings page for how to configure settings specific 
to'",
      "     VISIBLE:  'See also the Application Specifi', cursor=1",
      "SPEECH OUTPUT: 'See also the'",
      "SPEECH OUTPUT: 'Application Specific Settings'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: 'page for how to configure settings specific to an'"]))
+     "SPEECH OUTPUT: 'page for how to configure settings specific to'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "71. Line Down",
-    ["BRAILLE LINE:  'application.'",
-     "     VISIBLE:  'application.', cursor=1",
-     "SPEECH OUTPUT: 'application.'"]))
+    "72. Line Down",
+    ["BRAILLE LINE:  'an application.'",
+     "     VISIBLE:  'an application.', cursor=1",
+     "SPEECH OUTPUT: 'an application.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "72. Line Down",
+    "73. Line Down",
     ["BRAILLE LINE:  'Please also refer to the Accessible Applications page for detailed information.'",
      "     VISIBLE:  'Please also refer to the Accessi', cursor=1",
      "SPEECH OUTPUT: 'Please also refer to the'",
@@ -734,7 +741,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "73. Line Down",
+    "74. Line Down",
     ["BRAILLE LINE:  'How Can I Help? h1'",
      "     VISIBLE:  'How Can I Help? h1', cursor=1",
      "SPEECH OUTPUT: 'How Can I Help? heading level 1'"]))
@@ -742,7 +749,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "74. Line Down",
+    "75. Line Down",
     ["BRAILLE LINE:  'There's a bunch you can do! Please refer to the How Can I Help page for detailed'",
      "     VISIBLE:  'There's a bunch you can do! Plea', cursor=1",
      "SPEECH OUTPUT: 'There's a bunch you can do! Please refer to the'",
@@ -753,7 +760,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "75. Line Down",
+    "76. Line Down",
     ["BRAILLE LINE:  'information.'",
      "     VISIBLE:  'information.', cursor=1",
      "SPEECH OUTPUT: 'information.'"]))
@@ -761,7 +768,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "76. Line Down",
+    "77. Line Down",
     ["BRAILLE LINE:  'More Information h1'",
      "     VISIBLE:  'More Information h1', cursor=1",
      "SPEECH OUTPUT: 'More Information heading level 1'"]))
@@ -769,7 +776,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "77. Line Down",
+    "78. Line Down",
     ["BRAILLE LINE:  '• Frequently Asked Questions: FAQ'",
      "     VISIBLE:  '• Frequently Asked Questions: FA', cursor=1",
      "SPEECH OUTPUT: '•.'",
@@ -780,7 +787,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "78. Line Down",
+    "79. Line Down",
     ["BRAILLE LINE:  '• Mailing list: orca-list gnome org (Archives)'",
      "     VISIBLE:  '• Mailing list: orca-list gnome ', cursor=1",
      "SPEECH OUTPUT: '•.'",
@@ -795,7 +802,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "79. Line Down",
+    "80. Line Down",
     ["BRAILLE LINE:  '• Bug database: GNOME Bug Tracking System (Bugzilla) (current bug list)'",
      "     VISIBLE:  '• Bug database: GNOME Bug Tracki', cursor=1",
      "SPEECH OUTPUT: '•.'",
@@ -810,7 +817,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "80. Line Down",
+    "81. Line Down",
     ["BRAILLE LINE:  '• Design documents: Orca Documentation Series'",
      "     VISIBLE:  '• Design documents: Orca Documen', cursor=1",
      "SPEECH OUTPUT: '•.'",
@@ -821,7 +828,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "81. Line Down",
+    "82. Line Down",
     ["BRAILLE LINE:  '• Dive Into Python, Mark Pilgrim'",
      "     VISIBLE:  '• Dive Into Python, Mark Pilgrim', cursor=1",
      "SPEECH OUTPUT: '•.'",
@@ -831,7 +838,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "82. Line Down",
+    "83. Line Down",
     ["BRAILLE LINE:  '• Python in a Nutshell, Alex Martelli'",
      "     VISIBLE:  '• Python in a Nutshell, Alex Mar', cursor=1",
      "SPEECH OUTPUT: '•.'",
@@ -841,7 +848,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "83. Line Down",
+    "84. Line Down",
     ["BRAILLE LINE:  '• Python Pocket Reference, Mark Lutz'",
      "     VISIBLE:  '• Python Pocket Reference, Mark ', cursor=1",
      "SPEECH OUTPUT: '•.'",
@@ -851,7 +858,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "84. Line Down",
+    "85. Line Down",
     ["BRAILLE LINE:  'separator'",
      "     VISIBLE:  'separator', cursor=1",
      "SPEECH OUTPUT: 'separator'"]))
@@ -859,31 +866,31 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "85. Line Down",
-    ["BRAILLE LINE:  'The information on this page and the other Orca-related pages on this site are 
distributed'",
+    "86. Line Down",
+    ["BRAILLE LINE:  'The information on this page and the other Orca-related pages on this site are'",
      "     VISIBLE:  'The information on this page and', cursor=1",
-     "SPEECH OUTPUT: 'The information on this page and the other Orca-related pages on this site are 
distributed'"]))
+     "SPEECH OUTPUT: 'The information on this page and the other Orca-related pages on this site are'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "86. Line Down",
-    ["BRAILLE LINE:  'in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 
implied'",
-     "     VISIBLE:  'in the hope that it will be usef', cursor=1",
-     "SPEECH OUTPUT: 'in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 
implied'"]))
+    "87. Line Down",
+    ["BRAILLE LINE:  'distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without 
even'",
+     "     VISIBLE:  'distributed in the hope that it ', cursor=1",
+     "SPEECH OUTPUT: 'distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without 
even'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "87. Line Down",
-    ["BRAILLE LINE:  'warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.'",
-     "     VISIBLE:  'warranty of MERCHANTABILITY or F', cursor=1",
-     "SPEECH OUTPUT: 'warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.'"]))
+    "88. Line Down",
+    ["BRAILLE LINE:  'the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.'",
+     "     VISIBLE:  'the implied warranty of MERCHANT', cursor=1",
+     "SPEECH OUTPUT: 'the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "88. Line Down",
+    "89. Line Down",
     ["BRAILLE LINE:  'separator'",
      "     VISIBLE:  'separator', cursor=1",
      "SPEECH OUTPUT: 'separator'"]))
@@ -891,7 +898,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "89. Line Down",
+    "90. Line Down",
     ["BRAILLE LINE:  'CategoryAccessibility'",
      "     VISIBLE:  'CategoryAccessibility', cursor=1",
      "SPEECH OUTPUT: 'CategoryAccessibility'",
@@ -900,7 +907,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "90. Line Down",
+    "91. Line Down",
     ["BRAILLE LINE:  'Orca (last edited 2007-12-07 22:09:22 by WillieWalker)'",
      "     VISIBLE:  'Orca (last edited 2007-12-07 22:', cursor=1",
      "SPEECH OUTPUT: 'Orca (last edited 2007-12-07 22:09:22 by'",
@@ -911,7 +918,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "91. Line Down",
+    "92. Line Down",
     ["BRAILLE LINE:  'User h3'",
      "     VISIBLE:  'User h3', cursor=1",
      "SPEECH OUTPUT: 'User heading level 3'"]))
@@ -919,7 +926,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "92. Line Down",
+    "93. Line Down",
     ["BRAILLE LINE:  'Login'",
      "     VISIBLE:  'Login', cursor=1",
      "SPEECH OUTPUT: 'Login'",
@@ -928,7 +935,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "93. Line Down",
+    "94. Line Down",
     ["BRAILLE LINE:  'Page h3'",
      "     VISIBLE:  'Page h3', cursor=1",
      "SPEECH OUTPUT: 'Page heading level 3'"]))
@@ -936,7 +943,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "94. Line Down",
+    "95. Line Down",
     ["BRAILLE LINE:  'Immutable Page'",
      "     VISIBLE:  'Immutable Page', cursor=1",
      "SPEECH OUTPUT: 'Immutable Page.'"]))
@@ -944,7 +951,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "95. Line Down",
+    "96. Line Down",
     ["BRAILLE LINE:  'Info'",
      "     VISIBLE:  'Info', cursor=1",
      "SPEECH OUTPUT: 'Info'",
@@ -953,7 +960,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "96. Line Down",
+    "97. Line Down",
     ["BRAILLE LINE:  'Attachments'",
      "     VISIBLE:  'Attachments', cursor=1",
      "SPEECH OUTPUT: 'Attachments'",
@@ -962,7 +969,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "97. Line Down",
+    "98. Line Down",
     ["BRAILLE LINE:  'More Actions: combo box'",
      "     VISIBLE:  'More Actions: combo box', cursor=1",
      "SPEECH OUTPUT: 'More Actions: combo box.'"]))
@@ -970,7 +977,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "98. Line Down",
+    "99. Line Down",
     ["BRAILLE LINE:  'GNOME World  h3'",
      "     VISIBLE:  'GNOME World  h3', cursor=1",
      "SPEECH OUTPUT: 'GNOME World heading level 3'"]))
@@ -978,7 +985,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "99. Line Down",
+    "100. Line Down",
     ["BRAILLE LINE:  'Wide h3'",
      "     VISIBLE:  'Wide h3', cursor=1",
      "SPEECH OUTPUT: 'Wide heading level 3'"]))
@@ -986,7 +993,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "100. Line Down",
+    "101. Line Down",
     ["BRAILLE LINE:  'GnomeWorldWide image'",
      "     VISIBLE:  'GnomeWorldWide image', cursor=1",
      "SPEECH OUTPUT: 'GnomeWorldWide image link'"]))
@@ -994,7 +1001,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "101. Line Down",
+    "102. Line Down",
     ["BRAILLE LINE:  'Copyright \xa9 2005, 2006, 2007 The GNOME Project.'",
      "     VISIBLE:  'Copyright \xa9 2005, 2006, 2007 The', cursor=1",
      "SPEECH OUTPUT: 'Copyright \xa9 2005, 2006, 2007'",
@@ -1005,7 +1012,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "102. Line Down",
+    "103. Line Down",
     ["BRAILLE LINE:  'Hosted by Red Hat.'",
      "     VISIBLE:  'Hosted by Red Hat.', cursor=1",
      "SPEECH OUTPUT: 'Hosted by'",
diff --git a/test/keystrokes/firefox/line_nav_wiki_up.py b/test/keystrokes/firefox/line_nav_wiki_up.py
index 36fd571..2799b2a 100644
--- a/test/keystrokes/firefox/line_nav_wiki_up.py
+++ b/test/keystrokes/firefox/line_nav_wiki_up.py
@@ -23,26 +23,29 @@ sequence.append(utils.AssertPresentationAction(
     "1. Bottom of file",
     ["BRAILLE LINE:  'Hosted by Red Hat.'",
      "     VISIBLE:  'Hosted by Red Hat.', cursor=0",
+     "BRAILLE LINE:  'The GNOME Project'",
+     "     VISIBLE:  'The GNOME Project', cursor=1",
      "SPEECH OUTPUT: 'Hosted by'",
      "SPEECH OUTPUT: 'Red Hat'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: '.'"]))
+     "SPEECH OUTPUT: '.'",
+     "SPEECH OUTPUT: 'The GNOME Project link.'"]))
 
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "2. Line Up",
-    ["BRAILLE LINE:  'Copyright \xa9 2005, 2006, 2007 The GNOME Project.'",
-     "     VISIBLE:  'Copyright \xa9 2005, 2006, 2007 The', cursor=1",
-     "SPEECH OUTPUT: 'Copyright \xa9 2005, 2006, 2007'",
-     "SPEECH OUTPUT: 'The GNOME Project'",
-     "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: '.'"]))
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("Up"))
+#sequence.append(utils.AssertPresentationAction(
+#    "2. Line Up",
+#    ["BRAILLE LINE:  'Copyright \xa9 2005, 2006, 2007 The GNOME Project.'",
+#     "     VISIBLE:  'Copyright \xa9 2005, 2006, 2007 The', cursor=1",
+#     "SPEECH OUTPUT: 'Copyright \xa9 2005, 2006, 2007'",
+#     "SPEECH OUTPUT: 'The GNOME Project'",
+#     "SPEECH OUTPUT: 'link.'",
+#     "SPEECH OUTPUT: '.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "3. Line Up",
+    "2. Line Up",
     ["BRAILLE LINE:  'GnomeWorldWide image'",
      "     VISIBLE:  'GnomeWorldWide image', cursor=1",
      "SPEECH OUTPUT: 'GnomeWorldWide image link'"]))
@@ -50,7 +53,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "4. Line Up",
+    "3. Line Up",
     ["BRAILLE LINE:  'Wide h3'",
      "     VISIBLE:  'Wide h3', cursor=1",
      "SPEECH OUTPUT: 'Wide heading level 3'"]))
@@ -58,7 +61,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "5. Line Up",
+    "4. Line Up",
     ["BRAILLE LINE:  'GNOME World  h3'",
      "     VISIBLE:  'GNOME World  h3', cursor=1",
      "SPEECH OUTPUT: 'GNOME World heading level 3'"]))
@@ -66,7 +69,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "6. Line Up",
+    "5. Line Up",
     ["BRAILLE LINE:  'More Actions: combo box'",
      "     VISIBLE:  'More Actions: combo box', cursor=1",
      "SPEECH OUTPUT: 'More Actions: combo box.'"]))
@@ -74,7 +77,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "7. Line Up",
+    "6. Line Up",
     ["BRAILLE LINE:  'Attachments'",
      "     VISIBLE:  'Attachments', cursor=1",
      "SPEECH OUTPUT: 'Attachments'",
@@ -83,7 +86,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "8. Line Up",
+    "7. Line Up",
     ["BRAILLE LINE:  'Info'",
      "     VISIBLE:  'Info', cursor=1",
      "SPEECH OUTPUT: 'Info'",
@@ -92,7 +95,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "9. Line Up",
+    "8. Line Up",
     ["BRAILLE LINE:  'Immutable Page'",
      "     VISIBLE:  'Immutable Page', cursor=1",
      "SPEECH OUTPUT: 'Immutable Page.'"]))
@@ -100,7 +103,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "10. Line Up",
+    "9. Line Up",
     ["BRAILLE LINE:  'Page h3'",
      "     VISIBLE:  'Page h3', cursor=1",
      "SPEECH OUTPUT: 'Page heading level 3'"]))
@@ -108,7 +111,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "11. Line Up",
+    "10. Line Up",
     ["BRAILLE LINE:  'Login'",
      "     VISIBLE:  'Login', cursor=1",
      "SPEECH OUTPUT: 'Login'",
@@ -117,7 +120,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "12. Line Up",
+    "11. Line Up",
     ["BRAILLE LINE:  'User h3'",
      "     VISIBLE:  'User h3', cursor=1",
      "SPEECH OUTPUT: 'User heading level 3'"]))
@@ -125,7 +128,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "13. Line Up",
+    "12. Line Up",
     ["BRAILLE LINE:  'Orca (last edited 2007-12-07 22:09:22 by WillieWalker)'",
      "     VISIBLE:  'Orca (last edited 2007-12-07 22:', cursor=1",
      "SPEECH OUTPUT: 'Orca (last edited 2007-12-07 22:09:22 by'",
@@ -136,7 +139,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "14. Line Up",
+    "13. Line Up",
     ["BRAILLE LINE:  'CategoryAccessibility'",
      "     VISIBLE:  'CategoryAccessibility', cursor=1",
      "SPEECH OUTPUT: 'CategoryAccessibility'",
@@ -145,7 +148,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "15. Line Up",
+    "14. Line Up",
     ["BRAILLE LINE:  'separator'",
      "     VISIBLE:  'separator', cursor=1",
      "SPEECH OUTPUT: 'separator'"]))
@@ -153,31 +156,31 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "16. Line Up",
-    ["BRAILLE LINE:  'warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.'",
-     "     VISIBLE:  'warranty of MERCHANTABILITY or F', cursor=1",
-     "SPEECH OUTPUT: 'warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.'"]))
+    "15. Line Up",
+    ["BRAILLE LINE:  'the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.'",
+     "     VISIBLE:  'the implied warranty of MERCHANT', cursor=1",
+     "SPEECH OUTPUT: 'the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "17. Line Up",
-    ["BRAILLE LINE:  'in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 
implied'",
-     "     VISIBLE:  'in the hope that it will be usef', cursor=1",
-     "SPEECH OUTPUT: 'in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 
implied'"]))
+    "16. Line Up",
+    ["BRAILLE LINE:  'distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without 
even'",
+     "     VISIBLE:  'distributed in the hope that it ', cursor=1",
+     "SPEECH OUTPUT: 'distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without 
even'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "18. Line Up",
-    ["BRAILLE LINE:  'The information on this page and the other Orca-related pages on this site are 
distributed'",
+    "17. Line Up",
+    ["BRAILLE LINE:  'The information on this page and the other Orca-related pages on this site are'",
      "     VISIBLE:  'The information on this page and', cursor=1",
-     "SPEECH OUTPUT: 'The information on this page and the other Orca-related pages on this site are 
distributed'"]))
+     "SPEECH OUTPUT: 'The information on this page and the other Orca-related pages on this site are'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "19. Line Up",
+    "18. Line Up",
     ["BRAILLE LINE:  'separator'",
      "     VISIBLE:  'separator', cursor=1",
      "SPEECH OUTPUT: 'separator'"]))
@@ -185,7 +188,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "20. Line Up",
+    "19. Line Up",
     ["BRAILLE LINE:  '• Python Pocket Reference, Mark Lutz'",
      "     VISIBLE:  '• Python Pocket Reference, Mark ', cursor=1",
      "SPEECH OUTPUT: '•.'",
@@ -195,7 +198,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "21. Line Up",
+    "20. Line Up",
     ["BRAILLE LINE:  '• Python in a Nutshell, Alex Martelli'",
      "     VISIBLE:  '• Python in a Nutshell, Alex Mar', cursor=1",
      "SPEECH OUTPUT: '•.'",
@@ -205,7 +208,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "22. Line Up",
+    "21. Line Up",
     ["BRAILLE LINE:  '• Dive Into Python, Mark Pilgrim'",
      "     VISIBLE:  '• Dive Into Python, Mark Pilgrim', cursor=1",
      "SPEECH OUTPUT: '•.'",
@@ -215,7 +218,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "23. Line Up",
+    "22. Line Up",
     ["BRAILLE LINE:  '• Design documents: Orca Documentation Series'",
      "     VISIBLE:  '• Design documents: Orca Documen', cursor=1",
      "SPEECH OUTPUT: '•.'",
@@ -226,7 +229,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "24. Line Up",
+    "23. Line Up",
     ["BRAILLE LINE:  '• Bug database: GNOME Bug Tracking System (Bugzilla) (current bug list)'",
      "     VISIBLE:  '• Bug database: GNOME Bug Tracki', cursor=1",
      "SPEECH OUTPUT: '•.'",
@@ -241,7 +244,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "25. Line Up",
+    "24. Line Up",
     ["BRAILLE LINE:  '• Mailing list: orca-list gnome org (Archives)'",
      "     VISIBLE:  '• Mailing list: orca-list gnome ', cursor=1",
      "SPEECH OUTPUT: '•.'",
@@ -256,7 +259,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "26. Line Up",
+    "25. Line Up",
     ["BRAILLE LINE:  '• Frequently Asked Questions: FAQ'",
      "     VISIBLE:  '• Frequently Asked Questions: FA', cursor=1",
      "SPEECH OUTPUT: '•.'",
@@ -267,7 +270,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "27. Line Up",
+    "26. Line Up",
     ["BRAILLE LINE:  'More Information h1'",
      "     VISIBLE:  'More Information h1', cursor=1",
      "SPEECH OUTPUT: 'More Information heading level 1'"]))
@@ -275,7 +278,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "28. Line Up",
+    "27. Line Up",
     ["BRAILLE LINE:  'information.'",
      "     VISIBLE:  'information.', cursor=1",
      "SPEECH OUTPUT: 'information.'"]))
@@ -283,7 +286,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "29. Line Up",
+    "28. Line Up",
     ["BRAILLE LINE:  'There's a bunch you can do! Please refer to the How Can I Help page for detailed'",
      "     VISIBLE:  'There's a bunch you can do! Plea', cursor=1",
      "SPEECH OUTPUT: 'There's a bunch you can do! Please refer to the'",
@@ -294,7 +297,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "30. Line Up",
+    "29. Line Up",
     ["BRAILLE LINE:  'How Can I Help? h1'",
      "     VISIBLE:  'How Can I Help? h1', cursor=1",
      "SPEECH OUTPUT: 'How Can I Help? heading level 1'"]))
@@ -302,7 +305,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "31. Line Up",
+    "30. Line Up",
     ["BRAILLE LINE:  'Please also refer to the Accessible Applications page for detailed information.'",
      "     VISIBLE:  'Please also refer to the Accessi', cursor=1",
      "SPEECH OUTPUT: 'Please also refer to the'",
@@ -313,50 +316,50 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "32. Line Up",
-    ["BRAILLE LINE:  'application.'",
-     "     VISIBLE:  'application.', cursor=1",
-     "SPEECH OUTPUT: 'application.'"]))
+    "31. Line Up",
+    ["BRAILLE LINE:  'an application.'",
+     "     VISIBLE:  'an application.', cursor=1",
+     "SPEECH OUTPUT: 'an application.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "33. Line Up",
-    ["BRAILLE LINE:  'See also the Application Specific Settings page for how to configure settings specific 
to an'",
+    "32. Line Up",
+    ["BRAILLE LINE:  'See also the Application Specific Settings page for how to configure settings specific 
to'",
      "     VISIBLE:  'See also the Application Specifi', cursor=1",
      "SPEECH OUTPUT: 'See also the'",
      "SPEECH OUTPUT: 'Application Specific Settings'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: 'page for how to configure settings specific to an'"]))
+     "SPEECH OUTPUT: 'page for how to configure settings specific to'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "34. Line Up",
-    ["BRAILLE LINE:  'tested.'",
-     "     VISIBLE:  'tested.', cursor=1",
-     "SPEECH OUTPUT: 'tested.'"]))
+    "33. Line Up",
+    ["BRAILLE LINE:  'they have tested.'",
+     "     VISIBLE:  'they have tested.', cursor=1",
+     "SPEECH OUTPUT: 'they have tested.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "35. Line Up",
-    ["BRAILLE LINE:  'repository within which users can share experiences regarding applications they have'",
-     "     VISIBLE:  'repository within which users ca', cursor=1",
-     "SPEECH OUTPUT: 'repository within which users can share experiences regarding applications they 
have'"]))
+    "34. Line Up",
+    ["BRAILLE LINE:  'provide a repository within which users can share experiences regarding applications'",
+     "     VISIBLE:  'provide a repository within whic', cursor=1",
+     "SPEECH OUTPUT: 'provide a repository within which users can share experiences regarding 
applications'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "36. Line Up",
-    ["BRAILLE LINE:  'them. The list is not to be a conclusive list of all applications. Rather, the goal is 
to provide a'",
+    "35. Line Up",
+    ["BRAILLE LINE:  'them. The list is not to be a conclusive list of all applications. Rather, the goal is 
to'",
      "     VISIBLE:  'them. The list is not to be a co', cursor=1",
-     "SPEECH OUTPUT: 'them. The list is not to be a conclusive list of all applications. Rather, the goal is 
to provide a'"]))
+     "SPEECH OUTPUT: 'them. The list is not to be a conclusive list of all applications. Rather, the goal is 
to'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "37. Line Up",
+    "36. Line Up",
     ["BRAILLE LINE:  'various applications that can be accessed with Orca as well as tips and tricks for 
using'",
      "     VISIBLE:  'various applications that can be', cursor=1",
      "SPEECH OUTPUT: 'various applications that can be accessed with Orca as well as tips and tricks for 
using'"]))
@@ -364,7 +367,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "38. Line Up",
+    "37. Line Up",
     ["BRAILLE LINE:  'On the Accessible Applications page, you will find a growing list of information 
regarding'",
      "     VISIBLE:  'On the Accessible Applications p', cursor=1",
      "SPEECH OUTPUT: 'On the'",
@@ -375,7 +378,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "39. Line Up",
+    "38. Line Up",
     ["BRAILLE LINE:  'access to more and more applications.'",
      "     VISIBLE:  'access to more and more applicat', cursor=1",
      "SPEECH OUTPUT: 'access to more and more applications.'"]))
@@ -383,7 +386,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "40. Line Up",
+    "39. Line Up",
     ["BRAILLE LINE:  'than others, however, and the Orca community continually works to provide compelling'",
      "     VISIBLE:  'than others, however, and the Or', cursor=1",
      "SPEECH OUTPUT: 'than others, however, and the Orca community continually works to provide 
compelling'"]))
@@ -391,7 +394,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "41. Line Up",
+    "40. Line Up",
     ["BRAILLE LINE:  'applications, OpenOffice, Firefox, and the Java platform. Some applications work 
better'",
      "     VISIBLE:  'applications, OpenOffice, Firefo', cursor=1",
      "SPEECH OUTPUT: 'applications,'",
@@ -402,7 +405,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "42. Line Up",
+    "41. Line Up",
     ["BRAILLE LINE:  'technology service provider interface (AT-SPI). This includes the GNOME desktop and 
its'",
      "     VISIBLE:  'technology service provider inte', cursor=1",
      "SPEECH OUTPUT: 'technology service provider interface (AT-SPI). This includes the GNOME desktop and 
its'"]))
@@ -410,7 +413,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "43. Line Up",
+    "42. Line Up",
     ["BRAILLE LINE:  'Orca is designed to work with applications and toolkits that support the assistive'",
      "     VISIBLE:  'Orca is designed to work with ap', cursor=1",
      "SPEECH OUTPUT: 'Orca is designed to work with applications and toolkits that support the assistive'"]))
@@ -418,7 +421,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "44. Line Up",
+    "43. Line Up",
     ["BRAILLE LINE:  'Accessible Applications h1'",
      "     VISIBLE:  'Accessible Applications h1', cursor=1",
      "SPEECH OUTPUT: 'Accessible Applications heading level 1'"]))
@@ -426,7 +429,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "45. Line Up",
+    "44. Line Up",
     ["BRAILLE LINE:  'Please also refer to the Configuration/Use page for detailed information.'",
      "     VISIBLE:  'Please also refer to the Configu', cursor=1",
      "SPEECH OUTPUT: 'Please also refer to the'",
@@ -437,98 +440,106 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
+    "45. Line Up",
+    ["BRAILLE LINE:  'of Orca key bindings.'",
+     "     VISIBLE:  'of Orca key bindings.', cursor=1",
+     "SPEECH OUTPUT: 'of Orca key bindings.'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
     "46. Line Up",
-    ["BRAILLE LINE:  'includes a \"Key Bindings\" tab that allows you to get a complete list of Orca key 
bindings.'",
-     "     VISIBLE:  'includes a \"Key Bindings\" tab th', cursor=1",
-     "SPEECH OUTPUT: 'includes a \"Key Bindings\" tab that allows you to get a complete list of Orca key 
bindings.'"]))
+    ["BRAILLE LINE:  'Configuration GUI also includes a \"Key Bindings\" tab that allows you to get a 
complete list'",
+     "     VISIBLE:  'Configuration GUI also includes ', cursor=1",
+     "SPEECH OUTPUT: 'Configuration GUI'",
+     "SPEECH OUTPUT: 'link.'",
+     "SPEECH OUTPUT: 'also includes a \"Key Bindings\" tab that allows you to get a complete list'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "47. Line Up",
-    ["BRAILLE LINE:  'information on Orca-specific keyboard commands. The Orca Configuration GUI also'",
-     "     VISIBLE:  'information on Orca-specific key', cursor=1",
-     "SPEECH OUTPUT: 'information on Orca-specific keyboard commands. The'",
-     "SPEECH OUTPUT: 'Orca Configuration GUI'",
+    ["BRAILLE LINE:  '(Laptop Layout) for more information on Orca-specific keyboard commands. The Orca'",
+     "     VISIBLE:  '(Laptop Layout) for more informa', cursor=1",
+     "SPEECH OUTPUT: '(Laptop Layout)'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: 'also'"]))
+     "SPEECH OUTPUT: 'for more information on Orca-specific keyboard commands. The'",
+     "SPEECH OUTPUT: 'Orca'",
+     "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "48. Line Up",
-    ["BRAILLE LINE:  'mode to examine a window. Refer to Orca Keyboard Commands \(Laptop Layout\) for more'",
-     "     VISIBLE:  'mode to examine a window. Refer ', cursor=1",
-     "SPEECH OUTPUT: 'mode to examine a window. Refer to'",
+    ["BRAILLE LINE:  'using flat review mode to examine a window. Refer to Orca Keyboard Commands'",
+     "     VISIBLE:  'using flat review mode to examin', cursor=1",
+     "SPEECH OUTPUT: 'using flat review mode to examine a window. Refer to'",
      "SPEECH OUTPUT: 'Orca Keyboard Commands'",
-     "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: '\(Laptop Layout\)'",
-     "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: 'for more'"]))
+     "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "49. Line Up",
-    ["BRAILLE LINE:  'GUI (accessed by pressing Insert+Space when Orca is running) and for using flat 
review'",
-     "     VISIBLE:  'GUI (accessed by pressing Insert', cursor=1",
-     "SPEECH OUTPUT: 'GUI'",
+    ["BRAILLE LINE:  'Configuration GUI (accessed by pressing Insert+Space when Orca is running) and for'",
+     "     VISIBLE:  'Configuration GUI (accessed by p', cursor=1",
+     "SPEECH OUTPUT: 'Configuration GUI'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: '(accessed by pressing Insert+Space when Orca is running) and for using flat review'"]))
+     "SPEECH OUTPUT: '(accessed by pressing Insert+Space when Orca is running) and for'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "50. Line Up",
-    ["BRAILLE LINE:  'You may sometimes wish to control Orca itself, such as bringing up the Orca 
Configuration'",
+    ["BRAILLE LINE:  'You may sometimes wish to control Orca itself, such as bringing up the Orca'",
      "     VISIBLE:  'You may sometimes wish to contro', cursor=1",
      "SPEECH OUTPUT: 'You may sometimes wish to control Orca itself, such as bringing up the'",
-     "SPEECH OUTPUT: 'Orca Configuration'",
+     "SPEECH OUTPUT: 'Orca'",
      "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "51. Line Up",
-    ["BRAILLE LINE:  'desktop applications.'",
-     "     VISIBLE:  'desktop applications.', cursor=1",
-     "SPEECH OUTPUT: 'desktop applications.'"]))
+    ["BRAILLE LINE:  'most desktop applications.'",
+     "     VISIBLE:  'most desktop applications.', cursor=1",
+     "SPEECH OUTPUT: 'most desktop applications.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "52. Line Up",
-    ["BRAILLE LINE:  'mechanisms of GNOME. These navigation mechanisms are consistent across most'",
-     "     VISIBLE:  'mechanisms of GNOME. These navig', cursor=1",
-     "SPEECH OUTPUT: 'mechanisms of GNOME'",
+    ["BRAILLE LINE:  'navigation mechanisms of GNOME. These navigation mechanisms are consistent across'",
+     "     VISIBLE:  'navigation mechanisms of GNOME. ', cursor=1",
+     "SPEECH OUTPUT: 'navigation mechanisms of GNOME'",
      "SPEECH OUTPUT: 'link.'",
-     "SPEECH OUTPUT: '. These navigation mechanisms are consistent across most'"]))
+     "SPEECH OUTPUT: '. These navigation mechanisms are consistent across'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "53. Line Up",
-    ["BRAILLE LINE:  'designed to present information as you navigate the desktop using the built-in 
navigation'",
+    ["BRAILLE LINE:  'designed to present information as you navigate the desktop using the built-in'",
      "     VISIBLE:  'designed to present information ', cursor=1",
      "SPEECH OUTPUT: 'designed to present information as you navigate the desktop using the'",
-     "SPEECH OUTPUT: 'built-in navigation'",
+     "SPEECH OUTPUT: 'built-in'",
      "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "54. Line Up",
-    ["BRAILLE LINE:  'logged in, waiting for a second or so, then typing orca and pressing return. Orca is'",
-     "     VISIBLE:  'logged in, waiting for a second ', cursor=1",
-     "SPEECH OUTPUT: 'logged in, waiting for a second or so, then typing orca and pressing return. Orca 
is'"]))
+    ["BRAILLE LINE:  'when logged in, waiting for a second or so, then typing orca and pressing return. Orca 
is'",
+     "     VISIBLE:  'when logged in, waiting for a se', cursor=1",
+     "SPEECH OUTPUT: 'when logged in, waiting for a second or so, then typing orca and pressing return. Orca 
is'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "55. Line Up",
-    ["BRAILLE LINE:  'The command to run orca is orca. You can enter this command by pressing Alt+F2 when'",
+    ["BRAILLE LINE:  'The command to run orca is orca. You can enter this command by pressing Alt+F2'",
      "     VISIBLE:  'The command to run orca is orca.', cursor=1",
-     "SPEECH OUTPUT: 'The command to run orca is orca. You can enter this command by pressing Alt+F2 
when'"]))
+     "SPEECH OUTPUT: 'The command to run orca is orca. You can enter this command by pressing Alt+F2'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -561,8 +572,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "59. Line Up",
-    ["BRAILLE LINE:  'and Ubuntu.'",
-     "     VISIBLE:  'and Ubuntu.', cursor=1",
+    ["BRAILLE LINE:  'Solaris and Ubuntu.'",
+     "     VISIBLE:  'Solaris and Ubuntu.', cursor=1",
+     "SPEECH OUTPUT: 'Solaris'",
+     "SPEECH OUTPUT: 'link.'",
      "SPEECH OUTPUT: 'and'",
      "SPEECH OUTPUT: 'Ubuntu'",
      "SPEECH OUTPUT: 'link.'",
@@ -572,10 +585,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "60. Line Up",
-    ["BRAILLE LINE:  'provided by default on a number of operating system distributions, including Open 
Solaris'",
+    ["BRAILLE LINE:  'provided by default on a number of operating system distributions, including Open'",
      "     VISIBLE:  'provided by default on a number ', cursor=1",
      "SPEECH OUTPUT: 'provided by default on a number of operating system distributions, including'",
-     "SPEECH OUTPUT: 'Open Solaris'",
+     "SPEECH OUTPUT: 'Open'",
      "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -628,9 +641,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "66. Line Up",
-    ["BRAILLE LINE:  '/linuxat.asp and include the following:'",
-     "     VISIBLE:  '/linuxat.asp and include the fol', cursor=1",
-     "SPEECH OUTPUT: '/linuxat.asp'",
+    ["BRAILLE LINE:  'http://www.digitaldarragh.com/linuxat.asp and include the following:'",
+     "     VISIBLE:  'http://www.digitaldarragh.com/li', cursor=1",
+     "SPEECH OUTPUT: 'http://www.digitaldarragh.com/linuxat.asp'",
      "SPEECH OUTPUT: 'link.'",
      "SPEECH OUTPUT: 'and include the following:'"]))
 
@@ -638,11 +651,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "67. Line Up",
-    ["BRAILLE LINE:  'contribution (THANKS!)!!! The audio guides can be found at 
http://www.digitaldarragh.com'",
+    ["BRAILLE LINE:  'contribution (THANKS!)!!! The audio guides can be found at'",
      "     VISIBLE:  'contribution (THANKS!)!!! The au', cursor=1",
-     "SPEECH OUTPUT: 'contribution (THANKS!)!!! The audio guides can be found at'",
-     "SPEECH OUTPUT: 'http://www.digitaldarragh.com'",
-     "SPEECH OUTPUT: 'link.'"]))
+     "SPEECH OUTPUT: 'contribution (THANKS!)!!! The audio guides can be found at'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -688,9 +699,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "72. Line Up",
-    ["BRAILLE LINE:  'use Bugzilla\).'",
-     "     VISIBLE:  'use Bugzilla\).', cursor=1",
-     "SPEECH OUTPUT: 'use Bugzilla'",
+    ["BRAILLE LINE:  'we use Bugzilla\).'",
+     "     VISIBLE:  'we use Bugzilla\).', cursor=1",
+     "SPEECH OUTPUT: 'we use Bugzilla'",
      "SPEECH OUTPUT: 'link.'",
      "SPEECH OUTPUT: '\).'"]))
 
@@ -698,13 +709,13 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "73. Line Up",
-    ["BRAILLE LINE:  'problems in other components, is maintained in Bugzilla \(please see our notes on how 
we'",
+    ["BRAILLE LINE:  'problems in other components, is maintained in Bugzilla \(please see our notes on 
how'",
      "     VISIBLE:  'problems in other components, is', cursor=1",
      "SPEECH OUTPUT: 'problems in other components, is maintained in'",
      "SPEECH OUTPUT: 'Bugzilla'",
      "SPEECH OUTPUT: 'link.'",
      "SPEECH OUTPUT: '\(please see our'",
-     "SPEECH OUTPUT: 'notes on how we'",
+     "SPEECH OUTPUT: 'notes on how'",
      "SPEECH OUTPUT: 'link.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -984,8 +995,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "101. Line Up",
-    ["BRAILLE LINE:  'live.gnome.org h1 Search $l Titles push button Text push button'",
-     "     VISIBLE:  'live.gnome.org h1 Search $l Titl', cursor=1",
+    ["BRAILLE LINE:  'live.gnome.org  h1 Search $l Titles push button Text push button'",
+     "     VISIBLE:  'live.gnome.org  h1 Search $l Tit', cursor=1",
      "SPEECH OUTPUT: 'live.gnome.org heading level 1'",
      "SPEECH OUTPUT: 'entry Search'",
      "SPEECH OUTPUT: 'Titles push button'",
diff --git a/test/keystrokes/firefox/math_line_nav_torture_test.py 
b/test/keystrokes/firefox/math_line_nav_torture_test.py
index 5b95783..415990f 100644
--- a/test/keystrokes/firefox/math_line_nav_torture_test.py
+++ b/test/keystrokes/firefox/math_line_nav_torture_test.py
@@ -228,7 +228,7 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'over partial differential y.'",
      "SPEECH OUTPUT: 'superscript 2.'",
      "SPEECH OUTPUT: 'fraction end.'",
-     "SPEECH OUTPUT: 'right paren vertical bar φ left paren x plus i y right paren vertical bar.'",
+     "SPEECH OUTPUT: 'right paren vertical bar φ  left paren x plus i y right paren vertical bar.'",
      "SPEECH OUTPUT: 'superscript 2.'",
      "SPEECH OUTPUT: 'equals 0'"]))
 
diff --git a/test/keystrokes/firefox/mouseover_javascript_alert.py 
b/test/keystrokes/firefox/mouseover_javascript_alert.py
index 7e44491..6757d86 100644
--- a/test/keystrokes/firefox/mouseover_javascript_alert.py
+++ b/test/keystrokes/firefox/mouseover_javascript_alert.py
@@ -18,9 +18,10 @@ sequence.append(KeyComboAction("KP_Divide"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "1. Route the pointer to the image",
-    ["BRAILLE LINE:  'Firefox application MouseOvers - (Mozilla Firefox|Nightly) frame dialog'",
+    ["KNOWN ISSUE: There seems to be some input event bleed through here",
+     "BRAILLE LINE:  'Firefox application MouseOvers - Nightly frame dialog'",
      "     VISIBLE:  'dialog', cursor=1",
-     "BRAILLE LINE:  'Firefox application MouseOvers - (Mozilla Firefox|Nightly) frame dialog OK push 
button'",
+     "BRAILLE LINE:  'Firefox application MouseOvers - Nightly frame dialog OK push button'",
      "     VISIBLE:  'OK push button', cursor=1",
      "SPEECH OUTPUT: 'Welcome to mouseover-enabled Orca!'",
      "SPEECH OUTPUT: 'OK push button'"]))
diff --git a/test/keystrokes/firefox/object_nav_descriptions_down.py 
b/test/keystrokes/firefox/object_nav_descriptions_down.py
index 1f7d29e..50b3cb6 100644
--- a/test/keystrokes/firefox/object_nav_descriptions_down.py
+++ b/test/keystrokes/firefox/object_nav_descriptions_down.py
@@ -143,7 +143,7 @@ sequence.append(utils.AssertPresentationAction(
     "16. Line Down",
     ["BRAILLE LINE:  'Black'",
      "     VISIBLE:  'Black', cursor=1",
-     "SPEECH OUTPUT: 'Black'"]))
+     "SPEECH OUTPUT: 'Black clickable'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -159,7 +159,7 @@ sequence.append(utils.AssertPresentationAction(
     "18. Line Down",
     ["BRAILLE LINE:  'White'",
      "     VISIBLE:  'White', cursor=1",
-     "SPEECH OUTPUT: 'White'"]))
+     "SPEECH OUTPUT: 'White clickable'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -175,7 +175,7 @@ sequence.append(utils.AssertPresentationAction(
     "20. Line Down",
     ["BRAILLE LINE:  'Grey'",
      "     VISIBLE:  'Grey', cursor=1",
-     "SPEECH OUTPUT: 'Grey'"]))
+     "SPEECH OUTPUT: 'Grey clickable'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
diff --git a/test/keystrokes/firefox/object_nav_descriptions_up.py 
b/test/keystrokes/firefox/object_nav_descriptions_up.py
index f10a346..edebdae 100644
--- a/test/keystrokes/firefox/object_nav_descriptions_up.py
+++ b/test/keystrokes/firefox/object_nav_descriptions_up.py
@@ -22,7 +22,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Line Up",
     ["BRAILLE LINE:  'Grey'",
      "     VISIBLE:  'Grey', cursor=1",
-     "SPEECH OUTPUT: 'Grey'"]))
+     "SPEECH OUTPUT: 'Grey clickable'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -38,7 +38,7 @@ sequence.append(utils.AssertPresentationAction(
     "3. Line Up",
     ["BRAILLE LINE:  'White'",
      "     VISIBLE:  'White', cursor=1",
-     "SPEECH OUTPUT: 'White'"]))
+     "SPEECH OUTPUT: 'White clickable'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -54,7 +54,7 @@ sequence.append(utils.AssertPresentationAction(
     "5. Line Up",
     ["BRAILLE LINE:  'Black'",
      "     VISIBLE:  'Black', cursor=1",
-     "SPEECH OUTPUT: 'Black'"]))
+     "SPEECH OUTPUT: 'Black clickable'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/object_nav_links_in_text.py 
b/test/keystrokes/firefox/object_nav_links_in_text.py
index 9bab0f6..e10e28f 100644
--- a/test/keystrokes/firefox/object_nav_links_in_text.py
+++ b/test/keystrokes/firefox/object_nav_links_in_text.py
@@ -18,9 +18,13 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "1. Top of file",
-    ["BRAILLE LINE:  'Home'",
+    ["KNOWN ISSUE: We are presenting this twice",
+     "BRAILLE LINE:  'Home'",
      "     VISIBLE:  'Home', cursor=1",
-     "SPEECH OUTPUT: 'Home link.'"]))
+     "BRAILLE LINE:  'Home'",
+     "     VISIBLE:  'Home', cursor=1",
+     "SPEECH OUTPUT: 'Home link.' voice=hyperlink",
+     "SPEECH OUTPUT: 'Home link.' voice=hyperlink"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("H"))
@@ -58,25 +62,25 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. line Down",
-    ["BRAILLE LINE:  ','",
-     "     VISIBLE:  ',', cursor=1",
-     "SPEECH OUTPUT: ',.'"]))
+    ["BRAILLE LINE:  ', please look at the list of'",
+     "     VISIBLE:  ', please look at the list of', cursor=1",
+     "SPEECH OUTPUT: ', please look at the list of.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "7. line Down",
-    ["BRAILLE LINE:  'please look at the list of'",
-     "     VISIBLE:  'please look at the list of', cursor=1",
-     "SPEECH OUTPUT: 'please look at the list of.'"]))
+    ["BRAILLE LINE:  'most'",
+     "     VISIBLE:  'most', cursor=1",
+     "SPEECH OUTPUT: 'most link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "8. line Down",
-    ["BRAILLE LINE:  'most frequently reported bugs'",
-     "     VISIBLE:  'most frequently reported bugs', cursor=1",
-     "SPEECH OUTPUT: 'most frequently reported bugs link.'"]))
+    ["BRAILLE LINE:  'frequently reported bugs'",
+     "     VISIBLE:  'frequently reported bugs', cursor=1",
+     "SPEECH OUTPUT: 'frequently reported bugs link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -154,25 +158,25 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "18. line Up",
-    ["BRAILLE LINE:  'most frequently reported bugs'",
-     "     VISIBLE:  'most frequently reported bugs', cursor=1",
-     "SPEECH OUTPUT: 'most frequently reported bugs link.'"]))
+    ["BRAILLE LINE:  'frequently reported bugs'",
+     "     VISIBLE:  'frequently reported bugs', cursor=1",
+     "SPEECH OUTPUT: 'frequently reported bugs link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "19. line Up",
-    ["BRAILLE LINE:  'please look at the list of'",
-     "     VISIBLE:  'please look at the list of', cursor=1",
-     "SPEECH OUTPUT: 'please look at the list of.'"]))
+    ["BRAILLE LINE:  'most'",
+     "     VISIBLE:  'most', cursor=1",
+     "SPEECH OUTPUT: 'most link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "20. line Up",
-    ["BRAILLE LINE:  ','",
-     "     VISIBLE:  ',', cursor=1",
-     "SPEECH OUTPUT: ',.'"]))
+    ["BRAILLE LINE:  ', please look at the list of'",
+     "     VISIBLE:  ', please look at the list of', cursor=1",
+     "SPEECH OUTPUT: ', please look at the list of.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/object_nav_links_on_line.py 
b/test/keystrokes/firefox/object_nav_links_on_line.py
index a188fa4..5fa1993 100644
--- a/test/keystrokes/firefox/object_nav_links_on_line.py
+++ b/test/keystrokes/firefox/object_nav_links_on_line.py
@@ -9,18 +9,20 @@ sequence = MacroSequence()
 
 #sequence.append(WaitForDocLoad())
 sequence.append(PauseAction(5000))
-
-# Work around some new quirk in Gecko that causes this test to fail if
-# run via the test harness rather than manually.
-sequence.append(KeyComboAction("<Control>r"))
+sequence.append(KeyComboAction("<Control>Home"))
+sequence.append(KeyComboAction("Tab"))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "1. Top of file",
-    ["BRAILLE LINE:  'Home'",
+    ["KNOWN ISSUE: We are presenting this twice",
+     "BRAILLE LINE:  'Home'",
      "     VISIBLE:  'Home', cursor=1",
-     "SPEECH OUTPUT: 'Home link.'"]))
+     "BRAILLE LINE:  'Home'",
+     "     VISIBLE:  'Home', cursor=1",
+     "SPEECH OUTPUT: 'Home link.' voice=hyperlink",
+     "SPEECH OUTPUT: 'Home link.' voice=hyperlink"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
diff --git a/test/keystrokes/firefox/object_nav_simple_form_down.py 
b/test/keystrokes/firefox/object_nav_simple_form_down.py
index 811a245..ebc4a3d 100644
--- a/test/keystrokes/firefox/object_nav_simple_form_down.py
+++ b/test/keystrokes/firefox/object_nav_simple_form_down.py
@@ -27,7 +27,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. line Down",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(PauseAction(1000))
@@ -80,7 +80,7 @@ sequence.append(utils.AssertPresentationAction(
     "8. line Down",
     ["BRAILLE LINE:  'I am a monkey with a long tail.  I like  $l'",
      "     VISIBLE:  'I am a monkey with a long tail. ', cursor=1",
-     "SPEECH OUTPUT: 'entry I am a monkey with a long tail.  I like "]))
+     "SPEECH OUTPUT: 'entry I am a monkey with a long tail.  I like '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -88,7 +88,7 @@ sequence.append(utils.AssertPresentationAction(
     "9. line Down",
     ["BRAILLE LINE:  'to swing from trees and eat bananas.   $l'",
      "     VISIBLE:  'to swing from trees and eat bana', cursor=1",
-     "SPEECH OUTPUT: 'to swing from trees and eat bananas.  "]))
+     "SPEECH OUTPUT: 'to swing from trees and eat bananas.  '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
diff --git a/test/keystrokes/firefox/object_nav_simple_form_down.settings 
b/test/keystrokes/firefox/object_nav_simple_form_down.settings
index d66b1e4..4c64ea4 100644
--- a/test/keystrokes/firefox/object_nav_simple_form_down.settings
+++ b/test/keystrokes/firefox/object_nav_simple_form_down.settings
@@ -40,7 +40,7 @@
         "enableSpeechIndentation": false, 
         "chatSpeakRoomName": false, 
         "flashVerbosityLevel": 1, 
-        "enableBraille": true, 
+        "enableBraille": false, 
         "speakCellHeaders": true, 
         "layoutMode": false, 
         "enableBrailleMonitor": true, 
diff --git a/test/keystrokes/firefox/object_nav_simple_form_up.py 
b/test/keystrokes/firefox/object_nav_simple_form_up.py
index 5327b97..3851cc7 100644
--- a/test/keystrokes/firefox/object_nav_simple_form_up.py
+++ b/test/keystrokes/firefox/object_nav_simple_form_up.py
@@ -232,7 +232,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "27. line Up",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/object_nav_simple_form_up.settings 
b/test/keystrokes/firefox/object_nav_simple_form_up.settings
index d66b1e4..4c64ea4 100644
--- a/test/keystrokes/firefox/object_nav_simple_form_up.settings
+++ b/test/keystrokes/firefox/object_nav_simple_form_up.settings
@@ -40,7 +40,7 @@
         "enableSpeechIndentation": false, 
         "chatSpeakRoomName": false, 
         "flashVerbosityLevel": 1, 
-        "enableBraille": true, 
+        "enableBraille": false, 
         "speakCellHeaders": true, 
         "layoutMode": false, 
         "enableBrailleMonitor": true, 
diff --git a/test/keystrokes/firefox/say_all_bugzilla_search.py 
b/test/keystrokes/firefox/say_all_bugzilla_search.py
index 9e9b332..c5fc4d6 100644
--- a/test/keystrokes/firefox/say_all_bugzilla_search.py
+++ b/test/keystrokes/firefox/say_all_bugzilla_search.py
@@ -19,7 +19,6 @@ sequence.append(utils.AssertPresentationAction(
     "KP_Add to do a SayAll",
     ["SPEECH OUTPUT: 'Home'",
      "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'Back to the Gnome Bugzilla home page'",
      "SPEECH OUTPUT: 'Bugzilla'",
      "SPEECH OUTPUT: 'New bug'",
      "SPEECH OUTPUT: 'link'",
diff --git a/test/keystrokes/firefox/say_all_nested_tables.py 
b/test/keystrokes/firefox/say_all_nested_tables.py
index f143d46..1a9de49 100644
--- a/test/keystrokes/firefox/say_all_nested_tables.py
+++ b/test/keystrokes/firefox/say_all_nested_tables.py
@@ -28,7 +28,6 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: '.'",
      "SPEECH OUTPUT: 'Reports'",
      "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'table row'",
      "SPEECH OUTPUT: 'Your Learning Plan'",
      "SPEECH OUTPUT: 'Below is a list of the courses that make up your learning plan.'",
      "SPEECH OUTPUT: 'UNIX 2007'",
diff --git a/test/keystrokes/firefox/say_all_simple_form.py b/test/keystrokes/firefox/say_all_simple_form.py
index f79f132..5b93a8b 100644
--- a/test/keystrokes/firefox/say_all_simple_form.py
+++ b/test/keystrokes/firefox/say_all_simple_form.py
@@ -34,14 +34,17 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: 'Red'",
+     "SPEECH OUTPUT: 'clickable'",
      "SPEECH OUTPUT: 'Blue'",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: 'Blue'",
+     "SPEECH OUTPUT: 'clickable'",
      "SPEECH OUTPUT: 'Green'",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: 'Green'",
+     "SPEECH OUTPUT: 'clickable'",
      "SPEECH OUTPUT: 'Make a selection:'",
      "SPEECH OUTPUT: 'Water'",
      "SPEECH OUTPUT: 'combo box'",
diff --git a/test/keystrokes/firefox/selection_wiki.py b/test/keystrokes/firefox/selection_wiki.py
index 149009d..410e191 100644
--- a/test/keystrokes/firefox/selection_wiki.py
+++ b/test/keystrokes/firefox/selection_wiki.py
@@ -121,7 +121,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Down"))
 sequence.append(utils.AssertPresentationAction(
     "12. Shift Down",
-    ["BRAILLE LINE:  'problems in other components, is maintained in Bugzilla \(please see our notes on how 
we'",
+    ["BRAILLE LINE:  'problems in other components, is maintained in Bugzilla \(please see our notes on 
how'",
      "     VISIBLE:  'r components, is maintained in B', cursor=32",
      "SPEECH OUTPUT: 'problems in other components, is maintained in Bugzilla  \(please see our'",
      "SPEECH OUTPUT: 'selected' voice=system"]))
@@ -130,9 +130,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Down"))
 sequence.append(utils.AssertPresentationAction(
     "13. Shift Down",
-    ["BRAILLE LINE:  'use Bugzilla).'",
-     "     VISIBLE:  'use Bugzilla).', cursor=1",
-     "SPEECH OUTPUT: 'notes on how we use Bugzilla ).'",
+    ["BRAILLE LINE:  'we use Bugzilla\).'",
+     "     VISIBLE:  'we use Bugzilla\).', cursor=1",
+     "SPEECH OUTPUT: 'notes on how we use Bugzilla \).'",
      "SPEECH OUTPUT: 'selected' voice=system"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -175,8 +175,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Down"))
 sequence.append(utils.AssertPresentationAction(
     "18. Shift Down",
-    ["BRAILLE LINE:  'contribution (THANKS!)!!! The audio guides can be found at 
http://www.digitaldarragh.com'",
-     "     VISIBLE:  'e audio guides can be found at h', cursor=32",
+    ["BRAILLE LINE:  'contribution (THANKS!)!!! The audio guides can be found at'",
+     "     VISIBLE:  'e audio guides can be found at', cursor=32",
      "SPEECH OUTPUT: 'contribution (THANKS!)!!! The audio guides can be found at '",
      "SPEECH OUTPUT: 'selected' voice=system"]))
 
@@ -184,8 +184,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Down"))
 sequence.append(utils.AssertPresentationAction(
     "19. Shift Down",
-    ["BRAILLE LINE:  '/linuxat.asp and include the following:'",
-     "     VISIBLE:  '/linuxat.asp and include the fol', cursor=1",
+    ["BRAILLE LINE:  'http://www.digitaldarragh.com/linuxat.asp and include the following:'",
+     "     VISIBLE:  'http://www.digitaldarragh.com/li', cursor=1",
      "SPEECH OUTPUT: 'http://www.digitaldarragh.com/linuxat.asp  and include the following:'",
      "SPEECH OUTPUT: 'selected' voice=system"]))
 
@@ -238,25 +238,25 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Down"))
 sequence.append(utils.AssertPresentationAction(
     "25. Shift Down",
-    ["BRAILLE LINE:  'provided by default on a number of operating system distributions, including Open 
Solaris'",
+    ["BRAILLE LINE:  'provided by default on a number of operating system distributions, including Open'",
      "     VISIBLE:  'ystem distributions, including O', cursor=32",
-     "SPEECH OUTPUT: 'provided by default on a number of operating system distributions, including Open 
Solaris'",
+     "SPEECH OUTPUT: 'provided by default on a number of operating system distributions, including '",
      "SPEECH OUTPUT: 'selected' voice=system"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Up"))
 sequence.append(utils.AssertPresentationAction(
     "26. Shift Up",
-    ["BRAILLE LINE:  'and Ubuntu.'",
-     "     VISIBLE:  'and Ubuntu.', cursor=0",
-     "SPEECH OUTPUT: 'provided by default on a number of operating system distributions, including Open 
Solaris'",
+    ["BRAILLE LINE:  'Solaris and Ubuntu.'",
+     "     VISIBLE:  'Solaris and Ubuntu.', cursor=1",
+     "SPEECH OUTPUT: 'provided by default on a number of operating system distributions, including '",
      "SPEECH OUTPUT: 'unselected' voice=system"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Up"))
 sequence.append(utils.AssertPresentationAction(
     "27. Shift Up",
-    ["BRAILLE LINE:  'provided by default on a number of operating system distributions, including Open 
Solaris'",
+    ["BRAILLE LINE:  'provided by default on a number of operating system distributions, including Open'",
      "     VISIBLE:  'provided by default on a number ', cursor=0",
      "SPEECH OUTPUT: 'As of GNOME 2.16, Orca is a part of the GNOME platform. As a result, Orca is already 
'",
      "SPEECH OUTPUT: 'unselected' voice=system"]))
@@ -310,8 +310,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Up"))
 sequence.append(utils.AssertPresentationAction(
     "33. Shift Up",
-    ["BRAILLE LINE:  '/linuxat.asp and include the following:'",
-     "     VISIBLE:  '/linuxat.asp and include the fol', cursor=1",
+    ["BRAILLE LINE:  'http://www.digitaldarragh.com/linuxat.asp and include the following:'",
+     "     VISIBLE:  'http://www.digitaldarragh.com/li', cursor=1",
      "SPEECH OUTPUT: 'contribution (THANKS!)!!! The audio guides can be found at '",
      "SPEECH OUTPUT: 'unselected' voice=system"]))
 
@@ -319,7 +319,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Up"))
 sequence.append(utils.AssertPresentationAction(
     "34. Shift Up",
-    ["BRAILLE LINE:  'contribution (THANKS!)!!! The audio guides can be found at 
http://www.digitaldarragh.com'",
+    ["BRAILLE LINE:  'contribution (THANKS!)!!! The audio guides can be found at'",
      "     VISIBLE:  'contribution (THANKS!)!!! The au', cursor=0",
      "SPEECH OUTPUT: 'Darragh Ó Héiligh  has created several audio guides for Orca. This is a fantastic'",
      "SPEECH OUTPUT: 'unselected' voice=system"]))
diff --git a/test/keystrokes/firefox/spelling_errors.py b/test/keystrokes/firefox/spelling_errors.py
index 65edf66..74a6879 100644
--- a/test/keystrokes/firefox/spelling_errors.py
+++ b/test/keystrokes/firefox/spelling_errors.py
@@ -349,7 +349,7 @@ sequence.append(KeyComboAction("f"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "41. Insert+f",
-    ["SPEECH OUTPUT: 'size: 9' voice=system",
+    ["SPEECH OUTPUT: 'size: 12' voice=system",
      "SPEECH OUTPUT: 'family name: DejaVu Sans Mono' voice=system",
      "SPEECH OUTPUT: 'misspelled' voice=system",
      "SPEECH OUTPUT: 'foreground color: black' voice=system",
@@ -394,7 +394,7 @@ sequence.append(KeyComboAction("f"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "46. Insert+f",
-    ["SPEECH OUTPUT: 'size: 9' voice=system",
+    ["SPEECH OUTPUT: 'size: 12' voice=system",
      "SPEECH OUTPUT: 'family name: DejaVu Sans Mono' voice=system",
      "SPEECH OUTPUT: 'foreground color: black' voice=system",
      "SPEECH OUTPUT: 'background color: white' voice=system"]))
diff --git a/test/keystrokes/firefox/ui_doc_tabs.py b/test/keystrokes/firefox/ui_doc_tabs.py
index 5d5cf95..f66bd67 100644
--- a/test/keystrokes/firefox/ui_doc_tabs.py
+++ b/test/keystrokes/firefox/ui_doc_tabs.py
@@ -8,23 +8,15 @@ import utils
 sequence = MacroSequence()
 
 #sequence.append(WaitForDocLoad())
-sequence.append(PauseAction(5000))
-
-# Work around some new quirk in Gecko that causes this test to fail if
-# run via the test harness rather than manually.
-sequence.append(KeyComboAction("<Control>r"))
-
-sequence.append(PauseAction(3000))
+sequence.append(PauseAction(15000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>2"))
 sequence.append(utils.AssertPresentationAction(
     "1. Switch to second page tab - Orca wiki",
-    ["BRAILLE LINE:  'Firefox application Orca - GNOME Live! - (Mozilla Firefox|Nightly) frame Browser tabs 
tool bar Orca - GNOME Live! page tab'",
-     "     VISIBLE:  'Orca - GNOME Live! page tab', cursor=1",
+    ["KNOWN ISSUE: We are not presenting the page tab",
      "BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'Orca - GNOME Live! page tab.'",
      "SPEECH OUTPUT: 'document frame'"]))
 
 sequence.append(PauseAction(3000))
@@ -33,41 +25,36 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>1"))
 sequence.append(utils.AssertPresentationAction(
     "2. Switch to first page tab - Test page",
-    ["BRAILLE LINE:  'Firefox application HTML test page - (Mozilla Firefox|Nightly) frame Browser tabs tool 
bar HTML test page page tab'",
-     "     VISIBLE:  'HTML test page page tab', cursor=1",
-     "BRAILLE LINE:  ''",
+    ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=0",
-     "SPEECH OUTPUT: 'HTML test page page tab.'",
      "SPEECH OUTPUT: 'document frame blank'"]))
 
-sequence.append(PauseAction(3000))
+sequence.append(PauseAction(5000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt>3"))
 sequence.append(utils.AssertPresentationAction(
     "3. Switch to third page tab - Bugzilla",
-    ["BRAILLE LINE:  'Firefox application GNOME Bug Tracking System - (Mozilla Firefox|Nightly) frame 
Browser tabs tool bar GNOME Bug Tracking System page tab'",
-     "     VISIBLE:  'GNOME Bug Tracking System page t', cursor=1",
-     "BRAILLE LINE:  'Enter a bug # or some search terms:  $l'",
+    ["BRAILLE LINE:  'Enter a bug # or some search terms:  $l'",
      "     VISIBLE:  ' a bug # or some search terms:  ', cursor=32",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "SPEECH OUTPUT: 'GNOME Bug Tracking System page tab.'",
      "SPEECH OUTPUT: 'Enter a bug # or some search terms: entry'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
-sequence.append(PauseAction(3000))
+sequence.append(PauseAction(5000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Ctrl>w"))
 sequence.append(utils.AssertPresentationAction(
     "4. Close third page tab - land in second page",
-    ["BRAILLE LINE:  'Firefox application Orca - GNOME Live! - (Mozilla Firefox|Nightly) frame Browser tabs 
tool bar Orca - GNOME Live! page tab'",
-     "     VISIBLE:  'Orca - GNOME Live! page tab', cursor=1",
-     "BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'Orca - GNOME Live! page tab.'",
-     "SPEECH OUTPUT: 'document frame'"]))
+    ["KNOWN ISSUE: EOCs",
+     "BRAILLE LINE:  '\ufffc\ufffc'",
+     "     VISIBLE:  '\ufffc\ufffc', cursor=1",
+     "BRAILLE LINE:  'Browse mode'",
+     "     VISIBLE:  'Browse mode', cursor=0",
+     "SPEECH OUTPUT: 'document frame'",
+     "SPEECH OUTPUT: 'Browse mode' voice=system"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/firefox/ui_role_radio_menu_item.py 
b/test/keystrokes/firefox/ui_role_radio_menu_item.py
index 4e78bfa..f11f904 100644
--- a/test/keystrokes/firefox/ui_role_radio_menu_item.py
+++ b/test/keystrokes/firefox/ui_role_radio_menu_item.py
@@ -14,7 +14,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("y"))
 sequence.append(utils.AssertPresentationAction(
     "1. y for the Page Style menu",
-    ["BRAILLE LINE:  'Firefox application (Mozilla Firefox|Nightly) frame Menu Bar tool bar Application menu 
bar View menu & y No Style radio menu item'",
+    ["BRAILLE LINE:  'Firefox application Nightly frame Menu Bar tool bar Application menu bar Page Style 
menu'",
+     "     VISIBLE:  'Page Style menu', cursor=1",
+     "BRAILLE LINE:  'Firefox application Nightly frame Menu Bar tool bar Application menu bar View menu & y 
No Style radio menu item'",
      "     VISIBLE:  '& y No Style radio menu item', cursor=1",
      "SPEECH OUTPUT: 'Page Style menu.'",
      "SPEECH OUTPUT: 'No Style not selected radio menu item'"]))
@@ -23,9 +25,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. Basic Where Am I",
-    ["BRAILLE LINE:  'Firefox application (Mozilla Firefox|Nightly) frame Menu Bar tool bar Application menu 
bar View menu & y No Style radio menu item'",
+    ["BRAILLE LINE:  'Firefox application Nightly frame Menu Bar tool bar Application menu bar View menu & y 
No Style radio menu item'",
      "     VISIBLE:  '& y No Style radio menu item', cursor=1",
-     "SPEECH OUTPUT: '(Mozilla Firefox|Nightly) frame'",
+     "SPEECH OUTPUT: 'Nightly frame'",
      "SPEECH OUTPUT: 'View menu'",
      "SPEECH OUTPUT: 'Page Style menu'",
      "SPEECH OUTPUT: 'Menu Bar tool bar No Style radio menu item not selected 1 of 2.'",
@@ -35,7 +37,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Down Arrow in menu",
-    ["BRAILLE LINE:  'Firefox application (Mozilla Firefox|Nightly) frame Menu Bar tool bar Application menu 
bar View menu &=y Basic Page Style radio menu item'",
+    ["BRAILLE LINE:  'Firefox application Nightly frame Menu Bar tool bar Application menu bar View menu &=y 
Basic Page Style radio menu item'",
      "     VISIBLE:  '&=y Basic Page Style radio menu ', cursor=1",
      "SPEECH OUTPUT: 'Basic Page Style selected radio menu item'"]))
 
@@ -43,9 +45,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "4. Basic Where Am I",
-    ["BRAILLE LINE:  'Firefox application (Mozilla Firefox|Nightly) frame Menu Bar tool bar Application menu 
bar View menu &=y Basic Page Style radio menu item'",
+    ["BRAILLE LINE:  'Firefox application Nightly frame Menu Bar tool bar Application menu bar View menu &=y 
Basic Page Style radio menu item'",
      "     VISIBLE:  '&=y Basic Page Style radio menu ', cursor=1",
-     "SPEECH OUTPUT: '(Mozilla Firefox|Nightly) frame'",
+     "SPEECH OUTPUT: 'Nightly frame'",
      "SPEECH OUTPUT: 'View menu'",
      "SPEECH OUTPUT: 'Page Style menu'",
      "SPEECH OUTPUT: 'Menu Bar tool bar Basic Page Style radio menu item selected 2 of 2.'",
diff --git a/test/keystrokes/firefox/ui_role_tree.py b/test/keystrokes/firefox/ui_role_tree.py
index f84b0e9..b62504e 100644
--- a/test/keystrokes/firefox/ui_role_tree.py
+++ b/test/keystrokes/firefox/ui_role_tree.py
@@ -10,6 +10,13 @@ sequence = MacroSequence()
 sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("<Alt>b"))
 sequence.append(KeyComboAction("Return"))
+sequence.append(KeyComboAction("Tab"))
+sequence.append(KeyComboAction("Tab"))
+sequence.append(KeyComboAction("Up"))
+sequence.append(KeyComboAction("Up"))
+sequence.append(KeyComboAction("Up"))
+sequence.append(KeyComboAction("Tab"))
+sequence.append(PauseAction(3000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Tab"))
@@ -73,20 +80,20 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "7. Down Arrow in tree",
-    ["BRAILLE LINE:  'Firefox application Library frame Recently Bookmarked list item TREE LEVEL 3'",
-     "     VISIBLE:  'Recently Bookmarked list item TR', cursor=1",
-     "SPEECH OUTPUT: 'Recently Bookmarked.'",
+    ["BRAILLE LINE:  'Firefox application Library frame Recent Tags list item TREE LEVEL 3'",
+     "     VISIBLE:  'Recent Tags list item TREE LEVEL', cursor=1",
+     "SPEECH OUTPUT: 'Recent Tags.'",
      "SPEECH OUTPUT: 'tree level 3'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "8. Basic Where Am I", 
-    ["BRAILLE LINE:  'Firefox application Library frame Recently Bookmarked list item TREE LEVEL 3'",
-     "     VISIBLE:  'Recently Bookmarked list item TR', cursor=1",
+    ["BRAILLE LINE:  'Firefox application Library frame Recent Tags list item TREE LEVEL 3'",
+     "     VISIBLE:  'Recent Tags list item TREE LEVEL', cursor=1",
      "SPEECH OUTPUT: 'list item.'",
-     "SPEECH OUTPUT: 'Recently Bookmarked.'",
-     "SPEECH OUTPUT: '1 of 4.'",
+     "SPEECH OUTPUT: 'Recent Tags.'",
+     "SPEECH OUTPUT: '1 of 3.'",
      "SPEECH OUTPUT: 'tree level 3.'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/ui_role_tree_table.py b/test/keystrokes/firefox/ui_role_tree_table.py
index 8abfd4f..a14b553 100644
--- a/test/keystrokes/firefox/ui_role_tree_table.py
+++ b/test/keystrokes/firefox/ui_role_tree_table.py
@@ -10,30 +10,36 @@ sequence = MacroSequence()
 sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("<Alt>b"))
 sequence.append(KeyComboAction("Return"))
+sequence.append(PauseAction(3000))
+sequence.append(KeyComboAction("Tab"))
+sequence.append(KeyComboAction("Tab"))
+sequence.append(KeyComboAction("Up"))
+sequence.append(KeyComboAction("Tab"))
+sequence.append(KeyComboAction("Down"))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Down Arrow in tree table",
-    ["BRAILLE LINE:  'Firefox application Library frame tree table Bookmarks Menu   table row TREE LEVEL 1'",
-     "     VISIBLE:  'Bookmarks Menu   table row TREE ', cursor=1",
-     "SPEECH OUTPUT: 'Bookmarks Menu   table row'"]))
+    ["BRAILLE LINE:  'Firefox application Library frame tree table GNOME   table row TREE LEVEL 1'",
+     "     VISIBLE:  'GNOME   table row TREE LEVEL 1', cursor=1",
+     "SPEECH OUTPUT: 'GNOME   table row'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. Basic Where Am I",
-    ["BRAILLE LINE:  'Firefox application Library frame tree table Bookmarks Menu   table row TREE LEVEL 1'",
-     "     VISIBLE:  'Bookmarks Menu   table row TREE ', cursor=1",
-     "SPEECH OUTPUT: 'Bookmarks Menu   table row'"]))
+    ["BRAILLE LINE:  'Firefox application Library frame tree table GNOME   table row TREE LEVEL 1'",
+     "     VISIBLE:  'GNOME   table row TREE LEVEL 1', cursor=1",
+     "SPEECH OUTPUT: 'GNOME   table row'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "3. Up Arrow in tree table",
-    ["BRAILLE LINE:  'Firefox application Library frame tree table Bookmarks Toolbar   table row TREE LEVEL 
1'",
-     "     VISIBLE:  'Bookmarks Toolbar   table row TR', cursor=1",
-     "SPEECH OUTPUT: 'Bookmarks Toolbar   table row'"]))
+    ["BRAILLE LINE:  'Firefox application Library frame tree table table row TREE LEVEL 1'",
+     "     VISIBLE:  'table row TREE LEVEL 1', cursor=1",
+     "SPEECH OUTPUT: 'table row'"]))
 
 sequence.append(KeyComboAction("<Alt>F4"))
 
diff --git a/test/keystrokes/firefox/ui_title_and_status_bar.params 
b/test/keystrokes/firefox/ui_title_and_status_bar.params
new file mode 100644
index 0000000..6041395
--- /dev/null
+++ b/test/keystrokes/firefox/ui_title_and_status_bar.params
@@ -0,0 +1 @@
+PARAMS=$TEST_DIR/../../html/anchors2.html
diff --git a/test/keystrokes/firefox/ui_title_and_status_bar.py 
b/test/keystrokes/firefox/ui_title_and_status_bar.py
new file mode 100644
index 0000000..9ea6680
--- /dev/null
+++ b/test/keystrokes/firefox/ui_title_and_status_bar.py
@@ -0,0 +1,42 @@
+#!/usr/bin/python
+
+from macaroon.playback import *
+import utils
+
+sequence = MacroSequence()
+
+sequence.append(PauseAction(5000))
+sequence.append(KeyComboAction("Tab"))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyPressAction(0, None, "KP_Insert"))
+sequence.append(KeyComboAction("KP_Enter"))
+sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
+sequence.append(utils.AssertPresentationAction(
+    "1. Title bar",
+    ["BRAILLE LINE:  'Links to test files - Nightly'",
+     "     VISIBLE:  'Links to test files - Nightly', cursor=0",
+     "SPEECH OUTPUT: 'Links to test files - Nightly'"]))
+
+sequence.append(PauseAction(5000))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyPressAction(0, None, "KP_Insert"))
+sequence.append(KeyComboAction("KP_Enter"))
+sequence.append(KeyComboAction("KP_Enter"))
+sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
+sequence.append(utils.AssertPresentationAction(
+    "2. Status bar",
+    ["BRAILLE LINE:  'Links to test files - Nightly'",
+     "     VISIBLE:  'Links to test files - Nightly', cursor=0",
+     "BRAILLE LINE:  'anchors.html'",
+     "     VISIBLE:  'anchors.html', cursor=1",
+     "BRAILLE LINE:  'anchors.html'",
+     "     VISIBLE:  'anchors.html', cursor=1",
+     "BRAILLE LINE:  'file:///.+/anchors.html'",
+     "     VISIBLE:  'file:///.+', cursor=0",
+     "SPEECH OUTPUT: 'Links to test files - Nightly'",
+     "SPEECH OUTPUT: 'file:///.+/anchors.html'"]))
+
+sequence.append(utils.AssertionSummaryAction())
+sequence.start()



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