[orca/gnome-3-14] New and updated tests

From: Joanmarie Diggs <joanied src gnome org>
To: commits-list gnome org
Cc:
Subject: [orca/gnome-3-14] New and updated tests
Date: Tue, 2 Sep 2014 23:27:34 +0000 (UTC)
commit 764b56839364454d6763a8a39659bdab50937796
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Sep 1 22:13:59 2014 -0400

    New and updated tests

 test/html/link-in-pre.html                         |   14 +
 test/html/words-with-links.html                    |    7 +
 test/keystrokes/firefox/aria_alert.py              |    2 +-
 test/keystrokes/firefox/aria_button_dojo.py        |   12 +-
 test/keystrokes/firefox/aria_checkbox_dojo.py      |   20 +-
 .../firefox/aria_editor_navigation_dojo.py         |    8 +-
 test/keystrokes/firefox/aria_slider_dojo.py        |    8 +-
 test/keystrokes/firefox/aria_slider_uiuc.py        |    4 +-
 test/keystrokes/firefox/aria_spinner_dojo.py       |    4 +-
 test/keystrokes/firefox/aria_tabpanel_uiuc.py      |    4 +-
 test/keystrokes/firefox/aria_toolbar_dojo.py       |  112 +---
 test/keystrokes/firefox/html_role_combo_box.py     |    8 +-
 .../firefox/html_struct_nav_bug_554616.py          |    4 +-
 test/keystrokes/firefox/line_nav_bug_546815.py     |  193 +++----
 test/keystrokes/firefox/line_nav_bug_549128.py     |  124 +++--
 test/keystrokes/firefox/line_nav_bug_552887a.py    |  157 ++++--
 test/keystrokes/firefox/line_nav_bug_554616.py     |   47 ++-
 test/keystrokes/firefox/line_nav_bug_555055.py     |  108 ++---
 test/keystrokes/firefox/line_nav_bug_570757.py     |   18 +-
 test/keystrokes/firefox/line_nav_bug_577239.py     |   14 +-
 .../firefox/line_nav_bug_577979.customizations     |    2 -
 test/keystrokes/firefox/line_nav_bug_577979.py     |   83 ---
 test/keystrokes/firefox/line_nav_bug_592383.py     |   54 ++-
 .../firefox/line_nav_bugzilla_search_down.py       |   84 ++--
 .../firefox/line_nav_bugzilla_search_up.py         |  105 ++--
 test/keystrokes/firefox/line_nav_clickables.py     |   38 +--
 test/keystrokes/firefox/line_nav_empty_anchor.py   |   88 +---
 test/keystrokes/firefox/line_nav_enter_bug.py      |   86 ++--
 test/keystrokes/firefox/line_nav_entries.params    |    1 +
 test/keystrokes/firefox/line_nav_entries.py        |  570 ++++++++++++++++++++
 .../firefox/line_nav_follow_same_page_link.py      |    2 +-
 .../firefox/line_nav_follow_same_page_link_3.py    |    2 +
 .../firefox/line_nav_home_end_on_blank_line.py     |   43 +--
 .../keystrokes/firefox/line_nav_images_in_links.py |  337 ++++--------
 ...tml_role_lists.params => line_nav_lists.params} |    0
 .../{html_role_lists.py => line_nav_lists.py}      |   80 ++--
 test/keystrokes/firefox/line_nav_nested_tables.py  |   34 +-
 test/keystrokes/firefox/line_nav_pre_links.params  |    1 +
 test/keystrokes/firefox/line_nav_pre_links.py      |   91 ++++
 test/keystrokes/firefox/line_nav_simple_form.py    |  125 ++---
 test/keystrokes/firefox/line_nav_slash_test.py     |    7 +-
 test/keystrokes/firefox/line_nav_sun_java.py       |  166 +++----
 .../firefox/line_nav_table_cell_links.py           |   30 +-
 test/keystrokes/firefox/line_nav_twitter_bug.py    |   41 +-
 test/keystrokes/firefox/line_nav_wiki_down.py      |  176 +++---
 test/keystrokes/firefox/line_nav_wiki_up.py        |  289 +++++++----
 test/keystrokes/firefox/word_nav_links.params      |    1 +
 test/keystrokes/firefox/word_nav_links.py          |  138 +++++
 ...ug_577979.params => word_nav_list_items.params} |    0
 test/keystrokes/firefox/word_nav_list_items.py     |   71 +++
 50 files changed, 2105 insertions(+), 1508 deletions(-)
---
diff --git a/test/html/link-in-pre.html b/test/html/link-in-pre.html
new file mode 100644
index 0000000..98df6c0
--- /dev/null
+++ b/test/html/link-in-pre.html
@@ -0,0 +1,14 @@
+<html>
+<body>
+Line 1
+<pre>
+<a href="foo">Line 2</a>
+</pre>
+Line 3
+<pre>
+<a href="foo">Line 4</a>
+</pre>
+Line 5
+</body>
+</html>
+
diff --git a/test/html/words-with-links.html b/test/html/words-with-links.html
new file mode 100644
index 0000000..c6147eb
--- /dev/null
+++ b/test/html/words-with-links.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>Line 1</p>
+<p>Hello <a href="a">W</a><a href="b">o</a><a href="c">r</a><a href="d">l</a>d. Go<a href="foo">odbye 
w</a>orld.</p>
+<p>More <a href="foobar">stuff</a>! Yay!</p>
+</body>
+</html>
diff --git a/test/keystrokes/firefox/aria_alert.py b/test/keystrokes/firefox/aria_alert.py
index a08da86..bb9a601 100644
--- a/test/keystrokes/firefox/aria_alert.py
+++ b/test/keystrokes/firefox/aria_alert.py
@@ -21,7 +21,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Press button",
     ["KNOWN ISSUE: Because the link has focus, we double-present it.",
      "BRAILLE LINE:  'This popup is created as a div in the'",
-     "     VISIBLE:  'This popup is created as a div i', cursor=1",
+     "     VISIBLE:  'This popup is created as a div i', cursor=0",
      "BRAILLE LINE:  'close'",
      "     VISIBLE:  'close', cursor=1",
      "BRAILLE LINE:  'close'",
diff --git a/test/keystrokes/firefox/aria_button_dojo.py b/test/keystrokes/firefox/aria_button_dojo.py
index 28a9e86..dc4a00b 100644
--- a/test/keystrokes/firefox/aria_button_dojo.py
+++ b/test/keystrokes/firefox/aria_button_dojo.py
@@ -10,7 +10,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to the <button> button",
     ["BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button Viewpush button Createsave options push button   Savesave options push button Disabled push button 
push button'",
-     "     VISIBLE:  '<button> push button <input type', cursor=1",
+     "     VISIBLE:  '<button> push button <input type', cursor=0",
      "SPEECH OUTPUT: '<button> push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -18,7 +18,7 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. Basic Where Am I on <button>",
     ["BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button Viewpush button Createsave options push button   Savesave options push button Disabled push button 
push button'",
-     "     VISIBLE:  '<button> push button <input type', cursor=1",
+     "     VISIBLE:  '<button> push button <input type', cursor=0",
      "SPEECH OUTPUT: '<button>'",
      "SPEECH OUTPUT: 'push button'"]))
 
@@ -27,7 +27,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "3. Tab to <input type='button'>",
     ["BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button Viewpush button Createsave options push button   Savesave options push button Disabled push button 
push button'",
-     "     VISIBLE:  '<input type='button'> push butto', cursor=1",
+     "     VISIBLE:  '<button> push button <input type', cursor=0",
      "SPEECH OUTPUT: '<input type='button'> push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -35,7 +35,7 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "4. Basic Where Am I on <input type='button'>",
     ["BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button Viewpush button Createsave options push button   Savesave options push button Disabled push button 
push button'",
-     "     VISIBLE:  '<input type='button'> push butto', cursor=1",
+     "     VISIBLE:  '<button> push button <input type', cursor=0",
      "SPEECH OUTPUT: '<input type='button'>'",
      "SPEECH OUTPUT: 'push button'"]))
 
@@ -77,7 +77,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "9. Tab to drop down menu on Create -- whose tooltip and accessible name is 'save options'",
     ["BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button Viewpush button Createsave options push button   Savesave options push button Disabled push button 
push button'",
-     "     VISIBLE:  'save options push button   Saves', cursor=1",
+     "     VISIBLE:  '<button> push button <input type', cursor=0",
      "SPEECH OUTPUT: 'save options push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -85,7 +85,7 @@ sequence.append(TypeAction(" "))
 sequence.append(utils.AssertPresentationAction(
     "10. Open drop down menu on Create",
     ["BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button Viewpush button Createsave options push button   Savesave options push button Disabled push button 
push button'",
-     "     VISIBLE:  'save options push button   Saves', cursor=1",
+     "     VISIBLE:  '<button> push button save option', cursor=0",
      "BRAILLE LINE:  'Create blank'",
      "     VISIBLE:  'Create blank', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
diff --git a/test/keystrokes/firefox/aria_checkbox_dojo.py b/test/keystrokes/firefox/aria_checkbox_dojo.py
index 6db96c6..dfa6ec8 100644
--- a/test/keystrokes/firefox/aria_checkbox_dojo.py
+++ b/test/keystrokes/firefox/aria_checkbox_dojo.py
@@ -12,7 +12,7 @@ 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 '",
-     "     VISIBLE:  '<x> cb0: Vanilla (non-dojo) chec', cursor=1",
+     "     VISIBLE:  '<x> cb0: Vanilla (non-dojo) chec', cursor=0",
      "SPEECH OUTPUT: 'cb0: Vanilla (non-dojo) checkbox (for comparison purposes) check box checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -20,7 +20,7 @@ sequence.append(TypeAction(" "))
 sequence.append(utils.AssertPresentationAction(
     "2. Change state on cb0 checkbox",
     ["BRAILLE LINE:  '< > cb0: Vanilla (non-dojo) checkbox (for comparison purposes) check box '",
-     "     VISIBLE:  '< > cb0: Vanilla (non-dojo) chec', cursor=1",
+     "     VISIBLE:  '< > cb0: Vanilla (non-dojo) chec', cursor=0",
      "SPEECH OUTPUT: 'not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -28,7 +28,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "3. Tab to the cb1 checkbox",
     ["BRAILLE LINE:  '< > cb1: normal checkbox, with value=foo, clicking generates console log messages 
check box  get('value') push button'",
-     "     VISIBLE:  '< > cb1: normal checkbox, with v', cursor=1",
+     "     VISIBLE:  '< > cb1: normal checkbox, with v', cursor=0",
      "SPEECH OUTPUT: 'cb1: normal checkbox, with value=foo, clicking generates console log messages check 
box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -36,7 +36,7 @@ sequence.append(TypeAction(" "))
 sequence.append(utils.AssertPresentationAction(
     "4. Change state on cb1 checkbox",
     ["BRAILLE LINE:  '<x> cb1: normal checkbox, with value=foo, clicking generates console log messages 
check box  get('value') push button'",
-     "     VISIBLE:  '<x> cb1: normal checkbox, with v', cursor=1",
+     "     VISIBLE:  '<x> cb1: normal checkbox, with v', cursor=0",
      "SPEECH OUTPUT: 'checked'"]))
 
 sequence.append(KeyComboAction("Tab"))
@@ -45,7 +45,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "5. Tab to the cb2 checkbox",
     ["BRAILLE LINE:  '<x> cb2: normal checkbox, with default value, initially turned on. check box  
\"onChange\" handler updates: [] get('value') push button'",
-     "     VISIBLE:  '<x> cb2: normal checkbox, with d', cursor=1",
+     "     VISIBLE:  '<x> cb2: normal checkbox, with d', cursor=0",
      "SPEECH OUTPUT: 'cb2: normal checkbox, with default value, initially turned on. check box checked'"]))
 
 sequence.append(KeyComboAction("Tab"))
@@ -54,7 +54,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "6. Tab to the cb4 checkbox",
     ["BRAILLE LINE:  '<x> cb4: readOnly checkbox, turned on check box '",
-     "     VISIBLE:  '<x> cb4: readOnly checkbox, turn', cursor=1",
+     "     VISIBLE:  '<x> cb4: readOnly checkbox, turn', cursor=0",
      "SPEECH OUTPUT: 'cb4: readOnly checkbox, turned on check box checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -62,7 +62,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "7. Tab to the cb5 checkbox",
     ["BRAILLE LINE:  '< > cb5: normal checkbox, with specified value=\"\", clicking generates console log 
messages check box  get('value') push button'",
-     "     VISIBLE:  '< > cb5: normal checkbox, with s', cursor=1",
+     "     VISIBLE:  '< > cb5: normal checkbox, with s', cursor=0",
      "SPEECH OUTPUT: 'cb5: normal checkbox, with specified value=\"\", clicking generates console log 
messages check box not checked'"]))
 
 sequence.append(KeyComboAction("Tab"))
@@ -71,7 +71,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "8. Tab to the cb6 checkbox",
     ["BRAILLE LINE:  '<x> cb6: instantiated from script check box '",
-     "     VISIBLE:  '<x> cb6: instantiated from scrip', cursor=1",
+     "     VISIBLE:  '<x> cb6: instantiated from scrip', cursor=0",
      "SPEECH OUTPUT: 'cb6: instantiated from script check box checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -79,7 +79,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "9. Tab to the cb7 checkbox",
     ["BRAILLE LINE:  '< > cb7: normal checkbox. check box  disable push button enable push button set value 
to \"fish\" push button Reset value+checked push button \"onChange\" handler updates: []'",
-     "     VISIBLE:  '< > cb7: normal checkbox. check ', cursor=1",
+     "     VISIBLE:  '< > cb7: normal checkbox. check ', cursor=0",
      "SPEECH OUTPUT: 'cb7: normal checkbox. check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -87,7 +87,7 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "10. Basic Where Am I",
     ["BRAILLE LINE:  '< > cb7: normal checkbox. check box  disable push button enable push button set value 
to \"fish\" push button Reset value+checked push button \"onChange\" handler updates: []'",
-     "     VISIBLE:  '< > cb7: normal checkbox. check ', cursor=1",
+     "     VISIBLE:  '< > cb7: normal checkbox. check ', cursor=0",
      "SPEECH OUTPUT: 'cb7: normal checkbox.'",
      "SPEECH OUTPUT: 'check box not checked'"]))
 
diff --git a/test/keystrokes/firefox/aria_editor_navigation_dojo.py 
b/test/keystrokes/firefox/aria_editor_navigation_dojo.py
index e1e82e3..fe7febb 100644
--- a/test/keystrokes/firefox/aria_editor_navigation_dojo.py
+++ b/test/keystrokes/firefox/aria_editor_navigation_dojo.py
@@ -7,12 +7,14 @@ import utils
 
 sequence = MacroSequence()
 
+sequence.append(PauseAction(3000))
+
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "1. Up Arrow in Focus Mode",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1"]))
+     "     VISIBLE:  '', cursor=0"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyPressAction(0, None, "KP_Insert"))
@@ -29,9 +31,9 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "3. Up Arrow in Browse Mode",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
+     "     VISIBLE:  '', cursor=0",
      "BRAILLE LINE:  'editor0 tool bar'",
-     "     VISIBLE:  'editor0 tool bar', cursor=1",
+     "     VISIBLE:  'editor0 tool bar', cursor=0",
      "SPEECH OUTPUT: 'editor0'",
      "SPEECH OUTPUT: 'tool bar'"]))
 
diff --git a/test/keystrokes/firefox/aria_slider_dojo.py b/test/keystrokes/firefox/aria_slider_dojo.py
index 00245f8..f2a82d3 100644
--- a/test/keystrokes/firefox/aria_slider_dojo.py
+++ b/test/keystrokes/firefox/aria_slider_dojo.py
@@ -13,7 +13,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Tab to first slider",
     ["KNOWN ISSUE: Why are we not displaying the value after focus mode?",
      "BRAILLE LINE:  'slider 1 10 slider'",
-     "     VISIBLE:  'slider 1 10 slider', cursor=1",
+     "     VISIBLE:  'slider 1 10 slider', cursor=0",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "SPEECH OUTPUT: 'slider 1 slider 10'",
@@ -25,7 +25,7 @@ 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",
+     "     VISIBLE:  'slider 1 10 slider', cursor=0",
      "BRAILLE LINE:  'slider 1 10.238095238095237 slider'",
      "     VISIBLE:  'slider 1 10.238095238095237 slid', cursor=1",
      "SPEECH OUTPUT: '10.238095238095237'"]))
@@ -82,7 +82,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'Disable previous slider push button'",
      "     VISIBLE:  'Disable previous slider push but', cursor=1",
      "BRAILLE LINE:  'slider 2 10 slider'",
-     "     VISIBLE:  'slider 2 10 slider', cursor=1",
+     "     VISIBLE:  'slider 2 10 slider', cursor=0",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "SPEECH OUTPUT: 'slider 2 slider 10'",
@@ -93,7 +93,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "9. Increment second slider",
     ["BRAILLE LINE:  'slider 2 10 slider'",
-     "     VISIBLE:  'slider 2 10 slider', cursor=1",
+     "     VISIBLE:  'slider 2 10 slider', cursor=0",
      "BRAILLE LINE:  'slider 2 20 slider'",
      "     VISIBLE:  'slider 2 20 slider', cursor=1",
      "SPEECH OUTPUT: '20'"]))
diff --git a/test/keystrokes/firefox/aria_slider_uiuc.py b/test/keystrokes/firefox/aria_slider_uiuc.py
index 75706b7..9a44d68 100644
--- a/test/keystrokes/firefox/aria_slider_uiuc.py
+++ b/test/keystrokes/firefox/aria_slider_uiuc.py
@@ -15,7 +15,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to slider 1",
     ["BRAILLE LINE:  '30 slider'",
-     "     VISIBLE:  '30 slider', cursor=1",
+     "     VISIBLE:  '30 slider', cursor=0",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "SPEECH OUTPUT: 'slider 30'",
@@ -26,7 +26,7 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. Basic whereAmI on slider 1",
     ["BRAILLE LINE:  '30 slider'",
-     "     VISIBLE:  '30 slider', cursor=1",
+     "     VISIBLE:  '30 slider', cursor=0",
      "BRAILLE LINE:  '30 slider'",
      "     VISIBLE:  '30 slider', cursor=1",
      "SPEECH OUTPUT: 'slider 30 30 percent.'"]))
diff --git a/test/keystrokes/firefox/aria_spinner_dojo.py b/test/keystrokes/firefox/aria_spinner_dojo.py
index 01f4054..714be68 100644
--- a/test/keystrokes/firefox/aria_spinner_dojo.py
+++ b/test/keystrokes/firefox/aria_spinner_dojo.py
@@ -13,8 +13,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to the first spinner",
-    ["BRAILLE LINE:  '900 onChange: not fired yet! $l Set value to 400 push button Set value to null push 
button Set required to false push button'",
-     "     VISIBLE:  '900 onChange: not fired yet! $l ', cursor=1",
+    ["BRAILLE LINE:  '900'",
+     "     VISIBLE:  '900', cursor=0",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "BRAILLE LINE:  'Spinbox #1: 900 $l'",
diff --git a/test/keystrokes/firefox/aria_tabpanel_uiuc.py b/test/keystrokes/firefox/aria_tabpanel_uiuc.py
index de923d8..aa688d1 100644
--- a/test/keystrokes/firefox/aria_tabpanel_uiuc.py
+++ b/test/keystrokes/firefox/aria_tabpanel_uiuc.py
@@ -16,7 +16,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Give focus to a widget in the first Tab",
     ["BRAILLE LINE:  '&=y Thick and cheesy radio button'",
-     "     VISIBLE:  '&=y Thick and cheesy radio butto', cursor=1",
+     "     VISIBLE:  '&=y Thick and cheesy radio butto', cursor=0",
      "SPEECH OUTPUT: 'Thick and cheesy selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -91,7 +91,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  '< > Pepperoni check box'",
      "     VISIBLE:  '< > Pepperoni check box', cursor=1",
      "BRAILLE LINE:  '<x> Pepperoni check box'",
-     "     VISIBLE:  '<x> Pepperoni check box', cursor=1",
+     "     VISIBLE:  '<x> Pepperoni check box', cursor=0",
      "SPEECH OUTPUT: 'checked'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/aria_toolbar_dojo.py b/test/keystrokes/firefox/aria_toolbar_dojo.py
index 9047a35..8ac590f 100644
--- a/test/keystrokes/firefox/aria_toolbar_dojo.py
+++ b/test/keystrokes/firefox/aria_toolbar_dojo.py
@@ -7,6 +7,7 @@ import utils
 
 sequence = MacroSequence()
 
+sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("<Control>Home"))
 
 sequence.append(utils.StartRecordingAction())
@@ -31,95 +32,38 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Down Arrow",
-    ["BRAILLE LINE:  'Buttons: '",
-     "     VISIBLE:  'Buttons: ', cursor=1",
-     "SPEECH OUTPUT: 'Buttons: '"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "4. Down Arrow",
-    ["KNOWN ISSUE: These results are not correct here and in the following assertions",
-     "BRAILLE LINE:  'push button'",
-     "     VISIBLE:  'push button', cursor=1",
-     "BRAILLE LINE:  'push button'",
-     "     VISIBLE:  'push button', cursor=1",
-     "SPEECH OUTPUT: 'push button'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Right"))
-sequence.append(utils.AssertPresentationAction(
-    "5. Right Arrow on toolbar",
-    ["BRAILLE LINE:  'push button'",
-     "     VISIBLE:  'push button', cursor=1",
-     "SPEECH OUTPUT: 'push button'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Right"))
-sequence.append(utils.AssertPresentationAction(
-    "6. Right Arrow on toolbar",
-    ["BRAILLE LINE:  'Copy'",
-     "     VISIBLE:  'Copy', cursor=1"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Left"))
-sequence.append(utils.AssertPresentationAction(
-    "7. Left Arrow on toolbar",
-    ["BRAILLE LINE:  'push button'",
-     "     VISIBLE:  'push button', cursor=1",
-     "SPEECH OUTPUT: 'push button'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("End"))
-sequence.append(utils.AssertPresentationAction(
-    "8. End to last widget on toolbar",
-    ["BRAILLE LINE:  'push button'",
-     "     VISIBLE:  'push button', cursor=1",
+    ["KNOWN ISSUE: Whether or not this is the ideal presentation is questionable. But it is more correct 
that what we were doing.",
+     "BRAILLE LINE:  'Buttons: Copy Toggles: Italic Dropdowns: TooltipDialogColorPalette Combos: Menusave 
options push button Menu2 push button save options2 push button'",
+     "     VISIBLE:  'Buttons: Copy Toggles: Italic Dr', cursor=1",
+     "SPEECH OUTPUT: 'Buttons: '",
+     "SPEECH OUTPUT: 'Copy'",
+     "SPEECH OUTPUT: ' Toggles: '",
+     "SPEECH OUTPUT: 'Italic'",
+     "SPEECH OUTPUT: 'push button'",
+     "SPEECH OUTPUT: 'Italic'",
+     "SPEECH OUTPUT: 'push button'",
+     "SPEECH OUTPUT: 'push button'",
+     "SPEECH OUTPUT: 'Dropdowns: '",
+     "SPEECH OUTPUT: ' Combos: '",
+     "SPEECH OUTPUT: 'Menu'",
+     "SPEECH OUTPUT: 'save options'",
+     "SPEECH OUTPUT: 'push button'",
+     "SPEECH OUTPUT: 'text'",
+     "SPEECH OUTPUT: 'clickable'",
+     "SPEECH OUTPUT: 'save options2'",
+     "SPEECH OUTPUT: 'push button'",
+     "SPEECH OUTPUT: 'Ordered list'",
+     "SPEECH OUTPUT: 'push button'",
      "SPEECH OUTPUT: 'push button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "9. Down Arrow",
-    ["BRAILLE LINE:  'Copy'",
-     "     VISIBLE:  'Copy', cursor=1",
-     "SPEECH OUTPUT: 'Copy'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "10. Down Arrow",
-    ["BRAILLE LINE:  'push button'",
-     "     VISIBLE:  'push button', cursor=1",
-     "BRAILLE LINE:  'push button'",
-     "     VISIBLE:  'push button', cursor=1",
-     "SPEECH OUTPUT: 'push button'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "11. Down Arrow",
-    ["BRAILLE LINE:  ' Toggles: '",
-     "     VISIBLE:  ' Toggles: ', cursor=1",
-     "SPEECH OUTPUT: ' Toggles: '"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "12. Down Arrow",
-    ["BRAILLE LINE:  'push button'",
-     "     VISIBLE:  'push button', cursor=1",
-     "BRAILLE LINE:  'push button'",
-     "     VISIBLE:  'push button', cursor=1",
-     "SPEECH OUTPUT: 'push button'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Right"))
-sequence.append(utils.AssertPresentationAction(
-    "13. Right Arrow on toolbar",
-    ["BRAILLE LINE:  'push button'",
-     "     VISIBLE:  'push button', cursor=1",
-     "SPEECH OUTPUT: 'push button'"]))
+    "4. Down Arrow",
+    ["BRAILLE LINE:  'input after toolbar1 $l'",
+     "     VISIBLE:  'input after toolbar1 $l', cursor=1",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'input after toolbar1'"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/firefox/html_role_combo_box.py b/test/keystrokes/firefox/html_role_combo_box.py
index 5c8756e..dbad509 100644
--- a/test/keystrokes/firefox/html_role_combo_box.py
+++ b/test/keystrokes/firefox/html_role_combo_box.py
@@ -14,7 +14,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to Severity combo box",
     ["BRAILLE LINE:  'Severity: Severity normal combo box'",
-     "     VISIBLE:  'Severity normal combo box', cursor=10",
+     "     VISIBLE:  'Severity: Severity normal combo ', cursor=0",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "SPEECH OUTPUT: 'Severity normal combo box'",
@@ -25,7 +25,7 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. Basic Where Am I",
     ["BRAILLE LINE:  'Severity: Severity normal combo box'",
-     "     VISIBLE:  'Severity normal combo box', cursor=10",
+     "     VISIBLE:  'Severity: Severity normal combo ', cursor=0",
      "BRAILLE LINE:  'Severity normal combo box'",
      "     VISIBLE:  'Severity normal combo box', cursor=10",
      "SPEECH OUTPUT: 'Severity'",
@@ -52,7 +52,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "4. Tab to Priority combo box",
     ["BRAILLE LINE:  'Priority: Normal combo box'",
-     "     VISIBLE:  'Priority: Normal combo box', cursor=11",
+     "     VISIBLE:  'Priority: Normal combo box', cursor=0",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "SPEECH OUTPUT: 'Priority: Normal combo box'",
@@ -63,7 +63,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "5. Tab to Resolution combo box",
     ["BRAILLE LINE:  'Priority: Normal combo box'",
-     "     VISIBLE:  'Priority: Normal combo box', cursor=11",
+     "     VISIBLE:  'Priority: Normal combo box', cursor=0",
      "BRAILLE LINE:  'FIXED combo box'",
      "     VISIBLE:  'FIXED combo box', cursor=1",
      "SPEECH OUTPUT: 'Resolution: FIXED combo box'"]))
diff --git a/test/keystrokes/firefox/html_struct_nav_bug_554616.py 
b/test/keystrokes/firefox/html_struct_nav_bug_554616.py
index 5457091..5bb377c 100644
--- a/test/keystrokes/firefox/html_struct_nav_bug_554616.py
+++ b/test/keystrokes/firefox/html_struct_nav_bug_554616.py
@@ -17,8 +17,8 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Wrapping to top.', cursor=0",
      "BRAILLE LINE:  'table with 4 rows 3 columns'",
      "     VISIBLE:  'table with 4 rows 3 columns', cursor=0",
-     "BRAILLE LINE:  'Snapshot version Date (UTC) Download'",
-     "     VISIBLE:  'Snapshot version Date (UTC) Down', cursor=1",
+     "BRAILLE LINE:  'Snapshot version'",
+     "     VISIBLE:  'Snapshot version', cursor=1",
      "SPEECH OUTPUT: 'Wrapping to top.' voice=system",
      "SPEECH OUTPUT: 'table with 4 rows 3 columns' voice=system",
      "SPEECH OUTPUT: 'Snapshot version'",
diff --git a/test/keystrokes/firefox/line_nav_bug_546815.py b/test/keystrokes/firefox/line_nav_bug_546815.py
index 3c3d2d0..eff0231 100644
--- a/test/keystrokes/firefox/line_nav_bug_546815.py
+++ b/test/keystrokes/firefox/line_nav_bug_546815.py
@@ -7,12 +7,14 @@ import utils
 
 sequence = MacroSequence()
 
+sequence.append(PauseAction(3000))
+
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "1. Top of file",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -21,7 +23,6 @@ sequence.append(utils.AssertPresentationAction(
     "2. Line Down",
     ["BRAILLE LINE:  'HTML Form and Widgets'",
      "     VISIBLE:  'HTML Form and Widgets', cursor=1",
-     "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'HTML Form and Widgets",
      "'"]))
 
@@ -29,14 +30,6 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
-    ["BRAILLE LINE:  '",
-     "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "4. Line Down",
     ["BRAILLE LINE:  'Textfield :'",
      "     VISIBLE:  'Textfield :', cursor=1",
      "SPEECH OUTPUT: 'Textfield :'"]))
@@ -44,7 +37,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "5. Line Down",
+    "4. Line Down",
     ["BRAILLE LINE:  'Enter your Name:  $l text field using default type=text'",
      "     VISIBLE:  'Enter your Name:  $l text field ', cursor=1",
      "SPEECH OUTPUT: 'Enter your Name: '",
@@ -54,7 +47,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "6. Line Down",
+    "5. Line Down",
     ["BRAILLE LINE:  '1. Enter your Address:  $l text field using SIZE and'",
      "     VISIBLE:  '1. Enter your Address:  $l text ', cursor=1",
      "SPEECH OUTPUT: '1. Enter your Address: '",
@@ -64,7 +57,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "7. Line Down",
+    "6. Line Down",
     ["BRAILLE LINE:  'MAXLENGTH'",
      "     VISIBLE:  'MAXLENGTH', cursor=1",
      "SPEECH OUTPUT: 'MAXLENGTH'"]))
@@ -72,9 +65,8 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "8. Line Down",
-    ["KNOWN ISSUE: Sometimes we display the 'US'; other times we do not. Seems to be test flakiness.",
-     "BRAILLE LINE:  '2. Enter your City:  $l 3. Enter your State:  $l 4. Enter your Country: US $l image 
text field using'",
+    "7. Line Down",
+    ["BRAILLE LINE:  '2. Enter your City:  $l 3. Enter your State:  $l 4. Enter your Country: US $l image 
text field using'",
      "     VISIBLE:  '2. Enter your City:  $l 3. Enter', cursor=1",
      "SPEECH OUTPUT: '2. Enter your City: '",
      "SPEECH OUTPUT: 'entry'",
@@ -89,7 +81,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:  'value'",
      "     VISIBLE:  'value', cursor=1",
      "SPEECH OUTPUT: 'value'"]))
@@ -97,7 +89,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "10. Line Down",
+    "9. Line Down",
     ["BRAILLE LINE:  '5. Enter your Zip:  $l'",
      "     VISIBLE:  '5. Enter your Zip:  $l', cursor=1",
      "SPEECH OUTPUT: '5. Enter your Zip: '",
@@ -106,7 +98,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "11. Line Down",
+    "10. Line Down",
     ["BRAILLE LINE:  '6. What happens when a fixed-width font(the default) is used for a one-byte text input 
area, let's try it.. Enter one'",
      "     VISIBLE:  '6. What happens when a fixed-wid', cursor=1",
      "SPEECH OUTPUT: '6. What happens when a fixed-width font(the default) is used for a one-byte text input 
area, let's try it.. Enter one '"]))
@@ -114,7 +106,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:  'character:  $l'",
      "     VISIBLE:  'character:  $l', cursor=1",
      "SPEECH OUTPUT: 'character: '",
@@ -123,24 +115,23 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "13. Line Down",
+    "12. Line Down",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "14. Line Down",
-    ["KNOWN ISSUE: Why is the checkbox all by itself?",
-     "BRAILLE LINE:  ' CheckBox:'",
+    "13. Line Down",
+    ["BRAILLE LINE:  ' CheckBox:'",
      "     VISIBLE:  ' CheckBox:', cursor=1",
      "SPEECH OUTPUT: ' CheckBox:'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "15. Line Down",
+    "14. Line Down",
     ["BRAILLE LINE:  'What are your favorite pets? h2'",
      "     VISIBLE:  'What are your favorite pets? h2', cursor=1",
      "SPEECH OUTPUT: 'What are your favorite pets?'",
@@ -149,9 +140,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "16. Line Down",
+    "15. Line Down",
     ["BRAILLE LINE:  '< > check box bird'",
-     "     VISIBLE:  '< > check box bird', cursor=1",
+     "     VISIBLE:  '< > check box bird', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: 'bird ",
@@ -160,9 +151,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "17. Line Down",
+    "16. Line Down",
     ["BRAILLE LINE:  '< > check box fish'",
-     "     VISIBLE:  '< > check box fish', cursor=1",
+     "     VISIBLE:  '< > check box fish', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: 'fish ",
@@ -171,36 +162,26 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "18. Line Down",
-    ["KNOWN ISSUE: We're treating the separator as if it were on this line",
-     "BRAILLE LINE:  '< > check box wild animal separator'",
-     "     VISIBLE:  '< > check box wild animal separa', cursor=1",
+    "17. Line Down",
+    ["BRAILLE LINE:  '< > check box wild animal'",
+     "     VISIBLE:  '< > check box wild animal', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: 'wild animal ",
-     "'",
-     "SPEECH OUTPUT: 'separator'"]))
+     "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "19. Line Down",
+    "18. Line Down",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "20. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "21. Line Down",
+    "19. Line Down",
     ["BRAILLE LINE:  'Radio Buttons:'",
      "     VISIBLE:  'Radio Buttons:', cursor=1",
      "SPEECH OUTPUT: 'Radio Buttons:'"]))
@@ -208,7 +189,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:  'Would type of wine do you like? h2'",
      "     VISIBLE:  'Would type of wine do you like? ', cursor=1",
      "SPEECH OUTPUT: 'Would type of wine do you like?'",
@@ -217,10 +198,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "23. Line Down",
-    ["KNOWN ISSUE: We are combining lines here.",
-     "BRAILLE LINE:  '&=y radio button cabernet sauvignon'",
-     "     VISIBLE:  '&=y radio button cabernet sauvig', cursor=1",
+    "22. Line Down",
+    ["BRAILLE LINE:  '&=y radio button cabernet sauvignon'",
+     "     VISIBLE:  '&=y radio button cabernet sauvig', cursor=0",
      "SPEECH OUTPUT: 'selected'",
      "SPEECH OUTPUT: 'radio button'",
      "SPEECH OUTPUT: 'cabernet sauvignon ",
@@ -229,9 +209,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "24. Line Down",
+    "23. Line Down",
     ["BRAILLE LINE:  '& y radio button merlot'",
-     "     VISIBLE:  '& y radio button merlot', cursor=1",
+     "     VISIBLE:  '& y radio button merlot', cursor=0",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'",
      "SPEECH OUTPUT: 'merlot ",
@@ -240,9 +220,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "25. Line Down",
+    "24. Line Down",
     ["BRAILLE LINE:  '& y radio button nebbiolo'",
-     "     VISIBLE:  '& y radio button nebbiolo', cursor=1",
+     "     VISIBLE:  '& y radio button nebbiolo', cursor=0",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'",
      "SPEECH OUTPUT: 'nebbiolo ",
@@ -251,9 +231,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "26. Line Down",
+    "25. Line Down",
     ["BRAILLE LINE:  '& y radio button pinot noir'",
-     "     VISIBLE:  '& y radio button pinot noir', cursor=1",
+     "     VISIBLE:  '& y radio button pinot noir', cursor=0",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'",
      "SPEECH OUTPUT: 'pinot noir ",
@@ -262,9 +242,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "27. Line Down",
+    "26. Line Down",
     ["BRAILLE LINE:  '& y radio button don't drink wine'",
-     "     VISIBLE:  '& y radio button don't drink win', cursor=1",
+     "     VISIBLE:  '& y radio button don't drink win', cursor=0",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'",
      "SPEECH OUTPUT: 'don't drink wine '"]))
@@ -272,10 +252,10 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "28. Line Up",
+    "27. Line Up",
     ["KNOWN ISSUE: We're repeating things here and in the next few tests which we should not be",
      "BRAILLE LINE:  '& y radio button pinot noir'",
-     "     VISIBLE:  '& y radio button pinot noir', cursor=1",
+     "     VISIBLE:  '& y radio button pinot noir', cursor=0",
      "SPEECH OUTPUT: 'pinot noir'",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'",
@@ -285,9 +265,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "29. Line Up",
+    "28. Line Up",
     ["BRAILLE LINE:  '& y radio button nebbiolo'",
-     "     VISIBLE:  '& y radio button nebbiolo', cursor=1",
+     "     VISIBLE:  '& y radio button nebbiolo', cursor=0",
      "SPEECH OUTPUT: 'nebbiolo'",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'",
@@ -297,9 +277,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "30. Line Up",
+    "29. Line Up",
     ["BRAILLE LINE:  '& y radio button merlot'",
-     "     VISIBLE:  '& y radio button merlot', cursor=1",
+     "     VISIBLE:  '& y radio button merlot', cursor=0",
      "SPEECH OUTPUT: 'merlot'",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'",
@@ -309,9 +289,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "31. Line Up",
+    "30. Line Up",
     ["BRAILLE LINE:  '&=y radio button cabernet sauvignon'",
-     "     VISIBLE:  '&=y radio button cabernet sauvig', cursor=1",
+     "     VISIBLE:  '&=y radio button cabernet sauvig', cursor=0",
      "SPEECH OUTPUT: 'selected'",
      "SPEECH OUTPUT: 'radio button'",
      "SPEECH OUTPUT: 'cabernet sauvignon ",
@@ -320,7 +300,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:  'Would type of wine do you like? h2'",
      "     VISIBLE:  'Would type of wine do you like? ', cursor=1",
      "SPEECH OUTPUT: 'Would type of wine do you like?'",
@@ -329,7 +309,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:  'Radio Buttons:'",
      "     VISIBLE:  'Radio Buttons:', cursor=1",
      "SPEECH OUTPUT: 'Radio Buttons:'"]))
@@ -337,26 +317,17 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "34. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "35. Line Up",
-    ["BRAILLE LINE:  'separator",
-     "     VISIBLE:  'separator', cursor=1",
+    "33. Line Up",
+    ["BRAILLE LINE:  'separator'",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "36. Line Up",
-    ["KNOWN ISSUE: We're treating the separator as if it were on this line",
-     "BRAILLE LINE:  '< > check box wild animal separator'",
-     "     VISIBLE:  '< > check box wild animal separa', cursor=1",
+    "34. Line Up",
+    ["BRAILLE LINE:  '< > check box wild animal'",
+     "     VISIBLE:  '< > check box wild animal', cursor=0",
      "SPEECH OUTPUT: 'wild animal'",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
@@ -367,9 +338,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "37. Line Up",
+    "35. Line Up",
     ["BRAILLE LINE:  '< > check box fish'",
-     "     VISIBLE:  '< > check box fish', cursor=1",
+     "     VISIBLE:  '< > check box fish', cursor=0",
      "SPEECH OUTPUT: 'fish'",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
@@ -379,10 +350,10 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "38. Line Up",
+    "36. Line Up",
     ["KNOWN ISSUE: This isn't quite right",
      "BRAILLE LINE:  '< > check box bird'",
-     "     VISIBLE:  '< > check box bird', cursor=1",
+     "     VISIBLE:  '< > check box bird', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: 'bird ",
@@ -391,7 +362,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "39. Line Up",
+    "37. Line Up",
     ["BRAILLE LINE:  'What are your favorite pets? h2'",
      "     VISIBLE:  'What are your favorite pets? h2', cursor=1",
      "SPEECH OUTPUT: 'What are your favorite pets?'",
@@ -400,24 +371,23 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "40. Line Up",
-    ["KNOWN ISSUE: Why is the checkbox all by itself?",
-     "BRAILLE LINE:  ' CheckBox:'",
+    "38. Line Up",
+    ["BRAILLE LINE:  ' CheckBox:'",
      "     VISIBLE:  ' CheckBox:', cursor=1",
      "SPEECH OUTPUT: ' CheckBox:'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "41. Line Up",
+    "39. Line Up",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "42. Line Up",
+    "40. Line Up",
     ["BRAILLE LINE:  'character:  $l'",
      "     VISIBLE:  'character:  $l', cursor=1",
      "SPEECH OUTPUT: 'character: '",
@@ -426,7 +396,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "43. Line Up",
+    "41. Line Up",
     ["BRAILLE LINE:  '6. What happens when a fixed-width font(the default) is used for a one-byte text input 
area, let's try it.. Enter one'",
      "     VISIBLE:  '6. What happens when a fixed-wid', cursor=1",
      "SPEECH OUTPUT: '6. What happens when a fixed-width font(the default) is used for a one-byte text input 
area, let's try it.. Enter one '"]))
@@ -434,7 +404,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "44. Line Up",
+    "42. Line Up",
     ["BRAILLE LINE:  '5. Enter your Zip:  $l'",
      "     VISIBLE:  '5. Enter your Zip:  $l', cursor=1",
      "SPEECH OUTPUT: '5. Enter your Zip: '",
@@ -443,7 +413,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:  'value'",
      "     VISIBLE:  'value', cursor=1",
      "SPEECH OUTPUT: 'value'"]))
@@ -451,7 +421,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:  '2. Enter your City:  $l 3. Enter your State:  $l 4. Enter your Country: US $l image 
text field using'",
      "     VISIBLE:  '2. Enter your City:  $l 3. Enter', cursor=1",
      "SPEECH OUTPUT: '2. Enter your City: '",
@@ -467,7 +437,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:  'MAXLENGTH'",
      "     VISIBLE:  'MAXLENGTH', cursor=1",
      "SPEECH OUTPUT: 'MAXLENGTH'"]))
@@ -475,7 +445,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "48. Line Up",
+    "46. Line Up",
     ["BRAILLE LINE:  '1. Enter your Address:  $l text field using SIZE and'",
      "     VISIBLE:  '1. Enter your Address:  $l text ', cursor=1",
      "SPEECH OUTPUT: '1. Enter your Address: '",
@@ -485,7 +455,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "49. Line Up",
+    "47. Line Up",
     ["BRAILLE LINE:  'Enter your Name:  $l text field using default type=text'",
      "     VISIBLE:  'Enter your Name:  $l text field ', cursor=1",
      "SPEECH OUTPUT: 'Enter your Name: '",
@@ -495,7 +465,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "50. Line Up",
+    "48. Line Up",
     ["BRAILLE LINE:  'Textfield :'",
      "     VISIBLE:  'Textfield :', cursor=1",
      "SPEECH OUTPUT: 'Textfield :'"]))
@@ -503,27 +473,18 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "51. Line Up",
-    ["BRAILLE LINE:  '",
-     "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "52. Line Up",
+    "49. Line Up",
     ["BRAILLE LINE:  'HTML Form and Widgets'",
      "     VISIBLE:  'HTML Form and Widgets', cursor=1",
-     "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'HTML Form and Widgets",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "53. Line Up",
+    "50. Line Up",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/line_nav_bug_549128.py b/test/keystrokes/firefox/line_nav_bug_549128.py
index 5856cf6..6bf9050 100644
--- a/test/keystrokes/firefox/line_nav_bug_549128.py
+++ b/test/keystrokes/firefox/line_nav_bug_549128.py
@@ -20,7 +20,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Down",
     ["BRAILLE LINE:  'image'",
-     "     VISIBLE:  'image', cursor=1",
+     "     VISIBLE:  'image', cursor=0",
      "SPEECH OUTPUT: 'image'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -37,7 +37,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
     ["BRAILLE LINE:  'image'",
-     "     VISIBLE:  'image', cursor=1",
+     "     VISIBLE:  'image', cursor=0",
      "SPEECH OUTPUT: 'image'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -55,66 +55,70 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Down",
-    ["KNOWN ISSUE: There is currently a Gecko bug or two that make the results get odd/off around here.",
-     "BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=0",
-     "SPEECH OUTPUT: 'blank'"]))
+    ["KNOWN ISSUE: The new smarts for hacking around Gecko AtkText bugs hasn't yet been given to braille.",
+     "BRAILLE LINE:  '\xa0'",
+     "     VISIBLE:  '\xa0', cursor=1",
+     "SPEECH OUTPUT: '\xa0'",
+     "SPEECH OUTPUT: '2 (5 oz.) Filet Mignons",
+     "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "7. Line Down",
-    ["BRAILLE LINE:  '  2 (5 oz.) Filet Mignons'",
-     "     VISIBLE:  '  2 (5 oz.) Filet Mignons', cursor=0",
-     "SPEECH OUTPUT: '  2 (5 oz.) Filet Mignons",
+    ["BRAILLE LINE:  '\xa0'",
+     "     VISIBLE:  '\xa0', cursor=1",
+     "SPEECH OUTPUT: '\xa0'",
+     "SPEECH OUTPUT: '2 (5 oz.) Top Sirloins",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "8. Line Down",
-    ["BRAILLE LINE:  '  2 (5 oz.) Top Sirloins'",
-     "     VISIBLE:  '  2 (5 oz.) Top Sirloins', cursor=0",
-     "SPEECH OUTPUT: '  2 (5 oz.) Top Sirloins",
+    ["BRAILLE LINE:  '\xa0'",
+     "     VISIBLE:  '\xa0', cursor=1",
+     "SPEECH OUTPUT: '\xa0'",
+     "SPEECH OUTPUT: '4 (4 oz.) Foobar Steaks Burgers",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "9. Line Down",
-    ["BRAILLE LINE:  '  4 (4 oz.) Foobar Steaks Burgers'",
-     "     VISIBLE:  '  4 (4 oz.) Foobar Steaks Burger', cursor=0",
-     "SPEECH OUTPUT: '  4 (4 oz.) Foobar Steaks Burgers",
+    ["BRAILLE LINE:  '\xa0'",
+     "     VISIBLE:  '\xa0', cursor=1",
+     "SPEECH OUTPUT: '\xa0'",
+     "SPEECH OUTPUT: '6 (5.75 oz.) Stuffed Baked Potatoes",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "10. Line Down",
-    ["BRAILLE LINE:  '  6 (5.75 oz.) Stuffed Baked Potatoes'",
-     "     VISIBLE:  '  6 (5.75 oz.) Stuffed Baked Pot', cursor=0",
-     "SPEECH OUTPUT: '  6 (5.75 oz.) Stuffed Baked Potatoes",
+    ["BRAILLE LINE:  '\xa0'",
+     "     VISIBLE:  '\xa0', cursor=1",
+     "SPEECH OUTPUT: '\xa0'",
+     "SPEECH OUTPUT: '2 (4.5 oz.) Stuffed Sole with Scallops and Crab",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "11. Line Down",
-    ["BRAILLE LINE:  '  2 (4.5 oz.) Stuffed Sole with Scallops and Crab'",
-     "     VISIBLE:  '  2 (4.5 oz.) Stuffed Sole with ', cursor=0",
-     "SPEECH OUTPUT: '  2 (4.5 oz.) Stuffed Sole with Scallops and Crab",
+    ["BRAILLE LINE:  '\xa0'",
+     "     VISIBLE:  '\xa0', cursor=1",
+     "SPEECH OUTPUT: '\xa0'",
+     "SPEECH OUTPUT: '1 (6 in.) Chocolate Lover's Cake",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "12. Line Down",
-    ["BRAILLE LINE:  '  1 (6 in.) Chocolate Lover's Cake",
-     "Regular $133.00, Now $59.99'",
-     "     VISIBLE:  '(6 in.) Chocolate Lover's Cake",
-     "R', cursor=32",
-     "SPEECH OUTPUT: '  1 (6 in.) Chocolate Lover's Cake",
-     "Regular $133.00, Now $59.99",
+    ["BRAILLE LINE:  'Regular $133.00, Now $59.99'",
+     "     VISIBLE:  'Regular $133.00, Now $59.99', cursor=1",
+     "SPEECH OUTPUT: 'Regular $133.00, Now $59.99",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -127,33 +131,67 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "14. Line Up",
-    ["KNOWN ISSUE: We skip lines on the way up so the results which follow are broken.",
-     "BRAILLE LINE:  '  6 (5.75 oz.) Stuffed Baked Potatoes'",
-     "     VISIBLE:  '  6 (5.75 oz.) Stuffed Baked Pot', cursor=0",
-     "SPEECH OUTPUT: '  6 (5.75 oz.) Stuffed Baked Potatoes",
+    ["KNOWN ISSUE: The new smarts for hacking around Gecko AtkText bugs hasn't yet been given to braille.",
+     "BRAILLE LINE:  '\xa0'",
+     "     VISIBLE:  '\xa0', cursor=1",
+     "SPEECH OUTPUT: '\xa0'",
+     "SPEECH OUTPUT: '1 (6 in.) Chocolate Lover's Cake",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "15. Line Up",
-    ["BRAILLE LINE:  '  2 (5 oz.) Top Sirloins'",
-     "     VISIBLE:  '  2 (5 oz.) Top Sirloins', cursor=0",
-     "SPEECH OUTPUT: '  2 (5 oz.) Top Sirloins",
+    ["BRAILLE LINE:  '\xa0'",
+     "     VISIBLE:  '\xa0', cursor=1",
+     "SPEECH OUTPUT: '\xa0'",
+     "SPEECH OUTPUT: '2 (4.5 oz.) Stuffed Sole with Scallops and Crab",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "16. Line Up",
-    ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=0",
-     "SPEECH OUTPUT: 'blank'"]))
+    ["BRAILLE LINE:  '\xa0'",
+     "     VISIBLE:  '\xa0', cursor=1",
+     "SPEECH OUTPUT: '\xa0'",
+     "SPEECH OUTPUT: '6 (5.75 oz.) Stuffed Baked Potatoes",
+     "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "17. Line Up",
+    ["BRAILLE LINE:  '\xa0'",
+     "     VISIBLE:  '\xa0', cursor=1",
+     "SPEECH OUTPUT: '\xa0'",
+     "SPEECH OUTPUT: '4 (4 oz.) Foobar Steaks Burgers",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "18. Line Up",
+    ["BRAILLE LINE:  '\xa0'",
+     "     VISIBLE:  '\xa0', cursor=1",
+     "SPEECH OUTPUT: '\xa0'",
+     "SPEECH OUTPUT: '2 (5 oz.) Top Sirloins",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "19. Line Up",
+    ["BRAILLE LINE:  '\xa0'",
+     "     VISIBLE:  '\xa0', cursor=1",
+     "SPEECH OUTPUT: '\xa0'",
+     "SPEECH OUTPUT: '2 (5 oz.) Filet Mignons",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "20. Line Up",
     ["BRAILLE LINE:  'The Ideal Gift Collection'",
      "     VISIBLE:  'The Ideal Gift Collection', cursor=1",
      "SPEECH OUTPUT: 'The Ideal Gift Collection'",
@@ -164,15 +202,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "18. Line Up",
+    "21. Line Up",
     ["BRAILLE LINE:  'image'",
-     "     VISIBLE:  'image', cursor=1",
+     "     VISIBLE:  'image', cursor=0",
      "SPEECH OUTPUT: 'image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "19. Line Up",
+    "22. Line Up",
     ["BRAILLE LINE:  'Shop Early - Deliver Later'",
      "     VISIBLE:  'Shop Early - Deliver Later', cursor=1",
      "SPEECH OUTPUT: 'Shop Early - Deliver Later",
@@ -181,15 +219,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "20. Line Up",
+    "23. Line Up",
     ["BRAILLE LINE:  'image'",
-     "     VISIBLE:  'image', cursor=1",
+     "     VISIBLE:  'image', cursor=0",
      "SPEECH OUTPUT: 'image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "21. Line Up",
+    "24. Line Up",
     ["BRAILLE LINE:  'Holiday Gift Giving'",
      "     VISIBLE:  'Holiday Gift Giving', cursor=1",
      "SPEECH OUTPUT: 'Holiday Gift Giving'"]))
diff --git a/test/keystrokes/firefox/line_nav_bug_552887a.py b/test/keystrokes/firefox/line_nav_bug_552887a.py
index d77a0b6..0bfd602 100644
--- a/test/keystrokes/firefox/line_nav_bug_552887a.py
+++ b/test/keystrokes/firefox/line_nav_bug_552887a.py
@@ -28,10 +28,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
-    ["BRAILLE LINE:  'Line 1 Line 2 h2'",
-     "     VISIBLE:  'Line 1 Line 2 h2', cursor=8",
-     "SPEECH OUTPUT: 'Line 1",
-     "'",
+    ["BRAILLE LINE:  'Line 2 h2'",
+     "     VISIBLE:  'Line 2 h2', cursor=1",
      "SPEECH OUTPUT: 'Line 2'",
      "SPEECH OUTPUT: 'heading level 2'"]))
 
@@ -49,7 +47,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Line Down",
     ["BRAILLE LINE:  'The Orca logo image'",
-     "     VISIBLE:  'The Orca logo image', cursor=1",
+     "     VISIBLE:  'The Orca logo image', cursor=0",
      "SPEECH OUTPUT: 'The Orca logo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
@@ -79,9 +77,9 @@ 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 '"]))
+    ["BRAILLE LINE:  '\(And why aren't we'",
+     "     VISIBLE:  '\(And why aren't we', cursor=1",
+     "SPEECH OUTPUT: '\(And why aren't we '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -95,23 +93,6 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "10. Line Down",
-    ["BRAILLE LINE:  'The Orca logo image'",
-     "     VISIBLE:  'The Orca logo image', cursor=20",
-     "SPEECH OUTPUT: 'The Orca logo'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'Hey, look, it's our logo!'",
-     "SPEECH OUTPUT: '",
-     "'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: '",
-     "'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "11. Line Down",
     ["BRAILLE LINE:  'This text comes before the box section'",
      "     VISIBLE:  'This text comes before the box s', cursor=1",
      "SPEECH OUTPUT: 'This text comes before the box section",
@@ -120,23 +101,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "12. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "13. Line Down",
+    "11. Line Down",
     ["BRAILLE LINE:  'image'",
-     "     VISIBLE:  'image', cursor=1",
+     "     VISIBLE:  'image', cursor=0",
      "SPEECH OUTPUT: 'image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "14. Line Down",
+    "12. Line Down",
     ["BRAILLE LINE:  'Here's a box'",
      "     VISIBLE:  'Here's a box', cursor=1",
      "SPEECH OUTPUT: 'Here's a box'"]))
@@ -144,7 +117,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "15. Line Down",
+    "13. Line Down",
     ["BRAILLE LINE:  'Here's some box text.'",
      "     VISIBLE:  'Here's some box text.', cursor=1",
      "SPEECH OUTPUT: 'Here's some box text.'"]))
@@ -152,7 +125,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "16. Line Down",
+    "14. Line Down",
     ["BRAILLE LINE:  'The end of the box'",
      "     VISIBLE:  'The end of the box', cursor=1",
      "SPEECH OUTPUT: 'The end of the box'"]))
@@ -160,16 +133,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "17. Line Down",
-    ["BRAILLE LINE:  'image This text comes after'",
-     "     VISIBLE:  'image This text comes after', cursor=7",\
-     "SPEECH OUTPUT: 'image'",
+    "15. Line Down",
+    ["BRAILLE LINE:  'This text comes after'",
+     "     VISIBLE:  'This text comes after', cursor=1",
      "SPEECH OUTPUT: 'This text comes after '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "18. Line Down",
+    "16. Line Down",
     ["BRAILLE LINE:  'the box section.'",
      "     VISIBLE:  'the box section.', cursor=1",
      "SPEECH OUTPUT: 'the box section.",
@@ -178,15 +150,47 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
+    "17. Line Up",
+    ["BRAILLE LINE:  'This text comes after'",
+     "     VISIBLE:  'This text comes after', cursor=1",
+     "SPEECH OUTPUT: 'This text comes after '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "18. Line Up",
+    ["BRAILLE LINE:  'The end of the box'",
+     "     VISIBLE:  'The end of the box', cursor=1",
+     "SPEECH OUTPUT: 'The end of the box'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
     "19. Line Up",
+    ["BRAILLE LINE:  'Here's some box text.'",
+     "     VISIBLE:  'Here's some box text.', cursor=1",
+     "SPEECH OUTPUT: 'Here's some box text.'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "20. Line Up",
+    ["BRAILLE LINE:  'Here's a box'",
+     "     VISIBLE:  'Here's a box', cursor=1",
+     "SPEECH OUTPUT: 'Here's a box'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "21. Line Up",
     ["BRAILLE LINE:  'image'",
-     "     VISIBLE:  'image', cursor=1",
+     "     VISIBLE:  'image', cursor=0",
      "SPEECH OUTPUT: 'image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "20. Line Up",
+    "22. Line Up",
     ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
@@ -194,7 +198,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "21. Line Up",
+    "23. Line Up",
     ["BRAILLE LINE:  'This text comes before the box section'",
      "     VISIBLE:  'This text comes before the box s', cursor=1",
      "SPEECH OUTPUT: 'This text comes before the box section",
@@ -203,9 +207,41 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "22. Line Up",
+    "24. Line Up",
+    ["BRAILLE LINE:  'speaking this text?'",
+     "     VISIBLE:  'speaking this text?', cursor=1",
+     "SPEECH OUTPUT: 'speaking this text?'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "25. Line Up",
+    ["BRAILLE LINE:  '\(And why aren't we'",
+     "     VISIBLE:  '\(And why aren't we', cursor=1",
+     "SPEECH OUTPUT: '\(And why aren't we '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "26. Line Up",
+    ["BRAILLE LINE:  'hold a white cane?'",
+     "     VISIBLE:  'hold a white cane?', cursor=1",
+     "SPEECH OUTPUT: 'hold a white cane? '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "27. Line Up",
+    ["BRAILLE LINE:  'Can an Orca really'",
+     "     VISIBLE:  'Can an Orca really', cursor=1",
+     "SPEECH OUTPUT: 'Can an Orca really '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "28. Line Up",
     ["BRAILLE LINE:  'The Orca logo image'",
-     "     VISIBLE:  'The Orca logo image', cursor=1",
+     "     VISIBLE:  'The Orca logo image', cursor=0",
      "SPEECH OUTPUT: 'The Orca logo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
@@ -218,7 +254,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "23. Line Up",
+    "29. Line Up",
     ["BRAILLE LINE:  'Line 3'",
      "     VISIBLE:  'Line 3', cursor=1",
      "SPEECH OUTPUT: 'Line 3",
@@ -227,17 +263,28 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "24. Line Up",
-    ["KNOWN ISSUE: On the way up, we skip the 'Line 2' text.",
-     "BRAILLE LINE:  'Line 1'",
-     "     VISIBLE:  'Line 1', cursor=1",
+    "30. Line Up",
+    ["BRAILLE LINE:  'Line 2 h2'",
+     "     VISIBLE:  'Line 2 h2', cursor=1",
+     "SPEECH OUTPUT: 'Line 2'",
+     "SPEECH OUTPUT: 'heading level 2'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "31. Line Up",
+    ["KNOWN ISSUE: We're presenting these together on the way up",
+     "BRAILLE LINE:  'Line 1 Line 2 h2'",
+     "     VISIBLE:  'Line 1 Line 2 h2', cursor=1",
      "SPEECH OUTPUT: 'Line 1",
-     "'"]))
+     "'",
+     "SPEECH OUTPUT: 'Line 2'",
+     "SPEECH OUTPUT: 'heading level 2'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "25. Line Up",
+    "32. Line Up",
     ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
diff --git a/test/keystrokes/firefox/line_nav_bug_554616.py b/test/keystrokes/firefox/line_nav_bug_554616.py
index d3700e7..82532e9 100644
--- a/test/keystrokes/firefox/line_nav_bug_554616.py
+++ b/test/keystrokes/firefox/line_nav_bug_554616.py
@@ -8,11 +8,23 @@ import utils
 sequence = MacroSequence()
 
 sequence.append(KeyComboAction("<Control>Home"))
-
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Line Down",
+    ["BRAILLE LINE:  'Snapshot version Date (UTC) Download'",
+     "     VISIBLE:  'Snapshot version Date (UTC) Down', cursor=1",
+     "SPEECH OUTPUT: 'Snapshot version'",
+     "SPEECH OUTPUT: 'column header'",
+     "SPEECH OUTPUT: 'Date (UTC)'",
+     "SPEECH OUTPUT: 'column header'",
+     "SPEECH OUTPUT: 'Download'",
+     "SPEECH OUTPUT: 'column header'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "2. Line Down",
     ["BRAILLE LINE:  'r2477 Wed Nov 5 16:39:00 2008'",
      "     VISIBLE:  'r2477 Wed Nov 5 16:39:00 2008', cursor=1",
      "SPEECH OUTPUT: 'r2477'",
@@ -21,7 +33,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "2. Line Down",
+    "3. Line Down",
     ["BRAILLE LINE:  'installer (10190 KB)'",
      "     VISIBLE:  'installer (10190 KB)', cursor=1",
      "SPEECH OUTPUT: 'installer'",
@@ -32,7 +44,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "3. Line Down",
+    "4. Line Down",
     ["BRAILLE LINE:  'portable archive (9154 KB)'",
      "     VISIBLE:  'portable archive (9154 KB)', cursor=1",
      "SPEECH OUTPUT: 'portable archive'",
@@ -42,7 +54,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "4. Line Down",
+    "5. Line Down",
     ["BRAILLE LINE:  'r2468 Tue Nov 4 16:39:02 2008'",
      "     VISIBLE:  'r2468 Tue Nov 4 16:39:02 2008', cursor=1",
      "SPEECH OUTPUT: 'r2468'",
@@ -51,7 +63,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "5. Line Down",
+    "6. Line Down",
     ["BRAILLE LINE:  'installer (10193 KB)'",
      "     VISIBLE:  'installer (10193 KB)', cursor=1",
      "SPEECH OUTPUT: 'installer'",
@@ -62,7 +74,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "6. Line Down",
+    "7. Line Down",
     ["BRAILLE LINE:  'portable archive (9149 KB)'",
      "     VISIBLE:  'portable archive (9149 KB)', cursor=1",
      "SPEECH OUTPUT: 'portable archive'",
@@ -72,12 +84,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "7. Line Up",
-    ["KNOWN ISSUE: We are skipping bits on the way up",
-     "BRAILLE LINE:  'r2468 Tue Nov 4 16:39:02 2008'",
-     "     VISIBLE:  'r2468 Tue Nov 4 16:39:02 2008', cursor=1",
+    "8. Line Up",
+    ["BRAILLE LINE:  'r2468 Tue Nov 4 16:39:02 2008 installer (10193 KB)'",
+     "     VISIBLE:  'r2468 Tue Nov 4 16:39:02 2008 in', cursor=1",
      "SPEECH OUTPUT: 'r2468'",
-     "SPEECH OUTPUT: 'Tue Nov 4 16:39:02 2008'"]))
+     "SPEECH OUTPUT: 'Tue Nov 4 16:39:02 2008'",
+     "SPEECH OUTPUT: 'installer'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: ' (10193 KB)",
+     "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -93,10 +108,14 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "9. Line Up",
-    ["BRAILLE LINE:  'r2477 Wed Nov 5 16:39:00 2008'",
-     "     VISIBLE:  'r2477 Wed Nov 5 16:39:00 2008', cursor=1",
+    ["BRAILLE LINE:  'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)'",
+     "     VISIBLE:  'r2477 Wed Nov 5 16:39:00 2008 in', cursor=1",
      "SPEECH OUTPUT: 'r2477'",
-     "SPEECH OUTPUT: 'Wed Nov 5 16:39:00 2008'"]))
+     "SPEECH OUTPUT: 'Wed Nov 5 16:39:00 2008'",
+     "SPEECH OUTPUT: 'installer'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: ' (10190 KB)",
+     "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_bug_555055.py b/test/keystrokes/firefox/line_nav_bug_555055.py
index 7c61f67..d05753b 100644
--- a/test/keystrokes/firefox/line_nav_bug_555055.py
+++ b/test/keystrokes/firefox/line_nav_bug_555055.py
@@ -21,16 +21,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Down",
-    ["BRAILLE LINE:  ' '",
-     "     VISIBLE:  ' ', cursor=1",
-     "SPEECH OUTPUT: ' '"]))
+    ["BRAILLE LINE:  'image'",
+     "     VISIBLE:  'image', cursor=0",
+     "SPEECH OUTPUT: 'image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
     ["BRAILLE LINE:  'image'",
-     "     VISIBLE:  'image', cursor=1",
+     "     VISIBLE:  'image', cursor=0",
      "SPEECH OUTPUT: 'image'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -38,21 +38,13 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
     ["BRAILLE LINE:  'image'",
-     "     VISIBLE:  'image', cursor=1",
+     "     VISIBLE:  'image', cursor=0",
      "SPEECH OUTPUT: 'image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Line Down",
-    ["BRAILLE LINE:  'image'",
-     "     VISIBLE:  'image', cursor=1",
-     "SPEECH OUTPUT: 'image'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "6. Line Down",
     ["BRAILLE LINE:  'hi'",
      "     VISIBLE:  'hi', cursor=1",
      "SPEECH OUTPUT: 'hi'"]))
@@ -60,33 +52,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "7. Line Down",
-    ["BRAILLE LINE:  ' '",
-     "     VISIBLE:  ' ', cursor=1",
-     "SPEECH OUTPUT: ' '"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "8. Line Down",
-    ["BRAILLE LINE:  ' '",
-     "     VISIBLE:  ' ', cursor=1",
-     "SPEECH OUTPUT: '",
-     "'",
-     "SPEECH OUTPUT: '  '"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "9. Line Down",
-    ["BRAILLE LINE:  ' '",
-     "     VISIBLE:  ' ', cursor=1",
-     "SPEECH OUTPUT: ' '"]))
+    "6. Line Down",
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1",
+     "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "10. Line Down",
+    "7. Line Down",
     ["BRAILLE LINE:  'Item 1'",
      "     VISIBLE:  'Item 1', cursor=1",
      "SPEECH OUTPUT: 'Item 1'"]))
@@ -94,7 +68,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "11. Line Down",
+    "8. Line Down",
     ["BRAILLE LINE:  'Item 2'",
      "     VISIBLE:  'Item 2', cursor=1",
      "SPEECH OUTPUT: 'Item 2'"]))
@@ -102,7 +76,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "12. Line Down",
+    "9. Line Down",
     ["BRAILLE LINE:  'Item 3'",
      "     VISIBLE:  'Item 3', cursor=1",
      "SPEECH OUTPUT: 'Item 3'"]))
@@ -110,15 +84,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "13. Line Down",
-    ["BRAILLE LINE:  ' '",
-     "     VISIBLE:  ' ', cursor=1",
-     "SPEECH OUTPUT: '  '"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "14. Line Down",
+    "10. Line Down",
     ["BRAILLE LINE:  'table cell'",
      "     VISIBLE:  'table cell', cursor=1",
      "SPEECH OUTPUT: '",
@@ -128,7 +94,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "15. Line Down",
+    "11. Line Down",
     ["BRAILLE LINE:  'This table is messed up.'",
      "     VISIBLE:  'This table is messed up.', cursor=1",
      "SPEECH OUTPUT: 'This table is messed up.'"]))
@@ -136,7 +102,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "16. Line Down",
+    "12. Line Down",
     ["BRAILLE LINE:  'Here's a cell'",
      "     VISIBLE:  'Here's a cell', cursor=1",
      "SPEECH OUTPUT: 'Here's a cell'"]))
@@ -144,7 +110,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "17. Line Up",
+    "13. Line Up",
     ["BRAILLE LINE:  'This table is messed up.'",
      "     VISIBLE:  'This table is messed up.', cursor=1",
      "SPEECH OUTPUT: 'This table is messed up.'"]))
@@ -152,7 +118,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "18. Line Up",
+    "14. Line Up",
     ["BRAILLE LINE:  'table cell'",
      "     VISIBLE:  'table cell', cursor=1",
      "SPEECH OUTPUT: '",
@@ -162,7 +128,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "19. Line Up",
+    "15. Line Up",
     ["BRAILLE LINE:  ' '",
      "     VISIBLE:  ' ', cursor=1",
      "SPEECH OUTPUT: '  '"]))
@@ -170,7 +136,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "20. Line Up",
+    "16. Line Up",
     ["BRAILLE LINE:  'Item 3'",
      "     VISIBLE:  'Item 3', cursor=1",
      "SPEECH OUTPUT: 'Item 3'"]))
@@ -178,7 +144,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "21. Line Up",
+    "17. Line Up",
     ["BRAILLE LINE:  'Item 2'",
      "     VISIBLE:  'Item 2', cursor=1",
      "SPEECH OUTPUT: 'Item 2'"]))
@@ -186,7 +152,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "22. Line Up",
+    "18. Line Up",
     ["BRAILLE LINE:  'Item 1'",
      "     VISIBLE:  'Item 1', cursor=1",
      "SPEECH OUTPUT: 'Item 1'"]))
@@ -194,7 +160,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "23. Line Up",
+    "19. Line Up",
     ["BRAILLE LINE:  ' '",
      "     VISIBLE:  ' ', cursor=1",
      "SPEECH OUTPUT: ' '"]))
@@ -202,17 +168,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "24. Line Up",
-    ["BRAILLE LINE:  ' '",
-     "     VISIBLE:  ' ', cursor=1",
-     "SPEECH OUTPUT: '",
-     "'",
-     "SPEECH OUTPUT: '  '"]))
+    "20. Line Up",
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1",
+     "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "25. Line Up",
+    "21. Line Up",
     ["BRAILLE LINE:  ' '",
      "     VISIBLE:  ' ', cursor=1",
      "SPEECH OUTPUT: ' '"]))
@@ -220,7 +184,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "26. Line Up",
+    "22. Line Up",
     ["BRAILLE LINE:  'hi'",
      "     VISIBLE:  'hi', cursor=1",
      "SPEECH OUTPUT: 'hi'"]))
@@ -228,31 +192,31 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "27. Line Up",
+    "23. Line Up",
     ["BRAILLE LINE:  'image'",
-     "     VISIBLE:  'image', cursor=1",
+     "     VISIBLE:  'image', cursor=0",
      "SPEECH OUTPUT: 'image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "28. Line Up",
+    "24. Line Up",
     ["BRAILLE LINE:  'image'",
-     "     VISIBLE:  'image', cursor=1",
+     "     VISIBLE:  'image', cursor=0",
      "SPEECH OUTPUT: 'image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "29. Line Up",
+    "25. Line Up",
     ["BRAILLE LINE:  'image'",
-     "     VISIBLE:  'image', cursor=1",
+     "     VISIBLE:  'image', cursor=0",
      "SPEECH OUTPUT: 'image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "30. Line Up",
+    "26. Line Up",
     ["BRAILLE LINE:  ' '",
      "     VISIBLE:  ' ', cursor=1",
      "SPEECH OUTPUT: ' '"]))
@@ -260,7 +224,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "31. Line Up",
+    "27. Line Up",
     ["BRAILLE LINE:  'Hello world!'",
      "     VISIBLE:  'Hello world!', cursor=1",
      "SPEECH OUTPUT: 'Hello world! '"]))
diff --git a/test/keystrokes/firefox/line_nav_bug_570757.py b/test/keystrokes/firefox/line_nav_bug_570757.py
index 8e61c04..dfc7427 100644
--- a/test/keystrokes/firefox/line_nav_bug_570757.py
+++ b/test/keystrokes/firefox/line_nav_bug_570757.py
@@ -39,18 +39,6 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
-    ["KNOWN ISSUE: Are we getting stuck here?",
-     "BRAILLE LINE:  'Here is a step-by-step tutorial: •Do this thing'",
-     "     VISIBLE:  '•Do this thing', cursor=1",
-     "SPEECH OUTPUT: 'Here is a step-by-step tutorial: ",
-     "'",
-     "SPEECH OUTPUT: 'panel'",
-     "SPEECH OUTPUT: '•Do this thing'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "5. Line Down",
     ["BRAILLE LINE:  '•Do this other thing'",
      "     VISIBLE:  '•Do this other thing', cursor=1",
      "SPEECH OUTPUT: '•Do this other thing'"]))
@@ -58,7 +46,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:  '•Do this thing'",
      "     VISIBLE:  '•Do this thing', cursor=1",
      "SPEECH OUTPUT: '•Do this thing'"]))
@@ -66,7 +54,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:  'Here is a step-by-step tutorial: •Do this thing'",
      "     VISIBLE:  'Here is a step-by-step tutorial:', cursor=1",
      "SPEECH OUTPUT: 'Here is a step-by-step tutorial: ",
@@ -77,7 +65,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:  'Solution'",
      "     VISIBLE:  'Solution', cursor=1",
      "SPEECH OUTPUT: 'Solution'"]))
diff --git a/test/keystrokes/firefox/line_nav_bug_577239.py b/test/keystrokes/firefox/line_nav_bug_577239.py
index ef8eb01..0b56686 100644
--- a/test/keystrokes/firefox/line_nav_bug_577239.py
+++ b/test/keystrokes/firefox/line_nav_bug_577239.py
@@ -131,19 +131,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "16. Line Up",
-    ["KNOWN ISSUE: The list item marker has gone missing.",
-     "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'",
-     "     VISIBLE:  'This is a list item that spans m', 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 '"]))
+    ["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'",
+     "     VISIBLE:  '2.This is a list item that spans', 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 '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "17. Line Up",
-    ["KNOWN ISSUE: The list item marker has gone missing.",
-     "BRAILLE LINE:  'This is a short list item.'",
-     "     VISIBLE:  'This is a short list item.', cursor=1",
-     "SPEECH OUTPUT: 'This is a short list item. '"]))
+    ["BRAILLE LINE:  '1.This is a short list item.'",
+     "     VISIBLE:  '1.This is a short list item.', cursor=1",
+     "SPEECH OUTPUT: '1.This is a short list item. '"]))
 
 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 12ba2df..6812f0e 100644
--- a/test/keystrokes/firefox/line_nav_bug_592383.py
+++ b/test/keystrokes/firefox/line_nav_bug_592383.py
@@ -36,7 +36,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Down",
     ["BRAILLE LINE:  'W   hy did the chicken cross the road? Give up? It was to escape from the enormous 
capital letter at the'",
-     "     VISIBLE:  '   hy did the chicken cross the ', cursor=1",
+     "     VISIBLE:  'W   hy did the chicken cross the', cursor=1",
      "SPEECH OUTPUT: 'W'",
      "SPEECH OUTPUT: '   hy did the chicken cross the road? Give up? It was to escape from the enormous 
capital letter at the '"]))
 
@@ -44,17 +44,30 @@ 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. '"]))
+    ["KNOWN ISSUE: At the moment we cannot get past the giant W line",
+     "BRAILLE LINE:  'W   hy did the chicken cross the road? Give up? It was to escape from the enormous 
capital letter at the'",
+     "     VISIBLE:  'W   hy did the chicken cross the', cursor=1",
+     "SPEECH OUTPUT: 'W'",
+     "SPEECH OUTPUT: '   hy did the chicken cross the road? Give up? It was to escape from the enormous 
capital letter at the '"]))
+
+#    ["BRAILLE LINE:  'W 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: 'W'",
+#     "SPEECH OUTPUT: 'beginning of this paragraph. These are the things that keep chickens up at night. No. 
Really.They are. '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. Down",
-    ["BRAILLE LINE:  'Here's another normal paragraph.'",
-     "     VISIBLE:  'Here's another normal paragraph.', cursor=1",
-     "SPEECH OUTPUT: 'Here's another normal paragraph.'"]))
+    ["KNOWN ISSUE: At the moment we cannot get past the giant W line",
+     "BRAILLE LINE:  'W   hy did the chicken cross the road? Give up? It was to escape from the enormous 
capital letter at the'",
+     "     VISIBLE:  'W   hy did the chicken cross the', cursor=1",
+     "SPEECH OUTPUT: 'W'",
+     "SPEECH OUTPUT: '   hy did the chicken cross the road? Give up? It was to escape from the enormous 
capital letter at the '"]))
+
+#    ["BRAILLE LINE:  'Here's another normal paragraph.'",
+#     "     VISIBLE:  'Here's another normal paragraph.', cursor=1",
+#     "SPEECH OUTPUT: 'Here's another normal paragraph.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>End"))
@@ -68,31 +81,30 @@ 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. '"]))
+    ["KNOWN ISSUE: At the moment we cannot get past the giant W line",
+     "BRAILLE LINE:  'W   hy did the chicken cross the road? Give up? It was to escape from the enormous 
capital letter at the'",
+     "     VISIBLE:  'W   hy did the chicken cross the', cursor=1",
+     "SPEECH OUTPUT: 'W'",
+     "SPEECH OUTPUT: '   hy did the chicken cross the road? Give up? It was to escape from the enormous 
capital letter at the '"]))
 
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "9. Up",
-    ["KNOWN ISSUE: We are not combining the W with the non-huge text that follows",
-     "BRAILLE LINE:  'W'",
-     "     VISIBLE:  'W', cursor=1",
-     "SPEECH OUTPUT: 'W'"]))
+#    ["BRAILLE LINE:  'W beginning of this paragraph. These are the things that keep chickens up at night. 
No. Really.They are.'",
+#     "     VISIBLE:  'W beginning of this paragraph. T', cursor=1",
+#     "SPEECH OUTPUT: 'W'",
+#     "SPEECH OUTPUT: 'beginning of 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(
-    "10. Up",
-    ["BRAILLE LINE:  'So is this one, but the next one will not be.'",
+    "9. Up",
+    ["KNOWN ISSUE: On the way up, thanks to the giant W, we are skipping over the text between the two",
+     "BRAILLE LINE:  'So is this one, but the next one will not be.'",
      "     VISIBLE:  'So is this one, but the next one', cursor=1",
      "SPEECH OUTPUT: 'So is this one, but the next one will not be.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "11. Up",
+    "10. Up",
     ["BRAILLE LINE:  'This is a normal paragraph.'",
      "     VISIBLE:  'This is a normal paragraph.', cursor=1",
      "SPEECH OUTPUT: 'This is a normal paragraph.'"]))
diff --git a/test/keystrokes/firefox/line_nav_bugzilla_search_down.py 
b/test/keystrokes/firefox/line_nav_bugzilla_search_down.py
index 21fad3c..6d561f5 100644
--- a/test/keystrokes/firefox/line_nav_bugzilla_search_down.py
+++ b/test/keystrokes/firefox/line_nav_bugzilla_search_down.py
@@ -90,7 +90,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Down",
     ["BRAILLE LINE:  'Admin list box'",
-     "     VISIBLE:  'Admin list box', cursor=1",
+     "     VISIBLE:  'Admin list box', cursor=0",
      "SPEECH OUTPUT: 'Classification:'",
      "SPEECH OUTPUT: 'Admin'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -110,7 +110,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "8. Line Down",
     ["BRAILLE LINE:  'accerciser list box'",
-     "     VISIBLE:  'accerciser list box', cursor=1",
+     "     VISIBLE:  'accerciser list box', cursor=0",
      "SPEECH OUTPUT: 'Product:'",
      "SPEECH OUTPUT: 'accerciser'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -132,7 +132,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "10. Line Down",
     ["BRAILLE LINE:  'abiscan list box'",
-     "     VISIBLE:  'abiscan list box', cursor=1",
+     "     VISIBLE:  'abiscan list box', cursor=0",
      "SPEECH OUTPUT: 'Component:'",
      "SPEECH OUTPUT: 'abiscan'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -152,7 +152,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "12. Line Down",
     ["BRAILLE LINE:  '0.0.1 list box'",
-     "     VISIBLE:  '0.0.1 list box', cursor=1",
+     "     VISIBLE:  '0.0.1 list box', cursor=0",
      "SPEECH OUTPUT: 'Version:'",
      "SPEECH OUTPUT: '0.0.1'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -172,7 +172,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "14. Line Down",
     ["BRAILLE LINE:  '--- list box'",
-     "     VISIBLE:  '--- list box', cursor=1",
+     "     VISIBLE:  '--- list box', cursor=0",
      "SPEECH OUTPUT: 'Target Milestone:'",
      "SPEECH OUTPUT: '---'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -223,7 +223,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "18. Line Down",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -241,7 +241,7 @@ sequence.append(utils.AssertPresentationAction(
     "20. Line Down",
     ["KNOWN ISSUE: Should we be doing a different presentation of these selected children?",
      "BRAILLE LINE:  'UNCONFIRMED NEW ASSIGNED REOPENED NEEDINFO list box'",
-     "     VISIBLE:  'UNCONFIRMED NEW ASSIGNED REOPENE', cursor=1",
+     "     VISIBLE:  'UNCONFIRMED NEW ASSIGNED REOPENE', cursor=0",
      "SPEECH OUTPUT: 'Status:'",
      "SPEECH OUTPUT: 'UNCONFIRMED'",
      "SPEECH OUTPUT: 'NEW'",
@@ -265,7 +265,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "22. Line Down",
     ["BRAILLE LINE:  'FIXED list box'",
-     "     VISIBLE:  'FIXED list box', cursor=1",
+     "     VISIBLE:  'FIXED list box', cursor=0",
      "SPEECH OUTPUT: 'Resolution:'",
      "SPEECH OUTPUT: 'FIXED'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -285,7 +285,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "24. Line Down",
     ["BRAILLE LINE:  'blocker list box'",
-     "     VISIBLE:  'blocker list box', cursor=1",
+     "     VISIBLE:  'blocker list box', cursor=0",
      "SPEECH OUTPUT: 'Severity:'",
      "SPEECH OUTPUT: 'blocker'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -305,7 +305,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "26. Line Down",
     ["BRAILLE LINE:  'Immediate list box'",
-     "     VISIBLE:  'Immediate list box', cursor=1",
+     "     VISIBLE:  'Immediate list box', cursor=0",
      "SPEECH OUTPUT: 'Priority:'",
      "SPEECH OUTPUT: 'Immediate'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -325,7 +325,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "28. Line Down",
     ["BRAILLE LINE:  'All list box'",
-     "     VISIBLE:  'All list box', cursor=1",
+     "     VISIBLE:  'All list box', cursor=0",
      "SPEECH OUTPUT: 'OS:'",
      "SPEECH OUTPUT: 'All'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -352,7 +352,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "31. Line Down",
     ["BRAILLE LINE:  '<x> check box the bug assignee'",
-     "     VISIBLE:  '<x> check box the bug assignee', cursor=1",
+     "     VISIBLE:  '<x> check box the bug assignee', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'checked'",
      "SPEECH OUTPUT: ' the bug assignee '"]))
@@ -362,7 +362,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "32. Line Down",
     ["BRAILLE LINE:  '< > check box the reporter'",
-     "     VISIBLE:  '< > check box the reporter', cursor=1",
+     "     VISIBLE:  '< > check box the reporter', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: ' the reporter '"]))
@@ -372,7 +372,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "33. Line Down",
     ["BRAILLE LINE:  '< > check box the QA contact'",
-     "     VISIBLE:  '< > check box the QA contact', cursor=1",
+     "     VISIBLE:  '< > check box the QA contact', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: ' the QA contact '"]))
@@ -382,7 +382,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "34. Line Down",
     ["BRAILLE LINE:  '< > check box a CC list member'",
-     "     VISIBLE:  '< > check box a CC list member', cursor=1",
+     "     VISIBLE:  '< > check box a CC list member', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: ' a CC list member '"]))
@@ -392,7 +392,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "35. Line Down",
     ["BRAILLE LINE:  '< > check box a commenter'",
-     "     VISIBLE:  '< > check box a commenter', cursor=1",
+     "     VISIBLE:  '< > check box a commenter', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: ' a commenter '"]))
@@ -402,7 +402,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "36. Line Down",
     ["BRAILLE LINE:  'contains combo box'",
-     "     VISIBLE:  'contains combo box', cursor=1",
+     "     VISIBLE:  'contains combo box', cursor=0",
      "SPEECH OUTPUT: 'contains'",
      "SPEECH OUTPUT: 'combo box'"]))
 
@@ -411,7 +411,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())
@@ -427,7 +427,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "39. Line Down",
     ["BRAILLE LINE:  '<x> check box the bug assignee'",
-     "     VISIBLE:  '<x> check box the bug assignee', cursor=1",
+     "     VISIBLE:  '<x> check box the bug assignee', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'checked'",
      "SPEECH OUTPUT: ' the bug assignee '"]))
@@ -437,7 +437,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "40. Line Down",
     ["BRAILLE LINE:  '<x> check box the reporter'",
-     "     VISIBLE:  '<x> check box the reporter', cursor=1",
+     "     VISIBLE:  '<x> check box the reporter', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'checked'",
      "SPEECH OUTPUT: ' the reporter '"]))
@@ -447,7 +447,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "41. Line Down",
     ["BRAILLE LINE:  '<x> check box the QA contact'",
-     "     VISIBLE:  '<x> check box the QA contact', cursor=1",
+     "     VISIBLE:  '<x> check box the QA contact', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'checked'",
      "SPEECH OUTPUT: ' the QA contact '"]))
@@ -457,7 +457,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "42. Line Down",
     ["BRAILLE LINE:  '<x> check box a CC list member'",
-     "     VISIBLE:  '<x> check box a CC list member', cursor=1",
+     "     VISIBLE:  '<x> check box a CC list member', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'checked'",
      "SPEECH OUTPUT: ' a CC list member '"]))
@@ -467,7 +467,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "43. Line Down",
     ["BRAILLE LINE:  '< > check box a commenter'",
-     "     VISIBLE:  '< > check box a commenter', cursor=1",
+     "     VISIBLE:  '< > check box a commenter', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: ' a commenter '"]))
@@ -477,7 +477,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "44. Line Down",
     ["BRAILLE LINE:  'contains combo box'",
-     "     VISIBLE:  'contains combo box', cursor=1",
+     "     VISIBLE:  'contains combo box', cursor=0",
      "SPEECH OUTPUT: 'contains'",
      "SPEECH OUTPUT: 'combo box'"]))
 
@@ -486,7 +486,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())
@@ -494,7 +494,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "46. Line Down",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -502,7 +502,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "47. Line Down",
     ["BRAILLE LINE:  'Only include combo box bugs numbered:  $l'",
-     "     VISIBLE:  'Only include combo box bugs numb', cursor=1",
+     "     VISIBLE:  'Only include combo box bugs numb', cursor=0",
      "SPEECH OUTPUT: 'Only include'",
      "SPEECH OUTPUT: 'combo box'",
      "SPEECH OUTPUT: 'bugs numbered: '",
@@ -512,8 +512,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "48. Line Down",
-    ["BRAILLE LINE:  'table cell (comma-separated list)'",
-     "     VISIBLE:  'table cell (comma-separated list', cursor=1",
+    ["BRAILLE LINE:  'table cell \(comma-separated list\)'",
+     "     VISIBLE:  'table cell \(comma-separated list', cursor=0",
      "SPEECH OUTPUT: 'blank'",
      "SPEECH OUTPUT: '(comma-separated list)'"]))
 
@@ -537,10 +537,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "51. Line Down",
-    ["BRAILLE LINE:  ' $l and  $l'",
-     "     VISIBLE:  ' $l and  $l', cursor=1",
+    ["BRAILLE LINE:  ' $l '",
+     "     VISIBLE:  ' $l ', cursor=0",
      "SPEECH OUTPUT: 'entry'",
-     "SPEECH OUTPUT: ' and '",
+     "SPEECH OUTPUT: 'and '",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'Now'",
      "SPEECH OUTPUT: '",
@@ -559,15 +559,15 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "53. Line Down",
     ["BRAILLE LINE:  'where one or more of the following changed:'",
-    "     VISIBLE:  'where one or more of the followi', cursor=1",
-    "SPEECH OUTPUT: 'where one or more of the following changed:'"]))
+     "     VISIBLE:  'where one or more of the followi', cursor=1",
+     "SPEECH OUTPUT: 'where one or more of the following changed:'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "54. Line Down",
     ["BRAILLE LINE:  '[Bug creation] list box'",
-     "     VISIBLE:  '[Bug creation] list box', cursor=1",
+     "     VISIBLE:  '[Bug creation] list box', cursor=0",
      "SPEECH OUTPUT: 'where one or more of the following changed:'",
      "SPEECH OUTPUT: '[Bug creation]'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -586,7 +586,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())
@@ -603,7 +603,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "58. Line Down",
     ["BRAILLE LINE:  'Unspecified list box'",
-     "     VISIBLE:  'Unspecified list box', cursor=1",
+     "     VISIBLE:  'Unspecified list box', cursor=0",
      "SPEECH OUTPUT: 'GNOME version:'",
      "SPEECH OUTPUT: 'Unspecified'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -623,7 +623,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "60. Line Down",
     ["BRAILLE LINE:  'Unspecified list box'",
-     "     VISIBLE:  'Unspecified list box', cursor=1",
+     "     VISIBLE:  'Unspecified list box', cursor=0",
      "SPEECH OUTPUT: 'GNOME target:'",
      "SPEECH OUTPUT: 'Unspecified'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -664,7 +664,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "64. Line Down",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -680,7 +680,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "66. Line Down",
     ["BRAILLE LINE:  '< > check box Not (negate this whole chart)'",
-     "     VISIBLE:  '< > check box Not (negate this w', cursor=1",
+     "     VISIBLE:  '< > check box Not (negate this w', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: ' Not (negate this whole chart) '"]))
@@ -690,7 +690,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "67. Line Down",
     ["BRAILLE LINE:  '--- combo box --- combo box  $l Or push button'",
-     "     VISIBLE:  '--- combo box --- combo box  $l ', cursor=1",
+     "     VISIBLE:  '--- combo box --- combo box  $l ', cursor=0",
      "SPEECH OUTPUT: '---'",
      "SPEECH OUTPUT: 'combo box'",
      "SPEECH OUTPUT: '---'",
@@ -717,7 +717,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "69. Line Down",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 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 cac027f..a97522c 100644
--- a/test/keystrokes/firefox/line_nav_bugzilla_search_up.py
+++ b/test/keystrokes/firefox/line_nav_bugzilla_search_up.py
@@ -15,7 +15,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "1. Line Up",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -36,7 +36,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Up",
     ["BRAILLE LINE:  '--- combo box --- combo box  $l Or push button'",
-     "     VISIBLE:  '--- combo box --- combo box  $l ', cursor=1",
+     "     VISIBLE:  '--- combo box --- combo box  $l ', cursor=0",
      "SPEECH OUTPUT: '---'",
      "SPEECH OUTPUT: 'combo box'",
      "SPEECH OUTPUT: '---'",
@@ -49,8 +49,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Up",
-    ["BRAILLE LINE:  '< > check box Not (negate this whole chart)'",
-     "     VISIBLE:  '< > check box Not (negate this w', cursor=1",
+    ["BRAILLE LINE:  '< > check box Not \(negate this whole chart\)'",
+     "     VISIBLE:  '< > check box Not \(negate this w', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: ' Not (negate this whole chart) '"]))
@@ -68,7 +68,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Up",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -106,7 +106,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "10. Line Up",
     ["BRAILLE LINE:  'Unspecified list box'",
-     "     VISIBLE:  'Unspecified list box', cursor=1",
+     "     VISIBLE:  'Unspecified list box', cursor=0",
      "SPEECH OUTPUT: 'GNOME target:'",
      "SPEECH OUTPUT: 'Unspecified'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -126,7 +126,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "12. Line Up",
     ["BRAILLE LINE:  'Unspecified list box'",
-     "     VISIBLE:  'Unspecified list box', cursor=1",
+     "     VISIBLE:  'Unspecified list box', cursor=0",
      "SPEECH OUTPUT: 'GNOME version:'",
      "SPEECH OUTPUT: 'Unspecified'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -146,7 +146,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())
@@ -154,7 +154,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "15. Line Up",
     ["BRAILLE LINE:  'and the new value was:'",
-     "     VISIBLE:  'and the new value was:', cursor=0",
+     "     VISIBLE:  'and the new value was:', cursor=1",
      "SPEECH OUTPUT: 'and the new value was:'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -162,7 +162,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "16. Line Up",
     ["BRAILLE LINE:  '[Bug creation] list box'",
-     "     VISIBLE:  '[Bug creation] list box', cursor=1",
+     "     VISIBLE:  '[Bug creation] list box', cursor=0",
      "SPEECH OUTPUT: 'where one or more of the following changed:'",
      "SPEECH OUTPUT: '[Bug creation]'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -188,10 +188,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "19. Line Up",
-    ["BRAILLE LINE:  ' $l and  $l'",
-     "     VISIBLE:  ' $l and  $l', cursor=1",
+    ["BRAILLE LINE:  ' $l '",
+     "     VISIBLE:  ' $l ', cursor=0",
      "SPEECH OUTPUT: 'entry'",
-     "SPEECH OUTPUT: ' and '",
+     "SPEECH OUTPUT: 'and '",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'Now'",
      "SPEECH OUTPUT: '",
@@ -202,7 +202,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "20. Line Up",
     ["BRAILLE LINE:  'Only bugs changed between:'",
-     "     VISIBLE:  'Only bugs changed between:', cursor=0",
+     "     VISIBLE:  'Only bugs changed between:', cursor=1",
      "SPEECH OUTPUT: 'Only bugs changed between:'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -217,17 +217,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "22. Line Up",
-    ["BRAILLE LINE:  'table cell (comma-separated list)'",
-     "     VISIBLE:  'table cell (comma-separated list', cursor=1",
+    ["BRAILLE LINE:  'table cell \(comma-separated list\)'",
+     "     VISIBLE:  'table cell \(comma-separated list', cursor=0",
      "SPEECH OUTPUT: 'blank'",
-     "SPEECH OUTPUT: '(comma-separated list)'"]))
+     "SPEECH OUTPUT: '\(comma-separated list\)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "23. Line Up",
     ["BRAILLE LINE:  'Only include combo box bugs numbered:  $l'",
-     "     VISIBLE:  'Only include combo box bugs numb', cursor=1",
+     "     VISIBLE:  'Only include combo box bugs numb', cursor=0",
      "SPEECH OUTPUT: 'Only include'",
      "SPEECH OUTPUT: 'combo box'",
      "SPEECH OUTPUT: 'bugs numbered: '",
@@ -238,7 +238,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "24. Line Up",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -246,7 +246,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())
@@ -254,7 +254,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "26. Line Up",
     ["BRAILLE LINE:  'contains combo box'",
-     "     VISIBLE:  'contains combo box', cursor=1",
+     "     VISIBLE:  'contains combo box', cursor=0",
      "SPEECH OUTPUT: 'contains'",
      "SPEECH OUTPUT: 'combo box'"]))
 
@@ -262,17 +262,18 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "27. Line Up",
-    ["KNOWN ISSUE: This is different from the Down version. Down includes 'a commenter'.",
-     "BRAILLE LINE:  '< > check box table cell'",
-     "     VISIBLE:  '< > check box table cell', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
+    ["BRAILLE LINE:  '< > check box '",
+     "     VISIBLE:  '< > check box ', cursor=0",
+     "SPEECH OUTPUT: 'check box'",
+     "SPEECH OUTPUT: 'not checked'",
+     "SPEECH OUTPUT: 'a commenter '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "28. Line Up",
     ["BRAILLE LINE:  '<x> check box a CC list member'",
-     "     VISIBLE:  '<x> check box a CC list member', cursor=1",
+     "     VISIBLE:  '<x> check box a CC list member', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'checked'",
      "SPEECH OUTPUT: ' a CC list member '"]))
@@ -282,7 +283,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "29. Line Up",
     ["BRAILLE LINE:  '<x> check box the QA contact'",
-     "     VISIBLE:  '<x> check box the QA contact', cursor=1",
+     "     VISIBLE:  '<x> check box the QA contact', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'checked'",
      "SPEECH OUTPUT: ' the QA contact '"]))
@@ -292,7 +293,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "30. Line Up",
     ["BRAILLE LINE:  '<x> check box the reporter'",
-     "     VISIBLE:  '<x> check box the reporter', cursor=1",
+     "     VISIBLE:  '<x> check box the reporter', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'checked'",
      "SPEECH OUTPUT: ' the reporter '"]))
@@ -302,7 +303,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "31. Line Up",
     ["BRAILLE LINE:  '<x> check box the bug assignee'",
-     "     VISIBLE:  '<x> check box the bug assignee', cursor=1",
+     "     VISIBLE:  '<x> check box the bug assignee', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'checked'",
      "SPEECH OUTPUT: ' the bug assignee '"]))
@@ -320,7 +321,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())
@@ -328,7 +329,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "34. Line Up",
     ["BRAILLE LINE:  'contains combo box'",
-     "     VISIBLE:  'contains combo box', cursor=1",
+     "     VISIBLE:  'contains combo box', cursor=0",
      "SPEECH OUTPUT: 'contains'",
      "SPEECH OUTPUT: 'combo box'"]))
 
@@ -336,17 +337,18 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "35. Line Up",
-    ["KNOWN ISSUE: This is different from the Down version. Down includes 'a commenter'.",
-     "BRAILLE LINE:  '< > check box table cell'",
-     "     VISIBLE:  '< > check box table cell', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
+    ["BRAILLE LINE:  '< > check box '",
+     "     VISIBLE:  '< > check box ', cursor=0",
+     "SPEECH OUTPUT: 'check box'",
+     "SPEECH OUTPUT: 'not checked'",
+     "SPEECH OUTPUT: 'a commenter '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "36. Line Up",
     ["BRAILLE LINE:  '< > check box a CC list member'",
-     "     VISIBLE:  '< > check box a CC list member', cursor=1",
+     "     VISIBLE:  '< > check box a CC list member', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: ' a CC list member '"]))
@@ -356,7 +358,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "37. Line Up",
     ["BRAILLE LINE:  '< > check box the QA contact'",
-     "     VISIBLE:  '< > check box the QA contact', cursor=1",
+     "     VISIBLE:  '< > check box the QA contact', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: ' the QA contact '"]))
@@ -366,7 +368,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "38. Line Up",
     ["BRAILLE LINE:  '< > check box the reporter'",
-     "     VISIBLE:  '< > check box the reporter', cursor=1",
+     "     VISIBLE:  '< > check box the reporter', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: ' the reporter '"]))
@@ -376,7 +378,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "39. Line Up",
     ["BRAILLE LINE:  '<x> check box the bug assignee'",
-     "     VISIBLE:  '<x> check box the bug assignee', cursor=1",
+     "     VISIBLE:  '<x> check box the bug assignee', cursor=0",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'checked'",
      "SPEECH OUTPUT: ' the bug assignee '"]))
@@ -402,7 +404,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "42. Line Up",
     ["BRAILLE LINE:  'All list box'",
-     "     VISIBLE:  'All list box', cursor=1",
+     "     VISIBLE:  'All list box', cursor=0",
      "SPEECH OUTPUT: 'OS:'",
      "SPEECH OUTPUT: 'All'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -422,7 +424,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "44. Line Up",
     ["BRAILLE LINE:  'Immediate list box'",
-     "     VISIBLE:  'Immediate list box', cursor=1",
+     "     VISIBLE:  'Immediate list box', cursor=0",
      "SPEECH OUTPUT: 'Priority:'",
      "SPEECH OUTPUT: 'Immediate'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -442,7 +444,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "46. Line Up",
     ["BRAILLE LINE:  'blocker list box'",
-     "     VISIBLE:  'blocker list box', cursor=1",
+     "     VISIBLE:  'blocker list box', cursor=0",
      "SPEECH OUTPUT: 'Severity:'",
      "SPEECH OUTPUT: 'blocker'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -462,7 +464,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "48. Line Up",
     ["BRAILLE LINE:  'FIXED list box'",
-     "     VISIBLE:  'FIXED list box', cursor=1",
+     "     VISIBLE:  'FIXED list box', cursor=0",
      "SPEECH OUTPUT: 'Resolution:'",
      "SPEECH OUTPUT: 'FIXED'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -481,9 +483,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "50. Line Up",
-    ["KNOWN ISSUE: Should we be doing a different presentation of these selected children?",
-     "BRAILLE LINE:  'UNCONFIRMED NEW ASSIGNED REOPENED NEEDINFO list box'",
-     "     VISIBLE:  'UNCONFIRMED NEW ASSIGNED REOPENE', cursor=1",
+    ["BRAILLE LINE:  'UNCONFIRMED NEW ASSIGNED REOPENED NEEDINFO list box'",
+     "     VISIBLE:  'UNCONFIRMED NEW ASSIGNED REOPENE', cursor=0",
      "SPEECH OUTPUT: 'Status:'",
      "SPEECH OUTPUT: 'UNCONFIRMED'",
      "SPEECH OUTPUT: 'NEW'",
@@ -507,7 +508,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "52. Line Up",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -555,7 +556,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "56. Line Up",
     ["BRAILLE LINE:  '--- list box'",
-     "     VISIBLE:  '--- list box', cursor=1",
+     "     VISIBLE:  '--- list box', cursor=0",
      "SPEECH OUTPUT: 'Target Milestone:'",
      "SPEECH OUTPUT: '---'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -575,7 +576,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "58. Line Up",
     ["BRAILLE LINE:  '0.0.1 list box'",
-     "     VISIBLE:  '0.0.1 list box', cursor=1",
+     "     VISIBLE:  '0.0.1 list box', cursor=0",
      "SPEECH OUTPUT: 'Version:'",
      "SPEECH OUTPUT: '0.0.1'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -595,7 +596,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "60. Line Up",
     ["BRAILLE LINE:  'abiscan list box'",
-     "     VISIBLE:  'abiscan list box', cursor=1",
+     "     VISIBLE:  'abiscan list box', cursor=0",
      "SPEECH OUTPUT: 'Component:'",
      "SPEECH OUTPUT: 'abiscan'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -617,7 +618,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "62. Line Up",
     ["BRAILLE LINE:  'accerciser list box'",
-     "     VISIBLE:  'accerciser list box', cursor=1",
+     "     VISIBLE:  'accerciser list box', cursor=0",
      "SPEECH OUTPUT: 'Product:'",
      "SPEECH OUTPUT: 'accerciser'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -637,7 +638,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "64. Line Up",
     ["BRAILLE LINE:  'Admin list box'",
-     "     VISIBLE:  'Admin list box', cursor=1",
+     "     VISIBLE:  'Admin list box', cursor=0",
      "SPEECH OUTPUT: 'Classification:'",
      "SPEECH OUTPUT: 'Admin'",
      "SPEECH OUTPUT: 'multi-select'",
diff --git a/test/keystrokes/firefox/line_nav_clickables.py b/test/keystrokes/firefox/line_nav_clickables.py
index 94ab3ef..64ba558 100644
--- a/test/keystrokes/firefox/line_nav_clickables.py
+++ b/test/keystrokes/firefox/line_nav_clickables.py
@@ -23,30 +23,6 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Down",
-    ["KNOWN ISSUE: We presented this on the previous line",
-     "BRAILLE LINE:  'Orca Logo'",
-     "     VISIBLE:  'Orca Logo', cursor=1",
-     "SPEECH OUTPUT: 'Orca Logo'",
-     "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'clickable'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "3. Line Down",
-    ["KNOWN ISSUE: We presented this on the previous lines",
-     "BRAILLE LINE:  'Clickable image: Orca Logo More text.'",
-     "     VISIBLE:  'More text.', cursor=1",
-     "SPEECH OUTPUT: 'Clickable image: '",
-     "SPEECH OUTPUT: 'Orca Logo'",
-     "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'clickable'",
-     "SPEECH OUTPUT: 'More text.'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "4. Line Down",
     ["BRAILLE LINE:  'Clickable span: Click Me. More text.'",
      "     VISIBLE:  'Clickable span: Click Me. More t', cursor=1",
      "SPEECH OUTPUT: 'Clickable span: '",
@@ -58,7 +34,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "5. Line Down",
+    "3. Line Down",
     ["BRAILLE LINE:  'Clickable div:'",
      "     VISIBLE:  'Clickable div:', cursor=1",
      "SPEECH OUTPUT: 'Clickable div: '"]))
@@ -66,7 +42,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "6. Line Down",
+    "4 Line Down",
     ["BRAILLE LINE:  'Click Me.'",
      "     VISIBLE:  'Click Me.', cursor=1",
      "SPEECH OUTPUT: 'Click Me.'",
@@ -75,7 +51,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "7. Line Down",
+    "5. Line Down",
     ["BRAILLE LINE:  'More text.'",
      "     VISIBLE:  'More text.', cursor=1",
      "SPEECH OUTPUT: 'More text.'"]))
@@ -83,7 +59,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "8. Line Up",
+    "6. Line Up",
     ["BRAILLE LINE:  'Click Me.'",
      "     VISIBLE:  'Click Me.', cursor=1",
      "SPEECH OUTPUT: 'Click Me.'",
@@ -92,7 +68,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "9. Line Up",
+    "7. Line Up",
     ["BRAILLE LINE:  'Clickable div:'",
      "     VISIBLE:  'Clickable div:', cursor=1",
      "SPEECH OUTPUT: 'Clickable div: '"]))
@@ -100,7 +76,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "10. Line Up",
+    "8 . Line Up",
     ["BRAILLE LINE:  'Clickable span: Click Me. More text.'",
      "     VISIBLE:  'Clickable span: Click Me. More t', cursor=1",
      "SPEECH OUTPUT: 'Clickable span: '",
@@ -112,7 +88,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "11. Line Up",
+    "9 . Line Up",
     ["BRAILLE LINE:  'Clickable image: Orca Logo More text.'",
      "     VISIBLE:  'Clickable image: Orca Logo More ', cursor=1",
      "SPEECH OUTPUT: 'Clickable image: '",
diff --git a/test/keystrokes/firefox/line_nav_empty_anchor.py 
b/test/keystrokes/firefox/line_nav_empty_anchor.py
index 875ad1a..c3264e0 100644
--- a/test/keystrokes/firefox/line_nav_empty_anchor.py
+++ b/test/keystrokes/firefox/line_nav_empty_anchor.py
@@ -56,15 +56,6 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Down",
-    ["BRAILLE LINE:  ' h2'",
-     "     VISIBLE:  ' h2', cursor=1",
-     "SPEECH OUTPUT: 'blank'",
-     "SPEECH OUTPUT: 'heading level 2'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "7. Line Down",
     ["BRAILLE LINE:  'FOO h2'",
      "     VISIBLE:  'FOO h2', cursor=1",
      "SPEECH OUTPUT: 'FOO'",
@@ -73,7 +64,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:  'Q. Why would someone put a line break in a heading?'",
      "     VISIBLE:  'Q. Why would someone put a line ', cursor=1",
      "SPEECH OUTPUT: 'Q. Why would someone put a line break in a heading?'",
@@ -82,7 +73,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:  'Q. What is the airspeed velocity of an unladen swallow?'",
      "     VISIBLE:  'Q. What is the airspeed velocity', cursor=1",
      "SPEECH OUTPUT: 'Q. What is the airspeed velocity of an unladen swallow?'",
@@ -91,16 +82,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "10. Line Down",
-    ["BRAILLE LINE:  ' h2'",
-     "     VISIBLE:  ' h2', cursor=1",
-     "SPEECH OUTPUT: 'blank'",
-     "SPEECH OUTPUT: 'heading level 2'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "11. Line Down",
+    "9. Line Down",
     ["BRAILLE LINE:  'Battery h2'",
      "     VISIBLE:  'Battery h2', cursor=1",
      "SPEECH OUTPUT: 'Battery'",
@@ -109,17 +91,16 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "12. Line Down",
+    "10. Line Down",
     ["BRAILLE LINE:  'Q. What is a battery?'",
      "     VISIBLE:  'Q. What is a battery?', cursor=1",
-     "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'Q. What is a battery?",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "13. Line Down",
+    "11. Line Down",
     ["BRAILLE LINE:  'A. Look it up.'",
      "     VISIBLE:  'A. Look it up.', cursor=1",
      "SPEECH OUTPUT: 'A. Look it up.'"]))
@@ -127,17 +108,16 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "14. Line Down",
+    "12. Line Down",
     ["BRAILLE LINE:  'Q. Which way is up?'",
      "     VISIBLE:  'Q. Which way is up?', cursor=1",
-     "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'Q. Which way is up?",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "15. Line Down",
+    "13. Line Down",
     ["BRAILLE LINE:  'A. That way.'",
      "     VISIBLE:  'A. That way.', cursor=1",
      "SPEECH OUTPUT: 'A. That way. '"]))
@@ -145,17 +125,16 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "16. Line Down",
+    "14. Line Down",
     ["BRAILLE LINE:  'Q. Why did Orca used to get stuck on this page?'",
      "     VISIBLE:  'Q. Why did Orca used to get stuc', cursor=1",
-     "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'Q. Why did Orca used to get stuck on this page?",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "17. Line Down",
+    "15. Line Down",
     ["BRAILLE LINE:  'A. Empty anchors.'",
      "     VISIBLE:  'A. Empty anchors.', cursor=1",
      "SPEECH OUTPUT: 'A. Empty anchors.'"]))
@@ -163,17 +142,16 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "18. Line Up",
+    "16. Line Up",
     ["BRAILLE LINE:  'Q. Why did Orca used to get stuck on this page?'",
      "     VISIBLE:  'Q. Why did Orca used to get stuc', cursor=1",
-     "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'Q. Why did Orca used to get stuck on this page?",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "19. Line Up",
+    "17. Line Up",
     ["BRAILLE LINE:  'A. That way.'",
      "     VISIBLE:  'A. That way.', cursor=1",
      "SPEECH OUTPUT: 'A. That way. '"]))
@@ -181,17 +159,16 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "20. Line Up",
+    "18. Line Up",
     ["BRAILLE LINE:  'Q. Which way is up?'",
      "     VISIBLE:  'Q. Which way is up?', cursor=1",
-     "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'Q. Which way is up?",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "21. Line Up",
+    "19. Line Up",
     ["BRAILLE LINE:  'A. Look it up.'",
      "     VISIBLE:  'A. Look it up.', cursor=1",
      "SPEECH OUTPUT: 'A. Look it up.'"]))
@@ -199,17 +176,16 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "22. Line Up",
+    "20. Line Up",
     ["BRAILLE LINE:  'Q. What is a battery?'",
      "     VISIBLE:  'Q. What is a battery?', cursor=1",
-     "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'Q. What is a battery?",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "23. Line Up",
+    "21. Line Up",
     ["BRAILLE LINE:  'Battery h2'",
      "     VISIBLE:  'Battery h2', cursor=1",
      "SPEECH OUTPUT: 'Battery'",
@@ -218,16 +194,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "24. Line Up",
-    ["BRAILLE LINE:  ' h2'",
-     "     VISIBLE:  ' h2', cursor=1",
-     "SPEECH OUTPUT: 'blank'",
-     "SPEECH OUTPUT: 'heading level 2'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "25. Line Up",
+    "22. Line Up",
     ["BRAILLE LINE:  'Q. What is the airspeed velocity of an unladen swallow?'",
      "     VISIBLE:  'Q. What is the airspeed velocity', cursor=1",
      "SPEECH OUTPUT: 'Q. What is the airspeed velocity of an unladen swallow?'",
@@ -236,7 +203,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "26. Line Up",
+    "23. Line Up",
     ["BRAILLE LINE:  'Q. Why would someone put a line break in a heading?'",
      "     VISIBLE:  'Q. Why would someone put a line ', cursor=1",
      "SPEECH OUTPUT: 'Q. Why would someone put a line break in a heading?'",
@@ -245,7 +212,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "27. Line Up",
+    "24. Line Up",
     ["BRAILLE LINE:  'FOO h2'",
      "     VISIBLE:  'FOO h2', cursor=1",
      "SPEECH OUTPUT: 'FOO'",
@@ -254,16 +221,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "28. Line Up",
-    ["BRAILLE LINE:  ' h2'",
-     "     VISIBLE:  ' h2', cursor=1",
-     "SPEECH OUTPUT: 'blank'",
-     "SPEECH OUTPUT: 'heading level 2'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "29. Line Up",
+    "25. Line Up",
     ["BRAILLE LINE:  'Q. Why did Orca used to get stuck on this page?'",
      "     VISIBLE:  'Q. Why did Orca used to get stuc', cursor=1",
      "SPEECH OUTPUT: 'Q. Why did Orca used to get stuck on this page?'",
@@ -272,7 +230,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "30. Line Up",
+    "26. Line Up",
     ["BRAILLE LINE:  'Q. Which way is up?'",
      "     VISIBLE:  'Q. Which way is up?', cursor=1",
      "SPEECH OUTPUT: 'Q. Which way is up?'",
@@ -281,7 +239,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "31. Line Up",
+    "27. Line Up",
     ["BRAILLE LINE:  'Q. What's a battery?'",
      "     VISIBLE:  'Q. What's a battery?', cursor=1",
      "SPEECH OUTPUT: 'Q. What's a battery?'",
@@ -290,7 +248,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "32. Line Up",
+    "28. Line Up",
     ["BRAILLE LINE:  'Battery h2'",
      "     VISIBLE:  'Battery h2', cursor=1",
      "SPEECH OUTPUT: 'Battery'",
@@ -299,7 +257,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "33. Line Up",
+    "29. Line Up",
     ["BRAILLE LINE:  'FAQ h1'",
      "     VISIBLE:  'FAQ h1', cursor=1",
      "SPEECH OUTPUT: 'FAQ '",
diff --git a/test/keystrokes/firefox/line_nav_enter_bug.py b/test/keystrokes/firefox/line_nav_enter_bug.py
index e9f7daf..692e7af 100644
--- a/test/keystrokes/firefox/line_nav_enter_bug.py
+++ b/test/keystrokes/firefox/line_nav_enter_bug.py
@@ -69,7 +69,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Line Down",
     ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -77,7 +77,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Down",
     ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -120,7 +120,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "10. Line Down",
     ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -147,7 +147,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "13. Line Down",
     ["BRAILLE LINE:  '2.21.x list box'",
-     "     VISIBLE:  '2.21.x list box', cursor=1",
+     "     VISIBLE:  '2.21.x list box', cursor=0",
      "SPEECH OUTPUT: 'Version:'",
      "SPEECH OUTPUT: '2.21.x'",
      "SPEECH OUTPUT: 'List with 9 items'"]))
@@ -167,7 +167,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "15. Line Down",
     ["BRAILLE LINE:  'braille list box'",
-     "     VISIBLE:  'braille list box', cursor=1",
+     "     VISIBLE:  'braille list box', cursor=0",
      "SPEECH OUTPUT: 'Component:'",
      "SPEECH OUTPUT: 'braille'",
      "SPEECH OUTPUT: 'List with 5 items'"]))
@@ -194,13 +194,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "18. Line Down",
-    ["KNOWN ISSUE: Double presentation?",
-     "BRAILLE LINE:  'version version:'",
-     "     VISIBLE:  'version version:', cursor=1",
+    ["BRAILLE LINE:  'version:'",
+     "     VISIBLE:  'version:', cursor=1",
      "SPEECH OUTPUT: 'version'",
      "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'GNOME '",
-     "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: ': '"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -208,7 +205,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "19. Line Down",
     ["BRAILLE LINE:  'Unspecified combo box'",
-     "     VISIBLE:  'Unspecified combo box', cursor=1",
+     "     VISIBLE:  'Unspecified combo box', cursor=0",
      "SPEECH OUTPUT: 'Unspecified'",
      "SPEECH OUTPUT: 'combo box'"]))
 
@@ -267,7 +264,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "25. Line Down",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -311,7 +308,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "30. Line Down",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -355,7 +352,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "35. Line Up",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'Description:'",
      "SPEECH OUTPUT: 'entry'"]))
 
@@ -413,9 +410,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "41. Line Up",
-    ["KNOWN ISSUE: On the way down we split this into two.",
-     "BRAILLE LINE:  'Unspecified combo box'",
-     "     VISIBLE:  'Unspecified combo box', cursor=1",
+    ["BRAILLE LINE:  'Unspecified combo box'",
+     "     VISIBLE:  'Unspecified combo box', cursor=0",
      "SPEECH OUTPUT: 'GNOME version:'",
      "SPEECH OUTPUT: 'Unspecified'",
      "SPEECH OUTPUT: 'combo box'"]))
@@ -424,6 +420,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "42. Line Up",
+    ["BRAILLE LINE:  'version:'",
+     "     VISIBLE:  'version:', cursor=1",
+     "SPEECH OUTPUT: 'version'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: ': '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "43. Line Up",
     ["BRAILLE LINE:  'GNOME'",
      "     VISIBLE:  'GNOME', cursor=1",
      "SPEECH OUTPUT: 'GNOME '",
@@ -432,7 +438,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "43. Line Up",
+    "44. Line Up",
     ["BRAILLE LINE:  ' table cell'",
      "     VISIBLE:  ' table cell', cursor=1",
      "SPEECH OUTPUT: ' '",
@@ -441,9 +447,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "44. Line Up",
+    "45. Line Up",
     ["BRAILLE LINE:  'braille list box'",
-     "     VISIBLE:  'braille list box', cursor=1",
+     "     VISIBLE:  'braille list box', cursor=0",
      "SPEECH OUTPUT: 'Component:'",
      "SPEECH OUTPUT: 'braille'",
      "SPEECH OUTPUT: 'List with 5 items'"]))
@@ -451,7 +457,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "45. Line Up",
+    "46. Line Up",
     ["BRAILLE LINE:  'Component:'",
      "     VISIBLE:  'Component:', cursor=1",
      "SPEECH OUTPUT: 'Component'",
@@ -461,9 +467,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "46. Line Up",
+    "47. Line Up",
     ["BRAILLE LINE:  '2.21.x list box'",
-     "     VISIBLE:  '2.21.x list box', cursor=1",
+     "     VISIBLE:  '2.21.x list box', cursor=0",
      "SPEECH OUTPUT: 'Version:'",
      "SPEECH OUTPUT: '2.21.x'",
      "SPEECH OUTPUT: 'List with 9 items'"]))
@@ -471,7 +477,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "47. Line Up",
+    "48. Line Up",
     ["BRAILLE LINE:  'Version:'",
      "     VISIBLE:  'Version:', cursor=1",
      "SPEECH OUTPUT: 'Version:'"]))
@@ -479,7 +485,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "48. Line Up",
+    "49. Line Up",
     ["BRAILLE LINE:  'Reporter: joanmarie diggs gmail com Product: orca'",
      "     VISIBLE:  'Reporter: joanmarie diggs gmail ', cursor=1",
      "SPEECH OUTPUT: 'Reporter:'",
@@ -490,15 +496,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "49. Line Up",
+    "50. Line Up",
     ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "50. Line Up",
+    "51. Line Up",
     ["BRAILLE LINE:  'search or browse for the bug.'",
      "     VISIBLE:  'search or browse for the bug.', cursor=1",
      "SPEECH OUTPUT: 'search'",
@@ -511,7 +517,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "51. Line Up",
+    "52. 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 '",
@@ -522,7 +528,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "52. Line Up",
+    "53. Line Up",
     ["BRAILLE LINE:  'Before reporting a bug, please read the bug writing guidelines,'",
      "     VISIBLE:  'Before reporting a bug, please r', cursor=1",
      "SPEECH OUTPUT: 'Before reporting a bug, please read the '",
@@ -533,23 +539,23 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "53. Line Up",
+    "54. Line Up",
     ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "54. Line Up",
+    "55. Line Up",
     ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "55. Line Up",
+    "56. Line Up",
     ["BRAILLE LINE:  'into Bugzilla. h1'",
      "     VISIBLE:  'into Bugzilla. h1', cursor=1",
      "SPEECH OUTPUT: 'into Bugzilla.'",
@@ -558,16 +564,16 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "56. Line Up",
-    ["BRAILLE LINE:  'Enter Bug: orca – This page lets you enter a new bug h1'",
+    "57. Line Up",
+    ["BRAILLE LINE:  'Enter Bug: orca \u2013 This page lets you enter a new bug into Bugzilla. h1'",
      "     VISIBLE:  'Enter Bug: orca – This page lets', cursor=1",
-     "SPEECH OUTPUT: 'Enter Bug: orca – This page lets you enter a new bug '",
+     "SPEECH OUTPUT: 'Enter Bug: orca \u2013 This page lets you enter a new bug into Bugzilla.'",
      "SPEECH OUTPUT: 'heading level 1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "57. Line Up",
+    "58. 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'",
@@ -597,7 +603,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "58. Line Up",
+    "59. Line Up",
     ["BRAILLE LINE:  'Home Bugzilla'",
      "     VISIBLE:  'Home Bugzilla', cursor=1",
      "SPEECH OUTPUT: 'Home'",
diff --git a/test/keystrokes/firefox/line_nav_entries.params b/test/keystrokes/firefox/line_nav_entries.params
new file mode 100644
index 0000000..2ff0b54
--- /dev/null
+++ b/test/keystrokes/firefox/line_nav_entries.params
@@ -0,0 +1 @@
+PARAMS=$TEST_DIR/../../html/entries.html
diff --git a/test/keystrokes/firefox/line_nav_entries.py b/test/keystrokes/firefox/line_nav_entries.py
new file mode 100644
index 0000000..1c8a6cf
--- /dev/null
+++ b/test/keystrokes/firefox/line_nav_entries.py
@@ -0,0 +1,570 @@
+#!/usr/bin/python
+
+"""Test of line navigation."""
+
+from macaroon.playback import *
+import utils
+
+sequence = MacroSequence()
+
+sequence.append(PauseAction(3000))
+sequence.append(KeyComboAction("Tab"))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Home"))
+sequence.append(utils.AssertPresentationAction(
+    "1. Top of file",
+    ["BRAILLE LINE:  'Here are some entries h2'",
+     "     VISIBLE:  'Here are some entries h2', cursor=1",
+     "SPEECH OUTPUT: 'Here are some entries'",
+     "SPEECH OUTPUT: 'heading level 2'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "2. Line Down",
+    ["BRAILLE LINE:  'Type something rather amusing here:  $l'",
+     "     VISIBLE:  'Type something rather amusing he', cursor=1",
+     "SPEECH OUTPUT: 'Type '",
+     "SPEECH OUTPUT: 'something'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: ' rather '",
+     "SPEECH OUTPUT: 'amusing'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: ' here: '",
+     "SPEECH OUTPUT: 'entry'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "3. Line Down",
+    ["BRAILLE LINE:  'Amusing numbers fall between  $l and  $l .'",
+     "     VISIBLE:  'Amusing numbers fall between  $l', cursor=1",
+     "SPEECH OUTPUT: 'Amusing numbers fall between '",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: ' and '",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: '.'"]))
+
+sequence.append(utils.StartRecordingAction())
+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=0",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'I'm a label'"]))
+
+sequence.append(utils.StartRecordingAction())
+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=0",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'Am I a label as well?'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "6. Line Down",
+    ["BRAILLE LINE:  'What the heck should we do here? h2'",
+     "     VISIBLE:  'What the heck should we do here?', cursor=1",
+     "SPEECH OUTPUT: 'What the heck should we do here?'",
+     "SPEECH OUTPUT: 'heading level 2'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "7. Line Down",
+    ["BRAILLE LINE:  'Looking at what follows visually, I'm not sure what I would type/i.e. what the labels 
are.'",
+     "     VISIBLE:  'Looking at what follows visually', cursor=1",
+     "SPEECH OUTPUT: 'Looking at what follows visually, I'm not sure what I would type/i.e. what the labels 
are.'"]))
+
+sequence.append(utils.StartRecordingAction())
+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=0",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'Too far away to be a label.'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "9. Line Down",
+    ["BRAILLE LINE:  'Distance doesn't count on the left $l'",
+     "     VISIBLE:  'Distance doesn't count on the le', cursor=1",
+     "SPEECH OUTPUT: 'Distance doesn't count on the left'",
+     "SPEECH OUTPUT: 'entry'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "10. Line Down",
+    ["BRAILLE LINE:  'Sometimes labels can be below the fields due to <br /> h2'",
+     "     VISIBLE:  'Sometimes labels can be below th', cursor=1",
+     "SPEECH OUTPUT: 'Sometimes labels can be below the fields due to <br />'",
+     "SPEECH OUTPUT: 'heading level 2'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "11. Line Down",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=0",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: '",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "12. Line Down",
+    ["BRAILLE LINE:  'First Name'",
+     "     VISIBLE:  'First Name', cursor=1",
+     "SPEECH OUTPUT: 'First Name'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "13. Line Down",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=0",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: '",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "14. Line Down",
+    ["BRAILLE LINE:  'M.I.'",
+     "     VISIBLE:  'M.I.', cursor=1",
+     "SPEECH OUTPUT: 'M.I.'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "15. Line Down",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=0",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: '",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "16. Line Down",
+    ["BRAILLE LINE:  'Last Name'",
+     "     VISIBLE:  'Last Name', cursor=1",
+     "SPEECH OUTPUT: 'Last Name'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "17. Line Down",
+    ["BRAILLE LINE:  'Other times it's due to layout tables h2'",
+     "     VISIBLE:  'Other times it's due to layout t', cursor=1",
+     "SPEECH OUTPUT: 'Other times it's due to layout tables'",
+     "SPEECH OUTPUT: 'heading level 2'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "18. Line Down",
+    ["BRAILLE LINE:  ' $l $l $l'",
+     "     VISIBLE:  ' $l $l $l', cursor=0",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'entry'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "19. Line Down",
+    ["BRAILLE LINE:  'First name'",
+     "     VISIBLE:  'First name', cursor=1",
+     "SPEECH OUTPUT: 'First name'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "20. Line Down",
+    ["BRAILLE LINE:  'Middle'",
+     "     VISIBLE:  'Middle', cursor=1",
+     "SPEECH OUTPUT: 'Middle",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "21. Line Down",
+    ["BRAILLE LINE:  'initial'",
+     "     VISIBLE:  'initial', cursor=1",
+     "SPEECH OUTPUT: 'initial'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "22. Line Down",
+    ["BRAILLE LINE:  'Last name'",
+     "     VISIBLE:  'Last name', cursor=1",
+     "SPEECH OUTPUT: 'Last '",
+     "SPEECH OUTPUT: 'name'",
+     "SPEECH OUTPUT: 'link'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "23. Line Down",
+    ["BRAILLE LINE:  'Second verse same as the first (only now the labels are above the fields) h2'",
+     "     VISIBLE:  'Second verse same as the first (', cursor=1",
+     "SPEECH OUTPUT: 'Second verse same as the first (only now the labels are above the fields)'",
+     "SPEECH OUTPUT: 'heading level 2'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "24. Line Down",
+    ["BRAILLE LINE:  'First Name'",
+     "     VISIBLE:  'First Name', cursor=1",
+     "SPEECH OUTPUT: 'First Name'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "25. Line Down",
+    ["BRAILLE LINE:  'Middle'",
+     "     VISIBLE:  'Middle', cursor=1",
+     "SPEECH OUTPUT: 'Middle",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "26. Line Down",
+    ["BRAILLE LINE:  'initial'",
+     "     VISIBLE:  'initial', cursor=1",
+     "SPEECH OUTPUT: 'initial'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "27. Line Down",
+    ["BRAILLE LINE:  'Last name'",
+     "     VISIBLE:  'Last name', cursor=1",
+     "SPEECH OUTPUT: 'Last '",
+     "SPEECH OUTPUT: 'name'",
+     "SPEECH OUTPUT: 'link'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "28. Line Down",
+    ["BRAILLE LINE:  ' $l $l $l'",
+     "     VISIBLE:  ' $l $l $l', cursor=0",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'entry'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "29. Line Down",
+    ["BRAILLE LINE:  'Decisions, decisions.... When in doubt, closest table cell text wins h2'",
+     "     VISIBLE:  'Decisions, decisions.... When in', cursor=1",
+     "SPEECH OUTPUT: 'Decisions, decisions.... When in doubt, closest table cell text wins'",
+     "SPEECH OUTPUT: 'heading level 2'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "30. Line Down",
+    ["BRAILLE LINE:  'First name Middle'",
+     "     VISIBLE:  'First name Middle', cursor=1",
+     "SPEECH OUTPUT: 'First name'",
+     "SPEECH OUTPUT: 'Middle",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "31. Line Up",
+    ["BRAILLE LINE:  'Decisions, decisions.... When in doubt, closest table cell text wins h2'",
+     "     VISIBLE:  'Decisions, decisions.... When in', cursor=1",
+     "SPEECH OUTPUT: 'Decisions, decisions.... When in doubt, closest table cell text wins'",
+     "SPEECH OUTPUT: 'heading level 2'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "32. Line Up",
+    ["BRAILLE LINE:  ' $l $l $l'",
+     "     VISIBLE:  ' $l $l $l', cursor=0",
+     "SPEECH OUTPUT: 'First Name'",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'entry'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "33. Line Up",
+    ["BRAILLE LINE:  'Last name'",
+     "     VISIBLE:  'Last name', cursor=1",
+     "SPEECH OUTPUT: 'Last '",
+     "SPEECH OUTPUT: 'name'",
+     "SPEECH OUTPUT: 'link'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "34. Line Up",
+    ["BRAILLE LINE:  'initial'",
+     "     VISIBLE:  'initial', cursor=1",
+     "SPEECH OUTPUT: 'initial'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "35. Line Up",
+    ["BRAILLE LINE:  'Middle'",
+     "     VISIBLE:  'Middle', cursor=1",
+     "SPEECH OUTPUT: 'Middle",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "36. Line Up",
+    ["BRAILLE LINE:  'First Name'",
+     "     VISIBLE:  'First Name', cursor=1",
+     "SPEECH OUTPUT: 'First Name'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "37. Line Up",
+    ["BRAILLE LINE:  'Second verse same as the first (only now the labels are above the fields) h2'",
+     "     VISIBLE:  'Second verse same as the first (', cursor=1",
+     "SPEECH OUTPUT: 'Second verse same as the first (only now the labels are above the fields)'",
+     "SPEECH OUTPUT: 'heading level 2'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "38. Line Up",
+    ["BRAILLE LINE:  'Last name'",
+     "     VISIBLE:  'Last name', cursor=1",
+     "SPEECH OUTPUT: 'Last '",
+     "SPEECH OUTPUT: 'name'",
+     "SPEECH OUTPUT: 'link'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "39. Line Up",
+    ["BRAILLE LINE:  'initial'",
+     "     VISIBLE:  'initial', cursor=1",
+     "SPEECH OUTPUT: 'initial'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "40. Line Up",
+    ["BRAILLE LINE:  'Middle'",
+     "     VISIBLE:  'Middle', cursor=1",
+     "SPEECH OUTPUT: 'Middle",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "41. Line Up",
+    ["BRAILLE LINE:  'First name'",
+     "     VISIBLE:  'First name', cursor=1",
+     "SPEECH OUTPUT: 'First name'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "42. Line Up",
+    ["BRAILLE LINE:  ' $l $l $l'",
+     "     VISIBLE:  ' $l $l $l', cursor=0",
+     "SPEECH OUTPUT: 'First name'",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'entry'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "43. Line Up",
+    ["BRAILLE LINE:  'Other times it's due to layout tables h2'",
+     "     VISIBLE:  'Other times it's due to layout t', cursor=1",
+     "SPEECH OUTPUT: 'Other times it's due to layout tables'",
+     "SPEECH OUTPUT: 'heading level 2'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "44. Line Up",
+    ["BRAILLE LINE:  'Last Name'",
+     "     VISIBLE:  'Last Name', cursor=1",
+     "SPEECH OUTPUT: 'Last Name'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "45. Line Up",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=0",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: '",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "46. Line Up",
+    ["BRAILLE LINE:  'M.I.'",
+     "     VISIBLE:  'M.I.', cursor=1",
+     "SPEECH OUTPUT: 'M.I.'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "47. Line Up",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=0",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: '",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "48. Line Up",
+    ["BRAILLE LINE:  'First Name'",
+     "     VISIBLE:  'First Name', cursor=1",
+     "SPEECH OUTPUT: 'First Name'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "49. Line Up",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=0",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: '",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "50. Line Up",
+    ["BRAILLE LINE:  'Sometimes labels can be below the fields due to <br /> h2'",
+     "     VISIBLE:  'Sometimes labels can be below th', cursor=1",
+     "SPEECH OUTPUT: 'Sometimes labels can be below the fields due to <br />'",
+     "SPEECH OUTPUT: 'heading level 2'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "51. Line Up",
+    ["BRAILLE LINE:  'Distance doesn't count on the left $l'",
+     "     VISIBLE:  'Distance doesn't count on the le', cursor=1",
+     "SPEECH OUTPUT: 'Distance doesn't count on the left'",
+     "SPEECH OUTPUT: 'entry'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "52. Line Up",
+    ["KNOWN ISSUE: We are double-speaking the text",
+     "BRAILLE LINE:  ' $l Too far away to be a label.'",
+     "     VISIBLE:  ' $l Too far away to be a label.', cursor=0",
+     "SPEECH OUTPUT: 'Too far away to be a label.'",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'Too far away to be a label.'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "53. Line Up",
+    ["BRAILLE LINE:  'Looking at what follows visually, I'm not sure what I would type/i.e. what the labels 
are.'",
+     "     VISIBLE:  'Looking at what follows visually', cursor=1",
+     "SPEECH OUTPUT: 'Looking at what follows visually, I'm not sure what I would type/i.e. what the labels 
are.'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "54. Line Up",
+    ["BRAILLE LINE:  'What the heck should we do here? h2'",
+     "     VISIBLE:  'What the heck should we do here?', cursor=1",
+     "SPEECH OUTPUT: 'What the heck should we do here?'",
+     "SPEECH OUTPUT: 'heading level 2'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "55. Line Up",
+    ["KNOWN ISSUE: We are double-speaking the text",
+     "BRAILLE LINE:  ' $l Am I a label as well?'",
+     "     VISIBLE:  ' $l Am I a label as well?', cursor=0",
+     "SPEECH OUTPUT: 'Am I a label as well?'",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'Am I a label as well?'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "56. Line Up",
+    ["KNOWN ISSUE: We are double-speaking the text",
+     "BRAILLE LINE:  ' $l I'm a label'",
+     "     VISIBLE:  ' $l I'm a label', cursor=0",
+     "SPEECH OUTPUT: 'I'm a label'",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'I'm a label'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "57. Line Up",
+    ["BRAILLE LINE:  'Amusing numbers fall between  $l and  $l .'",
+     "     VISIBLE:  'Amusing numbers fall between  $l', cursor=1",
+     "SPEECH OUTPUT: 'Amusing numbers fall between '",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: ' and '",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: '.'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "58. Line Up",
+    ["BRAILLE LINE:  'Type something rather amusing here:  $l'",
+     "     VISIBLE:  'Type something rather amusing he', cursor=1",
+     "SPEECH OUTPUT: 'Type '",
+     "SPEECH OUTPUT: 'something'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: ' rather '",
+     "SPEECH OUTPUT: 'amusing'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: ' here: '",
+     "SPEECH OUTPUT: 'entry'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "59. Line Up",
+    ["BRAILLE LINE:  'Here are some entries h2'",
+     "     VISIBLE:  'Here are some entries h2', cursor=1",
+     "SPEECH OUTPUT: 'Here are some entries'",
+     "SPEECH OUTPUT: 'heading level 2'"]))
+
+sequence.append(utils.AssertionSummaryAction())
+sequence.start()
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 4a8067f..0e5f4f9 100644
--- a/test/keystrokes/firefox/line_nav_follow_same_page_link.py
+++ b/test/keystrokes/firefox/line_nav_follow_same_page_link.py
@@ -43,7 +43,7 @@ sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "4. Return",
     ["BRAILLE LINE:  'seas. '",
-     "     VISIBLE:  'seas. ', cursor=7",
+     "     VISIBLE:  'seas. ', cursor=0",
      "SPEECH OUTPUT: 'link' voice=hyperlink"]))
 
 sequence.append(utils.StartRecordingAction())
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 21bcbbf..5b1e6d1 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
@@ -7,6 +7,8 @@ import utils
 
 sequence = MacroSequence()
 
+sequence.append(PauseAction(3000))
+
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
diff --git a/test/keystrokes/firefox/line_nav_home_end_on_blank_line.py 
b/test/keystrokes/firefox/line_nav_home_end_on_blank_line.py
index b99cc63..066dbf4 100644
--- a/test/keystrokes/firefox/line_nav_home_end_on_blank_line.py
+++ b/test/keystrokes/firefox/line_nav_home_end_on_blank_line.py
@@ -6,53 +6,22 @@ from macaroon.playback import *
 import utils
 
 sequence = MacroSequence()
-
-sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
-sequence.append(utils.AssertPresentationAction(
-    "1. Top of file", 
-    ["BRAILLE LINE:  'This is a test.'",
-     "     VISIBLE:  'This is a test.', cursor=1",
-     "SPEECH OUTPUT: 'This is a test.",
-     "'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "2. Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
+sequence.append(KeyComboAction("End"))
+sequence.append(KeyComboAction("Right"))
 
 sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Home"))
+sequence.append(KeyComboAction("End"))
 sequence.append(utils.AssertPresentationAction(
-    "3. Home",
+    "1. End",
     ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'newline'"]))
 
 sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("<Control>Home"))
-sequence.append(utils.AssertPresentationAction(
-    "4. Top of file",
-    ["BRAILLE LINE:  'This is a test.'",
-     "     VISIBLE:  'This is a test.', cursor=1",
-     "SPEECH OUTPUT: 'This is a test.",
-     "'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "5. Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("End"))
+sequence.append(KeyComboAction("Home"))
 sequence.append(utils.AssertPresentationAction(
-    "6. End",
+    "2. Home",
     ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'newline'"]))
diff --git a/test/keystrokes/firefox/line_nav_images_in_links.py 
b/test/keystrokes/firefox/line_nav_images_in_links.py
index 4991df6..6d20129 100644
--- a/test/keystrokes/firefox/line_nav_images_in_links.py
+++ b/test/keystrokes/firefox/line_nav_images_in_links.py
@@ -7,6 +7,8 @@ import utils
 
 sequence = MacroSequence()
 
+sequence.append(PauseAction(3000))
+
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
@@ -22,16 +24,6 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Down",
-    ["BRAILLE LINE:  'Orca logo image'",
-     "     VISIBLE:  'Orca logo image', cursor=1",
-     "SPEECH OUTPUT: 'Orca logo'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "3. Line Down",
     ["BRAILLE LINE:  'One image with title attribute in a link: Orca logo showing a whale holding a white 
cane image'",
      "     VISIBLE:  'One image with title attribute i', cursor=1",
      "SPEECH OUTPUT: 'One image with title attribute in a link: '",
@@ -42,17 +34,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "4. Line Down",
-    ["BRAILLE LINE:  'Orca logo showing a whale holding a white cane image'",
-     "     VISIBLE:  'Orca logo showing a whale holdin', cursor=1",
-     "SPEECH OUTPUT: 'Orca logo showing a whale holding a white cane'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "5. Line Down",
+    "3. Line Down",
     ["BRAILLE LINE:  'One image with both alt text and title attribute in a link: Orca logo image'",
      "     VISIBLE:  'One image with both alt text and', cursor=1",
      "SPEECH OUTPUT: 'One image with both alt text and title attribute in a link: '",
@@ -64,18 +46,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "6. Line Down",
-    ["BRAILLE LINE:  'Orca logo image'",
-     "     VISIBLE:  'Orca logo image', cursor=1",
-     "SPEECH OUTPUT: 'Orca logo'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'Orca logo showing a whale holding a white cane'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "7. Line Down",
+    "4. Line Down",
     ["BRAILLE LINE:  'One \"useless\" image in a link: foo image'",
      "     VISIBLE:  'One \"useless\" image in a link: f', cursor=1",
      "SPEECH OUTPUT: 'One \"useless\" image in a link: '",
@@ -86,17 +57,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "8. Line Down",
-    ["BRAILLE LINE:  'foo image'",
-     "     VISIBLE:  'foo image', cursor=1",
-     "SPEECH OUTPUT: 'foo'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "9. Line Down",
+    "5. Line Down",
     ["BRAILLE LINE:  'Two \"useless\" images in a link: foo image foo image'",
      "     VISIBLE:  'Two \"useless\" images in a link: ', cursor=1",
      "SPEECH OUTPUT: 'Two \"useless\" images in a link: '",
@@ -110,20 +71,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "10. Line Down",
-    ["BRAILLE LINE:  'foo image foo image'",
-     "     VISIBLE:  'foo image foo image', cursor=1",
-     "SPEECH OUTPUT: 'foo'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'foo'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "11. Line Down",
+    "6. Line Down",
     ["BRAILLE LINE:  'Two \"useless\" images in a paragraph that is inside of a link: foo'",
      "     VISIBLE:  'Two \"useless\" images in a paragr', cursor=1",
      "SPEECH OUTPUT: 'Two \"useless\" images in a paragraph that is inside of a link: '",
@@ -133,9 +81,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "12. Line Down",
+    "7. Line Down",
     ["BRAILLE LINE:  'foo image foo image'",
-     "     VISIBLE:  'foo image foo image', cursor=1",
+     "     VISIBLE:  'foo image foo image', cursor=0",
      "SPEECH OUTPUT: 'foo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
@@ -146,7 +94,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "13. Line Down",
+    "8. Line Down",
     ["BRAILLE LINE:  'One \"useless\" image and one \"useful\" image in a link: Orca logo image foo image'",
      "     VISIBLE:  'One \"useless\" image and one \"use', cursor=1",
      "SPEECH OUTPUT: 'One \"useless\" image and one \"useful\" image in a link: '",
@@ -160,20 +108,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "14. Line Down",
-    ["BRAILLE LINE:  'Orca logo image foo image'",
-     "     VISIBLE:  'Orca logo image foo image', cursor=1",
-     "SPEECH OUTPUT: 'Orca logo'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'foo'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "15. Line Down",
+    "9. Line Down",
     ["BRAILLE LINE:  'Two \"useless\" images along with some text in a link: foo image silly link foo 
image'",
      "     VISIBLE:  'Two \"useless\" images along with ', cursor=1",
      "SPEECH OUTPUT: 'Two \"useless\" images along with some text in a link: '",
@@ -190,44 +125,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "16. Line Down",
-    ["BRAILLE LINE:  'foo image'",
-     "     VISIBLE:  'foo image', cursor=1",
-     "SPEECH OUTPUT: 'foo'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "17. Line Down",
-    ["BRAILLE LINE:  'Two \"useless\" images along with some text in a link: foo image silly link foo 
image'",
-     "     VISIBLE:  'silly link foo image', cursor=1",
-     "SPEECH OUTPUT: 'Two \"useless\" images along with some text in a link: '",
-     "SPEECH OUTPUT: 'foo'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'silly link'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'foo'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "18. Line Down",
-    ["BRAILLE LINE:  'foo image'",
-     "     VISIBLE:  'foo image', cursor=1",
-     "SPEECH OUTPUT: 'foo'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "19. Line Down",
+    "10. 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'",
      "     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: '",
@@ -237,7 +135,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "20. Line Down",
+    "11. Line Down",
     ["BRAILLE LINE:  'the paragraph'",
      "     VISIBLE:  'the paragraph', cursor=1",
      "SPEECH OUTPUT: 'the paragraph'",
@@ -246,9 +144,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "21. Line Down",
+    "12. Line Down",
     ["BRAILLE LINE:  'foo image foo image'",
-     "     VISIBLE:  'foo image foo image', cursor=1",
+     "     VISIBLE:  'foo image foo image', cursor=0",
      "SPEECH OUTPUT: 'foo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
@@ -259,7 +157,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "22. Line Down",
+    "13. Line Down",
     ["BRAILLE LINE:  'After the paragraph'",
      "     VISIBLE:  'After the paragraph', cursor=1",
      "SPEECH OUTPUT: 'After the paragraph'",
@@ -268,7 +166,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "23. Line Down",
+    "14. 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'",
      "     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 '"]))
@@ -276,7 +174,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "24. Line Down",
+    "15. Line Down",
     ["BRAILLE LINE:  'the paragraph: Before the paragraph'",
      "     VISIBLE:  'the paragraph: Before the paragr', cursor=1",
      "SPEECH OUTPUT: 'the paragraph: '",
@@ -286,25 +184,12 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "25. Line Down",
-    ["BRAILLE LINE:  'foo image'",
-     "     VISIBLE:  'foo image', cursor=1",
-     "SPEECH OUTPUT: 'foo'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "26. Line Down",
-    ["BRAILLE LINE:  'foo image silly link foo image'",
-     "     VISIBLE:  'foo image silly link foo image', cursor=11",
+    "16. Line Down",
+    ["BRAILLE LINE:  'foo image foo image'",
+     "     VISIBLE:  'foo image foo image', cursor=0",
      "SPEECH OUTPUT: 'foo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'silly link'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: 'foo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
@@ -312,17 +197,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "27. Line Down",
-    ["BRAILLE LINE:  'foo image'",
-     "     VISIBLE:  'foo image', cursor=1",
-     "SPEECH OUTPUT: 'foo'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "28. Line Down",
+    "17. Line Down",
     ["BRAILLE LINE:  'After the paragraph'",
      "     VISIBLE:  'After the paragraph', cursor=1",
      "SPEECH OUTPUT: 'After the paragraph'",
@@ -331,50 +206,20 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "29. Line Up",
-    ["BRAILLE LINE:  'foo image'",
-     "     VISIBLE:  'foo image', cursor=1",
+    "18. Line Up",
+    ["BRAILLE LINE:  'foo image foo image'",
+     "     VISIBLE:  'foo image foo image', cursor=0",
      "SPEECH OUTPUT: 'foo'",
      "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "30. Line Up",
-    ["KNOWN ISSUE: We seem to be skipping over some things when arrowing up.",
-     "BRAILLE LINE:  'foo image'",
-     "     VISIBLE:  'foo image', cursor=1",
+     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: 'foo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
 
-#    ["BRAILLE LINE:  'foo image silly link foo image'",
-#     "     VISIBLE:  'foo image silly link foo image', cursor=11",
-#     "SPEECH OUTPUT: 'foo'",
-#     "SPEECH OUTPUT: 'link'",
-#     "SPEECH OUTPUT: 'image'",
-#     "SPEECH OUTPUT: 'silly link'",
-#     "SPEECH OUTPUT: 'link'",
-#     "SPEECH OUTPUT: 'image'",
-#     "SPEECH OUTPUT: 'foo'",
-#     "SPEECH OUTPUT: 'link'",
-#     "SPEECH OUTPUT: 'image'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Up"))
-#sequence.append(utils.AssertPresentationAction(
-#    "31. Line Up",
-#    ["BRAILLE LINE:  'foo image'",
-#     "     VISIBLE:  'foo image', cursor=1",
-#     "SPEECH OUTPUT: 'foo'",
-#     "SPEECH OUTPUT: 'link'",
-#     "SPEECH OUTPUT: 'image'"]))
-
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "31. Line Up",
+    "19. Line Up",
     ["BRAILLE LINE:  'the paragraph: Before the paragraph'",
      "     VISIBLE:  'the paragraph: Before the paragr', cursor=1",
      "SPEECH OUTPUT: 'the paragraph: '",
@@ -384,7 +229,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "32. Line Up",
+    "20. 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'",
      "     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 '"]))
@@ -392,7 +237,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "33. Line Up",
+    "21. Line Up",
     ["BRAILLE LINE:  'After the paragraph'",
      "     VISIBLE:  'After the paragraph', cursor=1",
      "SPEECH OUTPUT: 'After the paragraph'",
@@ -401,9 +246,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "34. Line Up",
+    "22. Line Up",
     ["BRAILLE LINE:  'foo image foo image'",
-     "     VISIBLE:  'foo image foo image', cursor=1",
+     "     VISIBLE:  'foo image foo image', cursor=0",
      "SPEECH OUTPUT: 'foo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
@@ -414,7 +259,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "35. Line Up",
+    "23. Line Up",
     ["BRAILLE LINE:  'the paragraph'",
      "     VISIBLE:  'the paragraph', cursor=1",
      "SPEECH OUTPUT: 'the paragraph'",
@@ -423,7 +268,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "36. Line Up",
+    "24. 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'",
      "     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: '",
@@ -433,9 +278,12 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "37. Line Up",
-    ["BRAILLE LINE:  'foo image'",
-     "     VISIBLE:  'foo image', cursor=1",
+    "25. Line Up",
+    ["BRAILLE LINE:  'foo image foo image'",
+     "     VISIBLE:  'foo image foo image', cursor=0",
+     "SPEECH OUTPUT: 'foo'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: 'foo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
@@ -443,7 +291,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "38. Line Up",
+    "26. Line Up",
     ["BRAILLE LINE:  'Two \"useless\" images along with some text in a link: foo image silly link foo 
image'",
      "     VISIBLE:  'Two \"useless\" images along with ', cursor=1",
      "SPEECH OUTPUT: 'Two \"useless\" images along with some text in a link: '",
@@ -457,40 +305,12 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
 
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Up"))
-#sequence.append(utils.AssertPresentationAction(
-#    "39. Line Up",
-#    ["BRAILLE LINE:  'foo image'",
-#     "     VISIBLE:  'foo image', cursor=1",
-#     "SPEECH OUTPUT: 'foo'",
-#     "SPEECH OUTPUT: 'link'",
-#     "SPEECH OUTPUT: 'image'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Up"))
-#sequence.append(utils.AssertPresentationAction(
-#    "40. Line Up",
-#    ["BRAILLE LINE:  'Two \"useless\" images along with some text in a link: foo image silly link foo 
image'",
-#     "     VISIBLE:  'Two \"useless\" images along with ', cursor=1",
-#     "SPEECH OUTPUT: 'Two \"useless\" images along with some text in a link: '",
-#     "SPEECH OUTPUT: 'foo'",
-#     "SPEECH OUTPUT: 'link'",
-#     "SPEECH OUTPUT: 'image'",
-#     "SPEECH OUTPUT: 'silly link'",
-#     "SPEECH OUTPUT: 'link'",
-#     "SPEECH OUTPUT: 'image'",
-#     "SPEECH OUTPUT: 'foo'",
-#     "SPEECH OUTPUT: 'link'",
-#     "SPEECH OUTPUT: 'image'"]))
-
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "39. Line Up",
-    ["KNOWN ISSUE: Another case where we just skipped over something",
-     "BRAILLE LINE:  'Orca logo image foo image'",
-     "     VISIBLE:  'Orca logo image foo image', cursor=1",
+    "27. Line Up",
+    ["BRAILLE LINE:  'foo image Orca logo image'",
+     "     VISIBLE:  'foo image Orca logo image', cursor=0",
      "SPEECH OUTPUT: 'Orca logo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
@@ -501,7 +321,20 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "40. Line Up",
+    "28. Line Up",
+    ["BRAILLE LINE:  'Orca logo image foo image'",
+     "     VISIBLE:  'Orca logo image foo image', cursor=0",
+     "SPEECH OUTPUT: 'foo'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
+     "SPEECH OUTPUT: 'Orca logo'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "29. Line Up",
     ["BRAILLE LINE:  'One \"useless\" image and one \"useful\" image in a link: Orca logo image foo image'",
      "     VISIBLE:  'One \"useless\" image and one \"use', cursor=1",
      "SPEECH OUTPUT: 'One \"useless\" image and one \"useful\" image in a link: '",
@@ -515,9 +348,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "41. Line Up",
+    "30. Line Up",
     ["BRAILLE LINE:  'foo image foo image'",
-     "     VISIBLE:  'foo image foo image', cursor=1",
+     "     VISIBLE:  'foo image foo image', cursor=0",
      "SPEECH OUTPUT: 'foo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
@@ -528,7 +361,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "42. Line Up",
+    "31. Line Up",
     ["BRAILLE LINE:  'Two \"useless\" images in a paragraph that is inside of a link: foo'",
      "     VISIBLE:  'Two \"useless\" images in a paragr', cursor=1",
      "SPEECH OUTPUT: 'Two \"useless\" images in a paragraph that is inside of a link: '",
@@ -538,9 +371,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "43. Line Up",
+    "32. Line Up",
     ["BRAILLE LINE:  'foo image foo image'",
-     "     VISIBLE:  'foo image foo image', cursor=1",
+     "     VISIBLE:  'foo image foo image', cursor=0",
      "SPEECH OUTPUT: 'foo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
@@ -551,7 +384,20 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "44. Line Up",
+    "33. Line Up",
+    ["BRAILLE LINE:  'foo image foo image'",
+     "     VISIBLE:  'foo image foo image', cursor=0",
+     "SPEECH OUTPUT: 'foo'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
+     "SPEECH OUTPUT: 'foo'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "34. Line Up",
     ["BRAILLE LINE:  'Two \"useless\" images in a link: foo image foo image'",
      "     VISIBLE:  'Two \"useless\" images in a link: ', cursor=1",
      "SPEECH OUTPUT: 'Two \"useless\" images in a link: '",
@@ -565,9 +411,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "45. Line Up",
+    "35. Line Up",
     ["BRAILLE LINE:  'foo image'",
-     "     VISIBLE:  'foo image', cursor=1",
+     "     VISIBLE:  'foo image', cursor=0",
      "SPEECH OUTPUT: 'foo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
@@ -575,7 +421,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "46. Line Up",
+    "36. Line Up",
     ["BRAILLE LINE:  'One \"useless\" image in a link: foo image'",
      "     VISIBLE:  'One \"useless\" image in a link: f', cursor=1",
      "SPEECH OUTPUT: 'One \"useless\" image in a link: '",
@@ -586,9 +432,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "47. Line Up",
+    "37. Line Up",
     ["BRAILLE LINE:  'Orca logo image'",
-     "     VISIBLE:  'Orca logo image', cursor=1",
+     "     VISIBLE:  'Orca logo image', cursor=0",
      "SPEECH OUTPUT: 'Orca logo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
@@ -597,7 +443,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "48. Line Up",
+    "38. Line Up",
     ["BRAILLE LINE:  'One image with both alt text and title attribute in a link: Orca logo image'",
      "     VISIBLE:  'One image with both alt text and', cursor=1",
      "SPEECH OUTPUT: 'One image with both alt text and title attribute in a link: '",
@@ -609,9 +455,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "49. Line Up",
+    "39. Line Up",
     ["BRAILLE LINE:  'Orca logo showing a whale holding a white cane image'",
-     "     VISIBLE:  'Orca logo showing a whale holdin', cursor=1",
+     "     VISIBLE:  'Orca logo showing a whale holdin', cursor=0",
      "SPEECH OUTPUT: 'Orca logo showing a whale holding a white cane'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
@@ -619,7 +465,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "50. Line Up",
+    "40. Line Up",
     ["BRAILLE LINE:  'One image with title attribute in a link: Orca logo showing a whale holding a white 
cane image'",
      "     VISIBLE:  'One image with title attribute i', cursor=1",
      "SPEECH OUTPUT: 'One image with title attribute in a link: '",
@@ -630,9 +476,20 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "51. Line Up",
+    "41. Line Up",
     ["BRAILLE LINE:  'Orca logo image'",
-     "     VISIBLE:  'Orca logo image', cursor=1",
+     "     VISIBLE:  'Orca logo image', cursor=0",
+     "SPEECH OUTPUT: 'Orca logo'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "42. Line Up",
+    ["BRAILLE LINE:  'One image with alt text in a link: Orca logo image'",
+     "     VISIBLE:  'One image with alt text in a lin', cursor=1",
+     "SPEECH OUTPUT: 'One image with alt text in a link: '",
      "SPEECH OUTPUT: 'Orca logo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
diff --git a/test/keystrokes/firefox/html_role_lists.params b/test/keystrokes/firefox/line_nav_lists.params
similarity index 100%
rename from test/keystrokes/firefox/html_role_lists.params
rename to test/keystrokes/firefox/line_nav_lists.params
diff --git a/test/keystrokes/firefox/html_role_lists.py b/test/keystrokes/firefox/line_nav_lists.py
similarity index 77%
rename from test/keystrokes/firefox/html_role_lists.py
rename to test/keystrokes/firefox/line_nav_lists.py
index fd52572..73f76cd 100644
--- a/test/keystrokes/firefox/html_role_lists.py
+++ b/test/keystrokes/firefox/line_nav_lists.py
@@ -30,15 +30,6 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
-    ["BRAILLE LINE:  'Lists are not only fun to make, they are fun to use. They help us: 1.remember what the 
heck we are doing each day'",
-    "     VISIBLE:  '1.remember what the heck we are ', cursor=1",
-    "SPEECH OUTPUT: 'Lists are not only fun to make, they are fun to use. They help us: '",
-    "SPEECH OUTPUT: '1.remember what the heck we are doing each day'"]))
-
-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'",
      "     VISIBLE:  '2.arrange long and arbitrary lin', cursor=1",
      "SPEECH OUTPUT: '2.arrange long and arbitrary lines of text into ordered lists that are pleasing to the 
eye and suggest some '"]))
@@ -46,7 +37,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "5. Line Down",
+    "4. 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'"]))
@@ -54,7 +45,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "6. Line Down",
+    "5. Line Down",
     ["BRAILLE LINE:  '3.look really cool when we carry them around on yellow Post-Itstm.'",
      "     VISIBLE:  '3.look really cool when we carry', cursor=1",
      "SPEECH OUTPUT: '3.look really cool when we carry them around on yellow Post-Itstm.'"]))
@@ -62,7 +53,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "7. Line Down",
+    "6. Line Down",
     ["BRAILLE LINE:  '4.and that other thing I keep forgetting.'",
      "     VISIBLE:  '4.and that other thing I keep fo', cursor=1",
      "SPEECH OUTPUT: '4.and that other thing I keep forgetting.'"]))
@@ -70,7 +61,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "8. Line Down",
+    "7. Line Down",
     ["KNOWN ISSUE: We seem to be combining items here",
      "BRAILLE LINE:  'Your ordered lists can start at a strange number, like: VI.And use roman numerals,'",
      "     VISIBLE:  'Your ordered lists can start at ', cursor=1",
@@ -80,24 +71,31 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
+    "8. Line Down",
+    ["BRAILLE LINE:  'g.You might try using letters as well,'",
+     "     VISIBLE:  'g.You might try using letters as', cursor=1",
+     "SPEECH OUTPUT: 'g.You might try using letters as well,'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
     "9. Line Down",
-    ["BRAILLE LINE:  'Your ordered lists can start at a strange number, like: VI.And use roman numerals,'",
-     "     VISIBLE:  'VI.And use roman numerals,', cursor=1",
-     "SPEECH OUTPUT: 'Your ordered lists can start at a strange number, like: '",
-     "SPEECH OUTPUT: 'VI.And use roman numerals,'"]))
+    ["BRAILLE LINE:  'H.Maybe you prefer Big Letters,'",
+     "     VISIBLE:  'H.Maybe you prefer Big Letters,', cursor=1",
+     "SPEECH OUTPUT: 'H.Maybe you prefer Big Letters,'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "10. Line Down",
-    ["BRAILLE LINE:  'g.You might try using letters as well,'",
-     "     VISIBLE:  'g.You might try using letters as', cursor=1",
-     "SPEECH OUTPUT: 'g.You might try using letters as well,'"]))
+    ["BRAILLE LINE:  'ix.or small roman numerals'",
+     "     VISIBLE:  'ix.or small roman numerals', cursor=1",
+     "SPEECH OUTPUT: 'ix.or small roman numerals'"]))
 
 sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
+sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "11. Line Down",
+    "11. Line Up",
     ["BRAILLE LINE:  'H.Maybe you prefer Big Letters,'",
      "     VISIBLE:  'H.Maybe you prefer Big Letters,', cursor=1",
      "SPEECH OUTPUT: 'H.Maybe you prefer Big Letters,'"]))
@@ -106,17 +104,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "12. Line Up",
-    ["BRAILLE LINE:  'You might try using letters as well,'",
-     "     VISIBLE:  'You might try using letters as w', cursor=1",
-     "SPEECH OUTPUT: 'You might try using letters as well,'"]))
+    ["BRAILLE LINE:  'g.You might try using letters as well,'",
+     "     VISIBLE:  'g.You might try using letters as', cursor=1",
+     "SPEECH OUTPUT: 'g.You might try using letters as well,'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "13. Line Up",
-    ["BRAILLE LINE:  'And use roman numerals,'",
-     "     VISIBLE:  'And use roman numerals,', cursor=1",
-     "SPEECH OUTPUT: 'And use roman numerals,'"]))
+    ["BRAILLE LINE:  'VI.And use roman numerals,'",
+     "     VISIBLE:  'VI.And use roman numerals,', cursor=1",
+     "SPEECH OUTPUT: 'VI.And use roman numerals,'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -132,19 +130,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "15. Line Up",
-    ["KNOWN ISSUE: We lost the list item marker here",
-     "BRAILLE LINE:  'and that other thing I keep forgetting.'",
-     "     VISIBLE:  'and that other thing I keep forg', cursor=1",
-     "SPEECH OUTPUT: 'and that other thing I keep forgetting.'"]))
+    ["BRAILLE LINE:  '4.and that other thing I keep forgetting.'",
+     "     VISIBLE:  '4.and that other thing I keep fo', cursor=1",
+     "SPEECH OUTPUT: '4.and that other thing I keep forgetting.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "16. Line Up",
-    ["KNOWN ISSUE: We lost the list item marker here",
-     "BRAILLE LINE:  'look really cool when we carry them around on yellow Post-Itstm.'",
-     "     VISIBLE:  'look really cool when we carry t', cursor=1",
-     "SPEECH OUTPUT: 'look really cool when we carry them around on yellow Post-Itstm.'"]))
+    ["BRAILLE LINE:  '3.look really cool when we carry them around on yellow Post-Itstm.'",
+     "     VISIBLE:  '3.look really cool when we carry', cursor=1",
+     "SPEECH OUTPUT: '3.look really cool when we carry them around on yellow Post-Itstm.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -158,17 +154,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "18. Line Up",
-    ["BRAILLE LINE:  'arrange long and arbitrary lines of text into ordered lists that are pleasing to the 
eye and suggest some'",
-     "     VISIBLE:  'arrange long and arbitrary lines', cursor=1",
-     "SPEECH OUTPUT: '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'",
+     "     VISIBLE:  '2.arrange long and arbitrary lin', cursor=1",
+     "SPEECH OUTPUT: '2.arrange long and arbitrary lines of text into ordered lists that are pleasing to the 
eye and suggest some '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "19. Line Up",
-    ["BRAILLE LINE:  'remember what the heck we are doing each day'",
-     "     VISIBLE:  'remember what the heck we are do', cursor=1",
-     "SPEECH OUTPUT: 'remember what the heck we are doing each day'"]))
+    ["BRAILLE LINE:  '1.remember what the heck we are doing each day'",
+     "     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())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_nested_tables.py 
b/test/keystrokes/firefox/line_nav_nested_tables.py
index 7c82af8..5b5cbcf 100644
--- a/test/keystrokes/firefox/line_nav_nested_tables.py
+++ b/test/keystrokes/firefox/line_nav_nested_tables.py
@@ -12,7 +12,7 @@ sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "1. Top of file",
     ["BRAILLE LINE:  'nested-tables image'",
-     "     VISIBLE:  'nested-tables image', cursor=1",
+     "     VISIBLE:  'nested-tables image', cursor=0",
      "SPEECH OUTPUT: 'nested-tables'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
@@ -82,7 +82,7 @@ sequence.append(utils.AssertPresentationAction(
     "8. line Down",
     ["KNOWN ISSUE: We are now finding and moving to useless table cells.",
      "BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -99,7 +99,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "10. line Down",
     ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -107,7 +107,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "11. line Down",
     ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -123,7 +123,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "13. line Down",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -147,7 +147,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "16. line Down",
     ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -164,7 +164,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "18. line Down",
     ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -172,7 +172,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "19. line Down",
     ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -188,7 +188,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "21. line Down",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -204,7 +204,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "23. line Up",
     ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -212,7 +212,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "24. line Up",
     ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -229,7 +229,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "26. line Up",
     ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -253,7 +253,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "29. line Up",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -269,7 +269,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "31. line Up",
     ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -277,7 +277,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "32. line Up",
     ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -294,7 +294,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "34. line Up",
     ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+     "     VISIBLE:  'table cell', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -361,7 +361,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "41. line Up",
     ["BRAILLE LINE:  'nested-tables image'",
-     "     VISIBLE:  'nested-tables image', cursor=1",
+     "     VISIBLE:  'nested-tables image', cursor=0",
      "SPEECH OUTPUT: 'nested-tables'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
diff --git a/test/keystrokes/firefox/line_nav_pre_links.params 
b/test/keystrokes/firefox/line_nav_pre_links.params
new file mode 100644
index 0000000..9796717
--- /dev/null
+++ b/test/keystrokes/firefox/line_nav_pre_links.params
@@ -0,0 +1 @@
+PARAMS=$TEST_DIR/../../html/link-in-pre.html
diff --git a/test/keystrokes/firefox/line_nav_pre_links.py b/test/keystrokes/firefox/line_nav_pre_links.py
new file mode 100644
index 0000000..f952aea
--- /dev/null
+++ b/test/keystrokes/firefox/line_nav_pre_links.py
@@ -0,0 +1,91 @@
+#!/usr/bin/python
+
+"""Test of line navigation output of Firefox."""
+
+from macaroon.playback import *
+import utils
+
+sequence = MacroSequence()
+
+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(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "2. Line Down",
+    ["BRAILLE LINE:  'Line 2'",
+     "     VISIBLE:  'Line 2', cursor=1",
+     "SPEECH OUTPUT: 'Line 2'",
+     "SPEECH OUTPUT: 'link'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "3. Line Down",
+    ["BRAILLE LINE:  'Line 3'",
+     "     VISIBLE:  'Line 3', cursor=1",
+     "SPEECH OUTPUT: 'Line 3 '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "4. Line Down",
+    ["BRAILLE LINE:  'Line 4'",
+     "     VISIBLE:  'Line 4', cursor=1",
+     "SPEECH OUTPUT: 'Line 4'",
+     "SPEECH OUTPUT: 'link'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "5. Line Down",
+    ["BRAILLE LINE:  'Line 5'",
+     "     VISIBLE:  'Line 5', cursor=1",
+     "SPEECH OUTPUT: 'Line 5 '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "6. Line Up",
+    ["BRAILLE LINE:  'Line 4'",
+     "     VISIBLE:  'Line 4', cursor=1",
+     "SPEECH OUTPUT: 'Line 4'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: '",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "7. Line Up",
+    ["BRAILLE LINE:  'Line 3'",
+     "     VISIBLE:  'Line 3', cursor=1",
+     "SPEECH OUTPUT: 'Line 3 '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "8. Line Up",
+    ["BRAILLE LINE:  'Line 2'",
+     "     VISIBLE:  'Line 2', cursor=1",
+     "SPEECH OUTPUT: 'Line 2'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: '",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "9. Line Up",
+    ["BRAILLE LINE:  'Line 1'",
+     "     VISIBLE:  'Line 1', cursor=1",
+     "SPEECH OUTPUT: 'Line 1 '"]))
+
+sequence.append(utils.AssertionSummaryAction())
+sequence.start()
diff --git a/test/keystrokes/firefox/line_nav_simple_form.py b/test/keystrokes/firefox/line_nav_simple_form.py
index fbc9cbb..d6df4fc 100644
--- a/test/keystrokes/firefox/line_nav_simple_form.py
+++ b/test/keystrokes/firefox/line_nav_simple_form.py
@@ -13,8 +13,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. line Down",
-    ["BRAILLE LINE:  'Magic disappearing text trick:  $l'",
-     "     VISIBLE:  'Magic disappearing text trick:  ', cursor=1",
+    ["BRAILLE LINE:  'Magic disappearing text trick: tab to me and I disappear $l'",
+     "     VISIBLE:  'Magic disappearing text trick: t', cursor=1",
      "SPEECH OUTPUT: 'Magic disappearing text trick: '",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'tab to me and I disappear'"]))
@@ -43,34 +43,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. line Down",
-    ["KNOWN ISSUE: Something is causing us to keep presenting the field",
-     "BRAILLE LINE:  'Tell me a little more about yourself: I am a monkey with a long tail.  I like  $l'",
-     "     VISIBLE:  'I am a monkey with a long tail. ', cursor=1",
-     "SPEECH OUTPUT: 'Tell me a little more about yourself:",
-     "'",
-     "SPEECH OUTPUT: 'entry'",
-     "SPEECH OUTPUT: 'I am a monkey with a long tail.  I like '"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "5. line Down",
-    ["BRAILLE LINE:  'Tell me a little more about yourself: to swing from trees and eat bananas.   $l'",
+    ["BRAILLE LINE:  'to swing from trees and eat bananas.   $l'",
      "     VISIBLE:  'to swing from trees and eat bana', cursor=1",
-     "SPEECH OUTPUT: 'Tell me a little more about yourself:",
-     "'",
-     "SPEECH OUTPUT: 'Tell me a little more about yourself:'",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'to swing from trees and eat bananas.  '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "6. line Down",
-    ["BRAILLE LINE:  'Tell me a little more about yourself: I've recently taken up typing and plan  $l'",
+    "5. line Down",
+    ["BRAILLE LINE:  'I've recently taken up typing and plan  $l'",
      "     VISIBLE:  'I've recently taken up typing an', cursor=1",
-     "SPEECH OUTPUT: 'Tell me a little more about yourself:",
-     "'",
      "SPEECH OUTPUT: 'Tell me a little more about yourself:'",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'I've recently taken up typing and plan '"]))
@@ -78,11 +61,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "7. line Down",
-    ["BRAILLE LINE:  'Tell me a little more about yourself: to write my memoirs. $l'",
+    "6. line Down",
+    ["BRAILLE LINE:  'to write my memoirs. $l'",
      "     VISIBLE:  'to write my memoirs. $l', cursor=1",
-     "SPEECH OUTPUT: 'Tell me a little more about yourself:",
-     "'",
      "SPEECH OUTPUT: 'Tell me a little more about yourself:'",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'to write my memoirs.'"]))
@@ -90,19 +71,14 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "8. line Down",
-    ["BRAILLE LINE:  'Tell me a little more about yourself:      $l'",
-     "     VISIBLE:  '      $l', cursor=1",
-     "SPEECH OUTPUT: 'Tell me a little more about yourself:",
-     "'",
-     "SPEECH OUTPUT: 'Tell me a little more about yourself:'",
-     "SPEECH OUTPUT: 'entry'",
-     "SPEECH OUTPUT: '     '"]))
+    "7. line Down",
+    ["BRAILLE LINE:  '      $l'",
+     "     VISIBLE:  '      $l', cursor=1"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "9. line Down",
+    "8. line Down",
     ["BRAILLE LINE:  'Check one or more: < > Red check box < > Blue check box < > Green check box'",
      "     VISIBLE:  'Check one or more: < > Red check', cursor=1",
      "SPEECH OUTPUT: 'Check one or more: '",
@@ -119,7 +95,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "10. line Down",
+    "9. line Down",
     ["BRAILLE LINE:  'Make a selection: Water combo box'",
      "     VISIBLE:  'Make a selection: Water combo bo', cursor=1",
      "SPEECH OUTPUT: 'Make a selection: '",
@@ -129,9 +105,8 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "11. line Down",
-    ["KNOWN ISSUE: It seems that we're repeating this widget.",
-     "BRAILLE LINE:  'Which sports do you like?Hockey list box'",
+    "10. line Down",
+    ["BRAILLE LINE:  'Which sports do you like?Hockey list box'",
      "     VISIBLE:  'Which sports do you like?Hockey ', cursor=1",
      "SPEECH OUTPUT: 'Which sports do you like?",
      "'",
@@ -143,20 +118,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "12. line Down",
-    ["BRAILLE LINE:  'Hockey list box'",
-     "     VISIBLE:  'Hockey list box', cursor=1",
-     "SPEECH OUTPUT: 'Which sports do you like?'",
-     "SPEECH OUTPUT: 'Hockey'",
-     "SPEECH OUTPUT: 'multi-select'",
-     "SPEECH OUTPUT: 'List with 4 items'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "13. line Down",
+    "11. line Down",
     ["BRAILLE LINE:  'Dashing picture of Willie Walker image'",
-     "     VISIBLE:  'Dashing picture of Willie Walker', cursor=1",
+     "     VISIBLE:  'Dashing picture of Willie Walker', cursor=0",
      "SPEECH OUTPUT: 'Dashing picture of Willie Walker'",
      "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: '",
@@ -165,7 +129,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "14. line Down",
+    "12. line Down",
     ["BRAILLE LINE:  'Ain't he handsome (please say yes)? & y radio button Yes & y radio button No'",
      "     VISIBLE:  'Ain't he handsome (please say ye', cursor=1",
      "SPEECH OUTPUT: 'Ain't he handsome (please say yes)? '",
@@ -179,9 +143,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "15. line Up",
+    "13. line Up",
     ["BRAILLE LINE:  'Dashing picture of Willie Walker image'",
-     "     VISIBLE:  'Dashing picture of Willie Walker', cursor=1",
+     "     VISIBLE:  'Dashing picture of Willie Walker', cursor=0",
      "SPEECH OUTPUT: 'Dashing picture of Willie Walker'",
      "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: '",
@@ -190,9 +154,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "16. line Up",
+    "14. line Up",
     ["BRAILLE LINE:  'Hockey list box'",
-     "     VISIBLE:  'Hockey list box', cursor=1",
+     "     VISIBLE:  'Hockey list box', cursor=0",
      "SPEECH OUTPUT: 'Which sports do you like?'",
      "SPEECH OUTPUT: 'Hockey'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -201,7 +165,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "17. line Up",
+    "15. line Up",
     ["BRAILLE LINE:  'Which sports do you like?Hockey list box'",
      "     VISIBLE:  'Which sports do you like?Hockey ', cursor=1",
      "SPEECH OUTPUT: 'Which sports do you like?",
@@ -214,7 +178,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "18. line Up",
+    "16. line Up",
     ["BRAILLE LINE:  'Make a selection: Water combo box'",
      "     VISIBLE:  'Make a selection: Water combo bo', cursor=1",
      "SPEECH OUTPUT: 'Make a selection: '",
@@ -224,7 +188,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "19. line Up",
+    "17. line Up",
     ["BRAILLE LINE:  'Check one or more: < > Red check box < > Blue check box < > Green check box'",
      "     VISIBLE:  'Check one or more: < > Red check', cursor=1",
      "SPEECH OUTPUT: 'Check one or more: '",
@@ -241,43 +205,54 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "20. line Up",
-    ["KNOWN ISSUE: Why aren't we speaking this? Ditto for the next few items.",
-     "BRAILLE LINE:  '      $l'",
+    "18. line Up",
+    ["BRAILLE LINE:  '      $l'",
      "     VISIBLE:  '      $l', cursor=1"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "21. line Up",
+    "19. line Up",
     ["BRAILLE LINE:  'to write my memoirs. $l'",
-     "     VISIBLE:  'to write my memoirs. $l', cursor=1"]))
+     "     VISIBLE:  'to write my memoirs. $l', cursor=1",
+     "SPEECH OUTPUT: 'Tell me a little more about yourself:'",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'to write my memoirs.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "22. line Up",
+    "20. line Up",
     ["BRAILLE LINE:  'I've recently taken up typing and plan  $l'",
-     "     VISIBLE:  'I've recently taken up typing an', cursor=1"]))
+     "     VISIBLE:  'I've recently taken up typing an', cursor=1",
+     "SPEECH OUTPUT: 'Tell me a little more about yourself:'",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'I've recently taken up typing and plan '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "23. line Up",
+    "21. line Up",
     ["BRAILLE LINE:  'to swing from trees and eat bananas.   $l'",
-     "     VISIBLE:  'to swing from trees and eat bana', cursor=1"]))
+     "     VISIBLE:  'to swing from trees and eat bana', cursor=1",
+     "SPEECH OUTPUT: 'Tell me a little more about yourself:'",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'to swing from trees and eat bananas.  '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "24. line Up",
+    "22. line Up",
     ["BRAILLE LINE:  'I am a monkey with a long tail.  I like  $l'",
-     "     VISIBLE:  'I am a monkey with a long tail. ', cursor=1"]))
+     "     VISIBLE:  'I am a monkey with a long tail. ', cursor=1",
+     "SPEECH OUTPUT: 'Tell me a little more about yourself:'",
+     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'I am a monkey with a long tail.  I like '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "25. line Up",
+    "23. line Up",
     ["BRAILLE LINE:  'Tell me a little more about yourself:      $l'",
      "     VISIBLE:  'Tell me a little more about your', cursor=1",
      "SPEECH OUTPUT: 'Tell me a little more about yourself:",
@@ -289,7 +264,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "26. line Up",
+    "24. line Up",
     ["BRAILLE LINE:  'Tell me a secret:  $l'",
      "     VISIBLE:  'Tell me a secret:  $l', cursor=1",
      "SPEECH OUTPUT: 'Tell me a secret: '",
@@ -298,7 +273,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "27. line Up",
+    "25. line Up",
     ["BRAILLE LINE:  'Magic disappearing text trick: tab to me and I disappear $l'",
      "     VISIBLE:  'Magic disappearing text trick: t', cursor=1",
      "SPEECH OUTPUT: 'Magic disappearing text trick: '",
@@ -308,7 +283,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "28. line Up",
+    "26. line Up",
     ["BRAILLE LINE:  'Type something here:  $l'",
      "     VISIBLE:  'Type something here:  $l', cursor=1",
      "SPEECH OUTPUT: 'Type something here: '",
diff --git a/test/keystrokes/firefox/line_nav_slash_test.py b/test/keystrokes/firefox/line_nav_slash_test.py
index 8fdbad0..ef3d286 100644
--- a/test/keystrokes/firefox/line_nav_slash_test.py
+++ b/test/keystrokes/firefox/line_nav_slash_test.py
@@ -114,9 +114,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "11. Line Down",
-    ["KNOWN ISSUE - Sometimes we also say 'Recent Tags'. Might be a timing issue. And the presentation is 
wrong regardless.",
-     "BRAILLE LINE:  '& y radio button Some polls'",
-     "     VISIBLE:  '& y radio button Some polls', cursor=1",
+    ["BRAILLE LINE:  '& y radio button Some polls'",
+     "     VISIBLE:  '& y radio button Some polls', cursor=0",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'",
      "SPEECH OUTPUT: 'Some polls '",
@@ -138,7 +137,7 @@ sequence.append(utils.AssertPresentationAction(
     "13. Line Up",
     ["KNOWN ISSUE: We should not be re-presenting the panel",
      "BRAILLE LINE:  '& y radio button Some polls'",
-     "     VISIBLE:  '& y radio button Some polls', cursor=1",
+     "     VISIBLE:  '& y radio button Some polls', cursor=0",
      "SPEECH OUTPUT: 'Some polls'",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'",
diff --git a/test/keystrokes/firefox/line_nav_sun_java.py b/test/keystrokes/firefox/line_nav_sun_java.py
index a69fe5c..f945f31 100644
--- a/test/keystrokes/firefox/line_nav_sun_java.py
+++ b/test/keystrokes/firefox/line_nav_sun_java.py
@@ -30,8 +30,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Down",
-    ["BRAILLE LINE:  'Home Page'",
-     "     VISIBLE:  'Home Page', cursor=1",
+    ["BRAILLE LINE:  'Home Page Sun Developer Network'",
+     "     VISIBLE:  'Home Page Sun Developer Network', cursor=1",
      "SPEECH OUTPUT: 'Home Page'",
      "SPEECH OUTPUT: 'Sun Developer Network'"]))
 
@@ -59,20 +59,12 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1"]))
+     "     VISIBLE:  '', cursor=0"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "6. Line Down",
     ["BRAILLE LINE:  'JavaTM SE 6 Release Notes'",
      "     VISIBLE:  'JavaTM SE 6 Release Notes', cursor=1",
      "SPEECH OUTPUT: 'JavaTM SE 6 Release Notes'"]))
@@ -80,23 +72,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "7. Line Down",
-    ["BRAILLE LINE:  'JavaTM SE 6 Release Notes'",
-     "     VISIBLE:  'JavaTM SE 6 Release Notes', cursor=5",
-     "SPEECH OUTPUT: 'JavaTM SE 6 Release Notes'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "8. Line Down",
-    ["BRAILLE LINE:  'JavaTM SE 6 Release Notes'",
-     "     VISIBLE:  'JavaTM SE 6 Release Notes', cursor=7",
-     "SPEECH OUTPUT: 'JavaTM SE 6 Release Notes'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "9. Line Down",
+    "6. Line Down",
     ["BRAILLE LINE:  'Linux Installation (32-bit) h1'",
      "     VISIBLE:  'Linux Installation (32-bit) h1', cursor=1",
      "SPEECH OUTPUT: 'Linux Installation (32-bit)'",
@@ -105,15 +81,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "10. Line Down",
+    "7. Line Down",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "11. Line Down",
+    "8. Line Down",
     ["BRAILLE LINE:  'JDK Documentation'",
      "     VISIBLE:  'JDK Documentation', cursor=1",
      "SPEECH OUTPUT: 'JDK Documentation'",
@@ -122,7 +98,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "12. Line Down",
+    "9. Line Down",
     ["BRAILLE LINE:  'Contents h2'",
      "     VISIBLE:  'Contents h2', cursor=1",
      "SPEECH OUTPUT: 'Contents'",
@@ -131,7 +107,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "13. Line Down",
+    "10. Line Down",
     ["BRAILLE LINE:  'System Requirements'",
      "     VISIBLE:  'System Requirements', cursor=1",
      "SPEECH OUTPUT: 'System Requirements'",
@@ -142,26 +118,23 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "14. Line Down",
+    "11. Line Down",
     ["BRAILLE LINE:  'JDK Installation Instructions'",
      "     VISIBLE:  'JDK Installation Instructions', cursor=1",
      "SPEECH OUTPUT: 'JDK Installation Instructions'",
-     "SPEECH OUTPUT: 'link'"]))
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: '",
+     "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "15. Line Down",
-    ["BRAILLE LINE:  'System RequirementsJDK Installation Instructions\xa0\xa0\xa0Installation of 
Self-Extracting Binary'",
-     "     VISIBLE:  '\xa0\xa0\xa0Installation of Self-Extracti', cursor=2",
-     "SPEECH OUTPUT: 'System Requirements'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: '",
-     "'",
-     "SPEECH OUTPUT: 'JDK Installation Instructions'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: '",
-     "\xa0\xa0\xa0'",
+    "12. Line Down",
+    ["BRAILLE LINE:  '\xa0Installation of Self-Extracting Binary'",
+     "     VISIBLE:  '\xa0Installation of Self-Extracting', cursor=1",
+     "SPEECH OUTPUT: '\xa0'",
+     "SPEECH OUTPUT: '\xa0'",
+     "SPEECH OUTPUT: '\xa0'",
      "SPEECH OUTPUT: 'Installation of Self-Extracting Binary'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: '",
@@ -170,7 +143,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "16. Line Down",
+    "13. Line Down",
     ["BRAILLE LINE:  '\xa0\xa0\xa0Installation of RPM File'",
      "     VISIBLE:  '\xa0\xa0\xa0Installation of RPM File', cursor=1",
      "SPEECH OUTPUT: '\xa0\xa0\xa0'",
@@ -182,7 +155,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "17. Line Down",
+    "14. Line Down",
     ["BRAILLE LINE:  'Java Plugin Browser Registration Instructions'",
      "     VISIBLE:  'Java Plugin Browser Registration', cursor=1",
      "SPEECH OUTPUT: 'Java Plugin Browser Registration Instructions'",
@@ -193,7 +166,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "18. Line Down",
+    "15. Line Down",
     ["BRAILLE LINE:  'Java Web Start Installation Notes'",
      "     VISIBLE:  'Java Web Start Installation Note', cursor=1",
      "SPEECH OUTPUT: 'Java Web Start Installation Notes'",
@@ -204,7 +177,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "19. Line Down",
+    "16. Line Down",
     ["BRAILLE LINE:  'Troubleshooting'",
      "     VISIBLE:  'Troubleshooting', cursor=1",
      "SPEECH OUTPUT: 'Troubleshooting'",
@@ -213,7 +186,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "20. Line Down",
+    "17. Line Down",
     ["BRAILLE LINE:  'System Requirements h2'",
      "     VISIBLE:  'System Requirements h2', cursor=1",
      "SPEECH OUTPUT: 'System Requirements'",
@@ -222,7 +195,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "21. Line Down",
+    "18. Line Down",
     ["BRAILLE LINE:  'See supported System Configurations for information about supported platforms, 
operating systems, desktop managers, and browsers.'",
      "     VISIBLE:  'See supported System Configurati', cursor=1",
      "SPEECH OUTPUT: 'See supported '",
@@ -233,7 +206,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "22. Line Down",
+    "19. Line Down",
     ["BRAILLE LINE:  'For issues, see the Troubleshooting section below.'",
      "     VISIBLE:  'For issues, see the Troubleshoot', cursor=1",
      "SPEECH OUTPUT: 'For issues, see the '",
@@ -244,21 +217,34 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "23. Line Down",
+    "20. Line Down",
     ["BRAILLE LINE:  'Installation Instructions h2'",
      "     VISIBLE:  'Installation Instructions h2', cursor=1",
      "SPEECH OUTPUT: 'Installation Instructions'",
      "SPEECH OUTPUT: 'heading level 2'"]))
 
-# There's some crazy bug here that makes us treat the lines that follow as a single line
-# I think it's a Gecko bug. But for now, we'll skip past it as this seems an edge case.
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "21. Line Down",
+    ["BRAILLE LINE:  'Installing the JDK automatically installs the Java Plugin and Java Web Start. Note 
that the Java Plugin needs to be registered with the browser. After installing the JDK, refer to:'",
+     "     VISIBLE:  'Installing the JDK automatically', cursor=1",
+     "SPEECH OUTPUT: 'Installing the JDK automatically installs the Java Plugin and Java Web Start. Note 
that the Java Plugin needs to be registered with the browser. After installing the JDK, refer to: '"]))
+
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "22. Line Down",
+    ["BRAILLE LINE:  '\u2022Java Plugin Browser Registration Instructions'",
+     "     VISIBLE:  '\u2022Java Plugin Browser Registratio', cursor=1",
+     "SPEECH OUTPUT: '\u2022'",
+     "SPEECH OUTPUT: 'Java Plugin Browser Registration Instructions'",
+     "SPEECH OUTPUT: 'link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "24. Line Down",
+    "23. Line Down",
     ["BRAILLE LINE:  '\u2022Java Web Start Installation Notes'",
      "     VISIBLE:  '\u2022Java Web Start Installation Not', cursor=1",
      "SPEECH OUTPUT: '\u2022'",
@@ -268,27 +254,23 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "25. Line Down",
-    ["BRAILLE LINE:  'Install formats - This version of the JDK is available in two installation formats. 
\u2022Self-extracting Binary File - This file can be used to install the JDK in a location chosen by the 
user. This one can be installed by anyone (not only root users), and it can'",
+    "24. Line Down",
+    ["BRAILLE LINE:  'Install formats - This version of the JDK is available in two installation formats.'",
      "     VISIBLE:  'Install formats - This version o', cursor=1",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'Install formats - This version of the JDK is available in two installation formats. '",
-     "SPEECH OUTPUT: '\u2022Self-extracting Binary File - This file can be used to install the JDK in a 
location chosen by the user. This one can be installed by anyone (not only root users), and it can '"]))
+     "SPEECH OUTPUT: 'Install formats - This version of the JDK is available in two installation formats. 
'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "26. Line Down",
-    ["BRAILLE LINE:  'Install formats - This version of the JDK is available in two installation formats. 
\u2022Self-extracting Binary File - This file can be used to install the JDK in a location chosen by the 
user. This one can be installed by anyone (not only root users), and it can'",
+    "25. Line Down",
+    ["BRAILLE LINE:  '\u2022Self-extracting Binary File - This file can be used to install the JDK in a 
location chosen by the user. This one can be installed by anyone (not only root users), and it can'",
      "     VISIBLE:  '\u2022Self-extracting Binary File - T', cursor=1",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'Install formats - This version of the JDK is available in two installation formats. '",
      "SPEECH OUTPUT: '\u2022Self-extracting Binary File - This file can be used to install the JDK in a 
location chosen by the user. This one can be installed by anyone (not only root users), and it can '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "27. Line Down",
+    "26. 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'",
      "     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 '"]))
@@ -296,8 +278,8 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "28. Line Down",
-    ["BRAILLE LINE:  'Installation of Self-Extracting Binary below. '",
+    "27. Line Down",
+    ["BRAILLE LINE:  'Installation of Self-Extracting Binary below.'",
      "     VISIBLE:  'Installation of Self-Extracting ', cursor=1",
      "SPEECH OUTPUT: 'Installation of Self-Extracting Binary'",
      "SPEECH OUTPUT: 'link'",
@@ -306,7 +288,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "29. Line Down",
+    "28. Line Down",
     ["BRAILLE LINE:  '\u2022RPM Packages - A rpm.bin file containing RPM packages, installed with the rpm 
utility. Requires root access to install. RPM packages are the recommended method for'",
      "     VISIBLE:  '\u2022RPM Packages - A rpm.bin file c', cursor=1",
      "SPEECH OUTPUT: '\u2022RPM Packages - A rpm.bin file containing RPM packages, installed with the rpm 
utility. Requires root access to install. RPM packages are the recommended method for '"]))
@@ -314,7 +296,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "30. Line Down",
+    "29. Line Down",
     ["BRAILLE LINE:  'installation on Linux. To use this bundle, see Installation of RPM File below.'",
      "     VISIBLE:  'installation on Linux. To use th', cursor=1",
      "SPEECH OUTPUT: 'installation on Linux. To use this bundle, see '",
@@ -325,16 +307,17 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "31. Line Down",
-    ["BRAILLE LINE:  'Choose the install format that is most suitable to your needs. table cell'",
+    "30. Line Down",
+    ["BRAILLE LINE:  'Choose the install format that is most suitable to your needs.    $l'",
      "     VISIBLE:  'Choose the install format that i', cursor=1",
      "SPEECH OUTPUT: 'Choose the install format that is most suitable to your needs. '",
-     "SPEECH OUTPUT: 'blank'"]))
+     "SPEECH OUTPUT: ' '",
+     "SPEECH OUTPUT: 'text'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "32. Line Down",
+    "31. Line Down",
     ["BRAILLE LINE:  'Note: For any text on this page containing the following notation, you must substitute 
the appropriate JDK update version number for the notation.'",
      "     VISIBLE:  'Note: For any text on this page ', cursor=1",
      "SPEECH OUTPUT: 'Note: For any text on this page containing the following notation, you must substitute 
the appropriate JDK update version number for the notation. '"]))
@@ -342,7 +325,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "33. Line Down",
+    "32. Line Down",
     ["BRAILLE LINE:  '<version>'",
      "     VISIBLE:  '<version>', cursor=1",
      "SPEECH OUTPUT: '<version>",
@@ -351,14 +334,14 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "34. Line Down",
+    "33. Line Down",
     ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "35. Line Down",
+    "34. Line Down",
     ["BRAILLE LINE:  'For example, if you were downloading update 6_01, the following command:'",
      "     VISIBLE:  'For example, if you were downloa', cursor=1",
      "SPEECH OUTPUT: 'For example, if you were downloading update 6_01, the following command: '"]))
@@ -366,7 +349,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "36. Line Down",
+    "35. Line Down",
     ["BRAILLE LINE:  './jdk-6<version>-linux-i586.bin'",
      "     VISIBLE:  './jdk-6<version>-linux-i586.bin', cursor=1",
      "SPEECH OUTPUT: './jdk-6<version>-linux-i586.bin",
@@ -375,14 +358,14 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "37. Line Down",
+    "36. Line Down",
     ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "38. Line Down",
+    "37. Line Down",
     ["BRAILLE LINE:  'would become:'",
      "     VISIBLE:  'would become:', cursor=1",
      "SPEECH OUTPUT: 'would become: '"]))
@@ -390,7 +373,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "39. Line Down",
+    "38. Line Down",
     ["BRAILLE LINE:  './jdk-6u1-linux-i586.bin'",
      "     VISIBLE:  './jdk-6u1-linux-i586.bin', cursor=1",
      "SPEECH OUTPUT: './jdk-6u1-linux-i586.bin",
@@ -399,14 +382,14 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "40. Line Down",
+    "39. Line Down",
     ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "41. Line Down",
+    "40. Line Down",
     ["BRAILLE LINE:  'Installation of Self-Extracting Binary h3'",
      "     VISIBLE:  'Installation of Self-Extracting ', cursor=1",
      "SPEECH OUTPUT: 'Installation of Self-Extracting Binary'",
@@ -415,18 +398,19 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "42. Line Down",
+    "41. Line Down",
     ["BRAILLE LINE:  'Use these instructions if you want to use the self-extracting binary file to install 
the JDK. If you want to install RPM packages instead, see Installation of RPM File. '",
      "     VISIBLE:  'Use these instructions if you wa', cursor=1",
      "SPEECH OUTPUT: 'Use these instructions if you want to use the self-extracting binary file to install 
the JDK. If you want to install RPM packages instead, see '",
      "SPEECH OUTPUT: 'Installation of RPM File'",
      "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: '. '"]))
+     "SPEECH OUTPUT: '. '",
+     "SPEECH OUTPUT: 'link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "43. Line Down",
+    "42. Line Down",
     ["BRAILLE LINE:  '1. Download and check the download file size to ensure that you have downloaded the 
full, uncorrupted software bundle.'",
      "     VISIBLE:  '1. Download and check the downlo', cursor=1",
      "SPEECH OUTPUT: '1. Download and check the download file size to ensure that you have downloaded the 
full, uncorrupted software bundle.'"]))
@@ -434,7 +418,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "44. Line Down",
+    "43. Line Down",
     ["BRAILLE LINE:  'You can download to any directory you choose; it does not have to be the directory 
where you want to install the JDK.'",
      "     VISIBLE:  'You can download to any director', cursor=1",
      "SPEECH OUTPUT: 'You can download to any directory you choose; it does not have to be the directory 
where you want to install the JDK. '"]))
@@ -442,7 +426,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "45. Line Down",
+    "44. Line Down",
     ["BRAILLE LINE:  'Before you download the file, notice its byte size provided on the download page on 
the web site. Once the download has completed, compare that file size to the'",
      "     VISIBLE:  'Before you download the file, no', cursor=1",
      "SPEECH OUTPUT: 'Before you download the file, notice its byte size provided on the download page on 
the web site. Once the download has completed, compare that file size to the '"]))
@@ -450,7 +434,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "46. Line Down",
+    "45. Line Down",
     ["BRAILLE LINE:  'size of the downloaded file to make sure they are equal.'",
      "     VISIBLE:  'size of the downloaded file to m', cursor=1",
      "SPEECH OUTPUT: 'size of the downloaded file to make sure they are equal. '"]))
@@ -458,7 +442,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "47. Line Down",
+    "46. Line Down",
     ["BRAILLE LINE:  '2. Make sure that execute permissions are set on the self-extracting binary.'",
      "     VISIBLE:  '2. Make sure that execute permis', cursor=1",
      "SPEECH OUTPUT: '2. Make sure that execute permissions are set on the self-extracting binary. '"]))
diff --git a/test/keystrokes/firefox/line_nav_table_cell_links.py 
b/test/keystrokes/firefox/line_nav_table_cell_links.py
index 3a1df16..fbb453a 100644
--- a/test/keystrokes/firefox/line_nav_table_cell_links.py
+++ b/test/keystrokes/firefox/line_nav_table_cell_links.py
@@ -28,14 +28,6 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "4. Line Down",
     ["BRAILLE LINE:  '<!-->'",
      "     VISIBLE:  '<!-->', cursor=1",
      "SPEECH OUTPUT: '<!-->'",
@@ -46,7 +38,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "5. Line Down",
+    "4. Line Down",
     ["BRAILLE LINE:  '<!DOCTYPE>'",
      "     VISIBLE:  '<!DOCTYPE>', cursor=1",
      "SPEECH OUTPUT: '<!DOCTYPE>'",
@@ -57,7 +49,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "6. Line Down",
+    "5. Line Down",
     ["BRAILLE LINE:  '<a>'",
      "     VISIBLE:  '<a>', cursor=1",
      "SPEECH OUTPUT: '<a>'",
@@ -68,7 +60,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "7. Line Down",
+    "6. Line Down",
     ["BRAILLE LINE:  '<abbr>'",
      "     VISIBLE:  '<abbr>', cursor=1",
      "SPEECH OUTPUT: '<abbr>'",
@@ -79,7 +71,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:  '<acronym>'",
      "     VISIBLE:  '<acronym>', cursor=1",
      "SPEECH OUTPUT: '<acronym>'",
@@ -88,7 +80,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:  '<abbr>'",
      "     VISIBLE:  '<abbr>', cursor=1",
      "SPEECH OUTPUT: '<abbr>'",
@@ -99,7 +91,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:  '<a>'",
      "     VISIBLE:  '<a>', cursor=1",
      "SPEECH OUTPUT: '<a>'",
@@ -110,7 +102,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:  '<!DOCTYPE>'",
      "     VISIBLE:  '<!DOCTYPE>', cursor=1",
      "SPEECH OUTPUT: '<!DOCTYPE>'",
@@ -121,7 +113,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:  '<!-->'",
      "     VISIBLE:  '<!-->', cursor=1",
      "SPEECH OUTPUT: '<!-->'",
@@ -132,7 +124,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:  ''",
      "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
@@ -140,7 +132,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:  'HTML Tags'",
      "     VISIBLE:  'HTML Tags', cursor=1",
      "SPEECH OUTPUT: 'HTML Tags",
@@ -149,7 +141,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:  'Here are some links'",
      "     VISIBLE:  'Here are some links', cursor=1",
      "SPEECH OUTPUT: 'Here are some links'"]))
diff --git a/test/keystrokes/firefox/line_nav_twitter_bug.py b/test/keystrokes/firefox/line_nav_twitter_bug.py
index ca15037..654bfc6 100644
--- a/test/keystrokes/firefox/line_nav_twitter_bug.py
+++ b/test/keystrokes/firefox/line_nav_twitter_bug.py
@@ -20,7 +20,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Down",
     ["BRAILLE LINE:  'foo image h2'",
-     "     VISIBLE:  'foo image h2', cursor=1",
+     "     VISIBLE:  'foo image h2', cursor=0",
      "SPEECH OUTPUT: 'foo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
@@ -31,8 +31,8 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
     ["KNOWN ISSUE: We either need to treat this as one line or two, but not both.",
-     "BRAILLE LINE:  'foo image Joanmarie h2'",
-     "     VISIBLE:  'foo image Joanmarie h2', cursor=11",
+     "BRAILLE LINE:  'foo image h2'",
+     "     VISIBLE:  'foo image h2', cursor=0",
      "SPEECH OUTPUT: 'foo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
@@ -43,26 +43,39 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
-    ["BRAILLE LINE:  'Another test'",
-     "     VISIBLE:  'Another test', cursor=1",
-     "SPEECH OUTPUT: 'Another test'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "5. Line Up",
-    ["KNOWN ISSUE: We're skipping the text to the right of the image",
+    ["KNOWN ISSUE: We're getting stuck on this image.",
      "BRAILLE LINE:  'foo image h2'",
-     "     VISIBLE:  'foo image h2', cursor=1",
+     "     VISIBLE:  'foo image h2', cursor=0",
      "SPEECH OUTPUT: 'foo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
+     "SPEECH OUTPUT: 'Joanmarie'",
      "SPEECH OUTPUT: 'heading level 2'"]))
 
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("Down"))
+#sequence.append(utils.AssertPresentationAction(
+#    "5. Line Down",
+#    ["BRAILLE LINE:  'Another test'",
+#     "     VISIBLE:  'Another test', cursor=1",
+#     "SPEECH OUTPUT: 'Another test'"]))
+#
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("Up"))
+#sequence.append(utils.AssertPresentationAction(
+#    "6. Line Up",
+#    ["BRAILLE LINE:  'foo image h2'",
+#     "     VISIBLE:  'foo image h2', cursor=0",
+#     "SPEECH OUTPUT: 'foo'",
+#     "SPEECH OUTPUT: 'link'",
+#     "SPEECH OUTPUT: 'image'",
+#     "SPEECH OUTPUT: 'Joanmarie'",
+#     "SPEECH OUTPUT: 'heading level 2'"]))
+
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "6. Line Up",
+    "5. Line Up",
     ["BRAILLE LINE:  'This is a test.'",
      "     VISIBLE:  'This is a test.', cursor=1",
      "SPEECH OUTPUT: 'This is a test.'"]))
diff --git a/test/keystrokes/firefox/line_nav_wiki_down.py b/test/keystrokes/firefox/line_nav_wiki_down.py
index 01dad47..48ec34f 100644
--- a/test/keystrokes/firefox/line_nav_wiki_down.py
+++ b/test/keystrokes/firefox/line_nav_wiki_down.py
@@ -7,6 +7,9 @@ import utils
 
 sequence = MacroSequence()
 
+sequence.append(PauseAction(3000))
+sequence.append(KeyComboAction("Tab"))
+
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
@@ -102,14 +105,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Down",
-    ["BRAILLE LINE:  'Archives orca-list image ) | FAQ | DocIndex'",
-     "     VISIBLE:  'Archives orca-list image ) | FAQ', cursor=1",
+    ["BRAILLE LINE:  'Archives) | FAQ | DocIndex'",
+     "     VISIBLE:  'Archives) | FAQ | DocIndex', cursor=1",
      "SPEECH OUTPUT: 'Archives'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'orca-list'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: ') | '",
      "SPEECH OUTPUT: 'FAQ'",
      "SPEECH OUTPUT: 'link'",
@@ -293,39 +293,38 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "26. Line Down",
-    ["KNOWN ISSUE: Part of the line is missing.",
-     "BRAILLE LINE:  'been led by the'",
-     "     VISIBLE:  'been led by the', cursor=1",
-     "SPEECH OUTPUT: 'been led by the '"]))
+    ["BRAILLE LINE:  'been led by the access image Accessibility Program Office of Sun'",
+     "     VISIBLE:  'been led by the access image Acc', cursor=1",
+     "SPEECH OUTPUT: 'been led by the '",
+     "SPEECH OUTPUT: 'access'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
+     "SPEECH OUTPUT: 'Accessibility Program Office of Sun '",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "27. Line Down",
-    ["BRAILLE LINE:  'Microsystems, Inc. access image Microsystems, Inc. with'",
-     "     VISIBLE:  'Microsystems, Inc. access image ', cursor=1",
+    ["KNOWN ISSUE: Braille has lost the 'with'",
+     "BRAILLE LINE:  'Microsystems, Inc. contributions from many'",
+     "     VISIBLE:  'Microsystems, Inc. contributions', cursor=1",
      "SPEECH OUTPUT: 'Microsystems, Inc.'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'access'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'Accessibility Program Office of Sun '",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: ' with '"]))
+     "SPEECH OUTPUT: 'with '",
+     "SPEECH OUTPUT: 'contributions from many '",
+     "SPEECH OUTPUT: 'link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "28. Line Down",
-    ["KNOWN ISSUE: Why the double braille?",
-     "BRAILLE LINE:  'community members community members.'",
-     "     VISIBLE:  'community members community memb', cursor=1",
+    ["BRAILLE LINE:  'community members.'",
+     "     VISIBLE:  'community members.', cursor=1",
      "SPEECH OUTPUT: 'community members'",
      "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'contributions from many '",
-     "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: '. '"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -340,8 +339,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "30. Line Down",
-    ["KNOWN ISSUE: Part of the line is missing.",
-     "BRAILLE LINE:  'problems in other components, is maintained in buglist image Bugzilla (please see 
our'",
+    ["BRAILLE LINE:  'problems in other components, is maintained in buglist image Bugzilla \(please see our 
notes on how we'",
      "     VISIBLE:  'problems in other components, is', cursor=1",
      "SPEECH OUTPUT: 'problems in other components, is maintained in '",
      "SPEECH OUTPUT: 'buglist'",
@@ -350,20 +348,19 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'Bugzilla'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: ' (please see our '"]))
+     "SPEECH OUTPUT: ' \(please see our '",
+     "SPEECH OUTPUT: 'notes on how we '",
+     "SPEECH OUTPUT: 'link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "31. Line Down",
-    ["KNOWN ISSUE: Why the double braille?",
-     "BRAILLE LINE:  'use Bugzilla use Bugzilla).'",
-     "     VISIBLE:  'use Bugzilla use Bugzilla).', cursor=1",
+    ["BRAILLE LINE:  'use Bugzilla\).'",
+     "     VISIBLE:  'use Bugzilla\).', cursor=1",
      "SPEECH OUTPUT: 'use Bugzilla'",
      "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'notes on how we '",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: '). '"]))
+     "SPEECH OUTPUT: '\). '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -408,46 +405,49 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "35. Line Down",
-    ["BRAILLE LINE:  'Darragh Ó Héiligh has created several audio guides for Orca. This is a fantastic'",
-     "     VISIBLE:  'Darragh Ó Héiligh has created se', cursor=1",
+    ["BRAILLE LINE:  'Darragh Ó Héiligh www.digitaldarragh.com image has created several audio guides for 
Orca. This is a fantastic'",
+     "     VISIBLE:  'Darragh Ó Héiligh www.digitaldar', cursor=1",
      "SPEECH OUTPUT: 'Darragh Ó Héiligh'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
+     "SPEECH OUTPUT: 'www.digitaldarragh.com'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: ' has created several audio guides for Orca. This is a fantastic '"]))
 
 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'",
+    ["BRAILLE LINE:  'contribution (THANKS!)!!! The audio guides can be found at linuxat image 
http://www.digitaldarragh.com'",
      "     VISIBLE:  'contribution (THANKS!)!!! The au', cursor=1",
-     "SPEECH OUTPUT: 'contribution (THANKS!)!!! The audio guides can be found at '"]))
+     "SPEECH OUTPUT: 'contribution (THANKS!)!!! The audio guides can be found at '",
+     "SPEECH OUTPUT: 'linuxat'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
+     "SPEECH OUTPUT: 'http://www.digitaldarragh.com'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "37. Line Down",
-    ["BRAILLE LINE:  '/linuxat.asp linuxat image /linuxat.asp and include the following:'",
-     "     VISIBLE:  '/linuxat.asp linuxat image /linu', cursor=1",
+    ["BRAILLE LINE:  '/linuxat.asp '",
+     "     VISIBLE:  '/linuxat.asp ', cursor=1",
      "SPEECH OUTPUT: '/linuxat.asp'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'linuxat'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'http://www.digitaldarragh.com'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: ' and include the following: '"]))
+     "SPEECH OUTPUT: 'and include the following: '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "38. Line Down",
-    ["BRAILLE LINE:  '•Walk through of the installation of Ubuntu 7.4. Very helpful tutorial'",
-     "     VISIBLE:  '•Walk through of the installatio', cursor=1",
+    ["BRAILLE LINE:  '• ubuntu-7-4-install-walk-through image'",
+     "     VISIBLE:  '• ubuntu-7-4-install-walk-throug', cursor=1",
      "SPEECH OUTPUT: '•'",
-     "SPEECH OUTPUT: 'Walk through of the installation of Ubuntu 7.4. Very helpful tutorial'",
+     "SPEECH OUTPUT: 'ubuntu-7-4-install-walk-through'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
 
@@ -455,10 +455,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "39. Line Down",
-    ["BRAILLE LINE:  '•Review of Fedora 7 and the Orca screen reader for the Gnome graphical desktop'",
-     "     VISIBLE:  '•Review of Fedora 7 and the Orca', cursor=1",
+    ["BRAILLE LINE:  '• linux-and-orca-review image'",
+     "     VISIBLE:  '• linux-and-orca-review image', cursor=1",
      "SPEECH OUTPUT: '•'",
-     "SPEECH OUTPUT: 'Review of Fedora 7 and the Orca screen reader for the Gnome graphical desktop'",
+     "SPEECH OUTPUT: 'linux-and-orca-review'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
 
@@ -466,10 +466,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "40. Line Down",
-    ["BRAILLE LINE:  '•Guide to installing the latest versions of Firefox and Orca'",
-     "     VISIBLE:  '•Guide to installing the latest ', cursor=1",
+    ["BRAILLE LINE:  '• installing-firefox-and-orca image'",
+     "     VISIBLE:  '• installing-firefox-and-orca im', cursor=1",
      "SPEECH OUTPUT: '•'",
-     "SPEECH OUTPUT: 'Guide to installing the latest versions of Firefox and Orca'",
+     "SPEECH OUTPUT: 'installing-firefox-and-orca'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
 
@@ -567,26 +567,26 @@ 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'",
+    ["BRAILLE LINE:  'designed to present information as you navigate the desktop using the keynav-1 image 
built-in navigation'",
      "     VISIBLE:  'designed to present information ', cursor=1",
-     "SPEECH OUTPUT: 'designed to present information as you navigate the desktop using the '"]))
+     "SPEECH OUTPUT: 'designed to present information as you navigate the desktop using the '",
+     "SPEECH OUTPUT: 'keynav-1'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
+     "SPEECH OUTPUT: 'built-in navigation '",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "51. Line Down",
-    ["BRAILLE LINE:  'mechanisms of GNOME keynav-1 image mechanisms of GNOME. These navigation mechanisms 
are consistent across most'",
-    "     VISIBLE:  'mechanisms of GNOME keynav-1 ima', cursor=1",
-    "SPEECH OUTPUT: 'mechanisms of GNOME'",
-    "SPEECH OUTPUT: 'link'",
-    "SPEECH OUTPUT: 'image'",
-    "SPEECH OUTPUT: 'keynav-1'",
-    "SPEECH OUTPUT: 'link'",
-    "SPEECH OUTPUT: 'image'",
-    "SPEECH OUTPUT: 'built-in navigation '",
-    "SPEECH OUTPUT: 'link'",
-    "SPEECH OUTPUT: 'image'",
-    "SPEECH OUTPUT: '. These navigation mechanisms are consistent across most '"]))
+    ["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'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
+     "SPEECH OUTPUT: '. These navigation mechanisms are consistent across most '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -600,21 +600,21 @@ 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'",
+    ["BRAILLE LINE:  'You may sometimes wish to control Orca itself, such as bringing up the Orca 
Configuration'",
      "     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: 'You may sometimes wish to control Orca itself, such as bringing up the '",
+     "SPEECH OUTPUT: 'Orca Configuration '",
+     "SPEECH OUTPUT: 'link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "54. Line Down",
-    ["BRAILLE LINE:  'GUI GUI (accessed by pressing Insert+Space when Orca is running) and for using flat 
review'",
-     "     VISIBLE:  'GUI GUI (accessed by pressing In', cursor=1",
+    ["BRAILLE LINE:  'GUI '",
+     "     VISIBLE:  'GUI ', cursor=1",
      "SPEECH OUTPUT: 'GUI'",
      "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'Orca Configuration '",
-     "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 using flat review 
'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -897,10 +897,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "81. Line Down",
-    ["BRAILLE LINE:  '•Dive Into Python, Mark Pilgrim'",
-     "     VISIBLE:  '•Dive Into Python, Mark Pilgrim', cursor=1",
+    ["BRAILLE LINE:  '• www.diveintopython.org image'",
+     "     VISIBLE:  '• www.diveintopython.org image', cursor=1",
      "SPEECH OUTPUT: '•'",
-     "SPEECH OUTPUT: 'Dive Into Python, Mark Pilgrim'",
+     "SPEECH OUTPUT: 'www.diveintopython.org'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
 
@@ -908,10 +908,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "82. Line Down",
-    ["BRAILLE LINE:  '•Python in a Nutshell, Alex Martelli'",
-     "     VISIBLE:  '•Python in a Nutshell, Alex Mart', cursor=1",
+    ["BRAILLE LINE:  '• 103-6779448-2183842 image'",
+     "     VISIBLE:  '• 103-6779448-2183842 image', cursor=1",
      "SPEECH OUTPUT: '•'",
-     "SPEECH OUTPUT: 'Python in a Nutshell, Alex Martelli'",
+     "SPEECH OUTPUT: '103-6779448-2183842'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
 
@@ -919,10 +919,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "83. Line Down",
-    ["BRAILLE LINE:  '•Python Pocket Reference, Mark Lutz'",
-     "     VISIBLE:  '•Python Pocket Reference, Mark L', cursor=1",
+    ["BRAILLE LINE:  '• 103-6779448-2183842 image'",
+     "     VISIBLE:  '• 103-6779448-2183842 image', cursor=1",
      "SPEECH OUTPUT: '•'",
-     "SPEECH OUTPUT: 'Python Pocket Reference, Mark Lutz'",
+     "SPEECH OUTPUT: '103-6779448-2183842'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
 
@@ -931,7 +931,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "84. Line Down",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -963,7 +963,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "88. Line Down",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -1044,7 +1044,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "97. Line Down",
     ["BRAILLE LINE:  'More Actions: combo box'",
-     "     VISIBLE:  'More Actions: combo box', cursor=1",
+     "     VISIBLE:  'More Actions: combo box', cursor=0",
      "SPEECH OUTPUT: 'More Actions:'",
      "SPEECH OUTPUT: 'combo box'"]))
 
@@ -1071,7 +1071,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "100. Line Down",
     ["BRAILLE LINE:  'GnomeWorldWide image'",
-     "     VISIBLE:  'GnomeWorldWide image', cursor=1",
+     "     VISIBLE:  'GnomeWorldWide image', cursor=0",
      "SPEECH OUTPUT: 'GnomeWorldWide'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
diff --git a/test/keystrokes/firefox/line_nav_wiki_up.py b/test/keystrokes/firefox/line_nav_wiki_up.py
index e8aaebc..e93e5d1 100644
--- a/test/keystrokes/firefox/line_nav_wiki_up.py
+++ b/test/keystrokes/firefox/line_nav_wiki_up.py
@@ -7,6 +7,9 @@ import utils
 
 sequence = MacroSequence()
 
+sequence.append(PauseAction(3000))
+sequence.append(KeyComboAction("Tab"))
+
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>End"))
 sequence.append(utils.AssertPresentationAction(
@@ -35,7 +38,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Up",
     ["BRAILLE LINE:  'GnomeWorldWide image'",
-     "     VISIBLE:  'GnomeWorldWide image', cursor=1",
+     "     VISIBLE:  'GnomeWorldWide image', cursor=0",
      "SPEECH OUTPUT: 'GnomeWorldWide'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
@@ -63,7 +66,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Up",
     ["BRAILLE LINE:  'More Actions: combo box'",
-     "     VISIBLE:  'More Actions: combo box', cursor=1",
+     "     VISIBLE:  'More Actions: combo box', cursor=0",
      "SPEECH OUTPUT: 'More Actions:'",
      "SPEECH OUTPUT: 'combo box'"]))
 
@@ -145,7 +148,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "15. Line Up",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -177,16 +180,19 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "19. Line Up",
     ["BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=1",
+     "     VISIBLE:  'separator', cursor=0",
      "SPEECH OUTPUT: 'separator'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "20. Line Up",
-    ["BRAILLE LINE:  '•Python Pocket Reference, Mark Lutz'",
-     "     VISIBLE:  '•Python Pocket Reference, Mark L', cursor=1",
+    ["BRAILLE LINE:  '• 103-6779448-2183842 image Python Pocket Reference, Mark Lutz'",
+     "     VISIBLE:  '• 103-6779448-2183842 image Pyth', cursor=1",
      "SPEECH OUTPUT: '•'",
+     "SPEECH OUTPUT: '103-6779448-2183842'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: 'Python Pocket Reference, Mark Lutz'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
@@ -195,9 +201,12 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "21. Line Up",
-    ["BRAILLE LINE:  '•Python in a Nutshell, Alex Martelli'",
-     "     VISIBLE:  '•Python in a Nutshell, Alex Mart', cursor=1",
+    ["BRAILLE LINE:  '• 103-6779448-2183842 image Python in a Nutshell, Alex Martelli'",
+     "     VISIBLE:  '• 103-6779448-2183842 image Pyth', cursor=1",
      "SPEECH OUTPUT: '•'",
+     "SPEECH OUTPUT: '103-6779448-2183842'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: 'Python in a Nutshell, Alex Martelli'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
@@ -206,9 +215,12 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "22. Line Up",
-    ["BRAILLE LINE:  '•Dive Into Python, Mark Pilgrim'",
-     "     VISIBLE:  '•Dive Into Python, Mark Pilgrim', cursor=1",
+    ["BRAILLE LINE:  '• www.diveintopython.org image Dive Into Python, Mark Pilgrim'",
+     "     VISIBLE:  '• www.diveintopython.org image D', cursor=1",
      "SPEECH OUTPUT: '•'",
+     "SPEECH OUTPUT: 'www.diveintopython.org'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: 'Dive Into Python, Mark Pilgrim'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
@@ -217,8 +229,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "23. Line Up",
-    ["BRAILLE LINE:  '• Design documents: orca image Orca Documentation Series'",
-     "     VISIBLE:  '• Design documents: orca image O', cursor=1",
+    ["BRAILLE LINE:  '• Design documents:  orca image Orca Documentation Series'",
+     "     VISIBLE:  '• Design documents:  orca image ', cursor=1",
      "SPEECH OUTPUT: '•'",
      "SPEECH OUTPUT: 'Design documents: '",
      "SPEECH OUTPUT: 'orca'",
@@ -278,8 +290,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "26. Line Up",
-    ["BRAILLE LINE:  '• Frequently Asked Questions: FAQ'",
-     "     VISIBLE:  '• Frequently Asked Questions: FA', cursor=1",
+    ["BRAILLE LINE:  '• Frequently Asked Questions:  FAQ'",
+     "     VISIBLE:  '• Frequently Asked Questions:  F', cursor=1",
      "SPEECH OUTPUT: '•'",
      "SPEECH OUTPUT: 'Frequently Asked Questions: '",
      "SPEECH OUTPUT: 'FAQ'",
@@ -481,12 +493,12 @@ 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'",
+    ["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 '",
      "SPEECH OUTPUT: 'Orca Keyboard Commands'",
      "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: '(Laptop Layout)'",
+     "SPEECH OUTPUT: '\(Laptop Layout\)'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: ' for more '"]))
 
@@ -494,9 +506,18 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "49. Line Up",
-    ["KNOWN ISSUE: Here we are combining lines which are not being combined on the way down",
-     "BRAILLE LINE:  'You may sometimes wish to control Orca itself, such as bringing up the Orca 
Configuration'",
-     "     VISIBLE:  'Orca Configuration', cursor=1",
+    ["BRAILLE LINE:  'GUI '",
+     "     VISIBLE:  'GUI ', cursor=1",
+     "SPEECH OUTPUT: 'GUI'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: '(accessed by pressing Insert+Space when Orca is running) and for using flat review 
'"]))
+
+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'",
+     "     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: 'link'"]))
@@ -504,7 +525,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "50. Line Up",
+    "51. Line Up",
     ["BRAILLE LINE:  'desktop applications.'",
      "     VISIBLE:  'desktop applications.', cursor=1",
      "SPEECH OUTPUT: 'desktop applications. '"]))
@@ -512,9 +533,20 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "51. Line Up",
+    "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'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
+     "SPEECH OUTPUT: '. These navigation mechanisms are consistent across most '"]))
+
+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 keynav-1 image 
built-in navigation'",
-     "     VISIBLE:  'keynav-1 image built-in navigati', cursor=1",
+     "     VISIBLE:  'designed to present information ', cursor=1",
      "SPEECH OUTPUT: 'designed to present information as you navigate the desktop using the '",
      "SPEECH OUTPUT: 'keynav-1'",
      "SPEECH OUTPUT: 'link'",
@@ -526,7 +558,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "52. Line Up",
+    "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 
'"]))
@@ -534,7 +566,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "53. Line Up",
+    "55. Line Up",
     ["BRAILLE LINE:  'The command to run orca is orca. You can enter this command by pressing Alt+F2 when'",
      "     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 
'"]))
@@ -542,7 +574,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "54. Line Up",
+    "56. Line Up",
     ["BRAILLE LINE:  'Configuration/Use h1'",
      "     VISIBLE:  'Configuration/Use h1', cursor=1",
      "SPEECH OUTPUT: 'Configuration/Use'",
@@ -551,7 +583,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "55. Line Up",
+    "57. Line Up",
     ["BRAILLE LINE:  'distributions as well as installing Orca directly from source.'",
      "     VISIBLE:  'distributions as well as install', cursor=1",
      "SPEECH OUTPUT: 'distributions as well as installing Orca directly from source. '"]))
@@ -559,18 +591,18 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "56. Line Up",
-    ["BRAILLE LINE:  'Please also refer to the Download/Installation page for detailed information on 
various'",
+    "58. Line Up",
+    ["BRAILLE LINE:  'Please also refer to the Download/Installation page for detailed information on 
various distributions as well as installing Orca directly from source.'",
      "     VISIBLE:  'Please also refer to the Downloa', cursor=1",
      "SPEECH OUTPUT: 'Please also refer to the '",
      "SPEECH OUTPUT: 'Download/Installation page'",
      "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: ' for detailed information on various '"]))
+     "SPEECH OUTPUT: ' for detailed information on various distributions as well as installing Orca directly 
from source. '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "57. Line Up",
+    "59. Line Up",
     ["BRAILLE LINE:  'and www.ubuntu.com image Ubuntu.'",
      "     VISIBLE:  'and www.ubuntu.com image Ubuntu.', cursor=1",
      "SPEECH OUTPUT: 'and '",
@@ -585,8 +617,8 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "58. Line Up",
-    ["BRAILLE LINE:  'provided by default on a number of operating system distributions, including 
www.opensolaris.org image Open Solaris'",
+    "60. Line Up",
+    ["BRAILLE LINE:  'provided by default on a number of operating system distributions, including  
www.opensolaris.org image Open Solaris'",
      "     VISIBLE:  'provided by default on a number ', cursor=1",
      "SPEECH OUTPUT: 'provided by default on a number of operating system distributions, including '",
      "SPEECH OUTPUT: 'www.opensolaris.org'",
@@ -599,7 +631,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "59. Line Up",
+    "61. Line Up",
     ["BRAILLE LINE:  'As of GNOME 2.16, Orca is a part of the GNOME platform. As a result, Orca is already'",
      "     VISIBLE:  'As of GNOME 2.16, Orca is a part', cursor=1",
      "SPEECH OUTPUT: 'As of GNOME 2.16, Orca is a part of the GNOME platform. As a result, Orca is already 
'"]))
@@ -607,7 +639,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "60. Line Up",
+    "62. Line Up",
     ["BRAILLE LINE:  'Download/Installation h1'",
      "     VISIBLE:  'Download/Installation h1', cursor=1",
      "SPEECH OUTPUT: 'Download/Installation'",
@@ -616,10 +648,13 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "61. Line Up",
-    ["BRAILLE LINE:  '•Guide to installing the latest versions of Firefox and Orca'",
-     "     VISIBLE:  '•Guide to installing the latest ', cursor=1",
+    "63. Line Up",
+    ["BRAILLE LINE:  '• installing-firefox-and-orca image Guide to installing the latest versions of Firefox 
and Orca'",
+     "     VISIBLE:  '• installing-firefox-and-orca im', cursor=1",
      "SPEECH OUTPUT: '•'",
+     "SPEECH OUTPUT: 'installing-firefox-and-orca'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: 'Guide to installing the latest versions of Firefox and Orca'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
@@ -627,10 +662,13 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "62. Line Up",
-    ["BRAILLE LINE:  '•Review of Fedora 7 and the Orca screen reader for the Gnome graphical desktop'",
-     "     VISIBLE:  '•Review of Fedora 7 and the Orca', cursor=1",
+    "64. Line Up",
+    ["BRAILLE LINE:  '• linux-and-orca-review image Review of Fedora 7 and the Orca screen reader for the 
Gnome graphical desktop'",
+     "     VISIBLE:  '• linux-and-orca-review image Re', cursor=1",
      "SPEECH OUTPUT: '•'",
+     "SPEECH OUTPUT: 'linux-and-orca-review'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: 'Review of Fedora 7 and the Orca screen reader for the Gnome graphical desktop'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
@@ -638,10 +676,13 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "63. Line Up",
-    ["BRAILLE LINE:  '•Walk through of the installation of Ubuntu 7.4. Very helpful tutorial'",
-     "     VISIBLE:  '•Walk through of the installatio', cursor=1",
+    "65. Line Up",
+    ["BRAILLE LINE:  '• ubuntu-7-4-install-walk-through image Walk through of the installation of Ubuntu 
7.4. Very helpful tutorial'",
+     "     VISIBLE:  '• ubuntu-7-4-install-walk-throug', cursor=1",
      "SPEECH OUTPUT: '•'",
+     "SPEECH OUTPUT: 'ubuntu-7-4-install-walk-through'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: 'Walk through of the installation of Ubuntu 7.4. Very helpful tutorial'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
@@ -649,9 +690,20 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "64. Line Up",
+    "66. Line Up",
+    ["BRAILLE LINE:  '/linuxat.asp '",
+     "     VISIBLE:  '/linuxat.asp ', cursor=1",
+     "SPEECH OUTPUT: '/linuxat.asp'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
+     "SPEECH OUTPUT: 'and include the following: '"]))
+
+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 linuxat image 
http://www.digitaldarragh.com'",
-     "     VISIBLE:  'linuxat image http://www.digital', cursor=1",
+     "     VISIBLE:  'contribution (THANKS!)!!! The au', cursor=1",
      "SPEECH OUTPUT: 'contribution (THANKS!)!!! The audio guides can be found at '",
      "SPEECH OUTPUT: 'linuxat'",
      "SPEECH OUTPUT: 'link'",
@@ -663,10 +715,10 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "65. Line Up",
-    ["BRAILLE LINE:  'Darragh Ó Héiligh has created several audio guides for Orca. This is a fantastic'",
-     "     VISIBLE:  'Darragh Ó Héiligh has created se', cursor=1",
-     "SPEECH OUTPUT: 'Darragh Ó Héiligh'",
+    "68. Line Up",
+    ["BRAILLE LINE:  'www.digitaldarragh.com image Darragh Ó Héiligh has created several audio guides for 
Orca. This is a fantastic'",
+     "     VISIBLE:  'www.digitaldarragh.com image Dar', cursor=0",
+     "SPEECH OUTPUT: 'www.digitaldarragh.com'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: ' has created several audio guides for Orca. This is a fantastic '"]))
@@ -674,7 +726,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "66. Line Up",
+    "69. Line Up",
     ["BRAILLE LINE:  'Audio Guides h1'",
      "     VISIBLE:  'Audio Guides h1', cursor=1",
      "SPEECH OUTPUT: 'Audio Guides'",
@@ -683,7 +735,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "67. Line Up",
+    "70. Line Up",
     ["BRAILLE LINE:  'productive environment composed of users and developers.'",
      "     VISIBLE:  'productive environment composed ', cursor=1",
      "SPEECH OUTPUT: 'productive environment composed of users and developers. '"]))
@@ -691,7 +743,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "68. Line Up",
+    "71. Line Up",
     ["BRAILLE LINE:  'Please join and participate on the orca-list image Orca mailing list ( orca-list image 
archives): it's a helpful, kind, and'",
      "     VISIBLE:  'Please join and participate on t', cursor=1",
      "SPEECH OUTPUT: 'Please join and participate on the '",
@@ -713,9 +765,19 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "69. Line Up",
-    ["BRAILLE LINE:  'problems in other components, is maintained in buglist image Bugzilla (please see our 
notes on how we'",
-     "     VISIBLE:  'notes on how we', cursor=1",
+    "72. Line Up",
+    ["BRAILLE LINE:  'use Bugzilla\).'",
+     "     VISIBLE:  'use Bugzilla\).', cursor=1",
+     "SPEECH OUTPUT: 'use Bugzilla'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: '\). '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "73. Line Up",
+    ["BRAILLE LINE:  'problems in other components, is maintained in buglist image Bugzilla \(please see our 
notes on how we'",
+     "     VISIBLE:  'problems in other components, is', cursor=1",
      "SPEECH OUTPUT: 'problems in other components, is maintained in '",
      "SPEECH OUTPUT: 'buglist'",
      "SPEECH OUTPUT: 'link'",
@@ -723,14 +785,14 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'Bugzilla'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: ' (please see our '",
+     "SPEECH OUTPUT: ' \(please see our '",
      "SPEECH OUTPUT: 'notes on how we '",
      "SPEECH OUTPUT: 'link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "70. Line Up",
+    "74. Line Up",
     ["BRAILLE LINE:  'The complete list of work to do, including bugs and feature requests, along with 
known'",
      "     VISIBLE:  'The complete list of work to do,', cursor=1",
      "SPEECH OUTPUT: 'The complete list of work to do, including bugs and feature requests, along with known 
'"]))
@@ -738,32 +800,44 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "71. Line Up",
-    ["BRAILLE LINE:  'access image Accessibility Program Office of Sun  with contributions from many'",
-     "     VISIBLE:  'contributions from many', cursor=1",
-     "SPEECH OUTPUT: 'access'",
+    "75. Line Up",
+    ["BRAILLE LINE:  'community members.'",
+     "     VISIBLE:  'community members.', cursor=1",
+     "SPEECH OUTPUT: 'community members'",
      "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'Accessibility Program Office of Sun '",
+     "SPEECH OUTPUT: '. '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "76. Line Up",
+    ["BRAILLE LINE:  'Microsystems, Inc. contributions from many'",
+     "     VISIBLE:  'Microsystems, Inc. contributions', cursor=1",
+     "SPEECH OUTPUT: 'Microsystems, Inc.'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: ' with '",
+     "SPEECH OUTPUT: 'with '",
      "SPEECH OUTPUT: 'contributions from many '",
      "SPEECH OUTPUT: 'link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "72. Line Up",
-    ["KNOWN ISSUE: Part of the line is missing.",
-     "BRAILLE LINE:  'been led by the'",
-     "     VISIBLE:  'been led by the', cursor=1",
-     "SPEECH OUTPUT: 'been led by the '"]))
+    "77. Line Up",
+    ["BRAILLE LINE:  'been led by the access image Accessibility Program Office of Sun'",
+     "     VISIBLE:  'been led by the access image Acc', cursor=1",
+     "SPEECH OUTPUT: 'been led by the '",
+     "SPEECH OUTPUT: 'access'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
+     "SPEECH OUTPUT: 'Accessibility Program Office of Sun '",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "73. Line Up",
+    "78. Line Up",
     ["BRAILLE LINE:  '(e.g., the GNOME desktop). The development of Orca has'",
      "     VISIBLE:  '(e.g., the GNOME desktop). The d', cursor=1",
      "SPEECH OUTPUT: '(e.g., the GNOME desktop). The development of Orca has '"]))
@@ -771,7 +845,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "74. Line Up",
+    "79. Line Up",
     ["BRAILLE LINE:  'access to applications and toolkits that support the AT-SPI'",
      "     VISIBLE:  'access to applications and toolk', cursor=1",
      "SPEECH OUTPUT: 'access to applications and toolkits that support the AT-SPI '"]))
@@ -779,7 +853,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "75. Line Up",
+    "80. Line Up",
     ["BRAILLE LINE:  'synthesis, braille, and magnification, Orca helps provide'",
      "     VISIBLE:  'synthesis, braille, and magnific', cursor=1",
      "SPEECH OUTPUT: 'synthesis, braille, and magnification, Orca helps provide '"]))
@@ -787,7 +861,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "76. Line Up",
+    "81. Line Up",
     ["BRAILLE LINE:  'impairments. Using various combinations of speech'",
      "     VISIBLE:  'impairments. Using various combi', cursor=1",
      "SPEECH OUTPUT: 'impairments. Using various combinations of speech '"]))
@@ -795,7 +869,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "77. Line Up",
+    "82. Line Up",
     ["BRAILLE LINE:  'powerful assistive technology for people with visual'",
      "     VISIBLE:  'powerful assistive technology fo', cursor=1",
      "SPEECH OUTPUT: 'powerful assistive technology for people with visual '"]))
@@ -803,7 +877,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "78. Line Up",
+    "83. Line Up",
     ["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 '"]))
@@ -811,7 +885,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "79. Line Up",
+    "84. Line Up",
     ["BRAILLE LINE:  'About h1'",
      "     VISIBLE:  'About h1', cursor=1",
      "SPEECH OUTPUT: 'About'",
@@ -820,7 +894,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "80. Line Up",
+    "85. Line Up",
     ["BRAILLE LINE:  '8.More Information'",
      "     VISIBLE:  '8.More Information', cursor=1",
      "SPEECH OUTPUT: '8.'",
@@ -830,7 +904,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "81. Line Up",
+    "86. Line Up",
     ["BRAILLE LINE:  '7.How Can I Help?'",
      "     VISIBLE:  '7.How Can I Help?', cursor=1",
      "SPEECH OUTPUT: '7.'",
@@ -840,7 +914,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "82. Line Up",
+    "87. Line Up",
     ["BRAILLE LINE:  '6.Accessible Applications'",
      "     VISIBLE:  '6.Accessible Applications', cursor=1",
      "SPEECH OUTPUT: '6.'",
@@ -850,7 +924,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "83. Line Up",
+    "88. Line Up",
     ["BRAILLE LINE:  '5.Configuration/Use'",
      "     VISIBLE:  '5.Configuration/Use', cursor=1",
      "SPEECH OUTPUT: '5.'",
@@ -860,7 +934,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "84. Line Up",
+    "89. Line Up",
     ["BRAILLE LINE:  '4.Download/Installation'",
      "     VISIBLE:  '4.Download/Installation', cursor=1",
      "SPEECH OUTPUT: '4.'",
@@ -870,7 +944,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "85. Line Up",
+    "90. Line Up",
     ["BRAILLE LINE:  '3.Audio Guides'",
      "     VISIBLE:  '3.Audio Guides', cursor=1",
      "SPEECH OUTPUT: '3.'",
@@ -880,7 +954,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "86. Line Up",
+    "91. Line Up",
     ["BRAILLE LINE:  '2.About'",
      "     VISIBLE:  '2.About', cursor=1",
      "SPEECH OUTPUT: '2.'",
@@ -890,7 +964,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "87. Line Up",
+    "92. Line Up",
     ["BRAILLE LINE:  '1.Welcome to Orca!'",
      "     VISIBLE:  '1.Welcome to Orca!', cursor=1",
      "SPEECH OUTPUT: '1.'",
@@ -900,7 +974,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "88. Line Up",
+    "93. Line Up",
     ["BRAILLE LINE:  'Contents'",
      "     VISIBLE:  'Contents', cursor=1",
      "SPEECH OUTPUT: 'Contents'"]))
@@ -908,9 +982,9 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "89. Line Up",
-    ["BRAILLE LINE:  'HOT HOT HOT: Notes on access to Firefox 3.0'",
-     "     VISIBLE:  'HOT HOT HOT: Notes on access to ', cursor=1",
+    "94. Line Up",
+    ["BRAILLE LINE:  'HOT HOT HOT: Notes on  access to Firefox 3.0'",
+     "     VISIBLE:  'HOT HOT HOT: Notes on  access to', cursor=1",
      "SPEECH OUTPUT: 'HOT HOT HOT: Notes on '",
      "SPEECH OUTPUT: 'access to Firefox 3.0'",
      "SPEECH OUTPUT: 'link'"]))
@@ -918,7 +992,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "90. Line Up",
+    "95. Line Up",
     ["BRAILLE LINE:  'Orca Logo'",
      "     VISIBLE:  'Orca Logo', cursor=1",
      "SPEECH OUTPUT: 'Orca Logo'"]))
@@ -926,7 +1000,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "91. Line Up",
+    "96. Line Up",
     ["BRAILLE LINE:  'Welcome to Orca! h1'",
      "     VISIBLE:  'Welcome to Orca! h1', cursor=1",
      "SPEECH OUTPUT: 'Welcome to Orca!'",
@@ -935,9 +1009,25 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "92. Line Up",
-    ["BRAILLE LINE:  'Home | Download/Installation | Configuration/Use | Accessible Applications | orca-list 
image Mailing List ( orca-list image'",
-     "     VISIBLE:  'orca-list image', cursor=1",
+    "97. Line Up",
+    ["BRAILLE LINE:  'Archives\) | FAQ | DocIndex'",
+     "     VISIBLE:  'Archives\) | FAQ | DocIndex', cursor=1",
+     "SPEECH OUTPUT: 'Archives'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
+     "SPEECH OUTPUT: '\) | '",
+     "SPEECH OUTPUT: 'FAQ'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: ' | '",
+     "SPEECH OUTPUT: 'DocIndex'",
+     "SPEECH OUTPUT: 'link'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "98. Line Up",
+    ["BRAILLE LINE:  'Home | Download/Installation | Configuration/Use | Accessible Applications | orca-list 
image Mailing List ('",
+     "     VISIBLE:  'Home | Download/Installation | C', cursor=1",
      "SPEECH OUTPUT: 'Home'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: ' | '",
@@ -956,15 +1046,12 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'Mailing List'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: ' ('",
-     "SPEECH OUTPUT: 'orca-list'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'"]))
+     "SPEECH OUTPUT: ' ('"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "93. Line Up",
+    "99. Line Up",
     ["BRAILLE LINE:  'en Español'",
      "     VISIBLE:  'en Español', cursor=1",
      "SPEECH OUTPUT: 'en Español'",
@@ -974,7 +1061,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "94. Line Up",
+    "100. Line Up",
     ["BRAILLE LINE:  'Home RecentChanges FindPage HelpContents Orca'",
      "     VISIBLE:  'Home RecentChanges FindPage Help', cursor=1",
      "SPEECH OUTPUT: 'Home'",
@@ -991,7 +1078,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "95. Line Up",
+    "101. Line Up",
     ["BRAILLE LINE:  'live.gnome.org h1  $l Titles push button Text push button'",
      "     VISIBLE:  'live.gnome.org h1  $l Titles pus', cursor=1",
      "SPEECH OUTPUT: 'live.gnome.org '",
@@ -1008,7 +1095,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "96. Line Up",
+    "102. Line Up",
     ["BRAILLE LINE:  'Home News Projects Art Support Development Community'",
      "     VISIBLE:  'Home News Projects Art Support D', cursor=1",
      "SPEECH OUTPUT: 'Home'",
diff --git a/test/keystrokes/firefox/word_nav_links.params b/test/keystrokes/firefox/word_nav_links.params
new file mode 100644
index 0000000..13e824a
--- /dev/null
+++ b/test/keystrokes/firefox/word_nav_links.params
@@ -0,0 +1 @@
+PARAMS=$TEST_DIR/../../html/words-with-links.html
diff --git a/test/keystrokes/firefox/word_nav_links.py b/test/keystrokes/firefox/word_nav_links.py
new file mode 100644
index 0000000..7c1aebd
--- /dev/null
+++ b/test/keystrokes/firefox/word_nav_links.py
@@ -0,0 +1,138 @@
+#!/usr/bin/python
+
+"""Test of line navigation output of Firefox."""
+
+from macaroon.playback import *
+import utils
+
+sequence = MacroSequence()
+
+sequence.append(KeyComboAction("<Control>Home"))
+sequence.append(KeyComboAction("Down"))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Right"))
+sequence.append(utils.AssertPresentationAction(
+    "1. Next Word",
+    ["BRAILLE LINE:  'Hello W o r ld. Goodbye world.'",
+     "     VISIBLE:  'Hello W o r ld. Goodbye world.', cursor=6",
+     "SPEECH OUTPUT: 'Hello '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Right"))
+sequence.append(utils.AssertPresentationAction(
+    "2. Next Word",
+    ["BRAILLE LINE:  'Hello W o r ld. Goodbye world.'",
+     "     VISIBLE:  'Hello W o r ld. Goodbye world.', cursor=16",
+     "SPEECH OUTPUT: 'W'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'o'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'r'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'l'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'd. '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Right"))
+sequence.append(utils.AssertPresentationAction(
+    "3. Next Word",
+    ["BRAILLE LINE:  'Hello W o r ld. Goodbye world.'",
+     "     VISIBLE:  'Hello W o r ld. Goodbye world.', cursor=19",
+     "SPEECH OUTPUT: 'Go'",
+     "SPEECH OUTPUT: 'odbye '",
+     "SPEECH OUTPUT: 'link'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Right"))
+sequence.append(utils.AssertPresentationAction(
+    "4. Next Word",
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1",
+     "SPEECH OUTPUT: 'w'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'orld.'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Right"))
+sequence.append(utils.AssertPresentationAction(
+    "5. Next Word",
+    ["BRAILLE LINE:  'More stuff! Yay!'",
+     "     VISIBLE:  'More stuff! Yay!', cursor=5",
+     "SPEECH OUTPUT: 'More '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Right"))
+sequence.append(utils.AssertPresentationAction(
+    "6. Next Word",
+    ["BRAILLE LINE:  'More stuff! Yay!'",
+     "     VISIBLE:  'More stuff! Yay!', cursor=12",
+     "SPEECH OUTPUT: 'stuff'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: '! '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Left"))
+sequence.append(utils.AssertPresentationAction(
+    "7. Previous Word",
+    ["BRAILLE LINE:  'More stuff! Yay!'",
+     "     VISIBLE:  'More stuff! Yay!', cursor=6",
+     "SPEECH OUTPUT: 'stuff'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: '! '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Left"))
+sequence.append(utils.AssertPresentationAction(
+    "8. Previous Word",
+    ["BRAILLE LINE:  'More stuff! Yay!'",
+     "     VISIBLE:  'More stuff! Yay!', cursor=1",
+     "SPEECH OUTPUT: 'More '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Left"))
+sequence.append(utils.AssertPresentationAction(
+    "9. Previous Word",
+    ["BRAILLE LINE:  'Hello W o r ld. Go orld.odbye w'",
+     "     VISIBLE:  'Hello W o r ld. Go orld.odbye w', cursor=25",
+     "SPEECH OUTPUT: 'w'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'orld.'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Left"))
+sequence.append(utils.AssertPresentationAction(
+    "10. Previous Word",
+    ["BRAILLE LINE:  'Hello W o r ld. Goodbye world.'",
+     "     VISIBLE:  'Hello W o r ld. Goodbye world.', cursor=17",
+     "SPEECH OUTPUT: 'Go'",
+     "SPEECH OUTPUT: 'odbye '",
+     "SPEECH OUTPUT: 'link'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Left"))
+sequence.append(utils.AssertPresentationAction(
+    "11. Previous Word",
+    ["BRAILLE LINE:  'Hello W o r ld. Goodbye world.'",
+     "     VISIBLE:  'Hello W o r ld. Goodbye world.', cursor=7",
+     "SPEECH OUTPUT: 'W'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'o'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'r'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'l'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'd. '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Left"))
+sequence.append(utils.AssertPresentationAction(
+    "12. Previous Word",
+    ["BRAILLE LINE:  'Hello W o r ld. Goodbye world.'",
+     "     VISIBLE:  'Hello W o r ld. Goodbye world.', cursor=1",
+     "SPEECH OUTPUT: 'Hello '"]))
+
+sequence.append(utils.AssertionSummaryAction())
+sequence.start()
diff --git a/test/keystrokes/firefox/line_nav_bug_577979.params 
b/test/keystrokes/firefox/word_nav_list_items.params
similarity index 100%
rename from test/keystrokes/firefox/line_nav_bug_577979.params
rename to test/keystrokes/firefox/word_nav_list_items.params
diff --git a/test/keystrokes/firefox/word_nav_list_items.py b/test/keystrokes/firefox/word_nav_list_items.py
new file mode 100644
index 0000000..01c2a1a
--- /dev/null
+++ b/test/keystrokes/firefox/word_nav_list_items.py
@@ -0,0 +1,71 @@
+#!/usr/bin/python
+
+"""Test of line navigation output of Firefox."""
+
+from macaroon.playback import *
+import utils
+
+sequence = MacroSequence()
+
+sequence.append(KeyComboAction("<Control>Home"))
+sequence.append(KeyComboAction("Down"))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "1. Line Down",
+    ["BRAILLE LINE:  '1.This is a short list item.'",
+     "     VISIBLE:  '1.This is a short list item.', cursor=1",
+     "SPEECH OUTPUT: '1.This is a short list item. '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Right"))
+sequence.append(utils.AssertPresentationAction(
+    "2. Next Word",
+    ["KNOWN ISSUE: Gecko stable has no space between the marker and the first word. They've fixed that in 
nightly.",
+     "BRAILLE LINE:  '1.This is a short list item.'",
+     "     VISIBLE:  '1.This is a short list item.', cursor=7",
+     "SPEECH OUTPUT: '1.This '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Right"))
+sequence.append(utils.AssertPresentationAction(
+    "3. Next Word",
+    ["BRAILLE LINE:  '1.This is a short list item.'",
+     "     VISIBLE:  '1.This is a short list item.', cursor=10",
+     "SPEECH OUTPUT: 'is '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Right"))
+sequence.append(utils.AssertPresentationAction(
+    "4. Next Word",
+    ["BRAILLE LINE:  '1.This is a short list item.'",
+     "     VISIBLE:  '1.This is a short list item.', cursor=12",
+     "SPEECH OUTPUT: 'a '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Left"))
+sequence.append(utils.AssertPresentationAction(
+    "5. Previous Word",
+    ["BRAILLE LINE:  '1.This is a short list item.'",
+     "     VISIBLE:  '1.This is a short list item.', cursor=11",
+     "SPEECH OUTPUT: 'a '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Left"))
+sequence.append(utils.AssertPresentationAction(
+    "6. Previous Word",
+    ["BRAILLE LINE:  '1.This is a short list item.'",
+     "     VISIBLE:  '1.This is a short list item.', cursor=8",
+     "SPEECH OUTPUT: 'is '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Left"))
+sequence.append(utils.AssertPresentationAction(
+    "7. Previous Word",
+    ["BRAILLE LINE:  '1.This is a short list item.'",
+     "     VISIBLE:  '1.This is a short list item.', cursor=1",
+     "SPEECH OUTPUT: '1.This '"]))
+
+sequence.append(utils.AssertionSummaryAction())
+sequence.start()
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]