Index: test/keystrokes/firefox/dojo_button.py
===================================================================
--- test/keystrokes/firefox/dojo_button.py	(revision 4543)
+++ test/keystrokes/firefox/dojo_button.py	(working copy)
@@ -34,7 +34,7 @@
 sequence.append(WaitForFocus("<button>", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the <button> button", 
-    ["BRAILLE LINE:  '<button> <input type='button'> Button       Create    $l Edit!    $l Color   Save     '",
+    ["BRAILLE LINE:  '<button> <input type='button'> Button       Create   Edit!   Color   Save     '",
      "     VISIBLE:  '<button> <input type='button'> B', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: '<button> button'"]))
@@ -47,7 +47,7 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I on <button>", 
-    ["BRAILLE LINE:  '<button> <input type='button'> Button       Create    $l Edit!    $l Color   Save     '",
+    ["BRAILLE LINE:  '<button> <input type='button'> Button       Create   Edit!   Color   Save     '",
      "     VISIBLE:  '<button> <input type='button'> B', cursor=1",
      "SPEECH OUTPUT: '<button>'",
      "SPEECH OUTPUT: 'button'",
@@ -61,7 +61,7 @@
 sequence.append(WaitForFocus("<input type='button'>", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to <input type='button'>",
-    ["BRAILLE LINE:  '<button> <input type='button'> Button       Create    $l Edit!    $l Color   Save     '",
+    ["BRAILLE LINE:  '<button> <input type='button'> Button       Create   Edit!   Color   Save     '",
      "     VISIBLE:  '<input type='button'> Button    ', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: '<input type='button'> button'"]))
@@ -74,7 +74,7 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I on <input type='button'>", 
-    ["BRAILLE LINE:  '<button> <input type='button'> Button       Create    $l Edit!    $l Color   Save     '",
+    ["BRAILLE LINE:  '<button> <input type='button'> Button       Create   Edit!   Color   Save     '",
      "     VISIBLE:  '<input type='button'> Button    ', cursor=1",
      "SPEECH OUTPUT: '<input type='button'>'",
      "SPEECH OUTPUT: 'button'",
@@ -125,8 +125,9 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_MENU))
 sequence.append(utils.AssertPresentationAction(
     "Tab to drop down menu on Create", 
-    ["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",
+    ["BUG? - Missing space between Button and Create, also Menu and Save",
+     "BRAILLE LINE:  '<button> Button <input type='button'> ButtonCreate Button   MenuSave Button   Menu'",
+     "     VISIBLE:  '  MenuSave Button   Menu', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: '  menu'"]))
 
@@ -138,8 +139,8 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I on drop down menu on Create", 
-    ["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",
+    ["BRAILLE LINE:  '<button> Button <input type='button'> ButtonCreate Button   MenuSave Button   Menu'",
+     "     VISIBLE:  '  MenuSave Button   Menu', cursor=1",
      "SPEECH OUTPUT: ' '",
      "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: ''"]))
@@ -489,8 +490,8 @@
 sequence.append(WaitForFocus("Save", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the third unlabelled button ('Save')", 
-    ["BRAILLE LINE:  ' $l $lSave Button   Menu'",
-     "     VISIBLE:  ' $l $lSave Button   Menu', cursor=7",
+    ["BRAILLE LINE:  'Save Button   Menu'",
+     "     VISIBLE:  'Save Button   Menu', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Save button'"]))
 
@@ -499,8 +500,8 @@
 sequence.append(WaitForFocus("  ▼", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the down arrow button", 
-    ["BRAILLE LINE:  ' $l $lSave Button   Menu'",
-     "     VISIBLE:  ' $l $lSave Button   Menu', cursor=19",
+    ["BRAILLE LINE:  'Save Button   Menu'",
+     "     VISIBLE:  'Save Button   Menu', cursor=13",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: '  menu'"]))
 
Index: test/keystrokes/firefox/line_nav_bug_547573.py
===================================================================
--- test/keystrokes/firefox/line_nav_bug_547573.py	(revision 4542)
+++ test/keystrokes/firefox/line_nav_bug_547573.py	(working copy)
@@ -54,7 +54,7 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Down",
-    ["BRAILLE LINE:  '» search tips  Search $l Submit Search Button Home Page Image $l'",
+    ["BRAILLE LINE:  '» search tips  Search $l Submit Search Button Home Page Image'",
      "     VISIBLE:  '» search tips  Search $l Submit ', cursor=1",
      "SPEECH OUTPUT: '»  search tips link   text Search Submit Search button Home Page link image'"]))
 
@@ -1648,7 +1648,7 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "93. Line Up",
-    ["BRAILLE LINE:  '» search tips  Search $l Submit Search Button Home Page Image $l'",
+    ["BRAILLE LINE:  '» search tips  Search $l Submit Search Button Home Page Image'",
      "     VISIBLE:  '» search tips  Search $l Submit ', cursor=1",
      "SPEECH OUTPUT: '»  search tips link   text Search Submit Search button Home Page link image'"]))
 
Index: test/keystrokes/firefox/tpg_aria_slider.py
===================================================================
--- test/keystrokes/firefox/tpg_aria_slider.py	(revision 4543)
+++ 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:  ' $l Volume 0 $lVolume 0 % Slider'",
-     "     VISIBLE:  ' $l Volume 0 $lVolume 0 % Slider', cursor=16",
+    ["BRAILLE LINE:  'Volume 0 % Slider'",
+     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
      "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:  ' $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",
+     "BRAILLE LINE:  'Volume 0 % Slider'",
+     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 0 % Slider'",
+     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 1 % Slider'",
+     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 2. Right Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Volume 1 % Slider'",
+     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 1 % Slider'",
+     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 2 % Slider'",
+     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
      "SPEECH OUTPUT: '2 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 3. Right Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Volume 2 % Slider'",
+     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 2 % Slider'",
+     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 3 % Slider'",
+     "     VISIBLE:  'Volume 3 % Slider', cursor=1",
      "SPEECH OUTPUT: '3 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 1. Left Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Volume 3 % Slider'",
+     "     VISIBLE:  'Volume 3 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 3 % Slider'",
+     "     VISIBLE:  'Volume 3 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 2 % Slider'",
+     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
      "SPEECH OUTPUT: '2 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 2. Left Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Volume 2 % Slider'",
+     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 2 % Slider'",
+     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 1 % Slider'",
+     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 3. Left Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Volume 1 % Slider'",
+     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 1 % Slider'",
+     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 0 % Slider'",
+     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 1. Up Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Volume 0 % Slider'",
+     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 0 % Slider'",
+     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 1 % Slider'",
+     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 2. Up Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Volume 1 % Slider'",
+     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 1 % Slider'",
+     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 2 % Slider'",
+     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
      "SPEECH OUTPUT: '2 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 3. Up Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Volume 2 % Slider'",
+     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 2 % Slider'",
+     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 3 % Slider'",
+     "     VISIBLE:  'Volume 3 % Slider', cursor=1",
      "SPEECH OUTPUT: '3 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 1. Down Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Volume 3 % Slider'",
+     "     VISIBLE:  'Volume 3 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 3 % Slider'",
+     "     VISIBLE:  'Volume 3 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 2 % Slider'",
+     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
      "SPEECH OUTPUT: '2 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 2. Down Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Volume 2 % Slider'",
+     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 2 % Slider'",
+     "     VISIBLE:  'Volume 2 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 1 % Slider'",
+     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 3. Down Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Volume 1 % Slider'",
+     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 1 % Slider'",
+     "     VISIBLE:  'Volume 1 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 0 % Slider'",
+     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Up"))
 sequence.append(utils.AssertPresentationAction(
     "Volume 1. Page Up", 
-    ["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'",
+    ["BRAILLE LINE:  'Volume 0 % Slider'",
+     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 0 % Slider'",
+     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 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:  ' $l Volume 25 $lVolume 25 % Slider'",
+    ["BRAILLE LINE:  'Volume 25 % Slider'",
      "     VISIBLE:  'Volume 25 % Slider', cursor=1",
-     "BRAILLE LINE:  ' $l Volume 25 $lVolume 25 % Slider'",
+     "BRAILLE LINE:  'Volume 25 % Slider'",
      "     VISIBLE:  'Volume 25 % Slider', cursor=1",
-     "BRAILLE LINE:  ' $l Volume 50 $lVolume 50 % Slider'",
+     "BRAILLE LINE:  'Volume 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:  ' $l Volume 50 $lVolume 50 % Slider'",
+    ["BRAILLE LINE:  'Volume 50 % Slider'",
      "     VISIBLE:  'Volume 50 % Slider', cursor=1",
-     "BRAILLE LINE:  ' $l Volume 50 $lVolume 50 % Slider'",
+     "BRAILLE LINE:  'Volume 50 % Slider'",
      "     VISIBLE:  'Volume 50 % Slider', cursor=1",
-     "BRAILLE LINE:  ' $l Volume 25 $lVolume 25 % Slider'",
+     "BRAILLE LINE:  'Volume 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:  ' $l Volume 25 $lVolume 25 % Slider'",
+    ["BRAILLE LINE:  'Volume 25 % Slider'",
      "     VISIBLE:  'Volume 25 % Slider', cursor=1",
-     "BRAILLE LINE:  ' $l Volume 25 $lVolume 25 % Slider'",
+     "BRAILLE LINE:  'Volume 25 % Slider'",
      "     VISIBLE:  'Volume 25 % Slider', cursor=1",
-     "BRAILLE LINE:  ' $l Volume 0 $lVolume 0 % Slider'",
-     "     VISIBLE:  ' $l Volume 0 $lVolume 0 % Slider', cursor=16",
+     "BRAILLE LINE:  'Volume 0 % Slider'",
+     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("End"))
 sequence.append(utils.AssertPresentationAction(
     "Volume End", 
-    ["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'",
+    ["BRAILLE LINE:  'Volume 0 % Slider'",
+     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 0 % Slider'",
+     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
+     "BRAILLE LINE:  'Volume 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:  ' $l Volume 100 $lVolume 100 % Slider'",
+    ["BRAILLE LINE:  'Volume 100 % Slider'",
      "     VISIBLE:  'Volume 100 % Slider', cursor=1",
-     "BRAILLE LINE:  ' $l Volume 100 $lVolume 100 % Slider'",
+     "BRAILLE LINE:  'Volume 100 % Slider'",
      "     VISIBLE:  'Volume 100 % Slider', cursor=1",
-     "BRAILLE LINE:  ' $l Volume 0 $lVolume 0 % Slider'",
-     "     VISIBLE:  ' $l Volume 0 $lVolume 0 % Slider', cursor=16",
+     "BRAILLE LINE:  'Volume 0 % Slider'",
+     "     VISIBLE:  'Volume 0 % Slider', cursor=1",
      "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:  ' $l Red 0 $lRed 0 % Slider'",
-     "     VISIBLE:  ' $l Red 0 $lRed 0 % Slider', cursor=13",
+    ["BRAILLE LINE:  'Red 0 % Slider'",
+     "     VISIBLE:  'Red 0 % Slider', cursor=1",
      "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:  ' $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",
+     "BRAILLE LINE:  'Red 0 % Slider'",
+     "     VISIBLE:  'Red 0 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 0 % Slider'",
+     "     VISIBLE:  'Red 0 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 1 % Slider'",
+     "     VISIBLE:  'Red 1 % Slider', cursor=1",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Red 2. Right Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Red 1 % Slider'",
+     "     VISIBLE:  'Red 1 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 1 % Slider'",
+     "     VISIBLE:  'Red 1 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 2 % Slider'",
+     "     VISIBLE:  'Red 2 % Slider', cursor=1",
      "SPEECH OUTPUT: '2 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Red 3. Right Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Red 2 % Slider'",
+     "     VISIBLE:  'Red 2 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 2 % Slider'",
+     "     VISIBLE:  'Red 2 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 3 % Slider'",
+     "     VISIBLE:  'Red 3 % Slider', cursor=1",
      "SPEECH OUTPUT: '3 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Red 1. Left Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Red 3 % Slider'",
+     "     VISIBLE:  'Red 3 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 3 % Slider'",
+     "     VISIBLE:  'Red 3 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 2 % Slider'",
+     "     VISIBLE:  'Red 2 % Slider', cursor=1",
      "SPEECH OUTPUT: '2 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Red 2. Left Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Red 2 % Slider'",
+     "     VISIBLE:  'Red 2 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 2 % Slider'",
+     "     VISIBLE:  'Red 2 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 1 % Slider'",
+     "     VISIBLE:  'Red 1 % Slider', cursor=1",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Red 3. Left Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Red 1 % Slider'",
+     "     VISIBLE:  'Red 1 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 1 % Slider'",
+     "     VISIBLE:  'Red 1 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 0 % Slider'",
+     "     VISIBLE:  'Red 0 % Slider', cursor=1",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Red 1. Up Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Red 0 % Slider'",
+     "     VISIBLE:  'Red 0 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 0 % Slider'",
+     "     VISIBLE:  'Red 0 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 1 % Slider'",
+     "     VISIBLE:  'Red 1 % Slider', cursor=1",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Red 2. Up Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Red 1 % Slider'",
+     "     VISIBLE:  'Red 1 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 1 % Slider'",
+     "     VISIBLE:  'Red 1 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 2 % Slider'",
+     "     VISIBLE:  'Red 2 % Slider', cursor=1",
      "SPEECH OUTPUT: '2 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Red 3. Up Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Red 2 % Slider'",
+     "     VISIBLE:  'Red 2 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 2 % Slider'",
+     "     VISIBLE:  'Red 2 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 3 % Slider'",
+     "     VISIBLE:  'Red 3 % Slider', cursor=1",
      "SPEECH OUTPUT: '3 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Red 1. Down Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Red 3 % Slider'",
+     "     VISIBLE:  'Red 3 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 3 % Slider'",
+     "     VISIBLE:  'Red 3 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 2 % Slider'",
+     "     VISIBLE:  'Red 2 % Slider', cursor=1",
      "SPEECH OUTPUT: '2 %'"]))
 
 
@@ -852,96 +852,96 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Red 2. Down Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Red 2 % Slider'",
+     "     VISIBLE:  'Red 2 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 2 % Slider'",
+     "     VISIBLE:  'Red 2 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 1 % Slider'",
+     "     VISIBLE:  'Red 1 % Slider', cursor=1",
      "SPEECH OUTPUT: '1 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Red 3. Down Arrow", 
-    ["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",
+    ["BRAILLE LINE:  'Red 1 % Slider'",
+     "     VISIBLE:  'Red 1 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 1 % Slider'",
+     "     VISIBLE:  'Red 1 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 0 % Slider'",
+     "     VISIBLE:  'Red 0 % Slider', cursor=1",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Up"))
 sequence.append(utils.AssertPresentationAction(
     "Red 1. Page Up", 
-    ["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",
+    ["BRAILLE LINE:  'Red 0 % Slider'",
+     "     VISIBLE:  'Red 0 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 0 % Slider'",
+     "     VISIBLE:  'Red 0 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 20 % Slider'",
+     "     VISIBLE:  'Red 20 % Slider', cursor=1",
      "SPEECH OUTPUT: '20 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Up"))
 sequence.append(utils.AssertPresentationAction(
     "Red 2. Page Up", 
-    ["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",
+    ["BRAILLE LINE:  'Red 20 % Slider'",
+     "     VISIBLE:  'Red 20 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 20 % Slider'",
+     "     VISIBLE:  'Red 20 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 40 % Slider'",
+     "     VISIBLE:  'Red 40 % Slider', cursor=1",
      "SPEECH OUTPUT: '40 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Down"))
 sequence.append(utils.AssertPresentationAction(
     "Red 1. Page Down", 
-    ["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",
+    ["BRAILLE LINE:  'Red 40 % Slider'",
+     "     VISIBLE:  'Red 40 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 40 % Slider'",
+     "     VISIBLE:  'Red 40 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 20 % Slider'",
+     "     VISIBLE:  'Red 20 % Slider', cursor=1",
      "SPEECH OUTPUT: '20 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Down"))
 sequence.append(utils.AssertPresentationAction(
     "Red 2. Page Down", 
-    ["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",
+    ["BRAILLE LINE:  'Red 20 % Slider'",
+     "     VISIBLE:  'Red 20 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 20 % Slider'",
+     "     VISIBLE:  'Red 20 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 0 % Slider'",
+     "     VISIBLE:  'Red 0 % Slider', cursor=1",
      "SPEECH OUTPUT: '0 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("End"))
 sequence.append(utils.AssertPresentationAction(
     "Red End", 
-    ["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",
+    ["BRAILLE LINE:  'Red 0 % Slider'",
+     "     VISIBLE:  'Red 0 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 0 % Slider'",
+     "     VISIBLE:  'Red 0 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 55 % Slider'",
+     "     VISIBLE:  'Red 55 % Slider', cursor=1",
      "SPEECH OUTPUT: '55 %'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Home"))
 sequence.append(utils.AssertPresentationAction(
     "Red Home", 
-    ["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",
+    ["BRAILLE LINE:  'Red 55 % Slider'",
+     "     VISIBLE:  'Red 55 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 55 % Slider'",
+     "     VISIBLE:  'Red 55 % Slider', cursor=1",
+     "BRAILLE LINE:  'Red 0 % Slider'",
+     "     VISIBLE:  'Red 0 % Slider', cursor=1",
      "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:  ' $l Green 0 $lGreen 0 Slider'",
-     "     VISIBLE:  ' $l Green 0 $lGreen 0 Slider', cursor=15",
+    ["BRAILLE LINE:  'Green 0 Slider'",
+     "     VISIBLE:  'Green 0 Slider', cursor=1",
      "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:  ' $l Green 1 $lGreen 1 Slider'",
-     "     VISIBLE:  ' $l Green 1 $lGreen 1 Slider', cursor=15",
+    ["BRAILLE LINE:  'Green 1 Slider'",
+     "     VISIBLE:  'Green 1 Slider', cursor=1",
      "SPEECH OUTPUT: '1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Green 2. Right Arrow", 
-    ["BRAILLE LINE:  ' $l Green 2 $lGreen 2 Slider'",
-     "     VISIBLE:  ' $l Green 2 $lGreen 2 Slider', cursor=15",
+    ["BRAILLE LINE:  'Green 2 Slider'",
+     "     VISIBLE:  'Green 2 Slider', cursor=1",
      "SPEECH OUTPUT: '2'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Green 3. Right Arrow", 
-    ["BRAILLE LINE:  ' $l Green 3 $lGreen 3 Slider'",
-     "     VISIBLE:  ' $l Green 3 $lGreen 3 Slider', cursor=15",
+    ["BRAILLE LINE:  'Green 3 Slider'",
+     "     VISIBLE:  'Green 3 Slider', cursor=1",
      "SPEECH OUTPUT: '3'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Green 1. Left Arrow", 
-    ["BRAILLE LINE:  ' $l Green 2 $lGreen 2 Slider'",
-     "     VISIBLE:  ' $l Green 2 $lGreen 2 Slider', cursor=15",
+    ["BRAILLE LINE:  'Green 2 Slider'",
+     "     VISIBLE:  'Green 2 Slider', cursor=1",
      "SPEECH OUTPUT: '2'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Green 2. Left Arrow", 
-    ["BRAILLE LINE:  ' $l Green 1 $lGreen 1 Slider'",
-     "     VISIBLE:  ' $l Green 1 $lGreen 1 Slider', cursor=15",
+    ["BRAILLE LINE:  'Green 1 Slider'",
+     "     VISIBLE:  'Green 1 Slider', cursor=1",
      "SPEECH OUTPUT: '1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Green 3. Left Arrow", 
-    ["BRAILLE LINE:  ' $l Green 0 $lGreen 0 Slider'",
-     "     VISIBLE:  ' $l Green 0 $lGreen 0 Slider', cursor=15",
+    ["BRAILLE LINE:  'Green 0 Slider'",
+     "     VISIBLE:  'Green 0 Slider', cursor=1",
      "SPEECH OUTPUT: '0'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Green 1. Up Arrow", 
-    ["BRAILLE LINE:  ' $l Green 1 $lGreen 1 Slider'",
-     "     VISIBLE:  ' $l Green 1 $lGreen 1 Slider', cursor=15",
+    ["BRAILLE LINE:  'Green 1 Slider'",
+     "     VISIBLE:  'Green 1 Slider', cursor=1",
      "SPEECH OUTPUT: '1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Green 2. Up Arrow", 
-    ["BRAILLE LINE:  ' $l Green 2 $lGreen 2 Slider'",
-     "     VISIBLE:  ' $l Green 2 $lGreen 2 Slider', cursor=15",
+    ["BRAILLE LINE:  'Green 2 Slider'",
+     "     VISIBLE:  'Green 2 Slider', cursor=1",
      "SPEECH OUTPUT: '2'"]))
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Green 3. Up Arrow", 
-    ["BRAILLE LINE:  ' $l Green 3 $lGreen 3 Slider'",
-     "     VISIBLE:  ' $l Green 3 $lGreen 3 Slider', cursor=15",
+    ["BRAILLE LINE:  'Green 3 Slider'",
+     "     VISIBLE:  'Green 3 Slider', cursor=1",
      "SPEECH OUTPUT: '3'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Green 1. Down Arrow", 
-    ["BRAILLE LINE:  ' $l Green 2 $lGreen 2 Slider'",
-     "     VISIBLE:  ' $l Green 2 $lGreen 2 Slider', cursor=15",
+    ["BRAILLE LINE:  'Green 2 Slider'",
+     "     VISIBLE:  'Green 2 Slider', cursor=1",
      "SPEECH OUTPUT: '2'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Green 2. Down Arrow", 
-    ["BRAILLE LINE:  ' $l Green 1 $lGreen 1 Slider'",
-     "     VISIBLE:  ' $l Green 1 $lGreen 1 Slider', cursor=15",
+    ["BRAILLE LINE:  'Green 1 Slider'",
+     "     VISIBLE:  'Green 1 Slider', cursor=1",
      "SPEECH OUTPUT: '1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Green 3. Down Arrow", 
-    ["BRAILLE LINE:  ' $l Green 0 $lGreen 0 Slider'",
-     "     VISIBLE:  ' $l Green 0 $lGreen 0 Slider', cursor=15",
+    ["BRAILLE LINE:  'Green 0 Slider'",
+     "     VISIBLE:  'Green 0 Slider', cursor=1",
      "SPEECH OUTPUT: '0'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Up"))
 sequence.append(utils.AssertPresentationAction(
     "Green 1. Page Up", 
-    ["BRAILLE LINE:  ' $l Green 64 $lGreen 64 Slider'",
-     "     VISIBLE:  ' $l Green 64 $lGreen 64 Slider', cursor=16",
+    ["BRAILLE LINE:  'Green 64 Slider'",
+     "     VISIBLE:  'Green 64 Slider', cursor=1",
      "SPEECH OUTPUT: '64'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Up"))
 sequence.append(utils.AssertPresentationAction(
     "Green 2. Page Up", 
-    ["BRAILLE LINE:  ' $l Green 128 $lGreen 128 Slider'",
-     "     VISIBLE:  ' $l Green 128 $lGreen 128 Slider', cursor=1",
+    ["BRAILLE LINE:  'Green 128 Slider'",
+     "     VISIBLE:  'Green 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:  ' $l Green 64 $lGreen 64 Slider'",
-     "     VISIBLE:  ' $l Green 64 $lGreen 64 Slider', cursor=16",
+    ["BRAILLE LINE:  'Green 64 Slider'",
+     "     VISIBLE:  'Green 64 Slider', cursor=1",
      "SPEECH OUTPUT: '64'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Page_Down"))
 sequence.append(utils.AssertPresentationAction(
     "Green 2. Page Down", 
-    ["BRAILLE LINE:  ' $l Green 0 $lGreen 0 Slider'",
-     "     VISIBLE:  ' $l Green 0 $lGreen 0 Slider', cursor=15",
+    ["BRAILLE LINE:  'Green 0 Slider'",
+     "     VISIBLE:  'Green 0 Slider', cursor=1",
      "SPEECH OUTPUT: '0'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("End"))
 sequence.append(utils.AssertPresentationAction(
     "Green End", 
-    ["BRAILLE LINE:  ' $l Green 255 $lGreen 255 Slider'",
-     "     VISIBLE:  ' $l Green 255 $lGreen 255 Slider', cursor=1",
+    ["BRAILLE LINE:  'Green 255 Slider'",
+     "     VISIBLE:  'Green 255 Slider', cursor=1",
      "SPEECH OUTPUT: '255'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Home"))
 sequence.append(utils.AssertPresentationAction(
     "Green Home", 
-    ["BRAILLE LINE:  ' $l Green 0 $lGreen 0 Slider'",
-     "     VISIBLE:  ' $l Green 0 $lGreen 0 Slider', cursor=15",
+    ["BRAILLE LINE:  'Green 0 Slider'",
+     "     VISIBLE:  'Green 0 Slider', cursor=1",
      "SPEECH OUTPUT: '0'"]))
 
 sequence.append(KeyComboAction("Tab"))
Index: test/keystrokes/firefox/yahoo_tab_view.py
===================================================================
--- test/keystrokes/firefox/yahoo_tab_view.py	(revision 4542)
+++ 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 Firefox Explorer Safari'",
-     "     VISIBLE:  'Opera Firefox Explorer Safari', cursor=1",
+     "BRAILLE LINE:  'Opera Page Firefox Page Explorer Page Safari Page'",
+     "     VISIBLE:  'Opera Page Firefox Page Explorer', 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 Firefox Explorer Safari'",
-     "     VISIBLE:  'Opera Firefox Explorer Safari', cursor=7",
+    ["BRAILLE LINE:  'Opera Page Firefox Page Explorer Page Safari Page'",
+     "     VISIBLE:  'Firefox Page Explorer Page Safar', cursor=1",
      "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 Firefox Explorer Safari'",
-     "     VISIBLE:  'Opera Firefox Explorer Safari', cursor=15",
+    ["BRAILLE LINE:  'Opera Page Firefox Page Explorer Page Safari Page'",
+     "     VISIBLE:  'Explorer Page Safari Page', cursor=1",
      "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 Firefox Explorer Safari'",
-     "     VISIBLE:  'Opera Firefox Explorer Safari', cursor=24",
+    ["BRAILLE LINE:  'Opera Page Firefox Page Explorer Page Safari Page'",
+     "     VISIBLE:  'Safari Page', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Safari page'"]))
 
@@ -86,8 +86,8 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  'Opera Firefox Explorer Safari'",
-     "     VISIBLE:  'Opera Firefox Explorer Safari', cursor=24",
+    ["BRAILLE LINE:  'Opera Page Firefox Page Explorer Page Safari Page'",
+     "     VISIBLE:  'Safari Page', cursor=1",
      "SPEECH OUTPUT: 'tab list'",
      "SPEECH OUTPUT: 'Safari page'",
      "SPEECH OUTPUT: 'item 4 of 4'",
@@ -100,8 +100,8 @@
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Left Arrow to the previous tab", 
-    ["BRAILLE LINE:  'Opera Firefox Explorer Safari'",
-     "     VISIBLE:  'Opera Firefox Explorer Safari', cursor=15",
+    ["BRAILLE LINE:  'Opera Page Firefox Page Explorer Page Safari Page'",
+     "     VISIBLE:  'Explorer Page Safari Page', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Explorer page'"]))
 
@@ -112,8 +112,8 @@
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Left Arrow to the previous tab", 
-    ["BRAILLE LINE:  'Opera Firefox Explorer Safari'",
-     "     VISIBLE:  'Opera Firefox Explorer Safari', cursor=7",
+    ["BRAILLE LINE:  'Opera Page Firefox Page Explorer Page Safari Page'",
+     "     VISIBLE:  'Firefox Page Explorer Page Safar', cursor=1",
      "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 Firefox Explorer Safari'",
-     "     VISIBLE:  'Opera Firefox Explorer Safari', cursor=1",
+    ["BRAILLE LINE:  'Opera Page Firefox Page Explorer Page Safari Page'",
+     "     VISIBLE:  'Opera Page Firefox Page Explorer', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Opera page'"]))
 
Index: test/keystrokes/firefox/moz_slider.py
===================================================================
--- test/keystrokes/firefox/moz_slider.py	(revision 4543)
+++ test/keystrokes/firefox/moz_slider.py	(working copy)
@@ -32,9 +32,8 @@
 sequence.append(KeyComboAction("Tab"))
 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:  'Move slider left Button 10% Slider Move slider right Button'",
-     "     VISIBLE:  '10% Slider Move slider right But', cursor=1",
+    ["BRAILLE LINE:  '10% Slider",
+     "     VISIBLE:  '10% Slider', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'My slider slider 10%'"]))
 
@@ -46,8 +45,8 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  'Move slider left Button 10% Slider Move slider right Button'",
-     "     VISIBLE:  '10% Slider Move slider right But', cursor=1",
+    ["BRAILLE LINE:  '10% Slider",
+     "     VISIBLE:  '10% Slider', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'slider'",
      "SPEECH OUTPUT: '10.0'",
@@ -66,8 +65,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "0 move slider", 
-    ["BRAILLE LINE:  'Move slider left Button $15.00 Slider Move slider right Button'",
-     "     VISIBLE:  '$15.00 Slider Move slider right ', cursor=1",
+    ["BRAILLE LINE:  '$15.00 Slider'",
+     "     VISIBLE:  '$15.00 Slider', cursor=1",
      "SPEECH OUTPUT: '$15.00'"]))
                                
 sequence.append(utils.StartRecordingAction())                       
@@ -79,8 +78,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "1 move slider", 
-    ["BRAILLE LINE:  'Move slider left Button $20.00 Slider Move slider right Button'",
-     "     VISIBLE:  '$20.00 Slider Move slider right ', cursor=1",
+    ["BRAILLE LINE:  '$20.00 Slider'",
+     "     VISIBLE:  '$20.00 Slider', cursor=1",
      "SPEECH OUTPUT: '$20.00'"]))
                               
 sequence.append(utils.StartRecordingAction())                         
@@ -92,8 +91,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "2 move slider", 
-    ["BRAILLE LINE:  'Move slider left Button $25.00 Slider Move slider right Button'",
-     "     VISIBLE:  '$25.00 Slider Move slider right ', cursor=1",
+    ["BRAILLE LINE:  '$25.00 Slider'",
+     "     VISIBLE:  '$25.00 Slider', cursor=1",
      "SPEECH OUTPUT: '$25.00'"]))
                                      
 sequence.append(utils.StartRecordingAction())           
@@ -105,8 +104,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "3 move slider", 
-    ["BRAILLE LINE:  'Move slider left Button $30.00 Slider Move slider right Button'",
-     "     VISIBLE:  '$30.00 Slider Move slider right ', cursor=1",
+    ["BRAILLE LINE:  '$30.00 Slider'",
+     "     VISIBLE:  '$30.00 Slider', cursor=1",
      "SPEECH OUTPUT: '$30.00'"]))
                                
 sequence.append(utils.StartRecordingAction())                        
@@ -118,8 +117,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "4 move slider", 
-    ["BRAILLE LINE:  'Move slider left Button $25.00 Slider Move slider right Button'",
-     "     VISIBLE:  '$25.00 Slider Move slider right ', cursor=1",
+    ["BRAILLE LINE:  '$25.00 Slider'",
+     "     VISIBLE:  '$25.00 Slider', cursor=1",
      "SPEECH OUTPUT: '$25.00'"]))
                                        
 sequence.append(utils.StartRecordingAction())                  
@@ -131,8 +130,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "5 move slider", 
-    ["BRAILLE LINE:  'Move slider left Button $20.00 Slider Move slider right Button'",
-     "     VISIBLE:  '$20.00 Slider Move slider right ', cursor=1",
+    ["BRAILLE LINE:  '$20.00 Slider'",
+     "     VISIBLE:  '$20.00 Slider', cursor=1",
      "SPEECH OUTPUT: '$20.00'"]))
                                      
 sequence.append(utils.StartRecordingAction())                    
@@ -144,8 +143,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "6 move slider", 
-    ["BRAILLE LINE:  'Move slider left Button $15.00 Slider Move slider right Button'",
-     "     VISIBLE:  '$15.00 Slider Move slider right ', cursor=1",
+    ["BRAILLE LINE:  '$15.00 Slider'",
+     "     VISIBLE:  '$15.00 Slider', cursor=1",
      "SPEECH OUTPUT: '$15.00'"]))                           
   
 sequence.append(utils.StartRecordingAction())                     
@@ -157,8 +156,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "7 move slider", 
-    ["BRAILLE LINE:  'Move slider left Button $10.00 Slider Move slider right Button'",
-     "     VISIBLE:  '$10.00 Slider Move slider right ', cursor=1",
+    ["BRAILLE LINE:  '$10.00 Slider'",
+     "     VISIBLE:  '$10.00 Slider', cursor=1",
      "SPEECH OUTPUT: '$10.00'"]))   
                             
 #  Move the slider with the 'end' key.
@@ -172,8 +171,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "move slider end", 
-    ["BRAILLE LINE:  'Move slider left Button $100.00 Slider Move slider right Button'",
-     "     VISIBLE:  '$100.00 Slider Move slider right', cursor=1",
+    ["BRAILLE LINE:  '$100.00 Slider'",
+     "     VISIBLE:  '$100.00 Slider', cursor=1",
      "SPEECH OUTPUT: '$100.00'"]))
                                
 #  Move the slider with the 'home' key.
@@ -187,8 +186,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "move slider home", 
-    ["BRAILLE LINE:  'Move slider left Button $0.00 Slider Move slider right Button'",
-     "     VISIBLE:  '$0.00 Slider Move slider right B', cursor=1",
+    ["BRAILLE LINE:  '$0.00 Slider'",
+     "     VISIBLE:  '$0.00 Slider', cursor=1",
      "SPEECH OUTPUT: '$0.00'"]))
 
 ########################################################################
Index: src/orca/scripts/toolkits/Gecko/script.py
===================================================================
--- src/orca/scripts/toolkits/Gecko/script.py	(revision 4543)
+++ src/orca/scripts/toolkits/Gecko/script.py	(working copy)
@@ -2196,6 +2196,25 @@
                 lineContentsOffset = max(0, focusedCharacterOffset - 1)
                 needToRefresh = True
 
+        if not self.isNavigableAria(focusedObj):
+            # Sometimes looking for the first caret context means that we
+            # are on a child within a non-navigable object (such as the
+            # text within a page tab). If so, set the focusedObj to the
+            # parent widget.
+            #
+            if not self.isAriaWidget(focusedObj):
+                focusedObj, focusedCharacterOffset = focusedObj.parent, 0
+                lineContentsOffset = 0
+
+        # Sometimes we just want to present the current object rather
+        # than the full line. For instance, if we're on a slider we
+        # should just present that slider. We'll assume we want the
+        # full line, however.
+        #
+        presentOnlyFocusedObj = False
+        if focusedObj.getRole() == pyatspi.ROLE_SLIDER:
+            presentOnlyFocusedObj = True
+
         contents = self.currentLineContents
         index = self.findObjectOnLine(focusedObj,
                                       max(0, lineContentsOffset),
@@ -2219,9 +2238,11 @@
             [obj, startOffset, endOffset, string] = content
             if not obj:
                 continue
+            elif presentOnlyFocusedObj and not isFocusedObj:
+                continue
 
             role = obj.getRole()
-            if not len(string) \
+            if (not len(string) and role != pyatspi.ROLE_PARAGRAPH) \
                or role in [pyatspi.ROLE_ENTRY,
                            pyatspi.ROLE_PASSWORD_TEXT,
                            pyatspi.ROLE_LINK]:
