diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 6f26a91d2..ae56511da 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -158,7 +158,7 @@ jobs:
 
       - name: Run render tests on macOS
         if: runner.os == 'macOS'
-        run: ./build/mbgl-render-test-runner --manifestPath metrics/macos-xcode11-release-style.json
+        run: set -o pipefail && ./build/mbgl-render-test-runner --manifestPath metrics/macos-xcode11-release-style.json
 
       - name: Upload render test artifacts
         uses: actions/upload-artifact@v3
diff --git a/metrics/linux-gcc8-release/render-tests/icon-rotate/with-offset/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotate/with-offset/metrics.json
index 39cea2f7a..9844b0070 100644
--- a/metrics/linux-gcc8-release/render-tests/icon-rotate/with-offset/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-rotate/with-offset/metrics.json
@@ -13,7 +13,7 @@
     ],
     "gfx": [
         [
-            "probeGFX - default - end",
+            "probeGFX - default1 - end",
             2,
             6,
             12,
diff --git a/metrics/macos-xcode11-release/render-tests/circle-sort-key/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-sort-key/literal/metrics.json
new file mode 100644
index 000000000..a7ecf0458
--- /dev/null
+++ b/metrics/macos-xcode11-release/render-tests/circle-sort-key/literal/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            0,
+            0
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            4,
+            9,
+            13,
+            1,
+            [
+                65552,
+                65552
+            ],
+            [
+                94,
+                94
+            ],
+            [
+                448,
+                448
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-line-translate/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-line-translate/metrics.json
index 6ed2f71ff..a99484c47 100644
--- a/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-line-translate/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-line-translate/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             4,
-            13,
+            21,
             19,
             1,
             [
-                87892,
-                87892
+                87924,
+                87924
             ],
             [
                 1578,
diff --git a/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-point-translate/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-point-translate/metrics.json
index bc4caba39..17fba0446 100644
--- a/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-point-translate/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-point-translate/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             4,
-            13,
+            21,
             19,
             1,
             [
-                87892,
-                87892
+                87924,
+                87924
             ],
             [
                 102,
diff --git a/metrics/macos-xcode11-release/render-tests/debug/collision-lines-overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-lines-overscaled/metrics.json
index e0337338d..89d36a35a 100644
--- a/metrics/macos-xcode11-release/render-tests/debug/collision-lines-overscaled/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/debug/collision-lines-overscaled/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             4,
-            13,
+            21,
             19,
             1,
             [
-                156088,
-                156088
+                156120,
+                156120
             ],
             [
                 790,
diff --git a/metrics/macos-xcode11-release/render-tests/debug/collision-lines-pitched/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-lines-pitched/metrics.json
index 9f0230b68..fdbd1532e 100644
--- a/metrics/macos-xcode11-release/render-tests/debug/collision-lines-pitched/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/debug/collision-lines-pitched/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             2,
-            4,
+            6,
             12,
             1,
             [
-                71936,
-                71936
+                71944,
+                71944
             ],
             [
                 30814,
diff --git a/metrics/macos-xcode11-release/render-tests/debug/collision-lines/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-lines/metrics.json
index 9f0230b68..fdbd1532e 100644
--- a/metrics/macos-xcode11-release/render-tests/debug/collision-lines/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/debug/collision-lines/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             2,
-            4,
+            6,
             12,
             1,
             [
-                71936,
-                71936
+                71944,
+                71944
             ],
             [
                 30814,
diff --git a/metrics/macos-xcode11-release/render-tests/debug/collision-overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-overscaled/metrics.json
index d9e4fbe38..a06fb7ad3 100644
--- a/metrics/macos-xcode11-release/render-tests/debug/collision-overscaled/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/debug/collision-overscaled/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             4,
-            5,
+            8,
             19,
             1,
             [
-                36896,
-                36896
+                36908,
+                36908
             ],
             [
                 26342,
diff --git a/metrics/macos-xcode11-release/render-tests/debug/collision-pitched-wrapped/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-pitched-wrapped/metrics.json
index d4438ca80..616849570 100644
--- a/metrics/macos-xcode11-release/render-tests/debug/collision-pitched-wrapped/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/debug/collision-pitched-wrapped/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             16,
-            25,
+            41,
             61,
             1,
             [
-                276736,
-                276736
+                276800,
+                276800
             ],
             [
                 51862,
diff --git a/metrics/macos-xcode11-release/render-tests/debug/collision-pitched/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-pitched/metrics.json
index 29bd85067..a4fade43b 100644
--- a/metrics/macos-xcode11-release/render-tests/debug/collision-pitched/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/debug/collision-pitched/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             16,
-            36,
+            60,
             61,
             1,
             [
-                413280,
-                413280
+                413376,
+                413376
             ],
             [
                 7062,
diff --git a/metrics/macos-xcode11-release/render-tests/filter/in/metrics.json b/metrics/macos-xcode11-release/render-tests/filter/in/metrics.json
new file mode 100644
index 000000000..f955deb5a
--- /dev/null
+++ b/metrics/macos-xcode11-release/render-tests/filter/in/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            0,
+            0
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            3,
+            3,
+            10,
+            1,
+            [
+                32768,
+                32768
+            ],
+            [
+                214,
+                214
+            ],
+            [
+                664,
+                664
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/macos-xcode11-release/render-tests/icon-rotate/with-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotate/with-offset/metrics.json
index 6d7c07c46..39cea2f7a 100644
--- a/metrics/macos-xcode11-release/render-tests/icon-rotate/with-offset/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-rotate/with-offset/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             2,
-            4,
+            6,
             12,
             1,
             [
-                21120,
-                21120
+                21128,
+                21128
             ],
             [
                 50,
diff --git a/metrics/macos-xcode11-release/render-tests/image/default/metrics.json b/metrics/macos-xcode11-release/render-tests/image/default/metrics.json
index e64a2bba0..a5e1a3ae1 100644
--- a/metrics/macos-xcode11-release/render-tests/image/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/default/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             1,
-            6,
+            7,
             7,
             1,
             [
-                2139136,
-                2139136
+                2139140,
+                2139140
             ],
             [
                 34,
diff --git a/metrics/macos-xcode11-release/render-tests/image/pitched/metrics.json b/metrics/macos-xcode11-release/render-tests/image/pitched/metrics.json
index 40cff205c..2d5947814 100644
--- a/metrics/macos-xcode11-release/render-tests/image/pitched/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/pitched/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             1,
-            13,
+            14,
             7,
             1,
             [
-                2253824,
-                2253824
+                2253828,
+                2253828
             ],
             [
                 34,
diff --git a/metrics/macos-xcode11-release/render-tests/image/raster-brightness/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-brightness/metrics.json
index e64a2bba0..a5e1a3ae1 100644
--- a/metrics/macos-xcode11-release/render-tests/image/raster-brightness/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/raster-brightness/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             1,
-            6,
+            7,
             7,
             1,
             [
-                2139136,
-                2139136
+                2139140,
+                2139140
             ],
             [
                 34,
diff --git a/metrics/macos-xcode11-release/render-tests/image/raster-contrast/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-contrast/metrics.json
index e64a2bba0..a5e1a3ae1 100644
--- a/metrics/macos-xcode11-release/render-tests/image/raster-contrast/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/raster-contrast/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             1,
-            6,
+            7,
             7,
             1,
             [
-                2139136,
-                2139136
+                2139140,
+                2139140
             ],
             [
                 34,
diff --git a/metrics/macos-xcode11-release/render-tests/image/raster-hue-rotate/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-hue-rotate/metrics.json
index e64a2bba0..a5e1a3ae1 100644
--- a/metrics/macos-xcode11-release/render-tests/image/raster-hue-rotate/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/raster-hue-rotate/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             1,
-            6,
+            7,
             7,
             1,
             [
-                2139136,
-                2139136
+                2139140,
+                2139140
             ],
             [
                 34,
diff --git a/metrics/macos-xcode11-release/render-tests/image/raster-opacity/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-opacity/metrics.json
index e64a2bba0..a5e1a3ae1 100644
--- a/metrics/macos-xcode11-release/render-tests/image/raster-opacity/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/raster-opacity/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             1,
-            6,
+            7,
             7,
             1,
             [
-                2139136,
-                2139136
+                2139140,
+                2139140
             ],
             [
                 34,
diff --git a/metrics/macos-xcode11-release/render-tests/image/raster-resampling/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-resampling/metrics.json
index 20c05495d..3a2571d36 100644
--- a/metrics/macos-xcode11-release/render-tests/image/raster-resampling/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/raster-resampling/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             1,
-            3,
+            4,
             7,
             1,
             [
-                2089984,
-                2089984
+                2089988,
+                2089988
             ],
             [
                 34,
diff --git a/metrics/macos-xcode11-release/render-tests/image/raster-saturation/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-saturation/metrics.json
index e64a2bba0..a5e1a3ae1 100644
--- a/metrics/macos-xcode11-release/render-tests/image/raster-saturation/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/raster-saturation/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             1,
-            6,
+            7,
             7,
             1,
             [
-                2139136,
-                2139136
+                2139140,
+                2139140
             ],
             [
                 34,
diff --git a/metrics/macos-xcode11-release/render-tests/image/raster-visibility/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-visibility/metrics.json
index e64a2bba0..a5e1a3ae1 100644
--- a/metrics/macos-xcode11-release/render-tests/image/raster-visibility/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/raster-visibility/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             1,
-            6,
+            7,
             7,
             1,
             [
-                2139136,
-                2139136
+                2139140,
+                2139140
             ],
             [
                 34,
diff --git a/metrics/macos-xcode11-release/render-tests/line-dasharray/zero-length-gap/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/zero-length-gap/metrics.json
new file mode 100644
index 000000000..32c56fe8f
--- /dev/null
+++ b/metrics/macos-xcode11-release/render-tests/line-dasharray/zero-length-gap/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            0,
+            0
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            6,
+            8,
+            20,
+            1,
+            [
+                34048,
+                34048
+            ],
+            [
+                58,
+                58
+            ],
+            [
+                784,
+                784
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/macos-xcode11-release/render-tests/line-gradient/gradient-tile-boundaries/metrics.json b/metrics/macos-xcode11-release/render-tests/line-gradient/gradient-tile-boundaries/metrics.json
new file mode 100644
index 000000000..c5be22f70
--- /dev/null
+++ b/metrics/macos-xcode11-release/render-tests/line-gradient/gradient-tile-boundaries/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            0,
+            0
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            4,
+            6,
+            9,
+            1,
+            [
+                66560,
+                66560
+            ],
+            [
+                94,
+                94
+            ],
+            [
+                192,
+                192
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/macos-xcode11-release/render-tests/map-mode/tile-avoid-edges/metrics.json b/metrics/macos-xcode11-release/render-tests/map-mode/tile-avoid-edges/metrics.json
index 199ebad89..c158d2da3 100644
--- a/metrics/macos-xcode11-release/render-tests/map-mode/tile-avoid-edges/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/map-mode/tile-avoid-edges/metrics.json
@@ -2,8 +2,8 @@
     "network": [
         [
             "probeNetwork - default - end",
-            8,
-            246523
+            5,
+            178378
         ],
         [
             "probeNetwork - default - start",
@@ -14,21 +14,21 @@
     "gfx": [
         [
             "probeGFX - default - end",
-            103,
-            15,
-            207,
+            23,
+            8,
+            51,
             1,
             [
-                207972,
-                207972
+                53024,
+                53024
             ],
             [
-                162572,
-                162572
+                43734,
+                43734
             ],
             [
-                512168,
-                512168
+                151604,
+                151604
             ]
         ]
     ]
diff --git a/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json
index 20c05495d..3a2571d36 100644
--- a/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             1,
-            3,
+            4,
             7,
             1,
             [
-                2089984,
-                2089984
+                2089988,
+                2089988
             ],
             [
                 34,
diff --git a/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json
index 20c05495d..3a2571d36 100644
--- a/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             1,
-            3,
+            4,
             7,
             1,
             [
-                2089984,
-                2089984
+                2089988,
+                2089988
             ],
             [
                 34,
diff --git a/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json
index b3e8b2695..48541088a 100644
--- a/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             2,
-            4,
+            5,
             7,
             1,
             [
-                2106368,
-                2106368
+                2106372,
+                2106372
             ],
             [
                 34,
diff --git a/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json
index 20c05495d..3a2571d36 100644
--- a/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             1,
-            3,
+            4,
             7,
             1,
             [
-                2089984,
-                2089984
+                2089988,
+                2089988
             ],
             [
                 34,
diff --git a/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json
index ca4687f41..e348c7161 100644
--- a/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             2,
-            4,
+            6,
             12,
             1,
             [
-                35828,
-                35828
+                35836,
+                35836
             ],
             [
                 86,
diff --git a/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5171/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5171/metrics.json
new file mode 100644
index 000000000..f116462d8
--- /dev/null
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5171/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            0,
+            0
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            2,
+            3,
+            7,
+            1,
+            [
+                32768,
+                32768
+            ],
+            [
+                34,
+                34
+            ],
+            [
+                96,
+                96
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json
index 25b998e4f..2043a63e4 100644
--- a/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             4,
-            45,
+            85,
             19,
             1,
             [
-                662656,
-                662656
+                662816,
+                662816
             ],
             [
                 438,
diff --git a/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json
index e9fe2a688..6603feaf8 100644
--- a/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             2,
-            60,
+            110,
             12,
             1,
             [
-                864279,
-                864279
+                864479,
+                864479
             ],
             [
                 898,
diff --git a/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json
index 2e13bfe1c..c8c3dee39 100644
--- a/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             4,
-            7,
+            11,
             9,
             1,
             [
-                92941,
-                92941
+                92957,
+                92957
             ],
             [
                 358,
diff --git a/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json
new file mode 100644
index 000000000..228731dd4
--- /dev/null
+++ b/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center-buffer-tile-map-mode/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            6,
+            268053
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            10,
+            22,
+            32,
+            4,
+            [
+                158509,
+                158509
+            ],
+            [
+                712,
+                712
+            ],
+            [
+                4576,
+                4576
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json
new file mode 100644
index 000000000..e6f162de0
--- /dev/null
+++ b/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center-tile-map-mode/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            8,
+            1755006
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            20,
+            24,
+            60,
+            4,
+            [
+                131780,
+                131780
+            ],
+            [
+                102328,
+                102328
+            ],
+            [
+                600256,
+                600256
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center/metrics.json
index 28402a2cc..480f8a18c 100644
--- a/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             8,
-            9,
+            15,
             25,
             1,
             [
-                98642,
-                98642
+                98666,
+                98666
             ],
             [
                 40606,
diff --git a/metrics/macos-xcode11-release/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json
new file mode 100644
index 000000000..6c810abb8
--- /dev/null
+++ b/metrics/macos-xcode11-release/render-tests/symbol-sort-key/placement-tile-boundary-left-then-right/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            2,
+            211659
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            3,
+            7,
+            13,
+            1,
+            [
+                53920,
+                53920
+            ],
+            [
+                58,
+                58
+            ],
+            [
+                544,
+                544
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/macos-xcode11-release/render-tests/text-rotate/with-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotate/with-offset/metrics.json
index ca4687f41..e348c7161 100644
--- a/metrics/macos-xcode11-release/render-tests/text-rotate/with-offset/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-rotate/with-offset/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             2,
-            4,
+            6,
             12,
             1,
             [
-                35828,
-                35828
+                35836,
+                35836
             ],
             [
                 86,
diff --git a/metrics/macos-xcode11-release/render-tests/text-size/zero/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/zero/metrics.json
new file mode 100644
index 000000000..ef15ba387
--- /dev/null
+++ b/metrics/macos-xcode11-release/render-tests/text-size/zero/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            1,
+            84942
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            1,
+            21,
+            9,
+            1,
+            [
+                215688,
+                215688
+            ],
+            [
+                58,
+                58
+            ],
+            [
+                544,
+                544
+            ]
+        ]
+    ]
+}
diff --git a/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
index a7cc63292..1a348fa3e 100644
--- a/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
@@ -2,8 +2,8 @@
     "network": [
         [
             "probeNetwork - default - end",
-            13,
-            2413450
+            16,
+            2668276
         ],
         [
             "probeNetwork - default - start",
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             8,
-            16,
+            24,
             36,
             4,
             [
-                143312,
-                143312
+                143344,
+                143344
             ],
             [
                 194056,
diff --git a/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
index 3a2c34627..9f7789217 100644
--- a/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             4,
-            4,
+            6,
             19,
             1,
             [
-                32035,
-                32035
+                32043,
+                32043
             ],
             [
                 422,
diff --git a/metrics/macos-xcode11-release/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json
new file mode 100644
index 000000000..22295b952
--- /dev/null
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            22,
+            3183754
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            12,
+            24,
+            52,
+            4,
+            [
+                296872,
+                296872
+            ],
+            [
+                79084,
+                79084
+            ],
+            [
+                1053536,
+                1053536
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
index 415dfc131..102e62664 100644
--- a/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
@@ -15,12 +15,12 @@
         [
             "probeGFX - default - end",
             8,
-            15,
+            25,
             33,
             1,
             [
-                176080,
-                176080
+                176120,
+                176120
             ],
             [
                 101270,
diff --git a/metrics/macos-xcode11-release/render-tests/within/filter-with-inlined-geojson/metrics.json b/metrics/macos-xcode11-release/render-tests/within/filter-with-inlined-geojson/metrics.json
new file mode 100644
index 000000000..12b2edda3
--- /dev/null
+++ b/metrics/macos-xcode11-release/render-tests/within/filter-with-inlined-geojson/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            0,
+            0
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            4,
+            4,
+            10,
+            1,
+            [
+                49152,
+                49152
+            ],
+            [
+                66,
+                66
+            ],
+            [
+                100,
+                100
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/macos-xcode11-release/render-tests/within/layout-text/metrics.json b/metrics/macos-xcode11-release/render-tests/within/layout-text/metrics.json
new file mode 100644
index 000000000..022aba25a
--- /dev/null
+++ b/metrics/macos-xcode11-release/render-tests/within/layout-text/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            1,
+            84942
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            13,
+            17,
+            21,
+            1,
+            [
+                207208,
+                207208
+            ],
+            [
+                210,
+                210
+            ],
+            [
+                944,
+                944
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/macos-xcode11-release/render-tests/within/paint-circle/metrics.json b/metrics/macos-xcode11-release/render-tests/within/paint-circle/metrics.json
new file mode 100644
index 000000000..e76ac664a
--- /dev/null
+++ b/metrics/macos-xcode11-release/render-tests/within/paint-circle/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            0,
+            0
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            16,
+            13,
+            29,
+            1,
+            [
+                196608,
+                196608
+            ],
+            [
+                246,
+                246
+            ],
+            [
+                528,
+                528
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/macos-xcode11-release/render-tests/within/paint-icon/metrics.json b/metrics/macos-xcode11-release/render-tests/within/paint-icon/metrics.json
new file mode 100644
index 000000000..a65edfc8c
--- /dev/null
+++ b/metrics/macos-xcode11-release/render-tests/within/paint-icon/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            2,
+            211659
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            13,
+            17,
+            22,
+            1,
+            [
+                154848,
+                154848
+            ],
+            [
+                174,
+                174
+            ],
+            [
+                528,
+                528
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/macos-xcode11-release/render-tests/within/paint-line/metrics.json b/metrics/macos-xcode11-release/render-tests/within/paint-line/metrics.json
new file mode 100644
index 000000000..c32db503c
--- /dev/null
+++ b/metrics/macos-xcode11-release/render-tests/within/paint-line/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            0,
+            0
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            5,
+            4,
+            13,
+            1,
+            [
+                49152,
+                49152
+            ],
+            [
+                286,
+                286
+            ],
+            [
+                528,
+                528
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/macos-xcode11-release/render-tests/within/paint-text/metrics.json b/metrics/macos-xcode11-release/render-tests/within/paint-text/metrics.json
new file mode 100644
index 000000000..b42b2f763
--- /dev/null
+++ b/metrics/macos-xcode11-release/render-tests/within/paint-text/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            1,
+            84942
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            13,
+            17,
+            22,
+            1,
+            [
+                207700,
+                207700
+            ],
+            [
+                246,
+                246
+            ],
+            [
+                1680,
+                1680
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/tests/location_indicator/change_image/style.json b/metrics/tests/location_indicator/change_image/style.json
index 7aed158bc..492f24912 100644
--- a/metrics/tests/location_indicator/change_image/style.json
+++ b/metrics/tests/location_indicator/change_image/style.json
@@ -31,7 +31,8 @@
           "puck_hat.png",
           {"pixelRatio": 4.0}
         ]
-      ]
+      ],
+      "ignoreProbing": true
     }
   },
   "sources": {
diff --git a/metrics/tests/location_indicator/dateline/style.json b/metrics/tests/location_indicator/dateline/style.json
index ff9bd5ea1..990520081 100644
--- a/metrics/tests/location_indicator/dateline/style.json
+++ b/metrics/tests/location_indicator/dateline/style.json
@@ -20,7 +20,8 @@
           "puck_shadow",
           "puck_shadow.png"
         ]
-      ]
+      ],
+      "ignoreProbing": true
     }
   },
   "center": [ 139.766707, 35.693055 ],
diff --git a/metrics/tests/location_indicator/default/style.json b/metrics/tests/location_indicator/default/style.json
index 409b980c5..232a07e01 100644
--- a/metrics/tests/location_indicator/default/style.json
+++ b/metrics/tests/location_indicator/default/style.json
@@ -20,7 +20,8 @@
           "puck_shadow",
           "puck_shadow.png"
         ]
-      ]
+      ],
+      "ignoreProbing": true
     }
   },
   "sources": {
diff --git a/metrics/tests/location_indicator/image_pixel_ratio/style.json b/metrics/tests/location_indicator/image_pixel_ratio/style.json
index 4c52ef1ee..c1f0b5d31 100644
--- a/metrics/tests/location_indicator/image_pixel_ratio/style.json
+++ b/metrics/tests/location_indicator/image_pixel_ratio/style.json
@@ -24,7 +24,8 @@
           "puck_shadow.png",
           {"pixelRatio": 2.0}
         ]
-      ]
+      ],
+      "ignoreProbing": true
     }
   },
   "sources": {
diff --git a/metrics/tests/location_indicator/no_radius_border/style.json b/metrics/tests/location_indicator/no_radius_border/style.json
index 0037b35ac..9eab1373b 100644
--- a/metrics/tests/location_indicator/no_radius_border/style.json
+++ b/metrics/tests/location_indicator/no_radius_border/style.json
@@ -20,7 +20,8 @@
           "puck_shadow",
           "puck_shadow.png"
         ]
-      ]
+      ],
+      "ignoreProbing": true
     }
   },
   "center": [ 139.766707, 35.693055 ],
diff --git a/metrics/tests/location_indicator/no_radius_fill/style.json b/metrics/tests/location_indicator/no_radius_fill/style.json
index 1848b2869..c5f8bd61d 100644
--- a/metrics/tests/location_indicator/no_radius_fill/style.json
+++ b/metrics/tests/location_indicator/no_radius_fill/style.json
@@ -20,7 +20,8 @@
           "puck_shadow",
           "puck_shadow.png"
         ]
-      ]
+      ],
+      "ignoreProbing": true
     }
   },
   "center": [ 139.766707, 35.693055 ],
diff --git a/metrics/tests/location_indicator/no_textures/style.json b/metrics/tests/location_indicator/no_textures/style.json
index 3864f748a..0695cffd9 100644
--- a/metrics/tests/location_indicator/no_textures/style.json
+++ b/metrics/tests/location_indicator/no_textures/style.json
@@ -20,7 +20,8 @@
           "puck_shadow",
           "puck_shadow.png"
         ]
-      ]
+      ],
+      "ignoreProbing": true
     }
   },
   "center": [ 139.766707, 35.693055 ],
diff --git a/metrics/tests/location_indicator/one_texture/style.json b/metrics/tests/location_indicator/one_texture/style.json
index f6a976f0f..2d6b5d8d9 100644
--- a/metrics/tests/location_indicator/one_texture/style.json
+++ b/metrics/tests/location_indicator/one_texture/style.json
@@ -20,7 +20,8 @@
           "puck_shadow",
           "puck_shadow.png"
         ]
-      ]
+      ],
+      "ignoreProbing": true
     }
   },
   "center": [ 139.766707, 35.693055 ],
diff --git a/metrics/tests/location_indicator/rotated/style.json b/metrics/tests/location_indicator/rotated/style.json
index e7e9d90cd..a60698091 100644
--- a/metrics/tests/location_indicator/rotated/style.json
+++ b/metrics/tests/location_indicator/rotated/style.json
@@ -20,7 +20,8 @@
           "puck_shadow",
           "puck_shadow.png"
         ]
-      ]
+      ],
+      "ignoreProbing": true
     }
   },
   "center": [ 139.766707, 35.693055 ],
diff --git a/metrics/tests/location_indicator/tilted/style.json b/metrics/tests/location_indicator/tilted/style.json
index fb6b31be4..145d07d18 100644
--- a/metrics/tests/location_indicator/tilted/style.json
+++ b/metrics/tests/location_indicator/tilted/style.json
@@ -20,7 +20,8 @@
           "puck_shadow",
           "puck_shadow.png"
         ]
-      ]
+      ],
+      "ignoreProbing": true
     }
   },
   "center": [ 139.766707, 35.693055 ],
diff --git a/metrics/tests/location_indicator/tilted_texture_shift/style.json b/metrics/tests/location_indicator/tilted_texture_shift/style.json
index 1ee6e3ab2..e1ebb3086 100644
--- a/metrics/tests/location_indicator/tilted_texture_shift/style.json
+++ b/metrics/tests/location_indicator/tilted_texture_shift/style.json
@@ -20,7 +20,8 @@
           "puck_shadow",
           "puck_shadow.png"
         ]
-      ]
+      ],
+      "ignoreProbing": true
     }
   },
   "center": [ 139.766707, 35.693055 ],
diff --git a/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/style.json b/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/style.json
index dd7667bf2..e6a61ec64 100644
--- a/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/style.json
+++ b/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/style.json
@@ -20,7 +20,8 @@
           "puck_shadow",
           "puck_shadow.png"
         ]
-      ]
+      ],
+      "ignoreProbing": true
     }
   },
   "center": [ 139.768885, 35.693125 ],
diff --git a/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/style.json b/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/style.json
index 53b80572b..be7344cdd 100644
--- a/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/style.json
+++ b/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/style.json
@@ -20,7 +20,8 @@
           "puck_shadow",
           "puck_shadow.png"
         ]
-      ]
+      ],
+      "ignoreProbing": true
     }
   },
   "center": [ 139.766487, 35.694867 ],
diff --git a/metrics/tests/location_indicator/tilted_texture_shift_top_left/style.json b/metrics/tests/location_indicator/tilted_texture_shift_top_left/style.json
index 0becd051f..9d76d43e7 100644
--- a/metrics/tests/location_indicator/tilted_texture_shift_top_left/style.json
+++ b/metrics/tests/location_indicator/tilted_texture_shift_top_left/style.json
@@ -20,7 +20,8 @@
           "puck_shadow",
           "puck_shadow.png"
         ]
-      ]
+      ],
+      "ignoreProbing": true
     }
   },
   "center": [ 139.766972, 35.687286 ],
diff --git a/metrics/tests/location_indicator/tilted_texture_shift_top_right/style.json b/metrics/tests/location_indicator/tilted_texture_shift_top_right/style.json
index dd9e17a49..38526bbce 100644
--- a/metrics/tests/location_indicator/tilted_texture_shift_top_right/style.json
+++ b/metrics/tests/location_indicator/tilted_texture_shift_top_right/style.json
@@ -20,7 +20,8 @@
           "puck_shadow",
           "puck_shadow.png"
         ]
-      ]
+      ],
+      "ignoreProbing": true
     }
   },
   "center": [ 139.759723, 35.692799 ],
diff --git a/metrics/tests/location_indicator/two_textures/style.json b/metrics/tests/location_indicator/two_textures/style.json
index 2d470d79d..41cf5f363 100644
--- a/metrics/tests/location_indicator/two_textures/style.json
+++ b/metrics/tests/location_indicator/two_textures/style.json
@@ -20,7 +20,8 @@
           "puck_shadow",
           "puck_shadow.png"
         ]
-      ]
+      ],
+      "ignoreProbing": true
     }
   },
   "center": [ 139.766707, 35.693055 ],
diff --git a/render-test/metadata.hpp b/render-test/metadata.hpp
index 84d94e6b2..07cb59904 100644
--- a/render-test/metadata.hpp
+++ b/render-test/metadata.hpp
@@ -138,6 +138,11 @@ struct TestMetadata {
     bool renderTest = true;
     bool outputsImage = true;
     bool ignoredTest = false;
+    // If unit test hasn't metric.json, the unit test will end with
+    // error message: "Failed to find expectations for..., to prevent
+    // unit test error by missing metric.json, can turn on 'ignoreProbing'
+    // to prevent the unit test fail, and just verify the render result.
+    bool ignoreProbing = false;
 
     mbgl::Size size{ 512u, 512u };
     float pixelRatio = 1.0f;
diff --git a/render-test/parser.cpp b/render-test/parser.cpp
index cd58fb606..f364810c1 100644
--- a/render-test/parser.cpp
+++ b/render-test/parser.cpp
@@ -564,6 +564,12 @@ TestMetadata parseTestMetadata(const TestPaths& paths) {
         }
         metadata.renderTest = false;
     }
+    
+    if (testValue.HasMember("ignoreProbing")) {
+        if (testValue["ignoreProbing"].IsBool()) {
+            metadata.ignoreProbing = testValue["ignoreProbing"].GetBool();
+        }
+    }
 
     if (testValue.HasMember("queryOptions")) {
         assert(testValue["queryOptions"].IsObject());
@@ -997,7 +1003,6 @@ TestOperations parseTestOperations(TestMetadata& metadata) {
         } else if (operationArray[0].GetString() == networkProbeStartOp) {
             // probeNetworkStart
             result.emplace_back([](TestContext&) {
-                assert(!mbgl::ProxyFileSource::isTrackingActive());
                 mbgl::ProxyFileSource::setTrackingActive(true);
                 return true;
             });
@@ -1007,7 +1012,6 @@ TestOperations parseTestOperations(TestMetadata& metadata) {
             assert(operationArray[1].IsString());
             std::string mark = std::string(operationArray[1].GetString(), operationArray[1].GetStringLength());
             result.emplace_back([mark](TestContext& ctx) {
-                assert(mbgl::ProxyFileSource::isTrackingActive());
                 ctx.getMetadata().metrics.network.emplace(
                     std::piecewise_construct,
                     std::forward_as_tuple(std::move(mark)),
@@ -1018,7 +1022,6 @@ TestOperations parseTestOperations(TestMetadata& metadata) {
         } else if (operationArray[0].GetString() == networkProbeEndOp) {
             // probeNetworkEnd
             result.emplace_back([](TestContext&) {
-                assert(mbgl::ProxyFileSource::isTrackingActive());
                 mbgl::ProxyFileSource::setTrackingActive(false);
                 return true;
             });
@@ -1252,7 +1255,6 @@ TestOperations parseTestOperations(TestMetadata& metadata) {
         } else if (operationArray[0].GetString() == gfxProbeStartOp) {
             // probeGFXStart
             result.emplace_back([](TestContext& ctx) {
-                assert(!ctx.gfxProbeActive);
                 ctx.gfxProbeActive = true;
                 ctx.baselineGfxProbe = ctx.activeGfxProbe;
                 return true;
diff --git a/render-test/render_test.cpp b/render-test/render_test.cpp
index 8d5a32101..aae5ae6ad 100644
--- a/render-test/render_test.cpp
+++ b/render-test/render_test.cpp
@@ -225,12 +225,14 @@ int runRenderTests(int argc, char** argv, std::function<void()> testStatus) {
                 status = "errored";
                 color = "red";
                 stats.erroredTests++;
+                returnCode = 2;
                 printf(ANSI_COLOR_RED "* errored %s" ANSI_COLOR_RESET "\n", id.c_str());
                 printf(ANSI_COLOR_RED "* error: %s" ANSI_COLOR_RESET "\n", metadata.errorMessage.c_str());
             } else {
                 status = "failed";
                 color = "red";
                 stats.failedTests++;
+                returnCode = 3;
                 printf(ANSI_COLOR_RED "* failed %s" ANSI_COLOR_RESET "\n", id.c_str());
             }
         }
diff --git a/render-test/runner.cpp b/render-test/runner.cpp
index 5c9a6366e..746c4446c 100644
--- a/render-test/runner.cpp
+++ b/render-test/runner.cpp
@@ -629,7 +629,6 @@ TestOperations getAfterOperations(const Manifest& manifest) {
         }
         if (networkProbeOp == probe) {
             result.emplace_back([](TestContext& ctx) {
-                assert(ProxyFileSource::isTrackingActive());
                 ctx.getMetadata().metrics.network.emplace(
                     std::piecewise_construct,
                     std::forward_as_tuple(networkProbeOp + mark),
@@ -864,7 +863,9 @@ void TestRunner::run(TestMetadata& metadata) {
     }
 
     if (metadata.renderTest) {
-        checkProbingResults(metadata);
+        if (!metadata.ignoreProbing) {
+            checkProbingResults(metadata);
+        }
         appendLabelCutOffResults(metadata, cutOffLabelsReport, duplicationsReport);
         checkRenderTestResults(std::move(result.image), metadata);
     } else {