diff --git a/testsuite/tools/simplify-data-3to4/assistant.expected b/testsuite/tools/simplify-data-3to4/assistant.expected
new file mode 100644
index 0000000000..5b81816063
--- /dev/null
+++ b/testsuite/tools/simplify-data-3to4/assistant.expected
@@ -0,0 +1,28 @@
+
+
+
+
diff --git a/testsuite/tools/simplify-data-3to4/assistant.ui b/testsuite/tools/simplify-data-3to4/assistant.ui
new file mode 100644
index 0000000000..aed2044489
--- /dev/null
+++ b/testsuite/tools/simplify-data-3to4/assistant.ui
@@ -0,0 +1,28 @@
+
+
+
+
+ False
+ popup
+
+
+ Button 1
+ True
+ True
+
+
+ Page 1
+
+
+
+
+ Button 2
+ True
+ True
+
+
+ Page 2
+
+
+
+
diff --git a/testsuite/tools/simplify-data-3to4/grid.expected b/testsuite/tools/simplify-data-3to4/grid.expected
new file mode 100644
index 0000000000..cda31e5900
--- /dev/null
+++ b/testsuite/tools/simplify-data-3to4/grid.expected
@@ -0,0 +1,110 @@
+
+
+
+ popup
+
+
+
+
+ Hello World!
+ 1
+ 1
+ 1
+
+
+
+
+ Hello World!
+ 1
+ 1
+
+ 1
+
+
+
+
+
+ Hello World!
+ 1
+ 1
+
+ 2
+
+
+
+
+
+ Hello World!
+ 1
+ button3
+ 1
+ 1
+
+ 3
+
+
+
+
+
+ 1
+ 1
+ 1
+
+ 4
+
+
+
+
+
+ 1
+ 1
+
+
+ Test switch
+
+
+
+ 5
+
+
+
+
+
+ 1
+ 1
+ Text Button
+
+ 1
+
+
+
+
+
+ 1
+ 1
+ center
+ center
+
+ 1
+ 1
+
+
+
+
+
+ 1
+ 1
+ center
+ center
+
+ 2
+ 1
+ 2
+ 2
+
+
+
+
+
+
+
diff --git a/testsuite/tools/simplify-data-3to4/grid.ui b/testsuite/tools/simplify-data-3to4/grid.ui
new file mode 100644
index 0000000000..be79df3ce4
--- /dev/null
+++ b/testsuite/tools/simplify-data-3to4/grid.ui
@@ -0,0 +1,138 @@
+
+
+
+
+ False
+ popup
+
+
+ True
+
+
+ Hello World!
+ True
+ True
+ True
+ True
+
+
+ 0
+ 0
+
+
+
+
+ Hello World!
+ True
+ False
+ True
+ True
+
+
+ 1
+ 0
+
+
+
+
+ Hello World!
+ True
+ False
+ True
+ True
+
+
+ 2
+ 0
+
+
+
+
+ Hello World!
+ True
+ True
+ button3
+ True
+ True
+
+
+ 3
+ 0
+
+
+
+
+ True
+ True
+ True
+ True
+
+
+ 4
+ 0
+
+
+
+
+ True
+ False
+ True
+ True
+
+
+ Test switch
+
+
+
+
+ 5
+ 0
+
+
+
+
+
+ True
+ True
+ True
+ Text Button
+
+
+ 0
+ 1
+
+
+
+
+ True
+ True
+ True
+ center
+ center
+
+
+ 1
+ 1
+ 1
+ 1
+
+
+
+
+ True
+ True
+ True
+ center
+ center
+
+
+ 2
+ 1
+ 2
+ 2
+
+
+
+
+
+
diff --git a/testsuite/tools/simplify-data-3to4/notebook.expected b/testsuite/tools/simplify-data-3to4/notebook.expected
new file mode 100644
index 0000000000..60ac5bcc4f
--- /dev/null
+++ b/testsuite/tools/simplify-data-3to4/notebook.expected
@@ -0,0 +1,38 @@
+
+
+
+ popup
+
+
+
+
+
+
+ Yes
+
+
+
+
+ Tab 1
+
+
+
+
+
+
+
+
+ No
+
+
+
+
+ Tab 2
+
+
+
+
+
+
+
+
diff --git a/testsuite/tools/simplify-data-3to4/notebook.ui b/testsuite/tools/simplify-data-3to4/notebook.ui
new file mode 100644
index 0000000000..46cc7378a2
--- /dev/null
+++ b/testsuite/tools/simplify-data-3to4/notebook.ui
@@ -0,0 +1,37 @@
+
+
+
+
+ False
+ popup
+
+
+ True
+
+
+ Yes
+ True
+
+
+
+
+ Tab 1
+ True
+
+
+
+
+ No
+ True
+
+
+
+
+ Tab 2
+ True
+
+
+
+
+
+
diff --git a/testsuite/tools/simplify-data-3to4/stack.expected b/testsuite/tools/simplify-data-3to4/stack.expected
new file mode 100644
index 0000000000..f6321c9563
--- /dev/null
+++ b/testsuite/tools/simplify-data-3to4/stack.expected
@@ -0,0 +1,43 @@
+
+
+
+ popup
+
+
+
+
+ stack1
+
+
+
+
+
+
+ page1
+ Page 1
+ 1
+
+
+ Yes
+
+
+
+
+
+
+ page2
+ Page 2
+ page2-icon
+
+
+ No
+
+
+
+
+
+
+
+
+
+
diff --git a/testsuite/tools/simplify-data-3to4/stack.ui b/testsuite/tools/simplify-data-3to4/stack.ui
new file mode 100644
index 0000000000..feb092eaad
--- /dev/null
+++ b/testsuite/tools/simplify-data-3to4/stack.ui
@@ -0,0 +1,46 @@
+
+
+
+
+ False
+ popup
+
+
+ True
+
+
+ True
+ stack1
+
+
+
+
+ True
+
+
+ Yes
+ True
+
+
+ page1
+ Page 1
+ 1
+
+
+
+
+ No
+ True
+
+
+ page2
+ Page 2
+ page2-icon
+
+
+
+
+
+
+
+
diff --git a/testsuite/tools/simplify-data-3to4/test1.expected b/testsuite/tools/simplify-data-3to4/test1.expected
new file mode 100644
index 0000000000..0ddbcae8f5
--- /dev/null
+++ b/testsuite/tools/simplify-data-3to4/test1.expected
@@ -0,0 +1,10 @@
+
+
+
+
+
+ 0
+
+
+
+