Index: test/keystrokes/oowriter/bug_450210.py
===================================================================
--- test/keystrokes/oowriter/bug_450210.py	(revision 3863)
+++ test/keystrokes/oowriter/bug_450210.py	(working copy)
@@ -37,7 +37,6 @@
      "     VISIBLE:  'soffice Application Open Dialog', cursor=21",
      "BRAILLE LINE:  'soffice Application Open Dialog File name: File name: List'",
      "     VISIBLE:  'File name: File name: List', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Open'",
      "SPEECH OUTPUT: 'File name: combo box'",
      "SPEECH OUTPUT: 'File name: list'"]))
Index: test/keystrokes/oowriter/bug_382415.py
===================================================================
--- test/keystrokes/oowriter/bug_382415.py	(revision 3863)
+++ test/keystrokes/oowriter/bug_382415.py	(working copy)
@@ -28,8 +28,8 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Down arrow to next line",
-    ["BRAILLE LINE:  'December 2006 $l'",
-     "     VISIBLE:  'December 2006 $l', cursor=1",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  'soffice Application Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=16",
      "SPEECH OUTPUT: 'This is a test.'"]))
@@ -42,8 +42,8 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Down arrow to move to the Mon table column header",
-    ["BRAILLE LINE:  'This is a test. $l'",
-     "     VISIBLE:  'This is a test. $l', cursor=1",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  'soffice Application Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Mon Paragraph'",
      "     VISIBLE:  'Mon Paragraph', cursor=1",
      "SPEECH OUTPUT: 'Cell B1'",
Index: test/keystrokes/oowriter/bug_353268.py
===================================================================
--- test/keystrokes/oowriter/bug_353268.py	(revision 3863)
+++ test/keystrokes/oowriter/bug_353268.py	(working copy)
@@ -61,8 +61,8 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Arrow down over first line of text",
-    ["BRAILLE LINE:  'Line 1 $l'",
-     "     VISIBLE:  'Line 1 $l', cursor=1",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view Line 2 $l'",
      "     VISIBLE:  'Line 2 $l', cursor=1",
      "SPEECH OUTPUT: 'Line 2'"]))
@@ -75,8 +75,8 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Arrow down over second line of text",
-    ["BRAILLE LINE:  'Line 2 $l'",
-     "     VISIBLE:  'Line 2 $l', cursor=1",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view  $l'",
      "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
Index: test/keystrokes/oowriter/bug_350219.py
===================================================================
--- test/keystrokes/oowriter/bug_350219.py	(revision 3863)
+++ test/keystrokes/oowriter/bug_350219.py	(working copy)
@@ -34,7 +34,6 @@
      "     VISIBLE:  'Untitled2 - OpenOffice.org Write', cursor=1",
      "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane Panel'",
      "     VISIBLE:  'Panel', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Untitled2 - OpenOffice.org Writer frame'",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'panel'"]))
Index: test/keystrokes/oowriter/bug_382408.py
===================================================================
--- test/keystrokes/oowriter/bug_382408.py	(revision 3863)
+++ test/keystrokes/oowriter/bug_382408.py	(working copy)
@@ -35,8 +35,8 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to the next line",
-    ["BRAILLE LINE:  'December 2006 $l'",
-     "     VISIBLE:  'December 2006 $l', cursor=1",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  'soffice Application Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=16",
      "SPEECH OUTPUT: 'This is a test.'"]))
@@ -49,8 +49,8 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to the Mon table column header",
-    ["BRAILLE LINE:  'This is a test. $l'",
-     "     VISIBLE:  'This is a test. $l', cursor=1",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  'soffice Application Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Sun Mon Tue Wed Thu Fri Sat'",
      "     VISIBLE:  'Mon Tue Wed Thu Fri Sat', cursor=1",
      "SPEECH OUTPUT: 'Sun Mon Tue Wed Thu Fri Sat'",
Index: test/keystrokes/oowriter/bug_382418.py
===================================================================
--- test/keystrokes/oowriter/bug_382418.py	(revision 3863)
+++ test/keystrokes/oowriter/bug_382418.py	(working copy)
@@ -82,8 +82,8 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to enter the table",
-    ["BRAILLE LINE:  'Line 1 $l'",
-     "     VISIBLE:  'Line 1 $l', cursor=1",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'table with 2 rows and 2 columns.'",
      "SPEECH OUTPUT: 'Cell A1'"]))
 
Index: test/keystrokes/oowriter/bug_382880.py
===================================================================
--- test/keystrokes/oowriter/bug_382880.py	(revision 3863)
+++ test/keystrokes/oowriter/bug_382880.py	(working copy)
@@ -28,8 +28,8 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to the next line",
-    ["BRAILLE LINE:  'December 2006 $l'",
-     "     VISIBLE:  'December 2006 $l', cursor=1",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  'soffice Application Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=16",
      "SPEECH OUTPUT: 'This is a test.'"]))
@@ -42,8 +42,8 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to the Mon table column header",
-    ["BRAILLE LINE:  'This is a test. $l'",
-     "     VISIBLE:  'This is a test. $l', cursor=1",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  'soffice Application Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Mon Paragraph'",
      "     VISIBLE:  'Mon Paragraph', cursor=1",
      "SPEECH OUTPUT: 'Cell B1'",
Index: test/keystrokes/oowriter/bug_385828.py
===================================================================
--- test/keystrokes/oowriter/bug_385828.py	(revision 3863)
+++ test/keystrokes/oowriter/bug_385828.py	(working copy)
@@ -40,11 +40,9 @@
      "     VISIBLE:  'aw-5blue (read-only) - OpenOffic', cursor=1",
      "BRAILLE LINE:  'soffice Application Agenda Wizard Dialog'",
      "     VISIBLE:  'Agenda Wizard Dialog', cursor=1",
-     "BRAILLE LINE:  'soffice Application Agenda Wizard Dialog Steps Panel Page design $l'",
-     "     VISIBLE:  'Page design $l', cursor=1",
-     "SPEECH OUTPUT: ''",
+     "BRAILLE LINE:  'soffice Application Agenda Wizard Dialog Steps Panel  $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'aw-5blue (read-only) - OpenOffice.org Writer frame'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Agenda Wizard'",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Page design label'"]))
Index: test/keystrokes/oowriter/bug_362979.py
===================================================================
--- test/keystrokes/oowriter/bug_362979.py	(revision 3863)
+++ test/keystrokes/oowriter/bug_362979.py	(working copy)
@@ -91,8 +91,8 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Move to second bulleted line",
-    ["BRAILLE LINE:  '•Line 1 $l'",
-     "     VISIBLE:  '•Line 1 $l', cursor=1",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view •Line 2 $l'",
      "     VISIBLE:  '•Line 2 $l', cursor=2",
      "SPEECH OUTPUT: '•Line 2'"]))
Index: test/keystrokes/oowriter/bug_382888.py
===================================================================
--- test/keystrokes/oowriter/bug_382888.py	(revision 3863)
+++ test/keystrokes/oowriter/bug_382888.py	(working copy)
@@ -28,8 +28,8 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to the next line",
-    ["BRAILLE LINE:  'December 2006 $l'",
-     "     VISIBLE:  'December 2006 $l', cursor=1",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  'soffice Application Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=16",
      "SPEECH OUTPUT: 'This is a test.'"]))
@@ -42,8 +42,8 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to the Mon table column header",
-    ["BRAILLE LINE:  'This is a test. $l'",
-     "     VISIBLE:  'This is a test. $l', cursor=1",
+    ["BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  'soffice Application Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Mon Paragraph'",
      "     VISIBLE:  'Mon Paragraph', cursor=1",
      "SPEECH OUTPUT: 'Cell B1'",
