[orca] Updating the Firefox regression tests



commit 33315694be19a544f74b500a1601497a395733e4
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Sun Dec 26 23:18:20 2010 -0500

    Updating the Firefox regression tests

 test/harness/utils.py                              |    2 +-
 test/keystrokes/firefox/bug_512303.py              |    2 -
 test/keystrokes/firefox/bug_544771.py              |    8 +-
 test/keystrokes/firefox/bug_552887a.py             |   38 +-
 test/keystrokes/firefox/bug_568631.py              |    2 +-
 test/keystrokes/firefox/bug_589455.py              |    6 +-
 test/keystrokes/firefox/codetalks_alert.py         |   26 +-
 test/keystrokes/firefox/codetalks_button.py        |    2 +-
 test/keystrokes/firefox/codetalks_tree.py          |    2 +
 test/keystrokes/firefox/dojo_button.py             |  469 ++++++++++----------
 test/keystrokes/firefox/dojo_checkbox.py           |   16 +-
 test/keystrokes/firefox/dojo_slider.py             |  129 +++---
 test/keystrokes/firefox/dojo_spinner.py            |    2 +-
 test/keystrokes/firefox/dojo_tabcontainer.py       |    2 +-
 test/keystrokes/firefox/find_wiki.py               |    6 +-
 test/keystrokes/firefox/html_role_links.py         |   22 +-
 .../firefox/html_role_list_item_where_am_i.py      |   12 +-
 test/keystrokes/firefox/html_role_lists.py         |   80 ++--
 .../firefox/html_struct_nav_blockquote.py          |    2 -
 .../firefox/html_struct_nav_bug_554616.py          |   42 ++-
 .../firefox/html_struct_nav_bug_556470.py          |   36 +-
 .../firefox/html_struct_nav_large_obj.py           |    2 -
 test/keystrokes/firefox/html_struct_nav_links.py   |   24 +-
 .../firefox/html_struct_nav_list_item.py           |  150 ++++---
 24 files changed, 548 insertions(+), 534 deletions(-)
---
diff --git a/test/harness/utils.py b/test/harness/utils.py
index a13ab0b..f6bc4d3 100644
--- a/test/harness/utils.py
+++ b/test/harness/utils.py
@@ -29,7 +29,7 @@ htmlURLPrefix = "file://" + htmlDir + "/"
 # These regex's attempt to provide a way to manage those differences.
 #
 firefoxAppNames = "(Firefox|Minefield|Namoroka)"
-firefoxFrameNames = "(Mozilla Firefox|Mozilla Firefox 3.1 Beta 2|Mozilla Firefox 3.1 Beta 3|Minefield|Mozilla Firefox 3.5 Beta 4|Namoroka)"
+firefoxFrameNames = "(Mozilla Firefox|Mozilla Firefox 4.0 Beta 7|Minefield|Namoroka)"
 firefoxLocationBarNames = "(Location|Search Bookmarks and History)"
 
 # Various OpenOffice names as a regex.  These are needed because OOo likes
diff --git a/test/keystrokes/firefox/bug_512303.py b/test/keystrokes/firefox/bug_512303.py
index 93df8b7..2420434 100644
--- a/test/keystrokes/firefox/bug_512303.py
+++ b/test/keystrokes/firefox/bug_512303.py
@@ -33,8 +33,6 @@ sequence.append(utils.AssertPresentationAction(
     "Top of file",
     ["BRAILLE LINE:  'Below is a table, with some sample table data'",
      "     VISIBLE:  'Below is a table, with some samp', cursor=1",
-     "BRAILLE LINE:  'Below is a table, with some sample table data'",
-     "     VISIBLE:  'Below is a table, with some samp', cursor=1",
      "SPEECH OUTPUT: 'Below is a table, with some sample table data'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/bug_544771.py b/test/keystrokes/firefox/bug_544771.py
index 070633f..ccf9bfb 100644
--- a/test/keystrokes/firefox/bug_544771.py
+++ b/test/keystrokes/firefox/bug_544771.py
@@ -48,16 +48,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "1. Tab", 
-    ["BRAILLE LINE:  'â?¢ First item'",
-     "     VISIBLE:  'â?¢ First item', cursor=3",
+    ["BRAILLE LINE:  'â?¢First item'",
+     "     VISIBLE:  'â?¢First item', cursor=2",
      "SPEECH OUTPUT: 'First item link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "2. Tab", 
-    ["BRAILLE LINE:  'â?¢ Second item'",
-     "     VISIBLE:  'â?¢ Second item', cursor=3",
+    ["BRAILLE LINE:  'â?¢Second item'",
+     "     VISIBLE:  'â?¢Second item', cursor=2",
      "SPEECH OUTPUT: 'Second item link'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/bug_552887a.py b/test/keystrokes/firefox/bug_552887a.py
index ec39c6f..1c5d635 100644
--- a/test/keystrokes/firefox/bug_552887a.py
+++ b/test/keystrokes/firefox/bug_552887a.py
@@ -73,12 +73,8 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
     ["BUG? - Now we are treating what used to be several lines as one line/the image name. Why? Seems to be a Firefox 4.0 thing.",
-     "BRAILLE LINE:  'The Orca logo Image'",
-     "     VISIBLE:  'The Orca logo Image', cursor=1",
      "BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=0",
-     "SPEECH OUTPUT: 'The Orca logo link image ",
-                     " link image'",
      "SPEECH OUTPUT: 'The Orca logo Can an Orca really hold a white cane? (And why aren't we speaking this text? link image'"]))
 
 #sequence.append(utils.StartRecordingAction())
@@ -308,23 +304,23 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Can an Orca really hold', cursor=1",
      "SPEECH OUTPUT: 'Can an Orca really hold'"]))
 
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "12. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
-     "SPEECH OUTPUT: '",
-     " link image'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "13. Line Up",
-    ["BRAILLE LINE:  'The Orca logo Image'",
-     "     VISIBLE:  'The Orca logo Image', cursor=1",
-     "SPEECH OUTPUT: 'The Orca logo link image ",
-     " link image'"]))
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("Up"))
+#sequence.append(utils.AssertPresentationAction(
+#    "12. Line Up",
+#    ["BRAILLE LINE:  ''",
+#     "     VISIBLE:  '', cursor=0",
+#     "SPEECH OUTPUT: '",
+#     " link image'"]))
+#
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("Up"))
+#sequence.append(utils.AssertPresentationAction(
+#    "13. Line Up",
+#    ["BRAILLE LINE:  'The Orca logo Image'",
+#     "     VISIBLE:  'The Orca logo Image', cursor=1",
+#     "SPEECH OUTPUT: 'The Orca logo link image ",
+#     " link image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/bug_568631.py b/test/keystrokes/firefox/bug_568631.py
index 72712ff..0b563e4 100644
--- a/test/keystrokes/firefox/bug_568631.py
+++ b/test/keystrokes/firefox/bug_568631.py
@@ -45,7 +45,7 @@ sequence.append(utils.AssertPresentationAction(
 # This assertion isn't even necessary as we actually care about what
 # comes after we press Return.
 #
-for i in range(24):
+for i in range(25):
     sequence.append(KeyComboAction("Tab", 1000))
 
 # Just a little extra wait to let some events get through.
diff --git a/test/keystrokes/firefox/bug_589455.py b/test/keystrokes/firefox/bug_589455.py
index c0a4fed..715b997 100644
--- a/test/keystrokes/firefox/bug_589455.py
+++ b/test/keystrokes/firefox/bug_589455.py
@@ -33,8 +33,6 @@ sequence.append(utils.AssertPresentationAction(
     "Top of file",
     ["BRAILLE LINE:  'Here is a result:'",
      "     VISIBLE:  'Here is a result:', cursor=1",
-     "BRAILLE LINE:  'Here is a result:'",
-     "     VISIBLE:  'Here is a result:', cursor=1",
      "SPEECH OUTPUT: 'Here is a result:'"]))
 
 ########################################################################
@@ -44,8 +42,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("3"))
 sequence.append(utils.AssertPresentationAction(
     "Press 3 to move to the heading at level 3",
-    ["BRAILLE LINE:  '1. Anchors2.html h3'",
-     "     VISIBLE:  '1. Anchors2.html h3', cursor=4",
+    ["BRAILLE LINE:  '1.Anchors2.html h3'",
+     "     VISIBLE:  '1.Anchors2.html h3', cursor=3",
      "SPEECH OUTPUT: 'Anchors2.html link heading level 3'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/codetalks_alert.py b/test/keystrokes/firefox/codetalks_alert.py
index e23072f..fc476cc 100644
--- a/test/keystrokes/firefox/codetalks_alert.py
+++ b/test/keystrokes/firefox/codetalks_alert.py
@@ -61,6 +61,8 @@ sequence.append(utils.AssertPresentationAction(
     ["KNOWN ISSUE - A focus event went missing: https://bugzilla.mozilla.org/show_bug.cgi?id=579964";,
      "BRAILLE LINE:  'close'",
      "     VISIBLE:  'close', cursor=1",
+     "BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=0",
      "SPEECH OUTPUT: 'close link'",
      "SPEECH OUTPUT: 'This popup is created as a div in the HTML content, rather than being created in the DOM at the time of use. The display style is changed from \"none\" to \"block\" to hide and show it. close'"]))
 
@@ -71,7 +73,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "1. Up Arrow", 
-    ["KNOWN ISSUE - A focus event went missing: https://bugzilla.mozilla.org/show_bug.cgi?id=579964";,
+    ["BRAILLE LINE:  'close'",
+     "     VISIBLE:  'close', cursor=1",
      "BRAILLE LINE:  '\"none\" to \"block\" to hide and show it.'",
      "     VISIBLE:  '\"none\" to \"block\" to hide and sh', cursor=1",
      "SPEECH OUTPUT: '\"none\" to \"block\" to hide and show it. alert'"]))
@@ -80,8 +83,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "2. Up Arrow", 
-    ["KNOWN ISSUE - A focus event went missing: https://bugzilla.mozilla.org/show_bug.cgi?id=579964";,
-     "BRAILLE LINE:  'the time of use. The display style is changed from'",
+    ["BRAILLE LINE:  'the time of use. The display style is changed from'",
      "     VISIBLE:  'the time of use. The display sty', cursor=1",
      "SPEECH OUTPUT: 'the time of use. The display style is changed from alert'"]))
 
@@ -89,8 +91,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "3. Up Arrow", 
-    ["KNOWN ISSUE - A focus event went missing: https://bugzilla.mozilla.org/show_bug.cgi?id=579964";,
-     "BRAILLE LINE:  'content, rather than being created in the DOM at'",
+    ["BRAILLE LINE:  'content, rather than being created in the DOM at'",
      "     VISIBLE:  'content, rather than being creat', cursor=1",
      "SPEECH OUTPUT: 'content, rather than being created in the DOM at alert'"]))
 
@@ -98,8 +99,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "4. Up Arrow", 
-    ["KNOWN ISSUE - A focus event went missing: https://bugzilla.mozilla.org/show_bug.cgi?id=579964";,
-     "BRAILLE LINE:  'This popup is created as a div in the HTML'",
+    ["BRAILLE LINE:  'This popup is created as a div in the HTML'",
      "     VISIBLE:  'This popup is created as a div i', cursor=1",
      "SPEECH OUTPUT: 'This popup is created as a div in the HTML alert'"]))
 
@@ -110,8 +110,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Down Arrow", 
-    ["KNOWN ISSUE - A focus event went missing: https://bugzilla.mozilla.org/show_bug.cgi?id=579964";,
-     "BRAILLE LINE:  'content, rather than being created in the DOM at'",
+    ["BRAILLE LINE:  'content, rather than being created in the DOM at'",
      "     VISIBLE:  'content, rather than being creat', cursor=1",
      "SPEECH OUTPUT: 'content, rather than being created in the DOM at alert'"]))
 
@@ -119,8 +118,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down Arrow", 
-    ["KNOWN ISSUE - A focus event went missing: https://bugzilla.mozilla.org/show_bug.cgi?id=579964";,
-     "BRAILLE LINE:  'the time of use. The display style is changed from'",
+    ["BRAILLE LINE:  'the time of use. The display style is changed from'",
      "     VISIBLE:  'the time of use. The display sty', cursor=1",
      "SPEECH OUTPUT: 'the time of use. The display style is changed from alert'"]))
 
@@ -128,8 +126,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Down Arrow", 
-    ["KNOWN ISSUE - A focus event went missing: https://bugzilla.mozilla.org/show_bug.cgi?id=579964";,
-     "BRAILLE LINE:  '\"none\" to \"block\" to hide and show it.'",
+    ["BRAILLE LINE:  '\"none\" to \"block\" to hide and show it.'",
      "     VISIBLE:  '\"none\" to \"block\" to hide and sh', cursor=1",
      "SPEECH OUTPUT: '\"none\" to \"block\" to hide and show it. alert'"]))
 
@@ -137,8 +134,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Down Arrow", 
-    ["KNOWN ISSUE - A focus event went missing: https://bugzilla.mozilla.org/show_bug.cgi?id=579964";,
-     "BRAILLE LINE:  'close'",
+    ["BRAILLE LINE:  'close'",
      "     VISIBLE:  'close', cursor=1",
      "SPEECH OUTPUT: 'close link'"]))
 
diff --git a/test/keystrokes/firefox/codetalks_button.py b/test/keystrokes/firefox/codetalks_button.py
index ea954c0..1854571 100644
--- a/test/keystrokes/firefox/codetalks_button.py
+++ b/test/keystrokes/firefox/codetalks_button.py
@@ -40,7 +40,7 @@ sequence.append(utils.AssertPresentationAction(
     "Tab to Tracking number text entry", 
     ["BRAILLE LINE:  'Tracking number Tracking number  $l'",
      "     VISIBLE:  'Tracking number  $l', cursor=17",
-     "SPEECH OUTPUT: 'Order tracking panel Tracking number text '"]))
+     "SPEECH OUTPUT: 'Order tracking panel Tracking number text'"]))
 
 ########################################################################
 # Tab to the "Check Now" push button
diff --git a/test/keystrokes/firefox/codetalks_tree.py b/test/keystrokes/firefox/codetalks_tree.py
index 2d7fa2e..03e8317 100644
--- a/test/keystrokes/firefox/codetalks_tree.py
+++ b/test/keystrokes/firefox/codetalks_tree.py
@@ -49,6 +49,8 @@ sequence.append(utils.AssertPresentationAction(
     "Left Arrow to collapse fruits", 
     ["BRAILLE LINE:  'Fruits Fruits collapsed ListItem'",
      "     VISIBLE:  'Fruits Fruits collapsed ListItem', cursor=1",
+     "BRAILLE LINE:  'Fruits Fruits collapsed ListItem'",
+     "     VISIBLE:  'Fruits Fruits collapsed ListItem', cursor=1",
      "SPEECH OUTPUT: 'collapsed'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/dojo_button.py b/test/keystrokes/firefox/dojo_button.py
index ae02688..7a5a9b0 100644
--- a/test/keystrokes/firefox/dojo_button.py
+++ b/test/keystrokes/firefox/dojo_button.py
@@ -33,7 +33,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the <button> button", 
-    ["BRAILLE LINE:  '<button> Button <input type='button'> Button Create  View  Create Button save options Menu'",
+    ["BRAILLE LINE:  '<button> Button <input type='button'> Button Create Create Button Disabled Button Create Button save options Menu Edit!Edit Button Colorcolor Button Save Button save options Menu Disabled Button '",
      "     VISIBLE:  '<button> Button <input type='but', cursor=1",
      "SPEECH OUTPUT: '<button> button'"]))
 
@@ -45,7 +45,7 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I on <button>", 
-    ["BRAILLE LINE:  '<button> Button <input type='button'> Button Create  View  Create Button save options Menu'",
+    ["BRAILLE LINE:  '<button> Button <input type='button'> Button Create Create Button Disabled Button Create Button save options Menu Edit!Edit Button Colorcolor Button Save Button save options Menu Disabled Button '",
      "     VISIBLE:  '<button> Button <input type='but', cursor=1",
      "SPEECH OUTPUT: '<button> button'"]))
 
@@ -57,7 +57,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to <input type='button'>",
-    ["BRAILLE LINE:  '<button> Button <input type='button'> Button Create  View  Create Button save options Menu'",
+    ["BRAILLE LINE:  '<button> Button <input type='button'> Button Create Create Button Disabled Button Create Button save options Menu Edit!Edit Button Colorcolor Button Save Button save options Menu Disabled Button '",
      "     VISIBLE:  '<input type='button'> Button Cre', cursor=1",
      "SPEECH OUTPUT: '<input type='button'> button'"]))
 
@@ -69,7 +69,7 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I on <input type='button'>", 
-    ["BRAILLE LINE:  '<button> Button <input type='button'> Button Create  View  Create Button save options Menu'",
+    ["BRAILLE LINE:  '<button> Button <input type='button'> Button Create Create Button Disabled Button Create Button save options Menu Edit!Edit Button Colorcolor Button Save Button save options Menu Disabled Button '",
      "     VISIBLE:  '<input type='button'> Button Cre', cursor=1",
      "SPEECH OUTPUT: '<input type='button'> button'"]))
 
@@ -81,8 +81,10 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Tab to Create",
-    ["BRAILLE LINE:  '<button> <input type='button'> Create  View  Createsave options Menu'",
-     "     VISIBLE:  'Create  View  Create Button save', cursor=1",
+    ["BRAILLE LINE:  '<button> Button <input type='button'> Button Create'",
+     "     VISIBLE:  'Create', cursor=1",
+     "BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=0",
      "SPEECH OUTPUT: 'Create button'",
      "SPEECH OUTPUT: 'tooltip on button'"]))
 
@@ -94,8 +96,10 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I on Create", 
-    ["BRAILLE LINE:  '<button> <input type='button'> Create  View  Createsave options Menu'",
-     "     VISIBLE:  'Create  View  Create Button save', cursor=1",
+    ["BRAILLE LINE:  '<button> Button <input type='button'> Button Create'",
+     "     VISIBLE:  'Create', cursor=1",
+     "BRAILLE LINE:  '<button> Button <input type='button'> Button Create'",
+     "     VISIBLE:  'Create', cursor=1",
      "SPEECH OUTPUT: 'Create button'"]))
 
 # WDW - Tabbing to the Create button pops up a tooltip.  Should we present
@@ -111,8 +115,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to drop down menu on Create", 
-    ["BRAILLE LINE:  '<button> Button <input type='button'> Button $lsave options Menu'",
-     "     VISIBLE:  'save options Menu', cursor=1",
+    ["BRAILLE LINE:  '<button> Button <input type='button'> Button $lsave options Menu $lsave options Menu'",
+     "     VISIBLE:  'save options Menu $lsave options', cursor=1",
      "SPEECH OUTPUT: 'save options menu'"]))
 
 ########################################################################
@@ -123,8 +127,8 @@ sequence.append(KeyComboAction("KP_Enter"))
 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 $lsave options Menu'",
-     "     VISIBLE:  'save options Menu', cursor=1",
+    ["BRAILLE LINE:  '<button> Button <input type='button'> Button $lsave options Menu $lsave options Menu'",
+     "     VISIBLE:  'save options Menu $lsave options', cursor=1",
      "SPEECH OUTPUT: 'save options menu'"]))
 
 ########################################################################
@@ -135,171 +139,166 @@ sequence.append(TypeAction(" "))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Open drop down menu on Create", 
-    ["KNOWN ISSUE -- http://bugzilla.gnome.org/show_bug.cgi?id=569345. In addition, the demo is broken at the moment."]))
-#     "BRAILLE LINE:  'Create blank'",
-#     "     VISIBLE:  'Create blank', cursor=1",
-#     "BRAILLE LINE:  'Menu'",
-#     "     VISIBLE:  'Menu', cursor=1",
-#     "SPEECH OUTPUT: 'Create blank'",
-#     "SPEECH OUTPUT: 'menu'"]))
+    ["BRAILLE LINE:  'Menu'",
+     "     VISIBLE:  'Menu', cursor=1",
+     "SPEECH OUTPUT: 'menu'"]))
 
 ########################################################################
 # Go down a menu item.
 #
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(WaitForFocus("Create from template", acc_role=pyatspi.ROLE_MENU_ITEM))
-#sequence.append(utils.AssertPresentationAction(
-#    "Down to Create from template",
-#    ["KNOWN ISSUE -- demo is broken at the moment."]))
-#     "BRAILLE LINE:  'Create from template'",
-#     "     VISIBLE:  'Create from template', cursor=1",
-#     "SPEECH OUTPUT: 'Create from template'"]))
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(WaitForFocus("Create from template", acc_role=pyatspi.ROLE_MENU_ITEM))
+sequence.append(utils.AssertPresentationAction(
+    "Down to Create from template",
+    ["BRAILLE LINE:  'Create from template'",
+     "     VISIBLE:  'Create from template', cursor=1",
+     "SPEECH OUTPUT: 'Create from template'"]))
 
 ########################################################################
 # Close the menu and go to the Edit! button
 #
-#sequence.append(KeyComboAction("Escape"))
+sequence.append(KeyComboAction("Escape"))
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Go to Edit!", 
-    ["BRAILLE LINE:  'Edit! Color Save Button save options Menu Disabled '",
-     "     VISIBLE:  'Edit! Color Save Button save opt', cursor=1",
-     "SPEECH OUTPUT: 'Edit! menu'"]))
+    ["BRAILLE LINE:  '<button> Button <input type='button'> Button $lsave options Menu $lsave options Menu'",
+     "     VISIBLE:  'save options Menu $lsave options', cursor=1",
+     "SPEECH OUTPUT: 'save options menu'"]))
 
 ########################################################################
 # Open the Edit! menu and navigate through it.
 #
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_MENU))
-#sequence.append(utils.AssertPresentationAction(
-#    "Open the Edit! menu", 
-#    ["KNOWN ISSUE -- http://bugzilla.gnome.org/show_bug.cgi?id=569345. In addition, the demo is broken at the moment."]))
-#     "BRAILLE LINE:  'Cut'",
-#     "     VISIBLE:  'Cut', cursor=1",
-#     "BRAILLE LINE:  'Menu'",
-#     "     VISIBLE:  'Menu', cursor=1",
-#     "SPEECH OUTPUT: 'Cut'",
-#     "SPEECH OUTPUT: 'menu'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(WaitForFocus("Copy", acc_role=pyatspi.ROLE_MENU_ITEM))
-#sequence.append(utils.AssertPresentationAction(
-#    "Go to Copy", 
-#    ["BRAILLE LINE:  'Copy'",
-#     "     VISIBLE:  'Copy', cursor=1",
-#     "SPEECH OUTPUT: 'Copy'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(WaitForFocus("Paste", acc_role=pyatspi.ROLE_MENU_ITEM))
-#sequence.append(utils.AssertPresentationAction(
-#    "Go to Paste", 
-#    ["BRAILLE LINE:  'Paste'",
-#     "     VISIBLE:  'Paste', cursor=1",
-#     "SPEECH OUTPUT: 'Paste'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(WaitForFocus("Submenu", acc_role=pyatspi.ROLE_MENU_ITEM))
-#sequence.append(utils.AssertPresentationAction(
-#    "Goto Submenu", 
-#    ["BRAILLE LINE:  'Submenu'",
-#     "     VISIBLE:  'Submenu', cursor=1",
-#     "SPEECH OUTPUT: 'Submenu'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Right"))
-#sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_MENU))
-#sequence.append(utils.AssertPresentationAction(
-#    "Open Submenu", 
-#    ["KNOWN ISSUE -- http://bugzilla.gnome.org/show_bug.cgi?id=569345";,
-#     "BRAILLE LINE:  'Menu'",
-#     "     VISIBLE:  'Menu', cursor=1",
-#     "BRAILLE LINE:  'Submenu Item One'",
-#     "     VISIBLE:  'Submenu Item One', cursor=1",
-#     "SPEECH OUTPUT: 'menu'",
-#     "SPEECH OUTPUT: 'Submenu Item One'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(WaitForFocus("Submenu Item Two", acc_role=pyatspi.ROLE_MENU_ITEM))
-#sequence.append(utils.AssertPresentationAction(
-#    "Down to Submenu Item Two", 
-#    ["BRAILLE LINE:  'Submenu Item Two'",
-#     "     VISIBLE:  'Submenu Item Two', cursor=1",
-#     "SPEECH OUTPUT: 'Submenu Item Two'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(WaitForFocus("Deeper Submenu", acc_role=pyatspi.ROLE_MENU_ITEM))
-#sequence.append(utils.AssertPresentationAction(
-#    "Down to Deeper Submenu", 
-#    ["BRAILLE LINE:  'Deeper Submenu'",
-#     "     VISIBLE:  'Deeper Submenu', cursor=1",
-#     "SPEECH OUTPUT: 'Deeper Submenu'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Right"))
-#sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_MENU))
-#sequence.append(utils.AssertPresentationAction(
-#    "Right to open Deeper Submenu", 
-#    ["KNOWN ISSUE -- http://bugzilla.gnome.org/show_bug.cgi?id=569345";,
-#     "BRAILLE LINE:  'Menu'",
-#     "     VISIBLE:  'Menu', cursor=1",
-#     "BRAILLE LINE:  'Sub-sub-menu Item One'",
-#     "     VISIBLE:  'Sub-sub-menu Item One', cursor=1",
-#     "SPEECH OUTPUT: 'menu'",
-#     "SPEECH OUTPUT: 'Sub-sub-menu Item One'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(WaitForFocus("Sub-sub-menu Item Two", acc_role=pyatspi.ROLE_MENU_ITEM))
-#sequence.append(utils.AssertPresentationAction(
-#    "Down to Sub-sub-menu Item Two", 
-#    ["BRAILLE LINE:  'Sub-sub-menu Item Two'",
-#     "     VISIBLE:  'Sub-sub-menu Item Two', cursor=1",
-#     "SPEECH OUTPUT: 'Sub-sub-menu Item Two'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Escape"))
-#sequence.append(WaitForFocus("Deeper Submenu", acc_role=pyatspi.ROLE_MENU_ITEM))
-#sequence.append(utils.AssertPresentationAction(
-#    "Close the Deeper Submenu", 
-#    ["BRAILLE LINE:  'Menu'",
-#     "     VISIBLE:  'Menu', cursor=1",
-#     "BRAILLE LINE:  'Deeper Submenu'",
-#     "     VISIBLE:  'Deeper Submenu', cursor=1",
-#     "SPEECH OUTPUT: 'menu'",
-#     "SPEECH OUTPUT: 'Deeper Submenu'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Escape"))
-#sequence.append(WaitForFocus("Submenu", acc_role=pyatspi.ROLE_MENU_ITEM))
-#sequence.append(utils.AssertPresentationAction(
-#    "Close the Submenu", 
-#    ["BRAILLE LINE:  'Menu Menu'",
-#     "     VISIBLE:  'Menu Menu', cursor=6",
-#     "BRAILLE LINE:  'Submenu'",
-#     "     VISIBLE:  'Submenu', cursor=1",
-#     "SPEECH OUTPUT: 'menu'",
-#     "SPEECH OUTPUT: 'Submenu'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Escape"))
-#sequence.append(WaitForFocus("Edit!", acc_role=pyatspi.ROLE_PUSH_BUTTON))
-#sequence.append(utils.AssertPresentationAction(
-#    "Close the Edit! menu", 
-#    ["BUG? - Why does it say Edit! twice?",
-#     "BRAILLE LINE:  'tooltip on buttonMenu Menu Menu Menu'",
-#     "     VISIBLE:  'Menu', cursor=1",
-#     "BRAILLE LINE:  'Edit! Edit! Menu'",
-#     "     VISIBLE:  'Edit! Edit! Menu', cursor=1",
-#     "SPEECH OUTPUT: 'menu'",
-#     "SPEECH OUTPUT: 'Edit! menu'"]))
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_MENU))
+sequence.append(utils.AssertPresentationAction(
+    "Open the Edit! menu", 
+    ["KNOWN ISSUE -- http://bugzilla.gnome.org/show_bug.cgi?id=569345. In addition, the demo is broken at the moment."]))
+     "BRAILLE LINE:  'Cut'",
+     "     VISIBLE:  'Cut', cursor=1",
+     "BRAILLE LINE:  'Menu'",
+     "     VISIBLE:  'Menu', cursor=1",
+     "SPEECH OUTPUT: 'Cut'",
+     "SPEECH OUTPUT: 'menu'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(WaitForFocus("Copy", acc_role=pyatspi.ROLE_MENU_ITEM))
+sequence.append(utils.AssertPresentationAction(
+    "Go to Copy", 
+    ["BRAILLE LINE:  'Copy'",
+     "     VISIBLE:  'Copy', cursor=1",
+     "SPEECH OUTPUT: 'Copy'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(WaitForFocus("Paste", acc_role=pyatspi.ROLE_MENU_ITEM))
+sequence.append(utils.AssertPresentationAction(
+    "Go to Paste", 
+    ["BRAILLE LINE:  'Paste'",
+     "     VISIBLE:  'Paste', cursor=1",
+     "SPEECH OUTPUT: 'Paste'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(WaitForFocus("Submenu", acc_role=pyatspi.ROLE_MENU_ITEM))
+sequence.append(utils.AssertPresentationAction(
+    "Goto Submenu", 
+    ["BRAILLE LINE:  'Submenu'",
+     "     VISIBLE:  'Submenu', cursor=1",
+     "SPEECH OUTPUT: 'Submenu'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_MENU))
+sequence.append(utils.AssertPresentationAction(
+    "Open Submenu", 
+    ["KNOWN ISSUE -- http://bugzilla.gnome.org/show_bug.cgi?id=569345";,
+     "BRAILLE LINE:  'Menu'",
+     "     VISIBLE:  'Menu', cursor=1",
+     "BRAILLE LINE:  'Submenu Item One'",
+     "     VISIBLE:  'Submenu Item One', cursor=1",
+     "SPEECH OUTPUT: 'menu'",
+     "SPEECH OUTPUT: 'Submenu Item One'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(WaitForFocus("Submenu Item Two", acc_role=pyatspi.ROLE_MENU_ITEM))
+sequence.append(utils.AssertPresentationAction(
+    "Down to Submenu Item Two", 
+    ["BRAILLE LINE:  'Submenu Item Two'",
+     "     VISIBLE:  'Submenu Item Two', cursor=1",
+     "SPEECH OUTPUT: 'Submenu Item Two'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(WaitForFocus("Deeper Submenu", acc_role=pyatspi.ROLE_MENU_ITEM))
+sequence.append(utils.AssertPresentationAction(
+    "Down to Deeper Submenu", 
+    ["BRAILLE LINE:  'Deeper Submenu'",
+     "     VISIBLE:  'Deeper Submenu', cursor=1",
+     "SPEECH OUTPUT: 'Deeper Submenu'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_MENU))
+sequence.append(utils.AssertPresentationAction(
+    "Right to open Deeper Submenu", 
+    ["KNOWN ISSUE -- http://bugzilla.gnome.org/show_bug.cgi?id=569345";,
+     "BRAILLE LINE:  'Menu'",
+     "     VISIBLE:  'Menu', cursor=1",
+     "BRAILLE LINE:  'Sub-sub-menu Item One'",
+     "     VISIBLE:  'Sub-sub-menu Item One', cursor=1",
+     "SPEECH OUTPUT: 'menu'",
+     "SPEECH OUTPUT: 'Sub-sub-menu Item One'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(WaitForFocus("Sub-sub-menu Item Two", acc_role=pyatspi.ROLE_MENU_ITEM))
+sequence.append(utils.AssertPresentationAction(
+    "Down to Sub-sub-menu Item Two", 
+    ["BRAILLE LINE:  'Sub-sub-menu Item Two'",
+     "     VISIBLE:  'Sub-sub-menu Item Two', cursor=1",
+     "SPEECH OUTPUT: 'Sub-sub-menu Item Two'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Escape"))
+sequence.append(WaitForFocus("Deeper Submenu", acc_role=pyatspi.ROLE_MENU_ITEM))
+sequence.append(utils.AssertPresentationAction(
+    "Close the Deeper Submenu", 
+    ["BRAILLE LINE:  'Menu'",
+     "     VISIBLE:  'Menu', cursor=1",
+     "BRAILLE LINE:  'Deeper Submenu'",
+     "     VISIBLE:  'Deeper Submenu', cursor=1",
+     "SPEECH OUTPUT: 'menu'",
+     "SPEECH OUTPUT: 'Deeper Submenu'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Escape"))
+sequence.append(WaitForFocus("Submenu", acc_role=pyatspi.ROLE_MENU_ITEM))
+sequence.append(utils.AssertPresentationAction(
+    "Close the Submenu", 
+    ["BRAILLE LINE:  'Menu Menu'",
+     "     VISIBLE:  'Menu Menu', cursor=6",
+     "BRAILLE LINE:  'Submenu'",
+     "     VISIBLE:  'Submenu', cursor=1",
+     "SPEECH OUTPUT: 'menu'",
+     "SPEECH OUTPUT: 'Submenu'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Escape"))
+sequence.append(WaitForFocus("Edit!", acc_role=pyatspi.ROLE_PUSH_BUTTON))
+sequence.append(utils.AssertPresentationAction(
+    "Close the Edit! menu", 
+    ["BUG? - Why does it say Edit! twice?",
+     "BRAILLE LINE:  'tooltip on buttonMenu Menu Menu Menu'",
+     "     VISIBLE:  'Menu', cursor=1",
+     "BRAILLE LINE:  'Edit! Edit! Menu'",
+     "     VISIBLE:  'Edit! Edit! Menu', cursor=1",
+     "SPEECH OUTPUT: 'menu'",
+     "SPEECH OUTPUT: 'Edit! menu'"]))
 
 ########################################################################
 # Open the Color menu and navigate through it.
@@ -312,80 +311,80 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Color Save Button save options M', cursor=1",
      "SPEECH OUTPUT: 'Color menu'"]))
 
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(WaitForFocus("white", acc_role=pyatspi.ROLE_TABLE_CELL))
-#sequence.append(utils.AssertPresentationAction(
-#    "Open the Color menu", 
-#    ["BUG? - speaks 'not selected' apparently due to Down into a table cell",
-#     "BRAILLE LINE:  'white Image lime Image green Image blue Image'",
-#     "     VISIBLE:  'white Image lime Image green Ima', cursor=1",
-#     "SPEECH OUTPUT: 'white not selected'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Right"))
-#sequence.append(WaitForFocus("lime", acc_role=pyatspi.ROLE_TABLE_CELL))
-#sequence.append(utils.AssertPresentationAction(
-#    "Go to lime", 
-#    ["BRAILLE LINE:  'white Image lime Image green Image blue Image'",
-#     "     VISIBLE:  'lime Image green Image blue Imag', cursor=1",
-#     "SPEECH OUTPUT: 'lime'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Right"))
-#sequence.append(WaitForFocus("green", acc_role=pyatspi.ROLE_TABLE_CELL))
-#sequence.append(utils.AssertPresentationAction(
-#    "Go to green", 
-#    ["BRAILLE LINE:  'white Image lime Image green Image blue Image'",
-#     "     VISIBLE:  'green Image blue Image', cursor=1",
-#     "SPEECH OUTPUT: 'green'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Right"))
-#sequence.append(WaitForFocus("blue", acc_role=pyatspi.ROLE_TABLE_CELL))
-#sequence.append(utils.AssertPresentationAction(
-#    "Go to blue", 
-#    ["BRAILLE LINE:  'white Image lime Image green Image blue Image'",
-#     "     VISIBLE:  'blue Image', cursor=1",
-#     "SPEECH OUTPUT: 'blue'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(WaitForFocus("navy", acc_role=pyatspi.ROLE_TABLE_CELL))
-#sequence.append(utils.AssertPresentationAction(
-#    "Go to navy", 
-#    ["BUG? - speaks 'not selected' apparently due to Down into a table cell",
-#     "BRAILLE LINE:  'silver Image yellow Image fuchsia Image navy Image'",
-#     "     VISIBLE:  'navy Image', cursor=1",
-#     "SPEECH OUTPUT: 'navy not selected'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Left"))
-#sequence.append(WaitForFocus("fuchsia", acc_role=pyatspi.ROLE_TABLE_CELL))
-#sequence.append(utils.AssertPresentationAction(
-#    "Goto fuchsia", 
-#    ["BRAILLE LINE:  'silver Image yellow Image fuchsia Image navy Image'",
-#     "     VISIBLE:  'fuchsia Image navy Image', cursor=1",
-#     "SPEECH OUTPUT: 'fuchsia'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Left"))
-#sequence.append(WaitForFocus("yellow", acc_role=pyatspi.ROLE_TABLE_CELL))
-#sequence.append(utils.AssertPresentationAction(
-#    "Goto yellow", 
-#    ["BRAILLE LINE:  'silver Image yellow Image fuchsia Image navy Image'",
-#     "     VISIBLE:  'yellow Image fuchsia Image navy ', cursor=1",
-#     "SPEECH OUTPUT: 'yellow'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Escape"))
-#sequence.append(WaitForFocus("Color", acc_role=pyatspi.ROLE_PUSH_BUTTON))
-#sequence.append(utils.AssertPresentationAction(
-#    "Close the Color menu", 
-#    ["BUG? - Why does it say Color twice?",
-#     "BRAILLE LINE:  'Color Color Menu'",
-#     "     VISIBLE:  'Color Color Menu', cursor=1",
-#     "SPEECH OUTPUT: 'Color menu'"]))
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(WaitForFocus("white", acc_role=pyatspi.ROLE_TABLE_CELL))
+sequence.append(utils.AssertPresentationAction(
+    "Open the Color menu", 
+    ["BUG? - speaks 'not selected' apparently due to Down into a table cell",
+     "BRAILLE LINE:  'white Image lime Image green Image blue Image'",
+     "     VISIBLE:  'white Image lime Image green Ima', cursor=1",
+     "SPEECH OUTPUT: 'white not selected'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(WaitForFocus("lime", acc_role=pyatspi.ROLE_TABLE_CELL))
+sequence.append(utils.AssertPresentationAction(
+    "Go to lime", 
+    ["BRAILLE LINE:  'white Image lime Image green Image blue Image'",
+     "     VISIBLE:  'lime Image green Image blue Imag', cursor=1",
+     "SPEECH OUTPUT: 'lime'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(WaitForFocus("green", acc_role=pyatspi.ROLE_TABLE_CELL))
+sequence.append(utils.AssertPresentationAction(
+    "Go to green", 
+    ["BRAILLE LINE:  'white Image lime Image green Image blue Image'",
+     "     VISIBLE:  'green Image blue Image', cursor=1",
+     "SPEECH OUTPUT: 'green'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(WaitForFocus("blue", acc_role=pyatspi.ROLE_TABLE_CELL))
+sequence.append(utils.AssertPresentationAction(
+    "Go to blue", 
+    ["BRAILLE LINE:  'white Image lime Image green Image blue Image'",
+     "     VISIBLE:  'blue Image', cursor=1",
+     "SPEECH OUTPUT: 'blue'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(WaitForFocus("navy", acc_role=pyatspi.ROLE_TABLE_CELL))
+sequence.append(utils.AssertPresentationAction(
+    "Go to navy", 
+    ["BUG? - speaks 'not selected' apparently due to Down into a table cell",
+     "BRAILLE LINE:  'silver Image yellow Image fuchsia Image navy Image'",
+     "     VISIBLE:  'navy Image', cursor=1",
+     "SPEECH OUTPUT: 'navy not selected'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Left"))
+sequence.append(WaitForFocus("fuchsia", acc_role=pyatspi.ROLE_TABLE_CELL))
+sequence.append(utils.AssertPresentationAction(
+    "Goto fuchsia", 
+    ["BRAILLE LINE:  'silver Image yellow Image fuchsia Image navy Image'",
+     "     VISIBLE:  'fuchsia Image navy Image', cursor=1",
+     "SPEECH OUTPUT: 'fuchsia'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Left"))
+sequence.append(WaitForFocus("yellow", acc_role=pyatspi.ROLE_TABLE_CELL))
+sequence.append(utils.AssertPresentationAction(
+    "Goto yellow", 
+    ["BRAILLE LINE:  'silver Image yellow Image fuchsia Image navy Image'",
+     "     VISIBLE:  'yellow Image fuchsia Image navy ', cursor=1",
+     "SPEECH OUTPUT: 'yellow'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Escape"))
+sequence.append(WaitForFocus("Color", acc_role=pyatspi.ROLE_PUSH_BUTTON))
+sequence.append(utils.AssertPresentationAction(
+    "Close the Color menu", 
+    ["BUG? - Why does it say Color twice?",
+     "BRAILLE LINE:  'Color Color Menu'",
+     "     VISIBLE:  'Color Color Menu', cursor=1",
+     "SPEECH OUTPUT: 'Color menu'"]))
 
 ########################################################################
 # Go to the unlabelled buttons
diff --git a/test/keystrokes/firefox/dojo_checkbox.py b/test/keystrokes/firefox/dojo_checkbox.py
index 3ee1ddd..ed36640 100644
--- a/test/keystrokes/firefox/dojo_checkbox.py
+++ b/test/keystrokes/firefox/dojo_checkbox.py
@@ -82,7 +82,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the cb2 checkbox", 
-    ["BRAILLE LINE:  '<x> CheckBox cb2: normal checkbox, with default value, initially turned on. \"onChange\" handler updates: \[false\] get\('value'\)'",
+    ["BRAILLE LINE:  '<x> CheckBox cb2: normal checkbox, with default value, initially turned on. \"onChange\" handler updates: \[\] get\('value'\) Button'",
      "     VISIBLE:  '<x> CheckBox cb2: normal checkbo', cursor=1",
      "SPEECH OUTPUT: 'cb2: normal checkbox, with default value, initially turned on. check box checked'"]))
 
@@ -117,8 +117,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the cb6 checkbox", 
-    ["BRAILLE LINE:  '<x> CheckBox cb6: instantiated from script'",
-     "     VISIBLE:  '<x> CheckBox cb6: instantiated f', cursor=1",
+    ["BRAILLE LINE:  '<x> CheckBox'",
+     "     VISIBLE:  '<x> CheckBox', cursor=1",
      "SPEECH OUTPUT: 'cb6: instantiated from script check box checked'"]))
 
 ########################################################################
@@ -128,8 +128,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the cb7 checkbox", 
-    ["BRAILLE LINE:  < > CheckBox cb7: normal checkbox. disable Button enable Button set value to \"fish\" Button Reset value+checked Button \"onChange\" handler updates: [false]'",
-     "     VISIBLE:  '< > CheckBox cb7: normal checkbo', cursor=1",
+    ["BRAILLE LINE:  '< > CheckBox'",
+     "     VISIBLE:  '< > CheckBox', cursor=1",
      "SPEECH OUTPUT: 'cb7: normal checkbox. check box not checked'"]))
 
 ########################################################################
@@ -140,9 +140,9 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
-    ["BRAILLE LINE:  < > CheckBox cb7: normal checkbox. disable Button enable Button set value to \"fish\" Button Reset value+checked Button \"onChange\" handler updates: [false]'",
-     "     VISIBLE:  '< > CheckBox cb7: normal checkbo', cursor=1",
-     "SPEECH OUTPUT: 'cb7: normal checkbox. check box not checked'"]))
+    ["BUG? - Why aren't we saying anything here?",
+     "BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1"]))
 
 ########################################################################
 # Close the demo
diff --git a/test/keystrokes/firefox/dojo_slider.py b/test/keystrokes/firefox/dojo_slider.py
index a676810..aa05e29 100644
--- a/test/keystrokes/firefox/dojo_slider.py
+++ b/test/keystrokes/firefox/dojo_slider.py
@@ -32,29 +32,13 @@ sequence.append(PauseAction(10000))
 ########################################################################
 # Tab to the first slider.  The following will be presented.
 #
-#  BRAILLE LINE:  '10 Slider'
-#       VISIBLE:  '10 Slider', cursor=1
-# SPEECH OUTPUT: ''
-# SPEECH OUTPUT: 'slider 10'
-#
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab", 1000))
 sequence.append(utils.AssertPresentationAction(
     "tab to first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 10 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10 Sli', cursor=1",
-     "SPEECH OUTPUT: 'Horizontal Slider Example table Horizontal Slider Example slider 10'"]))
-
-########################################################################
-# Do a basic "Where Am I" via KP_Enter.  The following should be
-# presented in speech and braille:
-#
-# BRAILLE LINE: 
-#      VISIBLE:  
-# SPEECH OUTPUT:
-#
-# sequence.append(KeyComboAction("KP_Enter"))
-# sequence.append(PauseAction(3000))
+    ["BRAILLE LINE:  '10 Slider'",
+     "     VISIBLE:  '10 Slider', cursor=1",
+     "SPEECH OUTPUT: 'slider 10'"]))
 
 ########################################################################
 # Move the first slider several times.  
@@ -69,9 +53,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
 sequence.append(utils.AssertPresentationAction(
     "1 move first slider", 
     ["KNOWN ISSUE - crazy valuetext http://bugs.dojotoolkit.org/ticket/8539";,
-     "BRAILLE LINE:  'Horizontal Slider Example 10.223713646532438 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10.223', cursor=1",
-     "SPEECH OUTPUT: '10.223713646532438'"]))
+     "BRAILLE LINE:  '10.22271714922049 Slider'",
+     "     VISIBLE:  '10.22271714922049 Slider', cursor=1",
+     "SPEECH OUTPUT: '10.22271714922049'"]))
                             
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
@@ -82,9 +66,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "2 move first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 10.447427293064877 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10.447', cursor=1",
-     "SPEECH OUTPUT: '10.447427293064877'"]))
+    ["BRAILLE LINE:  '10.44543429844098 Slider'",
+     "     VISIBLE:  '10.44543429844098 Slider', cursor=1",
+     "SPEECH OUTPUT: '10.44543429844098'"]))
                                
 sequence.append(utils.StartRecordingAction())                      
 sequence.append(KeyComboAction("Right"))
@@ -95,9 +79,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "3 move first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 10.671140939597315 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10.671', cursor=1",
-     "SPEECH OUTPUT: '10.671140939597315'"]))
+    ["BRAILLE LINE:  '10.66815144766147 Slider'",
+     "     VISIBLE:  '10.66815144766147 Slider', cursor=1",
+     "SPEECH OUTPUT: '10.66815144766147'"]))
                            
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
@@ -108,9 +92,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "4 move first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 10.894854586129753 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10.894', cursor=1",
-     "SPEECH OUTPUT: '10.894854586129753'"]))
+    ["BRAILLE LINE:  '10.89086859688196 Slider'",
+     "     VISIBLE:  '10.89086859688196 Slider', cursor=1",
+     "SPEECH OUTPUT: '10.89086859688196'"]))
                                
 sequence.append(utils.StartRecordingAction())                  
 sequence.append(KeyComboAction("Right"))
@@ -121,9 +105,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "5 move first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 11.118568232662192 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 11.118', cursor=1",
-     "SPEECH OUTPUT: '11.118568232662192'"]))
+    ["BRAILLE LINE:  '11.11358574610245 Slider'",
+     "     VISIBLE:  '11.11358574610245 Slider', cursor=1",
+     "SPEECH OUTPUT: '11.11358574610245'"]))
                                   
 sequence.append(utils.StartRecordingAction())                    
 sequence.append(KeyComboAction("Left"))
@@ -134,9 +118,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "6 move first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 10.894854586129753 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10.894', cursor=1",
-     "SPEECH OUTPUT: '10.894854586129753'"]))
+    ["BRAILLE LINE:  '10.89086859688196 Slider'",
+     "     VISIBLE:  '10.89086859688196 Slider', cursor=1",
+     "SPEECH OUTPUT: '10.89086859688196'"]))
                                  
 sequence.append(utils.StartRecordingAction())                     
 sequence.append(KeyComboAction("Left"))
@@ -147,9 +131,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "7 move first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 10.671140939597315 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10.671', cursor=1",
-     "SPEECH OUTPUT: '10.671140939597315'"]))
+    ["BRAILLE LINE:  '10.66815144766147 Slider'",
+     "     VISIBLE:  '10.66815144766147 Slider', cursor=1",
+     "SPEECH OUTPUT: '10.66815144766147''"]))
                                   
 sequence.append(utils.StartRecordingAction())                    
 sequence.append(KeyComboAction("Left"))
@@ -160,9 +144,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "8 move first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 10.447427293064877 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10.447', cursor=1",
-     "SPEECH OUTPUT: '10.447427293064877'"]))
+    ["BRAILLE LINE:  '10.44543429844098 Slider'",
+     "     VISIBLE:  '10.44543429844098 Slider', cursor=1",
+     "SPEECH OUTPUT: '10.44543429844098'"]))
                              
 sequence.append(utils.StartRecordingAction())                     
 sequence.append(KeyComboAction("Left"))
@@ -173,9 +157,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "9 move first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 10.223713646532438 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10.223', cursor=1",
-     "SPEECH OUTPUT: '10.223713646532438'"]))
+    ["BRAILLE LINE:  '10.22271714922049 Slider'",
+     "     VISIBLE:  '10.22271714922049 Slider', cursor=1",
+     "SPEECH OUTPUT: '10.22271714922049'"]))
                             
 sequence.append(utils.StartRecordingAction())                       
 sequence.append(KeyComboAction("Left"))
@@ -186,9 +170,9 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "10 move first slider", 
-    ["BRAILLE LINE:  'Horizontal Slider Example 10 Slider'",
-     "     VISIBLE:  'Horizontal Slider Example 10 Sli', cursor=1",
-     "SPEECH OUTPUT: '10'"]))
+    ["BRAILLE LINE:  '10 Slider'",
+     "     VISIBLE:  '10 Slider', cursor=1",
+     "SPEECH OUTPUT: 'slider 10'"]))
 
 ########################################################################
 # Tab to the next entry between the sliders. 
@@ -211,8 +195,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "move to button", 
-    ["BRAILLE LINE:  'Disable previous slider Button'",
-     "     VISIBLE:  'Disable previous slider Button', cursor=1",
+    ["BUG? - Why no braille?",
+     "BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'Disable previous slider button'"]))
      
 ########################################################################
@@ -222,9 +207,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "tab to second slider", 
-    ["BRAILLE LINE:  'Vertical Slider Example 10 Slider'",
-     "     VISIBLE:  'Vertical Slider Example 10 Slide', cursor=1",
-     "SPEECH OUTPUT: 'Vertical Slider Example table Vertical Slider Example slider 10'"]))
+    ["BRAILLE LINE:  '10 Slider'",
+     "     VISIBLE:  '10 Slider', cursor=1",
+     "SPEECH OUTPUT: 'slider 10'"]))
 
 ########################################################################
 # Move the slider several times
@@ -238,8 +223,8 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "1 move second slider", 
-    ["BRAILLE LINE:  'Vertical Slider Example 20 Slider'",
-     "     VISIBLE:  'Vertical Slider Example 20 Slide', cursor=1",
+    ["BRAILLE LINE:  '20 Slider'",
+     "     VISIBLE:  '20 Slider', cursor=1",
      "SPEECH OUTPUT: '20'"]))
 
 sequence.append(utils.StartRecordingAction())                       
@@ -251,8 +236,8 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "2 move second slider", 
-    ["BRAILLE LINE:  'Vertical Slider Example 30 Slider'",
-     "     VISIBLE:  'Vertical Slider Example 30 Slide', cursor=1",
+    ["BRAILLE LINE:  '30 Slider'",
+     "     VISIBLE:  '30 Slider', cursor=1",
      "SPEECH OUTPUT: '30'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -264,8 +249,8 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "3 move second slider", 
-    ["BRAILLE LINE:  'Vertical Slider Example 40 Slider'",
-     "     VISIBLE:  'Vertical Slider Example 40 Slide', cursor=1",
+    ["BRAILLE LINE:  '40 Slider'",
+     "     VISIBLE:  '40 Slider', cursor=1",
      "SPEECH OUTPUT: '40'"]))
 
 sequence.append(utils.StartRecordingAction())                        
@@ -277,8 +262,8 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "4 move second slider", 
-    ["BRAILLE LINE:  'Vertical Slider Example 50 Slider'",
-     "     VISIBLE:  'Vertical Slider Example 50 Slide', cursor=1",
+    ["BRAILLE LINE:  '50 Slider'",
+     "     VISIBLE:  '50 Slider', cursor=1",
      "SPEECH OUTPUT: '50'"]))
   
 sequence.append(utils.StartRecordingAction())                        
@@ -290,8 +275,8 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "5 move second slider", 
-    ["BRAILLE LINE:  'Vertical Slider Example 60 Slider'",
-     "     VISIBLE:  'Vertical Slider Example 60 Slide', cursor=1",
+    ["BRAILLE LINE:  '60 Slider'",
+     "     VISIBLE:  '60 Slider', cursor=1",
      "SPEECH OUTPUT: '60'"]))
                                
 sequence.append(utils.StartRecordingAction())                       
@@ -303,8 +288,8 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "6 move second slider", 
-    ["BRAILLE LINE:  'Vertical Slider Example 50 Slider'",
-     "     VISIBLE:  'Vertical Slider Example 50 Slide', cursor=1",
+    ["BRAILLE LINE:  '50 Slider'",
+     "     VISIBLE:  '50 Slider', cursor=1",
      "SPEECH OUTPUT: '50'"]))
  
 sequence.append(utils.StartRecordingAction())                        
@@ -316,8 +301,8 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "7 move second slider", 
-    ["BRAILLE LINE:  'Vertical Slider Example 40 Slider'",
-     "     VISIBLE:  'Vertical Slider Example 40 Slide', cursor=1",
+    ["BRAILLE LINE:  '40 Slider'",
+     "     VISIBLE:  '40 Slider', cursor=1",
      "SPEECH OUTPUT: '40'"]))
                                
 sequence.append(utils.StartRecordingAction())                        
@@ -329,8 +314,8 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "8 move second slider", 
-    ["BRAILLE LINE:  'Vertical Slider Example 30 Slider'",
-     "     VISIBLE:  'Vertical Slider Example 30 Slide', cursor=1",
+    ["BRAILLE LINE:  '30 Slider'",
+     "     VISIBLE:  '30 Slider', cursor=1",
      "SPEECH OUTPUT: '30'"]))
                                  
 sequence.append(utils.StartRecordingAction())                         
@@ -342,8 +327,8 @@ sequence.append(WaitAction("object:property-change:accessible-value",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "9 move second slider", 
-    ["BRAILLE LINE:  'Vertical Slider Example 20 Slider'",
-     "     VISIBLE:  'Vertical Slider Example 20 Slide', cursor=1",
+    ["BRAILLE LINE:  '20 Slider'",
+     "     VISIBLE:  '20 Slider', cursor=1",
      "SPEECH OUTPUT: '20'"]))
     
 ########################################################################
diff --git a/test/keystrokes/firefox/dojo_spinner.py b/test/keystrokes/firefox/dojo_spinner.py
index 7c74bac..46ccc54 100644
--- a/test/keystrokes/firefox/dojo_spinner.py
+++ b/test/keystrokes/firefox/dojo_spinner.py
@@ -24,7 +24,7 @@ sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
 #
 sequence.append(KeyComboAction("<Control>l"))
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-sequence.append(TypeAction(utils.DojoURLPrefix + "form/test_Spinner.html"))
+sequence.append(TypeAction(utils.DojoNightlyURLPrefix + "form/test_Spinner.html"))
 sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForDocLoad())
 sequence.append(WaitForFocus("Dojo Spinner Widget Test", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
diff --git a/test/keystrokes/firefox/dojo_tabcontainer.py b/test/keystrokes/firefox/dojo_tabcontainer.py
index bf337d2..19dbc3d 100644
--- a/test/keystrokes/firefox/dojo_tabcontainer.py
+++ b/test/keystrokes/firefox/dojo_tabcontainer.py
@@ -19,7 +19,7 @@ sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
 #
 sequence.append(KeyComboAction("<Control>l"))
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-sequence.append(TypeAction(utils.DojoURLPrefix + "layout/test_TabContainer.html"))
+sequence.append(TypeAction(utils.DojoNightlyURLPrefix + "layout/test_TabContainer.html"))
 sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForDocLoad())
 sequence.append(WaitForFocus("TabContainer Demo", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
diff --git a/test/keystrokes/firefox/find_wiki.py b/test/keystrokes/firefox/find_wiki.py
index a7b5451..e1c3ae7 100644
--- a/test/keystrokes/firefox/find_wiki.py
+++ b/test/keystrokes/firefox/find_wiki.py
@@ -48,10 +48,10 @@ sequence.append(KeyComboAction("<Control>F"))
 sequence.append(utils.AssertPresentationAction(
     "Get into the Find Toolbar", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Orca - GNOME Live! - " + utils.firefoxFrameNames + " Frame ToolBar Find: \$l'",
-     "     VISIBLE:  'Find: $l', cursor=1",
+     "     VISIBLE:  'Find:  $l', cursor=7",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Orca - GNOME Live! - " + utils.firefoxFrameNames + " Frame ToolBar Find: \$l'",
-     "     VISIBLE:  'Find: $l', cursor=1",
-     "SPEECH OUTPUT: 'Find: text '"]))
+     "     VISIBLE:  'Find:  $l', cursor=7",
+     "SPEECH OUTPUT: 'Find: text'"]))
 
 # We won't use an assert here because different builds of Firefox give
 # different results.
diff --git a/test/keystrokes/firefox/html_role_links.py b/test/keystrokes/firefox/html_role_links.py
index 7ba0c61..ff44402 100644
--- a/test/keystrokes/firefox/html_role_links.py
+++ b/test/keystrokes/firefox/html_role_links.py
@@ -37,8 +37,6 @@ sequence.append(utils.AssertPresentationAction(
     "Top of file", 
     ["BRAILLE LINE:  'Here are some of our local test files:'",
      "     VISIBLE:  'Here are some of our local test ', cursor=1",
-     "BRAILLE LINE:  'Here are some of our local test files:'",
-     "     VISIBLE:  'Here are some of our local test ', cursor=1",
      "SPEECH OUTPUT: 'Here are some of our local test files:'"]))
 
 ########################################################################
@@ -48,8 +46,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to anchors.html link", 
-    ["BRAILLE LINE:  'â?¢ anchors.html'",
-     "     VISIBLE:  'â?¢ anchors.html', cursor=3",
+    ["BRAILLE LINE:  'â?¢anchors.html'",
+     "     VISIBLE:  'â?¢anchors.html', cursor=2",
      "SPEECH OUTPUT: 'anchors.html link'"]))
 
 ########################################################################
@@ -59,8 +57,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to blockquotes.html link", 
-    ["BRAILLE LINE:  'â?¢ blockquotes.html'",
-     "     VISIBLE:  'â?¢ blockquotes.html', cursor=3",
+    ["BRAILLE LINE:  'â?¢blockquotes.html'",
+     "     VISIBLE:  'â?¢blockquotes.html', cursor=2",
      "SPEECH OUTPUT: 'blockquotes.html link'"]))
 
 ########################################################################
@@ -70,8 +68,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to bugzilla_top.html link", 
-    ["BRAILLE LINE:  'â?¢ bugzilla_top.html'",
-     "     VISIBLE:  'â?¢ bugzilla_top.html', cursor=3",
+    ["BRAILLE LINE:  'â?¢bugzilla_top.html'",
+     "     VISIBLE:  'â?¢bugzilla_top.html', cursor=2",
      "SPEECH OUTPUT: 'bugzilla_top.html link'"]))
 
 ########################################################################
@@ -81,8 +79,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Shift Tab to blockquotes.html link", 
-    ["BRAILLE LINE:  'â?¢ blockquotes.html'",
-     "     VISIBLE:  'â?¢ blockquotes.html', cursor=3",
+    ["BRAILLE LINE:  'â?¢blockquotes.html'",
+     "     VISIBLE:  'â?¢blockquotes.html', cursor=2",
      "SPEECH OUTPUT: 'blockquotes.html link'"]))
 
 ########################################################################
@@ -94,8 +92,8 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
-    ["BRAILLE LINE:  'â?¢ blockquotes.html'",
-     "     VISIBLE:  'â?¢ blockquotes.html', cursor=3",
+    ["BRAILLE LINE:  'â?¢blockquotes.html'",
+     "     VISIBLE:  'â?¢blockquotes.html', cursor=2",
      "SPEECH OUTPUT: 'file link to blockquotes.html same site 1188 bytes'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/html_role_list_item_where_am_i.py b/test/keystrokes/firefox/html_role_list_item_where_am_i.py
index bc354ac..304b096 100644
--- a/test/keystrokes/firefox/html_role_list_item_where_am_i.py
+++ b/test/keystrokes/firefox/html_role_list_item_where_am_i.py
@@ -34,9 +34,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "Top of file",
-    ["BRAILLE LINE:  'â?¢ Not in a paragraph'",
-     "     VISIBLE:  'â?¢ Not in a paragraph', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Not in a paragraph'"]))
+    ["BRAILLE LINE:  'â?¢Not in a paragraph'",
+     "     VISIBLE:  'â?¢Not in a paragraph', cursor=1",
+     "SPEECH OUTPUT: 'â?¢Not in a paragraph'"]))
 
 ########################################################################
 # Press Down Arrow to move through the lists doing a where am I for each
@@ -68,9 +68,9 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "3. Basic Where Am I",
-    ["BRAILLE LINE:  '1. A nested list item, not in a paragraph'",
-     "     VISIBLE:  '1. A nested list item, not in a ', cursor=1",
-     "SPEECH OUTPUT: 'list item 1. A nested list item, not in a paragraph 1 of 3 Nesting level 1'"]))
+    ["BRAILLE LINE:  '1.A nested list item, not in a paragraph'",
+     "     VISIBLE:  '1.A nested list item, not in a p', cursor=1",
+     "SPEECH OUTPUT: 'list item 1.A nested list item, not in a paragraph 1 of 3 Nesting level 1'"]))
 
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/html_role_lists.py b/test/keystrokes/firefox/html_role_lists.py
index dfbb393..d20309b 100644
--- a/test/keystrokes/firefox/html_role_lists.py
+++ b/test/keystrokes/firefox/html_role_lists.py
@@ -37,8 +37,6 @@ sequence.append(utils.AssertPresentationAction(
     "Top of file", 
     ["BRAILLE LINE:  'Welcome to a List of Lists h1'",
      "     VISIBLE:  'Welcome to a List of Lists h1', cursor=1",
-     "BRAILLE LINE:  'Welcome to a List of Lists h1'",
-     "     VISIBLE:  'Welcome to a List of Lists h1', cursor=1",
      "SPEECH OUTPUT: 'Welcome to a List of Lists heading level 1'"]))
 
 ########################################################################
@@ -56,33 +54,33 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
-    ["BRAILLE LINE:  '1. remember what the heck we are doing each day'",
-     "     VISIBLE:  '1. remember what the heck we are', cursor=1",
-     "SPEECH OUTPUT: '1. remember what the heck we are doing each day'"]))
+    ["BRAILLE LINE:  '1.remember what the heck we are doing each day'",
+     "     VISIBLE:  '1.remember what the heck we are ', cursor=1",
+     "SPEECH OUTPUT: '1.remember what the heck we are doing each day'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
-    ["BRAILLE LINE:  '2. arrange long and arbitrary lines of text into ordered lists that are pleasing to the eye and suggest some sense of priority, even if it is artificial'",
-     "     VISIBLE:  '2. arrange long and arbitrary li', cursor=1",
-     "SPEECH OUTPUT: '2. arrange long and arbitrary lines of text into ordered lists that are pleasing to the eye and suggest some sense of priority, even if it is artificial'"]))
+    ["BRAILLE LINE:  '2.arrange long and arbitrary lines of text into ordered lists that are pleasing to the eye and suggest some sense of priority, even if it is artificial'",
+     "     VISIBLE:  '2.arrange long and arbitrary lin', cursor=1",
+     "SPEECH OUTPUT: '2.arrange long and arbitrary lines of text into ordered lists that are pleasing to the eye and suggest some sense of priority, even if it is artificial'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
-    ["BRAILLE LINE:  '3. look really cool when we carry them around on yellow Post-Itstm.'",
-     "     VISIBLE:  '3. look really cool when we carr', cursor=1",
-     "SPEECH OUTPUT: '3. look really cool when we carry them around on yellow Post-Itstm.'"]))
+    ["BRAILLE LINE:  '3.look really cool when we carry them around on yellow Post-Itstm.'",
+     "     VISIBLE:  '3.look really cool when we carry', cursor=1",
+     "SPEECH OUTPUT: '3.look really cool when we carry them around on yellow Post-Itstm.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
-    ["BRAILLE LINE:  '4. and that other thing I keep forgetting.'",
-     "     VISIBLE:  '4. and that other thing I keep f', cursor=1",
-     "SPEECH OUTPUT: '4. and that other thing I keep forgetting.'"]))
+    ["BRAILLE LINE:  '4.and that other thing I keep forgetting.'",
+     "     VISIBLE:  '4.and that other thing I keep fo', cursor=1",
+     "SPEECH OUTPUT: '4.and that other thing I keep forgetting.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -96,65 +94,65 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
-    ["BRAILLE LINE:  'VI. And use roman numerals,'",
-     "     VISIBLE:  'VI. And use roman numerals,', cursor=1",
-     "SPEECH OUTPUT: 'VI. And use roman numerals,'"]))
+    ["BRAILLE LINE:  'VI.And use roman numerals,'",
+     "     VISIBLE:  'VI.And use roman numerals,', cursor=1",
+     "SPEECH OUTPUT: 'VI.And use roman numerals,'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
-    ["BRAILLE LINE:  'g. You might try using letters as well,'",
-     "     VISIBLE:  'g. You might try using letters a', cursor=1",
-     "SPEECH OUTPUT: 'g. You might try using letters as well,'"]))
+    ["BRAILLE LINE:  'g.You might try using letters as well,'",
+     "     VISIBLE:  'g.You might try using letters as', cursor=1",
+     "SPEECH OUTPUT: 'g.You might try using letters as well,'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
-    ["BRAILLE LINE:  'H. Maybe you prefer Big Letters,'",
-     "     VISIBLE:  'H. Maybe you prefer Big Letters,', cursor=1",
-     "SPEECH OUTPUT: 'H. Maybe you prefer Big Letters,'"]))
+    ["BRAILLE LINE:  'H.Maybe you prefer Big Letters,'",
+     "     VISIBLE:  'H.Maybe you prefer Big Letters,', cursor=1",
+     "SPEECH OUTPUT: 'H.Maybe you prefer Big Letters,'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
-    ["BRAILLE LINE:  'ix. or small roman numerals'",
-     "     VISIBLE:  'ix. or small roman numerals', cursor=1",
-     "SPEECH OUTPUT: 'ix. or small roman numerals'"]))
+    ["BRAILLE LINE:  'ix.or small roman numerals'",
+     "     VISIBLE:  'ix.or small roman numerals', cursor=1",
+     "SPEECH OUTPUT: 'ix.or small roman numerals'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
-    ["BRAILLE LINE:  'â?¢ But discs belong to unordered lists'",
-     "     VISIBLE:  'â?¢ But discs belong to unordered ', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ But discs belong to unordered lists'"]))
+    ["BRAILLE LINE:  'â?¢But discs belong to unordered lists'",
+     "     VISIBLE:  'â?¢But discs belong to unordered l', cursor=1",
+     "SPEECH OUTPUT: 'â?¢But discs belong to unordered lists'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
-    ["BRAILLE LINE:  '50. Though you can set the value in a list item!'",
-     "     VISIBLE:  '50. Though you can set the value', cursor=1",
-     "SPEECH OUTPUT: '50. Though you can set the value in a list item!'"]))
+    ["BRAILLE LINE:  '50.Though you can set the value in a list item!'",
+     "     VISIBLE:  '50.Though you can set the value ', cursor=1",
+     "SPEECH OUTPUT: '50.Though you can set the value in a list item!'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up", 
-    ["BRAILLE LINE:  'â?¢ But discs belong to unordered lists'",
-     "     VISIBLE:  'â?¢ But discs belong to unordered ', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ But discs belong to unordered lists'"]))
+    ["BRAILLE LINE:  'â?¢But discs belong to unordered lists'",
+     "     VISIBLE:  'â?¢But discs belong to unordered l', cursor=1",
+     "SPEECH OUTPUT: 'â?¢But discs belong to unordered lists'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up", 
-    ["BRAILLE LINE:  'ix. or small roman numerals'",
-     "     VISIBLE:  'ix. or small roman numerals', cursor=1",
-     "SPEECH OUTPUT: 'ix. or small roman numerals'"]))
+    ["BRAILLE LINE:  'ix.or small roman numerals'",
+     "     VISIBLE:  'ix.or small roman numerals', cursor=1",
+     "SPEECH OUTPUT: 'ix.or small roman numerals'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.  
@@ -164,9 +162,9 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
-    ["BRAILLE LINE:  'ix. or small roman numerals'",
-     "     VISIBLE:  'ix. or small roman numerals', cursor=1",
-     "SPEECH OUTPUT: 'list item ix. or small roman numerals 4 of 6'"]))
+    ["BRAILLE LINE:  'ix.or small roman numerals'",
+     "     VISIBLE:  'ix.or small roman numerals', cursor=1",
+     "SPEECH OUTPUT: 'list item ix.or small roman numerals 4 of 6'"]))
 
 ########################################################################
 # Move to the location bar by pressing Control+L.  When it has focus
diff --git a/test/keystrokes/firefox/html_struct_nav_blockquote.py b/test/keystrokes/firefox/html_struct_nav_blockquote.py
index bb34fd1..ff1999d 100644
--- a/test/keystrokes/firefox/html_struct_nav_blockquote.py
+++ b/test/keystrokes/firefox/html_struct_nav_blockquote.py
@@ -39,8 +39,6 @@ sequence.append(utils.AssertPresentationAction(
     "Top of file", 
     ["BRAILLE LINE:  'On weaponry:'",
      "     VISIBLE:  'On weaponry:', cursor=1",
-     "BRAILLE LINE:  'On weaponry:'",
-     "     VISIBLE:  'On weaponry:', cursor=1",
      "SPEECH OUTPUT: 'On weaponry:'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/html_struct_nav_bug_554616.py b/test/keystrokes/firefox/html_struct_nav_bug_554616.py
index 2927696..62297d4 100644
--- a/test/keystrokes/firefox/html_struct_nav_bug_554616.py
+++ b/test/keystrokes/firefox/html_struct_nav_bug_554616.py
@@ -48,10 +48,12 @@ sequence.append(utils.AssertPresentationAction(
     "2. t",
     ["BRAILLE LINE:  'Wrapping to top.'",
      "     VISIBLE:  'Wrapping to top.', cursor=0",
+     "BRAILLE LINE:  'table with 4 rows 3 columns'",
+     "     VISIBLE:  'table with 4 rows 3 columns', cursor=0",
      "BRAILLE LINE:  'Snapshot version Date (UTC) Download'",
      "     VISIBLE:  'Snapshot version Date (UTC) Down', cursor=1",
      "SPEECH OUTPUT: 'Wrapping to top.'",
-     "SPEECH OUTPUT: 'Table with 4 rows 3 columns'",
+     "SPEECH OUTPUT: 'table with 4 rows 3 columns'",
      "SPEECH OUTPUT: 'Snapshot version column header'"]))
 
 ########################################################################
@@ -65,6 +67,8 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'r2477 Wed Nov 5 16:39:00 2008 in', cursor=1",
      "BRAILLE LINE:  'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)portable archive (9154 KB)'",
      "     VISIBLE:  'r2477 Wed Nov 5 16:39:00 2008 in', cursor=1",
+     "BRAILLE LINE:  'Row 2, column 1.'",
+     "     VISIBLE:  'Row 2, column 1.', cursor=0",
      "SPEECH OUTPUT: 'r2477'",
      "SPEECH OUTPUT: 'Row 2, column 1.'"]))
 
@@ -73,9 +77,13 @@ sequence.append(KeyComboAction("<Alt><Shift>Right"))
 sequence.append(utils.AssertPresentationAction(
     "4. Alt Shift Right",
     ["BRAILLE LINE:  'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)portable archive (9154 KB)'",
+     "     VISIBLE:  'r2477 Wed Nov 5 16:39:00 2008 in', cursor=1",
+     "BRAILLE LINE:  'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)portable archive (9154 KB)'",
      "     VISIBLE:  'Wed Nov 5 16:39:00 2008 installe', cursor=1",
      "BRAILLE LINE:  'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)portable archive (9154 KB)'",
      "     VISIBLE:  'Wed Nov 5 16:39:00 2008 installe', cursor=1",
+     "BRAILLE LINE:  'Row 2, column 2.'",
+     "     VISIBLE:  'Row 2, column 2.', cursor=0",
      "SPEECH OUTPUT: 'Date (UTC)'",
      "SPEECH OUTPUT: 'Wed Nov 5 16:39:00 2008'",
      "SPEECH OUTPUT: 'Row 2, column 2.'"]))
@@ -85,9 +93,13 @@ sequence.append(KeyComboAction("<Alt><Shift>Right"))
 sequence.append(utils.AssertPresentationAction(
     "5. Alt Shift Right",
     ["BRAILLE LINE:  'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)portable archive (9154 KB)'",
+     "     VISIBLE:  'Wed Nov 5 16:39:00 2008 installe', cursor=1",
+     "BRAILLE LINE:  'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)portable archive (9154 KB)'",
      "     VISIBLE:  'installer (10190 KB)portable arc', cursor=1",
      "BRAILLE LINE:  'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)portable archive (9154 KB)'",
      "     VISIBLE:  'installer (10190 KB)portable arc', cursor=1",
+     "BRAILLE LINE:  'Row 2, column 3.'",
+     "     VISIBLE:  'Row 2, column 3.', cursor=0",
      "SPEECH OUTPUT: 'Download'",
      "SPEECH OUTPUT: 'installer link  (10190 KB)",
      " portable archive link  (9154 KB)'",
@@ -97,10 +109,14 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt><Shift>Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. Alt Shift Down",
-    ["BRAILLE LINE:  'r2468 Tue Nov 4 16:39:02 2008 installer (10193 KB)'",
+    ["BRAILLE LINE:  'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)portable archive (9154 KB)'",
+     "     VISIBLE:  'installer (10190 KB)portable arc', cursor=1",
+     "BRAILLE LINE:  'r2468 Tue Nov 4 16:39:02 2008 installer (10193 KB)'",
      "     VISIBLE:  'installer (10193 KB)', cursor=1",
      "BRAILLE LINE:  'r2468 Tue Nov 4 16:39:02 2008 installer (10193 KB)'",
      "     VISIBLE:  'installer (10193 KB)', cursor=1",
+     "BRAILLE LINE:  'Row 3, column 3.'",
+     "     VISIBLE:  'Row 3, column 3.', cursor=0",
      "SPEECH OUTPUT: 'installer link  (10193 KB)",
      " portable archive link  (9149 KB)'",
      "SPEECH OUTPUT: 'Row 3, column 3.'"]))
@@ -110,9 +126,13 @@ sequence.append(KeyComboAction("<Alt><Shift>Left"))
 sequence.append(utils.AssertPresentationAction(
     "7. Alt Shift Left",
     ["BRAILLE LINE:  'r2468 Tue Nov 4 16:39:02 2008 installer (10193 KB)'",
+     "     VISIBLE:  'installer (10193 KB)', cursor=1",
+     "BRAILLE LINE:  'r2468 Tue Nov 4 16:39:02 2008 installer (10193 KB)'",
      "     VISIBLE:  'Tue Nov 4 16:39:02 2008 installe', cursor=1",
      "BRAILLE LINE:  'r2468 Tue Nov 4 16:39:02 2008 installer (10193 KB)'",
      "     VISIBLE:  'Tue Nov 4 16:39:02 2008 installe', cursor=1",
+     "BRAILLE LINE:  'Row 3, column 2.'",
+     "     VISIBLE:  'Row 3, column 2.', cursor=0",
      "SPEECH OUTPUT: 'Date (UTC)'",
      "SPEECH OUTPUT: 'Tue Nov 4 16:39:02 2008'",
      "SPEECH OUTPUT: 'Row 3, column 2.'"]))
@@ -121,10 +141,14 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt><Shift>Up"))
 sequence.append(utils.AssertPresentationAction(
     "8. Alt Shift Up",
-    ["BRAILLE LINE:  'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)portable archive (9154 KB)'",
+    ["BRAILLE LINE:  'r2468 Tue Nov 4 16:39:02 2008 installer (10193 KB)'",
+     "     VISIBLE:  'Tue Nov 4 16:39:02 2008 installe', cursor=1",
+     "BRAILLE LINE:  'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)portable archive (9154 KB)'",
      "     VISIBLE:  'Wed Nov 5 16:39:00 2008 installe', cursor=1",
      "BRAILLE LINE:  'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)portable archive (9154 KB)'",
      "     VISIBLE:  'Wed Nov 5 16:39:00 2008 installe', cursor=1",
+     "BRAILLE LINE:  'Row 2, column 2.'",
+     "     VISIBLE:  'Row 2, column 2.', cursor=0",
      "SPEECH OUTPUT: 'Wed Nov 5 16:39:00 2008'",
      "SPEECH OUTPUT: 'Row 2, column 2.'"]))
 
@@ -132,10 +156,14 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt><Shift>End"))
 sequence.append(utils.AssertPresentationAction(
     "9. Alt Shift End",
-    ["BRAILLE LINE:  'r2464 Mon Nov 3 16:39:48 2008 installer (10186 KB)'",
+    ["BRAILLE LINE:  'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)portable archive (9154 KB)'",
+     "     VISIBLE:  'Wed Nov 5 16:39:00 2008 installe', cursor=1",
+     "BRAILLE LINE:  'r2464 Mon Nov 3 16:39:48 2008 installer (10186 KB)'",
      "     VISIBLE:  'installer (10186 KB)', cursor=1",
      "BRAILLE LINE:  'r2464 Mon Nov 3 16:39:48 2008 installer (10186 KB)'",
      "     VISIBLE:  'installer (10186 KB)', cursor=1",
+     "BRAILLE LINE:  'Row 4, column 3.'",
+     "     VISIBLE:  'Row 4, column 3.', cursor=0",
      "SPEECH OUTPUT: 'Download'",
      "SPEECH OUTPUT: 'installer link  (10186 KB)",
      " portable archive link  (9146 KB)'",
@@ -145,10 +173,14 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt><Shift>Home"))
 sequence.append(utils.AssertPresentationAction(
     "10. Alt Shift Home",
-    ["BRAILLE LINE:  'Snapshot version Date (UTC) Download'",
+    ["BRAILLE LINE:  'r2464 Mon Nov 3 16:39:48 2008 installer (10186 KB)'",
+     "     VISIBLE:  'installer (10186 KB)', cursor=1",
+     "BRAILLE LINE:  'Snapshot version Date (UTC) Download'",
      "     VISIBLE:  'Snapshot version Date (UTC) Down', cursor=1",
      "BRAILLE LINE:  'Snapshot version Date (UTC) Download'",
      "     VISIBLE:  'Snapshot version Date (UTC) Down', cursor=1",
+     "BRAILLE LINE:  'Row 1, column 1.'",
+     "     VISIBLE:  'Row 1, column 1.', cursor=0",
      "SPEECH OUTPUT: 'Snapshot version column header'",
      "SPEECH OUTPUT: 'Row 1, column 1.'"]))
 
diff --git a/test/keystrokes/firefox/html_struct_nav_bug_556470.py b/test/keystrokes/firefox/html_struct_nav_bug_556470.py
index adc542c..e1be2e1 100644
--- a/test/keystrokes/firefox/html_struct_nav_bug_556470.py
+++ b/test/keystrokes/firefox/html_struct_nav_bug_556470.py
@@ -46,19 +46,23 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("t"))
 sequence.append(utils.AssertPresentationAction(
-    "1. t", 
-    ["BRAILLE LINE:  'col 1 col 2 col 3'",
+    "1. t",
+    ["BRAILLE LINE:  'table with 2 rows 3 columns'",
+     "     VISIBLE:  'table with 2 rows 3 columns', cursor=0",
+     "BRAILLE LINE:  'col 1 col 2 col 3'",
      "     VISIBLE:  'col 1 col 2 col 3', cursor=1",
-     "SPEECH OUTPUT: 'Table with 2 rows 3 columns'",
+     "SPEECH OUTPUT: 'table with 2 rows 3 columns'",
      "SPEECH OUTPUT: 'col 1 column header'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("t"))
 sequence.append(utils.AssertPresentationAction(
-    "2. t", 
-    ["BRAILLE LINE:  '1 2 4'",
+    "2. t",
+    ["BRAILLE LINE:  'table with 2 rows 3 columns'",
+     "     VISIBLE:  'table with 2 rows 3 columns', cursor=0",
+     "BRAILLE LINE:  '1 2 4'",
      "     VISIBLE:  '1 2 4', cursor=1",
-     "SPEECH OUTPUT: 'Table with 2 rows 3 columns'",
+     "SPEECH OUTPUT: 'table with 2 rows 3 columns'",
      "SPEECH OUTPUT: '1'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -67,10 +71,12 @@ sequence.append(utils.AssertPresentationAction(
     "3. t",
     ["BRAILLE LINE:  'Wrapping to top.'",
      "     VISIBLE:  'Wrapping to top.', cursor=0",
+     "BRAILLE LINE:  'table with 2 rows 3 columns'",
+     "     VISIBLE:  'table with 2 rows 3 columns', cursor=0",
      "BRAILLE LINE:  'col 1 col 2 col 3'",
      "     VISIBLE:  'col 1 col 2 col 3', cursor=1",
      "SPEECH OUTPUT: 'Wrapping to top.'",
-     "SPEECH OUTPUT: 'Table with 2 rows 3 columns'",
+     "SPEECH OUTPUT: 'table with 2 rows 3 columns'",
      "SPEECH OUTPUT: 'col 1 column header'"]))
 
 ########################################################################
@@ -82,19 +88,23 @@ sequence.append(utils.AssertPresentationAction(
     "1. shift+t", 
     ["BRAILLE LINE:  'Wrapping to bottom.'",
      "     VISIBLE:  'Wrapping to bottom.', cursor=0",
+     "BRAILLE LINE:  'table with 2 rows 3 columns'",
+     "     VISIBLE:  'table with 2 rows 3 columns', cursor=0",
      "BRAILLE LINE:  '1 2 4'",
      "     VISIBLE:  '1 2 4', cursor=1",
      "SPEECH OUTPUT: 'Wrapping to bottom.'",
-     "SPEECH OUTPUT: 'Table with 2 rows 3 columns'",
+     "SPEECH OUTPUT: 'table with 2 rows 3 columns'",
      "SPEECH OUTPUT: '1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>t"))
 sequence.append(utils.AssertPresentationAction(
     "2. shift+t", 
-    ["BRAILLE LINE:  'col 1 col 2 col 3'",
+    ["BRAILLE LINE:  'table with 2 rows 3 columns'",
+     "     VISIBLE:  'table with 2 rows 3 columns', cursor=0",
+     "BRAILLE LINE:  'col 1 col 2 col 3'",
      "     VISIBLE:  'col 1 col 2 col 3', cursor=1",
-     "SPEECH OUTPUT: 'Table with 2 rows 3 columns'",
+     "SPEECH OUTPUT: 'table with 2 rows 3 columns'",
      "SPEECH OUTPUT: 'col 1 column header'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -102,11 +112,13 @@ sequence.append(KeyComboAction("<Shift>t"))
 sequence.append(utils.AssertPresentationAction(
     "3. shift+t",
     ["BRAILLE LINE:  'Wrapping to bottom.'",
-     "     VISIBLE:  'Wrapping to bottom.', cursor=0", 
+     "     VISIBLE:  'Wrapping to bottom.', cursor=0",
+     "BRAILLE LINE:  'table with 2 rows 3 columns'",
+     "     VISIBLE:  'table with 2 rows 3 columns', cursor=0",
      "BRAILLE LINE:  '1 2 4'",
      "     VISIBLE:  '1 2 4', cursor=1",
      "SPEECH OUTPUT: 'Wrapping to bottom.'",
-     "SPEECH OUTPUT: 'Table with 2 rows 3 columns'",
+     "SPEECH OUTPUT: 'table with 2 rows 3 columns'",
      "SPEECH OUTPUT: '1'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/html_struct_nav_large_obj.py b/test/keystrokes/firefox/html_struct_nav_large_obj.py
index 92eabd5..b06fb52 100644
--- a/test/keystrokes/firefox/html_struct_nav_large_obj.py
+++ b/test/keystrokes/firefox/html_struct_nav_large_obj.py
@@ -34,8 +34,6 @@ sequence.append(utils.AssertPresentationAction(
     "Top of file", 
     ["BRAILLE LINE:  'Text Attributes h1'",
      "     VISIBLE:  'Text Attributes h1', cursor=1",
-     "BRAILLE LINE:  'Text Attributes h1'",
-     "     VISIBLE:  'Text Attributes h1', cursor=1",
      "SPEECH OUTPUT: 'Text Attributes heading level 1'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/html_struct_nav_links.py b/test/keystrokes/firefox/html_struct_nav_links.py
index 182390d..5028fd4 100644
--- a/test/keystrokes/firefox/html_struct_nav_links.py
+++ b/test/keystrokes/firefox/html_struct_nav_links.py
@@ -48,8 +48,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("u"))
 sequence.append(utils.AssertPresentationAction(
     "u to anchors.html link", 
-    ["BRAILLE LINE:  'â?¢ anchors.html'",
-     "     VISIBLE:  'â?¢ anchors.html', cursor=3",
+    ["BRAILLE LINE:  'â?¢anchors.html'",
+     "     VISIBLE:  'â?¢anchors.html', cursor=2",
      "SPEECH OUTPUT: 'anchors.html link'"]))
 
 ########################################################################
@@ -59,8 +59,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("u"))
 sequence.append(utils.AssertPresentationAction(
     "u to blockquotes.html link", 
-    ["BRAILLE LINE:  'â?¢ blockquotes.html'",
-     "     VISIBLE:  'â?¢ blockquotes.html', cursor=3",
+    ["BRAILLE LINE:  'â?¢blockquotes.html'",
+     "     VISIBLE:  'â?¢blockquotes.html', cursor=2",
      "SPEECH OUTPUT: 'blockquotes.html link'"]))
 
 ########################################################################
@@ -70,8 +70,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>u"))
 sequence.append(utils.AssertPresentationAction(
     "shift + u to anchors.html link", 
-    ["BRAILLE LINE:  'â?¢ anchors.html'",
-     "     VISIBLE:  'â?¢ anchors.html', cursor=3",
+    ["BRAILLE LINE:  'â?¢anchors.html'",
+     "     VISIBLE:  'â?¢anchors.html', cursor=2",
      "SPEECH OUTPUT: 'anchors.html link'"]))
 
 ########################################################################
@@ -86,8 +86,8 @@ sequence.append(utils.AssertPresentationAction(
     "shift + u wrapping to bottom",
     ["BRAILLE LINE:  'Wrapping to bottom.'",
      "     VISIBLE:  'Wrapping to bottom.', cursor=0",
-     "BRAILLE LINE:  'â?¢ textattributes.html'",
-     "     VISIBLE:  'â?¢ textattributes.html', cursor=3",
+     "BRAILLE LINE:  'â?¢textattributes.html'",
+     "     VISIBLE:  'â?¢textattributes.html', cursor=2",
      "SPEECH OUTPUT: 'Wrapping to bottom.'",
      "SPEECH OUTPUT: 'textattributes.html link'"])) 
 
@@ -98,8 +98,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>u"))
 sequence.append(utils.AssertPresentationAction(
     "shift + u to tables.html",
-    ["BRAILLE LINE:  'â?¢ tables.html'",
-     "     VISIBLE:  'â?¢ tables.html', cursor=3",
+    ["BRAILLE LINE:  'â?¢tables.html'",
+     "     VISIBLE:  'â?¢tables.html', cursor=2",
      "SPEECH OUTPUT: 'tables.html link'"])) 
 
 ########################################################################
@@ -185,8 +185,8 @@ sequence.append(utils.AssertPresentationAction(
     "shift + v to tables.html link",
     ["BRAILLE LINE:  'Wrapping to bottom.'",
      "     VISIBLE:  'Wrapping to bottom.', cursor=0",
-     "BRAILLE LINE:  'â?¢ tables.html'",
-     "     VISIBLE:  'â?¢ tables.html', cursor=3",
+     "BRAILLE LINE:  'â?¢tables.html'",
+     "     VISIBLE:  'â?¢tables.html', cursor=2",
      "SPEECH OUTPUT: 'Wrapping to bottom.'",
      "SPEECH OUTPUT: 'tables.html link'"]))
 
diff --git a/test/keystrokes/firefox/html_struct_nav_list_item.py b/test/keystrokes/firefox/html_struct_nav_list_item.py
index 2802eca..aae20d3 100644
--- a/test/keystrokes/firefox/html_struct_nav_list_item.py
+++ b/test/keystrokes/firefox/html_struct_nav_list_item.py
@@ -37,8 +37,6 @@ sequence.append(utils.AssertPresentationAction(
     "Top of file", 
     ["BRAILLE LINE:  'Welcome to a List of Lists h1'",
      "     VISIBLE:  'Welcome to a List of Lists h1', cursor=1",
-     "BRAILLE LINE:  'Welcome to a List of Lists h1'",
-     "     VISIBLE:  'Welcome to a List of Lists h1', cursor=1",
      "SPEECH OUTPUT: 'Welcome to a List of Lists heading level 1'"]))
 
 ########################################################################
@@ -48,10 +46,12 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("l"))
 sequence.append(utils.AssertPresentationAction(
     "l to first list", 
-    ["BRAILLE LINE:  '1. remember what the heck we are doing each day'",
-     "     VISIBLE:  '1. remember what the heck we are', cursor=1",
+    ["BRAILLE LINE:  'List with 4 items'",
+     "     VISIBLE:  'List with 4 items', cursor=0",
+     "BRAILLE LINE:  '1.remember what the heck we are doing each day'",
+     "     VISIBLE:  '1.remember what the heck we are ', cursor=1",
      "SPEECH OUTPUT: 'List with 4 items'",
-     "SPEECH OUTPUT: '1. remember what the heck we are doing each day'"]))
+     "SPEECH OUTPUT: '1.remember what the heck we are doing each day'"]))
 
 ########################################################################
 # Press L to move to the second list.
@@ -59,11 +59,13 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("l"))
 sequence.append(utils.AssertPresentationAction(
-    "l to second list", 
-    ["BRAILLE LINE:  'VI. And use roman numerals,'",
-     "     VISIBLE:  'VI. And use roman numerals,', cursor=1",
+    "l to second list",
+    ["BRAILLE LINE:  'List with 6 items'",
+     "     VISIBLE:  'List with 6 items', cursor=0",
+     "BRAILLE LINE:  'VI.And use roman numerals,'",
+     "     VISIBLE:  'VI.And use roman numerals,', cursor=1",
      "SPEECH OUTPUT: 'List with 6 items'",
-     "SPEECH OUTPUT: 'VI. And use roman numerals,'"]))
+     "SPEECH OUTPUT: 'VI.And use roman numerals,'"]))
 
 ########################################################################
 # Press L to move to the third list.
@@ -71,11 +73,13 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("l"))
 sequence.append(utils.AssertPresentationAction(
-    "l to third list", 
-    ["BRAILLE LINE:  'â?¢ listing item'",
-     "     VISIBLE:  'â?¢ listing item', cursor=1",
+    "l to third list",
+    ["BRAILLE LINE:  'List with 2 items'",
+     "     VISIBLE:  'List with 2 items', cursor=0",
+     "BRAILLE LINE:  'â?¢listing item'",
+     "     VISIBLE:  'â?¢listing item', cursor=1",
      "SPEECH OUTPUT: 'List with 2 items'",
-     "SPEECH OUTPUT: 'â?¢ listing item'"]))
+     "SPEECH OUTPUT: 'â?¢listing item'"]))
 
 ########################################################################
 # Press I to move among all of the items (sub items, sub sub items, 
@@ -85,113 +89,113 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "i in third list", 
-    ["BRAILLE LINE:  'â?¢ first sublevel'",
-     "     VISIBLE:  'â?¢ first sublevel', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ first sublevel'"]))
+    ["BRAILLE LINE:  'â?¦first sublevel'",
+     "     VISIBLE:  'â?¦first sublevel', cursor=1",
+     "SPEECH OUTPUT: 'â?¦first sublevel'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "i in third list", 
-    ["BRAILLE LINE:  'â?¢ look for the bullet on'",
-     "     VISIBLE:  'â?¢ look for the bullet on', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ look for the bullet on'"]))
+    ["BRAILLE LINE:  'â?ªlook for the bullet on'",
+     "     VISIBLE:  'â?ªlook for the bullet on', cursor=1",
+     "SPEECH OUTPUT: 'â?ªlook for the bullet on'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "i in third list", 
-    ["BRAILLE LINE:  'â?¢ each sublevel'",
-     "     VISIBLE:  'â?¢ each sublevel', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ each sublevel'"]))
+    ["BRAILLE LINE:  'â?ªeach sublevel'",
+     "     VISIBLE:  'â?ªeach sublevel', cursor=1",
+     "SPEECH OUTPUT: 'â?ªeach sublevel'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "i in third list", 
-    ["BRAILLE LINE:  'â?¢ they should all be different, except here.'",
-     "     VISIBLE:  'â?¢ they should all be different, ', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ they should all be different, except here.'"]))
+    ["BRAILLE LINE:  'â?ªthey should all be different, except here.'",
+     "     VISIBLE:  'â?ªthey should all be different, e', cursor=1",
+     "SPEECH OUTPUT: 'â?ªthey should all be different, except here.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "i in third list", 
-    ["BRAILLE LINE:  'â?¢ second sublevel'",
-     "     VISIBLE:  'â?¢ second sublevel', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ second sublevel'"]))
+    ["BRAILLE LINE:  'â?ªsecond sublevel'",
+     "     VISIBLE:  'â?ªsecond sublevel', cursor=1",
+     "SPEECH OUTPUT: 'â?ªsecond sublevel'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "i in third list", 
-    ["BRAILLE LINE:  'â?¢ or you can specify a square'",
-     "     VISIBLE:  'â?¢ or you can specify a square', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ or you can specify a square'"]))
+    ["BRAILLE LINE:  'â?ªor you can specify a square'",
+     "     VISIBLE:  'â?ªor you can specify a square', cursor=1",
+     "SPEECH OUTPUT: 'â?ªor you can specify a square'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "i in third list", 
-    ["BRAILLE LINE:  'â?¢ if your TYPE is circle'",
-     "     VISIBLE:  'â?¢ if your TYPE is circle', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ if your TYPE is circle'"]))
+    ["BRAILLE LINE:  'â?¦if your TYPE is circle'",
+     "     VISIBLE:  'â?¦if your TYPE is circle', cursor=1",
+     "SPEECH OUTPUT: 'â?¦if your TYPE is circle'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "i in third list", 
-    ["BRAILLE LINE:  'â?¢ or even a disc'",
-     "     VISIBLE:  'â?¢ or even a disc', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ or even a disc'"]))
+    ["BRAILLE LINE:  'â?¢or even a disc'",
+     "     VISIBLE:  'â?¢or even a disc', cursor=1",
+     "SPEECH OUTPUT: 'â?¢or even a disc'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "i in third list", 
-    ["BRAILLE LINE:  'â?¢ Franz Liszt'",
-     "     VISIBLE:  'â?¢ Franz Liszt', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Franz Liszt'"]))
+    ["BRAILLE LINE:  'â?ªFranz Liszt'",
+     "     VISIBLE:  'â?ªFranz Liszt', cursor=1",
+     "SPEECH OUTPUT: 'â?ªFranz Liszt'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "i in third list", 
-    ["BRAILLE LINE:  'â?¢ was a composer who was not square'",
-     "     VISIBLE:  'â?¢ was a composer who was not squ', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ was a composer who was not square'"]))
+    ["BRAILLE LINE:  'â?¦was a composer who was not square'",
+     "     VISIBLE:  'â?¦was a composer who was not squa', cursor=1",
+     "SPEECH OUTPUT: 'â?¦was a composer who was not square'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "i in third list", 
-    ["BRAILLE LINE:  'â?¢ would have liked the Who'",
-     "     VISIBLE:  'â?¢ would have liked the Who', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ would have liked the Who'"]))
+    ["BRAILLE LINE:  'â?¢would have liked the Who'",
+     "     VISIBLE:  'â?¢would have liked the Who', cursor=1",
+     "SPEECH OUTPUT: 'â?¢would have liked the Who'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "i in third list", 
-    ["BRAILLE LINE:  'â?¢ feeling listless'",
-     "     VISIBLE:  'â?¢ feeling listless', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ feeling listless'"]))
+    ["BRAILLE LINE:  'â?¦feeling listless'",
+     "     VISIBLE:  'â?¦feeling listless', cursor=1",
+     "SPEECH OUTPUT: 'â?¦feeling listless''"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "i in third list", 
-    ["BRAILLE LINE:  'â?¢ blah, blah, blah'",
-     "     VISIBLE:  'â?¢ blah, blah, blah', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ blah, blah, blah'"]))
+    ["BRAILLE LINE:  'â?ªblah, blah, blah'",
+     "     VISIBLE:  'â?ªblah, blah, blah', cursor=1",
+     "SPEECH OUTPUT: 'â?ªblah, blah, blah'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "i in third list", 
-    ["BRAILLE LINE:  'â?¢ whine, whine, whine'",
-     "     VISIBLE:  'â?¢ whine, whine, whine', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ whine, whine, whine'"]))
+    ["BRAILLE LINE:  'â?¢whine, whine, whine'",
+     "     VISIBLE:  'â?¢whine, whine, whine', cursor=1",
+     "SPEECH OUTPUT: 'â?¢whine, whine, whine'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("i"))
@@ -199,18 +203,18 @@ sequence.append(utils.AssertPresentationAction(
     "i should wrap to top", 
     ["BRAILLE LINE:  'Wrapping to top.'",
      "     VISIBLE:  'Wrapping to top.', cursor=0",
-     "BRAILLE LINE:  '1. remember what the heck we are doing each day'",
-     "     VISIBLE:  '1. remember what the heck we are', cursor=1",
+     "BRAILLE LINE:  '1.remember what the heck we are doing each day'",
+     "     VISIBLE:  '1.remember what the heck we are ', cursor=1",
      "SPEECH OUTPUT: 'Wrapping to top.'",
-     "SPEECH OUTPUT: '1. remember what the heck we are doing each day'"]))
+     "SPEECH OUTPUT: '1.remember what the heck we are doing each day'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("i"))
 sequence.append(utils.AssertPresentationAction(
     "i in first list", 
-    ["BRAILLE LINE:  '2. arrange long and arbitrary lines of text into ordered lists that are pleasing to the eye and suggest some sense of priority, even if it is artificial'",
-     "     VISIBLE:  '2. arrange long and arbitrary li', cursor=1",
-     "SPEECH OUTPUT: '2. arrange long and arbitrary lines of text into ordered lists that are pleasing to the eye and suggest some sense of priority, even if it is artificial'"]))
+    ["BRAILLE LINE:  '2.arrange long and arbitrary lines of text into ordered lists that are pleasing to the eye and suggest some sense of priority, even if it is artificial'",
+     "     VISIBLE:  '2.arrange long and arbitrary lin', cursor=1",
+     "SPEECH OUTPUT: '2.arrange long and arbitrary lines of text into ordered lists that are pleasing to the eye and suggest some sense of priority, even if it is artificial'"]))
 
 ########################################################################
 # Now reverse our direction, but just for a few items.
@@ -219,9 +223,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>i"))
 sequence.append(utils.AssertPresentationAction(
     "shift + i in first list", 
-    ["BRAILLE LINE:  '1. remember what the heck we are doing each day'",
-     "     VISIBLE:  '1. remember what the heck we are', cursor=1",
-     "SPEECH OUTPUT: '1. remember what the heck we are doing each day'"]))
+    ["BRAILLE LINE:  '1.remember what the heck we are doing each day'",
+     "     VISIBLE:  '1.remember what the heck we are d', cursor=1",
+     "SPEECH OUTPUT: '1.remember what the heck we are doing each day'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>i"))
@@ -229,26 +233,26 @@ sequence.append(utils.AssertPresentationAction(
     "shift + i should wrap to bottom", 
     ["BRAILLE LINE:  'Wrapping to bottom.'",
      "     VISIBLE:  'Wrapping to bottom.', cursor=0",
-     "BRAILLE LINE:  'â?¢ whine, whine, whine'",
-     "     VISIBLE:  'â?¢ whine, whine, whine', cursor=1",
+     "BRAILLE LINE:  'â?¢whine, whine, whine'",
+     "     VISIBLE:  'â?¢whine, whine, whine', cursor=1",
      "SPEECH OUTPUT: 'Wrapping to bottom.'",
-     "SPEECH OUTPUT: 'â?¢ whine, whine, whine'"]))
+     "SPEECH OUTPUT: 'â?¢whine, whine, whine'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>i"))
 sequence.append(utils.AssertPresentationAction(
     "shift + i in third list", 
-    ["BRAILLE LINE:  'â?¢ blah, blah, blah'",
-     "     VISIBLE:  'â?¢ blah, blah, blah', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ blah, blah, blah'"]))
+    ["BRAILLE LINE:  'â?ªblah, blah, blah'",
+     "     VISIBLE:  'â?ªblah, blah, blah', cursor=1",
+     "SPEECH OUTPUT: 'â?ªblah, blah, blah'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>i"))
 sequence.append(utils.AssertPresentationAction(
     "shift + i in third list", 
-    ["BRAILLE LINE:  'â?¢ feeling listless'",
-     "     VISIBLE:  'â?¢ feeling listless', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ feeling listless'"]))
+    ["BRAILLE LINE:  'â?¦feeling listless'",
+     "     VISIBLE:  'â?¦feeling listless', cursor=1",
+     "SPEECH OUTPUT: 'â?¦feeling listless''"]))
 
 ########################################################################
 # Move to the location bar by pressing Control+L.  When it has focus



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