[orca/gnome-3-14] Fix for a couple of bugs related to presentation of Gecko entries



commit 0fe8b8f2ad6cb75cc8a09b90840ee934c5db16e8
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Tue Sep 16 23:40:31 2014 -0400

    Fix for a couple of bugs related to presentation of Gecko entries

 .../scripts/toolkits/Gecko/speech_generator.py     |   19 +++--
 test/keystrokes/firefox/aria_button_dojo.py        |   74 ++++++++---------
 test/keystrokes/firefox/aria_grid_uiuc.py          |    9 +-
 test/keystrokes/firefox/aria_tabpanel_text_dojo.py |    4 +-
 test/keystrokes/firefox/aria_tree_uiuc.py          |    4 +-
 test/keystrokes/firefox/flat_review_combo_box.py   |    2 +-
 test/keystrokes/firefox/focus_tracking_imagemap.py |    4 +-
 .../firefox/label_inference_bug_546815.py          |   33 ++++----
 .../firefox/label_inference_bugzilla_search.py     |   48 ++++++------
 test/keystrokes/firefox/label_inference_entries.py |   87 ++++++++++----------
 test/keystrokes/firefox/label_inference_mailman.py |   31 ++++----
 test/keystrokes/firefox/line_nav_bug_546815.py     |   36 ++++----
 test/keystrokes/firefox/line_nav_bug_552887a.py    |   12 ++--
 test/keystrokes/firefox/line_nav_bug_555055.py     |   24 +++---
 .../firefox/line_nav_bugzilla_search_down.py       |   57 +++++++------
 .../firefox/line_nav_bugzilla_search_up.py         |   55 ++++++------
 test/keystrokes/firefox/line_nav_enter_bug.py      |   54 ++++++------
 test/keystrokes/firefox/line_nav_entries.py        |   35 ++++----
 test/keystrokes/firefox/line_nav_hidden_label.py   |    5 +-
 .../firefox/line_nav_home_end_on_blank_line.py     |    8 +-
 .../firefox/line_nav_iframes_in_inline_block.py    |   12 ++--
 test/keystrokes/firefox/line_nav_nested_tables.py  |   36 ++++----
 test/keystrokes/firefox/line_nav_pre_lines.py      |   28 +++---
 test/keystrokes/firefox/line_nav_pre_links.py      |    8 +-
 test/keystrokes/firefox/line_nav_simple_form.py    |   24 +++---
 test/keystrokes/firefox/line_nav_slash_test.py     |    7 +-
 test/keystrokes/firefox/line_nav_sun_java.py       |   16 ++--
 .../firefox/line_nav_table_cell_links.py           |    2 +-
 test/keystrokes/firefox/line_nav_wiki_down.py      |    5 +-
 test/keystrokes/firefox/line_nav_wiki_up.py        |    5 +-
 30 files changed, 377 insertions(+), 367 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/speech_generator.py 
b/src/orca/scripts/toolkits/Gecko/speech_generator.py
index 4e85832..aee6344 100644
--- a/src/orca/scripts/toolkits/Gecko/speech_generator.py
+++ b/src/orca/scripts/toolkits/Gecko/speech_generator.py
@@ -167,17 +167,17 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
                         pyatspi.ROLE_RADIO_BUTTON,
                         pyatspi.ROLE_TEXT] \
            and self._script.inDocumentContent():
-
-            # TODO: JD - isLabellingContents() needs smarts to identify labels
-            # we'll later infer. For now, this keeps us from double-presenting.
             start = args.get('startOffset')
-            end = args.get('endOffset')
-            if start != None and end != None:
+            if isinstance(start, int) and start > 0:
                 return []
 
-            # We're having to hack around yet another Mozilla bug:
-            # https://bugzilla.mozilla.org/show_bug.cgi?id=960241
-            focusedOnly = role not in [pyatspi.ROLE_LIST, pyatspi.ROLE_LIST_BOX]
+            if role in [pyatspi.ROLE_LIST, pyatspi.ROLE_LIST_BOX]:
+                # We're having to hack around yet another Mozilla bug:
+                # https://bugzilla.mozilla.org/show_bug.cgi?id=960241
+                focusedOnly = False
+            else:
+                # Because we cannot count on grabFocus updating the state.
+                focusedOnly = obj != orca_state.locusOfFocus
 
             label = self._script.labelInference.infer(obj, focusedOnly)
             if label:
@@ -214,6 +214,9 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
         acss = self.voice(speech_generator.SYSTEM)
         role = args.get('role', obj.getRole())
         force = args.get('force', False)
+        start = args.get('startOffset')
+        if role == pyatspi.ROLE_ENTRY and isinstance(start, int) and start > 0:
+            return []
 
         # Saying "menu item" for a combo box can confuse users. Therefore,
         # speak the combo box role instead.  Also, only do it if the menu
diff --git a/test/keystrokes/firefox/aria_button_dojo.py b/test/keystrokes/firefox/aria_button_dojo.py
index f6974f1..19655ff 100644
--- a/test/keystrokes/firefox/aria_button_dojo.py
+++ b/test/keystrokes/firefox/aria_button_dojo.py
@@ -41,33 +41,32 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "5. Tab to first Create button",
-    ["KNOWN ISSUE: The braille is not correct here and in a few other tests which follow",
-     "BRAILLE LINE:  '<button> push button <input type='button'> push button Create View Create save options 
push button Edit! Color'",
-     "     VISIBLE:  '<button> push button <input type', cursor=0",
+    ["BRAILLE LINE:  'Create push button'",
+     "     VISIBLE:  'Create push button', cursor=1",
      "SPEECH OUTPUT: 'Create push button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "6. Basic Where Am I on first Create button",
-    ["BRAILLE LINE:  '<button> push button <input type='button'> push button Create View Create save options 
push button Edit! Color'",
-     "     VISIBLE:  '<button> push button <input type', cursor=0",
+    ["BRAILLE LINE:  'Create push button'",
+     "     VISIBLE:  'Create push button', cursor=1",
      "SPEECH OUTPUT: 'Create push button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "7. Tab to View push button",
-    ["BRAILLE LINE:  '<button> push button <input type='button'> push button Create Create save options push 
button Edit! Color'",
-     "     VISIBLE:  '<button> push button <input type', cursor=0",
+    ["BRAILLE LINE:  'View push button'",
+     "     VISIBLE:  'View push button', cursor=1",
      "SPEECH OUTPUT: 'View push button view title'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "8. Tab to second Create button",
-    ["BRAILLE LINE:  '<button> push button <input type='button'> push button Create View save options push 
button Edit! Color'",
-     "     VISIBLE:  '<button> push button <input type', cursor=0",
+    ["BRAILLE LINE:  'Create push button'",
+     "     VISIBLE:  'Create push button', cursor=1",
      "SPEECH OUTPUT: 'Create push button creative title'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -129,8 +128,8 @@ sequence.append(utils.AssertPresentationAction(
     "14. Open the Edit! menu",
     ["BRAILLE LINE:  'Edit! push button'",
      "     VISIBLE:  'Edit! push button', cursor=1",
-     "BRAILLE LINE:  '<button> push button save options collapsed push button Edit! Color'",
-     "     VISIBLE:  '<button> push button save option', cursor=0",
+     "BRAILLE LINE:  'Edit! push button'",
+     "     VISIBLE:  'Edit! push button', cursor=1",
      "BRAILLE LINE:  'Cut'",
      "     VISIBLE:  'Cut', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
@@ -240,10 +239,10 @@ sequence.append(utils.AssertPresentationAction(
     "24. Open the Color menu",
     ["BRAILLE LINE:  'Color push button'",
      "     VISIBLE:  'Color push button', cursor=1",
-     "BRAILLE LINE:  '<button> push button save options collapsed push button Edit! Color'",
-     "     VISIBLE:  '<button> push button save option', cursor=0",
-     "BRAILLE LINE:  'lime green blue'",
-     "     VISIBLE:  'lime green blue', cursor=0",
+     "BRAILLE LINE:  'Color push button'",
+     "     VISIBLE:  'Color push button', cursor=1",
+     "BRAILLE LINE:  'white table cell'",
+     "     VISIBLE:  'white table cell', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "SPEECH OUTPUT: 'Color panel'",
@@ -254,8 +253,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "25. Go to lime",
-    ["BRAILLE LINE:  'lime green blue'",
-     "     VISIBLE:  'lime green blue', cursor=0",
+    ["BRAILLE LINE:  'white table cell'",
+     "     VISIBLE:  'white table cell', cursor=1",
      "BRAILLE LINE:  'lime table cell'",
      "     VISIBLE:  'lime table cell', cursor=1",
      "SPEECH OUTPUT: 'lime'"]))
@@ -275,8 +274,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "27. Tab to the toggle me off button",
-    ["BRAILLE LINE:  'Toggle me off Toggle me'",
-     "     VISIBLE:  'Toggle me off Toggle me', cursor=0",
+    ["BRAILLE LINE:  '&=y Toggle me off toggle button'",
+     "     VISIBLE:  '&=y Toggle me off toggle button', cursor=1",
      "SPEECH OUTPUT: 'Toggle me off toggle button pressed'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -284,32 +283,31 @@ sequence.append(KeyComboAction("space"))
 sequence.append(utils.AssertPresentationAction(
     "28. Toggle the state of the toggle me off button",
     ["KNOWN ISSUE: This seems an excessive amount of braille updating",
-     "BRAILLE LINE:  'toggle me on Toggle me'",
-     "     VISIBLE:  'toggle me on Toggle me', cursor=0",
-     "BRAILLE LINE:  'toggle me on Toggle me'",
-     "     VISIBLE:  'toggle me on Toggle me', cursor=0",
-     "BRAILLE LINE:  'toggle me on Toggle me'",
-     "     VISIBLE:  'toggle me on Toggle me', cursor=0",
+     "BRAILLE LINE:  '& y toggle me on toggle button'",
+     "     VISIBLE:  '& y toggle me on toggle button', cursor=1",
+     "BRAILLE LINE:  'toggle me on $l'",
+     "     VISIBLE:  'toggle me on $l', cursor=1",
+     "BRAILLE LINE:  'toggle me on $l'",
+     "     VISIBLE:  'toggle me on $l', cursor=1",
      "SPEECH OUTPUT: 'not pressed'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("space"))
 sequence.append(utils.AssertPresentationAction(
     "29. Toggle the state of the toggle me off button",
-    ["BRAILLE LINE:  'toggle me off Toggle me'",
-     "     VISIBLE:  'toggle me off Toggle me', cursor=0",
-     "BRAILLE LINE:  'toggle me off Toggle me'",
-     "     VISIBLE:  'toggle me off Toggle me', cursor=0",
-     "BRAILLE LINE:  'toggle me off Toggle me'",
-     "     VISIBLE:  'toggle me off Toggle me', cursor=0",
-     "SPEECH OUTPUT: 'pressed'"]))
+    ["BRAILLE LINE:  '&=y toggle me off toggle button'",
+     "     VISIBLE:  '&=y toggle me off toggle button', cursor=1",
+     "BRAILLE LINE:  'toggle me off $l'",
+     "     VISIBLE:  'toggle me off $l', cursor=1",
+     "BRAILLE LINE:  'toggle me off $l'",
+     "     VISIBLE:  'toggle me off $l', cursor=1"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "30. Tab to the toggle me button",
-    ["BRAILLE LINE:  'toggle me off Toggle me'",
-     "     VISIBLE:  'toggle me off Toggle me', cursor=0",
+    ["BRAILLE LINE:  'Toggle me push button'",
+     "     VISIBLE:  'Toggle me push button', cursor=1",
      "SPEECH OUTPUT: 'Toggle me push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -317,16 +315,16 @@ sequence.append(KeyComboAction("space"))
 sequence.append(utils.AssertPresentationAction(
     "31. Toggle the state of the toggle me button",
     ["KNOWN ISSUE: We seem to be missing the expected events and state changes. Dojo bug?",
-     "BRAILLE LINE:  'toggle me off Toggle me'",
-     "     VISIBLE:  'toggle me off Toggle me', cursor=0"]))
+     "BRAILLE LINE:  'Toggle me push button'",
+     "     VISIBLE:  'Toggle me push button', cursor=1"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("space"))
 sequence.append(utils.AssertPresentationAction(
     "32. Toggle the state of the toggle me button",
     ["KNOWN ISSUE: We seem to be missing the expected events and state changes. Dojo bug?",
-     "BRAILLE LINE:  'toggle me off Toggle me'",
-     "     VISIBLE:  'toggle me off Toggle me', cursor=0"]))
+     "BRAILLE LINE:  'Toggle me push button'",
+     "     VISIBLE:  'Toggle me push button', cursor=1"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/firefox/aria_grid_uiuc.py b/test/keystrokes/firefox/aria_grid_uiuc.py
index c5c465b..fafeb82 100644
--- a/test/keystrokes/firefox/aria_grid_uiuc.py
+++ b/test/keystrokes/firefox/aria_grid_uiuc.py
@@ -15,17 +15,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to grid",
-    ["KNOWN ISSUE: The braille is not correct here",
-     "BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  'Selected Sort Sel column push button'",
+     "     VISIBLE:  'Selected Sort Sel column push bu', cursor=1",
      "SPEECH OUTPUT: 'Selected Sort Sel column push button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. basic whereAmI",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  'Selected Sort Sel column push button'",
+     "     VISIBLE:  'Selected Sort Sel column push bu', cursor=1",
      "SPEECH OUTPUT: 'Selected Sort Sel column push button'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/aria_tabpanel_text_dojo.py 
b/test/keystrokes/firefox/aria_tabpanel_text_dojo.py
index ac7b3fe..01162a1 100644
--- a/test/keystrokes/firefox/aria_tabpanel_text_dojo.py
+++ b/test/keystrokes/firefox/aria_tabpanel_text_dojo.py
@@ -16,8 +16,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction(" "))
 sequence.append(utils.AssertPresentationAction(
     "1. Space to press the Show TabContainer Dialog",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  'TabContainer Dialog dialog'",
+     "     VISIBLE:  'TabContainer Dialog dialog', cursor=1",
      "BRAILLE LINE:  'First tab page tab Second tab page tab'",
      "     VISIBLE:  'First tab page tab Second tab pa', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
diff --git a/test/keystrokes/firefox/aria_tree_uiuc.py b/test/keystrokes/firefox/aria_tree_uiuc.py
index c53148c..127ed63 100644
--- a/test/keystrokes/firefox/aria_tree_uiuc.py
+++ b/test/keystrokes/firefox/aria_tree_uiuc.py
@@ -16,7 +16,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to tree",
     ["BRAILLE LINE:  'Fruits expanded list item'",
-     "     VISIBLE:  'Fruits expanded list item', cursor=0",
+     "     VISIBLE:  'Fruits expanded list item', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "SPEECH OUTPUT: 'Fruits expanded tree level 1'",
@@ -27,7 +27,7 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. Basic whereAmI",
     ["BRAILLE LINE:  'Fruits expanded list item'",
-     "     VISIBLE:  'Fruits expanded list item', cursor=0",
+     "     VISIBLE:  'Fruits expanded list item', cursor=1",
      "BRAILLE LINE:  'Fruits expanded list item'",
      "     VISIBLE:  'Fruits expanded list item', cursor=1",
      "SPEECH OUTPUT: 'list item Fruits 1 of 2 expanded tree level 1'"]))
diff --git a/test/keystrokes/firefox/flat_review_combo_box.py 
b/test/keystrokes/firefox/flat_review_combo_box.py
index 1a1149b..44d47cc 100644
--- a/test/keystrokes/firefox/flat_review_combo_box.py
+++ b/test/keystrokes/firefox/flat_review_combo_box.py
@@ -15,7 +15,7 @@ sequence.append(KeyComboAction("KP_8"))
 sequence.append(utils.AssertPresentationAction(
     "1. Flat review current line",
     ["BRAILLE LINE:  'Severity: Severity normal combo box'",
-     "     VISIBLE:  'Severity: Severity normal combo ', cursor=0",
+     "     VISIBLE:  'Severity normal combo box', cursor=10",
      "BRAILLE LINE:  'Severity Severity :  normal $l'",
      "     VISIBLE:  'Severity Severity :  normal $l', cursor=22",
      "SPEECH OUTPUT: 'Severity Severity :  normal'"]))
diff --git a/test/keystrokes/firefox/focus_tracking_imagemap.py 
b/test/keystrokes/firefox/focus_tracking_imagemap.py
index caef633..40f3517 100644
--- a/test/keystrokes/firefox/focus_tracking_imagemap.py
+++ b/test/keystrokes/firefox/focus_tracking_imagemap.py
@@ -59,8 +59,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "4. Tab",
-    ["BRAILLE LINE:  'wk09_frozenmovie image'",
-     "     VISIBLE:  'wk09_frozenmovie image', cursor=0",
+    ["BRAILLE LINE:  'wk09_frozenmovie'",
+     "     VISIBLE:  'wk09_frozenmovie', cursor=1",
      "SPEECH OUTPUT: 'wk09_frozenmovie' voice=hyperlink",
      "SPEECH OUTPUT: 'link image'"]))
 
diff --git a/test/keystrokes/firefox/label_inference_bug_546815.py 
b/test/keystrokes/firefox/label_inference_bug_546815.py
index f037d1c..447f2b0 100644
--- a/test/keystrokes/firefox/label_inference_bug_546815.py
+++ b/test/keystrokes/firefox/label_inference_bug_546815.py
@@ -16,7 +16,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "1. Next form field",
     ["BRAILLE LINE:  'Enter your Name:  $l text field using default type=text'",
-     "     VISIBLE:  'Enter your Name:  $l text field ', cursor=0",
+     "     VISIBLE:  ' $l text field using default typ', cursor=1",
      "SPEECH OUTPUT: 'Enter your Name: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -26,7 +26,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "2. Next form field",
     ["BRAILLE LINE:  '1. Enter your Address:  $l text field using SIZE and'",
-     "     VISIBLE:  '1. Enter your Address:  $l text ', cursor=0",
+     "     VISIBLE:  ' $l text field using SIZE and', cursor=1",
      "SPEECH OUTPUT: '1. Enter your Address: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -36,7 +36,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "3. Next form field",
     ["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=0",
+     "     VISIBLE:  ' $l 3. Enter your State:  $l 4. ', cursor=1",
      "SPEECH OUTPUT: '2. Enter your City: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -46,7 +46,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "4. Next form field",
     ["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=0",
+     "     VISIBLE:  ' $l 4. Enter your Country: US $l', cursor=1",
      "SPEECH OUTPUT: '3. Enter your State: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -57,7 +57,8 @@ sequence.append(utils.AssertPresentationAction(
     "5. Next form field",
     ["BRAILLE LINE:  '2. Enter your City:  $l 3. Enter your State:  $l 4. Enter your Country: US $l image 
text field using'",
      "     VISIBLE:  'US $l image text field using', cursor=1",
-     "SPEECH OUTPUT: '4. Enter your Country: entry US'"]))
+     "SPEECH OUTPUT: '4. Enter your Country: entry'",
+     "SPEECH OUTPUT: 'US'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyPressAction(0, None, "KP_Insert"))
@@ -66,7 +67,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "6. Next form field",
     ["BRAILLE LINE:  '5. Enter your Zip:  $l'",
-     "     VISIBLE:  '5. Enter your Zip:  $l', cursor=0",
+     "     VISIBLE:  '5. Enter your Zip:  $l', cursor=20",
      "SPEECH OUTPUT: '5. Enter your Zip: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -76,7 +77,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "7. Next form field",
     ["BRAILLE LINE:  'character:  $l'",
-     "     VISIBLE:  'character:  $l', cursor=0",
+     "     VISIBLE:  'character:  $l', cursor=12",
      "SPEECH OUTPUT: 'character: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -86,7 +87,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "8. Next form field",
     ["BRAILLE LINE:  '< > check box bird'",
-     "     VISIBLE:  '< > check box bird', cursor=0",
+     "     VISIBLE:  '< > check box bird', cursor=1",
      "SPEECH OUTPUT: 'bird check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -96,7 +97,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "9. Next form field",
     ["BRAILLE LINE:  '< > check box fish'",
-     "     VISIBLE:  '< > check box fish', cursor=0",
+     "     VISIBLE:  '< > check box fish', cursor=1",
      "SPEECH OUTPUT: 'fish check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -106,7 +107,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "10. Next form field",
     ["BRAILLE LINE:  '< > check box wild animal'",
-     "     VISIBLE:  '< > check box wild animal', cursor=0",
+     "     VISIBLE:  '< > check box wild animal', cursor=1",
      "SPEECH OUTPUT: 'wild animal check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -116,7 +117,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "11. Next form field",
     ["BRAILLE LINE:  '&=y radio button cabernet sauvignon'",
-     "     VISIBLE:  '&=y radio button cabernet sauvig', cursor=0",
+     "     VISIBLE:  '&=y radio button cabernet sauvig', cursor=1",
      "SPEECH OUTPUT: 'cabernet sauvignon selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -126,7 +127,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "12. Next form field",
     ["BRAILLE LINE:  '& y radio button merlot'",
-     "     VISIBLE:  '& y radio button merlot', cursor=0",
+     "     VISIBLE:  '& y radio button merlot', cursor=1",
      "SPEECH OUTPUT: 'merlot not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -136,7 +137,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "13. Next form field",
     ["BRAILLE LINE:  '& y radio button nebbiolo'",
-     "     VISIBLE:  '& y radio button nebbiolo', cursor=0",
+     "     VISIBLE:  '& y radio button nebbiolo', cursor=1",
      "SPEECH OUTPUT: 'nebbiolo not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -146,7 +147,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "14. Next form field",
     ["BRAILLE LINE:  '& y radio button pinot noir'",
-     "     VISIBLE:  '& y radio button pinot noir', cursor=0",
+     "     VISIBLE:  '& y radio button pinot noir', cursor=1",
      "SPEECH OUTPUT: 'pinot noir not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -156,7 +157,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "15. Next form field",
     ["BRAILLE LINE:  '& y radio button don't drink wine'",
-     "     VISIBLE:  '& y radio button don't drink win', cursor=0",
+     "     VISIBLE:  '& y radio button don't drink win', cursor=1",
      "SPEECH OUTPUT: 'don't drink wine not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -168,7 +169,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'Wrapping to top.'",
      "     VISIBLE:  'Wrapping to top.', cursor=0",
      "BRAILLE LINE:  'Enter your Name:  $l text field using default type=text'",
-     "     VISIBLE:  'Enter your Name:\xa0 $l text field ', cursor=0",
+     "     VISIBLE:  ' $l text field using default typ', cursor=1",
      "SPEECH OUTPUT: 'Wrapping to top.' voice=system",
      "SPEECH OUTPUT: 'Enter your Name: entry'"]))
 
diff --git a/test/keystrokes/firefox/label_inference_bugzilla_search.py 
b/test/keystrokes/firefox/label_inference_bugzilla_search.py
index 3f30087..24d9c1d 100644
--- a/test/keystrokes/firefox/label_inference_bugzilla_search.py
+++ b/test/keystrokes/firefox/label_inference_bugzilla_search.py
@@ -14,7 +14,7 @@ sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Shift Tab",
     ["BRAILLE LINE:  'Summary: contains all of the words/strings combo box $l Search push button'",
-     "     VISIBLE:  'Summary: contains all of the wor', cursor=0",
+     "     VISIBLE:  'contains all of the word/string', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "SPEECH OUTPUT: 'Summary: contains all of the words/strings combo box'",
@@ -25,7 +25,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "2. Tab",
     ["BRAILLE LINE:  'Summary: contains all of the words/strings combo box $l Search push button'",
-     "     VISIBLE:  'Summary: contains all of the wor', cursor=0",
+     "     VISIBLE:  'contains all of the word/string', cursor=1",
      "BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Summary: entry'"]))
@@ -48,7 +48,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'Search push button'",
      "     VISIBLE:  'Search push button', cursor=1",
      "BRAILLE LINE:  'Admin'",
-     "     VISIBLE:  'Admin', cursor=0",
+     "     VISIBLE:  'Admin', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "SPEECH OUTPUT: 'Classification: multi-select List with 8 items'",
@@ -60,7 +60,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "5. Tab",
     ["BRAILLE LINE:  'Admin'",
-     "     VISIBLE:  'Admin', cursor=0",
+     "     VISIBLE:  'Admin', cursor=1",
      "BRAILLE LINE:  'accerciser'",
      "     VISIBLE:  'accerciser', cursor=1",
      "SPEECH OUTPUT: 'Product: multi-select List with 379 items'",
@@ -84,7 +84,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "7. Tab",
     ["BRAILLE LINE:  'abiscan'",
-     "     VISIBLE:  'abiscan', cursor=0",
+     "     VISIBLE:  'abiscan', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "SPEECH OUTPUT: 'Component: multi-select List with 1248 items'",
@@ -96,7 +96,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "8. Tab",
     ["BRAILLE LINE:  'abiscan'",
-     "     VISIBLE:  'abiscan', cursor=0",
+     "     VISIBLE:  'abiscan', cursor=1",
      "BRAILLE LINE:  '0.0.1'",
      "     VISIBLE:  '0.0.1', cursor=1",
      "SPEECH OUTPUT: 'Version: multi-select List with 857 items'",
@@ -161,7 +161,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "15. Tab",
     ["BRAILLE LINE:  'Keywords: contains all of the keywords combo box $l'",
-     "     VISIBLE:  'Keywords: contains all of the ke', cursor=0",
+     "     VISIBLE:  'contains all of the keywords com', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "SPEECH OUTPUT: 'Keywords: contains all of the keywords combo box'",
@@ -172,7 +172,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "16. Tab",
     ["BRAILLE LINE:  'Keywords: contains all of the keywords combo box $l'",
-     "     VISIBLE:  'Keywords: contains all of the ke', cursor=0",
+     "     VISIBLE:  'contains all of the keywords com', cursor=1",
      "BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Keywords entry'"]))
@@ -241,7 +241,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  '<x> check box'",
      "     VISIBLE:  '<x> check box', cursor=1",
      "BRAILLE LINE:  '< > check box the reporter'",
-     "     VISIBLE:  '< > check box the reporter', cursor=0",
+     "     VISIBLE:  '< > check box the reporter', cursor=1",
      "SPEECH OUTPUT: 'the reporter check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -249,7 +249,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "24. Tab",
     ["BRAILLE LINE:  '< > check box the QA contact'",
-     "     VISIBLE:  '< > check box the QA contact', cursor=0",
+     "     VISIBLE:  '< > check box the QA contact', cursor=1",
      "SPEECH OUTPUT: 'the QA contact check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -257,7 +257,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "25. Tab",
     ["BRAILLE LINE:  '< > check box a CC list member'",
-     "     VISIBLE:  '< > check box a CC list member', cursor=0",
+     "     VISIBLE:  '< > check box a CC list member', cursor=1",
      "SPEECH OUTPUT: 'a CC list member check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -265,7 +265,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "26. Tab",
     ["BRAILLE LINE:  '< > check box a commenter'",
-     "     VISIBLE:  '< > check box a commenter', cursor=0",
+     "     VISIBLE:  '< > check box a commenter', cursor=1",
      "SPEECH OUTPUT: 'a commenter check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -273,7 +273,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "27. Tab",
     ["BRAILLE LINE:  'contains combo box'",
-     "     VISIBLE:  'contains combo box', cursor=0",
+     "     VISIBLE:  'contains combo box', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "SPEECH OUTPUT: 'contains combo box'",
@@ -284,7 +284,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "28. Tab",
     ["BRAILLE LINE:  'contains combo box'",
-     "     VISIBLE:  'contains combo box', cursor=0",
+     "     VISIBLE:  'contains combo box', cursor=1",
      "BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'entry'"]))
@@ -307,7 +307,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  '<x> check box'",
      "     VISIBLE:  '<x> check box', cursor=1",
      "BRAILLE LINE:  '<x> check box the reporter'",
-     "     VISIBLE:  '<x> check box the reporter', cursor=0",
+     "     VISIBLE:  '<x> check box the reporter', cursor=1",
      "SPEECH OUTPUT: 'the reporter check box checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -315,7 +315,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "31. Tab",
     ["BRAILLE LINE:  '<x> check box the QA contact'",
-     "     VISIBLE:  '<x> check box the QA contact', cursor=0",
+     "     VISIBLE:  '<x> check box the QA contact', cursor=1",
      "SPEECH OUTPUT: 'the QA contact check box checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -323,7 +323,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "32. Tab",
     ["BRAILLE LINE:  '<x> check box a CC list member'",
-     "     VISIBLE:  '<x> check box a CC list member', cursor=0",
+     "     VISIBLE:  '<x> check box a CC list member', cursor=1",
      "SPEECH OUTPUT: 'a CC list member check box checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -331,7 +331,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "33. Tab",
     ["BRAILLE LINE:  '< > check box a commenter'",
-     "     VISIBLE:  '< > check box a commenter', cursor=0",
+     "     VISIBLE:  '< > check box a commenter', cursor=1",
      "SPEECH OUTPUT: 'a commenter check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -339,7 +339,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "34. Tab",
     ["BRAILLE LINE:  'contains combo box'",
-     "     VISIBLE:  'contains combo box', cursor=0",
+     "     VISIBLE:  'contains combo box', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "SPEECH OUTPUT: 'contains combo box'",
@@ -350,7 +350,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "35. Tab",
     ["BRAILLE LINE:  'contains combo box'",
-     "     VISIBLE:  'contains combo box', cursor=0",
+     "     VISIBLE:  'contains combo box', cursor=1",
      "BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'entry'"]))
@@ -451,7 +451,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'Search push button'",
      "     VISIBLE:  'Search push button', cursor=1",
      "BRAILLE LINE:  '< > check box and remember these as my default search options'",
-     "     VISIBLE:  '< > check box and remember these', cursor=0",
+     "     VISIBLE:  '< > check box and remember these', cursor=1",
      "SPEECH OUTPUT: 'and remember these as my default search options check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -459,7 +459,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "47. Tab",
     ["BRAILLE LINE:  '< > check box Not (negate this whole chart)'",
-     "     VISIBLE:  '< > check box Not \(negate this w', cursor=0",
+     "     VISIBLE:  '< > check box Not \(negate this w', cursor=1",
      "SPEECH OUTPUT: 'Not (negate this whole chart) check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -467,7 +467,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "48. Tab",
     ["BRAILLE LINE:  '--- combo box --- combo box $l Or push button'",
-     "     VISIBLE:  '--- combo box --- combo box $l O', cursor=0",
+     "     VISIBLE:  '--- combo box --- combo box $l O', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "SPEECH OUTPUT: '--- combo box'",
@@ -478,7 +478,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "49. Tab",
     ["BRAILLE LINE:  '--- combo box --- combo box $l Or push button'",
-     "     VISIBLE:  '--- combo box --- combo box $l O', cursor=0",
+     "     VISIBLE:  '--- combo box --- combo box $l O', cursor=1",
      "BRAILLE LINE:  '--- combo box'",
      "     VISIBLE:  '--- combo box', cursor=1",
      "SPEECH OUTPUT: '--- combo box'"]))
diff --git a/test/keystrokes/firefox/label_inference_entries.py 
b/test/keystrokes/firefox/label_inference_entries.py
index b421642..a6137db 100644
--- a/test/keystrokes/firefox/label_inference_entries.py
+++ b/test/keystrokes/firefox/label_inference_entries.py
@@ -14,7 +14,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "1. Next form field",
     ["BRAILLE LINE:  'Type something rather amusing here:  $l'",
-     "     VISIBLE:  'Type something rather amusing he', cursor=0",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Type something rather amusing here: entry'"]))
 
 sequence.append(PauseAction(3000))
@@ -26,7 +26,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "2. Next form field",
     ["BRAILLE LINE:  'Amusing numbers fall between  $l and  $l.'",
-     "     VISIBLE:  'Amusing numbers fall between  $l', cursor=0",
+     "     VISIBLE:  ' $l and  $l.', cursor=1",
      "SPEECH OUTPUT: 'Amusing numbers fall between entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -35,9 +35,8 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "3. Next form field",
-    ["KNOWN ISSUE: We are not scrolling to the entry",
-     "BRAILLE LINE:  'Amusing numbers fall between  $l and  $l.'",
-     "     VISIBLE:  'Amusing numbers fall between  $l', cursor=0",
+    ["BRAILLE LINE:  'Amusing numbers fall between  $l and  $l.'",
+     "     VISIBLE:  ' $l.', cursor=1",
      "SPEECH OUTPUT: 'and entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -47,7 +46,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "4. Next form field",
     ["BRAILLE LINE:  ' $l I'm a label'",
-     "     VISIBLE:  ' $l I'm a label', cursor=0",
+     "     VISIBLE:  ' $l I'm a label', cursor=1",
      "SPEECH OUTPUT: 'I'm a label entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -57,7 +56,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "5. Next form field",
     ["BRAILLE LINE:  ' $l Am I a label as well?'",
-     "     VISIBLE:  ' $l Am I a label as well?', cursor=0",
+     "     VISIBLE:  ' $l Am I a label as well?', cursor=1",
      "SPEECH OUTPUT: 'Am I a label as well? entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -68,7 +67,7 @@ sequence.append(utils.AssertPresentationAction(
     "6. Next form field",
     ["KNOWN ISSUE: As the text suggests, we probably shouldn't be guessing this.",
      "BRAILLE LINE:  ' $l Too far away to be a label.'",
-     "     VISIBLE:  ' $l Too far away to be a label.', cursor=0",
+     "     VISIBLE:  ' $l Too far away to be a label.', cursor=1",
      "SPEECH OUTPUT: 'Too far away to be a label. entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -78,7 +77,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "7. Next form field",
     ["BRAILLE LINE:  'Distance doesn't count on the left $l'",
-     "     VISIBLE:  'Distance doesn't count on the le', cursor=0",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Distance doesn't count on the left entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -88,7 +87,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "8. Next form field",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=0",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'First Name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -98,7 +97,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "9. Next form field",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=0",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'M.I. entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -108,7 +107,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "10. Next form field",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=0",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Last Name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -118,7 +117,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "11. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l', cursor=1",
      "SPEECH OUTPUT: 'First name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -128,7 +127,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "12. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l', cursor=4",
      "SPEECH OUTPUT: 'Middle",
      "initial entry'"]))
 
@@ -139,7 +138,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "13. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l', cursor=7",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -149,7 +148,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "14. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l', cursor=1",
      "SPEECH OUTPUT: 'First Name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -159,7 +158,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "15. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l', cursor=4",
      "SPEECH OUTPUT: 'Middle",
      "initial entry'"]))
 
@@ -170,7 +169,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "16. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l', cursor=7",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -180,7 +179,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "17. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l', cursor=1",
      "SPEECH OUTPUT: 'Given name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -190,7 +189,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "18. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l', cursor=4",
      "SPEECH OUTPUT: 'initial entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -200,7 +199,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "19. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l', cursor=7",
      "SPEECH OUTPUT: 'Surname entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -210,7 +209,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "20. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l', cursor=1",
      "SPEECH OUTPUT: 'First name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -220,7 +219,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "21. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l', cursor=4",
      "SPEECH OUTPUT: 'Middle",
      "initial entry'"]))
 
@@ -231,7 +230,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "22. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l', cursor=7",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -241,7 +240,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "23. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l $l', cursor=1",
      "SPEECH OUTPUT: 'First name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -251,7 +250,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "24. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l $l', cursor=4",
      "SPEECH OUTPUT: 'Middle",
      "initial entry'"]))
 
@@ -262,7 +261,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "25. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l $l', cursor=7",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -272,7 +271,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "26. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l $l', cursor=10",
      "SPEECH OUTPUT: 'patched image entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -282,7 +281,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "27. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l $l', cursor=1",
      "SPEECH OUTPUT: 'First name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -292,7 +291,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "28. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l $l', cursor=4",
      "SPEECH OUTPUT: 'Middle",
      "initial entry'"]))
 
@@ -303,7 +302,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "29. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l $l', cursor=7",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -313,7 +312,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "30. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l $l', cursor=10",
      "SPEECH OUTPUT: 'patched image entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -323,7 +322,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "31. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l $l', cursor=1",
      "SPEECH OUTPUT: 'First name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -333,7 +332,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "32. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l $l', cursor=4",
      "SPEECH OUTPUT: 'Middle",
      "initial entry'"]))
 
@@ -344,7 +343,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "33. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l $l', cursor=7",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -354,7 +353,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "34. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=0",
+     "     VISIBLE:  ' $l $l $l $l', cursor=10",
      "SPEECH OUTPUT: 'patched image entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -364,7 +363,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "35. Next form field",
     ["BRAILLE LINE:  'bandaid graphic $l'",
-     "     VISIBLE:  'bandaid graphic $l', cursor=0",
+     "     VISIBLE:  'bandaid graphic $l', cursor=16",
      "SPEECH OUTPUT: 'bandaid graphic entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -374,7 +373,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "36. Next form field",
     ["BRAILLE LINE:  ' $l bandaid graphic redux'",
-     "     VISIBLE:  ' $l bandaid graphic redux', cursor=0",
+     "     VISIBLE:  ' $l bandaid graphic redux', cursor=1",
      "SPEECH OUTPUT: 'bandaid graphic redux entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -384,9 +383,9 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "37. Next form field",
     ["BRAILLE LINE:  'Magic disappearing text trick:  $l'",
-     "     VISIBLE:  'Magic disappearing text trick:  ', cursor=0",
+     "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  'Magic disappearing text trick:  $l'",
-     "     VISIBLE:  'Magic disappearing text trick:  ', cursor=0",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Magic disappearing text trick: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -396,7 +395,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "38. Next form field",
     ["BRAILLE LINE:  'Tell me a secret:  $l'",
-     "     VISIBLE:  'Tell me a secret:  $l', cursor=0",
+     "     VISIBLE:  'Tell me a secret:  $l', cursor=19",
      "SPEECH OUTPUT: 'Tell me a secret: password text'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -407,7 +406,9 @@ sequence.append(utils.AssertPresentationAction(
     "39. Next form field",
     ["BRAILLE LINE:  'I $l'",
      "     VISIBLE:  'I $l', cursor=1",
-     "SPEECH OUTPUT: 'Tell me a little more about yourself: entry I'"]))
+     "SPEECH OUTPUT: 'Tell me a little more about yourself: entry I",
+     "am a monkey with a long tail. I like to swing from trees and eat",
+     "bananas. I've recently taken up typing and plan to write my memoirs. '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyPressAction(0, None, "KP_Insert"))
@@ -418,7 +419,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'Wrapping to top.'",
      "     VISIBLE:  'Wrapping to top.', cursor=0",
      "BRAILLE LINE:  'Type something rather amusing here:  $l'",
-     "     VISIBLE:  'Type something rather amusing he', cursor=0",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Wrapping to top.' voice=system",
      "SPEECH OUTPUT: 'Type something rather amusing here: entry'"]))
 
diff --git a/test/keystrokes/firefox/label_inference_mailman.py 
b/test/keystrokes/firefox/label_inference_mailman.py
index b042e38..d263ff4 100644
--- a/test/keystrokes/firefox/label_inference_mailman.py
+++ b/test/keystrokes/firefox/label_inference_mailman.py
@@ -16,7 +16,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "1. Next form field",
     ["BRAILLE LINE:  'search mozilla:  $l Go push button'",
-     "     VISIBLE:  'search mozilla:  $l Go push butt', cursor=0",
+     "     VISIBLE:  'search mozilla:  $l Go push butt', cursor=17",
      "SPEECH OUTPUT: 'search mozilla: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -25,9 +25,8 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "2. Next form field",
-    ["KNOWN ISSUE: We are not scrolling to the current item",
-     "BRAILLE LINE:  'search mozilla:  $l Go push button'",
-     "     VISIBLE:  'search mozilla:  $l Go push butt', cursor=0",
+    ["BRAILLE LINE:  'search mozilla:  $l Go push button'",
+     "     VISIBLE:  'Go push button', cursor=1",
      "SPEECH OUTPUT: 'Go push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -37,7 +36,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "3. Next form field",
     ["BRAILLE LINE:  'Your email address: $l'",
-     "     VISIBLE:  'Your email address: $l', cursor=0",
+     "     VISIBLE:  'Your email address: $l', cursor=20",
      "SPEECH OUTPUT: 'Your email address: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -47,7 +46,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "4. Next form field",
     ["BRAILLE LINE:  'Your name (optional): $l'",
-     "     VISIBLE:  'Your name (optional): $l', cursor=0",
+     "     VISIBLE:  'Your name (optional): $l', cursor=22",
      "SPEECH OUTPUT: 'Your name (optional): entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -57,7 +56,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "5. Next form field",
     ["BRAILLE LINE:  'Pick a password: $l'",
-     "     VISIBLE:  'Pick a password: $l', cursor=0",
+     "     VISIBLE:  'Pick a password: $l', cursor=17",
      "SPEECH OUTPUT: 'Pick a password: password text'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -67,7 +66,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "6. Next form field",
     ["BRAILLE LINE:  'Reenter password to confirm: $l'",
-     "     VISIBLE:  'Reenter password to confirm: $l', cursor=0",
+     "     VISIBLE:  'Reenter password to confirm: $l', cursor=29",
      "SPEECH OUTPUT: 'Reenter password to confirm: password text'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -77,7 +76,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "7. Next form field",
     ["BRAILLE LINE:  '&=y radio button No & y radio button Yes'",
-     "     VISIBLE:  '&=y radio button No & y radio bu', cursor=0",
+     "     VISIBLE:  '&=y radio button No & y radio bu', cursor=1",
      "SPEECH OUTPUT: 'No selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -87,7 +86,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "8. Next form field",
     ["BRAILLE LINE:  '&=y radio button No & y radio button Yes'",
-     "     VISIBLE:  '&=y radio button No & y radio bu', cursor=0",
+     "     VISIBLE:  '& y radio button Yes', cursor=1",
      "SPEECH OUTPUT: 'Yes not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -97,7 +96,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "9. Next form field",
     ["BRAILLE LINE:  'Subscribe push button'",
-     "     VISIBLE:  'Subscribe push button', cursor=0",
+     "     VISIBLE:  'Subscribe push button', cursor=1",
      "SPEECH OUTPUT: 'Subscribe push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -107,7 +106,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "10. Next form field",
     ["BRAILLE LINE:  'Admin address:  $l Password:  $l Visit Subscriber List push button'",
-     "     VISIBLE:  'Admin address:  $l Password:  $l', cursor=0",
+     "     VISIBLE:  ' $l Password:  $l Visit Subscrib', cursor=1",
      "SPEECH OUTPUT: 'Admin address: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -117,7 +116,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "11. Next form field",
     ["BRAILLE LINE:  'Admin address:  $l Password:  $l Visit Subscriber List push button'",
-     "     VISIBLE:  'Admin address:  $l Password:  $l', cursor=0",
+     "     VISIBLE:  ' $l Visit Subscriber List push b', cursor=1",
      "SPEECH OUTPUT: 'Password: password text'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -127,7 +126,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "12. Next form field",
     ["BRAILLE LINE:  'Admin address:  $l Password:  $l Visit Subscriber List push button'",
-     "     VISIBLE:  'Admin address:  $l Password:  $l', cursor=0",
+     "     VISIBLE:  'Visit Subscriber List push butto', cursor=1",
      "SPEECH OUTPUT: 'Visit Subscriber List push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -138,7 +137,7 @@ sequence.append(utils.AssertPresentationAction(
     "13. Next form field",
     ["KNOWN ISSUE: We are failing to infer the label",
      "BRAILLE LINE:  ' $l Unsubscribe or edit options push button'",
-     "     VISIBLE:  ' $l Unsubscribe or edit options ', cursor=0",
+     "     VISIBLE:  ' $l Unsubscribe or edit options ', cursor=1",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -148,7 +147,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "14. Next form field",
     ["BRAILLE LINE:  ' $l Unsubscribe or edit options push button'",
-     "     VISIBLE:  ' $l Unsubscribe or edit options ', cursor=0",
+     "     VISIBLE:  'Unsubscribe or edit options push', cursor=1",
      "SPEECH OUTPUT: 'Unsubscribe or edit options push button'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/line_nav_bug_546815.py b/test/keystrokes/firefox/line_nav_bug_546815.py
index 97ba171..a9796cf 100644
--- a/test/keystrokes/firefox/line_nav_bug_546815.py
+++ b/test/keystrokes/firefox/line_nav_bug_546815.py
@@ -139,9 +139,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "15. Line Down",
-    ["BRAILLE LINE:  '< > check box bird'",
+    ["KNOWN ISSUE: We are guessing the label and presenting it because it's text on this line",
+     "BRAILLE LINE:  '< > check box bird'",
      "     VISIBLE:  '< > check box bird', cursor=1",
-     "SPEECH OUTPUT: 'check box not checked'",
+     "SPEECH OUTPUT: 'bird check box not checked'",
      "SPEECH OUTPUT: 'bird'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -150,7 +151,7 @@ sequence.append(utils.AssertPresentationAction(
     "16. Line Down",
     ["BRAILLE LINE:  '< > check box fish'",
      "     VISIBLE:  '< > check box fish', cursor=1",
-     "SPEECH OUTPUT: 'check box not checked'",
+     "SPEECH OUTPUT: 'fish check box not checked'",
      "SPEECH OUTPUT: 'fish'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -159,7 +160,7 @@ sequence.append(utils.AssertPresentationAction(
     "17. Line Down",
     ["BRAILLE LINE:  '< > check box wild animal'",
      "     VISIBLE:  '< > check box wild animal', cursor=1",
-     "SPEECH OUTPUT: 'check box not checked'",
+     "SPEECH OUTPUT: 'wild animal check box not checked'",
      "SPEECH OUTPUT: 'wild animal'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -190,9 +191,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "21. Line Down",
-    ["BRAILLE LINE:  '&=y radio button cabernet sauvignon'",
+    ["KNOWN ISSUE: We are guessing the label and presenting it because it's text on this line",
+     "BRAILLE LINE:  '&=y radio button cabernet sauvignon'",
      "     VISIBLE:  '&=y radio button cabernet sauvig', cursor=1",
-     "SPEECH OUTPUT: 'selected radio button'",
+     "SPEECH OUTPUT: 'cabernet sauvignon selected radio button'",
      "SPEECH OUTPUT: 'cabernet sauvignon'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -201,7 +203,7 @@ sequence.append(utils.AssertPresentationAction(
     "22. Line Down",
     ["BRAILLE LINE:  '& y radio button merlot'",
      "     VISIBLE:  '& y radio button merlot', cursor=1",
-     "SPEECH OUTPUT: 'not selected radio button'",
+     "SPEECH OUTPUT: 'merlot not selected radio button'",
      "SPEECH OUTPUT: 'merlot'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -210,7 +212,7 @@ sequence.append(utils.AssertPresentationAction(
     "23. Line Down",
     ["BRAILLE LINE:  '& y radio button nebbiolo'",
      "     VISIBLE:  '& y radio button nebbiolo', cursor=1",
-     "SPEECH OUTPUT: 'not selected radio button'",
+     "SPEECH OUTPUT: 'nebbiolo not selected radio button'",
      "SPEECH OUTPUT: 'nebbiolo'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -219,7 +221,7 @@ sequence.append(utils.AssertPresentationAction(
     "24. Line Down",
     ["BRAILLE LINE:  '& y radio button pinot noir'",
      "     VISIBLE:  '& y radio button pinot noir', cursor=1",
-     "SPEECH OUTPUT: 'not selected radio button'",
+     "SPEECH OUTPUT: 'pinot noir not selected radio button'",
      "SPEECH OUTPUT: 'pinot noir'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -228,7 +230,7 @@ sequence.append(utils.AssertPresentationAction(
     "25. Line Down",
     ["BRAILLE LINE:  '& y radio button don't drink wine'",
      "     VISIBLE:  '& y radio button don't drink win', cursor=1",
-     "SPEECH OUTPUT: 'not selected radio button'",
+     "SPEECH OUTPUT: 'don't drink wine not selected radio button'",
      "SPEECH OUTPUT: 'don't drink wine'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -237,7 +239,7 @@ sequence.append(utils.AssertPresentationAction(
     "26. Line Up",
     ["BRAILLE LINE:  '& y radio button pinot noir'",
      "     VISIBLE:  '& y radio button pinot noir', cursor=1",
-     "SPEECH OUTPUT: 'not selected radio button'",
+     "SPEECH OUTPUT: 'pinot noir not selected radio button'",
      "SPEECH OUTPUT: 'pinot noir'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -246,7 +248,7 @@ sequence.append(utils.AssertPresentationAction(
     "27. Line Up",
     ["BRAILLE LINE:  '& y radio button nebbiolo'",
      "     VISIBLE:  '& y radio button nebbiolo', cursor=1",
-     "SPEECH OUTPUT: 'not selected radio button'",
+     "SPEECH OUTPUT: 'nebbiolo not selected radio button'",
      "SPEECH OUTPUT: 'nebbiolo'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -255,7 +257,7 @@ sequence.append(utils.AssertPresentationAction(
     "28. Line Up",
     ["BRAILLE LINE:  '& y radio button merlot'",
      "     VISIBLE:  '& y radio button merlot', cursor=1",
-     "SPEECH OUTPUT: 'not selected radio button'",
+     "SPEECH OUTPUT: 'merlot not selected radio button'",
      "SPEECH OUTPUT: 'merlot'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -264,7 +266,7 @@ sequence.append(utils.AssertPresentationAction(
     "29. Line Up",
     ["BRAILLE LINE:  '&=y radio button cabernet sauvignon'",
      "     VISIBLE:  '&=y radio button cabernet sauvig', cursor=1",
-     "SPEECH OUTPUT: 'selected radio button'",
+     "SPEECH OUTPUT: 'cabernet sauvignon selected radio button'",
      "SPEECH OUTPUT: 'cabernet sauvignon'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -297,7 +299,7 @@ sequence.append(utils.AssertPresentationAction(
     "33. Line Up",
     ["BRAILLE LINE:  '< > check box wild animal'",
      "     VISIBLE:  '< > check box wild animal', cursor=1",
-     "SPEECH OUTPUT: 'check box not checked'",
+     "SPEECH OUTPUT: 'wild animal check box not checked'",
      "SPEECH OUTPUT: 'wild animal'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -306,7 +308,7 @@ sequence.append(utils.AssertPresentationAction(
     "34. Line Up",
     ["BRAILLE LINE:  '< > check box fish'",
      "     VISIBLE:  '< > check box fish', cursor=1",
-     "SPEECH OUTPUT: 'check box not checked'",
+     "SPEECH OUTPUT: 'fish check box not checked'",
      "SPEECH OUTPUT: 'fish'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -315,7 +317,7 @@ sequence.append(utils.AssertPresentationAction(
     "35. Line Up",
     ["BRAILLE LINE:  '< > check box bird'",
      "     VISIBLE:  '< > check box bird', cursor=1",
-     "SPEECH OUTPUT: 'check box not checked'",
+     "SPEECH OUTPUT: 'bird check box not checked'",
      "SPEECH OUTPUT: 'bird'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_bug_552887a.py b/test/keystrokes/firefox/line_nav_bug_552887a.py
index 992c911..58391aa 100644
--- a/test/keystrokes/firefox/line_nav_bug_552887a.py
+++ b/test/keystrokes/firefox/line_nav_bug_552887a.py
@@ -11,8 +11,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "1. Top of file",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -179,8 +179,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "22. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -261,8 +261,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "32. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/line_nav_bug_555055.py b/test/keystrokes/firefox/line_nav_bug_555055.py
index 37f1b38..7711e8a 100644
--- a/test/keystrokes/firefox/line_nav_bug_555055.py
+++ b/test/keystrokes/firefox/line_nav_bug_555055.py
@@ -55,7 +55,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Down",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -87,7 +87,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "10. Line Down",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -119,15 +119,15 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "14. Line Up",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "15. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  '  '",
+     "     VISIBLE:  '  ', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -158,8 +158,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "19. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' '",
+     "     VISIBLE:  ' ', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -167,15 +167,15 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "20. Line Up",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "21. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' '",
+     "     VISIBLE:  ' ', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -214,8 +214,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "26. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' '",
+     "     VISIBLE:  ' ', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_bugzilla_search_down.py 
b/test/keystrokes/firefox/line_nav_bugzilla_search_down.py
index 9d621ea..ccb0e60 100644
--- a/test/keystrokes/firefox/line_nav_bugzilla_search_down.py
+++ b/test/keystrokes/firefox/line_nav_bugzilla_search_down.py
@@ -68,7 +68,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Summary: contains all of the wor', cursor=1",
      "SPEECH OUTPUT: 'Summary: row header'",
      "SPEECH OUTPUT: 'contains all of the words/strings combo box'",
-     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'Summary: entry'",
      "SPEECH OUTPUT: 'Search push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -85,7 +85,7 @@ sequence.append(utils.AssertPresentationAction(
     "6. Line Down",
     ["BRAILLE LINE:  'Admin  list box'",
      "     VISIBLE:  'Admin  list box', cursor=1",
-     "SPEECH OUTPUT: 'Admin  multi-select List with 8 items'"]))
+     "SPEECH OUTPUT: 'Classification: Admin  multi-select List with 8 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -101,7 +101,7 @@ sequence.append(utils.AssertPresentationAction(
     "8. Line Down",
     ["BRAILLE LINE:  'accerciser list box'",
      "     VISIBLE:  'accerciser list box', cursor=1",
-     "SPEECH OUTPUT: 'accerciser multi-select List with 379 items'"]))
+     "SPEECH OUTPUT: 'Product: accerciser multi-select List with 379 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -119,7 +119,7 @@ sequence.append(utils.AssertPresentationAction(
     "10. Line Down",
     ["BRAILLE LINE:  'abiscan list box'",
      "     VISIBLE:  'abiscan list box', cursor=1",
-     "SPEECH OUTPUT: 'abiscan multi-select List with 1248 items'"]))
+     "SPEECH OUTPUT: 'Component: abiscan multi-select List with 1248 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -135,7 +135,7 @@ sequence.append(utils.AssertPresentationAction(
     "12. Line Down",
     ["BRAILLE LINE:  '0.0.1 list box'",
      "     VISIBLE:  '0.0.1 list box', cursor=1",
-     "SPEECH OUTPUT: '0.0.1 multi-select List with 857 items'"]))
+     "SPEECH OUTPUT: 'Version: 0.0.1 multi-select List with 857 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -151,7 +151,7 @@ sequence.append(utils.AssertPresentationAction(
     "14. Line Down",
     ["BRAILLE LINE:  '--- list box'",
      "     VISIBLE:  '--- list box', cursor=1",
-     "SPEECH OUTPUT: '--- multi-select List with 555 items'"]))
+     "SPEECH OUTPUT: 'Target Milestone: --- multi-select List with 555 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -208,7 +208,7 @@ sequence.append(utils.AssertPresentationAction(
     ["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",
-     "SPEECH OUTPUT: 'UNCONFIRMED NEW ASSIGNED REOPENED NEEDINFO multi-select List with 8 items'"]))
+     "SPEECH OUTPUT: 'Status: UNCONFIRMED NEW ASSIGNED REOPENED NEEDINFO multi-select List with 8 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -224,7 +224,7 @@ sequence.append(utils.AssertPresentationAction(
     "22. Line Down",
     ["BRAILLE LINE:  'FIXED list box'",
      "     VISIBLE:  'FIXED list box', cursor=1",
-     "SPEECH OUTPUT: 'FIXED multi-select List with 12 items'"]))
+     "SPEECH OUTPUT: 'Resolution: FIXED multi-select List with 12 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -240,7 +240,7 @@ sequence.append(utils.AssertPresentationAction(
     "24. Line Down",
     ["BRAILLE LINE:  'blocker list box'",
      "     VISIBLE:  'blocker list box', cursor=1",
-     "SPEECH OUTPUT: 'blocker multi-select List with 7 items'"]))
+     "SPEECH OUTPUT: 'Severity: blocker multi-select List with 7 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -256,7 +256,7 @@ sequence.append(utils.AssertPresentationAction(
     "26. Line Down",
     ["BRAILLE LINE:  'Immediate list box'",
      "     VISIBLE:  'Immediate list box', cursor=1",
-     "SPEECH OUTPUT: 'Immediate multi-select List with 5 items'"]))
+     "SPEECH OUTPUT: 'Priority: Immediate multi-select List with 5 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -272,7 +272,7 @@ sequence.append(utils.AssertPresentationAction(
     "28. Line Down",
     ["BRAILLE LINE:  'All list box'",
      "     VISIBLE:  'All list box', cursor=1",
-     "SPEECH OUTPUT: 'All multi-select List with 21 items'"]))
+     "SPEECH OUTPUT: 'OS: All multi-select List with 21 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -294,9 +294,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "31. Line Down",
-    ["BRAILLE LINE:  '<x> check box the bug assignee'",
+    ["KNOWN ISSUE: We are both guessing the label and presenting its text",
+     "BRAILLE LINE:  '<x> check box the bug assignee'",
      "     VISIBLE:  '<x> check box the bug assignee', cursor=1",
-     "SPEECH OUTPUT: 'check box checked'",
+     "SPEECH OUTPUT: 'the bug assignee check box checked'",
      "SPEECH OUTPUT: 'the bug assignee'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -305,7 +306,7 @@ sequence.append(utils.AssertPresentationAction(
     "32. Line Down",
     ["BRAILLE LINE:  '< > check box the reporter'",
      "     VISIBLE:  '< > check box the reporter', cursor=1",
-     "SPEECH OUTPUT: 'check box not checked'",
+     "SPEECH OUTPUT: 'the reporter check box not checked'",
      "SPEECH OUTPUT: 'the reporter'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -314,7 +315,7 @@ sequence.append(utils.AssertPresentationAction(
     "33. Line Down",
     ["BRAILLE LINE:  '< > check box the QA contact'",
      "     VISIBLE:  '< > check box the QA contact', cursor=1",
-     "SPEECH OUTPUT: 'check box not checked'",
+     "SPEECH OUTPUT: 'the QA contact check box not checked'",
      "SPEECH OUTPUT: 'the QA contact'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -323,7 +324,7 @@ sequence.append(utils.AssertPresentationAction(
     "34. Line Down",
     ["BRAILLE LINE:  '< > check box a CC list member'",
      "     VISIBLE:  '< > check box a CC list member', cursor=1",
-     "SPEECH OUTPUT: 'check box not checked'",
+     "SPEECH OUTPUT: 'a CC list member check box not checked'",
      "SPEECH OUTPUT: 'a CC list member'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -332,7 +333,7 @@ sequence.append(utils.AssertPresentationAction(
     "35. Line Down",
     ["BRAILLE LINE:  '< > check box a commenter'",
      "     VISIBLE:  '< > check box a commenter', cursor=1",
-     "SPEECH OUTPUT: 'check box not checked'",
+     "SPEECH OUTPUT: 'a commenter check box not checked'",
      "SPEECH OUTPUT: 'a commenter'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -365,7 +366,7 @@ sequence.append(utils.AssertPresentationAction(
     "39. Line Down",
     ["BRAILLE LINE:  '<x> check box the bug assignee'",
      "     VISIBLE:  '<x> check box the bug assignee', cursor=1",
-     "SPEECH OUTPUT: 'check box checked'",
+     "SPEECH OUTPUT: 'the bug assignee check box checked'",
      "SPEECH OUTPUT: 'the bug assignee'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -374,7 +375,7 @@ sequence.append(utils.AssertPresentationAction(
     "40. Line Down",
     ["BRAILLE LINE:  '<x> check box the reporter'",
      "     VISIBLE:  '<x> check box the reporter', cursor=1",
-     "SPEECH OUTPUT: 'check box checked'",
+     "SPEECH OUTPUT: 'the reporter check box checked'",
      "SPEECH OUTPUT: 'the reporter'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -383,7 +384,7 @@ sequence.append(utils.AssertPresentationAction(
     "41. Line Down",
     ["BRAILLE LINE:  '<x> check box the QA contact'",
      "     VISIBLE:  '<x> check box the QA contact', cursor=1",
-     "SPEECH OUTPUT: 'check box checked'",
+     "SPEECH OUTPUT: 'the QA contact check box checked'",
      "SPEECH OUTPUT: 'the QA contact'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -392,7 +393,7 @@ 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",
-     "SPEECH OUTPUT: 'check box checked'",
+     "SPEECH OUTPUT: 'a CC list member check box checked'",
      "SPEECH OUTPUT: 'a CC list member'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -401,7 +402,7 @@ sequence.append(utils.AssertPresentationAction(
     "43. Line Down",
     ["BRAILLE LINE:  '< > check box a commenter'",
      "     VISIBLE:  '< > check box a commenter', cursor=1",
-     "SPEECH OUTPUT: 'check box not checked'",
+     "SPEECH OUTPUT: 'a commenter check box not checked'",
      "SPEECH OUTPUT: 'a commenter'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -468,7 +469,7 @@ sequence.append(utils.AssertPresentationAction(
     "51. Line Down",
     ["BRAILLE LINE:  ' $l and Now $l'",
      "     VISIBLE:  ' $l and Now $l', cursor=1",
-     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'Only bugs changed between: entry'",
      "SPEECH OUTPUT: 'and'",
      "SPEECH OUTPUT: 'entry Now'"]))
 
@@ -494,7 +495,7 @@ sequence.append(utils.AssertPresentationAction(
     "54. Line Down",
     ["BRAILLE LINE:  '[Bug creation] list box'",
      "     VISIBLE:  '[Bug creation] list box', cursor=1",
-     "SPEECH OUTPUT: '[Bug creation] multi-select List with 26 items'"]))
+     "SPEECH OUTPUT: 'where one or more of the following changed: [Bug creation] multi-select List with 26 
items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -510,7 +511,7 @@ sequence.append(utils.AssertPresentationAction(
     "56. Line Down",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'entry'"]))
+     "SPEECH OUTPUT: 'and the new value was: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -526,7 +527,7 @@ sequence.append(utils.AssertPresentationAction(
     "58. Line Down",
     ["BRAILLE LINE:  'Unspecified list box'",
      "     VISIBLE:  'Unspecified list box', cursor=1",
-     "SPEECH OUTPUT: 'Unspecified multi-select List with 14 items'"]))
+     "SPEECH OUTPUT: 'GNOME version: Unspecified multi-select List with 14 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -542,7 +543,7 @@ sequence.append(utils.AssertPresentationAction(
     "60. Line Down",
     ["BRAILLE LINE:  'Unspecified list box'",
      "     VISIBLE:  'Unspecified list box', cursor=1",
-     "SPEECH OUTPUT: 'Unspecified multi-select List with 12 items'"]))
+     "SPEECH OUTPUT: 'GNOME target: Unspecified multi-select List with 12 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -592,7 +593,7 @@ 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",
-     "SPEECH OUTPUT: 'check box not checked'",
+     "SPEECH OUTPUT: 'Not (negate this whole chart) check box not checked'",
      "SPEECH OUTPUT: 'Not (negate this whole chart)'"]))
 
 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 a26f9e0..c9473ff 100644
--- a/test/keystrokes/firefox/line_nav_bugzilla_search_up.py
+++ b/test/keystrokes/firefox/line_nav_bugzilla_search_up.py
@@ -44,7 +44,7 @@ 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",
-     "SPEECH OUTPUT: 'check box not checked'",
+     "SPEECH OUTPUT: 'Not (negate this whole chart) check box not checked'",
      "SPEECH OUTPUT: 'Not (negate this whole chart)'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -95,7 +95,7 @@ sequence.append(utils.AssertPresentationAction(
     "10. Line Up",
     ["BRAILLE LINE:  'Unspecified list box'",
      "     VISIBLE:  'Unspecified list box', cursor=1",
-     "SPEECH OUTPUT: 'Unspecified multi-select List with 12 items'"]))
+     "SPEECH OUTPUT: 'GNOME target: Unspecified multi-select List with 12 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -111,7 +111,7 @@ sequence.append(utils.AssertPresentationAction(
     "12. Line Up",
     ["BRAILLE LINE:  'Unspecified list box'",
      "     VISIBLE:  'Unspecified list box', cursor=1",
-     "SPEECH OUTPUT: 'Unspecified multi-select List with 14 items'"]))
+     "SPEECH OUTPUT: 'GNOME version: Unspecified multi-select List with 14 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -127,7 +127,7 @@ sequence.append(utils.AssertPresentationAction(
     "14. Line Up",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'entry'"]))
+     "SPEECH OUTPUT: 'and the new value was: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -143,7 +143,7 @@ sequence.append(utils.AssertPresentationAction(
     "16. Line Up",
     ["BRAILLE LINE:  '[Bug creation] list box'",
      "     VISIBLE:  '[Bug creation] list box', cursor=1",
-     "SPEECH OUTPUT: '[Bug creation] multi-select List with 26 items'"]))
+     "SPEECH OUTPUT: 'where one or more of the following changed: [Bug creation] multi-select List with 26 
items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -167,7 +167,7 @@ sequence.append(utils.AssertPresentationAction(
     "19. Line Up",
     ["BRAILLE LINE:  ' $l and Now $l'",
      "     VISIBLE:  ' $l and Now $l', cursor=1",
-     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'Only bugs changed between: entry'",
      "SPEECH OUTPUT: 'and'",
      "SPEECH OUTPUT: 'entry Now'"]))
 
@@ -242,9 +242,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "28. Line Up",
-    ["BRAILLE LINE:  '<x> check box a CC list member'",
+    ["KNOWN ISSUE: We're guessing the label and presenting its text",
+     "BRAILLE LINE:  '<x> check box a CC list member'",
      "     VISIBLE:  '<x> check box a CC list member', cursor=1",
-     "SPEECH OUTPUT: 'check box checked'",
+     "SPEECH OUTPUT: 'a CC list member check box checked'",
      "SPEECH OUTPUT: 'a CC list member'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -253,7 +254,7 @@ sequence.append(utils.AssertPresentationAction(
     "29. Line Up",
     ["BRAILLE LINE:  '<x> check box the QA contact'",
      "     VISIBLE:  '<x> check box the QA contact', cursor=1",
-     "SPEECH OUTPUT: 'check box checked'",
+     "SPEECH OUTPUT: 'the QA contact check box checked'",
      "SPEECH OUTPUT: 'the QA contact'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -262,7 +263,7 @@ sequence.append(utils.AssertPresentationAction(
     "30. Line Up",
     ["BRAILLE LINE:  '<x> check box the reporter'",
      "     VISIBLE:  '<x> check box the reporter', cursor=1",
-     "SPEECH OUTPUT: 'check box checked'",
+     "SPEECH OUTPUT: 'the reporter check box checked'",
      "SPEECH OUTPUT: 'the reporter'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -271,7 +272,7 @@ sequence.append(utils.AssertPresentationAction(
     "31. Line Up",
     ["BRAILLE LINE:  '<x> check box the bug assignee'",
      "     VISIBLE:  '<x> check box the bug assignee', cursor=1",
-     "SPEECH OUTPUT: 'check box checked'",
+     "SPEECH OUTPUT: 'the bug assignee check box checked'",
      "SPEECH OUTPUT: 'the bug assignee'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -313,7 +314,7 @@ sequence.append(utils.AssertPresentationAction(
     "36. Line Up",
     ["BRAILLE LINE:  '< > check box a CC list member'",
      "     VISIBLE:  '< > check box a CC list member', cursor=1",
-     "SPEECH OUTPUT: 'check box not checked'",
+     "SPEECH OUTPUT: 'a CC list member check box not checked'",
      "SPEECH OUTPUT: 'a CC list member'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -322,7 +323,7 @@ sequence.append(utils.AssertPresentationAction(
     "37. Line Up",
     ["BRAILLE LINE:  '< > check box the QA contact'",
      "     VISIBLE:  '< > check box the QA contact', cursor=1",
-     "SPEECH OUTPUT: 'check box not checked'",
+     "SPEECH OUTPUT: 'the QA contact check box not checked'",
      "SPEECH OUTPUT: 'the QA contact'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -331,7 +332,7 @@ sequence.append(utils.AssertPresentationAction(
     "38. Line Up",
     ["BRAILLE LINE:  '< > check box the reporter'",
      "     VISIBLE:  '< > check box the reporter', cursor=1",
-     "SPEECH OUTPUT: 'check box not checked'",
+     "SPEECH OUTPUT: 'the reporter check box not checked'",
      "SPEECH OUTPUT: 'the reporter'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -340,7 +341,7 @@ sequence.append(utils.AssertPresentationAction(
     "39. Line Up",
     ["BRAILLE LINE:  '<x> check box the bug assignee'",
      "     VISIBLE:  '<x> check box the bug assignee', cursor=1",
-     "SPEECH OUTPUT: 'check box checked'",
+     "SPEECH OUTPUT: 'the bug assignee check box checked'",
      "SPEECH OUTPUT: 'the bug assignee'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -365,7 +366,7 @@ sequence.append(utils.AssertPresentationAction(
     "42. Line Up",
     ["BRAILLE LINE:  'All list box'",
      "     VISIBLE:  'All list box', cursor=1",
-     "SPEECH OUTPUT: 'All multi-select List with 21 items'"]))
+     "SPEECH OUTPUT: 'OS: All multi-select List with 21 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -381,7 +382,7 @@ sequence.append(utils.AssertPresentationAction(
     "44. Line Up",
     ["BRAILLE LINE:  'Immediate list box'",
      "     VISIBLE:  'Immediate list box', cursor=1",
-     "SPEECH OUTPUT: 'Immediate multi-select List with 5 items'"]))
+     "SPEECH OUTPUT: 'Priority: Immediate multi-select List with 5 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -397,7 +398,7 @@ sequence.append(utils.AssertPresentationAction(
     "46. Line Up",
     ["BRAILLE LINE:  'blocker list box'",
      "     VISIBLE:  'blocker list box', cursor=1",
-     "SPEECH OUTPUT: 'blocker multi-select List with 7 items'"]))
+     "SPEECH OUTPUT: 'Severity: blocker multi-select List with 7 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -413,7 +414,7 @@ sequence.append(utils.AssertPresentationAction(
     "48. Line Up",
     ["BRAILLE LINE:  'FIXED list box'",
      "     VISIBLE:  'FIXED list box', cursor=1",
-     "SPEECH OUTPUT: 'FIXED multi-select List with 12 items'"]))
+     "SPEECH OUTPUT: 'Resolution: FIXED multi-select List with 12 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -429,7 +430,7 @@ sequence.append(utils.AssertPresentationAction(
     "50. Line Up",
     ["BRAILLE LINE:  'UNCONFIRMED NEW ASSIGNED REOPENED NEEDINFO list box'",
      "     VISIBLE:  'UNCONFIRMED NEW ASSIGNED REOPENE', cursor=1",
-     "SPEECH OUTPUT: 'UNCONFIRMED NEW ASSIGNED REOPENED NEEDINFO multi-select List with 8 items'"]))
+     "SPEECH OUTPUT: 'Status: UNCONFIRMED NEW ASSIGNED REOPENED NEEDINFO multi-select List with 8 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -485,7 +486,7 @@ sequence.append(utils.AssertPresentationAction(
     "56. Line Up",
     ["BRAILLE LINE:  '--- list box'",
      "     VISIBLE:  '--- list box', cursor=1",
-     "SPEECH OUTPUT: '--- multi-select List with 555 items'"]))
+     "SPEECH OUTPUT: 'Target Milestone: --- multi-select List with 555 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -501,7 +502,7 @@ sequence.append(utils.AssertPresentationAction(
     "58. Line Up",
     ["BRAILLE LINE:  '0.0.1 list box'",
      "     VISIBLE:  '0.0.1 list box', cursor=1",
-     "SPEECH OUTPUT: '0.0.1 multi-select List with 857 items'"]))
+     "SPEECH OUTPUT: 'Version: 0.0.1 multi-select List with 857 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -517,7 +518,7 @@ sequence.append(utils.AssertPresentationAction(
     "60. Line Up",
     ["BRAILLE LINE:  'abiscan list box'",
      "     VISIBLE:  'abiscan list box', cursor=1",
-     "SPEECH OUTPUT: 'abiscan multi-select List with 1248 items'"]))
+     "SPEECH OUTPUT: 'Component: abiscan multi-select List with 1248 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -535,7 +536,7 @@ sequence.append(utils.AssertPresentationAction(
     "62. Line Up",
     ["BRAILLE LINE:  'accerciser list box'",
      "     VISIBLE:  'accerciser list box', cursor=1",
-     "SPEECH OUTPUT: 'accerciser multi-select List with 379 items'"]))
+     "SPEECH OUTPUT: 'Product: accerciser multi-select List with 379 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -551,7 +552,7 @@ sequence.append(utils.AssertPresentationAction(
     "64. Line Up",
     ["BRAILLE LINE:  'Admin  list box'",
      "     VISIBLE:  'Admin  list box', cursor=1",
-     "SPEECH OUTPUT: 'Admin  multi-select List with 8 items'"]))
+     "SPEECH OUTPUT: 'Classification: Admin  multi-select List with 8 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -569,7 +570,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Summary: contains all of the wor', cursor=1",
      "SPEECH OUTPUT: 'Summary: row header'",
      "SPEECH OUTPUT: 'contains all of the words/strings combo box'",
-     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'Summary: entry'",
      "SPEECH OUTPUT: 'Search push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -587,7 +588,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "68. Line Up",
     ["BRAILLE LINE:  'Short Bug Search Form Complicated Bug Search Form'",
-     "     VISIBLE:  'Short Bug Search Form Complicate', cursor=0",
+     "     VISIBLE:  'Short Bug Search Form Complicate', cursor=1",
      "SPEECH OUTPUT: 'Short Bug Search Form'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'Complicated Bug Search Form'"]))
diff --git a/test/keystrokes/firefox/line_nav_enter_bug.py b/test/keystrokes/firefox/line_nav_enter_bug.py
index 201cd8e..cb05751 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:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -77,7 +77,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Down",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -120,7 +120,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "10. Line Down",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -148,7 +148,7 @@ sequence.append(utils.AssertPresentationAction(
     "13. Line Down",
     ["BRAILLE LINE:  '2.21.x  list box'",
      "     VISIBLE:  '2.21.x  list box', cursor=1",
-     "SPEECH OUTPUT: '2.21.x  List with 9 items'"]))
+     "SPEECH OUTPUT: 'Version: 2.21.x  List with 9 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -166,14 +166,14 @@ sequence.append(utils.AssertPresentationAction(
     "15. Line Down",
     ["BRAILLE LINE:  'braille  list box'",
      "     VISIBLE:  'braille  list box', cursor=1",
-     "SPEECH OUTPUT: 'braille  List with 5 items'"]))
+     "SPEECH OUTPUT: 'Component: braille  List with 5 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "16. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' '",
+     "     VISIBLE:  ' ', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -201,7 +201,7 @@ sequence.append(utils.AssertPresentationAction(
     "19. Line Down",
     ["BRAILLE LINE:  'Unspecified combo box'",
      "     VISIBLE:  'Unspecified combo box', cursor=1",
-     "SPEECH OUTPUT: 'Unspecified combo box'"]))
+     "SPEECH OUTPUT: 'GNOME version: Unspecified combo box'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -229,8 +229,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "22. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' '",
+     "     VISIBLE:  ' ', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -256,14 +256,14 @@ sequence.append(utils.AssertPresentationAction(
     "25. Line Down",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'entry'"]))
+     "SPEECH OUTPUT: 'Description: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "26. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' '",
+     "     VISIBLE:  ' ', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -299,7 +299,7 @@ sequence.append(utils.AssertPresentationAction(
     "30. Line Down",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'entry'"]))
+     "SPEECH OUTPUT: 'Keywords: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -332,8 +332,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "34. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' '",
+     "     VISIBLE:  ' ', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -342,7 +342,7 @@ sequence.append(utils.AssertPresentationAction(
     "35. Line Up",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'entry'"]))
+     "SPEECH OUTPUT: 'Description: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -365,8 +365,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "38. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' '",
+     "     VISIBLE:  ' ', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -397,7 +397,7 @@ sequence.append(utils.AssertPresentationAction(
     "41. Line Up",
     ["BRAILLE LINE:  'Unspecified combo box'",
      "     VISIBLE:  'Unspecified combo box', cursor=1",
-     "SPEECH OUTPUT: 'Unspecified combo box'"]))
+     "SPEECH OUTPUT: 'GNOME version: Unspecified combo box'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -422,8 +422,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "44. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' '",
+     "     VISIBLE:  ' ', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -432,7 +432,7 @@ sequence.append(utils.AssertPresentationAction(
     "45. Line Up",
     ["BRAILLE LINE:  'braille  list box'",
      "     VISIBLE:  'braille  list box', cursor=1",
-     "SPEECH OUTPUT: 'braille  List with 5 items'"]))
+     "SPEECH OUTPUT: 'Component: braille  List with 5 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -450,7 +450,7 @@ sequence.append(utils.AssertPresentationAction(
     "47. Line Up",
     ["BRAILLE LINE:  '2.21.x  list box'",
      "     VISIBLE:  '2.21.x  list box', cursor=1",
-     "SPEECH OUTPUT: '2.21.x  List with 9 items'"]))
+     "SPEECH OUTPUT: 'Version: 2.21.x  List with 9 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -476,7 +476,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "50. Line Up",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -519,7 +519,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "54. Line Up",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -527,7 +527,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "55. Line Up",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_entries.py b/test/keystrokes/firefox/line_nav_entries.py
index 74c12f3..9cc16f4 100644
--- a/test/keystrokes/firefox/line_nav_entries.py
+++ b/test/keystrokes/firefox/line_nav_entries.py
@@ -49,9 +49,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
-    ["BRAILLE LINE:  ' $l I'm a label'",
+    ["KNOWN ISSUE: We're guessing the label and also presenting its text",
+     "BRAILLE LINE:  ' $l I'm a label'",
      "     VISIBLE:  ' $l I'm a label', cursor=1",
-     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'I'm a label entry'",
      "SPEECH OUTPUT: 'I'm a label'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -60,7 +61,7 @@ sequence.append(utils.AssertPresentationAction(
     "5. Line Down",
     ["BRAILLE LINE:  ' $l Am I a label as well?'",
      "     VISIBLE:  ' $l Am I a label as well?', cursor=1",
-     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'Am I a label as well? entry'",
      "SPEECH OUTPUT: 'Am I a label as well?'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -85,7 +86,7 @@ sequence.append(utils.AssertPresentationAction(
     "8. Line Down",
     ["BRAILLE LINE:  ' $l Too far away to be a label.'",
      "     VISIBLE:  ' $l Too far away to be a label.', cursor=1",
-     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'Too far away to be a label. entry'",
      "SPEECH OUTPUT: 'Too far away to be a label.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -111,7 +112,7 @@ sequence.append(utils.AssertPresentationAction(
     "11. Line Down",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'entry'"]))
+     "SPEECH OUTPUT: 'First Name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -127,7 +128,7 @@ sequence.append(utils.AssertPresentationAction(
     "13. Line Down",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'entry'"]))
+     "SPEECH OUTPUT: 'M.I. entry'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -143,7 +144,7 @@ sequence.append(utils.AssertPresentationAction(
     "15. Line Down",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'entry'"]))
+     "SPEECH OUTPUT: 'Last Name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -167,7 +168,7 @@ sequence.append(utils.AssertPresentationAction(
     "18. Line Down",
     ["BRAILLE LINE:  ' $l $l $l'",
      "     VISIBLE:  ' $l $l $l', cursor=1",
-     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'First name entry'",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'entry'"]))
 
@@ -253,7 +254,7 @@ sequence.append(utils.AssertPresentationAction(
     "28. Line Down",
     ["BRAILLE LINE:  ' $l $l $l'",
      "     VISIBLE:  ' $l $l $l', cursor=1",
-     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'First Name entry'",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'entry'"]))
 
@@ -288,7 +289,7 @@ sequence.append(utils.AssertPresentationAction(
     "32. Line Up",
     ["BRAILLE LINE:  ' $l $l $l'",
      "     VISIBLE:  ' $l $l $l', cursor=1",
-     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'First Name entry'",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'entry'"]))
 
@@ -374,7 +375,7 @@ sequence.append(utils.AssertPresentationAction(
     "42. Line Up",
     ["BRAILLE LINE:  ' $l $l $l'",
      "     VISIBLE:  ' $l $l $l', cursor=1",
-     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'First name entry'",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'entry'"]))
 
@@ -400,7 +401,7 @@ sequence.append(utils.AssertPresentationAction(
     "45. Line Up",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'entry'"]))
+     "SPEECH OUTPUT: 'Last Name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -416,7 +417,7 @@ sequence.append(utils.AssertPresentationAction(
     "47. Line Up",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'entry'"]))
+     "SPEECH OUTPUT: 'M.I. entry'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -432,7 +433,7 @@ sequence.append(utils.AssertPresentationAction(
     "49. Line Up",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'entry'"]))
+     "SPEECH OUTPUT: 'First Name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -457,7 +458,7 @@ sequence.append(utils.AssertPresentationAction(
     "52. Line Up",
     ["BRAILLE LINE:  ' $l Too far away to be a label.'",
      "     VISIBLE:  ' $l Too far away to be a label.', cursor=1",
-     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'Too far away to be a label. entry'",
      "SPEECH OUTPUT: 'Too far away to be a label.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -482,7 +483,7 @@ sequence.append(utils.AssertPresentationAction(
     "55. Line Up",
     ["BRAILLE LINE:  ' $l Am I a label as well?'",
      "     VISIBLE:  ' $l Am I a label as well?', cursor=1",
-     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'Am I a label as well? entry'",
      "SPEECH OUTPUT: 'Am I a label as well?'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -491,7 +492,7 @@ sequence.append(utils.AssertPresentationAction(
     "56. Line Up",
     ["BRAILLE LINE:  ' $l I'm a label'",
      "     VISIBLE:  ' $l I'm a label', cursor=1",
-     "SPEECH OUTPUT: 'entry'",
+     "SPEECH OUTPUT: 'I'm a label entry'",
      "SPEECH OUTPUT: 'I'm a label'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_hidden_label.py 
b/test/keystrokes/firefox/line_nav_hidden_label.py
index 19b01af..b273aa2 100644
--- a/test/keystrokes/firefox/line_nav_hidden_label.py
+++ b/test/keystrokes/firefox/line_nav_hidden_label.py
@@ -29,8 +29,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["KNOWN ISSUE: We're displaying part of the hidden label",
+     "BRAILLE LINE:  'I '",
+     "     VISIBLE:  'I ', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
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 3b07e0d..0eb1f37 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
@@ -14,16 +14,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("End"))
 sequence.append(utils.AssertPresentationAction(
     "1. End",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'newline'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Home"))
 sequence.append(utils.AssertPresentationAction(
     "2. Home",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'newline'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/line_nav_iframes_in_inline_block.py 
b/test/keystrokes/firefox/line_nav_iframes_in_inline_block.py
index 436e106..0747a4b 100644
--- a/test/keystrokes/firefox/line_nav_iframes_in_inline_block.py
+++ b/test/keystrokes/firefox/line_nav_iframes_in_inline_block.py
@@ -19,16 +19,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -43,8 +43,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "5. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_nested_tables.py 
b/test/keystrokes/firefox/line_nav_nested_tables.py
index 3426b61..f48580e 100644
--- a/test/keystrokes/firefox/line_nav_nested_tables.py
+++ b/test/keystrokes/firefox/line_nav_nested_tables.py
@@ -63,7 +63,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. line Down",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -80,7 +80,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "8. line Down",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -88,7 +88,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "9. line Down",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -120,7 +120,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "13. line Down",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -137,7 +137,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "15. line Down",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -145,7 +145,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "16. line Down",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -177,7 +177,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "20. line Up",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -185,7 +185,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "21. line Up",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -202,15 +202,15 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "23. line Up",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "24. line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' '",
+     "     VISIBLE:  ' ', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -242,7 +242,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "28. line Up",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -250,7 +250,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "29. line Up",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -267,15 +267,15 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "31. line Up",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "32. line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' '",
+     "     VISIBLE:  ' ', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -290,8 +290,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "34. line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  '   $l'",
+     "     VISIBLE:  '   $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_pre_lines.py b/test/keystrokes/firefox/line_nav_pre_lines.py
index 3d416d8..130ac01 100644
--- a/test/keystrokes/firefox/line_nav_pre_lines.py
+++ b/test/keystrokes/firefox/line_nav_pre_lines.py
@@ -19,16 +19,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -67,8 +67,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "8. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -83,16 +83,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "10. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "11. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -131,16 +131,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "16. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "17. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_pre_links.py b/test/keystrokes/firefox/line_nav_pre_links.py
index e8c7f3c..04c0a5a 100644
--- a/test/keystrokes/firefox/line_nav_pre_links.py
+++ b/test/keystrokes/firefox/line_nav_pre_links.py
@@ -53,8 +53,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -78,8 +78,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "9. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_simple_form.py b/test/keystrokes/firefox/line_nav_simple_form.py
index 725ea8c..fe8da23 100644
--- a/test/keystrokes/firefox/line_nav_simple_form.py
+++ b/test/keystrokes/firefox/line_nav_simple_form.py
@@ -41,7 +41,7 @@ sequence.append(utils.AssertPresentationAction(
     "4. line Down",
     ["BRAILLE LINE:  'I am a monkey with a long tail.  I like  $l'",
      "     VISIBLE:  'I am a monkey with a long tail. ', cursor=1",
-     "SPEECH OUTPUT: 'entry I am a monkey with a long tail.  I like '"]))
+     "SPEECH OUTPUT: 'Tell me a little more about yourself: entry I am a monkey with a long tail.  I like 
'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -49,7 +49,7 @@ sequence.append(utils.AssertPresentationAction(
     "5. line Down",
     ["BRAILLE LINE:  'to swing from trees and eat bananas.   $l'",
      "     VISIBLE:  'to swing from trees and eat bana', cursor=1",
-     "SPEECH OUTPUT: 'entry to swing from trees and eat bananas.  '"]))
+     "SPEECH OUTPUT: 'to swing from trees and eat bananas.  '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -57,7 +57,7 @@ sequence.append(utils.AssertPresentationAction(
     "6. 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: 'entry I've recently taken up typing and plan '"]))
+     "SPEECH OUTPUT: 'I've recently taken up typing and plan '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -65,7 +65,7 @@ sequence.append(utils.AssertPresentationAction(
     "7. line Down",
     ["BRAILLE LINE:  'to write my memoirs. $l'",
      "     VISIBLE:  'to write my memoirs. $l', cursor=1",
-     "SPEECH OUTPUT: 'entry to write my memoirs.",
+     "SPEECH OUTPUT: 'to write my memoirs.",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -74,7 +74,7 @@ sequence.append(utils.AssertPresentationAction(
     "8. line Down",
     ["BRAILLE LINE:  '      $l'",
      "     VISIBLE:  '      $l', cursor=1",
-     "SPEECH OUTPUT: 'entry      '"]))
+     "SPEECH OUTPUT: '     '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -110,7 +110,7 @@ sequence.append(utils.AssertPresentationAction(
     "12. line Down",
     ["BRAILLE LINE:  'Hockey list box'",
      "     VISIBLE:  'Hockey list box', cursor=1",
-     "SPEECH OUTPUT: 'Hockey multi-select List with 4 items'"]))
+     "SPEECH OUTPUT: 'Which sports do you like? Hockey multi-select List with 4 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -146,7 +146,7 @@ sequence.append(utils.AssertPresentationAction(
     "16. line Up",
     ["BRAILLE LINE:  'Hockey list box'",
      "     VISIBLE:  'Hockey list box', cursor=1",
-     "SPEECH OUTPUT: 'Hockey multi-select List with 4 items'"]))
+     "SPEECH OUTPUT: 'Which sports do you like? Hockey multi-select List with 4 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -182,7 +182,7 @@ sequence.append(utils.AssertPresentationAction(
     "20. line Up",
     ["BRAILLE LINE:  '      $l'",
      "     VISIBLE:  '      $l', cursor=1",
-     "SPEECH OUTPUT: 'entry      '"]))
+     "SPEECH OUTPUT: '     '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -190,7 +190,7 @@ sequence.append(utils.AssertPresentationAction(
     "21. line Up",
     ["BRAILLE LINE:  'to write my memoirs. $l'",
      "     VISIBLE:  'to write my memoirs. $l', cursor=1",
-     "SPEECH OUTPUT: 'entry to write my memoirs.",
+     "SPEECH OUTPUT: 'to write my memoirs.",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -199,7 +199,7 @@ sequence.append(utils.AssertPresentationAction(
     "22. line Up",
     ["BRAILLE LINE:  'I've recently taken up typing and plan  $l'",
      "     VISIBLE:  'I've recently taken up typing an', cursor=1",
-     "SPEECH OUTPUT: 'entry I've recently taken up typing and plan '"]))
+     "SPEECH OUTPUT: 'I've recently taken up typing and plan '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -207,7 +207,7 @@ sequence.append(utils.AssertPresentationAction(
     "23. line Up",
     ["BRAILLE LINE:  'to swing from trees and eat bananas.   $l'",
      "     VISIBLE:  'to swing from trees and eat bana', cursor=1",
-     "SPEECH OUTPUT: 'entry to swing from trees and eat bananas.  '"]))
+     "SPEECH OUTPUT: 'to swing from trees and eat bananas.  '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -215,7 +215,7 @@ sequence.append(utils.AssertPresentationAction(
     "24. 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",
-     "SPEECH OUTPUT: 'entry I am a monkey with a long tail.  I like '"]))
+     "SPEECH OUTPUT: 'Tell me a little more about yourself: entry I am a monkey with a long tail.  I like 
'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_slash_test.py b/test/keystrokes/firefox/line_nav_slash_test.py
index d897459..97ad18e 100644
--- a/test/keystrokes/firefox/line_nav_slash_test.py
+++ b/test/keystrokes/firefox/line_nav_slash_test.py
@@ -85,9 +85,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "9. Line Down",
-    ["BRAILLE LINE:  '& y radio button Some polls'",
+    ["KNOWN ISSUE: We're guessing the label and also presenting its text",
+     "BRAILLE LINE:  '& y radio button Some polls'",
      "     VISIBLE:  '& y radio button Some polls', cursor=1",
-     "SPEECH OUTPUT: 'not selected radio button'",
+     "SPEECH OUTPUT: 'Some polls not selected radio button'",
      "SPEECH OUTPUT: 'Some polls'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -106,7 +107,7 @@ sequence.append(utils.AssertPresentationAction(
     "11. Line Up",
     ["BRAILLE LINE:  '& y radio button Some polls'",
      "     VISIBLE:  '& y radio button Some polls', cursor=1",
-     "SPEECH OUTPUT: 'not selected radio button'",
+     "SPEECH OUTPUT: 'Some polls not selected radio button'",
      "SPEECH OUTPUT: 'Some polls'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_sun_java.py b/test/keystrokes/firefox/line_nav_sun_java.py
index cb9adaa..b6a5821 100644
--- a/test/keystrokes/firefox/line_nav_sun_java.py
+++ b/test/keystrokes/firefox/line_nav_sun_java.py
@@ -55,8 +55,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=0",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -310,8 +310,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "33. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  '           $l'",
+     "     VISIBLE:  '           $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -334,8 +334,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "36. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  '           $l'",
+     "     VISIBLE:  '           $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -358,8 +358,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "39. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  '           $l'",
+     "     VISIBLE:  '           $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_table_cell_links.py 
b/test/keystrokes/firefox/line_nav_table_cell_links.py
index be1cd40..50f2217 100644
--- a/test/keystrokes/firefox/line_nav_table_cell_links.py
+++ b/test/keystrokes/firefox/line_nav_table_cell_links.py
@@ -109,7 +109,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "12. Line Up",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_wiki_down.py b/test/keystrokes/firefox/line_nav_wiki_down.py
index ff44881..f69f78f 100644
--- a/test/keystrokes/firefox/line_nav_wiki_down.py
+++ b/test/keystrokes/firefox/line_nav_wiki_down.py
@@ -955,9 +955,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "97. Line Down",
-    ["BRAILLE LINE:  'More Actions: combo box'",
+    ["KNOWN ISSUE: This is not correct",
+     "BRAILLE LINE:  'More Actions: combo box'",
      "     VISIBLE:  'More Actions: combo box', cursor=1",
-     "SPEECH OUTPUT: 'More Actions: combo box'"]))
+     "SPEECH OUTPUT: 'Attachments More Actions: combo box'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
diff --git a/test/keystrokes/firefox/line_nav_wiki_up.py b/test/keystrokes/firefox/line_nav_wiki_up.py
index 461e18d..19da3e6 100644
--- a/test/keystrokes/firefox/line_nav_wiki_up.py
+++ b/test/keystrokes/firefox/line_nav_wiki_up.py
@@ -61,9 +61,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Up",
-    ["BRAILLE LINE:  'More Actions: combo box'",
+    ["KNOWN ISSUE: This is not correct",
+     "BRAILLE LINE:  'More Actions: combo box'",
      "     VISIBLE:  'More Actions: combo box', cursor=1",
-     "SPEECH OUTPUT: 'More Actions: combo box'"]))
+     "SPEECH OUTPUT: 'Attachments More Actions: combo box'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))


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