[orca] Gecko: Fix several issues related to embedded object characters



commit b490fd4e0e3045688498d99c79715f549aff4560
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sat Aug 23 16:32:05 2014 -0400

    Gecko: Fix several issues related to embedded object characters

 src/orca/formatting.py                             |    8 +-
 src/orca/scripts/toolkits/Gecko/script.py          |   64 +++++-------
 test/keystrokes/firefox/aria_alert_uiuc.py         |   13 +--
 test/keystrokes/firefox/aria_button.py             |    9 +-
 test/keystrokes/firefox/aria_button_dojo.py        |   52 ++--------
 test/keystrokes/firefox/aria_checkbox_dojo.py      |   39 +++-----
 test/keystrokes/firefox/aria_combobox_dojo.py      |   17 ++--
 .../firefox/aria_editor_navigation_dojo.py         |    2 -
 test/keystrokes/firefox/aria_grid_uiuc.py          |   46 +++++----
 test/keystrokes/firefox/aria_slider.py             |    6 +-
 test/keystrokes/firefox/aria_slider_dojo.py        |   18 ++--
 test/keystrokes/firefox/aria_slider_uiuc.py        |   17 +---
 test/keystrokes/firefox/aria_spinner_dojo.py       |    2 -
 test/keystrokes/firefox/aria_tabpanel.py           |    6 +-
 test/keystrokes/firefox/aria_tabpanel_uiuc.py      |   15 ++--
 test/keystrokes/firefox/aria_toolbar_dojo.py       |    2 -
 test/keystrokes/firefox/aria_tree_uiuc.py          |   12 +--
 test/keystrokes/firefox/flat_review_combo_box.py   |    4 +-
 test/keystrokes/firefox/focus_tracking_imagemap.py |    8 --
 test/keystrokes/firefox/html_role_combo_box.py     |   70 ++++++--------
 .../firefox/label_inference_bug_546815.py          |   32 ------
 test/keystrokes/firefox/label_inference_entries.py |  100 ++-----------------
 test/keystrokes/firefox/label_inference_mailman.py |   28 ------
 test/keystrokes/firefox/line_nav_bug_546815.py     |   40 +-------
 test/keystrokes/firefox/line_nav_bug_552887a.py    |    4 +-
 test/keystrokes/firefox/line_nav_bug_555055.py     |    8 +-
 test/keystrokes/firefox/line_nav_enter_bug.py      |   42 +++------
 .../firefox/line_nav_follow_same_page_link.py      |    4 +-
 test/keystrokes/firefox/line_nav_simple_form.py    |   26 ++----
 test/keystrokes/firefox/line_nav_slash_test.py     |    4 -
 test/keystrokes/firefox/line_nav_sun_java.py       |    4 +-
 test/keystrokes/firefox/line_nav_wiki_down.py      |    6 +-
 test/keystrokes/firefox/line_nav_wiki_up.py        |    6 +-
 test/keystrokes/firefox/ui_role_combo_box.py       |   43 ++++-----
 34 files changed, 229 insertions(+), 528 deletions(-)
---
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index 60a6ea0..6764e72 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -134,7 +134,7 @@ formatting = {
             'basicWhereAmI': 'label + roleName + value + percentage + ' + MNEMONIC + ' + accelerator + 
required'
             },
         pyatspi.ROLE_COMBO_BOX: {
-            'focused': 'name + roleName + positionInList',
+            'focused': 'expandableState',
             'unfocused': 'label + name + roleName + positionInList + ' + MNEMONIC + ' + accelerator',
             'basicWhereAmI': 'label + roleName + name + positionInList + ' + MNEMONIC + ' + accelerator'
             },
@@ -401,7 +401,7 @@ formatting = {
             },
         pyatspi.ROLE_CHECK_BOX: {
             'unfocused': '[Component(obj,\
-                                     asString(label + displayedText + roleName),\
+                                     asString(labelOrName + roleName),\
                                      indicator=asString(checkedState))]'
             },
         pyatspi.ROLE_CHECK_MENU_ITEM: {
@@ -416,7 +416,7 @@ formatting = {
             # combobox starts.]]]
             #
             'unfocused': '((comboBoxTextObj and [Text(comboBoxTextObj[0], asString(label), asString(eol))])\
-                           or [Component(obj, asString(label + displayedText), label and 
(len(asString(label)) + 1) or 0)])\
+                           or [Component(obj, asString(label + name), label and (len(asString(label)) + 1) 
or 0)])\
                           + [Region(" " + asString(roleName))]'
             },
         #pyatspi.ROLE_DESKTOP_ICON: 'default'
@@ -601,7 +601,7 @@ if settings.useExperimentalSpeechProsody:
         'labelAndName + roleName + checkedState + required + availability + ' + MNEMONIC + ' + accelerator + 
pause + positionInList'
     formatting['speech'][pyatspi.ROLE_CHECK_MENU_ITEM]['basicWhereAmI'] = \
         'ancestors + pause + labelAndName + roleName + checkedState + pause + accelerator + pause + 
positionInList + ' + MNEMONIC
-    formatting['speech'][pyatspi.ROLE_COMBO_BOX]['focused'] = 'name + pause + positionInList + pause'
+    formatting['speech'][pyatspi.ROLE_COMBO_BOX]['focused'] = 'expandableState'
     formatting['speech'][pyatspi.ROLE_COMBO_BOX]['unfocused'] = 'label + name + roleName + pause + 
positionInList + ' + MNEMONIC + ' + accelerator'
     formatting['speech'][pyatspi.ROLE_COMBO_BOX]['basicWhereAmI'] = \
         'label + roleName + pause + name + positionInList + ' + MNEMONIC + ' + accelerator'
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index 8258231..dd414b2 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -846,6 +846,10 @@ class Script(default.Script):
     def onCaretMoved(self, event):
         """Callback for object:text-caret-moved accessibility events."""
 
+        if not self.inDocumentContent(event.source):
+            default.Script.onCaretMoved(self, event)
+            return
+
         if self._lastCommandWasCaretNav:
             msg = "INFO: Caret-moved event ignored: last command was caret nav"
             debug.println(debug.LEVEL_INFO, msg)
@@ -860,6 +864,18 @@ class Script(default.Script):
         if not text:
             if event.source.getRole() == pyatspi.ROLE_LINK:
                 orca.setLocusOfFocus(event, event.source)
+                self.setCaretContext(event.source, event.detail1)
+            return
+
+        char, start, end = text.getTextAtOffset(event.detail1, pyatspi.TEXT_BOUNDARY_CHAR)
+        if char == self.EMBEDDED_OBJECT_CHARACTER:
+            msg = "INFO: Caret-moved event ignored: Caret moved to embedded object"
+            debug.println(debug.LEVEL_INFO, msg)
+            return
+
+        if not char:
+            msg = "INFO: Caret-moved event ignored: Caret moved to empty character"
+            debug.println(debug.LEVEL_INFO, msg)
             return
 
         contextObj, contextOffset = self.getCaretContext()
@@ -877,10 +893,6 @@ class Script(default.Script):
            and not state.contains(pyatspi.STATE_EDITABLE):
             return
 
-        if not self.inDocumentContent(obj):
-            default.Script.onCaretMoved(self, event)
-            return
-
         if self.utilities.inFindToolbar():
             self.presentFindResults(obj, event.detail1)
             return
@@ -948,6 +960,13 @@ class Script(default.Script):
            and self.inDocumentContent(event.source):
             return
 
+        text = self.utilities.queryNonEmptyText(event.source)
+        char, start, end = text.getTextAtOffset(text.caretOffset, pyatspi.TEXT_BOUNDARY_CHAR)
+        if char == self.EMBEDDED_OBJECT_CHARACTER:
+            msg = "INFO: Text-selection event ignored: Caret offset is at embedded object"
+            debug.println(debug.LEVEL_INFO, msg)
+            return
+
         default.Script.onTextSelectionChanged(self, event)
 
     def onActiveChanged(self, event):
@@ -1480,39 +1499,17 @@ class Script(default.Script):
 
         line = self.getNewBrailleLine(clearBraille=True, addLine=True)
 
-        # Some text areas have a character offset of -1 when you tab
-        # into them.  In these cases, they show all the text as being
-        # selected.  We don't know quite what to do in that case,
-        # so we'll just pretend the caret is at the beginning (0).
-        #
         [focusedObj, focusedCharacterOffset] = self.getCaretContext()
-
-        # [[[TODO: HACK - WDW when composing e-mail in Thunderbird and
-        # when entering text in editable text areas, Gecko likes to
-        # force the last character of a line to be a newline.  So,
-        # we adjust for this because we want to keep meaningful text
-        # on the display.]]]
-        #
-        needToRefresh = False
-        lineContentsOffset = focusedCharacterOffset
-        focusedObjText = self.utilities.queryNonEmptyText(focusedObj)
-        if focusedObjText:
-            char = focusedObjText.getText(focusedCharacterOffset,
-                                          focusedCharacterOffset + 1)
-            if char == "\n":
-                lineContentsOffset = max(0, focusedCharacterOffset - 1)
-                needToRefresh = True
-
         contents = self.currentLineContents
         index = self.findObjectOnLine(focusedObj,
-                                      max(0, lineContentsOffset),
+                                      max(0, focusedCharacterOffset),
                                       contents)
-        if index < 0 or needToRefresh:
+        if index < 0:
             contents = self.getLineContentsAtOffset(focusedObj,
-                                                    max(0, lineContentsOffset))
+                                                    max(0, focusedCharacterOffset))
             self.currentLineContents = contents
             index = self.findObjectOnLine(focusedObj,
-                                          max(0, lineContentsOffset),
+                                          max(0, focusedCharacterOffset),
                                           contents)
 
         if not len(contents):
@@ -1631,13 +1628,6 @@ class Script(default.Script):
             if isLastObject:
                 line.regions[-1].string = line.regions[-1].string.rstrip(" ")
 
-            # If we're inside of a combo box, we only want to display
-            # the selected menu item.
-            #
-            if obj.getRole() == pyatspi.ROLE_MENU_ITEM \
-               and obj.getState().contains(pyatspi.STATE_FOCUSED):
-                break
-
         if extraRegion:
             self.addBrailleRegionToLine(extraRegion, line)
 
diff --git a/test/keystrokes/firefox/aria_alert_uiuc.py b/test/keystrokes/firefox/aria_alert_uiuc.py
index c19cbd6..ac21e13 100644
--- a/test/keystrokes/firefox/aria_alert_uiuc.py
+++ b/test/keystrokes/firefox/aria_alert_uiuc.py
@@ -17,10 +17,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'dialog', cursor=1",
      "BRAILLE LINE:  'Browse mode'",
      "     VISIBLE:  'Browse mode', cursor=0",
-     "BRAILLE LINE:  'Alert Box'",
-     "     VISIBLE:  'Alert Box', cursor=0",
-     "BRAILLE LINE:  'Alert Box'",
-     "     VISIBLE:  'Alert Box', cursor=0",
      "SPEECH OUTPUT: 'Alert BoxYou must choose a number between 1 and 10!Close'",
      "SPEECH OUTPUT: 'Browse mode' voice=system"]))
 
@@ -28,7 +24,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down to message",
-    ["BRAILLE LINE:  'You must choose a number'",
+    ["BRAILLE LINE:  'dialog'",
+     "     VISIBLE:  'dialog', cursor=1",
+     "BRAILLE LINE:  'You must choose a number'",
      "     VISIBLE:  'You must choose a number', cursor=1",
      "SPEECH OUTPUT: 'You must choose a number '"]))
 
@@ -44,13 +42,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "4. Close Alert",
-    ["KNOWN ISSUE: We shouldn't be brailling the EOC",
-     "BRAILLE LINE:  'Guess a number between 1 and 10 12 $l'",
+    ["BRAILLE LINE:  'Guess a number between 1 and 10 12 $l'",
      "     VISIBLE:  'ss a number between 1 and 10 12 ', cursor=32",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "BRAILLE LINE:  '\ufffc $l'",
-     "     VISIBLE:  '\ufffc $l', cursor=1",
      "BRAILLE LINE:  'Guess a number between 1 and 10 12 $l'",
      "     VISIBLE:  'ss a number between 1 and 10 12 ', cursor=32",
      "SPEECH OUTPUT: 'Guess a number between 1 and 10 entry 12 selected'",
diff --git a/test/keystrokes/firefox/aria_button.py b/test/keystrokes/firefox/aria_button.py
index 369852d..f0234eb 100644
--- a/test/keystrokes/firefox/aria_button.py
+++ b/test/keystrokes/firefox/aria_button.py
@@ -11,12 +11,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to Tracking number text entry",
-    ["BRAILLE LINE:  'Tracking number Tracking number  $l'",
+    ["KNOWN ISSUE: Double braille?",
+     "BRAILLE LINE:  'Tracking number Tracking number  $l'",
      "     VISIBLE:  'Tracking number  $l', cursor=17",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'Tracking number entry'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
@@ -24,7 +23,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "2. Tab to Check Now push button",
-    ["BRAILLE LINE:  'Check Now push button'",
+    ["BRAILLE LINE:  'Tracking number Tracking number  $l'",
+     "     VISIBLE:  'Tracking number  $l', cursor=17",
+     "BRAILLE LINE:  'Check Now push button'",
      "     VISIBLE:  'Check Now push button', cursor=1",
      "BRAILLE LINE:  'Browse mode'",
      "     VISIBLE:  'Browse mode', cursor=0",
diff --git a/test/keystrokes/firefox/aria_button_dojo.py b/test/keystrokes/firefox/aria_button_dojo.py
index 30a7ccb..49a4035 100644
--- a/test/keystrokes/firefox/aria_button_dojo.py
+++ b/test/keystrokes/firefox/aria_button_dojo.py
@@ -11,8 +11,6 @@ sequence.append(utils.AssertPresentationAction(
     "1. Tab to the <button> button",
     ["BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button Viewpush button Createsave options push button   Savesave options push button Disabled push button 
push button'",
      "     VISIBLE:  '<button> push button <input type', cursor=1",
-     "BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button Viewpush button Createsave options push button   Savesave options push button Disabled push button 
push button'",
-     "     VISIBLE:  '<button> push button <input type', cursor=1",
      "SPEECH OUTPUT: '<button> push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -30,8 +28,6 @@ sequence.append(utils.AssertPresentationAction(
     "3. Tab to <input type='button'>",
     ["BRAILLE LINE:  '<button> push button  Create push button Create push button Viewpush button Createsave 
options push button   Savesave options push button Disabled push button push button <input type='button'> 
push button'",
      "     VISIBLE:  '<input type='button'> push butto', cursor=1",
-     "BRAILLE LINE:  '<button> push button  Create push button Create push button Viewpush button Createsave 
options push button   Savesave options push button Disabled push button push button <input type='button'> 
push button'",
-     "     VISIBLE:  '<input type='button'> push butto', cursor=1",
      "SPEECH OUTPUT: '<input type='button'> push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -49,8 +45,6 @@ sequence.append(utils.AssertPresentationAction(
     "5. Tab to first Create button",
     ["BRAILLE LINE:  '<button> push button  Create push button Create push button Viewpush button Createsave 
options push button   Savesave options push button Disabled push button push button <input type='button'> 
push button'",
      "     VISIBLE:  'Create push button Create push b', cursor=1",
-     "BRAILLE LINE:  '<button> push button  Create push button Create push button Viewpush button Createsave 
options push button   Savesave options push button Disabled push button push button <input type='button'> 
push button'",
-     "     VISIBLE:  'Create push button Create push b', cursor=1",
      "SPEECH OUTPUT: 'Create push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -68,8 +62,6 @@ sequence.append(utils.AssertPresentationAction(
     "7. Tab to View push button",
     ["BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button push button Createsave options push button   Savesave options push button Disabled push button push 
button View'",
      "     VISIBLE:  '<button> push button <input type', cursor=0",
-     "BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button push button Createsave options push button   Savesave options push button Disabled push button push 
button View'",
-     "     VISIBLE:  '<button> push button <input type', cursor=0",
      "SPEECH OUTPUT: 'View push button view title'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -78,8 +70,6 @@ sequence.append(utils.AssertPresentationAction(
     "8. Tab to second Create button",
     ["BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button Viewpush button save options push button   Savesave options push button Disabled push button push 
button Create'",
      "     VISIBLE:  '<button> push button <input type', cursor=0",
-     "BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button Viewpush button save options push button   Savesave options push button Disabled push button push 
button Create'",
-     "     VISIBLE:  '<button> push button <input type', cursor=0",
      "SPEECH OUTPUT: 'Create push button creative title'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -88,8 +78,6 @@ sequence.append(utils.AssertPresentationAction(
     "9. Tab to drop down menu on Create -- whose tooltip and accessible name is 'save options'",
     ["BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button Viewpush button    Savesave options push button Disabled push button push button Createsave options 
push button'",
      "     VISIBLE:  'save options push button', cursor=1",
-     "BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button Viewpush button    Savesave options push button Disabled push button push button Createsave options 
push button'",
-     "     VISIBLE:  'save options push button', cursor=1",
      "SPEECH OUTPUT: 'save options push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -124,8 +112,6 @@ sequence.append(utils.AssertPresentationAction(
     "12. Close Create drop down menu",
     ["BRAILLE LINE:  'save options collapsed push button'",
      "     VISIBLE:  'save options collapsed push butt', cursor=1",
-     "BRAILLE LINE:  'save options collapsed push button'",
-     "     VISIBLE:  'save options collapsed push butt', cursor=1",
      "SPEECH OUTPUT: 'save options collapsed push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -136,8 +122,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Edit! push button', cursor=1",
      "BRAILLE LINE:  'Browse mode'",
      "     VISIBLE:  'Browse mode', cursor=0",
-     "BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button Viewpush button Create   Savesave options push button Disabled push button push button Edit!Edit! push 
button'",
-     "     VISIBLE:  'Edit! push button', cursor=1",
      "SPEECH OUTPUT: 'Edit! push button edit title'",
      "SPEECH OUTPUT: 'Browse mode' voice=system"]))
 
@@ -145,7 +129,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("space"))
 sequence.append(utils.AssertPresentationAction(
     "14. Open the Edit! menu",
-    ["BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button Viewpush button Create   Savesave options push button Disabled push button push button Edit!Edit! push 
button'",
+    ["BRAILLE LINE:  'Edit! push button'",
+     "     VISIBLE:  'Edit! push button', cursor=1",
+     "BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button Viewpush button Create   Savesave options push button Disabled push button push button Edit!Edit! push 
button'",
      "     VISIBLE:  'Edit! push button', cursor=1",
      "BRAILLE LINE:  'Cut'",
      "     VISIBLE:  'Cut', cursor=1",
@@ -227,8 +213,6 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE: Too much speech context",
      "BRAILLE LINE:  'Submenu menu'",
      "     VISIBLE:  'Submenu menu', cursor=1",
-     "BRAILLE LINE:  'Submenu menu'",
-     "     VISIBLE:  'Submenu menu', cursor=1",
      "SPEECH OUTPUT: 'Edit! edit title panel'",
      "SPEECH OUTPUT: 'Edit! Edit! edit title menu'",
      "SPEECH OUTPUT: 'Submenu menu'"]))
@@ -239,8 +223,6 @@ sequence.append(utils.AssertPresentationAction(
     "22. Close the Edit! menu",
     ["BRAILLE LINE:  'Edit! collapsed push button'",
      "     VISIBLE:  'Edit! collapsed push button', cursor=1",
-     "BRAILLE LINE:  'Edit! collapsed push button'",
-     "     VISIBLE:  'Edit! collapsed push button', cursor=1",
      "SPEECH OUTPUT: 'Edit! collapsed push button edit title'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -251,8 +233,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Color push button', cursor=1",
      "BRAILLE LINE:  'Browse mode'",
      "     VISIBLE:  'Browse mode', cursor=0",
-     "BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button Viewpush button Create   Savesave options push button Disabled push button push button ColorColor push 
button'",
-     "     VISIBLE:  'Color push button', cursor=1",
      "SPEECH OUTPUT: 'Color push button'",
      "SPEECH OUTPUT: 'Browse mode' voice=system"]))
 
@@ -261,16 +241,14 @@ sequence.append(KeyComboAction("space"))
 sequence.append(utils.AssertPresentationAction(
     "24. Open the Color menu",
     ["KNOWN ISSUE: This is messed up on several different levels",
+     "BRAILLE LINE:  'Color push button'",
+     "     VISIBLE:  'Color push button', cursor=1",
      "BRAILLE LINE:  '<button> push button <input type='button'> push button Create push button Create push 
button Viewpush button Create   Savesave options push button Disabled push button push button ColorColor push 
button'",
      "     VISIBLE:  'Color push button', cursor=1",
      "BRAILLE LINE:  'white lime green blue'",
      "     VISIBLE:  'white lime green blue', cursor=0",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "BRAILLE LINE:  'white table cell'",
-     "     VISIBLE:  'white table cell', cursor=1",
-     "BRAILLE LINE:  '\ufffc $l'",
-     "     VISIBLE:  '\ufffc $l', cursor=2",
      "SPEECH OUTPUT: 'Color panel'",
      "SPEECH OUTPUT: 'white'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
@@ -279,15 +257,12 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "25. Go to lime",
-    ["KNOWN ISSUE: We should not be presenting this embedded object char",
-     "BRAILLE LINE:  'lime table cell'",
-     "     VISIBLE:  'lime table cell', cursor=1",
+    ["KNOWN ISSUE: Why are we presenting the cell?",
+     "BRAILLE LINE:  'white lime green blue'",
+     "     VISIBLE:  'white lime green blue', cursor=0",
      "BRAILLE LINE:  'lime table cell'",
      "     VISIBLE:  'lime table cell', cursor=1",
-     "BRAILLE LINE:  '\ufffc $l'",
-     "     VISIBLE:  '\ufffc $l', cursor=2",
-     "SPEECH OUTPUT: 'lime'",
-     "SPEECH OUTPUT: '\ufffc'"]))
+     "SPEECH OUTPUT: 'lime'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Escape"))
@@ -295,8 +270,6 @@ sequence.append(utils.AssertPresentationAction(
     "26. Close the Color menu",
     ["BRAILLE LINE:  'Color collapsed push button'",
      "     VISIBLE:  'Color collapsed push button', cursor=1",
-     "BRAILLE LINE:  'Color collapsed push button'",
-     "     VISIBLE:  'Color collapsed push button', cursor=1",
      "SPEECH OUTPUT: 'Color collapsed push button'"]))
 
 for i in range(18):
@@ -308,15 +281,14 @@ sequence.append(utils.AssertPresentationAction(
     "27. Tab to the toggle me off button",
     ["BRAILLE LINE:  'Toggle me off&=y Toggle me off toggle button'",
      "     VISIBLE:  '&=y Toggle me off toggle button', cursor=1",
-     "BRAILLE LINE:  'Toggle me off&=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())
 sequence.append(KeyComboAction("space"))
 sequence.append(utils.AssertPresentationAction(
     "28. Toggle the state of the toggle me off button",
-    ["BRAILLE LINE:  'Toggle me off& y toggle me on Toggle me off toggle button'",
+    ["KNOWN ISSUE: This seems an excessive amount of braille updating",
+     "BRAILLE LINE:  'Toggle me off& y toggle me on Toggle me off toggle button'",
      "     VISIBLE:  '& y toggle me on Toggle me off t', cursor=1",
      "BRAILLE LINE:  'toggle me on& y toggle me on Toggle me off toggle button'",
      "     VISIBLE:  '& y toggle me on Toggle me off t', cursor=1",
@@ -342,8 +314,6 @@ sequence.append(utils.AssertPresentationAction(
     "30. Tab to the toggle me button",
     ["BRAILLE LINE:  'toggle me off&=y toggle me off Toggle me off toggle button push button push button 
Toggle meToggle me push button'",
      "     VISIBLE:  'Toggle me push button', cursor=1",
-     "BRAILLE LINE:  'toggle me off&=y toggle me off Toggle me off toggle button push button push button 
Toggle meToggle me push button'",
-     "     VISIBLE:  'Toggle me push button', cursor=1",
      "SPEECH OUTPUT: 'Toggle me push button'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/aria_checkbox_dojo.py b/test/keystrokes/firefox/aria_checkbox_dojo.py
index 6d81f5b..b3a94f9 100644
--- a/test/keystrokes/firefox/aria_checkbox_dojo.py
+++ b/test/keystrokes/firefox/aria_checkbox_dojo.py
@@ -11,9 +11,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to the cb0 checkbox",
-    ["BRAILLE LINE:  '<x> cb0: Vanilla (non-dojo) checkbox (for comparison purposes) cb0: Vanilla (non-dojo) 
checkbox (for comparison purposes) check box cb0: Vanilla (non-dojo) checkbox (for comparison purposes)'",
-     "     VISIBLE:  '<x> cb0: Vanilla (non-dojo) chec', cursor=1",
-     "BRAILLE LINE:  '<x> cb0: Vanilla (non-dojo) checkbox (for comparison purposes) cb0: Vanilla (non-dojo) 
checkbox (for comparison purposes) check box cb0: Vanilla (non-dojo) checkbox (for comparison purposes)'",
+    ["KNOWN ISSUE: Seems like we're double-brailling the name in all these tests",
+     "BRAILLE LINE:  '<x> cb0: Vanilla (non-dojo) checkbox (for comparison purposes) check box cb0: Vanilla 
(non-dojo) checkbox (for comparison purposes)'",
      "     VISIBLE:  '<x> cb0: Vanilla (non-dojo) chec', cursor=1",
      "SPEECH OUTPUT: 'cb0: Vanilla (non-dojo) checkbox (for comparison purposes) check box checked'"]))
 
@@ -21,7 +20,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction(" "))
 sequence.append(utils.AssertPresentationAction(
     "2. Change state on cb0 checkbox",
-    ["BRAILLE LINE:  '< > cb0: Vanilla (non-dojo) checkbox (for comparison purposes) cb0: Vanilla (non-dojo) 
checkbox (for comparison purposes) check box cb0: Vanilla (non-dojo) checkbox (for comparison purposes)'",
+    ["BRAILLE LINE:  '< > cb0: Vanilla (non-dojo) checkbox (for comparison purposes) check box cb0: Vanilla 
(non-dojo) checkbox (for comparison purposes)'",
      "     VISIBLE:  '< > cb0: Vanilla (non-dojo) chec', cursor=1",
      "SPEECH OUTPUT: 'not checked'"]))
 
@@ -29,9 +28,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "3. Tab to the cb1 checkbox",
-    ["BRAILLE LINE:  '< > cb1: normal checkbox, with value=foo, clicking generates console log messages cb1: 
normal checkbox, with value=foo, clicking generates console log messages check box cb1: normal checkbox, with 
value=foo, clicking generates console log messages get('value') push button'",
-     "     VISIBLE:  '< > cb1: normal checkbox, with v', cursor=1",
-     "BRAILLE LINE:  '< > cb1: normal checkbox, with value=foo, clicking generates console log messages cb1: 
normal checkbox, with value=foo, clicking generates console log messages check box cb1: normal checkbox, with 
value=foo, clicking generates console log messages get('value') push button'",
+    ["BRAILLE LINE:  '< > cb1: normal checkbox, with value=foo, clicking generates console log messages 
check box cb1: normal checkbox, with value=foo, clicking generates console log messages get('value') push 
button'",
      "     VISIBLE:  '< > cb1: normal checkbox, with v', cursor=1",
      "SPEECH OUTPUT: 'cb1: normal checkbox, with value=foo, clicking generates console log messages check 
box not checked'"]))
 
@@ -39,7 +36,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction(" "))
 sequence.append(utils.AssertPresentationAction(
     "4. Change state on cb1 checkbox",
-    ["BRAILLE LINE:  '<x> cb1: normal checkbox, with value=foo, clicking generates console log messages cb1: 
normal checkbox, with value=foo, clicking generates console log messages check box cb1: normal checkbox, with 
value=foo, clicking generates console log messages get('value') push button'",
+    ["BRAILLE LINE:  '<x> cb1: normal checkbox, with value=foo, clicking generates console log messages 
check box cb1: normal checkbox, with value=foo, clicking generates console log messages get('value') push 
button'",
      "     VISIBLE:  '<x> cb1: normal checkbox, with v', cursor=1",
      "SPEECH OUTPUT: 'checked'"]))
 
@@ -48,9 +45,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "5. Tab to the cb2 checkbox",
-    ["BRAILLE LINE:  '<x> cb2: normal checkbox, with default value, initially turned on. cb2: normal 
checkbox, with default value, initially turned on. check box cb2: normal checkbox, with default value, 
initially turned on. \"onChange\" handler updates: [] get('value') push button'",
-     "     VISIBLE:  '<x> cb2: normal checkbox, with d', cursor=1",
-     "BRAILLE LINE:  '<x> cb2: normal checkbox, with default value, initially turned on. cb2: normal 
checkbox, with default value, initially turned on. check box cb2: normal checkbox, with default value, 
initially turned on. \"onChange\" handler updates: [] get('value') push button'",
+    ["BRAILLE LINE:  '<x> cb2: normal checkbox, with default value, initially turned on. check box cb2: 
normal checkbox, with default value, initially turned on. \"onChange\" handler updates: [] get('value') push 
button'",
      "     VISIBLE:  '<x> cb2: normal checkbox, with d', cursor=1",
      "SPEECH OUTPUT: 'cb2: normal checkbox, with default value, initially turned on. check box checked'"]))
 
@@ -59,9 +54,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "6. Tab to the cb4 checkbox",
-    ["BRAILLE LINE:  '<x> cb4: readOnly checkbox, turned on cb4: readOnly checkbox, turned on check box cb4: 
readOnly checkbox, turned on'",
-     "     VISIBLE:  '<x> cb4: readOnly checkbox, turn', cursor=1",
-     "BRAILLE LINE:  '<x> cb4: readOnly checkbox, turned on cb4: readOnly checkbox, turned on check box cb4: 
readOnly checkbox, turned on'",
+    ["BRAILLE LINE:  '<x> cb4: readOnly checkbox, turned on check box cb4: readOnly checkbox, turned on'",
      "     VISIBLE:  '<x> cb4: readOnly checkbox, turn', cursor=1",
      "SPEECH OUTPUT: 'cb4: readOnly checkbox, turned on check box checked'"]))
 
@@ -69,9 +62,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "7. Tab to the cb5 checkbox",
-    ["BRAILLE LINE:  '< > cb5: normal checkbox, with specified value=\"\", clicking generates console log 
messages cb5: normal checkbox, with specified value=\"\", clicking generates console log messages check box 
cb5: normal checkbox, with specified value=\"\", clicking generates console log messages get('value') push 
button'",
-     "     VISIBLE:  '< > cb5: normal checkbox, with s', cursor=1",
-     "BRAILLE LINE:  '< > cb5: normal checkbox, with specified value=\"\", clicking generates console log 
messages cb5: normal checkbox, with specified value=\"\", clicking generates console log messages check box 
cb5: normal checkbox, with specified value=\"\", clicking generates console log messages get('value') push 
button'",
+    ["BRAILLE LINE:  '< > cb5: normal checkbox, with specified value=\"\", clicking generates console log 
messages check box cb5: normal checkbox, with specified value=\"\", clicking generates console log messages 
get('value') push button'",
      "     VISIBLE:  '< > cb5: normal checkbox, with s', cursor=1",
      "SPEECH OUTPUT: 'cb5: normal checkbox, with specified value=\"\", clicking generates console log 
messages check box not checked'"]))
 
@@ -80,9 +71,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "8. Tab to the cb6 checkbox",
-    ["BRAILLE LINE:  '<x> cb6: instantiated from script cb6: instantiated from script check box cb6: 
instantiated from script'",
-     "     VISIBLE:  '<x> cb6: instantiated from scrip', cursor=1",
-     "BRAILLE LINE:  '<x> cb6: instantiated from script cb6: instantiated from script check box cb6: 
instantiated from script'",
+    ["BRAILLE LINE:  '<x> cb6: instantiated from script check box cb6: instantiated from script'",
      "     VISIBLE:  '<x> cb6: instantiated from scrip', cursor=1",
      "SPEECH OUTPUT: 'cb6: instantiated from script check box checked'"]))
 
@@ -90,18 +79,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "9. Tab to the cb7 checkbox",
-    ["BRAILLE LINE:  '< > cb7: normal checkbox. cb7: normal checkbox. check box cb7: normal checkbox. 
disable push button enable push button set value to \"fish\" push button Reset value+checked push button 
\"onChange\" handler updates: []'",
-     "     VISIBLE:  '< > cb7: normal checkbox. cb7: n', cursor=1",
-     "BRAILLE LINE:  '< > cb7: normal checkbox. cb7: normal checkbox. check box cb7: normal checkbox. 
disable push button enable push button set value to \"fish\" push button Reset value+checked push button 
\"onChange\" handler updates: []'",
-     "     VISIBLE:  '< > cb7: normal checkbox. cb7: n', cursor=1",
+    ["BRAILLE LINE:  '< > cb7: normal checkbox. check box cb7: normal checkbox. disable push button enable 
push button set value to \"fish\" push button Reset value+checked push button \"onChange\" handler updates: 
[]'",
+     "     VISIBLE:  '< > cb7: normal checkbox. check ', cursor=1",
      "SPEECH OUTPUT: 'cb7: normal checkbox. check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "10. Basic Where Am I",
-    ["BRAILLE LINE:  '< > cb7: normal checkbox. cb7: normal checkbox. check box cb7: normal checkbox. 
disable push button enable push button set value to \"fish\" push button Reset value+checked push button 
\"onChange\" handler updates: []'",
-     "     VISIBLE:  '< > cb7: normal checkbox. cb7: n', cursor=1",
+    ["BRAILLE LINE:  '< > cb7: normal checkbox. check box cb7: normal checkbox. disable push button enable 
push button set value to \"fish\" push button Reset value+checked push button \"onChange\" handler updates: 
[]'",
+     "     VISIBLE:  '< > cb7: normal checkbox. check ', cursor=1",
      "SPEECH OUTPUT: 'cb7: normal checkbox.'",
      "SPEECH OUTPUT: 'check box not checked'"]))
 
diff --git a/test/keystrokes/firefox/aria_combobox_dojo.py b/test/keystrokes/firefox/aria_combobox_dojo.py
index abec97f..ecac13a 100644
--- a/test/keystrokes/firefox/aria_combobox_dojo.py
+++ b/test/keystrokes/firefox/aria_combobox_dojo.py
@@ -14,16 +14,13 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to the first combo box",
-    ["KNOWN ISSUE: We are presenting an EOC.",
-     "BRAILLE LINE:  'US State test 1 (200% Courier font):  \u25bc push button US State test 1 (200% Courier 
font): California $l'",
+    ["BRAILLE LINE:  'US State test 1 (200% Courier font):  \u25bc push button US State test 1 (200% Courier 
font): California $l'",
      "     VISIBLE:  '(200% Courier font): California ', cursor=32",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
      "BRAILLE LINE:  'US State test 1 (200% Courier font): California $l'",
      "     VISIBLE:  '(200% Courier font): California ', cursor=32",
-     "BRAILLE LINE:  '\ufffc'",
-     "     VISIBLE:  '\ufffc', cursor=1",
-     "SPEECH OUTPUT: 'combo box'",
+     "SPEECH OUTPUT: 'collapsed'",
      "SPEECH OUTPUT: 'US State test 1 (200% Courier font): entry California selected'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
@@ -33,9 +30,9 @@ sequence.append(utils.AssertPresentationAction(
     "2. Replace existing text with a 'C'",
     ["KNOWN ISSUE: It would be good to present the appearance of the popup so one knows there's something to 
Down arrow into.",
      "BRAILLE LINE:  'US State test 1 (200% Courier font): C $l'",
-     "     VISIBLE:  'e test 1 (200% Courier font): C ', cursor=32",
+     "     VISIBLE:  '(200% Courier font): C $l', cursor=23",
      "BRAILLE LINE:  'US State test 1 (200% Courier font): C $l'",
-     "     VISIBLE:  'e test 1 (200% Courier font): C ', cursor=32"]))
+     "     VISIBLE:  '(200% Courier font): C $l', cursor=23"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -43,9 +40,9 @@ sequence.append(utils.AssertPresentationAction(
     "3. Down Arrow",
     ["KNOWN ISSUE: Too much braille updating",
      "BRAILLE LINE:  'US State test 1 (200% Courier font): California $l'",
-     "     VISIBLE:  'e test 1 (200% Courier font): Ca', cursor=30",
+     "     VISIBLE:  '(200% Courier font): California ', cursor=21",
      "BRAILLE LINE:  'US State test 1 (200% Courier font): California $l'",
-     "     VISIBLE:  'e test 1 (200% Courier font): Ca', cursor=30",
+     "     VISIBLE:  '(200% Courier font): California ', cursor=21",
      "BRAILLE LINE:  'California (CA)'",
      "     VISIBLE:  'California (CA)', cursor=1",
      "BRAILLE LINE:  'US State test 1 (200% Courier font): California $l'",
@@ -131,7 +128,7 @@ sequence.append(utils.AssertPresentationAction(
     "11. Escape",
     ["BRAILLE LINE:  'US State test 1 (200% Courier font): California $l'",
      "     VISIBLE:  '(200% Courier font): California ', cursor=32",
-     "SPEECH OUTPUT: 'combo box'",
+     "SPEECH OUTPUT: 'collapsed'",
      "SPEECH OUTPUT: 'US State test 1 (200% Courier font): entry California selected'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/aria_editor_navigation_dojo.py 
b/test/keystrokes/firefox/aria_editor_navigation_dojo.py
index 156b93b..e1e82e3 100644
--- a/test/keystrokes/firefox/aria_editor_navigation_dojo.py
+++ b/test/keystrokes/firefox/aria_editor_navigation_dojo.py
@@ -32,8 +32,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  '', cursor=1",
      "BRAILLE LINE:  'editor0 tool bar'",
      "     VISIBLE:  'editor0 tool bar', cursor=1",
-     "BRAILLE LINE:  'editor0 tool bar'",
-     "     VISIBLE:  'editor0 tool bar', cursor=1",
      "SPEECH OUTPUT: 'editor0'",
      "SPEECH OUTPUT: 'tool bar'"]))
 
diff --git a/test/keystrokes/firefox/aria_grid_uiuc.py b/test/keystrokes/firefox/aria_grid_uiuc.py
index 8b9d93d..44123e5 100644
--- a/test/keystrokes/firefox/aria_grid_uiuc.py
+++ b/test/keystrokes/firefox/aria_grid_uiuc.py
@@ -17,18 +17,14 @@ sequence.append(utils.AssertPresentationAction(
     "1. Tab to grid",
     ["BRAILLE LINE:  'SelSort Sel column Msg'",
      "     VISIBLE:  'SelSort Sel column Msg', cursor=0",
-     "BRAILLE LINE:  'SelSort Sel column Msg'",
-     "     VISIBLE:  'SelSort Sel column Msg', cursor=0",
-     "BRAILLE LINE:  'SelSort Sel column Msg'",
-     "     VISIBLE:  'SelSort Sel column Msg', cursor=0",
      "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:  'Sel'",
-     "     VISIBLE:  'Sel', cursor=0",
+    ["BRAILLE LINE:  'SelSort Sel column Msg'",
+     "     VISIBLE:  'SelSort Sel column Msg', cursor=0",
      "SPEECH OUTPUT: 'Selected Sort Sel column'",
      "SPEECH OUTPUT: 'push button'"]))
 
@@ -36,45 +32,55 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Move down into first data row",
-    ["BRAILLE LINE:  'Sel'",
-     "     VISIBLE:  'Sel', cursor=4",
+    ["KNOWN ISSUE: It appears we are not treating this as an ARIA widget",
+     "BRAILLE LINE:  'SelSort Sel column Msg'",
+     "     VISIBLE:  'SelSort Sel column Msg', cursor=4",
      "SPEECH OUTPUT: 'Sel'",
      "SPEECH OUTPUT: 'image'",
+     "SPEECH OUTPUT: 'clickable'",
+     "SPEECH OUTPUT: 'Sort Sel column'",
+     "SPEECH OUTPUT: 'Msg'",
+     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: 'clickable'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "4. Move right in first data row",
-    ["KNOWN ISSUE: This doesn't seem right.",
-     "BRAILLE LINE:  'Sel'",
-     "     VISIBLE:  'Sel', cursor=4",
-     "SPEECH OUTPUT: 'image clickable'"]))
+    ["KNOWN ISSUE: It appears we are not treating this as an ARIA widget",
+     "BRAILLE LINE:  'SelSort Sel column Msg'",
+     "     VISIBLE:  'SelSort Sel column Msg', cursor=5",
+     "SPEECH OUTPUT: 'o'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "5. Move right in first data row",
     ["KNOWN ISSUE: It appears we are not treating this as an ARIA widget",
-     "BRAILLE LINE:  'Sort Sel column'",
-     "     VISIBLE:  'Sort Sel column', cursor=1",
-     "SPEECH OUTPUT: 'S'"]))
+     "BRAILLE LINE:  'SelSort Sel column Msg'",
+     "     VISIBLE:  'SelSort Sel column Msg', cursor=6",
+     "SPEECH OUTPUT: 'r'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "6. Move right in first data row",
     ["KNOWN ISSUE: It appears we are not treating this as an ARIA widget",
-     "BRAILLE LINE:  'Sort Sel column'",
-     "     VISIBLE:  'Sort Sel column', cursor=2",
-     "SPEECH OUTPUT: 'o'"]))
+     "BRAILLE LINE:  'SelSort Sel column Msg'",
+     "     VISIBLE:  'SelSort Sel column Msg', cursor=7",
+     "SPEECH OUTPUT: 't'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "7. Move down to third row",
-    ["BRAILLE LINE:  'Msg'",
-     "     VISIBLE:  'Msg', cursor=1",
+    ["KNOWN ISSUE: It appears we are not treating this as an ARIA widget",
+     "BRAILLE LINE:  'SelSort Sel column Msg'",
+     "     VISIBLE:  'SelSort Sel column Msg', cursor=20",
+     "SPEECH OUTPUT: 'Sel'",
+     "SPEECH OUTPUT: 'image'",
+     "SPEECH OUTPUT: 'clickable'",
+     "SPEECH OUTPUT: 'Sort Sel column'",
      "SPEECH OUTPUT: 'Msg'",
      "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: 'clickable'"]))
diff --git a/test/keystrokes/firefox/aria_slider.py b/test/keystrokes/firefox/aria_slider.py
index eb1a35a..fcd6047 100644
--- a/test/keystrokes/firefox/aria_slider.py
+++ b/test/keystrokes/firefox/aria_slider.py
@@ -11,7 +11,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. tab to slider",
-    ["BRAILLE LINE:  '0Move slider left push button $lMy slider 10% slider'",
+    ["KNOWN ISSUE: The braille lacks spaces",
+     "BRAILLE LINE:  '0Move slider leftMy slider 10% slider'",
      "     VISIBLE:  'My slider 10% slider', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
@@ -22,7 +23,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. basic whereAmI",
-    ["BRAILLE LINE:  '0Move slider left push button $lMy slider 10% slider'",
+    ["KNOWN ISSUE: The braille lacks spaces",
+     "BRAILLE LINE:  '0Move slider leftMy slider 10% slider'",
      "     VISIBLE:  'My slider 10% slider', cursor=1",
      "BRAILLE LINE:  'My slider 10% slider'",
      "     VISIBLE:  'My slider 10% slider', cursor=1",
diff --git a/test/keystrokes/firefox/aria_slider_dojo.py b/test/keystrokes/firefox/aria_slider_dojo.py
index 3cbd7b9..00245f8 100644
--- a/test/keystrokes/firefox/aria_slider_dojo.py
+++ b/test/keystrokes/firefox/aria_slider_dojo.py
@@ -16,8 +16,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'slider 1 10 slider', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "BRAILLE LINE:  'slider 1'",
-     "     VISIBLE:  'slider 1', cursor=1",
      "SPEECH OUTPUT: 'slider 1 slider 10'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
@@ -26,6 +24,8 @@ sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "2. Increment first slider",
     ["KNOWN ISSUE: This is the value exposed to us so we're passing it along as-is.",
+     "BRAILLE LINE:  'slider 1 10 slider'",
+     "     VISIBLE:  'slider 1 10 slider', cursor=1",
      "BRAILLE LINE:  'slider 1 10.238095238095237 slider'",
      "     VISIBLE:  'slider 1 10.238095238095237 slid', cursor=1",
      "SPEECH OUTPUT: '10.238095238095237'"]))
@@ -62,8 +62,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Slider1 Value: 10.0% $l rdonly', cursor=21",
      "BRAILLE LINE:  'Slider1 Value: 10.0% $l rdonly'",
      "     VISIBLE:  'Slider1 Value: 10.0% $l rdonly', cursor=21",
-     "BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'Slider1 Value: read only entry 10.0% selected'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -74,8 +72,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Disable previous slider push but', cursor=1",
      "BRAILLE LINE:  'Browse mode'",
      "     VISIBLE:  'Browse mode', cursor=0",
-     "BRAILLE LINE:  'Disable previous slider'",
-     "     VISIBLE:  'Disable previous slider', cursor=0",
      "SPEECH OUTPUT: 'Disable previous slider push button'",
      "SPEECH OUTPUT: 'Browse mode' voice=system"]))
 
@@ -83,12 +79,12 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "8. Tab to second slider",
-    ["BRAILLE LINE:  'slider 2 10 slider'",
+    ["BRAILLE LINE:  'Disable previous slider push button'",
+     "     VISIBLE:  'Disable previous slider push but', cursor=1",
+     "BRAILLE LINE:  'slider 2 10 slider'",
      "     VISIBLE:  'slider 2 10 slider', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "BRAILLE LINE:  'slider 2'",
-     "     VISIBLE:  'slider 2', cursor=1",
      "SPEECH OUTPUT: 'slider 2 slider 10'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
@@ -96,7 +92,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "9. Increment second slider",
-    ["BRAILLE LINE:  'slider 2 20 slider'",
+    ["BRAILLE LINE:  'slider 2 10 slider'",
+     "     VISIBLE:  'slider 2 10 slider', cursor=1",
+     "BRAILLE LINE:  'slider 2 20 slider'",
      "     VISIBLE:  'slider 2 20 slider', cursor=1",
      "SPEECH OUTPUT: '20'"]))
 
diff --git a/test/keystrokes/firefox/aria_slider_uiuc.py b/test/keystrokes/firefox/aria_slider_uiuc.py
index 209b03b..75706b7 100644
--- a/test/keystrokes/firefox/aria_slider_uiuc.py
+++ b/test/keystrokes/firefox/aria_slider_uiuc.py
@@ -14,13 +14,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to slider 1",
-    ["KNOWN ISSUE: Why are we clearing braille here?",
-     "BRAILLE LINE:  '30 slider'",
+    ["BRAILLE LINE:  '30 slider'",
      "     VISIBLE:  '30 slider', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'slider 30'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
@@ -30,6 +27,8 @@ sequence.append(utils.AssertPresentationAction(
     "2. Basic whereAmI on slider 1",
     ["BRAILLE LINE:  '30 slider'",
      "     VISIBLE:  '30 slider', cursor=1",
+     "BRAILLE LINE:  '30 slider'",
+     "     VISIBLE:  '30 slider', cursor=1",
      "SPEECH OUTPUT: 'slider 30 30 percent.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -60,11 +59,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "6. Tab to slider 2's left range",
-    ["KNOWN ISSUE: Why are we clearing braille here?",
-     "BRAILLE LINE:  '1950 slider'",
+    ["BRAILLE LINE:  '1950 slider'",
      "     VISIBLE:  '1950 slider', cursor=1",
-     "BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'slider 1950'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -95,11 +91,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "10. Tab to slider 2's right range",
-    ["KNOWN ISSUE: Why are we clearing braille here?",
-     "BRAILLE LINE:  '2000 slider'",
+    ["BRAILLE LINE:  '2000 slider'",
      "     VISIBLE:  '2000 slider', cursor=1",
-     "BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'slider 2000'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/aria_spinner_dojo.py b/test/keystrokes/firefox/aria_spinner_dojo.py
index 21b033f..80517b4 100644
--- a/test/keystrokes/firefox/aria_spinner_dojo.py
+++ b/test/keystrokes/firefox/aria_spinner_dojo.py
@@ -19,8 +19,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Focus mode', cursor=0",
      "BRAILLE LINE:  'Spinbox #1: 900 $l'",
      "     VISIBLE:  'Spinbox #1: 900 $l', cursor=13",
-     "BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'Spinbox #1: 900 selected spin button'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
diff --git a/test/keystrokes/firefox/aria_tabpanel.py b/test/keystrokes/firefox/aria_tabpanel.py
index c889186..69adc59 100644
--- a/test/keystrokes/firefox/aria_tabpanel.py
+++ b/test/keystrokes/firefox/aria_tabpanel.py
@@ -45,8 +45,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  '&=y Internal Portal Bookmark rad', cursor=1",
      "BRAILLE LINE:  'Browse mode'",
      "     VISIBLE:  'Browse mode', cursor=0",
-     "BRAILLE LINE:  '&=y Internal Portal Bookmark radio button Internal Portal Bookmark & y External URL 
radio button External URL'",
-     "     VISIBLE:  '&=y Internal Portal Bookmark rad', cursor=1",
      "SPEECH OUTPUT: 'Internal Portal Bookmark selected radio button'",
      "SPEECH OUTPUT: 'Browse mode' voice=system"]))
 
@@ -54,7 +52,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Tab"))
 sequence.append(utils.AssertPresentationAction(
     "5. Shift+Tab out of contents",
-    ["BRAILLE LINE:  'Tab Zero Tab One Tab Two Tab Three Tab Four'",
+    ["BRAILLE LINE:  '&=y Internal Portal Bookmark radio button'",
+     "     VISIBLE:  '&=y Internal Portal Bookmark rad', cursor=1",
+     "BRAILLE LINE:  'Tab Zero Tab One Tab Two Tab Three Tab Four'",
      "     VISIBLE:  'Tab Two Tab Three Tab Four', cursor=1",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
diff --git a/test/keystrokes/firefox/aria_tabpanel_uiuc.py b/test/keystrokes/firefox/aria_tabpanel_uiuc.py
index 168cc6e..993ec27 100644
--- a/test/keystrokes/firefox/aria_tabpanel_uiuc.py
+++ b/test/keystrokes/firefox/aria_tabpanel_uiuc.py
@@ -17,8 +17,6 @@ sequence.append(utils.AssertPresentationAction(
     "1. Give focus to a widget in the first Tab",
     ["BRAILLE LINE:  '&=y Thick and cheesy radio button Thick and cheesy'",
      "     VISIBLE:  '&=y Thick and cheesy radio butto', cursor=1",
-     "BRAILLE LINE:  '&=y Thick and cheesy radio button Thick and cheesy'",
-     "     VISIBLE:  '&=y Thick and cheesy radio butto', cursor=1",
      "SPEECH OUTPUT: 'Thick and cheesy selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -79,12 +77,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "7. Press Tab to move into the third page",
-    ["BRAILLE LINE:  '< > Pepperoni Pepperoni check box'",
-     "     VISIBLE:  '< > Pepperoni Pepperoni check bo', cursor=1",
+    ["BRAILLE LINE:  '< > Pepperoni check box'",
+     "     VISIBLE:  '< > Pepperoni check box', cursor=1",
      "BRAILLE LINE:  'Browse mode'",
      "     VISIBLE:  'Browse mode', cursor=0",
-     "BRAILLE LINE:  '< > Pepperoni Pepperoni check box Pepperoni'",
-     "     VISIBLE:  '< > Pepperoni Pepperoni check bo', cursor=1",
      "SPEECH OUTPUT: 'Pepperoni check box not checked'",
      "SPEECH OUTPUT: 'Browse mode' voice=system"]))
 
@@ -92,8 +88,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction(" "))
 sequence.append(utils.AssertPresentationAction(
     "8. Toggle the focused checkbox",
-    ["BRAILLE LINE:  '<x> Pepperoni Pepperoni check box Pepperoni'",
-     "     VISIBLE:  '<x> Pepperoni Pepperoni check bo', cursor=1",
+    ["KNOWN ISSUE: Double braille?",
+     "BRAILLE LINE:  '< > Pepperoni check box'",
+     "     VISIBLE:  '< > Pepperoni check box', cursor=1",
+     "BRAILLE LINE:  '<x> Pepperoni check box Pepperoni'",
+     "     VISIBLE:  '<x> Pepperoni check box Pepperon', cursor=1",
      "SPEECH OUTPUT: 'checked'"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/aria_toolbar_dojo.py b/test/keystrokes/firefox/aria_toolbar_dojo.py
index 91e9ee7..9047a35 100644
--- a/test/keystrokes/firefox/aria_toolbar_dojo.py
+++ b/test/keystrokes/firefox/aria_toolbar_dojo.py
@@ -24,8 +24,6 @@ sequence.append(utils.AssertPresentationAction(
     "2. Down Arrow",
     ["BRAILLE LINE:  'input before toolbar1 $l'",
      "     VISIBLE:  'input before toolbar1 $l', cursor=1",
-     "BRAILLE LINE:  'input before toolbar1 $l'",
-     "     VISIBLE:  'input before toolbar1 $l', cursor=1",
      "SPEECH OUTPUT: 'entry'",
      "SPEECH OUTPUT: 'input before toolbar1'"]))
 
diff --git a/test/keystrokes/firefox/aria_tree_uiuc.py b/test/keystrokes/firefox/aria_tree_uiuc.py
index 131a26c..5c85456 100644
--- a/test/keystrokes/firefox/aria_tree_uiuc.py
+++ b/test/keystrokes/firefox/aria_tree_uiuc.py
@@ -19,8 +19,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Fruits Oranges Pineapples', cursor=0",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "BRAILLE LINE:  'Fruits expanded list item'",
-     "     VISIBLE:  'Fruits expanded list item', cursor=1",
      "SPEECH OUTPUT: 'Fruits expanded tree level 1'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
@@ -28,7 +26,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. Basic whereAmI",
-    ["BRAILLE LINE:  'Fruits expanded list item'",
+    ["BRAILLE LINE:  'Fruits Oranges Pineapples'",
+     "     VISIBLE:  'Fruits Oranges Pineapples', cursor=0",
+     "BRAILLE LINE:  'Fruits expanded list item'",
      "     VISIBLE:  'Fruits expanded list item', cursor=1",
      "SPEECH OUTPUT: 'list item'",
      "SPEECH OUTPUT: 'Fruits'",
@@ -60,8 +60,6 @@ sequence.append(utils.AssertPresentationAction(
     "5. Down arrow to apples",
     ["BRAILLE LINE:  'Apples collapsed list item'",
      "     VISIBLE:  'Apples collapsed list item', cursor=1",
-     "BRAILLE LINE:  'Apples collapsed list item'",
-     "     VISIBLE:  'Apples collapsed list item', cursor=1",
      "SPEECH OUTPUT: 'Apples collapsed'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -90,8 +88,6 @@ sequence.append(utils.AssertPresentationAction(
     "8. Down arrow to granny smith",
     ["BRAILLE LINE:  'Granny Smith collapsed list item'",
      "     VISIBLE:  'Granny Smith collapsed list item', cursor=1",
-     "BRAILLE LINE:  'Granny Smith collapsed list item'",
-     "     VISIBLE:  'Granny Smith collapsed list item', cursor=1",
      "SPEECH OUTPUT: 'Granny Smith collapsed'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -170,8 +166,6 @@ sequence.append(utils.AssertPresentationAction(
     "16. Down arrow to vegetables",
     ["BRAILLE LINE:  'Vegetables expanded list item'",
      "     VISIBLE:  'Vegetables expanded list item', cursor=1",
-     "BRAILLE LINE:  'Vegetables expanded list item'",
-     "     VISIBLE:  'Vegetables expanded list item', cursor=1",
      "SPEECH OUTPUT: 'Vegetables expanded tree level 1'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/flat_review_combo_box.py 
b/test/keystrokes/firefox/flat_review_combo_box.py
index 9fcf2c7..44d47cc 100644
--- a/test/keystrokes/firefox/flat_review_combo_box.py
+++ b/test/keystrokes/firefox/flat_review_combo_box.py
@@ -14,7 +14,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_8"))
 sequence.append(utils.AssertPresentationAction(
     "1. Flat review current line",
-    ["BRAILLE LINE:  'Severity Severity :  normal $l'",
+    ["BRAILLE LINE:  'Severity: Severity normal combo box'",
+     "     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 056fdc4..a8bb7c3 100644
--- a/test/keystrokes/firefox/focus_tracking_imagemap.py
+++ b/test/keystrokes/firefox/focus_tracking_imagemap.py
@@ -14,8 +14,6 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE: This seems a bit redundant/chatty",
      "BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'z y x w v u t s r q p o n m l k ', cursor=1",
-     "BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
-     "     VISIBLE:  'z y x w v u t s r q p o n m l k ', cursor=1",
      "SPEECH OUTPUT: 'z'",
      "SPEECH OUTPUT: 'link' voice=hyperlink",
      "SPEECH OUTPUT: 'z image map link'"]))
@@ -26,8 +24,6 @@ sequence.append(utils.AssertPresentationAction(
     "2. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'y x w v u t s r q p o n m l k j ', cursor=1",
-     "BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
-     "     VISIBLE:  'y x w v u t s r q p o n m l k j ', cursor=1",
      "SPEECH OUTPUT: 'y'",
      "SPEECH OUTPUT: 'link' voice=hyperlink",
      "SPEECH OUTPUT: 'y image map link'"]))
@@ -62,8 +58,6 @@ sequence.append(utils.AssertPresentationAction(
     "3. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'a', cursor=1",
-     "BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
-     "     VISIBLE:  'a', cursor=1",
      "SPEECH OUTPUT: 'a'",
      "SPEECH OUTPUT: 'link' voice=hyperlink",
      "SPEECH OUTPUT: 'a image map link'"]))
@@ -74,8 +68,6 @@ sequence.append(utils.AssertPresentationAction(
     "4. Tab",
     ["BRAILLE LINE:  'table cell wk09_frozenmovie image'",
      "     VISIBLE:  'table cell wk09_frozenmovie imag', cursor=0",
-     "BRAILLE LINE:  'table cell wk09_frozenmovie image'",
-     "     VISIBLE:  'table cell wk09_frozenmovie imag', cursor=0",
      "SPEECH OUTPUT: 'wk09_frozenmovie link image' voice=hyperlink"]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/html_role_combo_box.py b/test/keystrokes/firefox/html_role_combo_box.py
index 4ef92e9..5c8756e 100644
--- a/test/keystrokes/firefox/html_role_combo_box.py
+++ b/test/keystrokes/firefox/html_role_combo_box.py
@@ -13,12 +13,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to Severity combo box",
-    ["BRAILLE LINE:  'Severity: Severity Severity combo box'",
-     "     VISIBLE:  'Severity Severity combo box', cursor=10",
+    ["BRAILLE LINE:  'Severity: Severity normal combo box'",
+     "     VISIBLE:  'Severity normal combo box', cursor=10",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "BRAILLE LINE:  ':  $l'",
-     "     VISIBLE:  ':  $l', cursor=3",
      "SPEECH OUTPUT: 'Severity normal combo box'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
@@ -26,9 +24,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "2. Basic Where Am I",
-    ["KNOWN ISSUE: We want to present the displayed item",
-     "BRAILLE LINE:  'Severity Severity combo box'",
-     "     VISIBLE:  'Severity Severity combo box', cursor=10",
+    ["BRAILLE LINE:  'Severity: Severity normal combo box'",
+     "     VISIBLE:  'Severity normal combo box', cursor=10",
+     "BRAILLE LINE:  'Severity normal combo box'",
+     "     VISIBLE:  'Severity normal combo box', cursor=10",
      "SPEECH OUTPUT: 'Severity'",
      "SPEECH OUTPUT: 'combo box'",
      "SPEECH OUTPUT: 'normal'",
@@ -42,8 +41,8 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Priority', cursor=1",
      "BRAILLE LINE:  'Browse mode'",
      "     VISIBLE:  'Browse mode', cursor=0",
-     "BRAILLE LINE:  'Priority:  combo box'",
-     "     VISIBLE:  'Priority:  combo box', cursor=1",
+     "BRAILLE LINE:  'Priority: Normal combo box'",
+     "     VISIBLE:  'Priority: Normal combo box', cursor=1",
      "SPEECH OUTPUT: 'Priority'",
      "SPEECH OUTPUT: 'link' voice=hyperlink",
      "SPEECH OUTPUT: 'Browse mode' voice=system"]))
@@ -52,12 +51,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "4. Tab to Priority combo box",
-    ["BRAILLE LINE:  'Priority:  combo box'",
-     "     VISIBLE:  'Priority:  combo box', cursor=11",
+    ["BRAILLE LINE:  'Priority: Normal combo box'",
+     "     VISIBLE:  'Priority: Normal combo box', cursor=11",
      "BRAILLE LINE:  'Focus mode'",
      "     VISIBLE:  'Focus mode', cursor=0",
-     "BRAILLE LINE:  ':  $l'",
-     "     VISIBLE:  ':  $l', cursor=3",
      "SPEECH OUTPUT: 'Priority: Normal combo box'",
      "SPEECH OUTPUT: 'Focus mode' voice=system"]))
 
@@ -65,27 +62,26 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "5. Tab to Resolution combo box",
-    ["KNOWN ISSUE: We shouldn't be displaying the EOC",
-     "BRAILLE LINE:  ' combo box'",
-     "     VISIBLE:  ' combo box', cursor=1",
-     "BRAILLE LINE:  '\ufffc $l'",
-     "     VISIBLE:  '\ufffc $l', cursor=1",
+    ["BRAILLE LINE:  'Priority: Normal combo box'",
+     "     VISIBLE:  'Priority: Normal combo box', cursor=11",
+     "BRAILLE LINE:  'FIXED combo box'",
+     "     VISIBLE:  'FIXED combo box', cursor=1",
      "SPEECH OUTPUT: 'Resolution: FIXED combo box'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. Change selection Down: WONTFIX",
-    ["BRAILLE LINE:  ' combo box'",
-     "     VISIBLE:  ' combo box', cursor=1",
+    ["BRAILLE LINE:  'WONTFIX combo box'",
+     "     VISIBLE:  'WONTFIX combo box', cursor=1",
      "SPEECH OUTPUT: 'WONTFIX'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "7. Change selection Up: FIXED",
-    ["BRAILLE LINE:  ' combo box'",
-     "     VISIBLE:  ' combo box', cursor=1",
+    ["BRAILLE LINE:  'FIXED combo box'",
+     "     VISIBLE:  'FIXED combo box', cursor=1",
      "SPEECH OUTPUT: 'FIXED'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -99,30 +95,27 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "9. Change selection Down: WONTFIX",
-    ["BRAILLE LINE:  ' combo box'",
-     "     VISIBLE:  ' combo box', cursor=1",
+    ["BRAILLE LINE:  'WONTFIX combo box'",
+     "     VISIBLE:  'WONTFIX combo box', cursor=1",
      "SPEECH OUTPUT: 'WONTFIX'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "10. Return to collapse combo box",
-    ["BRAILLE LINE:  ' combo box'",
-     "     VISIBLE:  ' combo box', cursor=1",
-     "BRAILLE LINE:  ' combo box'",
-     "     VISIBLE:  ' combo box', cursor=1",
+    ["BRAILLE LINE:  'WONTFIX combo box'",
+     "     VISIBLE:  'WONTFIX combo box', cursor=1",
+     "BRAILLE LINE:  'WONTFIX combo box'",
+     "     VISIBLE:  'WONTFIX combo box', cursor=1",
      "SPEECH OUTPUT: 'Resolution: WONTFIX combo box'",
-     "SPEECH OUTPUT: 'WONTFIX'",
-     "SPEECH OUTPUT: 'combo box'"]))
+     "SPEECH OUTPUT: 'collapsed'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "11. Tab to Version combo box",
-    ["BRAILLE LINE:  ' combo box'",
-     "     VISIBLE:  ' combo box', cursor=1",
-     "BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
+    ["BRAILLE LINE:  '2.16 combo box'",
+     "     VISIBLE:  '2.16 combo box', cursor=1",
      "SPEECH OUTPUT: 'Version 2.16 combo box'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -135,15 +128,14 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Browse mode', cursor=0",
      "SPEECH OUTPUT: 'Browse mode' voice=system"]))
 
-
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "13. Left out of combo box",
-    ["BRAILLE LINE:  'table cell'",
-     "     VISIBLE:  'table cell', cursor=1",
-     "BRAILLE LINE:  'Version combo box'",
-     "     VISIBLE:  'Version combo box', cursor=8",
+    ["BRAILLE LINE:  '2.16 combo box'",
+     "     VISIBLE:  '2.16 combo box', cursor=1",
+     "BRAILLE LINE:  'Version 2.16 combo box'",
+     "     VISIBLE:  'Version 2.16 combo box', cursor=9",
      "SPEECH OUTPUT: 'Version 2.16'",
      "SPEECH OUTPUT: 'combo box'"]))
 
diff --git a/test/keystrokes/firefox/label_inference_bug_546815.py 
b/test/keystrokes/firefox/label_inference_bug_546815.py
index 7769f1c..1afa26c 100644
--- a/test/keystrokes/firefox/label_inference_bug_546815.py
+++ b/test/keystrokes/firefox/label_inference_bug_546815.py
@@ -17,8 +17,6 @@ sequence.append(utils.AssertPresentationAction(
     "1. Next form field",
     ["BRAILLE LINE:  'Enter your Name: text field using default type=text $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  'Enter your Name: text field using default type=text $l'",
-     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Enter your Name: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -29,8 +27,6 @@ sequence.append(utils.AssertPresentationAction(
     "2. Next form field",
     ["BRAILLE LINE:  '1. Enter your Address: text field using SIZE and  $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  '1. Enter your Address: text field using SIZE and  $l'",
-     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: '1. Enter your Address: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -41,8 +37,6 @@ sequence.append(utils.AssertPresentationAction(
     "3. Next form field",
     ["BRAILLE LINE:  '2. Enter your City: 3. Enter your State:  $l 4. Enter your Country: US $l image text 
field using  $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  '2. Enter your City: 3. Enter your State:  $l 4. Enter your Country: US $l image text 
field using  $l'",
-     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: '2. Enter your City: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -53,8 +47,6 @@ sequence.append(utils.AssertPresentationAction(
     "4. Next form field",
     ["BRAILLE LINE:  '2. Enter your City: 3. Enter your State:  $l 4. Enter your Country: US $l image text 
field using  $l'",
      "     VISIBLE:  ' $l 4. Enter your Country: US $l', cursor=1",
-     "BRAILLE LINE:  '2. Enter your City: 3. Enter your State:  $l 4. Enter your Country: US $l image text 
field using  $l'",
-     "     VISIBLE:  ' $l 4. Enter your Country: US $l', cursor=1",
      "SPEECH OUTPUT: '3. Enter your State: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -65,8 +57,6 @@ sequence.append(utils.AssertPresentationAction(
     "5. Next form field",
     ["BRAILLE LINE:  '2. Enter your City: 3. Enter your State:  $l 4. Enter your Country: US $l image text 
field using  $l'",
      "     VISIBLE:  'US $l image text field using  $l', cursor=1",
-     "BRAILLE LINE:  '2. Enter your City: 3. Enter your State:  $l 4. Enter your Country: US $l image text 
field using  $l'",
-     "     VISIBLE:  'US $l image text field using  $l', cursor=1",
      "SPEECH OUTPUT: '4. Enter your Country: entry US'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -77,8 +67,6 @@ sequence.append(utils.AssertPresentationAction(
     "6. Next form field",
     ["BRAILLE LINE:  '5. Enter your Zip:  $l'",
      "     VISIBLE:  '5. Enter your Zip:  $l', cursor=20",
-     "BRAILLE LINE:  '5. Enter your Zip:  $l'",
-     "     VISIBLE:  '5. Enter your Zip:  $l', cursor=20",
      "SPEECH OUTPUT: '5. Enter your Zip: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -89,8 +77,6 @@ sequence.append(utils.AssertPresentationAction(
     "7. Next form field",
     ["BRAILLE LINE:  'character:  $l'",
      "     VISIBLE:  'character:  $l', cursor=12",
-     "BRAILLE LINE:  'character:  $l'",
-     "     VISIBLE:  'character:  $l', cursor=12",
      "SPEECH OUTPUT: 'character: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -102,8 +88,6 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE: This is broken",
      "BRAILLE LINE:  '< > check box bird'",
      "     VISIBLE:  '< > check box bird', cursor=1",
-     "BRAILLE LINE:  '< > check box bird'",
-     "     VISIBLE:  '< > check box bird', cursor=1",
      "SPEECH OUTPUT: 'What are your favorite pets? check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -114,8 +98,6 @@ sequence.append(utils.AssertPresentationAction(
     "9. Next form field",
     ["BRAILLE LINE:  '< > check box fish'",
      "     VISIBLE:  '< > check box fish', cursor=1",
-     "BRAILLE LINE:  '< > check box fish'",
-     "     VISIBLE:  '< > check box fish', cursor=1",
      "SPEECH OUTPUT: 'fish check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -127,8 +109,6 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE: We are treating the separator as if it is on the same line",
      "BRAILLE LINE:  '< > check box wild animal separator'",
      "     VISIBLE:  '< > check box wild animal separa', cursor=1",
-     "BRAILLE LINE:  '< > check box wild animal separator'",
-     "     VISIBLE:  '< > check box wild animal separa', cursor=1",
      "SPEECH OUTPUT: 'wild animal check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -140,8 +120,6 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE: This is broken",
      "BRAILLE LINE:  '&=y radio button cabernet sauvignon'",
      "     VISIBLE:  '&=y radio button cabernet sauvig', cursor=1",
-     "BRAILLE LINE:  '&=y radio button cabernet sauvignon'",
-     "     VISIBLE:  '&=y radio button cabernet sauvig', cursor=1",
      "SPEECH OUTPUT: 'Would type of wine do you like? selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -152,8 +130,6 @@ sequence.append(utils.AssertPresentationAction(
     "12. Next form field",
     ["BRAILLE LINE:  '& y radio button merlot'",
      "     VISIBLE:  '& y radio button merlot', cursor=1",
-     "BRAILLE LINE:  '& y radio button merlot'",
-     "     VISIBLE:  '& y radio button merlot', cursor=1",
      "SPEECH OUTPUT: 'merlot not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -164,8 +140,6 @@ sequence.append(utils.AssertPresentationAction(
     "13. Next form field",
     ["BRAILLE LINE:  '& y radio button nebbiolo'",
      "     VISIBLE:  '& y radio button nebbiolo', cursor=1",
-     "BRAILLE LINE:  '& y radio button nebbiolo'",
-     "     VISIBLE:  '& y radio button nebbiolo', cursor=1",
      "SPEECH OUTPUT: 'nebbiolo not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -176,8 +150,6 @@ sequence.append(utils.AssertPresentationAction(
     "14. Next form field",
     ["BRAILLE LINE:  '& y radio button pinot noir'",
      "     VISIBLE:  '& y radio button pinot noir', cursor=1",
-     "BRAILLE LINE:  '& y radio button pinot noir'",
-     "     VISIBLE:  '& y radio button pinot noir', cursor=1",
      "SPEECH OUTPUT: 'pinot noir not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -188,8 +160,6 @@ 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=1",
-     "BRAILLE LINE:  '& y radio button don't drink wine'",
-     "     VISIBLE:  '& y radio button don't drink win', cursor=1",
      "SPEECH OUTPUT: 'don't drink wine not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -202,8 +172,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Wrapping to top.', cursor=0",
      "BRAILLE LINE:  'Enter your Name: text field using default type=text $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  'Enter your Name: text field using default type=text $l'",
-     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Wrapping to top.' voice=system",
      "SPEECH OUTPUT: 'Enter your Name: entry'"]))
 
diff --git a/test/keystrokes/firefox/label_inference_entries.py 
b/test/keystrokes/firefox/label_inference_entries.py
index 957da6b..f43dbf5 100644
--- a/test/keystrokes/firefox/label_inference_entries.py
+++ b/test/keystrokes/firefox/label_inference_entries.py
@@ -15,24 +15,18 @@ sequence.append(utils.AssertPresentationAction(
     "1. Next form field",
     ["BRAILLE LINE:  'Type something rather amusing here:  $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  'Type something rather amusing here:  $l'",
-     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Type something rather amusing here: entry'"]))
 
-sequence.append(PauseAction(3000))
-
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyPressAction(0, None, "KP_Insert"))
 sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "2. Next form field",
-    ["KNOWN ISSUE: Something odd is going on regarding the placement of the entries.",
-     "BRAILLE LINE:  'Amusing numbers fall between  and  $l . $l'",
-     "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  'Amusing numbers fall between  and  $l . $l'",
+    ["KNOWN ISSUE: This isn't right. But when done outside of the test it works as expected.",
+     "BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'Amusing numbers fall between entry'"]))
+     "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyPressAction(0, None, "KP_Insert"))
@@ -40,11 +34,10 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "3. Next form field",
-    ["BRAILLE LINE:  'Amusing numbers fall between  and  $l . $l'",
-     "     VISIBLE:  ' $l . $l', cursor=1",
-     "BRAILLE LINE:  'Amusing numbers fall between  and  $l . $l'",
-     "     VISIBLE:  ' $l . $l', cursor=1",
-     "SPEECH OUTPUT: 'and entry'"]))
+    ["KNOWN ISSUE: This isn't right. But when done outside of the test it works as expected.",
+     "BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
+     "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyPressAction(0, None, "KP_Insert"))
@@ -54,8 +47,6 @@ sequence.append(utils.AssertPresentationAction(
     "4. Next form field",
     ["BRAILLE LINE:  ' $l I'm a label'",
      "     VISIBLE:  ' $l I'm a label', cursor=1",
-     "BRAILLE LINE:  ' $l I'm a label'",
-     "     VISIBLE:  ' $l I'm a label', cursor=1",
      "SPEECH OUTPUT: 'I'm a label entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -66,8 +57,6 @@ 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=1",
-     "BRAILLE LINE:  ' $l Am I a label as well?'",
-     "     VISIBLE:  ' $l Am I a label as well?', cursor=1",
      "SPEECH OUTPUT: 'Am I a label as well? entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -79,8 +68,6 @@ sequence.append(utils.AssertPresentationAction(
     ["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=1",
-     "BRAILLE LINE:  ' $l Too far away to be a label.'",
-     "     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())
@@ -91,8 +78,6 @@ sequence.append(utils.AssertPresentationAction(
     "7. Next form field",
     ["BRAILLE LINE:  'Distance doesn't count on the left $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  'Distance doesn't count on the left $l'",
-     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Distance doesn't count on the left entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -103,8 +88,6 @@ sequence.append(utils.AssertPresentationAction(
     "8. Next form field",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'First Name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -115,8 +98,6 @@ sequence.append(utils.AssertPresentationAction(
     "9. Next form field",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'M.I. entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -127,8 +108,6 @@ sequence.append(utils.AssertPresentationAction(
     "10. Next form field",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Last Name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -139,8 +118,6 @@ sequence.append(utils.AssertPresentationAction(
     "11. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
      "     VISIBLE:  ' $l $l $l', cursor=1",
-     "BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=1",
      "SPEECH OUTPUT: 'First name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -151,8 +128,6 @@ sequence.append(utils.AssertPresentationAction(
     "12. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
      "     VISIBLE:  ' $l $l $l', cursor=4",
-     "BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=4",
      "SPEECH OUTPUT: 'Middle",
      "initial entry'"]))
 
@@ -164,8 +139,6 @@ sequence.append(utils.AssertPresentationAction(
     "13. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
      "     VISIBLE:  ' $l $l $l', cursor=7",
-     "BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=7",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -176,8 +149,6 @@ sequence.append(utils.AssertPresentationAction(
     "14. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
      "     VISIBLE:  ' $l $l $l', cursor=1",
-     "BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=1",
      "SPEECH OUTPUT: 'First Name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -188,8 +159,6 @@ sequence.append(utils.AssertPresentationAction(
     "15. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
      "     VISIBLE:  ' $l $l $l', cursor=4",
-     "BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=4",
      "SPEECH OUTPUT: 'Middle",
      "initial entry'"]))
 
@@ -201,8 +170,6 @@ sequence.append(utils.AssertPresentationAction(
     "16. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
      "     VISIBLE:  ' $l $l $l', cursor=7",
-     "BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=7",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -213,8 +180,6 @@ sequence.append(utils.AssertPresentationAction(
     "17. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
      "     VISIBLE:  ' $l $l $l', cursor=1",
-     "BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=1",
      "SPEECH OUTPUT: 'Given name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -225,8 +190,6 @@ sequence.append(utils.AssertPresentationAction(
     "18. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
      "     VISIBLE:  ' $l $l $l', cursor=4",
-     "BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=4",
      "SPEECH OUTPUT: 'initial entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -237,8 +200,6 @@ sequence.append(utils.AssertPresentationAction(
     "19. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
      "     VISIBLE:  ' $l $l $l', cursor=7",
-     "BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=7",
      "SPEECH OUTPUT: 'Surname entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -249,8 +210,6 @@ sequence.append(utils.AssertPresentationAction(
     "20. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
      "     VISIBLE:  ' $l $l $l', cursor=1",
-     "BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=1",
      "SPEECH OUTPUT: 'First name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -261,8 +220,6 @@ sequence.append(utils.AssertPresentationAction(
     "21. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
      "     VISIBLE:  ' $l $l $l', cursor=4",
-     "BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=4",
      "SPEECH OUTPUT: 'Middle",
      "initial entry'"]))
 
@@ -274,8 +231,6 @@ sequence.append(utils.AssertPresentationAction(
     "22. Next form field",
     ["BRAILLE LINE:  ' $l $l $l'",
      "     VISIBLE:  ' $l $l $l', cursor=7",
-     "BRAILLE LINE:  ' $l $l $l'",
-     "     VISIBLE:  ' $l $l $l', cursor=7",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -286,8 +241,6 @@ sequence.append(utils.AssertPresentationAction(
     "23. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
      "     VISIBLE:  ' $l $l $l $l', cursor=1",
-     "BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=1",
      "SPEECH OUTPUT: 'First name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -298,8 +251,6 @@ sequence.append(utils.AssertPresentationAction(
     "24. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
      "     VISIBLE:  ' $l $l $l $l', cursor=4",
-     "BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=4",
      "SPEECH OUTPUT: 'Middle",
      "initial entry'"]))
 
@@ -311,8 +262,6 @@ sequence.append(utils.AssertPresentationAction(
     "25. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
      "     VISIBLE:  ' $l $l $l $l', cursor=7",
-     "BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=7",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -323,8 +272,6 @@ sequence.append(utils.AssertPresentationAction(
     "26. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
      "     VISIBLE:  ' $l $l $l $l', cursor=10",
-     "BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=10",
      "SPEECH OUTPUT: 'patched image entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -335,8 +282,6 @@ sequence.append(utils.AssertPresentationAction(
     "27. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
      "     VISIBLE:  ' $l $l $l $l', cursor=1",
-     "BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=1",
      "SPEECH OUTPUT: 'First name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -347,8 +292,6 @@ sequence.append(utils.AssertPresentationAction(
     "28. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
      "     VISIBLE:  ' $l $l $l $l', cursor=4",
-     "BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=4",
      "SPEECH OUTPUT: 'Middle",
      "initial entry'"]))
 
@@ -360,8 +303,6 @@ sequence.append(utils.AssertPresentationAction(
     "29. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
      "     VISIBLE:  ' $l $l $l $l', cursor=7",
-     "BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=7",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -372,8 +313,6 @@ sequence.append(utils.AssertPresentationAction(
     "30. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
      "     VISIBLE:  ' $l $l $l $l', cursor=10",
-     "BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=10",
      "SPEECH OUTPUT: 'patched image entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -384,8 +323,6 @@ sequence.append(utils.AssertPresentationAction(
     "31. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
      "     VISIBLE:  ' $l $l $l $l', cursor=1",
-     "BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=1",
      "SPEECH OUTPUT: 'First name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -396,8 +333,6 @@ sequence.append(utils.AssertPresentationAction(
     "32. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
      "     VISIBLE:  ' $l $l $l $l', cursor=4",
-     "BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=4",
      "SPEECH OUTPUT: 'Middle",
      "initial entry'"]))
 
@@ -409,8 +344,6 @@ sequence.append(utils.AssertPresentationAction(
     "33. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
      "     VISIBLE:  ' $l $l $l $l', cursor=7",
-     "BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=7",
      "SPEECH OUTPUT: 'Last name entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -421,8 +354,6 @@ sequence.append(utils.AssertPresentationAction(
     "34. Next form field",
     ["BRAILLE LINE:  ' $l $l $l $l'",
      "     VISIBLE:  ' $l $l $l $l', cursor=10",
-     "BRAILLE LINE:  ' $l $l $l $l'",
-     "     VISIBLE:  ' $l $l $l $l', cursor=10",
      "SPEECH OUTPUT: 'patched image entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -431,11 +362,10 @@ sequence.append(KeyComboAction("Tab"))
 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=16",
-     "BRAILLE LINE:  'bandaid graphic $l'",
-     "     VISIBLE:  'bandaid graphic $l', cursor=16",
-     "SPEECH OUTPUT: 'bandaid graphic entry'"]))
+    ["KNOWN ISSUE: This isn't right",
+     "BRAILLE LINE:  'bandaid graphic  $l $l'",
+     "     VISIBLE:  'bandaid graphic  $l $l', cursor=20",
+     "SPEECH OUTPUT: 'We mustn't forget images as labels -- even if that practice is lame entry'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyPressAction(0, None, "KP_Insert"))
@@ -445,8 +375,6 @@ sequence.append(utils.AssertPresentationAction(
     "36. Next form field",
     ["BRAILLE LINE:  ' $l bandaid graphic redux'",
      "     VISIBLE:  ' $l bandaid graphic redux', cursor=1",
-     "BRAILLE LINE:  ' $l bandaid graphic redux'",
-     "     VISIBLE:  ' $l bandaid graphic redux', cursor=1",
      "SPEECH OUTPUT: 'bandaid graphic redux entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -469,8 +397,6 @@ sequence.append(utils.AssertPresentationAction(
     "38. Next form field",
     ["BRAILLE LINE:  'Tell me a secret:  $l'",
      "     VISIBLE:  'Tell me a secret:  $l', cursor=19",
-     "BRAILLE LINE:  'Tell me a secret:  $l'",
-     "     VISIBLE:  'Tell me a secret:  $l', cursor=19",
      "SPEECH OUTPUT: 'Tell me a secret: password text'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -481,8 +407,6 @@ sequence.append(utils.AssertPresentationAction(
     "39. Next form field",
     ["BRAILLE LINE:  'I $l'",
      "     VISIBLE:  'I $l', cursor=1",
-     "BRAILLE LINE:  'I $l'",
-     "     VISIBLE:  'I $l', cursor=1",
      "SPEECH OUTPUT: 'Tell me a little more about yourself: entry I'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -495,8 +419,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Wrapping to top.', cursor=0",
      "BRAILLE LINE:  'Type something rather amusing here:  $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  'Type something rather amusing here:  $l'",
-     "     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 a24a04b..dd73fe3 100644
--- a/test/keystrokes/firefox/label_inference_mailman.py
+++ b/test/keystrokes/firefox/label_inference_mailman.py
@@ -18,8 +18,6 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE: The braille line seems broken",
      "BRAILLE LINE:  'search mozilla:  Go push button search mozilla:  $l'",
      "     VISIBLE:  'search mozilla:  $l', cursor=17",
-     "BRAILLE LINE:  'search mozilla:  Go push button search mozilla:  $l'",
-     "     VISIBLE:  'search mozilla:  $l', cursor=17",
      "SPEECH OUTPUT: 'search mozilla: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -31,8 +29,6 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE: We are double-presenting the label in braille",
      "BRAILLE LINE:  'search mozilla: search mozilla:  $l Go push button'",
      "     VISIBLE:  'Go push button', cursor=1",
-     "BRAILLE LINE:  'search mozilla: search mozilla:  $l Go push button'",
-     "     VISIBLE:  'Go push button', cursor=1",
      "SPEECH OUTPUT: 'Go push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -43,8 +39,6 @@ sequence.append(utils.AssertPresentationAction(
     "3. Next form field",
     ["BRAILLE LINE:  'Your email address: $l '",
      "     VISIBLE:  'Your email address: $l ', cursor=20",
-     "BRAILLE LINE:  'Your email address: $l '",
-     "     VISIBLE:  'Your email address: $l ', cursor=20",
      "SPEECH OUTPUT: 'Your email address: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -55,8 +49,6 @@ sequence.append(utils.AssertPresentationAction(
     "4. Next form field",
     ["BRAILLE LINE:  'Your name (optional): $l '",
      "     VISIBLE:  'Your name (optional): $l ', cursor=22",
-     "BRAILLE LINE:  'Your name (optional): $l '",
-     "     VISIBLE:  'Your name (optional): $l ', cursor=22",
      "SPEECH OUTPUT: 'Your name (optional): entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -67,8 +59,6 @@ sequence.append(utils.AssertPresentationAction(
     "5. Next form field",
     ["BRAILLE LINE:  'Pick a password: $l '",
      "     VISIBLE:  'Pick a password: $l ', cursor=17",
-     "BRAILLE LINE:  'Pick a password: $l '",
-     "     VISIBLE:  'Pick a password: $l ', cursor=17",
      "SPEECH OUTPUT: 'Pick a password: password text'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -79,8 +69,6 @@ sequence.append(utils.AssertPresentationAction(
     "6. Next form field",
     ["BRAILLE LINE:  'Reenter password to confirm: $l '",
      "     VISIBLE:  'Reenter password to confirm: $l ', cursor=29",
-     "BRAILLE LINE:  'Reenter password to confirm: $l '",
-     "     VISIBLE:  'Reenter password to confirm: $l ', cursor=29",
      "SPEECH OUTPUT: 'Reenter password to confirm: password text'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -91,8 +79,6 @@ 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=1",
-     "BRAILLE LINE:  '&=y radio button No & y radio button Yes'",
-     "     VISIBLE:  '&=y radio button No & y radio bu', cursor=1",
      "SPEECH OUTPUT: 'No selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -104,8 +90,6 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE: Where 'Yes' appears seems to be impacted by its state",
      "BRAILLE LINE:  '&=y radio button No  Yes & y radio button'",
      "     VISIBLE:  '& y radio button', cursor=1",
-     "BRAILLE LINE:  '&=y radio button No  Yes & y radio button'",
-     "     VISIBLE:  '& y radio button', cursor=1",
      "SPEECH OUTPUT: 'Yes not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -116,8 +100,6 @@ sequence.append(utils.AssertPresentationAction(
     "9. Next form field",
     ["BRAILLE LINE:  'Subscribe push button'",
      "     VISIBLE:  'Subscribe push button', cursor=1",
-     "BRAILLE LINE:  'Subscribe push button'",
-     "     VISIBLE:  'Subscribe push button', cursor=1",
      "SPEECH OUTPUT: 'Subscribe push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -128,8 +110,6 @@ sequence.append(utils.AssertPresentationAction(
     "10. Next form field",
     ["BRAILLE LINE:  'Admin address: Password:  $l  Visit Subscriber List push button $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  'Admin address: Password:  $l  Visit Subscriber List push button $l'",
-     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Admin address: entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -140,8 +120,6 @@ sequence.append(utils.AssertPresentationAction(
     "11. Next form field",
     ["BRAILLE LINE:  'Admin address:  $l Password:   Visit Subscriber List push button $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  'Admin address:  $l Password:   Visit Subscriber List push button $l'",
-     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Password: password text'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -152,8 +130,6 @@ sequence.append(utils.AssertPresentationAction(
     "12. Next form field",
     ["BRAILLE LINE:  'Admin address:  $l Password:  $l  Visit Subscriber List push button'",
      "     VISIBLE:  'Visit Subscriber List push butto', cursor=1",
-     "BRAILLE LINE:  'Admin address:  $l Password:  $l  Visit Subscriber List push button'",
-     "     VISIBLE:  'Visit Subscriber List push butto', cursor=1",
      "SPEECH OUTPUT: 'Visit Subscriber List push button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -164,8 +140,6 @@ sequence.append(utils.AssertPresentationAction(
     "13. Next form field",
     ["BRAILLE LINE:  ' $l Unsubscribe or edit options push button'",
      "     VISIBLE:  ' $l Unsubscribe or edit options ', cursor=1",
-     "BRAILLE LINE:  ' $l Unsubscribe or edit options push button'",
-     "     VISIBLE:  ' $l Unsubscribe or edit options ', cursor=1",
      "SPEECH OUTPUT: 'Unsubscribe or edit options entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -176,8 +150,6 @@ sequence.append(utils.AssertPresentationAction(
     "14. Next form field",
     ["BRAILLE LINE:  ' $l Unsubscribe or edit options push button'",
      "     VISIBLE:  'Unsubscribe or edit options push', cursor=1",
-     "BRAILLE LINE:  ' $l Unsubscribe or edit options push button'",
-     "     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 2e644bd..4e51520 100644
--- a/test/keystrokes/firefox/line_nav_bug_546815.py
+++ b/test/keystrokes/firefox/line_nav_bug_546815.py
@@ -152,8 +152,6 @@ sequence.append(utils.AssertPresentationAction(
     "16. Line Down",
     ["BRAILLE LINE:  '< > check box bird'",
      "     VISIBLE:  '< > check box bird', cursor=1",
-     "BRAILLE LINE:  '< > check box bird'",
-     "     VISIBLE:  '< > check box bird', cursor=1",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: 'bird ",
@@ -165,8 +163,6 @@ sequence.append(utils.AssertPresentationAction(
     "17. Line Down",
     ["BRAILLE LINE:  '< > check box fish'",
      "     VISIBLE:  '< > check box fish', cursor=1",
-     "BRAILLE LINE:  '< > check box fish'",
-     "     VISIBLE:  '< > check box fish', cursor=1",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: 'fish ",
@@ -179,8 +175,6 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE: We're treating the separator as if it were on this line",
      "BRAILLE LINE:  '< > check box wild animal separator'",
      "     VISIBLE:  '< > check box wild animal separa', cursor=1",
-     "BRAILLE LINE:  '< > check box wild animal separator'",
-     "     VISIBLE:  '< > check box wild animal separa', cursor=1",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
      "SPEECH OUTPUT: 'wild animal ",
@@ -199,9 +193,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "20. Line Down",
-    ["KNOWN ISSUE: Braille doesn't match the speech",
-     "BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=0",
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -228,8 +221,6 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE: We are combining lines here.",
      "BRAILLE LINE:  '&=y radio button cabernet sauvignon'",
      "     VISIBLE:  '&=y radio button cabernet sauvig', cursor=1",
-     "BRAILLE LINE:  '&=y radio button cabernet sauvignon'",
-     "     VISIBLE:  '&=y radio button cabernet sauvig', cursor=1",
      "SPEECH OUTPUT: 'selected'",
      "SPEECH OUTPUT: 'radio button'",
      "SPEECH OUTPUT: 'cabernet sauvignon ",
@@ -241,8 +232,6 @@ sequence.append(utils.AssertPresentationAction(
     "24. Line Down",
     ["BRAILLE LINE:  '& y radio button merlot'",
      "     VISIBLE:  '& y radio button merlot', cursor=1",
-     "BRAILLE LINE:  '& y radio button merlot'",
-     "     VISIBLE:  '& y radio button merlot', cursor=1",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'",
      "SPEECH OUTPUT: 'merlot ",
@@ -254,8 +243,6 @@ sequence.append(utils.AssertPresentationAction(
     "25. Line Down",
     ["BRAILLE LINE:  '& y radio button nebbiolo'",
      "     VISIBLE:  '& y radio button nebbiolo', cursor=1",
-     "BRAILLE LINE:  '& y radio button nebbiolo'",
-     "     VISIBLE:  '& y radio button nebbiolo', cursor=1",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'",
      "SPEECH OUTPUT: 'nebbiolo ",
@@ -267,8 +254,6 @@ sequence.append(utils.AssertPresentationAction(
     "26. Line Down",
     ["BRAILLE LINE:  '& y radio button pinot noir'",
      "     VISIBLE:  '& y radio button pinot noir', cursor=1",
-     "BRAILLE LINE:  '& y radio button pinot noir'",
-     "     VISIBLE:  '& y radio button pinot noir', cursor=1",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'",
      "SPEECH OUTPUT: 'pinot noir ",
@@ -280,8 +265,6 @@ sequence.append(utils.AssertPresentationAction(
     "27. Line Down",
     ["BRAILLE LINE:  '& y radio button don't drink wine'",
      "     VISIBLE:  '& y radio button don't drink win', cursor=1",
-     "BRAILLE LINE:  '& y radio button don't drink wine'",
-     "     VISIBLE:  '& y radio button don't drink win', cursor=1",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'",
      "SPEECH OUTPUT: 'don't drink wine '"]))
@@ -292,8 +275,6 @@ sequence.append(utils.AssertPresentationAction(
     "28. Line Up",
     ["BRAILLE LINE:  '& y radio button pinot noir'",
      "     VISIBLE:  '& y radio button pinot noir', cursor=1",
-     "BRAILLE LINE:  '& y radio button pinot noir'",
-     "     VISIBLE:  '& y radio button pinot noir', cursor=1",
      "SPEECH OUTPUT: 'pinot noir'",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'"]))
@@ -304,8 +285,6 @@ sequence.append(utils.AssertPresentationAction(
     "29. Line Up",
     ["BRAILLE LINE:  '& y radio button nebbiolo'",
      "     VISIBLE:  '& y radio button nebbiolo', cursor=1",
-     "BRAILLE LINE:  '& y radio button nebbiolo'",
-     "     VISIBLE:  '& y radio button nebbiolo', cursor=1",
      "SPEECH OUTPUT: 'nebbiolo'",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'"]))
@@ -316,8 +295,6 @@ sequence.append(utils.AssertPresentationAction(
     "30. Line Up",
     ["BRAILLE LINE:  '& y radio button merlot'",
      "     VISIBLE:  '& y radio button merlot', cursor=1",
-     "BRAILLE LINE:  '& y radio button merlot'",
-     "     VISIBLE:  '& y radio button merlot', cursor=1",
      "SPEECH OUTPUT: 'merlot'",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'"]))
@@ -328,8 +305,6 @@ sequence.append(utils.AssertPresentationAction(
     "31. Line Up",
     ["BRAILLE LINE:  '&=y radio button cabernet sauvignon'",
      "     VISIBLE:  '&=y radio button cabernet sauvig', cursor=1",
-     "BRAILLE LINE:  '&=y radio button cabernet sauvignon'",
-     "     VISIBLE:  '&=y radio button cabernet sauvig', cursor=1",
      "SPEECH OUTPUT: 'Would type of wine do you like?'",
      "SPEECH OUTPUT: 'selected'",
      "SPEECH OUTPUT: 'radio button'",
@@ -357,9 +332,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "34. Line Up",
-    ["KNOWN ISSUE: Braille doesn't match the speech",
-     "BRAILLE LINE:  'separator'",
-     "     VISIBLE:  'separator', cursor=0",
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -377,8 +351,6 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE: We're treating the separator as if it were on this line",
      "BRAILLE LINE:  '< > check box wild animal separator'",
      "     VISIBLE:  '< > check box wild animal separa', cursor=1",
-     "BRAILLE LINE:  '< > check box wild animal separator'",
-     "     VISIBLE:  '< > check box wild animal separa', cursor=1",
      "SPEECH OUTPUT: 'wild animal'",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
@@ -390,8 +362,6 @@ sequence.append(utils.AssertPresentationAction(
     "37. Line Up",
     ["BRAILLE LINE:  '< > check box fish'",
      "     VISIBLE:  '< > check box fish', cursor=1",
-     "BRAILLE LINE:  '< > check box fish'",
-     "     VISIBLE:  '< > check box fish', cursor=1",
      "SPEECH OUTPUT: 'fish'",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'"]))
@@ -403,8 +373,6 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE: This isn't quite right",
      "BRAILLE LINE:  '< > check box bird'",
      "     VISIBLE:  '< > check box bird', cursor=1",
-     "BRAILLE LINE:  '< > check box bird'",
-     "     VISIBLE:  '< > check box bird', cursor=1",
      "SPEECH OUTPUT: 'What are your favorite pets?'",
      "SPEECH OUTPUT: 'check box'",
      "SPEECH OUTPUT: 'not checked'",
diff --git a/test/keystrokes/firefox/line_nav_bug_552887a.py b/test/keystrokes/firefox/line_nav_bug_552887a.py
index 86f1e03..d77a0b6 100644
--- a/test/keystrokes/firefox/line_nav_bug_552887a.py
+++ b/test/keystrokes/firefox/line_nav_bug_552887a.py
@@ -95,8 +95,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "10. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  'The Orca logo image'",
+     "     VISIBLE:  'The Orca logo image', cursor=20",
      "SPEECH OUTPUT: 'The Orca logo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
diff --git a/test/keystrokes/firefox/line_nav_bug_555055.py b/test/keystrokes/firefox/line_nav_bug_555055.py
index bfe47bb..7c61f67 100644
--- a/test/keystrokes/firefox/line_nav_bug_555055.py
+++ b/test/keystrokes/firefox/line_nav_bug_555055.py
@@ -119,8 +119,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "14. Line Down",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  'table cell'",
+     "     VISIBLE:  'table cell', cursor=1",
      "SPEECH OUTPUT: '",
      "'",
      "SPEECH OUTPUT: 'blank'"]))
@@ -153,8 +153,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "18. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  'table cell'",
+     "     VISIBLE:  'table cell', cursor=1",
      "SPEECH OUTPUT: '",
      "'",
      "SPEECH OUTPUT: 'blank'"]))
diff --git a/test/keystrokes/firefox/line_nav_enter_bug.py b/test/keystrokes/firefox/line_nav_enter_bug.py
index dd38421..e9f7daf 100644
--- a/test/keystrokes/firefox/line_nav_enter_bug.py
+++ b/test/keystrokes/firefox/line_nav_enter_bug.py
@@ -148,8 +148,6 @@ sequence.append(utils.AssertPresentationAction(
     "13. Line Down",
     ["BRAILLE LINE:  '2.21.x list box'",
      "     VISIBLE:  '2.21.x list box', cursor=1",
-     "BRAILLE LINE:  '2.21.x list box'",
-     "     VISIBLE:  '2.21.x list box', cursor=1",
      "SPEECH OUTPUT: 'Version:'",
      "SPEECH OUTPUT: '2.21.x'",
      "SPEECH OUTPUT: 'List with 9 items'"]))
@@ -170,8 +168,6 @@ sequence.append(utils.AssertPresentationAction(
     "15. Line Down",
     ["BRAILLE LINE:  'braille list box'",
      "     VISIBLE:  'braille list box', cursor=1",
-     "BRAILLE LINE:  'braille list box'",
-     "     VISIBLE:  'braille list box', cursor=1",
      "SPEECH OUTPUT: 'Component:'",
      "SPEECH OUTPUT: 'braille'",
      "SPEECH OUTPUT: 'List with 5 items'"]))
@@ -211,10 +207,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "19. Line Down",
-    ["BRAILLE LINE:  ' combo box'",
-     "     VISIBLE:  ' combo box', cursor=1",
-     "BRAILLE LINE:  ' combo box'",
-     "     VISIBLE:  ' combo box', cursor=1",
+    ["BRAILLE LINE:  'Unspecified combo box'",
+     "     VISIBLE:  'Unspecified combo box', cursor=1",
      "SPEECH OUTPUT: 'Unspecified'",
      "SPEECH OUTPUT: 'combo box'"]))
 
@@ -222,8 +216,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "20. Line Down",
-    ["BRAILLE LINE:  'OS:  combo box'",
-     "     VISIBLE:  'OS:  combo box', cursor=1",
+    ["BRAILLE LINE:  'OS: Linux combo box'",
+     "     VISIBLE:  'OS: Linux combo box', cursor=1",
      "SPEECH OUTPUT: 'OS'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: ': '",
@@ -234,8 +228,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "21. Line Down",
-    ["BRAILLE LINE:  'Severity:  combo box'",
-     "     VISIBLE:  'Severity:  combo box', cursor=1",
+    ["BRAILLE LINE:  'Severity: normal combo box'",
+     "     VISIBLE:  'Severity: normal combo box', cursor=1",
      "SPEECH OUTPUT: 'Severity'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: ': '",
@@ -274,8 +268,6 @@ sequence.append(utils.AssertPresentationAction(
     "25. Line Down",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -320,8 +312,6 @@ sequence.append(utils.AssertPresentationAction(
     "30. Line Down",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'entry'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -366,8 +356,6 @@ sequence.append(utils.AssertPresentationAction(
     "35. Line Up",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Description:'",
      "SPEECH OUTPUT: 'entry'"]))
 
@@ -401,8 +389,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "39. Line Up",
-    ["BRAILLE LINE:  'Severity:  combo box'",
-     "     VISIBLE:  'Severity:  combo box', cursor=1",
+    ["BRAILLE LINE:  'Severity: normal combo box'",
+     "     VISIBLE:  'Severity: normal combo box', cursor=1",
      "SPEECH OUTPUT: 'Severity'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: ': '",
@@ -413,8 +401,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "40. Line Up",
-    ["BRAILLE LINE:  'OS:  combo box'",
-     "     VISIBLE:  'OS:  combo box', cursor=1",
+    ["BRAILLE LINE:  'OS: Linux combo box'",
+     "     VISIBLE:  'OS: Linux combo box', cursor=1",
      "SPEECH OUTPUT: 'OS'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: ': '",
@@ -426,10 +414,8 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "41. Line Up",
     ["KNOWN ISSUE: On the way down we split this into two.",
-     "BRAILLE LINE:  ' combo box'",
-     "     VISIBLE:  ' combo box', cursor=1",
-     "BRAILLE LINE:  ' combo box'",
-     "     VISIBLE:  ' combo box', cursor=1",
+     "BRAILLE LINE:  'Unspecified combo box'",
+     "     VISIBLE:  'Unspecified combo box', cursor=1",
      "SPEECH OUTPUT: 'GNOME version:'",
      "SPEECH OUTPUT: 'Unspecified'",
      "SPEECH OUTPUT: 'combo box'"]))
@@ -458,8 +444,6 @@ sequence.append(utils.AssertPresentationAction(
     "44. Line Up",
     ["BRAILLE LINE:  'braille list box'",
      "     VISIBLE:  'braille list box', cursor=1",
-     "BRAILLE LINE:  'braille list box'",
-     "     VISIBLE:  'braille list box', cursor=1",
      "SPEECH OUTPUT: 'Component:'",
      "SPEECH OUTPUT: 'braille'",
      "SPEECH OUTPUT: 'List with 5 items'"]))
@@ -480,8 +464,6 @@ sequence.append(utils.AssertPresentationAction(
     "46. Line Up",
     ["BRAILLE LINE:  '2.21.x list box'",
      "     VISIBLE:  '2.21.x list box', cursor=1",
-     "BRAILLE LINE:  '2.21.x list box'",
-     "     VISIBLE:  '2.21.x list box', cursor=1",
      "SPEECH OUTPUT: 'Version:'",
      "SPEECH OUTPUT: '2.21.x'",
      "SPEECH OUTPUT: 'List with 9 items'"]))
diff --git a/test/keystrokes/firefox/line_nav_follow_same_page_link.py 
b/test/keystrokes/firefox/line_nav_follow_same_page_link.py
index 34d5881..4a8067f 100644
--- a/test/keystrokes/firefox/line_nav_follow_same_page_link.py
+++ b/test/keystrokes/firefox/line_nav_follow_same_page_link.py
@@ -42,9 +42,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "4. Return",
-    ["BRAILLE LINE:  '•Second item'",
-     "     VISIBLE:  '•Second item', cursor=2",
-     "BRAILLE LINE:  'seas. '",
+    ["BRAILLE LINE:  'seas. '",
      "     VISIBLE:  'seas. ', cursor=7",
      "SPEECH OUTPUT: 'link' voice=hyperlink"]))
 
diff --git a/test/keystrokes/firefox/line_nav_simple_form.py b/test/keystrokes/firefox/line_nav_simple_form.py
index 07b5d44..1537fe3 100644
--- a/test/keystrokes/firefox/line_nav_simple_form.py
+++ b/test/keystrokes/firefox/line_nav_simple_form.py
@@ -46,8 +46,6 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE: Something is causing us to keep presenting the field",
      "BRAILLE LINE:  'Tell me a little more about yourself: I am a monkey with a long tail.  I like  $l'",
      "     VISIBLE:  'I am a monkey with a long tail. ', cursor=1",
-     "BRAILLE LINE:  'Tell me a little more about yourself: I am a monkey with a long tail.  I like  $l'",
-     "     VISIBLE:  'I am a monkey with a long tail. ', cursor=1",
      "SPEECH OUTPUT: 'Tell me a little more about yourself:",
      "'",
      "SPEECH OUTPUT: 'entry'",
@@ -105,9 +103,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "9. line Down",
-    ["KNOWN ISSUE: We're double brailling the checkbox labels",
-     "BRAILLE LINE:  'Check one or more: < > Red Red check box Red < > Blue Blue check box Blue < > Green 
Green check box Green'",
-     "     VISIBLE:  'Check one or more: < > Red Red c', cursor=1",
+    ["BRAILLE LINE:  'Check one or more: < > Red check box Red < > Blue check box Blue < > Green check box 
Green'",
+     "     VISIBLE:  'Check one or more: < > Red check', cursor=1",
      "SPEECH OUTPUT: 'Check one or more: '",
      "SPEECH OUTPUT: 'Red'",
      "SPEECH OUTPUT: 'check box'",
@@ -123,8 +120,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "10. line Down",
-    ["BRAILLE LINE:  'Make a selection:  combo box'",
-     "     VISIBLE:  'Make a selection:  combo box', cursor=1",
+    ["BRAILLE LINE:  'Make a selection: Water combo box'",
+     "     VISIBLE:  'Make a selection: Water combo bo', cursor=1",
      "SPEECH OUTPUT: 'Make a selection: '",
      "SPEECH OUTPUT: 'Water'",
      "SPEECH OUTPUT: 'combo box'"]))
@@ -149,8 +146,6 @@ sequence.append(utils.AssertPresentationAction(
     "12. line Down",
     ["BRAILLE LINE:  'Hockey list box'",
      "     VISIBLE:  'Hockey list box', cursor=1",
-     "BRAILLE LINE:  'Hockey list box'",
-     "     VISIBLE:  'Hockey list box', cursor=1",
      "SPEECH OUTPUT: 'Which sports do you like?'",
      "SPEECH OUTPUT: 'Hockey'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -198,8 +193,6 @@ sequence.append(utils.AssertPresentationAction(
     "16. line Up",
     ["BRAILLE LINE:  'Hockey list box'",
      "     VISIBLE:  'Hockey list box', cursor=1",
-     "BRAILLE LINE:  'Hockey list box'",
-     "     VISIBLE:  'Hockey list box', cursor=1",
      "SPEECH OUTPUT: 'Which sports do you like?'",
      "SPEECH OUTPUT: 'Hockey'",
      "SPEECH OUTPUT: 'multi-select'",
@@ -222,8 +215,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "18. line Up",
-    ["BRAILLE LINE:  'Make a selection:  combo box'",
-     "     VISIBLE:  'Make a selection:  combo box', cursor=1",
+    ["BRAILLE LINE:  'Make a selection: Water combo box'",
+     "     VISIBLE:  'Make a selection: Water combo bo', cursor=1",
      "SPEECH OUTPUT: 'Make a selection: '",
      "SPEECH OUTPUT: 'Water'",
      "SPEECH OUTPUT: 'combo box'"]))
@@ -232,9 +225,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "19. line Up",
-    ["KNOWN ISSUE: We're double brailling the checkbox labels",
-     "BRAILLE LINE:  'Check one or more: < > Red Red check box Red < > Blue Blue check box Blue < > Green 
Green check box Green'",
-     "     VISIBLE:  'Check one or more: < > Red Red c', cursor=1",
+    ["BRAILLE LINE:  'Check one or more: < > Red check box Red < > Blue check box Blue < > Green check box 
Green'",
+     "     VISIBLE:  'Check one or more: < > Red check', cursor=1",
      "SPEECH OUTPUT: 'Check one or more: '",
      "SPEECH OUTPUT: 'Red'",
      "SPEECH OUTPUT: 'check box'",
@@ -252,8 +244,6 @@ sequence.append(utils.AssertPresentationAction(
     "20. line Up",
     ["KNOWN ISSUE: Why aren't we speaking this? Ditto for the next few items.",
      "BRAILLE LINE:  '      $l'",
-     "     VISIBLE:  '      $l', cursor=1",
-     "BRAILLE LINE:  '      $l'",
      "     VISIBLE:  '      $l', cursor=1"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_slash_test.py b/test/keystrokes/firefox/line_nav_slash_test.py
index 992e5ad..e0d3e40 100644
--- a/test/keystrokes/firefox/line_nav_slash_test.py
+++ b/test/keystrokes/firefox/line_nav_slash_test.py
@@ -117,8 +117,6 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE - Sometimes we also say 'Recent Tags'. Might be a timing issue. And the presentation is 
wrong regardless.",
      "BRAILLE LINE:  '& y radio button Some polls'",
      "     VISIBLE:  '& y radio button Some polls', cursor=1",
-     "BRAILLE LINE:  '& y radio button Some polls'",
-     "     VISIBLE:  '& y radio button Some polls', cursor=1",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'",
      "SPEECH OUTPUT: 'Some polls '",
@@ -140,8 +138,6 @@ sequence.append(utils.AssertPresentationAction(
     "13. Line Up",
     ["BRAILLE LINE:  '& y radio button Some polls'",
      "     VISIBLE:  '& y radio button Some polls', cursor=1",
-     "BRAILLE LINE:  '& y radio button Some polls'",
-     "     VISIBLE:  '& y radio button Some polls', cursor=1",
      "SPEECH OUTPUT: 'Some polls'",
      "SPEECH OUTPUT: 'not selected'",
      "SPEECH OUTPUT: 'radio button'"]))
diff --git a/test/keystrokes/firefox/line_nav_sun_java.py b/test/keystrokes/firefox/line_nav_sun_java.py
index 1655f5c..a69fe5c 100644
--- a/test/keystrokes/firefox/line_nav_sun_java.py
+++ b/test/keystrokes/firefox/line_nav_sun_java.py
@@ -65,8 +65,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Line Down",
-    ["BRAILLE LINE:  'Installation Notes document frame'",
-     "     VISIBLE:  'Installation Notes document fram', cursor=1",
+    ["BRAILLE LINE:  ''",
+     "     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 111e680..01dad47 100644
--- a/test/keystrokes/firefox/line_nav_wiki_down.py
+++ b/test/keystrokes/firefox/line_nav_wiki_down.py
@@ -1043,10 +1043,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "97. Line Down",
-    ["BRAILLE LINE:  ' combo box'",
-     "     VISIBLE:  ' combo box', cursor=1",
-     "BRAILLE LINE:  ' combo box'",
-     "     VISIBLE:  ' combo box', cursor=1",
+    ["BRAILLE LINE:  'More Actions: combo box'",
+     "     VISIBLE:  'More Actions: combo box', cursor=1",
      "SPEECH OUTPUT: 'More Actions:'",
      "SPEECH OUTPUT: 'combo box'"]))
 
diff --git a/test/keystrokes/firefox/line_nav_wiki_up.py b/test/keystrokes/firefox/line_nav_wiki_up.py
index f78b04e..e8aaebc 100644
--- a/test/keystrokes/firefox/line_nav_wiki_up.py
+++ b/test/keystrokes/firefox/line_nav_wiki_up.py
@@ -62,10 +62,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Up",
-    ["BRAILLE LINE:  ' combo box'",
-     "     VISIBLE:  ' combo box', cursor=1",
-     "BRAILLE LINE:  ' combo box'",
-     "     VISIBLE:  ' combo box', cursor=1",
+    ["BRAILLE LINE:  'More Actions: combo box'",
+     "     VISIBLE:  'More Actions: combo box', cursor=1",
      "SPEECH OUTPUT: 'More Actions:'",
      "SPEECH OUTPUT: 'combo box'"]))
 
diff --git a/test/keystrokes/firefox/ui_role_combo_box.py b/test/keystrokes/firefox/ui_role_combo_box.py
index 90fef44..74e0ad8 100644
--- a/test/keystrokes/firefox/ui_role_combo_box.py
+++ b/test/keystrokes/firefox/ui_role_combo_box.py
@@ -15,9 +15,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab to combobox",
-    ["KNOWN ISSUE: The braille isn't right here and in the tests that follow",
-     "BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup When Firefox starts: When 
Firefox starts: combo box'",
-     "     VISIBLE:  'When Firefox starts: When Firefo', cursor=22",
+    ["BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup When Firefox starts: Show a 
blank page combo box'",
+     "     VISIBLE:  'When Firefox starts: Show a blan', cursor=22",
      "SPEECH OUTPUT: 'Startup panel'",
      "SPEECH OUTPUT: 'When Firefox starts: Show a blank page combo box'"]))
 
@@ -25,16 +24,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down Arrow in combobox",
-    ["BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup When Firefox starts: When 
Firefox starts: combo box'",
-     "     VISIBLE:  'When Firefox starts: When Firefo', cursor=22",
+    ["BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup When Firefox starts: Show my 
windows and tabs from last time combo box'",
+     "     VISIBLE:  'When Firefox starts: Show my win', cursor=22",
      "SPEECH OUTPUT: 'Show my windows and tabs from last time'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "3. Up Arrow in combobox",
-    ["BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup When Firefox starts: When 
Firefox starts: combo box'",
-     "     VISIBLE:  'When Firefox starts: When Firefo', cursor=22",
+    ["BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup When Firefox starts: Show a 
blank page combo box'",
+     "     VISIBLE:  'When Firefox starts: Show a blan', cursor=22",
      "SPEECH OUTPUT: 'Show a blank page'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -48,7 +47,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Down Arrow in expanded combobox",
-    ["BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup  combo boxWhen Firefox starts: 
When Firefox starts: Show my windows and tabs from last time'",
+    ["BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup  combo boxWhen Firefox starts: 
Show a blank page Show my windows and tabs from last time'",
      "     VISIBLE:  'Show my windows and tabs from la', cursor=1",
      "SPEECH OUTPUT: 'Show my windows and tabs from last time'"]))
 
@@ -56,7 +55,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "6. Up Arrow in expanded combobox",
-    ["BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup  combo boxWhen Firefox starts: 
When Firefox starts: Show a blank page'",
+    ["BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup  combo boxWhen Firefox starts: 
Show a blank page Show a blank page'",
      "     VISIBLE:  'Show a blank page', cursor=1",
      "SPEECH OUTPUT: 'Show a blank page'"]))
 
@@ -64,28 +63,27 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "7. Return to collapse combobox",
-    ["BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup When Firefox starts: When 
Firefox starts: combo box'",
-     "     VISIBLE:  'When Firefox starts: When Firefo', cursor=22",
-     "BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup When Firefox starts: When 
Firefox starts: combo box'",
-     "     VISIBLE:  'When Firefox starts: When Firefo', cursor=22",
+    ["BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup When Firefox starts: Show a 
blank page combo box'",
+     "     VISIBLE:  'When Firefox starts: Show a blan', cursor=22",
+     "BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup When Firefox starts: Show a 
blank page combo box'",
+     "     VISIBLE:  'When Firefox starts: Show a blan', cursor=22",
      "SPEECH OUTPUT: 'When Firefox starts: Show a blank page combo box'",
-     "SPEECH OUTPUT: 'Show a blank page'",
-     "SPEECH OUTPUT: 'combo box'"]))
+     "SPEECH OUTPUT: 'collapsed'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction("s"))
 sequence.append(utils.AssertPresentationAction(
     "8. First letter navigation with s",
-    ["BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup When Firefox starts: When 
Firefox starts: combo box'",
-     "     VISIBLE:  'When Firefox starts: When Firefo', cursor=22",
+    ["BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup When Firefox starts: Show my 
home page combo box'",
+     "     VISIBLE:  'When Firefox starts: Show my hom', cursor=22",
      "SPEECH OUTPUT: 'Show my home page'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction("s"))
 sequence.append(utils.AssertPresentationAction(
     "9. First letter navigation with s",
-    ["BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup When Firefox starts: When 
Firefox starts: combo box'",
-     "     VISIBLE:  'When Firefox starts: When Firefo', cursor=22",
+    ["BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup When Firefox starts: Show a 
blank page combo box'",
+     "     VISIBLE:  'When Firefox starts: Show a blan', cursor=22",
      "SPEECH OUTPUT: 'Show a blank page'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -93,13 +91,12 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "10. Basic Where Am I",
     ["KNOWN ISSUE: Crazy chattines",
-     "BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup When Firefox starts: When 
Firefox starts: combo box'",
-     "     VISIBLE:  'When Firefox starts: When Firefo', cursor=22",
+     "BRAILLE LINE:  'Firefox application Firefox Preferences dialog Startup When Firefox starts: Show a 
blank page combo box'",
+     "     VISIBLE:  'When Firefox starts: Show a blan', cursor=22",
      "SPEECH OUTPUT: 'Firefox Preferences'",
      "SPEECH OUTPUT: 'Startup'",
      "SPEECH OUTPUT: 'panel'",
-     "SPEECH OUTPUT: 'Show a blank page'",
-     "SPEECH OUTPUT: 'combo box'",
+     "SPEECH OUTPUT: 'collapsed'",
      "SPEECH OUTPUT: 'Show a blank page'",
      "SPEECH OUTPUT: 'combo box'",
      "SPEECH OUTPUT: 'Show a blank page'",


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