Index: test/keystrokes/firefox/moz_menu.py
===================================================================
--- test/keystrokes/firefox/moz_menu.py	(revision 4542)
+++ test/keystrokes/firefox/moz_menu.py	(working copy)
@@ -60,8 +60,8 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Move to View", 
-    ["BRAILLE LINE:  'Edit View'",
-     "     VISIBLE:  'Edit View', cursor=6",
+    ["BRAILLE LINE:  'View'",
+     "     VISIBLE:  'View', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'View'"]))
     
@@ -84,10 +84,10 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Move to basic grey", 
-    ["BRAILLE LINE:  'Basic Grey'",
-     "     VISIBLE:  'Basic Grey', cursor=(0|1)",
-     "BRAILLE LINE:  'Basic Grey'",
-     "     VISIBLE:  'Basic Grey', cursor=1",
+    ["BRAILLE LINE:  'Themes          >'",
+     "     VISIBLE:  'Themes          >', cursor=(0|1)",
+     "BRAILLE LINE:  'Themes          > Basic Grey'",
+     "     VISIBLE:  'Themes          > Basic Grey', cursor=19",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: ''",
@@ -170,10 +170,11 @@
 sequence.append(PauseAction(1000))
 sequence.append(utils.AssertPresentationAction(
     "Move to one", 
-    ["BRAILLE LINE:  'one'",
-     "     VISIBLE:  'one', cursor=(0|1)",
-     "BRAILLE LINE:  'one'",
-     "     VISIBLE:  'one', cursor=1",
+    ["KNOWN ISSUE - Depenind on timing, we sometimes just display one rather than More",
+     "BRAILLE LINE:  'More                >'",
+     "     VISIBLE:  'More                >', cursor=(0|1)",
+     "BRAILLE LINE:  'More                > one'",
+     "     VISIBLE:  'More                > one', cursor=23",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: ''",
@@ -193,8 +194,8 @@
 sequence.append(utils.AssertPresentationAction(
     "leave menu", 
     ["BUG? - Focus is being given back to the table, but should we be saying more here?",
-     "BRAILLE LINE:  'Entry # Date Expense Amount Merchant Type'",
-     "     VISIBLE:  'Entry # Date Expense Amount Merc', cursor=8",
+     "BRAILLE LINE:  'Entry # ColumnHeader Date ColumnHeader Expense ColumnHeader Amount ColumnHeader Merchant ColumnHeader Type ColumnHeader'",
+     "     VISIBLE:  'Entry # ColumnHeader Date Column', cursor=0",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'table'"]))
 
Index: test/keystrokes/firefox/codetalks_panel_text.py
===================================================================
--- test/keystrokes/firefox/codetalks_panel_text.py	(revision 4542)
+++ test/keystrokes/firefox/codetalks_panel_text.py	(working copy)
@@ -29,7 +29,7 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Down Arrow", 
-    ["BUG? - Not presenting the first line in the panel"]))
+    ["BUG? - Not presenting anything for the initial arrow"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -158,17 +158,15 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "8. Up Arrow", 
-    ["BRAILLE LINE:  'Panel 0'",
-     "     VISIBLE:  'Panel 0', cursor=1",
-     "SPEECH OUTPUT: 'Panel 0 scroll pane'"]))
+    ["BRAILLE LINE:  'Tab Zero Page'",
+     "     VISIBLE:  'Tab Zero Page', cursor=1",
+     "SPEECH OUTPUT: 'Tab Zero scroll pane'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "9. Up Arrow", 
-    ["BRAILLE LINE:  'Tab Zero Page Tab One Page Tab Two Page Tab Three Page Tab Four Page'",
-     "     VISIBLE:  'Tab Zero Page Tab One Page Tab T', cursor=1",
-     "SPEECH OUTPUT: 'Tab Zero page Tab One page Tab Two page Tab Three page Tab Four page'"]))
+    ["BUG? - Not presenting anything for the final arrow"]))
 
 ########################################################################
 # Close the demo
Index: test/keystrokes/firefox/dojo_slider.py
===================================================================
--- test/keystrokes/firefox/dojo_slider.py	(revision 4542)
+++ test/keystrokes/firefox/dojo_slider.py	(working copy)
@@ -214,8 +214,8 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "move to button", 
-    ["BRAILLE LINE:  'Disable previous slider Button'",
-     "     VISIBLE:  'Disable previous slider Button', cursor=1",
+    ["BRAILLE LINE:  'Disable previous slider Button Enable previous slider Button'",
+     "     VISIBLE:  'Disable previous slider Button E', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Disable previous slider button'"]))
      
Index: test/keystrokes/firefox/dojo_tree.py
===================================================================
--- test/keystrokes/firefox/dojo_tree.py	(revision 4542)
+++ test/keystrokes/firefox/dojo_tree.py	(working copy)
@@ -37,9 +37,8 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "tab to continents", 
-    ["BUG? - The braille in this assertion and several of those that follow begins with an extraneous space.",
-     "BRAILLE LINE:  ' Continents ListItem'",
-     "     VISIBLE:  ' Continents ListItem', cursor=2",
+    ["BRAILLE LINE:  'Continents ListItem'",
+     "     VISIBLE:  'Continents ListItem', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Continents expanded'",
      "SPEECH OUTPUT: 'tree level 1'"]))
@@ -51,8 +50,8 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to Africa", 
-    ["BRAILLE LINE:  ' Africa ListItem'",
-     "     VISIBLE:  ' Africa ListItem', cursor=2",
+    ["BRAILLE LINE:  'Africa ListItem'",
+     "     VISIBLE:  'Africa ListItem', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Africa collapsed'",
      "SPEECH OUTPUT: 'tree level 2'"]))
@@ -65,8 +64,8 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  ' Africa ListItem'",
-     "     VISIBLE:  ' Africa ListItem', cursor=2",
+    ["BRAILLE LINE:  'Africa ListItem'",
+     "     VISIBLE:  'Africa ListItem', cursor=1",
      "SPEECH OUTPUT: 'list item'",
      "SPEECH OUTPUT: 'Africa'",
      "SPEECH OUTPUT: ''",
@@ -80,8 +79,8 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "expand Africa", 
-    ["BRAILLE LINE:  ' Africa ListItem'",
-     "     VISIBLE:  ' Africa ListItem', cursor=2",
+    ["BRAILLE LINE:  'Africa ListItem'",
+     "     VISIBLE:  'Africa ListItem', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -89,8 +88,8 @@
 sequence.append(WaitForFocus("Egypt", acc_role=pyatspi.ROLE_LIST_ITEM))
 sequence.append(utils.AssertPresentationAction(
     "arrow to Egypt", 
-    ["BRAILLE LINE:  ' Egypt ListItem'",
-     "     VISIBLE:  ' Egypt ListItem', cursor=2",
+    ["BRAILLE LINE:  'Egypt ListItem'",
+     "     VISIBLE:  'Egypt ListItem', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Egypt'",
      "SPEECH OUTPUT: 'tree level 3'"]))
@@ -152,8 +151,8 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to China", 
-    ["BRAILLE LINE:  ' China ListItem'",
-     "     VISIBLE:  ' China ListItem', cursor=2",
+    ["BRAILLE LINE:  'China ListItem'",
+     "     VISIBLE:  'China ListItem', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'China'",
      "SPEECH OUTPUT: 'tree level 3'"]))
Index: test/keystrokes/firefox/dojo_tabcontainer.py
===================================================================
--- test/keystrokes/firefox/dojo_tabcontainer.py	(revision 4542)
+++ test/keystrokes/firefox/dojo_tabcontainer.py	(working copy)
@@ -63,7 +63,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to tab 3", 
-    ["BRAILLE LINE:  'Tab 1 Page Tab 2 Page Tab 3 Page Inlined Sub TabContainer Page Sub TabContainer from href Page SplitContainer from href Page Tab 3 Page'",
+    ["BRAILLE LINE:  'Tab 1 Page Tab 2 Page Tab 3 Page Inlined Sub TabContainer Page Sub TabContainer from href Page SplitContainer from href Page'",
      "     VISIBLE:  'Tab 3 Page Inlined Sub TabContai', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Tab 3 page'"]))
@@ -74,7 +74,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to programmatically created tab", 
-    ["BRAILLE LINE:  'Tab 1 Page Tab 2 Page Tab 3 Page Inlined Sub TabContainer Page Sub TabContainer from href Page SplitContainer from href Page Inlined Sub TabContainer Page'",
+    ["BRAILLE LINE:  'Tab 1 Page Tab 2 Page Tab 3 Page Inlined Sub TabContainer Page Sub TabContainer from href Page SplitContainer from href Page'",
      "     VISIBLE:  'Inlined Sub TabContainer Page Su', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Inlined Sub TabContainer page'"]))
Index: test/keystrokes/firefox/dojo_spinner.py
===================================================================
--- test/keystrokes/firefox/dojo_spinner.py	(revision 4542)
+++ test/keystrokes/firefox/dojo_spinner.py	(working copy)
@@ -39,11 +39,9 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the first spinner",
-    ["BUG? - The spinbox is followed by some text - 'onChange:' followed by a grayed out entry containing the text 'not fired yet!'. Either the 'on change' text should be present or, in my opinion, this 'not fired yet!' removed",
+    ["BUG? - The spinbox is followed by some text - 'onChange:' followed by a grayed out entry containing the text 'not fired yet!'. Either the 'on change' text should be present or, in my opinion, this 'not fired yet!' removed. This is true for all assertions.",
      "BRAILLE LINE:  'Spinbox #1: 900 $l not fired yet! $l'",
      "     VISIBLE:  'Spinbox #1: 900 $l not fired yet', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 900 $l not fired yet! $l'",
-     "     VISIBLE:  'Spinbox #1: 900 $l not fired yet', cursor=16",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Spinbox #1: 900 selected spin button'"]))
 
@@ -54,10 +52,10 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 1", 
-    ["BRAILLE LINE:  'Spinbox #1: 900 $l'",
-     "     VISIBLE:  'Spinbox #1: 900 $l', cursor=0",
-     "BRAILLE LINE:  'Spinbox #1: 899 $l'",
-     "     VISIBLE:  'Spinbox #1: 899 $l', cursor=0",
+    ["BRAILLE LINE:  'Spinbox #1: 900 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 900 $l not fired yet', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 899 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 899 $l not fired yet', cursor=16",
      "SPEECH OUTPUT: '899'"]))
 
 ########################################################################
@@ -67,10 +65,10 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 2", 
-    ["BRAILLE LINE:  'Spinbox #1: 899 $l'",
-     "     VISIBLE:  'Spinbox #1: 899 $l', cursor=0",
-     "BRAILLE LINE:  'Spinbox #1: 898 $l'",
-     "     VISIBLE:  'Spinbox #1: 898 $l', cursor=0",
+    ["BRAILLE LINE:  'Spinbox #1: 899 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 899 $l not fired yet', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 898 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 898 $l not fired yet', cursor=16",
      "SPEECH OUTPUT: '898'"]))
 
 ########################################################################
@@ -80,10 +78,10 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 3", 
-    ["BRAILLE LINE:  'Spinbox #1: 898 $l'",
-     "     VISIBLE:  'Spinbox #1: 898 $l', cursor=0",
-     "BRAILLE LINE:  'Spinbox #1: 897 $l'",
-     "     VISIBLE:  'Spinbox #1: 897 $l', cursor=0",
+    ["BRAILLE LINE:  'Spinbox #1: 898 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 898 $l not fired yet', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 897 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 897 $l not fired yet', cursor=16",
      "SPEECH OUTPUT: '897'"]))
 
 ########################################################################
@@ -93,10 +91,10 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 4", 
-    ["BRAILLE LINE:  'Spinbox #1: 897 $l'",
-     "     VISIBLE:  'Spinbox #1: 897 $l', cursor=0",
-     "BRAILLE LINE:  'Spinbox #1: 896 $l'",
-     "     VISIBLE:  'Spinbox #1: 896 $l', cursor=0",
+    ["BRAILLE LINE:  'Spinbox #1: 897 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 897 $l not fired yet', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 896 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 896 $l not fired yet', cursor=16",
      "SPEECH OUTPUT: '896'"]))
 
 ########################################################################
@@ -106,10 +104,10 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 5", 
-    ["BRAILLE LINE:  'Spinbox #1: 896 $l'",
-     "     VISIBLE:  'Spinbox #1: 896 $l', cursor=0",
-     "BRAILLE LINE:  'Spinbox #1: 895 $l'",
-     "     VISIBLE:  'Spinbox #1: 895 $l', cursor=0",
+    ["BRAILLE LINE:  'Spinbox #1: 896 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 896 $l not fired yet', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 895 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 895 $l not fired yet', cursor=16",
      "SPEECH OUTPUT: '895'"]))
 
 ########################################################################
@@ -119,10 +117,10 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 1", 
-    ["BRAILLE LINE:  'Spinbox #1: 895 $l'",
-     "     VISIBLE:  'Spinbox #1: 895 $l', cursor=0",
-     "BRAILLE LINE:  'Spinbox #1: 896 $l'",
-     "     VISIBLE:  'Spinbox #1: 896 $l', cursor=0",
+    ["BRAILLE LINE:  'Spinbox #1: 895 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 895 $l not fired yet', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 896 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 896 $l not fired yet', cursor=16",
      "SPEECH OUTPUT: '896'"]))
 
 ########################################################################
@@ -132,10 +130,10 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 2", 
-    ["BRAILLE LINE:  'Spinbox #1: 896 $l'",
-     "     VISIBLE:  'Spinbox #1: 896 $l', cursor=0",
-     "BRAILLE LINE:  'Spinbox #1: 897 $l'",
-     "     VISIBLE:  'Spinbox #1: 897 $l', cursor=0",
+    ["BRAILLE LINE:  'Spinbox #1: 896 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 896 $l not fired yet', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 897 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 897 $l not fired yet', cursor=16",
      "SPEECH OUTPUT: '897'"]))
 
 ########################################################################
@@ -145,10 +143,10 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 3", 
-    ["BRAILLE LINE:  'Spinbox #1: 897 $l'",
-     "     VISIBLE:  'Spinbox #1: 897 $l', cursor=0",
-     "BRAILLE LINE:  'Spinbox #1: 898 $l'",
-     "     VISIBLE:  'Spinbox #1: 898 $l', cursor=0",
+    ["BRAILLE LINE:  'Spinbox #1: 897 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 897 $l not fired yet', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 898 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 898 $l not fired yet', cursor=16",
      "SPEECH OUTPUT: '898'"]))
 
 ########################################################################
@@ -158,10 +156,10 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 4", 
-    ["BRAILLE LINE:  'Spinbox #1: 898 $l'",
-     "     VISIBLE:  'Spinbox #1: 898 $l', cursor=0",
-     "BRAILLE LINE:  'Spinbox #1: 899 $l'",
-     "     VISIBLE:  'Spinbox #1: 899 $l', cursor=0",
+    ["BRAILLE LINE:  'Spinbox #1: 898 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 898 $l not fired yet', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 899 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 899 $l not fired yet', cursor=16",
      "SPEECH OUTPUT: '899'"]))
 
 ########################################################################
@@ -171,10 +169,10 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 5", 
-    ["BRAILLE LINE:  'Spinbox #1: 899 $l'",
-     "     VISIBLE:  'Spinbox #1: 899 $l', cursor=0",
-     "BRAILLE LINE:  'Spinbox #1: 900 $l'",
-     "     VISIBLE:  'Spinbox #1: 900 $l', cursor=0",
+    ["BRAILLE LINE:  'Spinbox #1: 899 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 899 $l not fired yet', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 900 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 900 $l not fired yet', cursor=16",
      "SPEECH OUTPUT: '900'"]))
 
 ########################################################################
@@ -184,10 +182,10 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 6", 
-    ["BRAILLE LINE:  'Spinbox #1: 900 $l'",
-     "     VISIBLE:  'Spinbox #1: 900 $l', cursor=0",
-     "BRAILLE LINE:  'Spinbox #1: 901 $l'",
-     "     VISIBLE:  'Spinbox #1: 901 $l', cursor=0",
+    ["BRAILLE LINE:  'Spinbox #1: 900 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 900 $l not fired yet', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 901 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 901 $l not fired yet', cursor=16",
      "SPEECH OUTPUT: '901'"]))
 
 ########################################################################
@@ -197,10 +195,10 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 7", 
-    ["BRAILLE LINE:  'Spinbox #1: 901 $l'",
-     "     VISIBLE:  'Spinbox #1: 901 $l', cursor=0",
-     "BRAILLE LINE:  'Spinbox #1: 902 $l'",
-     "     VISIBLE:  'Spinbox #1: 902 $l', cursor=0",
+    ["BRAILLE LINE:  'Spinbox #1: 901 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 901 $l not fired yet', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 902 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 902 $l not fired yet', cursor=16",
      "SPEECH OUTPUT: '902'"]))
 
 ########################################################################
@@ -211,8 +209,8 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  'Spinbox #1: 902 $l'",
-     "     VISIBLE:  'Spinbox #1: 902 $l', cursor=0",
+    ["BRAILLE LINE:  'Spinbox #1: 902 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1: 902 $l not fired yet', cursor=16",
      "SPEECH OUTPUT: 'Spinbox #1:'",
      "SPEECH OUTPUT: 'spin button'",
      "SPEECH OUTPUT: '902'",
Index: test/keystrokes/firefox/dojo_dialog.py
===================================================================
--- test/keystrokes/firefox/dojo_dialog.py	(revision 4542)
+++ test/keystrokes/firefox/dojo_dialog.py	(working copy)
@@ -36,8 +36,8 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to show dialog button", 
-    ["BRAILLE LINE:  'Show Dialog Button'",
-     "     VISIBLE:  'Show Dialog Button', cursor=1",
+    ["BRAILLE LINE:  'Show Dialog Button Programatic Dialog \(3 second delay\) Button Show TabContainer Dialog Button Test slow loading HREF Dialog Button Show File Dialog Button'",
+     "     VISIBLE:  'Show Dialog Button Programatic D', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Show Dialog button'"]))
      
@@ -48,7 +48,7 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to programatic dialog button", 
-    ["BRAILLE LINE:  'Programatic Dialog \(3 second delay\) Button'",
+    ["BRAILLE LINE:  'Show Dialog Button Programatic Dialog \(3 second delay\) Button Show TabContainer Dialog Button Test slow loading HREF Dialog Button Show File Dialog Button'",
      "     VISIBLE:  'Programatic Dialog \(3 second del', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Programatic Dialog \(3 second delay\) button'"]))
@@ -60,8 +60,8 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to tabcontainer dialog button", 
-    ["BRAILLE LINE:  'Show TabContainer Dialog Button'",
-     "     VISIBLE:  'Show TabContainer Dialog Button', cursor=1",
+    ["BRAILLE LINE:  'Show Dialog Button Programatic Dialog \(3 second delay\) Button Show TabContainer Dialog Button Test slow loading HREF Dialog Button Show File Dialog Button'",
+     "     VISIBLE:  'Show TabContainer Dialog Button ', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Show TabContainer Dialog button'"]))
 
@@ -102,8 +102,8 @@
 sequence.append(WaitForFocus("Show TabContainer Dialog", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "close dialog", 
-    ["BRAILLE LINE:  'Show TabContainer Dialog Button'",
-     "     VISIBLE:  'Show TabContainer Dialog Button', cursor=1",
+    ["BRAILLE LINE:  'Show Dialog Button Programatic Dialog \(3 second delay\) Button Show TabContainer Dialog Button Test slow loading HREF Dialog Button Show File Dialog Button'",
+     "     VISIBLE:  'Show TabContainer Dialog Button ', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Show TabContainer Dialog button'"]))
 
Index: test/keystrokes/firefox/uiuc_grid.py
===================================================================
--- test/keystrokes/firefox/uiuc_grid.py	(revision 4542)
+++ test/keystrokes/firefox/uiuc_grid.py	(working copy)
@@ -34,10 +34,8 @@
     "Tab to grid", 
     ["BRAILLE LINE:  'E-mail List Sorted by Date Caption'",
      "     VISIBLE:  'E-mail List Sorted by Date Capti', cursor=1",
-     "BRAILLE LINE:  '< > Email 0 Selected CheckBox 1 Cell Read message Image Attachment Image Lowest priority Image John Smith Cell Trip to Florida Cell 2007-10-03 Cell 2K Cell'",
-     "     VISIBLE:  '< > Email 0 Selected CheckBox 1 ', cursor=1",
-     "BRAILLE LINE:  'Email 0 Selected CheckBox'",
-     "     VISIBLE:  'Email 0 Selected CheckBox', cursor=0",
+     "BRAILLE LINE:  'Email 0 Selected CheckBox 1 Cell Read message Image Attachment Image Lowest priority Image John Smith Cell Trip to Florida Cell 2007-10-03 Cell 2K Cell'",
+     "     VISIBLE:  'Email 0 Selected CheckBox 1 Cell', cursor=0",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'E-mail List Sorted by Date table'",
      "SPEECH OUTPUT: ''",
@@ -52,11 +50,11 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BUG? - speech info is useless",
-     "BRAILLE LINE:  'Email 0 Selected CheckBox'",
-     "     VISIBLE:  'Email 0 Selected CheckBox', cursor=0",
+    ["BRAILLE LINE:  'Email 0 Selected CheckBox 1 Cell Read message Image Attachment Image Lowest priority Image John Smith Cell Trip to Florida Cell 2007-10-03 Cell 2K Cell'",
+     "     VISIBLE:  'Email 0 Selected CheckBox 1 Cell', cursor=0",
+     "SPEECH OUTPUT: '1 Read message Attachment Lowest priority From John Smith Subject Trip to Florida'",
      "SPEECH OUTPUT: 'panel'",
-     "SPEECH OUTPUT: 'cell'"]))
+     "SPEECH OUTPUT: '1 Read message Attachment Lowest priority John Smith Trip to Florida'"]))
 
 ########################################################################
 # Move down grid
@@ -65,14 +63,11 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Move down grid", 
-    ["BRAILLE LINE:  '< > Email 1 Selected CheckBox 2 Cell New message Image Attachment Image Low priority Image Fred Jones Cell Lunch on Friday Cell 2007-12-03 Cell 1K Cell'",
-     "     VISIBLE:  '< > Email 1 Selected CheckBox 2 ', cursor=1",
-     "BRAILLE LINE:  'Email 1 Selected CheckBox'",
-     "     VISIBLE:  'Email 1 Selected CheckBox', cursor=0",
+    ["BRAILLE LINE:  'Email 1 Selected CheckBox 2 Cell New message Image Attachment Image Low priority Image Fred Jones Cell Lunch on Friday Cell 2007-12-03 Cell 1K Cell'",
+     "     VISIBLE:  'Email 1 Selected CheckBox 2 Cell', cursor=0",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Att column header'",
-     "SPEECH OUTPUT: '2 New message Attachment Low priority From Fred Jones Subject Lunch on Friday panel'",
-     "SPEECH OUTPUT: 'Email 1 Selected'"]))
+     "SPEECH OUTPUT: '2 New message Attachment Low priority From Fred Jones Subject Lunch on Friday panel'"]))
     
 ########################################################################
 # Move right on second row 1
@@ -81,7 +76,10 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Move right on second row 1", 
-    ["BUG? - We're saying nothing here"]))
+    ["BRAILLE LINE:  'Email 1 Selected CheckBox 2 Cell New message Image Attachment Image Low priority Image Fred Jones Cell Lunch on Friday Cell 2007-12-03 Cell 1K Cell'",
+     "     VISIBLE:  'Email 1 Selected CheckBox 2 Cell', cursor=0",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'Email 1 Selected'"]))
      
 ########################################################################
 # Move right on second row 2
@@ -90,7 +88,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Move right on second row 2", 
-    ["BRAILLE LINE:  '< > Email 1 Selected CheckBox 2 Cell New message Image Attachment Image Low priority Image Fred Jones Cell Lunch on Friday Cell 2007-12-03 Cell 1K Cell'",
+    ["BRAILLE LINE:  'Email 1 Selected CheckBox 2 Cell New message Image Attachment Image Low priority Image Fred Jones Cell Lunch on Friday Cell 2007-12-03 Cell 1K Cell'",
      "     VISIBLE:  '2 Cell New message Image Attachm', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: '2'"]))
@@ -102,7 +100,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Move right on second row 3", 
-    ["BRAILLE LINE:  '< > Email 1 Selected CheckBox 2 Cell New message Image Attachment Image Low priority Image Fred Jones Cell Lunch on Friday Cell 2007-12-03 Cell 1K Cell'",
+    ["BRAILLE LINE:  '< > Email 1 Selected CheckBox 2 New message Image Attachment Image Low priority Image Fred Jones Lunch on Friday 2007-12-03 1K'",
      "     VISIBLE:  'New message Image Attachment Ima', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'New message'"]))
@@ -114,7 +112,7 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Move down to third row", 
-    ["BRAILLE LINE:  '< > Email 2 Selected CheckBox 3 Cell New message Image None Image Jane Johnson Cell Proposal for you to review Cell 2007-16-03 Cell 12K Cell'",
+    ["BRAILLE LINE:  '< > Email 2 Selected CheckBox 3 New message Image None Image Jane Johnson Proposal for you to review 2007-16-03 12K'",
      "     VISIBLE:  'New message Image None Image Jan', cursor=1",
      "SPEECH OUTPUT: '3 New message None From Jane Johnson Subject Proposal for you to review panel'",
      "SPEECH OUTPUT: 'New message'"]))
Index: test/keystrokes/firefox/ms_tree_bug_570571.py
===================================================================
--- test/keystrokes/firefox/ms_tree_bug_570571.py	(revision 4542)
+++ test/keystrokes/firefox/ms_tree_bug_570571.py	(working copy)
@@ -125,9 +125,8 @@
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Collapse Colors", 
-    ["BUG? We should not see main colors Panel in the braille. We're also updating braille too much here and elsewhere in these tests",
-     "BRAILLE LINE:  '-Colors ListItem main colors Panel'",
-     "     VISIBLE:  '-Colors ListItem main colors Pan', cursor=1",
+    ["BRAILLE LINE:  '-Colors ListItem'",
+     "     VISIBLE:  '-Colors ListItem', cursor=1",
      "BRAILLE LINE:  '+Colors ListItem'",
      "     VISIBLE:  '+Colors ListItem', cursor=1",
      "BRAILLE LINE:  '+Colors ListItem'",
Index: test/keystrokes/firefox/dojo_button.py
===================================================================
--- test/keystrokes/firefox/dojo_button.py	(revision 4542)
+++ test/keystrokes/firefox/dojo_button.py	(working copy)
@@ -89,8 +89,8 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Tab to Create",
-    ["BRAILLE LINE:  'Create Button View Button Create Button   Menu $l Edit!    $l Color   Save Button   Menu Disabled Button'",
-     "     VISIBLE:  'Create Button View Button Create', cursor=1",
+    ["BRAILLE LINE:  'Create Button'",
+     "     VISIBLE:  'Create Button', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Create button'",
      "SPEECH OUTPUT: 'tooltip on button'"]))
@@ -103,8 +103,8 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I on Create", 
-    ["BRAILLE LINE:  'Create Button View Button Create Button   Menu $l Edit!    $l Color   Save Button   Menu Disabled Button'",
-     "     VISIBLE:  'Create Button View Button Create', cursor=1",
+    ["BRAILLE LINE:  'Create Button'",
+     "     VISIBLE:  'Create Button', cursor=1",
      "SPEECH OUTPUT: 'Create'",
      "SPEECH OUTPUT: 'button'",
      "SPEECH OUTPUT: ''"]))
@@ -125,8 +125,8 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_MENU))
 sequence.append(utils.AssertPresentationAction(
     "Tab to drop down menu on Create", 
-    ["BRAILLE LINE:  'Create Button   Menu $l Edit!    $l Color   Save Button   Menu Disabled Button'",
-     "     VISIBLE:  '  Menu $l Edit!    $l Color   Sa', cursor=1",
+    ["BRAILLE LINE:  '<button> Button <input type='button'> Button $l $lCreate Button   Menu $l $lSave Button   Menu $l'",
+     "     VISIBLE:  '  Menu $l $lSave Button   Menu $', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: '  menu'"]))
 
@@ -138,8 +138,8 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I on drop down menu on Create", 
-    ["BRAILLE LINE:  'Create Button   Menu $l Edit!    $l Color   Save Button   Menu Disabled Button'",
-     "     VISIBLE:  '  Menu $l Edit!    $l Color   Sa', cursor=1",
+    ["BRAILLE LINE:  '<button> Button <input type='button'> Button $l $lCreate Button   Menu $l $lSave Button   Menu $l'",
+     "     VISIBLE:  '  Menu $l $lSave Button   Menu $', cursor=1",
      "SPEECH OUTPUT: ' '",
      "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: ''"]))
@@ -200,9 +200,9 @@
 sequence.append(WaitForFocus("Edit!", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Go to Edit!", 
-    ["BUG? - Cursor position is wrong",
-     "BRAILLE LINE:  '<button> Button <input type='button'> Button Create Button View Button Create Button   Menu  $l Edit!    $l Color   Save Button   Menu Disabled Button'",
-     "     VISIBLE:  '<button> Button <input type='but', cursor=0",
+    ["BUG? - Why does it say Edit! twice?",
+     "BRAILLE LINE:  'Edit! Edit! Menu'",
+     "     VISIBLE:  'Edit! Edit! Menu', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Edit! menu'"]))
 
@@ -347,11 +347,11 @@
 sequence.append(WaitForFocus("Edit!", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Close the Edit! menu", 
-    ["BUG? - Cursor position is wrong",
+    ["BUG? - Why does it say Edit! twice?",
      "BRAILLE LINE:  'tooltip on buttonMenu Menu Menu Menu'",
      "     VISIBLE:  'Menu', cursor=1",
-     "BRAILLE LINE:  '<button> Button <input type='button'> Button Create Button View Button Create Button   Menu  $l Edit!    $l Color   Save Button   Menu Disabled Button'",
-     "     VISIBLE:  '<button> Button <input type='but', cursor=0",
+     "BRAILLE LINE:  'Edit! Edit! Menu'",
+     "     VISIBLE:  'Edit! Edit! Menu', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: ''",
@@ -365,9 +365,9 @@
 sequence.append(WaitForFocus("Color", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the Color button", 
-    ["BUG? - Cursor position is wrong",
-     "BRAILLE LINE:  '<button> Button <input type='button'> Button Create Button View Button Create Button   Menu  $l Edit!    $l Color   Save Button   Menu Disabled Button'",
-     "     VISIBLE:  '<button> Button <input type='but', cursor=0",
+    ["BUG? - Why does it say Color twice?",
+     "BRAILLE LINE:  'Color Color Menu'",
+     "     VISIBLE:  'Color Color Menu', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Color menu'"]))
 
@@ -430,13 +430,9 @@
 sequence.append(WaitForFocus("fuchsia", acc_role=pyatspi.ROLE_TABLE_CELL))
 sequence.append(utils.AssertPresentationAction(
     "Goto fuchsia", 
-    ["BUG? - speaks fuchsia twice when we left arrow to it due to focus and caret-moved",
-     "BRAILLE LINE:  'silver Image yellow Image fuchsia Image navy Image'",
+    ["BRAILLE LINE:  'silver Image yellow Image fuchsia Image navy Image'",
      "     VISIBLE:  'fuchsia Image navy Image', cursor=1",
-     "BRAILLE LINE:  'fuchsia Image'",
-     "     VISIBLE:  'fuchsia Image', cursor=0",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'fuchsia'",
      "SPEECH OUTPUT: 'fuchsia'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -444,13 +440,9 @@
 sequence.append(WaitForFocus("yellow", acc_role=pyatspi.ROLE_TABLE_CELL))
 sequence.append(utils.AssertPresentationAction(
     "Goto yellow", 
-    ["BUG? - speaks yellow twice when we left arrow to it due to focus and caret-moved",
-     "BRAILLE LINE:  'silver Image yellow Image fuchsia Image navy Image'",
+    ["BRAILLE LINE:  'silver Image yellow Image fuchsia Image navy Image'",
      "     VISIBLE:  'yellow Image fuchsia Image navy ', cursor=1",
-     "BRAILLE LINE:  'yellow Image'",
-     "     VISIBLE:  'yellow Image', cursor=0",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'yellow'",
      "SPEECH OUTPUT: 'yellow'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -458,9 +450,9 @@
 sequence.append(WaitForFocus("Color", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Close the Color menu", 
-    ["BUG? - Cursor position is wrong",
-     "BRAILLE LINE:  '<button> Button <input type='button'> Button Create Button View Button Create Button   Menu  $l Edit!    $l Color   Save Button   Menu Disabled Button'",
-     "     VISIBLE:  '<button> Button <input type='but', cursor=0",
+    ["BUG? - Why does it say Color twice?",
+     "BRAILLE LINE:  'Color Color Menu'",
+     "     VISIBLE:  'Color Color Menu', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Color menu'"]))
 
@@ -477,8 +469,8 @@
 sequence.append(WaitForFocus("Rich Text Test!", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the first unlabelled button ('+')", 
-    ["BRAILLE LINE:  'Rich Text Test! Button $l   Save Button   Menu'",
-     "     VISIBLE:  'Rich Text Test! Button $l   Save', cursor=1",
+    ["BRAILLE LINE:  'Rich Text Test! Button'",
+     "     VISIBLE:  'Rich Text Test! Button', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Rich Text Test! button'"]))
 
@@ -487,8 +479,8 @@
 sequence.append(WaitForFocus("Color", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the second unlabelled button ('Color')", 
-    ["BRAILLE LINE:  'Button  $l   Save Button   Menu'",
-     "     VISIBLE:  'Button  $l   Save Button   Menu', cursor=0",
+    ["BRAILLE LINE:  'Color Menu'",
+     "     VISIBLE:  'Color Menu', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Color menu'"]))
 
@@ -497,8 +489,8 @@
 sequence.append(WaitForFocus("Save", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the third unlabelled button ('Save')", 
-    ["BRAILLE LINE:  'Save Button   Menu'",
-     "     VISIBLE:  'Save Button   Menu', cursor=1",
+    ["BRAILLE LINE:  ' $l $lSave Button   Menu'",
+     "     VISIBLE:  ' $l $lSave Button   Menu', cursor=7",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Save button'"]))
 
@@ -507,8 +499,8 @@
 sequence.append(WaitForFocus("  ▼", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the down arrow button", 
-    ["BRAILLE LINE:  'Save Button   Menu'",
-     "     VISIBLE:  'Save Button   Menu', cursor=13",
+    ["BRAILLE LINE:  ' $l $lSave Button   Menu'",
+     "     VISIBLE:  ' $l $lSave Button   Menu', cursor=19",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: '  menu'"]))
 
@@ -520,8 +512,8 @@
 sequence.append(WaitForFocus("Toggle me", acc_role=pyatspi.ROLE_TOGGLE_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the 'Toggle me' toggle button", 
-    ["BRAILLE LINE:  '&=y Toggle me ToggleButton Toggle me Button'",
-     "     VISIBLE:  '&=y Toggle me ToggleButton Toggl', cursor=1",
+    ["BRAILLE LINE:  '&=y Toggle me ToggleButton'",
+     "     VISIBLE:  '&=y Toggle me ToggleButton', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Toggle me toggle button pressed'"]))
 
@@ -534,8 +526,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "Change the 'Toggle me' toggle button", 
-    ["BRAILLE LINE:  '& y Toggle me ToggleButton Toggle me Button'",
-     "     VISIBLE:  '& y Toggle me ToggleButton Toggl', cursor=1",
+    ["BRAILLE LINE:  '& y Toggle me ToggleButton'",
+     "     VISIBLE:  '& y Toggle me ToggleButton', cursor=1",
      "SPEECH OUTPUT: 'not pressed'"]))
 
 # Skip this toggle button - it isn't a toggle button.
@@ -550,8 +542,8 @@
 sequence.append(WaitForFocus("big", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the big button", 
-    ["BRAILLE LINE:  'big Button small Button long Button'",
-     "     VISIBLE:  'big Button small Button long But', cursor=1",
+    ["BRAILLE LINE:  'big Button'",
+     "     VISIBLE:  'big Button', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'big button'"]))
 
Index: test/keystrokes/firefox/tpg_aria_slider.py
===================================================================
--- test/keystrokes/firefox/tpg_aria_slider.py	(revision 4542)
+++ test/keystrokes/firefox/tpg_aria_slider.py	(working copy)
@@ -34,8 +34,8 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to Volume Slider", 
-    ["BRAILLE LINE:  'Volume Volume 0 $lVolume 0 % Slider'",
-     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
+    ["BRAILLE LINE:  ' $l Volume 0 $lVolume 0 % Slider'",
+     "     VISIBLE:  ' $l Volume 0 $lVolume 0 % Slider', cursor=16",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Volume slider 0 %'"]))
 
@@ -44,155 +44,155 @@
 sequence.append(utils.AssertPresentationAction(
     "Volume 1. Right Arrow", 
     ["BUG? - Lots of unneeded braille updating here and in the assertions that follow for the Volume slider. Just marking it here.",
-     "BRAILLE LINE:  'Volume Volume 0 $lVolume 0 % Slider'",
-     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 0 $lVolume 0 % Slider'",
-     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 1 $lVolume 1 % Slider'",
-     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
+     "BRAILLE LINE:  ' $l Volume 0 $lVolume 0 % Slider'",
+     "     VISIBLE:  ' $l Volume 0 $lVolume 0 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 0 $lVolume 0 % Slider'",
+     "     VISIBLE:  ' $l Volume 0 $lVolume 0 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 1 $lVolume 1 % Slider'",
+     "     VISIBLE:  ' $l Volume 1 $lVolume 1 % Slider', cursor=16",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 2. Right Arrow", 
-    ["BRAILLE LINE:  'Volume Volume 1 $lVolume 1 % Slider'",
-     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 1 $lVolume 1 % Slider'",
-     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 2 $lVolume 2 % Slider'",
-     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
+    ["BRAILLE LINE:  ' $l Volume 1 $lVolume 1 % Slider'",
+     "     VISIBLE:  ' $l Volume 1 $lVolume 1 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 1 $lVolume 1 % Slider'",
+     "     VISIBLE:  ' $l Volume 1 $lVolume 1 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 2 $lVolume 2 % Slider'",
+     "     VISIBLE:  ' $l Volume 2 $lVolume 2 % Slider', cursor=16",
      "SPEECH OUTPUT: '2 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 3. Right Arrow", 
-    ["BRAILLE LINE:  'Volume Volume 2 $lVolume 2 % Slider'",
-     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 2 $lVolume 2 % Slider'",
-     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 3 $lVolume 3 % Slider'",
-     "     VISIBLE:  'Volume 3 % Slider', cursor=1",
+    ["BRAILLE LINE:  ' $l Volume 2 $lVolume 2 % Slider'",
+     "     VISIBLE:  ' $l Volume 2 $lVolume 2 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 2 $lVolume 2 % Slider'",
+     "     VISIBLE:  ' $l Volume 2 $lVolume 2 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 3 $lVolume 3 % Slider'",
+     "     VISIBLE:  ' $l Volume 3 $lVolume 3 % Slider', cursor=16",
      "SPEECH OUTPUT: '3 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 1. Left Arrow", 
-    ["BRAILLE LINE:  'Volume Volume 3 $lVolume 3 % Slider'",
-     "     VISIBLE:  'Volume 3 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 3 $lVolume 3 % Slider'",
-     "     VISIBLE:  'Volume 3 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 2 $lVolume 2 % Slider'",
-     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
+    ["BRAILLE LINE:  ' $l Volume 3 $lVolume 3 % Slider'",
+     "     VISIBLE:  ' $l Volume 3 $lVolume 3 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 3 $lVolume 3 % Slider'",
+     "     VISIBLE:  ' $l Volume 3 $lVolume 3 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 2 $lVolume 2 % Slider'",
+     "     VISIBLE:  ' $l Volume 2 $lVolume 2 % Slider', cursor=16",
      "SPEECH OUTPUT: '2 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 2. Left Arrow", 
-    ["BRAILLE LINE:  'Volume Volume 2 $lVolume 2 % Slider'",
-     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 2 $lVolume 2 % Slider'",
-     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 1 $lVolume 1 % Slider'",
-     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
+    ["BRAILLE LINE:  ' $l Volume 2 $lVolume 2 % Slider'",
+     "     VISIBLE:  ' $l Volume 2 $lVolume 2 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 2 $lVolume 2 % Slider'",
+     "     VISIBLE:  ' $l Volume 2 $lVolume 2 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 1 $lVolume 1 % Slider'",
+     "     VISIBLE:  ' $l Volume 1 $lVolume 1 % Slider', cursor=16",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 3. Left Arrow", 
-    ["BRAILLE LINE:  'Volume Volume 1 $lVolume 1 % Slider'",
-     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 1 $lVolume 1 % Slider'",
-     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 0 $lVolume 0 % Slider'",
-     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
+    ["BRAILLE LINE:  ' $l Volume 1 $lVolume 1 % Slider'",
+     "     VISIBLE:  ' $l Volume 1 $lVolume 1 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 1 $lVolume 1 % Slider'",
+     "     VISIBLE:  ' $l Volume 1 $lVolume 1 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 0 $lVolume 0 % Slider'",
+     "     VISIBLE:  ' $l Volume 0 $lVolume 0 % Slider', cursor=16",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 1. Up Arrow", 
-    ["BRAILLE LINE:  'Volume Volume 0 $lVolume 0 % Slider'",
-     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 0 $lVolume 0 % Slider'",
-     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 1 $lVolume 1 % Slider'",
-     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
+    ["BRAILLE LINE:  ' $l Volume 0 $lVolume 0 % Slider'",
+     "     VISIBLE:  ' $l Volume 0 $lVolume 0 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 0 $lVolume 0 % Slider'",
+     "     VISIBLE:  ' $l Volume 0 $lVolume 0 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 1 $lVolume 1 % Slider'",
+     "     VISIBLE:  ' $l Volume 1 $lVolume 1 % Slider', cursor=16",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 2. Up Arrow", 
-    ["BRAILLE LINE:  'Volume Volume 1 $lVolume 1 % Slider'",
-     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 1 $lVolume 1 % Slider'",
-     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 2 $lVolume 2 % Slider'",
-     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
+    ["BRAILLE LINE:  ' $l Volume 1 $lVolume 1 % Slider'",
+     "     VISIBLE:  ' $l Volume 1 $lVolume 1 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 1 $lVolume 1 % Slider'",
+     "     VISIBLE:  ' $l Volume 1 $lVolume 1 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 2 $lVolume 2 % Slider'",
+     "     VISIBLE:  ' $l Volume 2 $lVolume 2 % Slider', cursor=16",
      "SPEECH OUTPUT: '2 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 3. Up Arrow", 
-    ["BRAILLE LINE:  'Volume Volume 2 $lVolume 2 % Slider'",
-     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 2 $lVolume 2 % Slider'",
-     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 3 $lVolume 3 % Slider'",
-     "     VISIBLE:  'Volume 3 % Slider', cursor=1",
+    ["BRAILLE LINE:  ' $l Volume 2 $lVolume 2 % Slider'",
+     "     VISIBLE:  ' $l Volume 2 $lVolume 2 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 2 $lVolume 2 % Slider'",
+     "     VISIBLE:  ' $l Volume 2 $lVolume 2 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 3 $lVolume 3 % Slider'",
+     "     VISIBLE:  ' $l Volume 3 $lVolume 3 % Slider', cursor=16",
      "SPEECH OUTPUT: '3 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 1. Down Arrow", 
-    ["BRAILLE LINE:  'Volume Volume 3 $lVolume 3 % Slider'",
-     "     VISIBLE:  'Volume 3 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 3 $lVolume 3 % Slider'",
-     "     VISIBLE:  'Volume 3 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 2 $lVolume 2 % Slider'",
-     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
+    ["BRAILLE LINE:  ' $l Volume 3 $lVolume 3 % Slider'",
+     "     VISIBLE:  ' $l Volume 3 $lVolume 3 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 3 $lVolume 3 % Slider'",
+     "     VISIBLE:  ' $l Volume 3 $lVolume 3 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 2 $lVolume 2 % Slider'",
+     "     VISIBLE:  ' $l Volume 2 $lVolume 2 % Slider', cursor=16",
      "SPEECH OUTPUT: '2 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 2. Down Arrow", 
-    ["BRAILLE LINE:  'Volume Volume 2 $lVolume 2 % Slider'",
-     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 2 $lVolume 2 % Slider'",
-     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 1 $lVolume 1 % Slider'",
-     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
+    ["BRAILLE LINE:  ' $l Volume 2 $lVolume 2 % Slider'",
+     "     VISIBLE:  ' $l Volume 2 $lVolume 2 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 2 $lVolume 2 % Slider'",
+     "     VISIBLE:  ' $l Volume 2 $lVolume 2 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 1 $lVolume 1 % Slider'",
+     "     VISIBLE:  ' $l Volume 1 $lVolume 1 % Slider', cursor=16",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 3. Down Arrow", 
-    ["BRAILLE LINE:  'Volume Volume 1 $lVolume 1 % Slider'",
-     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 1 $lVolume 1 % Slider'",
-     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 0 $lVolume 0 % Slider'",
-     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
+    ["BRAILLE LINE:  ' $l Volume 1 $lVolume 1 % Slider'",
+     "     VISIBLE:  ' $l Volume 1 $lVolume 1 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 1 $lVolume 1 % Slider'",
+     "     VISIBLE:  ' $l Volume 1 $lVolume 1 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 0 $lVolume 0 % Slider'",
+     "     VISIBLE:  ' $l Volume 0 $lVolume 0 % Slider', cursor=16",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Up"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 1. Page Up", 
-    ["BRAILLE LINE:  'Volume Volume 0 $lVolume 0 % Slider'",
-     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 0 $lVolume 0 % Slider'",
-     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 25 $lVolume 25 % Slider'",
+    ["BRAILLE LINE:  ' $l Volume 0 $lVolume 0 % Slider'",
+     "     VISIBLE:  ' $l Volume 0 $lVolume 0 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 0 $lVolume 0 % Slider'",
+     "     VISIBLE:  ' $l Volume 0 $lVolume 0 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 25 $lVolume 25 % Slider'",
      "     VISIBLE:  'Volume 25 % Slider', cursor=1",
      "SPEECH OUTPUT: '25 %'"]))
 
@@ -200,11 +200,11 @@
 sequence.append(KeyComboAction("Page_Up"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 2. Page Up", 
-    ["BRAILLE LINE:  'Volume Volume 25 $lVolume 25 % Slider'",
+    ["BRAILLE LINE:  ' $l Volume 25 $lVolume 25 % Slider'",
      "     VISIBLE:  'Volume 25 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 25 $lVolume 25 % Slider'",
+     "BRAILLE LINE:  ' $l Volume 25 $lVolume 25 % Slider'",
      "     VISIBLE:  'Volume 25 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 50 $lVolume 50 % Slider'",
+     "BRAILLE LINE:  ' $l Volume 50 $lVolume 50 % Slider'",
      "     VISIBLE:  'Volume 50 % Slider', cursor=1",
      "SPEECH OUTPUT: '50 %'"]))
 
@@ -212,11 +212,11 @@
 sequence.append(KeyComboAction("Page_Down"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 1. Page Down", 
-    ["BRAILLE LINE:  'Volume Volume 50 $lVolume 50 % Slider'",
+    ["BRAILLE LINE:  ' $l Volume 50 $lVolume 50 % Slider'",
      "     VISIBLE:  'Volume 50 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 50 $lVolume 50 % Slider'",
+     "BRAILLE LINE:  ' $l Volume 50 $lVolume 50 % Slider'",
      "     VISIBLE:  'Volume 50 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 25 $lVolume 25 % Slider'",
+     "BRAILLE LINE:  ' $l Volume 25 $lVolume 25 % Slider'",
      "     VISIBLE:  'Volume 25 % Slider', cursor=1",
      "SPEECH OUTPUT: '25 %'"]))
 
@@ -224,23 +224,23 @@
 sequence.append(KeyComboAction("Page_Down"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 2. Page Down", 
-     ["BRAILLE LINE:  'Volume Volume 25 $lVolume 25 % Slider'",
+    ["BRAILLE LINE:  ' $l Volume 25 $lVolume 25 % Slider'",
      "     VISIBLE:  'Volume 25 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 25 $lVolume 25 % Slider'",
+     "BRAILLE LINE:  ' $l Volume 25 $lVolume 25 % Slider'",
      "     VISIBLE:  'Volume 25 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 0 $lVolume 0 % Slider'",
-     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
+     "BRAILLE LINE:  ' $l Volume 0 $lVolume 0 % Slider'",
+     "     VISIBLE:  ' $l Volume 0 $lVolume 0 % Slider', cursor=16",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("End"))
 sequence.append(utils.AssertPresentationAction(
     "Volume End", 
-    ["BRAILLE LINE:  'Volume Volume 0 $lVolume 0 % Slider'",
-     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 0 $lVolume 0 % Slider'",
-     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 100 $lVolume 100 % Slider'",
+    ["BRAILLE LINE:  ' $l Volume 0 $lVolume 0 % Slider'",
+     "     VISIBLE:  ' $l Volume 0 $lVolume 0 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 0 $lVolume 0 % Slider'",
+     "     VISIBLE:  ' $l Volume 0 $lVolume 0 % Slider', cursor=16",
+     "BRAILLE LINE:  ' $l Volume 100 $lVolume 100 % Slider'",
      "     VISIBLE:  'Volume 100 % Slider', cursor=1",
      "SPEECH OUTPUT: '100 %'"]))
 
@@ -248,12 +248,12 @@
 sequence.append(KeyComboAction("Home"))
 sequence.append(utils.AssertPresentationAction(
     "Volume Home", 
-    ["BRAILLE LINE:  'Volume Volume 100 $lVolume 100 % Slider'",
+    ["BRAILLE LINE:  ' $l Volume 100 $lVolume 100 % Slider'",
      "     VISIBLE:  'Volume 100 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 100 $lVolume 100 % Slider'",
+     "BRAILLE LINE:  ' $l Volume 100 $lVolume 100 % Slider'",
      "     VISIBLE:  'Volume 100 % Slider', cursor=1",
-     "BRAILLE LINE:  'Volume Volume 0 $lVolume 0 % Slider'",
-     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
+     "BRAILLE LINE:  ' $l Volume 0 $lVolume 0 % Slider'",
+     "     VISIBLE:  ' $l Volume 0 $lVolume 0 % Slider', cursor=16",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -721,8 +721,8 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to Red Slider", 
-    ["BRAILLE LINE:  'Red Red 0 $lRed 0 % Slider'",
-     "     VISIBLE:  'Red Red 0 $lRed 0 % Slider', cursor=13",
+    ["BRAILLE LINE:  ' $l Red 0 $lRed 0 % Slider'",
+     "     VISIBLE:  ' $l Red 0 $lRed 0 % Slider', cursor=13",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Red slider 0 %'"]))
 
@@ -731,120 +731,120 @@
 sequence.append(utils.AssertPresentationAction(
     "Red 1. Right Arrow", 
     ["BUG? - Lots of unneeded braille updating here and in the assertions that follow for the Red slider. Just marking it here.",
-     "BRAILLE LINE:  'Red Red 0 $lRed 0 % Slider'",
-     "     VISIBLE:  'Red Red 0 $lRed 0 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 0 $lRed 0 % Slider'",
-     "     VISIBLE:  'Red Red 0 $lRed 0 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 1 $lRed 1 % Slider'",
-     "     VISIBLE:  'Red Red 1 $lRed 1 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 0 $lRed 0 % Slider'",
+     "     VISIBLE:  ' $l Red 0 $lRed 0 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 0 $lRed 0 % Slider'",
+     "     VISIBLE:  ' $l Red 0 $lRed 0 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 1 $lRed 1 % Slider'",
+     "     VISIBLE:  ' $l Red 1 $lRed 1 % Slider', cursor=13",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Red 2. Right Arrow", 
-    ["BRAILLE LINE:  'Red Red 1 $lRed 1 % Slider'",
-     "     VISIBLE:  'Red Red 1 $lRed 1 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 1 $lRed 1 % Slider'",
-     "     VISIBLE:  'Red Red 1 $lRed 1 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 2 $lRed 2 % Slider'",
-     "     VISIBLE:  'Red Red 2 $lRed 2 % Slider', cursor=13",
+    ["BRAILLE LINE:  ' $l Red 1 $lRed 1 % Slider'",
+     "     VISIBLE:  ' $l Red 1 $lRed 1 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 1 $lRed 1 % Slider'",
+     "     VISIBLE:  ' $l Red 1 $lRed 1 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 2 $lRed 2 % Slider'",
+     "     VISIBLE:  ' $l Red 2 $lRed 2 % Slider', cursor=13",
      "SPEECH OUTPUT: '2 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Red 3. Right Arrow", 
-    ["BRAILLE LINE:  'Red Red 2 $lRed 2 % Slider'",
-     "     VISIBLE:  'Red Red 2 $lRed 2 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 2 $lRed 2 % Slider'",
-     "     VISIBLE:  'Red Red 2 $lRed 2 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 3 $lRed 3 % Slider'",
-     "     VISIBLE:  'Red Red 3 $lRed 3 % Slider', cursor=13",
+    ["BRAILLE LINE:  ' $l Red 2 $lRed 2 % Slider'",
+     "     VISIBLE:  ' $l Red 2 $lRed 2 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 2 $lRed 2 % Slider'",
+     "     VISIBLE:  ' $l Red 2 $lRed 2 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 3 $lRed 3 % Slider'",
+     "     VISIBLE:  ' $l Red 3 $lRed 3 % Slider', cursor=13",
      "SPEECH OUTPUT: '3 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Red 1. Left Arrow", 
-    ["BRAILLE LINE:  'Red Red 3 $lRed 3 % Slider'",
-     "     VISIBLE:  'Red Red 3 $lRed 3 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 3 $lRed 3 % Slider'",
-     "     VISIBLE:  'Red Red 3 $lRed 3 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 2 $lRed 2 % Slider'",
-     "     VISIBLE:  'Red Red 2 $lRed 2 % Slider', cursor=13",
+    ["BRAILLE LINE:  ' $l Red 3 $lRed 3 % Slider'",
+     "     VISIBLE:  ' $l Red 3 $lRed 3 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 3 $lRed 3 % Slider'",
+     "     VISIBLE:  ' $l Red 3 $lRed 3 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 2 $lRed 2 % Slider'",
+     "     VISIBLE:  ' $l Red 2 $lRed 2 % Slider', cursor=13",
      "SPEECH OUTPUT: '2 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Red 2. Left Arrow", 
-    ["BRAILLE LINE:  'Red Red 2 $lRed 2 % Slider'",
-     "     VISIBLE:  'Red Red 2 $lRed 2 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 2 $lRed 2 % Slider'",
-     "     VISIBLE:  'Red Red 2 $lRed 2 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 1 $lRed 1 % Slider'",
-     "     VISIBLE:  'Red Red 1 $lRed 1 % Slider', cursor=13",
+    ["BRAILLE LINE:  ' $l Red 2 $lRed 2 % Slider'",
+     "     VISIBLE:  ' $l Red 2 $lRed 2 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 2 $lRed 2 % Slider'",
+     "     VISIBLE:  ' $l Red 2 $lRed 2 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 1 $lRed 1 % Slider'",
+     "     VISIBLE:  ' $l Red 1 $lRed 1 % Slider', cursor=13",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Red 3. Left Arrow", 
-    ["BRAILLE LINE:  'Red Red 1 $lRed 1 % Slider'",
-     "     VISIBLE:  'Red Red 1 $lRed 1 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 1 $lRed 1 % Slider'",
-     "     VISIBLE:  'Red Red 1 $lRed 1 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 0 $lRed 0 % Slider'",
-     "     VISIBLE:  'Red Red 0 $lRed 0 % Slider', cursor=13",
+    ["BRAILLE LINE:  ' $l Red 1 $lRed 1 % Slider'",
+     "     VISIBLE:  ' $l Red 1 $lRed 1 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 1 $lRed 1 % Slider'",
+     "     VISIBLE:  ' $l Red 1 $lRed 1 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 0 $lRed 0 % Slider'",
+     "     VISIBLE:  ' $l Red 0 $lRed 0 % Slider', cursor=13",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Red 1. Up Arrow", 
-    ["BRAILLE LINE:  'Red Red 0 $lRed 0 % Slider'",
-     "     VISIBLE:  'Red Red 0 $lRed 0 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 0 $lRed 0 % Slider'",
-     "     VISIBLE:  'Red Red 0 $lRed 0 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 1 $lRed 1 % Slider'",
-     "     VISIBLE:  'Red Red 1 $lRed 1 % Slider', cursor=13",
+    ["BRAILLE LINE:  ' $l Red 0 $lRed 0 % Slider'",
+     "     VISIBLE:  ' $l Red 0 $lRed 0 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 0 $lRed 0 % Slider'",
+     "     VISIBLE:  ' $l Red 0 $lRed 0 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 1 $lRed 1 % Slider'",
+     "     VISIBLE:  ' $l Red 1 $lRed 1 % Slider', cursor=13",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Red 2. Up Arrow", 
-    ["BRAILLE LINE:  'Red Red 1 $lRed 1 % Slider'",
-     "     VISIBLE:  'Red Red 1 $lRed 1 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 1 $lRed 1 % Slider'",
-     "     VISIBLE:  'Red Red 1 $lRed 1 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 2 $lRed 2 % Slider'",
-     "     VISIBLE:  'Red Red 2 $lRed 2 % Slider', cursor=13",
+    ["BRAILLE LINE:  ' $l Red 1 $lRed 1 % Slider'",
+     "     VISIBLE:  ' $l Red 1 $lRed 1 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 1 $lRed 1 % Slider'",
+     "     VISIBLE:  ' $l Red 1 $lRed 1 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 2 $lRed 2 % Slider'",
+     "     VISIBLE:  ' $l Red 2 $lRed 2 % Slider', cursor=13",
      "SPEECH OUTPUT: '2 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Red 3. Up Arrow", 
-    ["BRAILLE LINE:  'Red Red 2 $lRed 2 % Slider'",
-     "     VISIBLE:  'Red Red 2 $lRed 2 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 2 $lRed 2 % Slider'",
-     "     VISIBLE:  'Red Red 2 $lRed 2 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 3 $lRed 3 % Slider'",
-     "     VISIBLE:  'Red Red 3 $lRed 3 % Slider', cursor=13",
+    ["BRAILLE LINE:  ' $l Red 2 $lRed 2 % Slider'",
+     "     VISIBLE:  ' $l Red 2 $lRed 2 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 2 $lRed 2 % Slider'",
+     "     VISIBLE:  ' $l Red 2 $lRed 2 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 3 $lRed 3 % Slider'",
+     "     VISIBLE:  ' $l Red 3 $lRed 3 % Slider', cursor=13",
      "SPEECH OUTPUT: '3 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Red 1. Down Arrow", 
-    ["BRAILLE LINE:  'Red Red 3 $lRed 3 % Slider'",
-     "     VISIBLE:  'Red Red 3 $lRed 3 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 3 $lRed 3 % Slider'",
-     "     VISIBLE:  'Red Red 3 $lRed 3 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 2 $lRed 2 % Slider'",
-     "     VISIBLE:  'Red Red 2 $lRed 2 % Slider', cursor=13",
+    ["BRAILLE LINE:  ' $l Red 3 $lRed 3 % Slider'",
+     "     VISIBLE:  ' $l Red 3 $lRed 3 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 3 $lRed 3 % Slider'",
+     "     VISIBLE:  ' $l Red 3 $lRed 3 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 2 $lRed 2 % Slider'",
+     "     VISIBLE:  ' $l Red 2 $lRed 2 % Slider', cursor=13",
      "SPEECH OUTPUT: '2 %'"]))
 
 
@@ -852,96 +852,96 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Red 2. Down Arrow", 
-    ["BRAILLE LINE:  'Red Red 2 $lRed 2 % Slider'",
-     "     VISIBLE:  'Red Red 2 $lRed 2 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 2 $lRed 2 % Slider'",
-     "     VISIBLE:  'Red Red 2 $lRed 2 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 1 $lRed 1 % Slider'",
-     "     VISIBLE:  'Red Red 1 $lRed 1 % Slider', cursor=13",
+    ["BRAILLE LINE:  ' $l Red 2 $lRed 2 % Slider'",
+     "     VISIBLE:  ' $l Red 2 $lRed 2 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 2 $lRed 2 % Slider'",
+     "     VISIBLE:  ' $l Red 2 $lRed 2 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 1 $lRed 1 % Slider'",
+     "     VISIBLE:  ' $l Red 1 $lRed 1 % Slider', cursor=13",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Red 3. Down Arrow", 
-    ["BRAILLE LINE:  'Red Red 1 $lRed 1 % Slider'",
-     "     VISIBLE:  'Red Red 1 $lRed 1 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 1 $lRed 1 % Slider'",
-     "     VISIBLE:  'Red Red 1 $lRed 1 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 0 $lRed 0 % Slider'",
-     "     VISIBLE:  'Red Red 0 $lRed 0 % Slider', cursor=13",
+    ["BRAILLE LINE:  ' $l Red 1 $lRed 1 % Slider'",
+     "     VISIBLE:  ' $l Red 1 $lRed 1 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 1 $lRed 1 % Slider'",
+     "     VISIBLE:  ' $l Red 1 $lRed 1 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 0 $lRed 0 % Slider'",
+     "     VISIBLE:  ' $l Red 0 $lRed 0 % Slider', cursor=13",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Up"))
 sequence.append(utils.AssertPresentationAction(
     "Red 1. Page Up", 
-    ["BRAILLE LINE:  'Red Red 0 $lRed 0 % Slider'",
-     "     VISIBLE:  'Red Red 0 $lRed 0 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 0 $lRed 0 % Slider'",
-     "     VISIBLE:  'Red Red 0 $lRed 0 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 20 $lRed 20 % Slider'",
-     "     VISIBLE:  'Red Red 20 $lRed 20 % Slider', cursor=14",
+    ["BRAILLE LINE:  ' $l Red 0 $lRed 0 % Slider'",
+     "     VISIBLE:  ' $l Red 0 $lRed 0 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 0 $lRed 0 % Slider'",
+     "     VISIBLE:  ' $l Red 0 $lRed 0 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 20 $lRed 20 % Slider'",
+     "     VISIBLE:  ' $l Red 20 $lRed 20 % Slider', cursor=14",
      "SPEECH OUTPUT: '20 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Up"))
 sequence.append(utils.AssertPresentationAction(
     "Red 2. Page Up", 
-    ["BRAILLE LINE:  'Red Red 20 $lRed 20 % Slider'",
-     "     VISIBLE:  'Red Red 20 $lRed 20 % Slider', cursor=14",
-     "BRAILLE LINE:  'Red Red 20 $lRed 20 % Slider'",
-     "     VISIBLE:  'Red Red 20 $lRed 20 % Slider', cursor=14",
-     "BRAILLE LINE:  'Red Red 40 $lRed 40 % Slider'",
-     "     VISIBLE:  'Red Red 40 $lRed 40 % Slider', cursor=14",
+    ["BRAILLE LINE:  ' $l Red 20 $lRed 20 % Slider'",
+     "     VISIBLE:  ' $l Red 20 $lRed 20 % Slider', cursor=14",
+     "BRAILLE LINE:  ' $l Red 20 $lRed 20 % Slider'",
+     "     VISIBLE:  ' $l Red 20 $lRed 20 % Slider', cursor=14",
+     "BRAILLE LINE:  ' $l Red 40 $lRed 40 % Slider'",
+     "     VISIBLE:  ' $l Red 40 $lRed 40 % Slider', cursor=14",
      "SPEECH OUTPUT: '40 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Down"))
 sequence.append(utils.AssertPresentationAction(
     "Red 1. Page Down", 
-    ["BRAILLE LINE:  'Red Red 40 $lRed 40 % Slider'",
-     "     VISIBLE:  'Red Red 40 $lRed 40 % Slider', cursor=14",
-     "BRAILLE LINE:  'Red Red 40 $lRed 40 % Slider'",
-     "     VISIBLE:  'Red Red 40 $lRed 40 % Slider', cursor=14",
-     "BRAILLE LINE:  'Red Red 20 $lRed 20 % Slider'",
-     "     VISIBLE:  'Red Red 20 $lRed 20 % Slider', cursor=14",
+    ["BRAILLE LINE:  ' $l Red 40 $lRed 40 % Slider'",
+     "     VISIBLE:  ' $l Red 40 $lRed 40 % Slider', cursor=14",
+     "BRAILLE LINE:  ' $l Red 40 $lRed 40 % Slider'",
+     "     VISIBLE:  ' $l Red 40 $lRed 40 % Slider', cursor=14",
+     "BRAILLE LINE:  ' $l Red 20 $lRed 20 % Slider'",
+     "     VISIBLE:  ' $l Red 20 $lRed 20 % Slider', cursor=14",
      "SPEECH OUTPUT: '20 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Down"))
 sequence.append(utils.AssertPresentationAction(
     "Red 2. Page Down", 
-    ["BRAILLE LINE:  'Red Red 20 $lRed 20 % Slider'",
-     "     VISIBLE:  'Red Red 20 $lRed 20 % Slider', cursor=14",
-     "BRAILLE LINE:  'Red Red 20 $lRed 20 % Slider'",
-     "     VISIBLE:  'Red Red 20 $lRed 20 % Slider', cursor=14",
-     "BRAILLE LINE:  'Red Red 0 $lRed 0 % Slider'",
-     "     VISIBLE:  'Red Red 0 $lRed 0 % Slider', cursor=13",
+    ["BRAILLE LINE:  ' $l Red 20 $lRed 20 % Slider'",
+     "     VISIBLE:  ' $l Red 20 $lRed 20 % Slider', cursor=14",
+     "BRAILLE LINE:  ' $l Red 20 $lRed 20 % Slider'",
+     "     VISIBLE:  ' $l Red 20 $lRed 20 % Slider', cursor=14",
+     "BRAILLE LINE:  ' $l Red 0 $lRed 0 % Slider'",
+     "     VISIBLE:  ' $l Red 0 $lRed 0 % Slider', cursor=13",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("End"))
 sequence.append(utils.AssertPresentationAction(
     "Red End", 
-    ["BRAILLE LINE:  'Red Red 0 $lRed 0 % Slider'",
-     "     VISIBLE:  'Red Red 0 $lRed 0 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 0 $lRed 0 % Slider'",
-     "     VISIBLE:  'Red Red 0 $lRed 0 % Slider', cursor=13",
-     "BRAILLE LINE:  'Red Red 55 $lRed 55 % Slider'",
-     "     VISIBLE:  'Red Red 55 $lRed 55 % Slider', cursor=14",
+    ["BRAILLE LINE:  ' $l Red 0 $lRed 0 % Slider'",
+     "     VISIBLE:  ' $l Red 0 $lRed 0 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 0 $lRed 0 % Slider'",
+     "     VISIBLE:  ' $l Red 0 $lRed 0 % Slider', cursor=13",
+     "BRAILLE LINE:  ' $l Red 55 $lRed 55 % Slider'",
+     "     VISIBLE:  ' $l Red 55 $lRed 55 % Slider', cursor=14",
      "SPEECH OUTPUT: '55 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Home"))
 sequence.append(utils.AssertPresentationAction(
     "Red Home", 
-    ["BRAILLE LINE:  'Red Red 55 $lRed 55 % Slider'",
-     "     VISIBLE:  'Red Red 55 $lRed 55 % Slider', cursor=14",
-     "BRAILLE LINE:  'Red Red 55 $lRed 55 % Slider'",
-     "     VISIBLE:  'Red Red 55 $lRed 55 % Slider', cursor=14",
-     "BRAILLE LINE:  'Red Red 0 $lRed 0 % Slider'",
-     "     VISIBLE:  'Red Red 0 $lRed 0 % Slider', cursor=13",
+    ["BRAILLE LINE:  ' $l Red 55 $lRed 55 % Slider'",
+     "     VISIBLE:  ' $l Red 55 $lRed 55 % Slider', cursor=14",
+     "BRAILLE LINE:  ' $l Red 55 $lRed 55 % Slider'",
+     "     VISIBLE:  ' $l Red 55 $lRed 55 % Slider', cursor=14",
+     "BRAILLE LINE:  ' $l Red 0 $lRed 0 % Slider'",
+     "     VISIBLE:  ' $l Red 0 $lRed 0 % Slider', cursor=13",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(KeyComboAction("Tab"))
@@ -949,8 +949,8 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to Green Slider", 
-    ["BRAILLE LINE:  'Green Green 0 $lGreen 0 Slider'",
-     "     VISIBLE:  'Green Green 0 $lGreen 0 Slider', cursor=17",
+    ["BRAILLE LINE:  ' $l Green 0 $lGreen 0 Slider'",
+     "     VISIBLE:  ' $l Green 0 $lGreen 0 Slider', cursor=15",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Green slider 0'"]))
 
@@ -958,143 +958,143 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Green 1. Right Arrow", 
-    ["BRAILLE LINE:  'Green Green 1 $lGreen 1 Slider'",
-     "     VISIBLE:  'Green Green 1 $lGreen 1 Slider', cursor=17",
+    ["BRAILLE LINE:  ' $l Green 1 $lGreen 1 Slider'",
+     "     VISIBLE:  ' $l Green 1 $lGreen 1 Slider', cursor=15",
      "SPEECH OUTPUT: '1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Green 2. Right Arrow", 
-    ["BRAILLE LINE:  'Green Green 2 $lGreen 2 Slider'",
-     "     VISIBLE:  'Green Green 2 $lGreen 2 Slider', cursor=17",
+    ["BRAILLE LINE:  ' $l Green 2 $lGreen 2 Slider'",
+     "     VISIBLE:  ' $l Green 2 $lGreen 2 Slider', cursor=15",
      "SPEECH OUTPUT: '2'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Green 3. Right Arrow", 
-    ["BRAILLE LINE:  'Green Green 3 $lGreen 3 Slider'",
-     "     VISIBLE:  'Green Green 3 $lGreen 3 Slider', cursor=17",
+    ["BRAILLE LINE:  ' $l Green 3 $lGreen 3 Slider'",
+     "     VISIBLE:  ' $l Green 3 $lGreen 3 Slider', cursor=15",
      "SPEECH OUTPUT: '3'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Green 1. Left Arrow", 
-    ["BRAILLE LINE:  'Green Green 2 $lGreen 2 Slider'",
-     "     VISIBLE:  'Green Green 2 $lGreen 2 Slider', cursor=17",
+    ["BRAILLE LINE:  ' $l Green 2 $lGreen 2 Slider'",
+     "     VISIBLE:  ' $l Green 2 $lGreen 2 Slider', cursor=15",
      "SPEECH OUTPUT: '2'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Green 2. Left Arrow", 
-    ["BRAILLE LINE:  'Green Green 1 $lGreen 1 Slider'",
-     "     VISIBLE:  'Green Green 1 $lGreen 1 Slider', cursor=17",
+    ["BRAILLE LINE:  ' $l Green 1 $lGreen 1 Slider'",
+     "     VISIBLE:  ' $l Green 1 $lGreen 1 Slider', cursor=15",
      "SPEECH OUTPUT: '1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Green 3. Left Arrow", 
-    ["BRAILLE LINE:  'Green Green 0 $lGreen 0 Slider'",
-     "     VISIBLE:  'Green Green 0 $lGreen 0 Slider', cursor=17",
+    ["BRAILLE LINE:  ' $l Green 0 $lGreen 0 Slider'",
+     "     VISIBLE:  ' $l Green 0 $lGreen 0 Slider', cursor=15",
      "SPEECH OUTPUT: '0'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Green 1. Up Arrow", 
-    ["BRAILLE LINE:  'Green Green 1 $lGreen 1 Slider'",
-     "     VISIBLE:  'Green Green 1 $lGreen 1 Slider', cursor=17",
+    ["BRAILLE LINE:  ' $l Green 1 $lGreen 1 Slider'",
+     "     VISIBLE:  ' $l Green 1 $lGreen 1 Slider', cursor=15",
      "SPEECH OUTPUT: '1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Green 2. Up Arrow", 
-    ["BRAILLE LINE:  'Green Green 2 $lGreen 2 Slider'",
-     "     VISIBLE:  'Green Green 2 $lGreen 2 Slider', cursor=17",
+    ["BRAILLE LINE:  ' $l Green 2 $lGreen 2 Slider'",
+     "     VISIBLE:  ' $l Green 2 $lGreen 2 Slider', cursor=15",
      "SPEECH OUTPUT: '2'"]))
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Green 3. Up Arrow", 
-    ["BRAILLE LINE:  'Green Green 3 $lGreen 3 Slider'",
-     "     VISIBLE:  'Green Green 3 $lGreen 3 Slider', cursor=17",
+    ["BRAILLE LINE:  ' $l Green 3 $lGreen 3 Slider'",
+     "     VISIBLE:  ' $l Green 3 $lGreen 3 Slider', cursor=15",
      "SPEECH OUTPUT: '3'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Green 1. Down Arrow", 
-    ["BRAILLE LINE:  'Green Green 2 $lGreen 2 Slider'",
-     "     VISIBLE:  'Green Green 2 $lGreen 2 Slider', cursor=17",
+    ["BRAILLE LINE:  ' $l Green 2 $lGreen 2 Slider'",
+     "     VISIBLE:  ' $l Green 2 $lGreen 2 Slider', cursor=15",
      "SPEECH OUTPUT: '2'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Green 2. Down Arrow", 
-    ["BRAILLE LINE:  'Green Green 1 $lGreen 1 Slider'",
-     "     VISIBLE:  'Green Green 1 $lGreen 1 Slider', cursor=17",
+    ["BRAILLE LINE:  ' $l Green 1 $lGreen 1 Slider'",
+     "     VISIBLE:  ' $l Green 1 $lGreen 1 Slider', cursor=15",
      "SPEECH OUTPUT: '1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Green 3. Down Arrow", 
-    ["BRAILLE LINE:  'Green Green 0 $lGreen 0 Slider'",
-     "     VISIBLE:  'Green Green 0 $lGreen 0 Slider', cursor=17",
+    ["BRAILLE LINE:  ' $l Green 0 $lGreen 0 Slider'",
+     "     VISIBLE:  ' $l Green 0 $lGreen 0 Slider', cursor=15",
      "SPEECH OUTPUT: '0'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Up"))
 sequence.append(utils.AssertPresentationAction(
     "Green 1. Page Up", 
-    ["BRAILLE LINE:  'Green Green 64 $lGreen 64 Slider'",
-     "     VISIBLE:  'Green Green 64 $lGreen 64 Slider', cursor=18",
+    ["BRAILLE LINE:  ' $l Green 64 $lGreen 64 Slider'",
+     "     VISIBLE:  ' $l Green 64 $lGreen 64 Slider', cursor=16",
      "SPEECH OUTPUT: '64'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Up"))
 sequence.append(utils.AssertPresentationAction(
     "Green 2. Page Up", 
-    ["BRAILLE LINE:  'Green Green 128 $lGreen 128 Slider'",
-     "     VISIBLE:  'Green 128 Slider', cursor=1",
+    ["BRAILLE LINE:  ' $l Green 128 $lGreen 128 Slider'",
+     "     VISIBLE:  ' $l Green 128 $lGreen 128 Slider', cursor=1",
      "SPEECH OUTPUT: '128'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Down"))
 sequence.append(utils.AssertPresentationAction(
     "Green 1. Page Down", 
-    ["BRAILLE LINE:  'Green Green 64 $lGreen 64 Slider'",
-     "     VISIBLE:  'Green Green 64 $lGreen 64 Slider', cursor=18",
+    ["BRAILLE LINE:  ' $l Green 64 $lGreen 64 Slider'",
+     "     VISIBLE:  ' $l Green 64 $lGreen 64 Slider', cursor=16",
      "SPEECH OUTPUT: '64'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Down"))
 sequence.append(utils.AssertPresentationAction(
     "Green 2. Page Down", 
-    ["BRAILLE LINE:  'Green Green 0 $lGreen 0 Slider'",
-     "     VISIBLE:  'Green Green 0 $lGreen 0 Slider', cursor=17",
+    ["BRAILLE LINE:  ' $l Green 0 $lGreen 0 Slider'",
+     "     VISIBLE:  ' $l Green 0 $lGreen 0 Slider', cursor=15",
      "SPEECH OUTPUT: '0'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("End"))
 sequence.append(utils.AssertPresentationAction(
     "Green End", 
-    ["BRAILLE LINE:  'Green Green 255 $lGreen 255 Slider'",
-     "     VISIBLE:  'Green 255 Slider', cursor=1",
+    ["BRAILLE LINE:  ' $l Green 255 $lGreen 255 Slider'",
+     "     VISIBLE:  ' $l Green 255 $lGreen 255 Slider', cursor=1",
      "SPEECH OUTPUT: '255'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Home"))
 sequence.append(utils.AssertPresentationAction(
     "Green Home", 
-    ["BRAILLE LINE:  'Green Green 0 $lGreen 0 Slider'",
-     "     VISIBLE:  'Green Green 0 $lGreen 0 Slider', cursor=17",
+    ["BRAILLE LINE:  ' $l Green 0 $lGreen 0 Slider'",
+     "     VISIBLE:  ' $l Green 0 $lGreen 0 Slider', cursor=15",
      "SPEECH OUTPUT: '0'"]))
 
 sequence.append(KeyComboAction("Tab"))
@@ -1256,7 +1256,9 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to Vertical Slider", 
-    ["BRAILLE LINE:  'Minimum Filesize 0 units Slider'",
+    ["BRAILLE LINE:  '0 $l'",
+     "     VISIBLE:  '0 $l', cursor=0",
+     "BRAILLE LINE:  'Minimum Filesize 0 units Slider'",
      "     VISIBLE:  'Minimum Filesize 0 units Slider', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Minimum Filesize slider 0 units'"]))
Index: test/keystrokes/firefox/uiuc_alert.py
===================================================================
--- test/keystrokes/firefox/uiuc_alert.py	(revision 4542)
+++ test/keystrokes/firefox/uiuc_alert.py	(working copy)
@@ -59,10 +59,21 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
+    "Down arrow past message", 
+    ["BUG? - This is not ideal",
+     "BRAILLE LINE:  'Alert Box Alert Box Alert'",
+     "     VISIBLE:  'Alert Box Alert Box Alert', cursor=0",
+     "SPEECH OUTPUT: 'Alert Box12 is not between 1 and 10'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(PauseAction(3000))
+sequence.append(utils.AssertPresentationAction(
     "Down to close button", 
-    ["BRAILLE LINE:  'Close Button'",
-     "     VISIBLE:  'Close Button', cursor=1",
-     "SPEECH OUTPUT: 'Close button'"]))
+    ["BUG? - The close button gets focus, but we're not presenting it"]))
+#     "BRAILLE LINE:  'Close Button'",
+#     "     VISIBLE:  'Close Button', cursor=1",
+#     "SPEECH OUTPUT: 'Close button'"]))
 
 ########################################################################
 # Close the alert.
Index: test/keystrokes/firefox/codetalks_button.py
===================================================================
--- test/keystrokes/firefox/codetalks_button.py	(revision 4542)
+++ test/keystrokes/firefox/codetalks_button.py	(working copy)
@@ -51,7 +51,7 @@
 sequence.append(WaitForFocus("Check Now", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to Check Now push button",
-    ["BRAILLE LINE:  'Check Now Button Check to see if your order has been shipped.'",
+    ["BRAILLE LINE:  'Check Now Button Check to see if your order has been shipped.  $l'",
      "     VISIBLE:  'Check Now Button Check to see if', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Check Now button'"]))
@@ -65,7 +65,7 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereamI", 
-    ["BRAILLE LINE:  'Check Now Button Check to see if your order has been shipped.'",
+    ["BRAILLE LINE:  'Check Now Button Check to see if your order has been shipped.  $l'",
      "     VISIBLE:  'Check Now Button Check to see if', cursor=1",
      "SPEECH OUTPUT: 'Check Now'",
      "SPEECH OUTPUT: 'button'",
@@ -99,10 +99,10 @@
     "Dismiss dialog", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application ARIA Button - " + utils.firefoxFrameNames + " Frame'",
      "     VISIBLE:  'ARIA Button - [3.a-zA-Z ]+', cursor=1",
-     "BRAILLE LINE:  'Check Now Button Check to see if your order has been shipped.'",
+     "BRAILLE LINE:  'Check Now Button Check to see if your order has been shipped.  $l'",
      "     VISIBLE:  'Check Now Button Check to see if', cursor=1",
      "SPEECH OUTPUT: 'ARIA Button - " + utils.firefoxFrameNames + " frame'",
-     "SPEECH OUTPUT: 'Check Now button Check to see if your order has been shipped. text'"]))
+     "SPEECH OUTPUT: 'Check Now button Check to see if your order has been shipped. text Check to see if your order has been shipped.'"]))
 
 ########################################################################
 # Close the demo
Index: test/keystrokes/firefox/moz_slider.py
===================================================================
--- test/keystrokes/firefox/moz_slider.py	(revision 4542)
+++ test/keystrokes/firefox/moz_slider.py	(working copy)
@@ -33,7 +33,7 @@
 sequence.append(utils.AssertPresentationAction(
     "tab to slider", 
     ["BUG? - Assuming we want to display the full slider line, including the numbers on either side, we should have a space in between the 0 and the Move for this and subsequent assertions",
-     "BRAILLE LINE:  '0Move slider left Button 10% Slider Move slider right Button 100'",
+     "BRAILLE LINE:  'Move slider left Button 10% Slider Move slider right Button'",
      "     VISIBLE:  '10% Slider Move slider right But', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'My slider slider 10%'"]))
@@ -46,7 +46,7 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  '0Move slider left Button 10% Slider Move slider right Button 100'",
+    ["BRAILLE LINE:  'Move slider left Button 10% Slider Move slider right Button'",
      "     VISIBLE:  '10% Slider Move slider right But', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'slider'",
@@ -66,7 +66,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "0 move slider", 
-    ["BRAILLE LINE:  '0Move slider left Button $15.00 Slider Move slider right Button 100'",
+    ["BRAILLE LINE:  'Move slider left Button $15.00 Slider Move slider right Button'",
      "     VISIBLE:  '$15.00 Slider Move slider right ', cursor=1",
      "SPEECH OUTPUT: '$15.00'"]))
                                
@@ -79,7 +79,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "1 move slider", 
-    ["BRAILLE LINE:  '0Move slider left Button $20.00 Slider Move slider right Button 100'",
+    ["BRAILLE LINE:  'Move slider left Button $20.00 Slider Move slider right Button'",
      "     VISIBLE:  '$20.00 Slider Move slider right ', cursor=1",
      "SPEECH OUTPUT: '$20.00'"]))
                               
@@ -92,7 +92,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "2 move slider", 
-    ["BRAILLE LINE:  '0Move slider left Button $25.00 Slider Move slider right Button 100'",
+    ["BRAILLE LINE:  'Move slider left Button $25.00 Slider Move slider right Button'",
      "     VISIBLE:  '$25.00 Slider Move slider right ', cursor=1",
      "SPEECH OUTPUT: '$25.00'"]))
                                      
@@ -105,7 +105,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "3 move slider", 
-    ["BRAILLE LINE:  '0Move slider left Button $30.00 Slider Move slider right Button 100'",
+    ["BRAILLE LINE:  'Move slider left Button $30.00 Slider Move slider right Button'",
      "     VISIBLE:  '$30.00 Slider Move slider right ', cursor=1",
      "SPEECH OUTPUT: '$30.00'"]))
                                
@@ -118,7 +118,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "4 move slider", 
-    ["BRAILLE LINE:  '0Move slider left Button $25.00 Slider Move slider right Button 100'",
+    ["BRAILLE LINE:  'Move slider left Button $25.00 Slider Move slider right Button'",
      "     VISIBLE:  '$25.00 Slider Move slider right ', cursor=1",
      "SPEECH OUTPUT: '$25.00'"]))
                                        
@@ -131,7 +131,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "5 move slider", 
-    ["BRAILLE LINE:  '0Move slider left Button $20.00 Slider Move slider right Button 100'",
+    ["BRAILLE LINE:  'Move slider left Button $20.00 Slider Move slider right Button'",
      "     VISIBLE:  '$20.00 Slider Move slider right ', cursor=1",
      "SPEECH OUTPUT: '$20.00'"]))
                                      
@@ -144,7 +144,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "6 move slider", 
-    ["BRAILLE LINE:  '0Move slider left Button $15.00 Slider Move slider right Button 100'",
+    ["BRAILLE LINE:  'Move slider left Button $15.00 Slider Move slider right Button'",
      "     VISIBLE:  '$15.00 Slider Move slider right ', cursor=1",
      "SPEECH OUTPUT: '$15.00'"]))                           
   
@@ -157,7 +157,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "7 move slider", 
-    ["BRAILLE LINE:  '0Move slider left Button $10.00 Slider Move slider right Button 100'",
+    ["BRAILLE LINE:  'Move slider left Button $10.00 Slider Move slider right Button'",
      "     VISIBLE:  '$10.00 Slider Move slider right ', cursor=1",
      "SPEECH OUTPUT: '$10.00'"]))   
                             
@@ -172,7 +172,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "move slider end", 
-    ["BRAILLE LINE:  '0Move slider left Button $100.00 Slider Move slider right Button 100'",
+    ["BRAILLE LINE:  'Move slider left Button $100.00 Slider Move slider right Button'",
      "     VISIBLE:  '$100.00 Slider Move slider right', cursor=1",
      "SPEECH OUTPUT: '$100.00'"]))
                                
@@ -187,7 +187,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "move slider home", 
-    ["BRAILLE LINE:  '0Move slider left Button $0.00 Slider Move slider right Button 100'",
+    ["BRAILLE LINE:  'Move slider left Button $0.00 Slider Move slider right Button'",
      "     VISIBLE:  '$0.00 Slider Move slider right B', cursor=1",
      "SPEECH OUTPUT: '$0.00'"]))
 
Index: test/keystrokes/firefox/uiuc_tree.py
===================================================================
--- test/keystrokes/firefox/uiuc_tree.py	(revision 4542)
+++ test/keystrokes/firefox/uiuc_tree.py	(working copy)
@@ -197,9 +197,8 @@
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "collapse vegetables", 
-    ["BUG? - If Panel shouldn't be in the context, perhaps a braille generator should be preventing it??",
-     "BRAILLE LINE:  'Vegetables ListItem Panel'",
-     "     VISIBLE:  'Vegetables ListItem Panel', cursor=1",
+    ["BRAILLE LINE:  'Vegetables ListItem'",
+     "     VISIBLE:  'Vegetables ListItem', cursor=1",
      "SPEECH OUTPUT: 'collapsed'"]))
 
 ########################################################################
Index: test/keystrokes/firefox/dojo_bug_570566.py
===================================================================
--- test/keystrokes/firefox/dojo_bug_570566.py	(revision 4542)
+++ test/keystrokes/firefox/dojo_bug_570566.py	(working copy)
@@ -60,14 +60,6 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "2. Up Arrow", 
-    ["BRAILLE LINE:  'Created from div h2'",
-     "     VISIBLE:  'Created from div h2', cursor=1",
-     "SPEECH OUTPUT: 'Created from div heading level 2'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "3. Up Arrow", 
     ["BRAILLE LINE:  'Editor + Plugins Test h1'",
      "     VISIBLE:  'Editor + Plugins Test h1', cursor=1",
      "SPEECH OUTPUT: 'Editor + Plugins Test heading level 1'"]))
@@ -75,7 +67,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "4. Up Arrow", 
+    "3. Up Arrow", 
     ["BUG? - The braille is not ideal, nor does it jive with the speech.",
      "BRAILLE LINE:  '<x> CheckBox<x> CheckBox<x> CheckBox<x> CheckBox<x> CheckBox'",
      "     VISIBLE:  '', cursor=1",
@@ -84,7 +76,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "5. Up Arrow", 
+    "4. Up Arrow", 
     ["BRAILLE LINE:  'Focus:<x> CheckBox Value:<x> CheckBox Change:<x> CheckBox Blur:<x> CheckBox Disabled:<x> CheckBox'",
      "     VISIBLE:  'Focus:<x> CheckBox Value:<x> Che', cursor=1",
      "SPEECH OUTPUT: 'Focus: check box checked grayed  Value: check box checked grayed  Change: check box checked grayed  Blur: check box checked grayed  Disabled: check box checked grayed  ",
@@ -93,7 +85,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "6. Up Arrow", 
+    "5. Up Arrow", 
     ["BRAILLE LINE:  'Automated Test - all check boxes should be checked'",
      "     VISIBLE:  'Automated Test - all check boxes', cursor=1",
      "SPEECH OUTPUT: 'Automated Test - all check boxes should be checked'"]))
Index: test/keystrokes/firefox/moz_tabpanel.py
===================================================================
--- test/keystrokes/firefox/moz_tabpanel.py	(revision 4542)
+++ test/keystrokes/firefox/moz_tabpanel.py	(working copy)
@@ -52,7 +52,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to tab 2", 
-    ["BRAILLE LINE:  'Tab Zero Page Tab One Page Tab Two Page Tab Three Page Tab Four Page Tab Zero Page'",
+    ["BRAILLE LINE:  'Tab Zero Page Tab One Page Tab Two Page Tab Three Page Tab Four Page'",
      "     VISIBLE:  'Tab One Page Tab Two Page Tab Th', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Tab One page'"]))
@@ -63,7 +63,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to tab 3", 
-    ["BRAILLE LINE:  'Tab Zero Page Tab One Page Tab Two Page Tab Three Page Tab Four Page Tab One Page'",
+    ["BRAILLE LINE:  'Tab Zero Page Tab One Page Tab Two Page Tab Three Page Tab Four Page'",
      "     VISIBLE:  'Tab Two Page Tab Three Page Tab ', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Tab Two page'"]))
@@ -97,8 +97,8 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to tab 4", 
-    ["BRAILLE LINE:  'Tab Zero Page Tab One Page Tab Two Page Tab Three Page Tab Four Page Tab Two Page'",
-     "     VISIBLE:  'Tab Three Page Tab Four Page Tab', cursor=1",
+    ["BRAILLE LINE:  'Tab Zero Page Tab One Page Tab Two Page Tab Three Page Tab Four Page'",
+     "     VISIBLE:  'Tab Three Page Tab Four Page', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Tab Three page'"]))
 ########################################################################
Index: test/keystrokes/firefox/dojo_panel_text.py
===================================================================
--- test/keystrokes/firefox/dojo_panel_text.py	(revision 4542)
+++ test/keystrokes/firefox/dojo_panel_text.py	(working copy)
@@ -29,9 +29,13 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction(" "))
+sequence.append(WaitForFocus("First tab"))
 sequence.append(utils.AssertPresentationAction(
     "Space to press the Show TabContainer Dialog", 
-    ["BUG? - A dialog has appeared. Shouldn't we say something?"]))
+    ["BRAILLE LINE:  'First tab Page Image Second tab Page Image'",
+     "     VISIBLE:  'First tab Page Image Second tab ', cursor=1",
+     "SPEECH OUTPUT: 'TabContainer Dialog dialog'",
+     "SPEECH OUTPUT: 'First tab page'"]))
 
 ########################################################################
 # Right Arrow to the Second tab page
@@ -65,6 +69,12 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Down Arrow", 
+    ["BUG? - We're quiet here."]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "2. Down Arrow", 
     ["BRAILLE LINE:  'Make it overflow. ipsum dolor sit amet, consectetuer adipiscing elit.'",
      "     VISIBLE:  'Make it overflow. ipsum dolor si', cursor=1",
      "SPEECH OUTPUT: 'Make it overflow. ipsum dolor sit amet link , consectetuer adipiscing elit.'"]))
@@ -72,7 +82,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "2. Down Arrow", 
+    "3. Down Arrow", 
     ["BRAILLE LINE:  'Aenean semper sagittis velit. Cras in mi. Duis porta mauris ut'",
      "     VISIBLE:  'Aenean semper sagittis velit. Cr', cursor=1",
      "SPEECH OUTPUT: 'Aenean semper sagittis velit. Cras in mi. Duis porta mauris ut'"]))
@@ -80,7 +90,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "3. Down Arrow", 
+    "4. Down Arrow", 
     ["BRAILLE LINE:  'ligula. Proin porta rutrum lacus. Etiam consequat scelerisque'",
      "     VISIBLE:  'ligula. Proin porta rutrum lacus', cursor=1",
      "SPEECH OUTPUT: 'ligula. Proin porta rutrum lacus. Etiam consequat scelerisque'"]))
@@ -88,7 +98,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "4. Down Arrow", 
+    "5. Down Arrow", 
     ["BRAILLE LINE:  'quam. Nulla facilisi. Maecenas luctus venenatis nulla. In sit amet'",
      "     VISIBLE:  'quam. Nulla facilisi. Maecenas l', cursor=1",
      "SPEECH OUTPUT: 'quam. Nulla facilisi. Maecenas luctus venenatis nulla. In sit amet'"]))
@@ -96,7 +106,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "5. Down Arrow", 
+    "6. Down Arrow", 
     ["BRAILLE LINE:  'dui non mi semper iaculis. Sed molestie tortor at ipsum. Morbi'",
      "     VISIBLE:  'dui non mi semper iaculis. Sed m', cursor=1",
      "SPEECH OUTPUT: 'dui non mi semper iaculis. Sed molestie tortor at ipsum. Morbi'"]))
Index: test/keystrokes/firefox/dojo_combo_box.py
===================================================================
--- test/keystrokes/firefox/dojo_combo_box.py	(revision 4542)
+++ test/keystrokes/firefox/dojo_combo_box.py	(working copy)
@@ -38,9 +38,8 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the first combo box", 
-    ["BUG? - Too verbose. This is true for all of the assertions, but I'm only marking it here.",
-     "BRAILLE LINE:  'US State test 1 California $l'",
-     "     VISIBLE:  'US State test 1 California $l', cursor=0",
+    ["BRAILLE LINE:  '  US State test 1 California $l'",
+     "     VISIBLE:  '  US State test 1 California $l', cursor=0",
      "SPEECH OUTPUT: 'US State test 1 combo box'",
      "SPEECH OUTPUT: 'US State test 1 text California selected'"]))
 
@@ -51,12 +50,11 @@
 sequence.append(TypeAction("C"))
 sequence.append(utils.AssertPresentationAction(
     "Replace existing text with a 'C'", 
-    ["BRAILLE LINE:  'US State test 1 California $l'",
-     "     VISIBLE:  'US State test 1 California $l', cursor=0",
-     "BRAILLE LINE:  'US State test 1 C $l'",
-     "     VISIBLE:  'US State test 1 C $l', cursor=0",
-     "BRAILLE LINE:  'US State test 1 C $l'",
-     "     VISIBLE:  'US State test 1 C $l', cursor=0",
+    ["BUG? - At this point, the entry expands into a combo box with three items showing. We speak them all. We should instead indicate that this object is expanded, similar to what we do with autocompletes.",
+     "BRAILLE LINE:  '  US State test 1 California $l'",
+     "     VISIBLE:  '  US State test 1 California $l', cursor=0",
+     "BRAILLE LINE:  '  US State test 1 C $l'",
+     "     VISIBLE:  '  US State test 1 C $l', cursor=0",
      "SPEECH OUTPUT: '• California• Colorado• Connecticut'"]))
 
 ########################################################################
@@ -67,64 +65,39 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Down Arrow", 
-    ["BRAILLE LINE:  'US State test 1 C $l'",
-     "     VISIBLE:  'US State test 1 C $l', cursor=0",
+    ["BRAILLE LINE:  '  US State test 1 C $l'",
+     "     VISIBLE:  '  US State test 1 C $l', cursor=0",
      "BRAILLE LINE:  '• California'",
      "     VISIBLE:  '• California', cursor=1",
-     "BRAILLE LINE:  'US State test 1 California $l'",
-     "     VISIBLE:  'US State test 1 California $l', cursor=0",
-     "BRAILLE LINE:  'US State test 1 California $l'",
-     "     VISIBLE:  'US State test 1 California $l', cursor=0",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: '• California'",
-     "SPEECH OUTPUT: 'California'"]))
+     "SPEECH OUTPUT: '• California'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down Arrow", 
-    ["BRAILLE LINE:  'US State test 1 California $l'",
-     "     VISIBLE:  'US State test 1 California $l', cursor=0",
-     "BRAILLE LINE:  'US State test 1 C $l'",
-     "     VISIBLE:  'US State test 1 C $l', cursor=0",
-     "BRAILLE LINE:  'US State test 1 Colorado $l'",
-     "     VISIBLE:  'US State test 1 Colorado $l', cursor=0",
-     "BRAILLE LINE:  '• Colorado'",
+    ["BRAILLE LINE:  '• Colorado'",
      "     VISIBLE:  '• Colorado', cursor=1",
-     "BRAILLE LINE:  'US State test 1 Colorado $l'",
-     "     VISIBLE:  'US State test 1 Colorado $l', cursor=0",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: '• Colorado'",
-     "SPEECH OUTPUT: 'Colorado'"]))
+     "SPEECH OUTPUT: '• Colorado'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Down Arrow", 
-    ["BRAILLE LINE:  'US State test 1 Colorado $l'",
-     "     VISIBLE:  'US State test 1 Colorado $l', cursor=0",
-     "BRAILLE LINE:  'US State test 1 C $l'",
-     "     VISIBLE:  'US State test 1 C $l', cursor=0",
-     "BRAILLE LINE:  'US State test 1 (200% Courier font):   US State test 1 Connecticut $l'",
-     "     VISIBLE:  'US State test 1 Connecticut $l', cursor=28",
-     "BRAILLE LINE:  '• Connecticut'",
+    ["BRAILLE LINE:  '• Connecticut'",
      "     VISIBLE:  '• Connecticut', cursor=1",
-     "BRAILLE LINE:  'US State test 1 Connecticut $l'",
-     "     VISIBLE:  'US State test 1 Connecticut $l', cursor=0",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: '• Connecticut'",
-     "SPEECH OUTPUT: 'Connecticut'"]))
+     "SPEECH OUTPUT: '• Connecticut'"]))
 
+# Note that not saying anything here is correct because we're already at
+# the end of the expanded combo box thus pressing Down doesn't move us.
+#
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Down Arrow", 
-    ["BRAILLE LINE:  'US State test 1 Connecticut $l'",
-     "     VISIBLE:  'US State test 1 Connecticut $l', cursor=0",
-     "BRAILLE LINE:  'US State test 1 C $l'",
-     "     VISIBLE:  'US State test 1 C $l', cursor=0",
-     "BRAILLE LINE:  'US State test 1 Connecticut $l'",
-     "     VISIBLE:  'US State test 1 Connecticut $l', cursor=0"]))
+    [""]))
 
 ########################################################################
 # Up Arrow amongst the newly-displayed items. One should not be able
@@ -134,48 +107,28 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "1. Up Arrow", 
-    ["BRAILLE LINE:  'US State test 1 Connecticut $l'",
-     "     VISIBLE:  'US State test 1 Connecticut $l', cursor=0",
-     "BRAILLE LINE:  'US State test 1 C $l'",
-     "     VISIBLE:  'US State test 1 C $l', cursor=0",
-     "BRAILLE LINE:  'US State test 1 Colorado $l'",
-     "     VISIBLE:  'US State test 1 Colorado $l', cursor=0",
-     "BRAILLE LINE:  '• Colorado'",
+    ["BRAILLE LINE:  '• Colorado'",
      "     VISIBLE:  '• Colorado', cursor=1",
-     "BRAILLE LINE:  'US State test 1 Colorado $l'",
-     "     VISIBLE:  'US State test 1 Colorado $l', cursor=0",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: '• Colorado'",
-     "SPEECH OUTPUT: 'Colorado'"]))
+     "SPEECH OUTPUT: '• Colorado'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "2. Up Arrow", 
-    ["BRAILLE LINE:  'US State test 1 Colorado $l'",
-     "     VISIBLE:  'US State test 1 Colorado $l', cursor=0",
-     "BRAILLE LINE:  'US State test 1 C $l'",
-     "     VISIBLE:  'US State test 1 C $l', cursor=0",
-     "BRAILLE LINE:  'US State test 1 (200% Courier font):   US State test 1 California $l'",
-     "     VISIBLE:  'US State test 1 California $l', cursor=27",
-     "BRAILLE LINE:  '• California'",
+    ["BRAILLE LINE:  '• California'",
      "     VISIBLE:  '• California', cursor=1",
-     "BRAILLE LINE:  'US State test 1 California $l'",
-     "     VISIBLE:  'US State test 1 California $l', cursor=0",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: '• California'",
-     "SPEECH OUTPUT: 'California'"]))
+     "SPEECH OUTPUT: '• California'"]))
 
+# Note that not saying anything here is correct because we're already at
+# the top of the expanded combo box thus pressing Up doesn't move us.
+#
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "3. Up Arrow", 
-    ["BRAILLE LINE:  'US State test 1 California $l'",
-     "     VISIBLE:  'US State test 1 California $l', cursor=0",
-     "BRAILLE LINE:  'US State test 1 C $l'",
-     "     VISIBLE:  'US State test 1 C $l', cursor=0",
-     "BRAILLE LINE:  'US State test 1 California $l'",
-     "     VISIBLE:  'US State test 1 California $l', cursor=0"]))
+    [""]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.  
@@ -185,14 +138,11 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I - Combo box expanded", 
-    ["BUG? - No indication that this is a combo box",
-     "BRAILLE LINE:  'US State test 1 California $l'",
-     "     VISIBLE:  'US State test 1 California $l', cursor=0",
-     "SPEECH OUTPUT: 'US State test 1'",
-     "SPEECH OUTPUT: 'text'",
-     "SPEECH OUTPUT: 'alifornia'",
-     "SPEECH OUTPUT: 'selected'",
-     "SPEECH OUTPUT: ''"]))
+    ["BRAILLE LINE:  '• California'",
+     "     VISIBLE:  '• California', cursor=1",
+     "SPEECH OUTPUT: 'list item'",
+     "SPEECH OUTPUT: '• California'",
+     "SPEECH OUTPUT: 'item 1 of 3'"]))
 
 ########################################################################
 # Escape to collapse the combo box.
@@ -201,7 +151,10 @@
 sequence.append(KeyComboAction("Escape"))
 sequence.append(utils.AssertPresentationAction(
     "Escape", 
-    [""]))
+    ["BRAILLE LINE:  '  US State test 1 California $l'",
+     "     VISIBLE:  '  US State test 1 California $l', cursor=0",
+     "SPEECH OUTPUT: 'US State test 1 combo box'",
+     "SPEECH OUTPUT: 'US State test 1 text California selected'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.  
@@ -210,10 +163,9 @@
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
-    "Basic Where Am I - Combo box collapsed", 
-    ["BUG? - Should we indicate that we're in a combo box now that it is collapsed?",
-    "BRAILLE LINE:  'US State test 1 California $l'",
-     "     VISIBLE:  'US State test 1 California $l', cursor=0",
+    "Basic Where Am I - Combo box collapsed back into an entry", 
+    ["BRAILLE LINE:  '  US State test 1 California $l'",
+     "     VISIBLE:  '  US State test 1 California $l', cursor=0",
      "SPEECH OUTPUT: 'US State test 1'",
      "SPEECH OUTPUT: 'text'",
      "SPEECH OUTPUT: 'alifornia'",
Index: src/orca/scripts/toolkits/Gecko/script.py
===================================================================
--- src/orca/scripts/toolkits/Gecko/script.py	(revision 4542)
+++ src/orca/scripts/toolkits/Gecko/script.py	(working copy)
@@ -1427,37 +1427,10 @@
                     #
                     return
 
-            elif self.isAriaWidget(event.source) \
-                 or self.isAriaWidget(event.source.parent):
-                # If it's not focusable, it's bogus.
-                #
-                if not eventSourceState.contains(pyatspi.STATE_FOCUSABLE):
+            elif not self.isNavigableAria(event.source):
+                if script_settings.controlCaretNavigation:
                     return
 
-                # Sometimes we get extra caret-moved events. See bug #471878
-                # and Mozilla bug #394318. However, we cannot do a blanket
-                # ignore of all caret-moved events.  See bug #539075 as an
-                # example.
-                #
-                if event.detail1 == 0 and not string in ["Left", "Home"] \
-                   or eventSourceRole in [pyatspi.ROLE_PAGE_TAB,
-                                          pyatspi.ROLE_LIST_ITEM,
-                                          pyatspi.ROLE_MENU_ITEM,
-                                          pyatspi.ROLE_PUSH_BUTTON,
-                                          pyatspi.ROLE_TOGGLE_BUTTON]:
-                    # A focus:/object:state-changed:focused event should
-                    # pick up this case.
-                    #
-                    return
-                elif eventSourceRole == pyatspi.ROLE_SPIN_BUTTON \
-                    and string in ["Up", "Down"]:
-                    # Ignore this bogus event.
-                    #
-                    return
-                else:
-                    self.setCaretContext(event.source, event.detail1)
-                    orca.setLocusOfFocus(event, event.source, False)
-
             elif self.isAriaWidget(orca_state.locusOfFocus) \
                  and self.isSameObject(event.source,
                                        orca_state.locusOfFocus.parent):
@@ -2249,7 +2222,6 @@
 
             role = obj.getRole()
             if not len(string) \
-               or not self.isNavigableAria(obj) \
                or role in [pyatspi.ROLE_ENTRY,
                            pyatspi.ROLE_PASSWORD_TEXT,
                            pyatspi.ROLE_LINK]:
@@ -2923,7 +2895,14 @@
         if obj and not obj.getState().contains(pyatspi.STATE_SHOWING):
             return True
 
+        # Sometimes the child of an ARIA widget claims focus. It may lack
+        # the attributes we're looking for. Therefore, if obj is not an
+        # ARIA widget, we'll also consider the parent's attributes.
+        #
         attrs = self._getAttrDictionary(obj)
+        if obj and not self.isAriaWidget(obj):
+            attrs.update(self._getAttrDictionary(obj.parent))
+
         try:
             # ARIA landmark widgets
             import sets
@@ -2939,10 +2918,13 @@
             #
             elif obj.getRole() in [pyatspi.ROLE_ENTRY,
                                    pyatspi.ROLE_LINK,
-                                   pyatspi.ROLE_ALERT]:
-                return obj.parent.getRole() != pyatspi.ROLE_COMBO_BOX
+                                   pyatspi.ROLE_ALERT,
+                                   pyatspi.ROLE_PARAGRAPH,
+                                   pyatspi.ROLE_SECTION]:
+                return obj.parent.getRole() not in [pyatspi.ROLE_COMBO_BOX,
+                                                    pyatspi.ROLE_PAGE_TAB]
             # All other ARIA widgets we will assume are navigable if
-            # they are not focusable.
+            # they are not focused.
             #
             else:
                 return not obj.getState().contains(pyatspi.STATE_FOCUSABLE)
@@ -5128,7 +5110,36 @@
 
         if not obj:
             return []
+        
+        # If it's an ARIA widget, we want the default generators to give
+        # us all the details.
+        #
+        if not self.isNavigableAria(obj):
+            if not self.isAriaWidget(obj):
+                obj = obj.parent
 
+            objects = [[obj, 0, 1, ""]]
+            ext = obj.queryComponent().getExtents(0)
+            extents = [ext.x, ext.y, ext.width, ext.height]
+            for i in range(obj.getIndexInParent() + 1, obj.parent.childCount):
+                newObj = obj.parent[i]
+                ext = newObj.queryComponent().getExtents(0)
+                newExtents = [ext.x, ext.y, ext.width, ext.height]
+                if self.onSameLine(extents, newExtents):
+                    objects.append([newObj, 0, 1, ""])
+                else:
+                    break
+            for i in range(obj.getIndexInParent() - 1, -1, -1):
+                newObj = obj.parent[i]
+                ext = newObj.queryComponent().getExtents(0)
+                newExtents = [ext.x, ext.y, ext.width, ext.height]
+                if self.onSameLine(extents, newExtents):
+                    objects[0:0] = [[newObj, 0, 1, ""]]
+                else:
+                    break
+
+            return objects
+
         boundary = pyatspi.TEXT_BOUNDARY_LINE_START
 
         # Find the beginning of this line w.r.t. this object.
@@ -5197,15 +5208,7 @@
         done = False
         while not done:
             [firstObj, start, end, string] = objects[0]
-            isAria = not self.isNavigableAria(firstObj)
-            if isAria:
-                documentFrame = self.getDocumentFrame()
-                prevObj = self.findPreviousObject(firstObj, documentFrame)
-                pOffset = 0
-            else:
-                [prevObj, pOffset] = \
-                    self.findPreviousCaretInOrder(firstObj, start)
-
+            [prevObj, pOffset] = self.findPreviousCaretInOrder(firstObj, start)
             if not prevObj or self.isSameObject(prevObj, firstObj):
                 break
 
@@ -5245,15 +5248,7 @@
         done = False
         while not done:
             [lastObj, start, end, string] = objects[-1]
-            isAria = not self.isNavigableAria(lastObj)
-
-            if isAria:
-                documentFrame = self.getDocumentFrame()
-                nextObj = self.findNextObject(lastObj, documentFrame)
-                nOffset = 0
-            else:
-                [nextObj, nOffset] = self.findNextCaretInOrder(lastObj, end)
-
+            [nextObj, nOffset] = self.findNextCaretInOrder(lastObj, end)
             if not nextObj or self.isSameObject(nextObj, lastObj):
                 break
 
@@ -5272,7 +5267,7 @@
                 objects.extend(toAdd)
             elif (nextObj.getRole() in [pyatspi.ROLE_SECTION,
                                         pyatspi.ROLE_TABLE_CELL] \
-                  and not isAria and self.isUselessObject(nextObj)):
+                  and self.isUselessObject(nextObj)):
                 toAdd = self.getObjectsFromEOCs(nextObj, nOffset, boundary)
                 done = True
                 for item in toAdd:
