diff --git a/test/api/fonts/test_glyphs-glyf_colr_1.ttf b/test/api/fonts/test_glyphs-glyf_colr_1.ttf
index 982ccc0a1..fb071d748 100644
Binary files a/test/api/fonts/test_glyphs-glyf_colr_1.ttf and b/test/api/fonts/test_glyphs-glyf_colr_1.ttf differ
diff --git a/test/api/fonts/test_glyphs-glyf_colr_1_variable.ttf b/test/api/fonts/test_glyphs-glyf_colr_1_variable.ttf
index 9cc723015..390635a9d 100644
Binary files a/test/api/fonts/test_glyphs-glyf_colr_1_variable.ttf and b/test/api/fonts/test_glyphs-glyf_colr_1_variable.ttf differ
diff --git a/test/api/results-paint/test-10 b/test/api/results-paint/test-10
index f67f70c72..7b68c1ac8 100644
--- a/test/api/results-paint/test-10
+++ b/test/api/results-paint/test-10
@@ -1,16 +1,15 @@
-start clip rectangle 0 0 1e+03 1e+03
+start clip rectangle 100 250 900 950
   start transform 1 0 0 1 0 0
     start transform 1 0 -0 1 0 0
-      start clip glyph 174
+      start clip glyph 10
         start transform 1 0 0 1 0 0
-          sweep gradient
-            center 500 600
-            angles 0 6.28
-            colors 0
-              0.25 250 240 230 255
-              0.417 0 0 255 255
-              0.583 255 0 0 255
-              0.75 47 79 79 255
+          linear gradient
+            p0 100 250
+            p1 900 250
+            p2 100 300
+            colors 1
+              0 255 0 0 255
+              1.5 0 0 255 255
         end transform
       end clip
     end transform
diff --git a/test/api/results-paint/test-106 b/test/api/results-paint/test-106
index 688fd2d4b..f3ced4fd3 100644
--- a/test/api/results-paint/test-106
+++ b/test/api/results-paint/test-106
@@ -1,4 +1,4 @@
-start clip rectangle 118 -22.9 750 750
+start clip rectangle 250 183 750 817
   start transform 1 0 0 1 0 0
     push group
       start transform 1 0 -0 1 0 0
@@ -9,9 +9,9 @@ start clip rectangle 118 -22.9 750 750
         end clip
       end transform
       push group
-        start transform 1 0 0 1 1e+03 1e+03
-          start transform 1 0.364 0.176 1 0 0
-            start transform 1 0 0 1 -1e+03 -1e+03
+        start transform 1 0 0 1 500 500
+          start transform 1 0.268 -0 1 0 0
+            start transform 1 0 0 1 -500 -500
               start transform 1 0 -0 1 0 0
                 start clip glyph 3
                   start transform 1 0 0 1 0 0
diff --git a/test/api/results-paint/test-116 b/test/api/results-paint/test-116
index 930e00232..850fb1ab5 100644
--- a/test/api/results-paint/test-116
+++ b/test/api/results-paint/test-116
@@ -1,4 +1,4 @@
-start clip rectangle 250 250 950 950
+start clip rectangle 250 250 850 750
   start transform 1 0 0 1 0 0
     push group
       start transform 1 0 -0 1 0 0
@@ -9,7 +9,7 @@ start clip rectangle 250 250 950 950
         end clip
       end transform
       push group
-        start transform 1 0 0 1 200 200
+        start transform 1 0 0 1 100 0
           start transform 1 0 -0 1 0 0
             start clip glyph 3
               start transform 1 0 0 1 0 0
diff --git a/test/api/results-paint/test-123 b/test/api/results-paint/test-123
index cb7b96e8b..20d61f7c2 100644
--- a/test/api/results-paint/test-123
+++ b/test/api/results-paint/test-123
@@ -35,7 +35,7 @@ start clip rectangle 0 0 1e+03 1e+03
             end transform
           end transform
         end transform
-      pop group mode 5
+      pop group mode 3
     pop group mode 3
   end transform
 end clip
diff --git a/test/api/results-paint/test-154 b/test/api/results-paint/test-154
index 6b50a9475..89afd2e91 100644
--- a/test/api/results-paint/test-154
+++ b/test/api/results-paint/test-154
@@ -1,38 +1,11 @@
-start clip rectangle 0 500 500 1e+03
+start clip rectangle 100 250 900 950
   start transform 1 0 0 1 0 0
-    push group
-      start transform 1 0 -0 1 0 0
-        paint color glyph 164; acting as failed
-      end transform
-      start clip rectangle 100 100 900 900
-        start transform 1 0 -0 1 0 0
-          paint color glyph 93; acting as failed
+    start transform 1 0 -0 1 0 0
+      start clip glyph 154
+        start transform 1 0 0 1 0 0
+          solid 0 0 0 255
         end transform
-        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 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
-    pop group mode 3
+    end transform
   end transform
 end clip
diff --git a/test/api/results-paint/test-165 b/test/api/results-paint/test-165
index 24bf7543f..dd59b78c5 100644
--- a/test/api/results-paint/test-165
+++ b/test/api/results-paint/test-165
@@ -1,18 +1,3 @@
-start clip rectangle 100 250 1.2e+03 950
-  start transform 1 0 0 1 0 0
-    start transform 1 0 -0 1 0 0
-      start clip glyph 165
-        start transform 1 0 0 1 0 0
-          linear gradient
-            p0 100 950
-            p1 2.3e+03 950
-            p2 -1e+03 250
-            colors 0
-              0 255 0 0 255
-              0.5 0 0 255 255
-              1 255 255 0 255
-        end transform
-      end clip
-    end transform
-  end transform
+start clip glyph 165
+  solid 0 0 0 255
 end clip
diff --git a/test/api/results-paint/test-175 b/test/api/results-paint/test-175
index a0d7c8152..77ca1eead 100644
--- a/test/api/results-paint/test-175
+++ b/test/api/results-paint/test-175
@@ -1,28 +1,3 @@
-start clip rectangle 0 0 1e+03 1e+03
-  start transform 1 0 0 1 0 0
-    start transform 1 0 0 1 150 0
-      start transform 1 0 -0 1 0 0
-        start clip glyph 174
-          start transform 1 0 0 1 0 0
-            solid 0 128 0 255
-          end transform
-        end clip
-      end transform
-    end transform
-    start transform 1 0 0 1 -150 0
-      start transform 1 0 -0 1 0 0
-        start clip glyph 174
-          start transform 1 0 0 1 0 0
-            linear gradient
-              p0 500 250
-              p1 500 950
-              p2 600 250
-              colors 1
-                0 255 0 0 255
-                1 0 0 255 255
-          end transform
-        end clip
-      end transform
-    end transform
-  end transform
+start clip glyph 175
+  solid 0 0 0 255
 end clip
diff --git a/test/api/results-paint/test-6 b/test/api/results-paint/test-6
index ff4ae4f67..ad5897b56 100644
--- a/test/api/results-paint/test-6
+++ b/test/api/results-paint/test-6
@@ -1,17 +1,3 @@
-start clip rectangle 100 250 900 950
-  start transform 1 0 0 1 0 0
-    start transform 1 0 -0 1 0 0
-      start clip glyph 6
-        start transform 1 0 0 1 0 0
-          linear gradient
-            p0 100 250
-            p1 900 250
-            p2 100 300
-            colors 1
-              0 255 0 0 255
-              1 0 0 255 255
-        end transform
-      end clip
-    end transform
-  end transform
+start clip glyph 6
+  solid 0 0 0 255
 end clip
diff --git a/test/api/results-paint/test-92 b/test/api/results-paint/test-92
index 0e2548189..6c6d8ac79 100644
--- a/test/api/results-paint/test-92
+++ b/test/api/results-paint/test-92
@@ -3,10 +3,11 @@ 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 1
+          linear gradient
+            p0 0 1.02e+03
+            p1 307 1.02e+03
+            p2 0 717
+            colors 2
               0 0 128 0 255
               0.5 255 255 255 255
               1 255 0 0 255
diff --git a/test/api/results-paint/testvf-10 b/test/api/results-paint/testvf-10
index f67f70c72..7b68c1ac8 100644
--- a/test/api/results-paint/testvf-10
+++ b/test/api/results-paint/testvf-10
@@ -1,16 +1,15 @@
-start clip rectangle 0 0 1e+03 1e+03
+start clip rectangle 100 250 900 950
   start transform 1 0 0 1 0 0
     start transform 1 0 -0 1 0 0
-      start clip glyph 174
+      start clip glyph 10
         start transform 1 0 0 1 0 0
-          sweep gradient
-            center 500 600
-            angles 0 6.28
-            colors 0
-              0.25 250 240 230 255
-              0.417 0 0 255 255
-              0.583 255 0 0 255
-              0.75 47 79 79 255
+          linear gradient
+            p0 100 250
+            p1 900 250
+            p2 100 300
+            colors 1
+              0 255 0 0 255
+              1.5 0 0 255 255
         end transform
       end clip
     end transform
diff --git a/test/api/results-paint/testvf-106 b/test/api/results-paint/testvf-106
index 688fd2d4b..f3ced4fd3 100644
--- a/test/api/results-paint/testvf-106
+++ b/test/api/results-paint/testvf-106
@@ -1,4 +1,4 @@
-start clip rectangle 118 -22.9 750 750
+start clip rectangle 250 183 750 817
   start transform 1 0 0 1 0 0
     push group
       start transform 1 0 -0 1 0 0
@@ -9,9 +9,9 @@ start clip rectangle 118 -22.9 750 750
         end clip
       end transform
       push group
-        start transform 1 0 0 1 1e+03 1e+03
-          start transform 1 0.364 0.176 1 0 0
-            start transform 1 0 0 1 -1e+03 -1e+03
+        start transform 1 0 0 1 500 500
+          start transform 1 0.268 -0 1 0 0
+            start transform 1 0 0 1 -500 -500
               start transform 1 0 -0 1 0 0
                 start clip glyph 3
                   start transform 1 0 0 1 0 0
diff --git a/test/api/results-paint/testvf-116 b/test/api/results-paint/testvf-116
index 930e00232..850fb1ab5 100644
--- a/test/api/results-paint/testvf-116
+++ b/test/api/results-paint/testvf-116
@@ -1,4 +1,4 @@
-start clip rectangle 250 250 950 950
+start clip rectangle 250 250 850 750
   start transform 1 0 0 1 0 0
     push group
       start transform 1 0 -0 1 0 0
@@ -9,7 +9,7 @@ start clip rectangle 250 250 950 950
         end clip
       end transform
       push group
-        start transform 1 0 0 1 200 200
+        start transform 1 0 0 1 100 0
           start transform 1 0 -0 1 0 0
             start clip glyph 3
               start transform 1 0 0 1 0 0
diff --git a/test/api/results-paint/testvf-123 b/test/api/results-paint/testvf-123
index cb7b96e8b..20d61f7c2 100644
--- a/test/api/results-paint/testvf-123
+++ b/test/api/results-paint/testvf-123
@@ -35,7 +35,7 @@ start clip rectangle 0 0 1e+03 1e+03
             end transform
           end transform
         end transform
-      pop group mode 5
+      pop group mode 3
     pop group mode 3
   end transform
 end clip
diff --git a/test/api/results-paint/testvf-154 b/test/api/results-paint/testvf-154
index 6b50a9475..89afd2e91 100644
--- a/test/api/results-paint/testvf-154
+++ b/test/api/results-paint/testvf-154
@@ -1,38 +1,11 @@
-start clip rectangle 0 500 500 1e+03
+start clip rectangle 100 250 900 950
   start transform 1 0 0 1 0 0
-    push group
-      start transform 1 0 -0 1 0 0
-        paint color glyph 164; acting as failed
-      end transform
-      start clip rectangle 100 100 900 900
-        start transform 1 0 -0 1 0 0
-          paint color glyph 93; acting as failed
+    start transform 1 0 -0 1 0 0
+      start clip glyph 154
+        start transform 1 0 0 1 0 0
+          solid 0 0 0 255
         end transform
-        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 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
-    pop group mode 3
+    end transform
   end transform
 end clip
diff --git a/test/api/results-paint/testvf-165 b/test/api/results-paint/testvf-165
index 24bf7543f..dd59b78c5 100644
--- a/test/api/results-paint/testvf-165
+++ b/test/api/results-paint/testvf-165
@@ -1,18 +1,3 @@
-start clip rectangle 100 250 1.2e+03 950
-  start transform 1 0 0 1 0 0
-    start transform 1 0 -0 1 0 0
-      start clip glyph 165
-        start transform 1 0 0 1 0 0
-          linear gradient
-            p0 100 950
-            p1 2.3e+03 950
-            p2 -1e+03 250
-            colors 0
-              0 255 0 0 255
-              0.5 0 0 255 255
-              1 255 255 0 255
-        end transform
-      end clip
-    end transform
-  end transform
+start clip glyph 165
+  solid 0 0 0 255
 end clip
diff --git a/test/api/results-paint/testvf-175 b/test/api/results-paint/testvf-175
index a0d7c8152..77ca1eead 100644
--- a/test/api/results-paint/testvf-175
+++ b/test/api/results-paint/testvf-175
@@ -1,28 +1,3 @@
-start clip rectangle 0 0 1e+03 1e+03
-  start transform 1 0 0 1 0 0
-    start transform 1 0 0 1 150 0
-      start transform 1 0 -0 1 0 0
-        start clip glyph 174
-          start transform 1 0 0 1 0 0
-            solid 0 128 0 255
-          end transform
-        end clip
-      end transform
-    end transform
-    start transform 1 0 0 1 -150 0
-      start transform 1 0 -0 1 0 0
-        start clip glyph 174
-          start transform 1 0 0 1 0 0
-            linear gradient
-              p0 500 250
-              p1 500 950
-              p2 600 250
-              colors 1
-                0 255 0 0 255
-                1 0 0 255 255
-          end transform
-        end clip
-      end transform
-    end transform
-  end transform
+start clip glyph 175
+  solid 0 0 0 255
 end clip
diff --git a/test/api/results-paint/testvf-6 b/test/api/results-paint/testvf-6
index ff4ae4f67..ad5897b56 100644
--- a/test/api/results-paint/testvf-6
+++ b/test/api/results-paint/testvf-6
@@ -1,17 +1,3 @@
-start clip rectangle 100 250 900 950
-  start transform 1 0 0 1 0 0
-    start transform 1 0 -0 1 0 0
-      start clip glyph 6
-        start transform 1 0 0 1 0 0
-          linear gradient
-            p0 100 250
-            p1 900 250
-            p2 100 300
-            colors 1
-              0 255 0 0 255
-              1 0 0 255 255
-        end transform
-      end clip
-    end transform
-  end transform
+start clip glyph 6
+  solid 0 0 0 255
 end clip
diff --git a/test/api/results-paint/testvf-92 b/test/api/results-paint/testvf-92
index 0e2548189..6c6d8ac79 100644
--- a/test/api/results-paint/testvf-92
+++ b/test/api/results-paint/testvf-92
@@ -3,10 +3,11 @@ 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 1
+          linear gradient
+            p0 0 1.02e+03
+            p1 307 1.02e+03
+            p2 0 717
+            colors 2
               0 0 128 0 255
               0.5 255 255 255 255
               1 255 0 0 255