Index: test/keystrokes/gtk-demo/role_icon.py
===================================================================
--- test/keystrokes/gtk-demo/role_icon.py	(revision 3524)
+++ test/keystrokes/gtk-demo/role_icon.py	(working copy)
@@ -63,11 +63,11 @@
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ICON))
 sequence.append(utils.AssertPresentationAction(
     "bin icon",
-    ["BUG? - we cannot get reliable output from this test since it depends on the contents of /",
-     "BRAILLE LINE:  'gtk-demo Application GtkIconView demo Frame ScrollPane LayeredPane Desktop Icon'",
-     "     VISIBLE:  'Desktop Icon', cursor=1",
+    ["BRAILLE LINE:  'gtk-demo Application GtkIconView demo Frame ScrollPane LayeredPane bin Icon'",
+     "     VISIBLE:  'bin Icon', cursor=1",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Desktop icon'"]))
+     "SPEECH OUTPUT: 'bin icon'",
+     "SPEECH OUTPUT: ' not selected'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.
@@ -88,7 +88,11 @@
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ICON))
 sequence.append(utils.AssertPresentationAction(
     "boot icon",
-    ["BUG? - we cannot get reliable output from this test since it depends on the contents of /"]))
+    ["BRAILLE LINE:  'gtk-demo Application GtkIconView demo Frame ScrollPane LayeredPane boot Icon'",
+     "     VISIBLE:  'boot Icon', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'boot icon'",
+     "SPEECH OUTPUT: ' not selected'"]))
 
 ########################################################################
 # Select more than one icon by doing Shift+Right.
@@ -98,8 +102,11 @@
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ICON))
 sequence.append(utils.AssertPresentationAction(
     "icon selection",
-    ["BUG? - we cannot get reliable output from this test since it depends on the contents of /",
-     "BUG? - we do not announce selection of icons when they are selected."]))
+    ["BRAILLE LINE:  'gtk-demo Application GtkIconView demo Frame ScrollPane LayeredPane cdrom Icon'",
+     "     VISIBLE:  'cdrom Icon', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'cdrom icon'",
+     "SPEECH OUTPUT: ' not selected'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.
Index: test/keystrokes/gtk-demo/role_tree_table.py
===================================================================
--- test/keystrokes/gtk-demo/role_tree_table.py	(revision 3524)
+++ test/keystrokes/gtk-demo/role_tree_table.py	(working copy)
@@ -103,7 +103,9 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "January cell collapsed",
-    ["BUG? - nothing presented", "BUG? - the cell name 'January' should not be spoken"]))
+    ["BRAILLE LINE:  'gtk-demo Application Card planning sheet Frame ScrollPane TreeTable Holiday ColumnHeader January collapsed < > Alex < > Havoc < > Tim < > Owen < > Dave TREE LEVEL 1'",
+     "     VISIBLE:  'January collapsed < > Alex < > H', cursor=1",
+     "SPEECH OUTPUT: 'collapsed'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.
@@ -131,7 +133,9 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "January cell expanded",
-    ["BUG? - nothing presented", "BUG? - the cell name 'January' should not be spoken"]))
+    ["BRAILLE LINE:  'gtk-demo Application Card planning sheet Frame ScrollPane TreeTable Holiday ColumnHeader January expanded < > Alex < > Havoc < > Tim < > Owen < > Dave TREE LEVEL 1'",
+     "     VISIBLE:  'January expanded < > Alex < > Ha', cursor=1",
+     "SPEECH OUTPUT: 'expanded 3 items'"]))
 
 ########################################################################
 # Arrow down a row.
@@ -148,7 +152,6 @@
     ["BRAILLE LINE:  'gtk-demo Application Card planning sheet Frame ScrollPane TreeTable Holiday ColumnHeader New Years Day <x> Alex <x> Havoc <x> Tim <x> Owen < > Dave TREE LEVEL 2'",
      "     VISIBLE:  'New Years Day <x> Alex <x> Havoc', cursor=1",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Holiday column header'",
      "SPEECH OUTPUT: 'New Years Day Alex check box checked  Havoc check box checked  Tim check box checked  Owen check box checked  Dave check box not checked '",
      "SPEECH OUTPUT: 'tree level 2'"]))
 
@@ -168,7 +171,6 @@
      "     VISIBLE:  '<x> Alex <x> Havoc <x> Tim <x> O', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Alex column header'",
-     "BUG? - should not speak entire row after moving right one cell",
      "SPEECH OUTPUT: 'New Years Day Alex check box checked  Havoc check box checked  Tim check box checked  Owen check box checked  Dave check box not checked '"]))
 
 #
