[test-paint] Update expectations
diff --git a/test/api/results/bad-154 b/test/api/results/bad-154
index a4d2a0e..2f4bdfc 100644
--- a/test/api/results/bad-154
+++ b/test/api/results/bad-154
@@ -1,287 +1,351 @@
-# random seed: R02Safcf66bc33a0c434dd4dafbe12dbbf15
+# random seed: R02S345aec86e0be01a834deb6fc61057f9c
 # Start of hb tests
 # Start of paint tests
 # Start of ot tests
 start clip rectangle 0 500 500 1e+03
   start transform 1 0 0 1 0 0
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-          end transform
+    start clip rectangle 0 500 500 1e+03
+      start clip rectangle 0 500 500 1e+03
+        start clip rectangle 0 500 500 1e+03
+          start clip rectangle 0 500 500 1e+03
+            start clip rectangle 0 500 500 1e+03
+              start clip rectangle 0 500 500 1e+03
+                start clip rectangle 0 500 500 1e+03
+                  start clip rectangle 0 500 500 1e+03
+                    start clip rectangle 0 500 500 1e+03
+                      start clip rectangle 0 500 500 1e+03
+                        start clip rectangle 0 500 500 1e+03
+                          start clip rectangle 0 500 500 1e+03
+                            start clip rectangle 0 500 500 1e+03
+                              start clip rectangle 0 500 500 1e+03
+                                start clip rectangle 0 500 500 1e+03
+                                  start clip rectangle 0 500 500 1e+03
+                                    start clip rectangle 0 500 500 1e+03
+                                      start clip rectangle 0 500 500 1e+03
+                                        start clip rectangle 0 500 500 1e+03
+                                          start clip rectangle 0 500 500 1e+03
+                                            start clip rectangle 0 500 500 1e+03
+                                              start clip rectangle 0 500 500 1e+03
+                                                start clip rectangle 0 500 500 1e+03
+                                                  start clip rectangle 0 500 500 1e+03
+                                                    start clip rectangle 0 500 500 1e+03
+                                                      start clip rectangle 0 500 500 1e+03
+                                                        start clip rectangle 0 500 500 1e+03
+                                                          start clip rectangle 0 500 500 1e+03
+                                                            start clip rectangle 0 500 500 1e+03
+                                                              start clip rectangle 0 500 500 1e+03
+                                                                start clip rectangle 0 500 500 1e+03
+                                                                  start clip rectangle 0 500 500 1e+03
+                                                                  end clip
+                                                                  push group
+                                                                    start transform 1 0 -0 1 0 0
+                                                                      start clip glyph 159
+                                                                        start transform 1 0 0 1 0 0
+                                                                        end transform
+                                                                      end clip
+                                                                    end transform
+                                                                  pop group mode 3
+                                                                end clip
+                                                                push group
+                                                                  start transform 1 0 -0 1 0 0
+                                                                    start clip glyph 159
+                                                                      start transform 1 0 0 1 0 0
+                                                                        solid 128 128 128 102
+                                                                      end transform
+                                                                    end clip
+                                                                  end transform
+                                                                pop group mode 3
+                                                              end clip
+                                                              push group
+                                                                start transform 1 0 -0 1 0 0
+                                                                  start clip glyph 159
+                                                                    start transform 1 0 0 1 0 0
+                                                                      solid 128 128 128 102
+                                                                    end transform
+                                                                  end clip
+                                                                end transform
+                                                              pop group mode 3
+                                                            end clip
+                                                            push group
+                                                              start transform 1 0 -0 1 0 0
+                                                                start clip glyph 159
+                                                                  start transform 1 0 0 1 0 0
+                                                                    solid 128 128 128 102
+                                                                  end transform
+                                                                end clip
+                                                              end transform
+                                                            pop group mode 3
+                                                          end clip
+                                                          push group
+                                                            start transform 1 0 -0 1 0 0
+                                                              start clip glyph 159
+                                                                start transform 1 0 0 1 0 0
+                                                                  solid 128 128 128 102
+                                                                end transform
+                                                              end clip
+                                                            end transform
+                                                          pop group mode 3
+                                                        end clip
+                                                        push group
+                                                          start transform 1 0 -0 1 0 0
+                                                            start clip glyph 159
+                                                              start transform 1 0 0 1 0 0
+                                                                solid 128 128 128 102
+                                                              end transform
+                                                            end clip
+                                                          end transform
+                                                        pop group mode 3
+                                                      end clip
+                                                      push group
+                                                        start transform 1 0 -0 1 0 0
+                                                          start clip glyph 159
+                                                            start transform 1 0 0 1 0 0
+                                                              solid 128 128 128 102
+                                                            end transform
+                                                          end clip
+                                                        end transform
+                                                      pop group mode 3
+                                                    end clip
+                                                    push group
+                                                      start transform 1 0 -0 1 0 0
+                                                        start clip glyph 159
+                                                          start transform 1 0 0 1 0 0
+                                                            solid 128 128 128 102
+                                                          end transform
+                                                        end clip
+                                                      end transform
+                                                    pop group mode 3
+                                                  end clip
+                                                  push group
+                                                    start transform 1 0 -0 1 0 0
+                                                      start clip glyph 159
+                                                        start transform 1 0 0 1 0 0
+                                                          solid 128 128 128 102
+                                                        end transform
+                                                      end clip
+                                                    end transform
+                                                  pop group mode 3
+                                                end clip
+                                                push group
+                                                  start transform 1 0 -0 1 0 0
+                                                    start clip glyph 159
+                                                      start transform 1 0 0 1 0 0
+                                                        solid 128 128 128 102
+                                                      end transform
+                                                    end clip
+                                                  end transform
+                                                pop group mode 3
+                                              end clip
+                                              push group
+                                                start transform 1 0 -0 1 0 0
+                                                  start clip glyph 159
+                                                    start transform 1 0 0 1 0 0
+                                                      solid 128 128 128 102
+                                                    end transform
+                                                  end clip
+                                                end transform
+                                              pop group mode 3
+                                            end clip
+                                            push group
+                                              start transform 1 0 -0 1 0 0
+                                                start clip glyph 159
+                                                  start transform 1 0 0 1 0 0
+                                                    solid 128 128 128 102
+                                                  end transform
+                                                end clip
+                                              end transform
+                                            pop group mode 3
+                                          end clip
+                                          push group
+                                            start transform 1 0 -0 1 0 0
+                                              start clip glyph 159
+                                                start transform 1 0 0 1 0 0
+                                                  solid 128 128 128 102
+                                                end transform
+                                              end clip
+                                            end transform
+                                          pop group mode 3
+                                        end clip
+                                        push group
+                                          start transform 1 0 -0 1 0 0
+                                            start clip glyph 159
+                                              start transform 1 0 0 1 0 0
+                                                solid 128 128 128 102
+                                              end transform
+                                            end clip
+                                          end transform
+                                        pop group mode 3
+                                      end clip
+                                      push group
+                                        start transform 1 0 -0 1 0 0
+                                          start clip glyph 159
+                                            start transform 1 0 0 1 0 0
+                                              solid 128 128 128 102
+                                            end transform
+                                          end clip
+                                        end transform
+                                      pop group mode 3
+                                    end clip
+                                    push group
+                                      start transform 1 0 -0 1 0 0
+                                        start clip glyph 159
+                                          start transform 1 0 0 1 0 0
+                                            solid 128 128 128 102
+                                          end transform
+                                        end clip
+                                      end transform
+                                    pop group mode 3
+                                  end clip
+                                  push group
+                                    start transform 1 0 -0 1 0 0
+                                      start clip glyph 159
+                                        start transform 1 0 0 1 0 0
+                                          solid 128 128 128 102
+                                        end transform
+                                      end clip
+                                    end transform
+                                  pop group mode 3
+                                end clip
+                                push group
+                                  start transform 1 0 -0 1 0 0
+                                    start clip glyph 159
+                                      start transform 1 0 0 1 0 0
+                                        solid 128 128 128 102
+                                      end transform
+                                    end clip
+                                  end transform
+                                pop group mode 3
+                              end clip
+                              push group
+                                start transform 1 0 -0 1 0 0
+                                  start clip glyph 159
+                                    start transform 1 0 0 1 0 0
+                                      solid 128 128 128 102
+                                    end transform
+                                  end clip
+                                end transform
+                              pop group mode 3
+                            end clip
+                            push group
+                              start transform 1 0 -0 1 0 0
+                                start clip glyph 159
+                                  start transform 1 0 0 1 0 0
+                                    solid 128 128 128 102
+                                  end transform
+                                end clip
+                              end transform
+                            pop group mode 3
+                          end clip
+                          push group
+                            start transform 1 0 -0 1 0 0
+                              start clip glyph 159
+                                start transform 1 0 0 1 0 0
+                                  solid 128 128 128 102
+                                end transform
+                              end clip
+                            end transform
+                          pop group mode 3
+                        end clip
+                        push group
+                          start transform 1 0 -0 1 0 0
+                            start clip glyph 159
+                              start transform 1 0 0 1 0 0
+                                solid 128 128 128 102
+                              end transform
+                            end clip
+                          end transform
+                        pop group mode 3
+                      end clip
+                      push group
+                        start transform 1 0 -0 1 0 0
+                          start clip glyph 159
+                            start transform 1 0 0 1 0 0
+                              solid 128 128 128 102
+                            end transform
+                          end clip
+                        end transform
+                      pop group mode 3
+                    end clip
+                    push group
+                      start transform 1 0 -0 1 0 0
+                        start clip glyph 159
+                          start transform 1 0 0 1 0 0
+                            solid 128 128 128 102
+                          end transform
+                        end clip
+                      end transform
+                    pop group mode 3
+                  end clip
+                  push group
+                    start transform 1 0 -0 1 0 0
+                      start clip glyph 159
+                        start transform 1 0 0 1 0 0
+                          solid 128 128 128 102
+                        end transform
+                      end clip
+                    end transform
+                  pop group mode 3
+                end clip
+                push group
+                  start transform 1 0 -0 1 0 0
+                    start clip glyph 159
+                      start transform 1 0 0 1 0 0
+                        solid 128 128 128 102
+                      end transform
+                    end clip
+                  end transform
+                pop group mode 3
+              end clip
+              push group
+                start transform 1 0 -0 1 0 0
+                  start clip glyph 159
+                    start transform 1 0 0 1 0 0
+                      solid 128 128 128 102
+                    end transform
+                  end clip
+                end transform
+              pop group mode 3
+            end clip
+            push group
+              start transform 1 0 -0 1 0 0
+                start clip glyph 159
+                  start transform 1 0 0 1 0 0
+                    solid 128 128 128 102
+                  end transform
+                end clip
+              end transform
+            pop group mode 3
+          end clip
+          push group
+            start transform 1 0 -0 1 0 0
+              start clip glyph 159
+                start transform 1 0 0 1 0 0
+                  solid 128 128 128 102
+                end transform
+              end clip
+            end transform
+          pop group mode 3
         end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
+        push group
+          start transform 1 0 -0 1 0 0
+            start clip glyph 159
+              start transform 1 0 0 1 0 0
+                solid 128 128 128 102
+              end transform
+            end clip
           end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
-    push group
-      start transform 1 0 -0 1 0 0
-        start clip glyph 159
-          start transform 1 0 0 1 0 0
-            solid 128 128 128 102
-          end transform
-        end clip
-      end transform
-    pop group mode 3
+        pop group mode 3
+      end clip
+      push group
+        start transform 1 0 -0 1 0 0
+          start clip glyph 159
+            start transform 1 0 0 1 0 0
+              solid 128 128 128 102
+            end transform
+          end clip
+        end transform
+      pop group mode 3
+    end clip
     push group
       start transform 1 0 -0 1 0 0
         start clip glyph 159
diff --git a/test/api/results/test-154 b/test/api/results/test-154
index 1465581..8b329cf 100644
--- a/test/api/results/test-154
+++ b/test/api/results/test-154
@@ -1,22 +1,26 @@
-# random seed: R02Sba94a82eea093a3b08429f774ffebb38
+# random seed: R02S9ffd1e4fb7cd9c50371f61b259bb32b5
 # Start of hb tests
 # Start of paint tests
 # Start of ot tests
 start clip rectangle 0 500 500 1e+03
   start transform 1 0 0 1 0 0
-    start transform 1 0 -0 1 0 0
-      start clip glyph 2
-        start transform 1 0 0 1 0 0
-          radial gradient
-            p0 166 768 radius 0
-            p1 166 768 radius 256
-            colors 2
-              0 0 128 0 255
-              0.5 255 255 255 255
-              1 255 0 0 255
+    start clip rectangle 100 100 900 900
+      start clip rectangle 0 0 1e+03 1e+03
+        start transform 1 0 -0 1 0 0
+          start clip glyph 2
+            start transform 1 0 0 1 0 0
+              radial gradient
+                p0 166 768 radius 0
+                p1 166 768 radius 256
+                colors 2
+                  0 0 128 0 255
+                  0.5 255 255 255 255
+                  1 255 0 0 255
+            end transform
+          end clip
         end transform
       end clip
-    end transform
+    end clip
     push group
       start transform 1 0 -0 1 0 0
         start clip glyph 159
diff --git a/test/api/results/testvf-154 b/test/api/results/testvf-154
index 03eb4bc..6da136f 100644
--- a/test/api/results/testvf-154
+++ b/test/api/results/testvf-154
@@ -1,22 +1,26 @@
-# random seed: R02S3997a362a4af7aea0e7c6f803c91771c
+# random seed: R02S2212d33e4705ca20b6475a83d116b9ab
 # Start of hb tests
 # Start of paint tests
 # Start of ot tests
 start clip rectangle 0 500 500 1e+03
   start transform 1 0 0 1 0 0
-    start transform 1 0 -0 1 0 0
-      start clip glyph 2
-        start transform 1 0 0 1 0 0
-          radial gradient
-            p0 166 768 radius 0
-            p1 166 768 radius 256
-            colors 2
-              0 0 128 0 255
-              0.5 255 255 255 255
-              1 255 0 0 255
+    start clip rectangle 100 100 900 900
+      start clip rectangle 0 0 1e+03 1e+03
+        start transform 1 0 -0 1 0 0
+          start clip glyph 2
+            start transform 1 0 0 1 0 0
+              radial gradient
+                p0 166 768 radius 0
+                p1 166 768 radius 256
+                colors 2
+                  0 0 128 0 255
+                  0.5 255 255 255 255
+                  1 255 0 0 255
+            end transform
+          end clip
         end transform
       end clip
-    end transform
+    end clip
     push group
       start transform 1 0 -0 1 0 0
         start clip glyph 159