Index: test/keystrokes/firefox/dojo_tree.py
===================================================================
--- test/keystrokes/firefox/dojo_tree.py	(revision 4516)
+++ test/keystrokes/firefox/dojo_tree.py	(working copy)
@@ -37,9 +37,9 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "tab to continents", 
-    ["BUG? - Should Tree be in the context? If not, the braille generator should deal with it.",
-     "BRAILLE LINE:  'Tree Continents ListItem'",
-     "     VISIBLE:  'Tree Continents ListItem', cursor=6",
+    ["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",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Continents expanded'",
      "SPEECH OUTPUT: 'tree level 1'"]))
@@ -51,9 +51,8 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to Africa", 
-    ["BUG? - Should Panel be in the context? If not, the braille generator should deal with it.",
-     "BRAILLE LINE:  'Panel Africa ListItem'",
-     "     VISIBLE:  'Panel Africa ListItem', cursor=7",
+    ["BRAILLE LINE:  ' Africa ListItem'",
+     "     VISIBLE:  ' Africa ListItem', cursor=2",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Africa collapsed'",
      "SPEECH OUTPUT: 'tree level 2'"]))
@@ -66,8 +65,8 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  'Panel Africa ListItem'",
-     "     VISIBLE:  'Panel Africa ListItem', cursor=7",
+    ["BRAILLE LINE:  ' Africa ListItem'",
+     "     VISIBLE:  ' Africa ListItem', cursor=2",
      "SPEECH OUTPUT: 'list item'",
      "SPEECH OUTPUT: 'Africa'",
      "SPEECH OUTPUT: ''",
@@ -81,8 +80,8 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "expand Africa", 
-    ["BRAILLE LINE:  'Panel Africa ListItem'",
-     "     VISIBLE:  'Panel Africa ListItem', cursor=7",
+    ["BRAILLE LINE:  ' Africa ListItem'",
+     "     VISIBLE:  ' Africa ListItem', cursor=2",
      "SPEECH OUTPUT: 'expanded'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -90,8 +89,8 @@
 sequence.append(WaitForFocus("Egypt", acc_role=pyatspi.ROLE_LIST_ITEM))
 sequence.append(utils.AssertPresentationAction(
     "arrow to Egypt", 
-    ["BRAILLE LINE:  'Panel Egypt ListItem'",
-     "     VISIBLE:  'Panel Egypt ListItem', cursor=7",
+    ["BRAILLE LINE:  ' Egypt ListItem'",
+     "     VISIBLE:  ' Egypt ListItem', cursor=2",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Egypt'",
      "SPEECH OUTPUT: 'tree level 3'"]))
@@ -153,8 +152,8 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to China", 
-    ["BRAILLE LINE:  'Panel China ListItem'",
-     "     VISIBLE:  'Panel China ListItem', cursor=7",
+    ["BRAILLE LINE:  ' China ListItem'",
+     "     VISIBLE:  ' China ListItem', cursor=2",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'China'",
      "SPEECH OUTPUT: 'tree level 3'"]))
Index: test/keystrokes/firefox/dojo_tabcontainer.py
===================================================================
--- test/keystrokes/firefox/dojo_tabcontainer.py	(revision 4516)
+++ test/keystrokes/firefox/dojo_tabcontainer.py	(working copy)
@@ -63,8 +63,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to tab 3", 
-    ["BUG? - Should panel be at the end of the line? If not, the braille generator should deal with it.",
-     "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 Panel'",
+    ["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'",
      "     VISIBLE:  'Tab 3 Page Inlined Sub TabContai', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Tab 3 page'"]))
@@ -75,8 +74,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to programmatically created tab", 
-    ["BUG? - Should panel be at the end of the line? If not, the braille generator should deal with it. Note that we don't always see it either.... Very strange....",
-     "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 Panel'",
+    ["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'",
      "     VISIBLE:  'Inlined Sub TabContainer Page Su', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Inlined Sub TabContainer page'"]))
Index: test/keystrokes/firefox/codetalks_tree.py
===================================================================
--- test/keystrokes/firefox/codetalks_tree.py	(revision 4517)
+++ test/keystrokes/firefox/codetalks_tree.py	(working copy)
@@ -23,6 +23,8 @@
 sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForDocLoad())
 
+sequence.append(PauseAction(5000))
+
 ########################################################################
 # Navigate to the first item in the tree
 #
@@ -33,10 +35,10 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Navigate to the tree",
-    ["BRAILLE LINE:  ' Fruits $l'",
-     "     VISIBLE:  ' Fruits $l', cursor=1",
-     "BRAILLE LINE:  ' Fruits $l'",
-     "     VISIBLE:  ' Fruits $l', cursor=1",
+    ["BRAILLE LINE:  ' Fruits'",
+     "     VISIBLE:  ' Fruits', cursor=1",
+     "BRAILLE LINE:  ' Fruits'",
+     "     VISIBLE:  ' Fruits', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Foods tree'",
      "SPEECH OUTPUT: ''",
@@ -50,10 +52,10 @@
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Left Arrow to collapse fruits", 
-    ["BRAILLE LINE:  ' Fruits $l'",
-     "     VISIBLE:  ' Fruits $l', cursor=1",
-     "BRAILLE LINE:  ' Fruits $l'",
-     "     VISIBLE:  ' Fruits $l', cursor=1",
+    ["BRAILLE LINE:  ' Fruits'",
+     "     VISIBLE:  ' Fruits', cursor=1",
+     "BRAILLE LINE:  ' Fruits'",
+     "     VISIBLE:  ' Fruits', cursor=1",
      "SPEECH OUTPUT: 'collapsed'"]))
 
 ########################################################################
@@ -64,8 +66,8 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  ' Fruits $l'",
-     "     VISIBLE:  ' Fruits $l', cursor=1",
+    ["BRAILLE LINE:  ' Fruits'",
+     "     VISIBLE:  ' Fruits', cursor=1",
      "SPEECH OUTPUT: 'Fruits'",
      "SPEECH OUTPUT: 'list item'",
      "SPEECH OUTPUT: 'Fruits'",
@@ -80,10 +82,10 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Right Arrow to expand fruits", 
-    ["BRAILLE LINE:  ' Fruits $l'",
-     "     VISIBLE:  ' Fruits $l', cursor=1",
-     "BRAILLE LINE:  ' Fruits $l'",
-     "     VISIBLE:  ' Fruits $l', cursor=1",
+    ["BRAILLE LINE:  ' Fruits'",
+     "     VISIBLE:  ' Fruits', cursor=1",
+     "BRAILLE LINE:  ' Fruits'",
+     "     VISIBLE:  ' Fruits', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
 ########################################################################
@@ -94,8 +96,8 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  ' Fruits $l'",
-     "     VISIBLE:  ' Fruits $l', cursor=1",
+    ["BRAILLE LINE:  ' Fruits'",
+     "     VISIBLE:  ' Fruits', cursor=1",
      "SPEECH OUTPUT: 'Fruits'",
      "SPEECH OUTPUT: 'list item'",
      "SPEECH OUTPUT: 'Fruits'",
Index: test/keystrokes/firefox/uiuc_grid.py
===================================================================
--- test/keystrokes/firefox/uiuc_grid.py	(revision 4516)
+++ test/keystrokes/firefox/uiuc_grid.py	(working copy)
@@ -102,7 +102,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Move right on second row 3", 
-    ["BRAILLE LINE:  '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:  'New message Image Attachment Ima', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'New message'"]))
@@ -114,8 +114,8 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Move down to third row", 
-    ["BRAILLE LINE:  'New message Image None Image Image Jane Johnson Cell Proposal for you to review Cell 2007-16-03 Cell 12K Cell'",
-     "     VISIBLE:  'New message Image None Image Ima', cursor=1",
+    ["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'",
+     "     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/yahoo_tab_view.py
===================================================================
--- test/keystrokes/firefox/yahoo_tab_view.py	(revision 4516)
+++ test/keystrokes/firefox/yahoo_tab_view.py	(working copy)
@@ -37,8 +37,8 @@
 sequence.append(utils.AssertPresentationAction(
     "Navigate to the tab view",
     ["BUG? - Ultimately we get around to announcing the page tab, but should we be speaking all of that additional information?",
-     "BRAILLE LINE:  'Opera $l Firefox $l Explorer $l Safari $l'",
-     "     VISIBLE:  'Opera $l Firefox $l Explorer $l ', cursor=1",
+     "BRAILLE LINE:  'Opera Firefox Explorer Safari'",
+     "     VISIBLE:  'Opera Firefox Explorer Safari', cursor=1",
      "SPEECH OUTPUT: 'Browser NewsPress the space bar or enter key to load the content of each tab. Browser News Press the space bar or enter key to load the content of each tab. tab list'",
      "SPEECH OUTPUT: 'Opera page'"]))
     
@@ -49,8 +49,8 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Right Arrow to the next tab", 
-    ["BRAILLE LINE:  'Opera $l Firefox $l Explorer $l Safari $l'",
-     "     VISIBLE:  'Firefox $l Explorer $l Safari $l', cursor=1",
+    ["BRAILLE LINE:  'Opera Firefox Explorer Safari'",
+     "     VISIBLE:  'Opera Firefox Explorer Safari', cursor=7",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Firefox page'"]))
 
@@ -61,8 +61,8 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Right Arrow to the next tab", 
-    ["BRAILLE LINE:  'Opera $l Firefox $l Explorer $l Safari $l'",
-     "     VISIBLE:  'Explorer $l Safari $l', cursor=1",
+    ["BRAILLE LINE:  'Opera Firefox Explorer Safari'",
+     "     VISIBLE:  'Opera Firefox Explorer Safari', cursor=15",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Explorer page'"]))
 
@@ -73,8 +73,8 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Right Arrow to the next tab", 
-    ["BRAILLE LINE:  'Opera $l Firefox $l Explorer $l Safari $l'",
-     "     VISIBLE:  'Safari $l', cursor=1",
+    ["BRAILLE LINE:  'Opera Firefox Explorer Safari'",
+     "     VISIBLE:  'Opera Firefox Explorer Safari', cursor=24",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Safari page'"]))
 
@@ -86,8 +86,8 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  'Opera $l Firefox $l Explorer $l Safari $l'",
-     "     VISIBLE:  'Safari $l', cursor=1",
+    ["BRAILLE LINE:  'Opera Firefox Explorer Safari'",
+     "     VISIBLE:  'Opera Firefox Explorer Safari', cursor=24",
      "SPEECH OUTPUT: 'tab list'",
      "SPEECH OUTPUT: 'Safari page'",
      "SPEECH OUTPUT: 'item 4 of 4'",
@@ -100,11 +100,11 @@
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Left Arrow to the previous tab", 
-    ["BRAILLE LINE:  'Opera $l Firefox $l Explorer $l Safari $l'",
-     "     VISIBLE:  'Explorer $l Safari $l', cursor=1",
+    ["BRAILLE LINE:  'Opera Firefox Explorer Safari'",
+     "     VISIBLE:  'Opera Firefox Explorer Safari', cursor=15",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Explorer page'"]))
-     
+
 ########################################################################
 # Left Arrow back to the second tab
 #
@@ -112,8 +112,8 @@
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Left Arrow to the previous tab", 
-    ["BRAILLE LINE:  'Opera $l Firefox $l Explorer $l Safari $l'",
-     "     VISIBLE:  'Firefox $l Explorer $l Safari $l', cursor=1",
+    ["BRAILLE LINE:  'Opera Firefox Explorer Safari'",
+     "     VISIBLE:  'Opera Firefox Explorer Safari', cursor=7",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Firefox page'"]))
 
@@ -124,8 +124,8 @@
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Left Arrow to the previous tab", 
-    ["BRAILLE LINE:  'Opera $l Firefox $l Explorer $l Safari $l'",
-     "     VISIBLE:  'Opera $l Firefox $l Explorer $l ', cursor=1",
+    ["BRAILLE LINE:  'Opera Firefox Explorer Safari'",
+     "     VISIBLE:  'Opera Firefox Explorer Safari', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Opera page'"]))
 
Index: test/keystrokes/firefox/codetalks_button.py
===================================================================
--- test/keystrokes/firefox/codetalks_button.py	(revision 4516)
+++ 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.  $l'",
+    ["BRAILLE LINE:  'Check Now Button Check to see if your order has been shipped.'",
      "     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.  $l'",
+    ["BRAILLE LINE:  'Check Now Button Check to see if your order has been shipped.'",
      "     VISIBLE:  'Check Now Button Check to see if', cursor=1",
      "SPEECH OUTPUT: 'Check Now'",
      "SPEECH OUTPUT: 'button'",
@@ -99,7 +99,7 @@
     "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.  $l'",
+     "BRAILLE LINE:  'Check Now Button Check to see if your order has been shipped.'",
      "     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'"]))
Index: test/keystrokes/firefox/moz_slider.py
===================================================================
--- test/keystrokes/firefox/moz_slider.py	(revision 4516)
+++ test/keystrokes/firefox/moz_slider.py	(working copy)
@@ -32,7 +32,8 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "tab to slider", 
-    ["BRAILLE LINE:  'Move slider left Button 10% Slider Move slider right Button'",
+    ["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'",
      "     VISIBLE:  '10% Slider Move slider right But', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'My slider slider 10%'"]))
@@ -45,7 +46,7 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  'Move slider left Button 10% Slider Move slider right Button'",
+    ["BRAILLE LINE:  '0Move slider left Button 10% Slider Move slider right Button 100'",
      "     VISIBLE:  '10% Slider Move slider right But', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'slider'",
@@ -65,7 +66,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "0 move slider", 
-    ["BRAILLE LINE:  'Move slider left Button $15.00 Slider Move slider right Button'",
+    ["BRAILLE LINE:  '0Move slider left Button $15.00 Slider Move slider right Button 100'",
      "     VISIBLE:  '$15.00 Slider Move slider right ', cursor=1",
      "SPEECH OUTPUT: '$15.00'"]))
                                
@@ -78,7 +79,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "1 move slider", 
-    ["BRAILLE LINE:  'Move slider left Button $20.00 Slider Move slider right Button'",
+    ["BRAILLE LINE:  '0Move slider left Button $20.00 Slider Move slider right Button 100'",
      "     VISIBLE:  '$20.00 Slider Move slider right ', cursor=1",
      "SPEECH OUTPUT: '$20.00'"]))
                               
@@ -91,7 +92,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "2 move slider", 
-    ["BRAILLE LINE:  'Move slider left Button $25.00 Slider Move slider right Button'",
+    ["BRAILLE LINE:  '0Move slider left Button $25.00 Slider Move slider right Button 100'",
      "     VISIBLE:  '$25.00 Slider Move slider right ', cursor=1",
      "SPEECH OUTPUT: '$25.00'"]))
                                      
@@ -104,7 +105,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "3 move slider", 
-    ["BRAILLE LINE:  'Move slider left Button $30.00 Slider Move slider right Button'",
+    ["BRAILLE LINE:  '0Move slider left Button $30.00 Slider Move slider right Button 100'",
      "     VISIBLE:  '$30.00 Slider Move slider right ', cursor=1",
      "SPEECH OUTPUT: '$30.00'"]))
                                
@@ -117,7 +118,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "4 move slider", 
-    ["BRAILLE LINE:  'Move slider left Button $25.00 Slider Move slider right Button'",
+    ["BRAILLE LINE:  '0Move slider left Button $25.00 Slider Move slider right Button 100'",
      "     VISIBLE:  '$25.00 Slider Move slider right ', cursor=1",
      "SPEECH OUTPUT: '$25.00'"]))
                                        
@@ -130,7 +131,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "5 move slider", 
-    ["BRAILLE LINE:  'Move slider left Button $20.00 Slider Move slider right Button'",
+    ["BRAILLE LINE:  '0Move slider left Button $20.00 Slider Move slider right Button 100'",
      "     VISIBLE:  '$20.00 Slider Move slider right ', cursor=1",
      "SPEECH OUTPUT: '$20.00'"]))
                                      
@@ -143,7 +144,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "6 move slider", 
-    ["BRAILLE LINE:  'Move slider left Button $15.00 Slider Move slider right Button'",
+    ["BRAILLE LINE:  '0Move slider left Button $15.00 Slider Move slider right Button 100'",
      "     VISIBLE:  '$15.00 Slider Move slider right ', cursor=1",
      "SPEECH OUTPUT: '$15.00'"]))                           
   
@@ -156,7 +157,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "7 move slider", 
-    ["BRAILLE LINE:  'Move slider left Button $10.00 Slider Move slider right Button'",
+    ["BRAILLE LINE:  '0Move slider left Button $10.00 Slider Move slider right Button 100'",
      "     VISIBLE:  '$10.00 Slider Move slider right ', cursor=1",
      "SPEECH OUTPUT: '$10.00'"]))   
                             
@@ -171,7 +172,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "move slider end", 
-    ["BRAILLE LINE:  'Move slider left Button $100.00 Slider Move slider right Button'",
+    ["BRAILLE LINE:  '0Move slider left Button $100.00 Slider Move slider right Button 100'",
      "     VISIBLE:  '$100.00 Slider Move slider right', cursor=1",
      "SPEECH OUTPUT: '$100.00'"]))
                                
@@ -186,7 +187,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "move slider home", 
-    ["BRAILLE LINE:  'Move slider left Button $0.00 Slider Move slider right Button'",
+    ["BRAILLE LINE:  '0Move slider left Button $0.00 Slider Move slider right Button 100'",
      "     VISIBLE:  '$0.00 Slider Move slider right B', cursor=1",
      "SPEECH OUTPUT: '$0.00'"]))
 
Index: test/keystrokes/firefox/dojo_combo_box.py
===================================================================
--- test/keystrokes/firefox/dojo_combo_box.py	(revision 4516)
+++ test/keystrokes/firefox/dojo_combo_box.py	(working copy)
@@ -69,8 +69,8 @@
     "1. Down Arrow", 
     ["BRAILLE LINE:  'US State test 1 C $l'",
      "     VISIBLE:  'US State test 1 C $l', cursor=0",
-     "BRAILLE LINE:  '• California ListItem'",
-     "     VISIBLE:  '• California ListItem', cursor=1",
+     "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'",
@@ -89,8 +89,8 @@
      "     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 ListItem'",
-     "     VISIBLE:  '• Colorado ListItem', cursor=1",
+     "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: ''",
@@ -105,10 +105,10 @@
      "     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 Connecticut $l'",
-     "     VISIBLE:  '  US State test 1 Connecticut $l', cursor=30",
-     "BRAILLE LINE:  '• Connecticut ListItem'",
-     "     VISIBLE:  '• Connecticut ListItem', cursor=1",
+     "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'",
+     "     VISIBLE:  '• Connecticut', cursor=1",
      "BRAILLE LINE:  'US State test 1 Connecticut $l'",
      "     VISIBLE:  'US State test 1 Connecticut $l', cursor=0",
      "SPEECH OUTPUT: ''",
@@ -140,8 +140,8 @@
      "     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 ListItem'",
-     "     VISIBLE:  '• Colorado ListItem', cursor=1",
+     "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: ''",
@@ -156,10 +156,10 @@
      "     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 California $l'",
-     "     VISIBLE:  '  US State test 1 California $l', cursor=29",
-     "BRAILLE LINE:  '• California ListItem'",
-     "     VISIBLE:  '• California ListItem', cursor=1",
+     "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'",
+     "     VISIBLE:  '• California', cursor=1",
      "BRAILLE LINE:  'US State test 1 California $l'",
      "     VISIBLE:  'US State test 1 California $l', cursor=0",
      "SPEECH OUTPUT: ''",
Index: src/orca/scripts/toolkits/Gecko/script.py
===================================================================
--- src/orca/scripts/toolkits/Gecko/script.py	(revision 4516)
+++ src/orca/scripts/toolkits/Gecko/script.py	(working copy)
@@ -2924,9 +2924,11 @@
                                    pyatspi.ROLE_LINK,
                                    pyatspi.ROLE_ALERT]:
                 return obj.parent.getRole() != pyatspi.ROLE_COMBO_BOX
-            # All other ARIA widgets
+            # All other ARIA widgets we will assume are navigable if
+            # they are not focusable.
+            #
             else:
-                return False
+                return not obj.getState().contains(pyatspi.STATE_FOCUSABLE)
         except (KeyError, TypeError):
             return True
 
