testsuite: Make a11y tests use regular windows

59 files changed, 352 insertions, 123 deletions

diff --git a/testsuite/a11y/accessible-name.txt b/testsuite/a11y/accessible-name.txt
index fbbeabafee..30b17ba67a 100644
--- a/testsuite/a11y/accessible-name.txt
+++ b/testsuite/a11y/accessible-name.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   button1
     "push button"
     parent: window1
diff --git a/testsuite/a11y/accessible-name.ui b/testsuite/a11y/accessible-name.ui
index 8fc76d0bf9..4b36e0ce76 100644
--- a/testsuite/a11y/accessible-name.ui
+++ b/testsuite/a11y/accessible-name.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="label" translatable="yes">Hello World!</property>
diff --git a/testsuite/a11y/actionbar.txt b/testsuite/a11y/actionbar.txt
index c5dfafa274..3a7311a652 100644
--- a/testsuite/a11y/actionbar.txt
+++ b/testsuite/a11y/actionbar.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   actionbar
     "panel"
     parent: window1
@@ -18,7 +26,7 @@ window1
     alpha: 1
     button1
       "push button"
-      parent: unnamed-GtkContainerAccessible-0
+      parent: unnamed-GtkContainerAccessible-1
       index: 0
       name: Start 1
       state: enabled focusable focused sensitive showing visible
@@ -34,7 +42,7 @@ window1
       action 0 description: Clicks the button
     button2
       "push button"
-      parent: unnamed-GtkContainerAccessible-0
+      parent: unnamed-GtkContainerAccessible-1
       index: 1
       name: Start 2
       state: enabled focusable sensitive showing visible
@@ -50,7 +58,7 @@ window1
       action 0 description: Clicks the button
     button5
       "push button"
-      parent: unnamed-GtkWidgetAccessible-1
+      parent: unnamed-GtkWidgetAccessible-2
       index: 1
       name: Center
       state: enabled focusable sensitive showing visible
@@ -66,7 +74,7 @@ window1
       action 0 description: Clicks the button
     button4
       "push button"
-      parent: unnamed-GtkContainerAccessible-2
+      parent: unnamed-GtkContainerAccessible-3
       index: 0
       name: End 2
       state: enabled focusable sensitive showing visible
@@ -82,7 +90,7 @@ window1
       action 0 description: Clicks the button
     button3
       "push button"
-      parent: unnamed-GtkContainerAccessible-2
+      parent: unnamed-GtkContainerAccessible-3
       index: 1
       name: End 1
       state: enabled focusable sensitive showing visible
diff --git a/testsuite/a11y/actionbar.ui b/testsuite/a11y/actionbar.ui
index d2f7885e89..fdf23e3b3d 100644
--- a/testsuite/a11y/actionbar.ui
+++ b/testsuite/a11y/actionbar.ui
@@ -1,6 +1,5 @@
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkActionBar" id="actionbar">
         <child type="start">
diff --git a/testsuite/a11y/assistant.txt b/testsuite/a11y/assistant.txt
index a1034152c4..b0254b31bf 100644
--- a/testsuite/a11y/assistant.txt
+++ b/testsuite/a11y/assistant.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   name: Page 1
   state: enabled resizable sensitive showing visible
diff --git a/testsuite/a11y/assistant.ui b/testsuite/a11y/assistant.ui
index dfe2785526..dd13171d8a 100644
--- a/testsuite/a11y/assistant.ui
+++ b/testsuite/a11y/assistant.ui
@@ -1,6 +1,5 @@
 <interface>
   <object class="GtkAssistant" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkAssistantPage">
         <property name="title" translatable="yes">Page 1</property>
diff --git a/testsuite/a11y/buttons.txt b/testsuite/a11y/buttons.txt
index 3f9811a23f..e9f76922de 100644
--- a/testsuite/a11y/buttons.txt
+++ b/testsuite/a11y/buttons.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   grid1
     "panel"
     parent: window1
@@ -55,7 +63,7 @@ window1
       name: Hello World!
       member-of: button4
                  button3
-      state: enabled focusable sensitive showing visible
+      state: checked enabled focusable sensitive showing visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
diff --git a/testsuite/a11y/buttons.ui b/testsuite/a11y/buttons.ui
index 46e1f7e802..537a20144e 100644
--- a/testsuite/a11y/buttons.ui
+++ b/testsuite/a11y/buttons.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/a11y/calendar.txt b/testsuite/a11y/calendar.txt
index 5f80dc7c78..f791d86702 100644
--- a/testsuite/a11y/calendar.txt
+++ b/testsuite/a11y/calendar.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   calendar1
     "calendar"
     parent: window1
diff --git a/testsuite/a11y/calendar.ui b/testsuite/a11y/calendar.ui
index f4562c4339..ac1486f93d 100644
--- a/testsuite/a11y/calendar.ui
+++ b/testsuite/a11y/calendar.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkCalendar" id="calendar1">
         <property name="visible">True</property>
diff --git a/testsuite/a11y/colorchooser.txt b/testsuite/a11y/colorchooser.txt
index db434621ce..b0b1503e2f 100644
--- a/testsuite/a11y/colorchooser.txt
+++ b/testsuite/a11y/colorchooser.txt
@@ -741,6 +741,40 @@ window1
               action 1 description: Activates the color
               action 2 name: customize
               action 2 description: Customizes the color
+            unnamed-GtkColorSwatchAccessible-41
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-39
+              index: 1
+              name: Custom color 1: Red 0%, Green 0%, Blue 100%
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              action 0 name: select
+              action 0 description: Selects the color
+              action 1 name: activate
+              action 1 description: Activates the color
+              action 2 name: customize
+              action 2 description: Customizes the color
+            unnamed-GtkColorSwatchAccessible-42
+              "radio button"
+              parent: unnamed-GtkContainerAccessible-39
+              index: 2
+              name: Custom color 2: Red 19%, Green 41%, Blue 63%
+              state: enabled focusable sensitive showing visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              <AtkAction>
+              action 0 name: select
+              action 0 description: Selects the color
+              action 1 name: activate
+              action 1 description: Activates the color
+              action 2 name: customize
+              action 2 description: Customizes the color
         GtkColorEditor
           "filler"
           parent: chooser
@@ -811,8 +845,8 @@ window1
                 layer: widget
                 alpha: 1
                 <AtkText>
-                text: 
-                character count: 0
+                text: #FFFFFF
+                character count: 7
                 caret offset: -1
                 default attributes: bg-color: <omitted>
                                     bg-full-height: 0
@@ -869,7 +903,7 @@ window1
                 <AtkValue>
                 minimum value: 0.000000
                 maximum value: 1.000000
-                current value: 0.000000
+                current value: 1.000000
               sv_plane
                 "color chooser"
                 parent: grid
@@ -1005,7 +1039,7 @@ window1
                   <AtkValue>
                   minimum value: 0.000000
                   maximum value: 100.000000
-                  current value: 0.000000
+                  current value: 100.000000
             h_popup
               "filler"
               parent: overlay
@@ -1149,7 +1183,7 @@ window1
                   <AtkValue>
                   minimum value: 0.000000
                   maximum value: 100.000000
-                  current value: 0.000000
+                  current value: 100.000000
     action_box
       "filler"
       parent: ___object_1___
@@ -1179,7 +1213,7 @@ window1
     alpha: 1
     cancel_button
       "push button"
-      parent: unnamed-GtkContainerAccessible-41
+      parent: unnamed-GtkContainerAccessible-43
       index: 0
       name: Cancel
       state: enabled focusable sensitive showing visible
@@ -1196,7 +1230,7 @@ window1
       action 0 keybinding: <Alt>c
     ok_button
       "push button"
-      parent: unnamed-GtkContainerAccessible-42
+      parent: unnamed-GtkContainerAccessible-44
       index: 0
       name: Select
       state: enabled focusable sensitive showing visible default
diff --git a/testsuite/a11y/combos.txt b/testsuite/a11y/combos.txt
index bc5862caa8..a47de4a219 100644
--- a/testsuite/a11y/combos.txt
+++ b/testsuite/a11y/combos.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   box1
     "filler"
     parent: window1
@@ -81,9 +89,9 @@ window1
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkStackAccessible-0
+        unnamed-GtkStackAccessible-1
           "panel"
-          parent: unnamed-GtkWidgetAccessible-1
+          parent: unnamed-GtkWidgetAccessible-2
           index: 0
           state: enabled sensitive visible
           toolkit: gtk
@@ -112,9 +120,9 @@ window1
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkStackAccessible-2
+        unnamed-GtkStackAccessible-3
           "panel"
-          parent: unnamed-GtkWidgetAccessible-3
+          parent: unnamed-GtkWidgetAccessible-4
           index: 0
           state: enabled sensitive visible
           toolkit: gtk
@@ -184,9 +192,9 @@ window1
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkStackAccessible-4
+        unnamed-GtkStackAccessible-5
           "panel"
-          parent: unnamed-GtkWidgetAccessible-5
+          parent: unnamed-GtkWidgetAccessible-6
           index: 0
           state: enabled sensitive visible
           toolkit: gtk
@@ -215,9 +223,9 @@ window1
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkStackAccessible-6
+        unnamed-GtkStackAccessible-7
           "panel"
-          parent: unnamed-GtkWidgetAccessible-7
+          parent: unnamed-GtkWidgetAccessible-8
           index: 0
           state: enabled sensitive visible
           toolkit: gtk
diff --git a/testsuite/a11y/combos.ui b/testsuite/a11y/combos.ui
index 8ad2416f6e..d05f042e97 100644
--- a/testsuite/a11y/combos.ui
+++ b/testsuite/a11y/combos.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/a11y/entries.txt b/testsuite/a11y/entries.txt
index d94dc9a956..329fe903d4 100644
--- a/testsuite/a11y/entries.txt
+++ b/testsuite/a11y/entries.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   box1
     "filler"
     parent: window1
@@ -267,7 +275,7 @@ window1
       <AtkAction>
       action 0 name: activate
       action 0 description: Activates the entry
-      unnamed-GtkEntryIconAccessible-0
+      unnamed-GtkEntryIconAccessible-1
         "icon"
         parent: entry3
         name: edit-undo
@@ -277,7 +285,7 @@ window1
         alpha: 1
         <AtkAction>
         action 0 name: activate
-      unnamed-GtkEntryIconAccessible-1
+      unnamed-GtkEntryIconAccessible-2
         "icon"
         parent: entry3
         name: edit-redo
diff --git a/testsuite/a11y/entries.ui b/testsuite/a11y/entries.ui
index f9c34448ea..1f51b25348 100644
--- a/testsuite/a11y/entries.ui
+++ b/testsuite/a11y/entries.ui
@@ -11,7 +11,6 @@
   </object>
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/a11y/expander.txt b/testsuite/a11y/expander.txt
index 07ca46e6fb..b5930cc3ff 100644
--- a/testsuite/a11y/expander.txt
+++ b/testsuite/a11y/expander.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   expander1
     "toggle button"
     parent: window1
diff --git a/testsuite/a11y/expander.ui b/testsuite/a11y/expander.ui
index a0baf67f7a..89d8baef9e 100644
--- a/testsuite/a11y/expander.ui
+++ b/testsuite/a11y/expander.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkExpander" id="expander1">
         <property name="label" translatable="yes">Reveal this</property>
diff --git a/testsuite/a11y/headerbar.txt b/testsuite/a11y/headerbar.txt
index b92dd63504..a4e722752b 100644
--- a/testsuite/a11y/headerbar.txt
+++ b/testsuite/a11y/headerbar.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   headerbar1
     "panel"
     parent: window1
@@ -18,7 +26,7 @@ window1
     alpha: 1
     button1
       "push button"
-      parent: unnamed-GtkContainerAccessible-0
+      parent: unnamed-GtkContainerAccessible-1
       index: 0
       name: Yes
       state: enabled focusable focused sensitive showing visible
@@ -34,7 +42,7 @@ window1
       action 0 description: Clicks the button
     page2
       "push button"
-      parent: unnamed-GtkContainerAccessible-1
+      parent: unnamed-GtkContainerAccessible-2
       index: 0
       name: No
       state: enabled focusable sensitive showing visible
diff --git a/testsuite/a11y/headerbar.ui b/testsuite/a11y/headerbar.ui
index 2477de1355..4e2abbfc17 100644
--- a/testsuite/a11y/headerbar.ui
+++ b/testsuite/a11y/headerbar.ui
@@ -1,6 +1,5 @@
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkHeaderBar" id="headerbar1">
         <property name="title">Title</property>
diff --git a/testsuite/a11y/hello-world.txt b/testsuite/a11y/hello-world.txt
index b9d478e88a..af53ac279b 100644
--- a/testsuite/a11y/hello-world.txt
+++ b/testsuite/a11y/hello-world.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   button1
     "push button"
     parent: window1
diff --git a/testsuite/a11y/hello-world.ui b/testsuite/a11y/hello-world.ui
index 589a12c7ca..1b8ed5154a 100644
--- a/testsuite/a11y/hello-world.ui
+++ b/testsuite/a11y/hello-world.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="label" translatable="yes">Hello World!</property>
diff --git a/testsuite/a11y/iconview.txt b/testsuite/a11y/iconview.txt
index 404a2c73c2..dfae902e31 100644
--- a/testsuite/a11y/iconview.txt
+++ b/testsuite/a11y/iconview.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   iv1
     "layered pane"
     parent: window1
diff --git a/testsuite/a11y/iconview.ui b/testsuite/a11y/iconview.ui
index ba5d89cfa2..c262f24d83 100644
--- a/testsuite/a11y/iconview.ui
+++ b/testsuite/a11y/iconview.ui
@@ -15,7 +15,6 @@
   </object>
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkIconView" id="iv1">
         <property name="visible">True</property>
diff --git a/testsuite/a11y/infobar.txt b/testsuite/a11y/infobar.txt
index f0a8a105a8..6c87375fce 100644
--- a/testsuite/a11y/infobar.txt
+++ b/testsuite/a11y/infobar.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   bar1
     "info bar"
     parent: window1
@@ -17,7 +25,7 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    unnamed-GtkContainerAccessible-0
+    unnamed-GtkContainerAccessible-1
       "panel"
       parent: bar1
       index: 0
@@ -26,18 +34,18 @@ window1
       <AtkComponent>
       layer: widget
       alpha: 1
-      unnamed-GtkContainerAccessible-1
+      unnamed-GtkContainerAccessible-2
         "filler"
-        parent: unnamed-GtkContainerAccessible-0
+        parent: unnamed-GtkContainerAccessible-1
         index: 0
         state: enabled horizontal sensitive showing visible
         toolkit: gtk
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkContainerAccessible-2
+        unnamed-GtkContainerAccessible-3
           "filler"
-          parent: unnamed-GtkContainerAccessible-1
+          parent: unnamed-GtkContainerAccessible-2
           index: 0
           state: enabled horizontal sensitive showing visible
           toolkit: gtk
@@ -46,7 +54,7 @@ window1
           alpha: 1
           label1
             "label"
-            parent: unnamed-GtkContainerAccessible-2
+            parent: unnamed-GtkContainerAccessible-3
             index: 0
             name: Some important info
             state: enabled multi-line sensitive showing visible
@@ -84,18 +92,18 @@ window1
                                 weight: <omitted>
                                 wrap-mode: word
             <AtkHypertext>
-        unnamed-GtkContainerAccessible-3
+        unnamed-GtkContainerAccessible-4
           "filler"
-          parent: unnamed-GtkContainerAccessible-1
+          parent: unnamed-GtkContainerAccessible-2
           index: 1
           state: enabled horizontal sensitive showing visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-        unnamed-GtkButtonAccessible-4
+        unnamed-GtkButtonAccessible-5
           "push button"
-          parent: unnamed-GtkContainerAccessible-1
+          parent: unnamed-GtkContainerAccessible-2
           index: 2
           name: Close
           state: enabled focusable sensitive
diff --git a/testsuite/a11y/infobar.ui b/testsuite/a11y/infobar.ui
index 32047883b8..52d2b82ea5 100644
--- a/testsuite/a11y/infobar.ui
+++ b/testsuite/a11y/infobar.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkInfoBar" id="bar1">
         <property name="visible">True</property>
diff --git a/testsuite/a11y/label-static.txt b/testsuite/a11y/label-static.txt
index 3b9eb4ba04..1d210163e8 100644
--- a/testsuite/a11y/label-static.txt
+++ b/testsuite/a11y/label-static.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   label1
     "static"
     parent: window1
@@ -20,7 +28,7 @@ window1
     <AtkText>
     text: Go to the GTK+ website or >google it
     character count: 36
-    caret offset: 0
+    caret offset: -1
     default attributes: bg-color: <omitted>
                         bg-full-height: 0
                         direction: <omitted>
@@ -55,7 +63,7 @@ window1
       start index: 27
       end index: 36
       anchors: http://www.google.com
-    unnamed-GtkLabelAccessibleLinkImpl-0
+    unnamed-GtkLabelAccessibleLinkImpl-1
       "link"
       parent: label1
       state: enabled focusable focused multi-line sensitive showing visible has-tooltip
@@ -64,7 +72,7 @@ window1
         start index: 10
         end index: 22
         anchors: http://www.gtk.org
-    unnamed-GtkLabelAccessibleLinkImpl-1
+    unnamed-GtkLabelAccessibleLinkImpl-2
       "link"
       parent: label1
       state: enabled focusable multi-line sensitive showing visible has-tooltip
diff --git a/testsuite/a11y/label-static.ui b/testsuite/a11y/label-static.ui
index 1e478c0b63..32742dd4b7 100644
--- a/testsuite/a11y/label-static.ui
+++ b/testsuite/a11y/label-static.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label">Go to the &lt;a href="http://www.gtk.org" title="&lt;i&gt;Our&lt;/i&gt; website"&gt;GTK+ website&lt;/a&gt; or &lt;small&gt;&gt;&lt;a href="http://www.google.com"&gt;google it&lt;/a&gt;&lt;/small&gt;</property>
diff --git a/testsuite/a11y/label.txt b/testsuite/a11y/label.txt
index a8669ada27..a4f91aecd7 100644
--- a/testsuite/a11y/label.txt
+++ b/testsuite/a11y/label.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   label1
     "label"
     parent: window1
@@ -55,7 +63,7 @@ window1
       start index: 27
       end index: 36
       anchors: http://www.google.com
-    unnamed-GtkLabelAccessibleLinkImpl-0
+    unnamed-GtkLabelAccessibleLinkImpl-1
       "link"
       parent: label1
       state: enabled focusable focused multi-line sensitive showing visible has-tooltip
@@ -64,7 +72,7 @@ window1
         start index: 10
         end index: 22
         anchors: http://www.gtk.org
-    unnamed-GtkLabelAccessibleLinkImpl-1
+    unnamed-GtkLabelAccessibleLinkImpl-2
       "link"
       parent: label1
       state: enabled focusable multi-line sensitive showing visible has-tooltip
diff --git a/testsuite/a11y/label.ui b/testsuite/a11y/label.ui
index 0ee6470b7b..244bfeaacd 100644
--- a/testsuite/a11y/label.ui
+++ b/testsuite/a11y/label.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label">Go to the &lt;a href="http://www.gtk.org" title="&lt;i&gt;Our&lt;/i&gt; website"&gt;GTK+ website&lt;/a&gt; or &lt;small&gt;&gt;&lt;a href="http://www.google.com"&gt;google it&lt;/a&gt;&lt;/small&gt;</property>
diff --git a/testsuite/a11y/link.txt b/testsuite/a11y/link.txt
index 37ddff5a05..4beae3a972 100644
--- a/testsuite/a11y/link.txt
+++ b/testsuite/a11y/link.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   button1
     "push button"
     parent: window1
diff --git a/testsuite/a11y/link.ui b/testsuite/a11y/link.ui
index 2777a6929c..26458921e6 100644
--- a/testsuite/a11y/link.ui
+++ b/testsuite/a11y/link.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkLinkButton" id="button1">
         <property name="label" translatable="yes">Hello World!</property>
diff --git a/testsuite/a11y/listbox.txt b/testsuite/a11y/listbox.txt
index f69b812c80..971c8fd08c 100644
--- a/testsuite/a11y/listbox.txt
+++ b/testsuite/a11y/listbox.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   box1
     "filler"
     parent: window1
@@ -26,7 +34,7 @@ window1
       layer: widget
       alpha: 1
       <AtkSelection>
-      unnamed-GtkListBoxRowAccessible-0
+      unnamed-GtkListBoxRowAccessible-1
         "list item"
         parent: listbox1
         index: 0
@@ -37,7 +45,7 @@ window1
         alpha: 1
         row1
           "label"
-          parent: unnamed-GtkListBoxRowAccessible-0
+          parent: unnamed-GtkListBoxRowAccessible-1
           index: 0
           name: Row One
           state: enabled multi-line sensitive showing visible
@@ -75,7 +83,7 @@ window1
                               weight: <omitted>
                               wrap-mode: word
           <AtkHypertext>
-      unnamed-GtkListBoxRowAccessible-1
+      unnamed-GtkListBoxRowAccessible-2
         "list item"
         parent: listbox1
         index: 1
@@ -86,7 +94,7 @@ window1
         alpha: 1
         row2
           "label"
-          parent: unnamed-GtkListBoxRowAccessible-1
+          parent: unnamed-GtkListBoxRowAccessible-2
           index: 0
           name: Row Two
           state: enabled multi-line sensitive showing visible
@@ -134,7 +142,7 @@ window1
       layer: widget
       alpha: 1
       <AtkSelection>
-      unnamed-GtkListBoxRowAccessible-2
+      unnamed-GtkListBoxRowAccessible-3
         "list item"
         parent: listbox2
         index: 0
@@ -145,7 +153,7 @@ window1
         alpha: 1
         row3
           "label"
-          parent: unnamed-GtkListBoxRowAccessible-2
+          parent: unnamed-GtkListBoxRowAccessible-3
           index: 0
           name: Row Tree
           state: enabled multi-line sensitive showing visible
diff --git a/testsuite/a11y/listbox.ui b/testsuite/a11y/listbox.ui
index d20c4c4e35..6e5a588a68 100644
--- a/testsuite/a11y/listbox.ui
+++ b/testsuite/a11y/listbox.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
diff --git a/testsuite/a11y/lockbutton.txt b/testsuite/a11y/lockbutton.txt
index d3bc163622..fea2d65eab 100644
--- a/testsuite/a11y/lockbutton.txt
+++ b/testsuite/a11y/lockbutton.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   button1
     "push button"
     parent: window1
diff --git a/testsuite/a11y/lockbutton.ui b/testsuite/a11y/lockbutton.ui
index 7df14c8373..745abd853c 100644
--- a/testsuite/a11y/lockbutton.ui
+++ b/testsuite/a11y/lockbutton.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkLockButton" id="button1">
         <property name="visible">True</property>
diff --git a/testsuite/a11y/mnemonic.txt b/testsuite/a11y/mnemonic.txt
index ca96c5d50b..c1d16ce327 100644
--- a/testsuite/a11y/mnemonic.txt
+++ b/testsuite/a11y/mnemonic.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   box1
     "filler"
     parent: window1
diff --git a/testsuite/a11y/mnemonic.ui b/testsuite/a11y/mnemonic.ui
index 443f2cd10c..dedf38fcd1 100644
--- a/testsuite/a11y/mnemonic.ui
+++ b/testsuite/a11y/mnemonic.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/a11y/notebook.txt b/testsuite/a11y/notebook.txt
index 5151cea46c..f32775d2db 100644
--- a/testsuite/a11y/notebook.txt
+++ b/testsuite/a11y/notebook.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   notebook1
     "page tab list"
     parent: window1
@@ -17,8 +25,8 @@ window1
     layer: widget
     alpha: 1
     <AtkSelection>
-    selected children: unnamed-GtkNotebookPageAccessible-0
-    unnamed-GtkNotebookPageAccessible-0
+    selected children: unnamed-GtkNotebookPageAccessible-1
+    unnamed-GtkNotebookPageAccessible-1
       "page tab"
       parent: notebook1
       index: 0
@@ -42,7 +50,7 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 description: Clicks the button
-    unnamed-GtkNotebookPageAccessible-1
+    unnamed-GtkNotebookPageAccessible-2
       "page tab"
       parent: notebook1
       index: 1
diff --git a/testsuite/a11y/notebook.ui b/testsuite/a11y/notebook.ui
index e18759ca42..d37be60088 100644
--- a/testsuite/a11y/notebook.ui
+++ b/testsuite/a11y/notebook.ui
@@ -1,6 +1,5 @@
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkNotebook" id="notebook1">
         <child>
diff --git a/testsuite/a11y/paned.txt b/testsuite/a11y/paned.txt
index b63e3098ed..58bf570763 100644
--- a/testsuite/a11y/paned.txt
+++ b/testsuite/a11y/paned.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   paned1
     "split pane"
     parent: window1
@@ -18,8 +26,8 @@ window1
     alpha: 1
     <AtkValue>
     minimum value: 0.000000
-    maximum value: 60.000000
-    current value: 26.000000
+    maximum value: 239.000000
+    current value: 24.000000
     label1
       "label"
       parent: paned1
diff --git a/testsuite/a11y/paned.ui b/testsuite/a11y/paned.ui
index 1d3c4c8472..190c41f6fd 100644
--- a/testsuite/a11y/paned.ui
+++ b/testsuite/a11y/paned.ui
@@ -1,6 +1,5 @@
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkPaned" id="paned1">
         <child>
diff --git a/testsuite/a11y/pickers.txt b/testsuite/a11y/pickers.txt
index 7f457e374a..c3861f41d5 100644
--- a/testsuite/a11y/pickers.txt
+++ b/testsuite/a11y/pickers.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   grid1
     "panel"
     parent: window1
diff --git a/testsuite/a11y/pickers.ui b/testsuite/a11y/pickers.ui
index 2a9a02756e..5e85c546a1 100644
--- a/testsuite/a11y/pickers.ui
+++ b/testsuite/a11y/pickers.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/a11y/placeholder-text.txt b/testsuite/a11y/placeholder-text.txt
index c264ae31d0..327937aa94 100644
--- a/testsuite/a11y/placeholder-text.txt
+++ b/testsuite/a11y/placeholder-text.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   box1
     "filler"
     parent: window1
diff --git a/testsuite/a11y/placeholder-text.ui b/testsuite/a11y/placeholder-text.ui
index c551607208..aa5b7a1a48 100644
--- a/testsuite/a11y/placeholder-text.ui
+++ b/testsuite/a11y/placeholder-text.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/a11y/progress.txt b/testsuite/a11y/progress.txt
index fa41710701..1630596d9e 100644
--- a/testsuite/a11y/progress.txt
+++ b/testsuite/a11y/progress.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   progress1
     "progress bar"
     parent: window1
diff --git a/testsuite/a11y/progress.ui b/testsuite/a11y/progress.ui
index f34c13b8fa..7a9affe325 100644
--- a/testsuite/a11y/progress.ui
+++ b/testsuite/a11y/progress.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkProgressBar" id="progress1">
         <property name="visible">True</property>
diff --git a/testsuite/a11y/range.txt b/testsuite/a11y/range.txt
index 68acf81aed..db634b91dc 100644
--- a/testsuite/a11y/range.txt
+++ b/testsuite/a11y/range.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   grid1
     "panel"
     parent: window1
diff --git a/testsuite/a11y/range.ui b/testsuite/a11y/range.ui
index 319acf0db5..256019aa6a 100644
--- a/testsuite/a11y/range.ui
+++ b/testsuite/a11y/range.ui
@@ -8,7 +8,6 @@
     <property name="page-increment">5.0</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/a11y/spinner.txt b/testsuite/a11y/spinner.txt
index 31bc6cdd27..8082e508f0 100644
--- a/testsuite/a11y/spinner.txt
+++ b/testsuite/a11y/spinner.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   spinner1
     "animation"
     parent: window1
@@ -19,5 +27,5 @@ window1
     layer: widget
     alpha: 1
     <AtkImage>
-    image size: 16 x 16
+    image size: 240 x 68
     image description: (null)
diff --git a/testsuite/a11y/spinner.ui b/testsuite/a11y/spinner.ui
index 3873564d8a..04a9d4302f 100644
--- a/testsuite/a11y/spinner.ui
+++ b/testsuite/a11y/spinner.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkSpinner" id="spinner1">
         <property name="visible">True</property>
diff --git a/testsuite/a11y/stack.txt b/testsuite/a11y/stack.txt
index b23d23e78a..149059413b 100644
--- a/testsuite/a11y/stack.txt
+++ b/testsuite/a11y/stack.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   box1
     "filler"
     parent: window1
@@ -25,7 +33,7 @@ window1
       <AtkComponent>
       layer: widget
       alpha: 1
-      unnamed-GtkToggleButtonAccessible-0
+      unnamed-GtkToggleButtonAccessible-1
         "toggle button"
         parent: stackswitcher1
         index: 0
@@ -41,7 +49,7 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 description: Clicks the button
-      unnamed-GtkToggleButtonAccessible-1
+      unnamed-GtkToggleButtonAccessible-2
         "toggle button"
         parent: stackswitcher1
         index: 1
diff --git a/testsuite/a11y/stack.ui b/testsuite/a11y/stack.ui
index 2ce89fd034..4aeb63d6cd 100644
--- a/testsuite/a11y/stack.ui
+++ b/testsuite/a11y/stack.ui
@@ -1,6 +1,5 @@
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/a11y/statusbar.txt b/testsuite/a11y/statusbar.txt
index 0406032e1f..c1056520b3 100644
--- a/testsuite/a11y/statusbar.txt
+++ b/testsuite/a11y/statusbar.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   statusbar1
     "statusbar"
     parent: window1
diff --git a/testsuite/a11y/statusbar.ui b/testsuite/a11y/statusbar.ui
index bc635bce2f..deeb21c0b8 100644
--- a/testsuite/a11y/statusbar.ui
+++ b/testsuite/a11y/statusbar.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkStatusbar" id="statusbar1">
         <property name="visible">True</property>
diff --git a/testsuite/a11y/text.txt b/testsuite/a11y/text.txt
index 771787e00d..137843c28b 100644
--- a/testsuite/a11y/text.txt
+++ b/testsuite/a11y/text.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   text1
     "text"
     parent: window1
diff --git a/testsuite/a11y/text.ui b/testsuite/a11y/text.ui
index 508efd504f..7026eb7484 100644
--- a/testsuite/a11y/text.ui
+++ b/testsuite/a11y/text.ui
@@ -7,7 +7,6 @@ Did gyre and gimple in the wabe</property>
   </object>
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkTextView" id="text1">
         <property name="visible">True</property>
diff --git a/testsuite/a11y/tree.txt b/testsuite/a11y/tree.txt
index 2a02b53083..653f90cade 100644
--- a/testsuite/a11y/tree.txt
+++ b/testsuite/a11y/tree.txt
@@ -1,5 +1,5 @@
 window1
-  "window"
+  "frame"
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   tv
     "table"
     parent: window1
@@ -23,12 +31,12 @@ window1
     columns: 1
     selected rows: 0
     column 0 description: Test
-    column 0 header: unnamed-GtkButtonAccessible-0
+    column 0 header: unnamed-GtkButtonAccessible-1
     table indexes:
       ✓✓tv
       ✓✓tv
       ✓✓tv
-    unnamed-GtkButtonAccessible-0
+    unnamed-GtkButtonAccessible-1
       "table column header"
       parent: tv
       index: 0
@@ -61,7 +69,7 @@ window1
       action 2 description: Activates the cell
       <AtkTableCell>
       table: tv
-      column-header[0]: unnamed-GtkButtonAccessible-0
+      column-header[0]: unnamed-GtkButtonAccessible-1
       column-span: 1
       row-span: 1
       tv
@@ -110,7 +118,7 @@ window1
         action 2 description: Activates the cell
         <AtkTableCell>
         table: tv
-        column-header[0]: unnamed-GtkButtonAccessible-0
+        column-header[0]: unnamed-GtkButtonAccessible-1
         column-span: 1
         row-span: 1
       tv
@@ -159,7 +167,7 @@ window1
         action 2 description: Activates the cell
         <AtkTableCell>
         table: tv
-        column-header[0]: unnamed-GtkButtonAccessible-0
+        column-header[0]: unnamed-GtkButtonAccessible-1
         column-span: 1
         row-span: 1
     tv
@@ -179,7 +187,7 @@ window1
       action 2 description: Activates the cell
       <AtkTableCell>
       table: tv
-      column-header[0]: unnamed-GtkButtonAccessible-0
+      column-header[0]: unnamed-GtkButtonAccessible-1
       column-span: 1
       row-span: 1
       position: 1 0
@@ -229,7 +237,7 @@ window1
         action 2 description: Activates the cell
         <AtkTableCell>
         table: tv
-        column-header[0]: unnamed-GtkButtonAccessible-0
+        column-header[0]: unnamed-GtkButtonAccessible-1
         column-span: 1
         row-span: 1
         position: 1 0
@@ -279,7 +287,7 @@ window1
         action 2 description: Activates the cell
         <AtkTableCell>
         table: tv
-        column-header[0]: unnamed-GtkButtonAccessible-0
+        column-header[0]: unnamed-GtkButtonAccessible-1
         column-span: 1
         row-span: 1
         position: 1 0
@@ -300,7 +308,7 @@ window1
       action 2 description: Activates the cell
       <AtkTableCell>
       table: tv
-      column-header[0]: unnamed-GtkButtonAccessible-0
+      column-header[0]: unnamed-GtkButtonAccessible-1
       column-span: 1
       row-span: 1
       position: 2 0
@@ -350,7 +358,7 @@ window1
         action 2 description: Activates the cell
         <AtkTableCell>
         table: tv
-        column-header[0]: unnamed-GtkButtonAccessible-0
+        column-header[0]: unnamed-GtkButtonAccessible-1
         column-span: 1
         row-span: 1
         position: 2 0
@@ -400,7 +408,7 @@ window1
         action 2 description: Activates the cell
         <AtkTableCell>
         table: tv
-        column-header[0]: unnamed-GtkButtonAccessible-0
+        column-header[0]: unnamed-GtkButtonAccessible-1
         column-span: 1
         row-span: 1
         position: 2 0
diff --git a/testsuite/a11y/tree.ui b/testsuite/a11y/tree.ui
index 331e5fba7c..bdef6fd2e5 100644
--- a/testsuite/a11y/tree.ui
+++ b/testsuite/a11y/tree.ui
@@ -14,7 +14,6 @@
   </object>
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkTreeView" id="tv">
         <property name="visible">True</property>