[build] Reorganize the render tests

Move everything that might collect metrics to the metrics/ directory,
the only test manifests inside the render-test/ directory are the
unit tests of the probes.

72 files changed, 0 insertions, 1133 deletions

diff --git a/render-test/tests/file-size/fail-file-doesnt-match/expected.png b/render-test/tests/file-size/fail-file-doesnt-match/expected.png
deleted file mode 100644
index 83d01c4e5d..0000000000
--- a/render-test/tests/file-size/fail-file-doesnt-match/expected.png
+++ /dev/null
diff --git a/render-test/tests/file-size/fail-file-doesnt-match/metrics.json b/render-test/tests/file-size/fail-file-doesnt-match/metrics.json
deleted file mode 100644
index c0002163d6..0000000000
--- a/render-test/tests/file-size/fail-file-doesnt-match/metrics.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "file-size": [
-        [
-            "image",
-            "expected.aaa",
-            169
-        ],
-        [
-            "style",
-            "style.bbbb",
-            510
-        ]
-    ]
-}
diff --git a/render-test/tests/file-size/fail-file-doesnt-match/style.json b/render-test/tests/file-size/fail-file-doesnt-match/style.json
deleted file mode 100644
index 839a8d4a12..0000000000
--- a/render-test/tests/file-size/fail-file-doesnt-match/style.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "operations": [
-        ["probeFileSize", "style", "style.json", 0],
-        ["probeFileSize", "image", "expected.png", 0]
-      ],
-      "width": 64,
-      "height": 64
-    }
-  },
-  "sources": {
-    "geojson": {
-      "type": "geojson",
-      "data": {
-        "type": "Point",
-        "coordinates": [
-          0,
-          0
-        ]
-      }
-    }
-  },
-  "layers": [
-    {
-      "id": "circle",
-      "type": "circle",
-      "source": "geojson"
-    }
-  ]
-}
diff --git a/render-test/tests/file-size/fail-file-not-found/expected.png b/render-test/tests/file-size/fail-file-not-found/expected.png
deleted file mode 100644
index 83d01c4e5d..0000000000
--- a/render-test/tests/file-size/fail-file-not-found/expected.png
+++ /dev/null
diff --git a/render-test/tests/file-size/fail-file-not-found/style.json b/render-test/tests/file-size/fail-file-not-found/style.json
deleted file mode 100644
index 74054e1f40..0000000000
--- a/render-test/tests/file-size/fail-file-not-found/style.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "operations": [
-        ["probeFileSize", "style", "style.aaaa", 0],
-        ["probeFileSize", "image", "expected.bbb", 0]
-      ],
-      "width": 64,
-      "height": 64
-    }
-  },
-  "sources": {
-    "geojson": {
-      "type": "geojson",
-      "data": {
-        "type": "Point",
-        "coordinates": [
-          0,
-          0
-        ]
-      }
-    }
-  },
-  "layers": [
-    {
-      "id": "circle",
-      "type": "circle",
-      "source": "geojson"
-    }
-  ]
-}
diff --git a/render-test/tests/file-size/fail-size-is-over/expected.png b/render-test/tests/file-size/fail-size-is-over/expected.png
deleted file mode 100644
index 83d01c4e5d..0000000000
--- a/render-test/tests/file-size/fail-size-is-over/expected.png
+++ /dev/null
diff --git a/render-test/tests/file-size/fail-size-is-over/metrics.json b/render-test/tests/file-size/fail-size-is-over/metrics.json
deleted file mode 100644
index bc194081cf..0000000000
--- a/render-test/tests/file-size/fail-size-is-over/metrics.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "file-size": [
-        [
-            "image",
-            "expected.png",
-            999
-        ],
-        [
-            "style",
-            "style.json",
-            999
-        ]
-    ]
-}
diff --git a/render-test/tests/file-size/fail-size-is-over/style.json b/render-test/tests/file-size/fail-size-is-over/style.json
deleted file mode 100644
index 839a8d4a12..0000000000
--- a/render-test/tests/file-size/fail-size-is-over/style.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "operations": [
-        ["probeFileSize", "style", "style.json", 0],
-        ["probeFileSize", "image", "expected.png", 0]
-      ],
-      "width": 64,
-      "height": 64
-    }
-  },
-  "sources": {
-    "geojson": {
-      "type": "geojson",
-      "data": {
-        "type": "Point",
-        "coordinates": [
-          0,
-          0
-        ]
-      }
-    }
-  },
-  "layers": [
-    {
-      "id": "circle",
-      "type": "circle",
-      "source": "geojson"
-    }
-  ]
-}
diff --git a/render-test/tests/file-size/fail-size-is-under/expected.png b/render-test/tests/file-size/fail-size-is-under/expected.png
deleted file mode 100644
index 83d01c4e5d..0000000000
--- a/render-test/tests/file-size/fail-size-is-under/expected.png
+++ /dev/null
diff --git a/render-test/tests/file-size/fail-size-is-under/metrics.json b/render-test/tests/file-size/fail-size-is-under/metrics.json
deleted file mode 100644
index d288c2ceee..0000000000
--- a/render-test/tests/file-size/fail-size-is-under/metrics.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "file-size": [
-        [
-            "image",
-            "expected.png",
-            100
-        ],
-        [
-            "style",
-            "style.json",
-            100
-        ]
-    ]
-}
diff --git a/render-test/tests/file-size/fail-size-is-under/style.json b/render-test/tests/file-size/fail-size-is-under/style.json
deleted file mode 100644
index 839a8d4a12..0000000000
--- a/render-test/tests/file-size/fail-size-is-under/style.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "operations": [
-        ["probeFileSize", "style", "style.json", 0],
-        ["probeFileSize", "image", "expected.png", 0]
-      ],
-      "width": 64,
-      "height": 64
-    }
-  },
-  "sources": {
-    "geojson": {
-      "type": "geojson",
-      "data": {
-        "type": "Point",
-        "coordinates": [
-          0,
-          0
-        ]
-      }
-    }
-  },
-  "layers": [
-    {
-      "id": "circle",
-      "type": "circle",
-      "source": "geojson"
-    }
-  ]
-}
diff --git a/render-test/tests/file-size/pass-size-is-in-tolerance-higher/expected.png b/render-test/tests/file-size/pass-size-is-in-tolerance-higher/expected.png
deleted file mode 100644
index 83d01c4e5d..0000000000
--- a/render-test/tests/file-size/pass-size-is-in-tolerance-higher/expected.png
+++ /dev/null
diff --git a/render-test/tests/file-size/pass-size-is-in-tolerance-higher/metrics.json b/render-test/tests/file-size/pass-size-is-in-tolerance-higher/metrics.json
deleted file mode 100644
index d0c0c9d7b6..0000000000
--- a/render-test/tests/file-size/pass-size-is-in-tolerance-higher/metrics.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "file-size": [
-        [
-            "image",
-            "expected.png",
-            177
-        ],
-        [
-            "style",
-            "style.json",
-            548
-        ]
-    ]
-}
diff --git a/render-test/tests/file-size/pass-size-is-in-tolerance-higher/style.json b/render-test/tests/file-size/pass-size-is-in-tolerance-higher/style.json
deleted file mode 100644
index d021673ba5..0000000000
--- a/render-test/tests/file-size/pass-size-is-in-tolerance-higher/style.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "operations": [
-        ["probeFileSize", "style", "style.json", 0.05],
-        ["probeFileSize", "image", "expected.png", 0.05]
-      ],
-      "width": 64,
-      "height": 64
-    }
-  },
-  "sources": {
-    "geojson": {
-      "type": "geojson",
-      "data": {
-        "type": "Point",
-        "coordinates": [
-          0,
-          0
-        ]
-      }
-    }
-  },
-  "layers": [
-    {
-      "id": "circle",
-      "type": "circle",
-      "source": "geojson"
-    }
-  ]
-}
diff --git a/render-test/tests/file-size/pass-size-is-in-tolerance-lower/expected.png b/render-test/tests/file-size/pass-size-is-in-tolerance-lower/expected.png
deleted file mode 100644
index 83d01c4e5d..0000000000
--- a/render-test/tests/file-size/pass-size-is-in-tolerance-lower/expected.png
+++ /dev/null
diff --git a/render-test/tests/file-size/pass-size-is-in-tolerance-lower/metrics.json b/render-test/tests/file-size/pass-size-is-in-tolerance-lower/metrics.json
deleted file mode 100644
index d62b751d5a..0000000000
--- a/render-test/tests/file-size/pass-size-is-in-tolerance-lower/metrics.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "file-size": [
-        [
-            "image",
-            "expected.png",
-            161
-        ],
-        [
-            "style",
-            "style.json",
-            498
-        ]
-    ]
-}
diff --git a/render-test/tests/file-size/pass-size-is-in-tolerance-lower/style.json b/render-test/tests/file-size/pass-size-is-in-tolerance-lower/style.json
deleted file mode 100644
index d021673ba5..0000000000
--- a/render-test/tests/file-size/pass-size-is-in-tolerance-lower/style.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "operations": [
-        ["probeFileSize", "style", "style.json", 0.05],
-        ["probeFileSize", "image", "expected.png", 0.05]
-      ],
-      "width": 64,
-      "height": 64
-    }
-  },
-  "sources": {
-    "geojson": {
-      "type": "geojson",
-      "data": {
-        "type": "Point",
-        "coordinates": [
-          0,
-          0
-        ]
-      }
-    }
-  },
-  "layers": [
-    {
-      "id": "circle",
-      "type": "circle",
-      "source": "geojson"
-    }
-  ]
-}
diff --git a/render-test/tests/file-size/pass-size-is-same/expected.png b/render-test/tests/file-size/pass-size-is-same/expected.png
deleted file mode 100644
index 83d01c4e5d..0000000000
--- a/render-test/tests/file-size/pass-size-is-same/expected.png
+++ /dev/null
diff --git a/render-test/tests/file-size/pass-size-is-same/metrics.json b/render-test/tests/file-size/pass-size-is-same/metrics.json
deleted file mode 100644
index 15f8c35617..0000000000
--- a/render-test/tests/file-size/pass-size-is-same/metrics.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "file-size": [
-        [
-            "image",
-            "expected.png",
-            169
-        ],
-        [
-            "image-compressed",
-            "expected.png",
-            167
-        ],
-        [
-            "style",
-            "style.json",
-            674
-        ],
-        [
-            "style-compressed",
-            "style.json",
-            256
-        ]
-    ]
-}
diff --git a/render-test/tests/file-size/pass-size-is-same/style.json b/render-test/tests/file-size/pass-size-is-same/style.json
deleted file mode 100644
index b13f37500a..0000000000
--- a/render-test/tests/file-size/pass-size-is-same/style.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "operations": [
-        ["probeFileSize", "image", "expected.png", 0],
-        ["probeFileSize", "image-compressed", "expected.png", 0, "compressed"],
-        ["probeFileSize", "style", "style.json", 0],
-        ["probeFileSize", "style-compressed", "style.json", 0, "compressed"]
-      ],
-      "width": 64,
-      "height": 64
-    }
-  },
-  "sources": {
-    "geojson": {
-      "type": "geojson",
-      "data": {
-        "type": "Point",
-        "coordinates": [
-          0,
-          0
-        ]
-      }
-    }
-  },
-  "layers": [
-    {
-      "id": "circle",
-      "type": "circle",
-      "source": "geojson"
-    }
-  ]
-}
diff --git a/render-test/tests/gfx/fail-ib-mem-mismatch/expected.png b/render-test/tests/gfx/fail-ib-mem-mismatch/expected.png
deleted file mode 100644
index 4b5ea75a25..0000000000
--- a/render-test/tests/gfx/fail-ib-mem-mismatch/expected.png
+++ /dev/null
diff --git a/render-test/tests/gfx/fail-ib-mem-mismatch/metrics.json b/render-test/tests/gfx/fail-ib-mem-mismatch/metrics.json
deleted file mode 100644
index 2b5c9c3eda..0000000000
--- a/render-test/tests/gfx/fail-ib-mem-mismatch/metrics.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "gfx":[
-        ["gfx 0", 36, 14, 63, 1, [371208, 371208], [68598, 65536], [74592, 74592]]
-    ]
-} 
diff --git a/render-test/tests/gfx/fail-ib-mem-mismatch/style.json b/render-test/tests/gfx/fail-ib-mem-mismatch/style.json
deleted file mode 100644
index 6ae3eecb8c..0000000000
--- a/render-test/tests/gfx/fail-ib-mem-mismatch/style.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "version": 8,
-    "metadata": {
-      "test": {
-        "width": 512,
-        "height": 512,
-        "operations": [
-          ["setStyle", "local://styles/uruguay.json"],
-          ["setZoom", 9 ],
-          ["probeGFXStart"],
-          ["setCenter", [-56.509552, -32.865788] ],
-          ["probeGFX", "gfx 0"],
-          ["probeGFXEnd"]
-        ]
-      }
-    },
-    "sources": {},
-    "layers": []
-  }
-  
\ No newline at end of file
diff --git a/render-test/tests/gfx/fail-negative-framebuffer-count/expected.png b/render-test/tests/gfx/fail-negative-framebuffer-count/expected.png
deleted file mode 100644
index 4b5ea75a25..0000000000
--- a/render-test/tests/gfx/fail-negative-framebuffer-count/expected.png
+++ /dev/null
diff --git a/render-test/tests/gfx/fail-negative-framebuffer-count/metrics.json b/render-test/tests/gfx/fail-negative-framebuffer-count/metrics.json
deleted file mode 100644
index e92cffa571..0000000000
--- a/render-test/tests/gfx/fail-negative-framebuffer-count/metrics.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "gfx":[
-        ["gfx 0", 36, 14, 63, -1, [371208, 371208], [68598, 68598], [74592, 74592]]
-    ]
-} 
diff --git a/render-test/tests/gfx/fail-negative-framebuffer-count/style.json b/render-test/tests/gfx/fail-negative-framebuffer-count/style.json
deleted file mode 100644
index 6ae3eecb8c..0000000000
--- a/render-test/tests/gfx/fail-negative-framebuffer-count/style.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "version": 8,
-    "metadata": {
-      "test": {
-        "width": 512,
-        "height": 512,
-        "operations": [
-          ["setStyle", "local://styles/uruguay.json"],
-          ["setZoom", 9 ],
-          ["probeGFXStart"],
-          ["setCenter", [-56.509552, -32.865788] ],
-          ["probeGFX", "gfx 0"],
-          ["probeGFXEnd"]
-        ]
-      }
-    },
-    "sources": {},
-    "layers": []
-  }
-  
\ No newline at end of file
diff --git a/render-test/tests/gfx/fail-texture-mem-mismatch/expected.png b/render-test/tests/gfx/fail-texture-mem-mismatch/expected.png
deleted file mode 100644
index 4b5ea75a25..0000000000
--- a/render-test/tests/gfx/fail-texture-mem-mismatch/expected.png
+++ /dev/null
diff --git a/render-test/tests/gfx/fail-texture-mem-mismatch/metrics.json b/render-test/tests/gfx/fail-texture-mem-mismatch/metrics.json
deleted file mode 100644
index fc6f55025f..0000000000
--- a/render-test/tests/gfx/fail-texture-mem-mismatch/metrics.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "gfx":[
-        ["gfx 0", 36, 14, 63, 1, [371208, 370000], [68598, 68598], [74592, 74592]]
-    ]
-} 
diff --git a/render-test/tests/gfx/fail-texture-mem-mismatch/style.json b/render-test/tests/gfx/fail-texture-mem-mismatch/style.json
deleted file mode 100644
index 6ae3eecb8c..0000000000
--- a/render-test/tests/gfx/fail-texture-mem-mismatch/style.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "version": 8,
-    "metadata": {
-      "test": {
-        "width": 512,
-        "height": 512,
-        "operations": [
-          ["setStyle", "local://styles/uruguay.json"],
-          ["setZoom", 9 ],
-          ["probeGFXStart"],
-          ["setCenter", [-56.509552, -32.865788] ],
-          ["probeGFX", "gfx 0"],
-          ["probeGFXEnd"]
-        ]
-      }
-    },
-    "sources": {},
-    "layers": []
-  }
-  
\ No newline at end of file
diff --git a/render-test/tests/gfx/fail-too-few-buffers/expected.png b/render-test/tests/gfx/fail-too-few-buffers/expected.png
deleted file mode 100644
index 4b5ea75a25..0000000000
--- a/render-test/tests/gfx/fail-too-few-buffers/expected.png
+++ /dev/null
diff --git a/render-test/tests/gfx/fail-too-few-buffers/metrics.json b/render-test/tests/gfx/fail-too-few-buffers/metrics.json
deleted file mode 100644
index 07b59adeed..0000000000
--- a/render-test/tests/gfx/fail-too-few-buffers/metrics.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "gfx":[
-        ["gfx 0", 36, 14, 1000, 1, [371208, 371208], [68598, 68598], [74592, 74592]]
-    ]
-} 
diff --git a/render-test/tests/gfx/fail-too-few-buffers/style.json b/render-test/tests/gfx/fail-too-few-buffers/style.json
deleted file mode 100644
index 6ae3eecb8c..0000000000
--- a/render-test/tests/gfx/fail-too-few-buffers/style.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "version": 8,
-    "metadata": {
-      "test": {
-        "width": 512,
-        "height": 512,
-        "operations": [
-          ["setStyle", "local://styles/uruguay.json"],
-          ["setZoom", 9 ],
-          ["probeGFXStart"],
-          ["setCenter", [-56.509552, -32.865788] ],
-          ["probeGFX", "gfx 0"],
-          ["probeGFXEnd"]
-        ]
-      }
-    },
-    "sources": {},
-    "layers": []
-  }
-  
\ No newline at end of file
diff --git a/render-test/tests/gfx/fail-too-few-textures/expected.png b/render-test/tests/gfx/fail-too-few-textures/expected.png
deleted file mode 100644
index 4b5ea75a25..0000000000
--- a/render-test/tests/gfx/fail-too-few-textures/expected.png
+++ /dev/null
diff --git a/render-test/tests/gfx/fail-too-few-textures/metrics.json b/render-test/tests/gfx/fail-too-few-textures/metrics.json
deleted file mode 100644
index 805d7035e2..0000000000
--- a/render-test/tests/gfx/fail-too-few-textures/metrics.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "gfx":[
-        ["gfx 0", 36, 1000, 63, 1, [371208, 371208], [68598, 68598], [74592, 74592]]
-    ]
-} 
diff --git a/render-test/tests/gfx/fail-too-few-textures/style.json b/render-test/tests/gfx/fail-too-few-textures/style.json
deleted file mode 100644
index 6ae3eecb8c..0000000000
--- a/render-test/tests/gfx/fail-too-few-textures/style.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "version": 8,
-    "metadata": {
-      "test": {
-        "width": 512,
-        "height": 512,
-        "operations": [
-          ["setStyle", "local://styles/uruguay.json"],
-          ["setZoom", 9 ],
-          ["probeGFXStart"],
-          ["setCenter", [-56.509552, -32.865788] ],
-          ["probeGFX", "gfx 0"],
-          ["probeGFXEnd"]
-        ]
-      }
-    },
-    "sources": {},
-    "layers": []
-  }
-  
\ No newline at end of file
diff --git a/render-test/tests/gfx/fail-too-many-drawcalls/expected.png b/render-test/tests/gfx/fail-too-many-drawcalls/expected.png
deleted file mode 100644
index 4b5ea75a25..0000000000
--- a/render-test/tests/gfx/fail-too-many-drawcalls/expected.png
+++ /dev/null
diff --git a/render-test/tests/gfx/fail-too-many-drawcalls/metrics.json b/render-test/tests/gfx/fail-too-many-drawcalls/metrics.json
deleted file mode 100644
index 9abb546450..0000000000
--- a/render-test/tests/gfx/fail-too-many-drawcalls/metrics.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "gfx":[
-        ["gfx 0", 28, 14, 63, 1, [371208, 371208], [68598, 68598], [74592, 74592]]
-    ]
-} 
diff --git a/render-test/tests/gfx/fail-too-many-drawcalls/style.json b/render-test/tests/gfx/fail-too-many-drawcalls/style.json
deleted file mode 100644
index 6ae3eecb8c..0000000000
--- a/render-test/tests/gfx/fail-too-many-drawcalls/style.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "version": 8,
-    "metadata": {
-      "test": {
-        "width": 512,
-        "height": 512,
-        "operations": [
-          ["setStyle", "local://styles/uruguay.json"],
-          ["setZoom", 9 ],
-          ["probeGFXStart"],
-          ["setCenter", [-56.509552, -32.865788] ],
-          ["probeGFX", "gfx 0"],
-          ["probeGFXEnd"]
-        ]
-      }
-    },
-    "sources": {},
-    "layers": []
-  }
-  
\ No newline at end of file
diff --git a/render-test/tests/gfx/fail-vb-mem-mismatch/expected.png b/render-test/tests/gfx/fail-vb-mem-mismatch/expected.png
deleted file mode 100644
index 4b5ea75a25..0000000000
--- a/render-test/tests/gfx/fail-vb-mem-mismatch/expected.png
+++ /dev/null
diff --git a/render-test/tests/gfx/fail-vb-mem-mismatch/metrics.json b/render-test/tests/gfx/fail-vb-mem-mismatch/metrics.json
deleted file mode 100644
index fd25dbd68b..0000000000
--- a/render-test/tests/gfx/fail-vb-mem-mismatch/metrics.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "gfx":[
-        ["gfx 0", 36, 14, 63, 1, [371208, 371208], [68598, 68598], [74592, 7654321]]
-    ]
-} 
diff --git a/render-test/tests/gfx/fail-vb-mem-mismatch/style.json b/render-test/tests/gfx/fail-vb-mem-mismatch/style.json
deleted file mode 100644
index 6ae3eecb8c..0000000000
--- a/render-test/tests/gfx/fail-vb-mem-mismatch/style.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "version": 8,
-    "metadata": {
-      "test": {
-        "width": 512,
-        "height": 512,
-        "operations": [
-          ["setStyle", "local://styles/uruguay.json"],
-          ["setZoom", 9 ],
-          ["probeGFXStart"],
-          ["setCenter", [-56.509552, -32.865788] ],
-          ["probeGFX", "gfx 0"],
-          ["probeGFXEnd"]
-        ]
-      }
-    },
-    "sources": {},
-    "layers": []
-  }
-  
\ No newline at end of file
diff --git a/render-test/tests/gfx/pass-double-probe/expected.png b/render-test/tests/gfx/pass-double-probe/expected.png
deleted file mode 100644
index 9f4e48ab24..0000000000
--- a/render-test/tests/gfx/pass-double-probe/expected.png
+++ /dev/null
diff --git a/render-test/tests/gfx/pass-double-probe/metrics.json b/render-test/tests/gfx/pass-double-probe/metrics.json
deleted file mode 100644
index f2641a9a16..0000000000
--- a/render-test/tests/gfx/pass-double-probe/metrics.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "gfx":[
-        ["gfx 0", 36, 13, 63, 1, [240136, 240136], [68598, 68598], [74592, 74592]],
-        ["gfx 1", 32, 17, 85, 1, [325008, 325008], [84926, 84926], [100224, 100224]]
-    ]
-} 
diff --git a/render-test/tests/gfx/pass-double-probe/style.json b/render-test/tests/gfx/pass-double-probe/style.json
deleted file mode 100644
index 395f4ce50a..0000000000
--- a/render-test/tests/gfx/pass-double-probe/style.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "version": 8,
-    "metadata": {
-      "test": {
-        "width": 512,
-        "height": 512,
-        "operations": [
-          ["setStyle", "local://styles/uruguay.json"],
-          ["setZoom", 9 ],
-          ["probeGFXStart"],
-          ["setCenter", [-56.509552, -32.865788] ],
-          ["probeGFX", "gfx 0"],
-          ["setCenter", [-56.509552, -32.745788] ],
-          ["probeGFX", "gfx 1"],
-          ["probeGFXEnd"]
-        ]
-      }
-    },
-    "sources": {},
-    "layers": []
-  }
-  
\ No newline at end of file
diff --git a/render-test/tests/gfx/pass-probe-reset/expected.png b/render-test/tests/gfx/pass-probe-reset/expected.png
deleted file mode 100644
index 9f4e48ab24..0000000000
--- a/render-test/tests/gfx/pass-probe-reset/expected.png
+++ /dev/null
diff --git a/render-test/tests/gfx/pass-probe-reset/metrics.json b/render-test/tests/gfx/pass-probe-reset/metrics.json
deleted file mode 100644
index 0e42bc1697..0000000000
--- a/render-test/tests/gfx/pass-probe-reset/metrics.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "gfx":[
-        ["gfx 0", 36, 13, 63, 1, [240136, 240136], [68598, 68598], [74592, 74592]],
-        ["gfx 1", 32, 17, 85, 1, [84872, 84872], [16328, 16328], [25632, 25632]]
-    ]
-} 
diff --git a/render-test/tests/gfx/pass-probe-reset/style.json b/render-test/tests/gfx/pass-probe-reset/style.json
deleted file mode 100644
index 698d95bb74..0000000000
--- a/render-test/tests/gfx/pass-probe-reset/style.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "version": 8,
-    "metadata": {
-      "test": {
-        "width": 512,
-        "height": 512,
-        "operations": [
-          ["setStyle", "local://styles/uruguay.json"],
-          ["setZoom", 9 ],
-          ["probeGFXStart"],
-          ["setCenter", [-56.509552, -32.865788] ],
-          ["probeGFX", "gfx 0"],
-          ["probeGFXEnd"],
-          ["probeGFXStart"],
-          ["setCenter", [-56.509552, -32.745788] ],
-          ["probeGFX", "gfx 1"],
-          ["probeGFXEnd"]
-        ]
-      }
-    },
-    "sources": {},
-    "layers": []
-  }
-  
\ No newline at end of file
diff --git a/render-test/tests/gfx/pass/expected.png b/render-test/tests/gfx/pass/expected.png
deleted file mode 100644
index 4b5ea75a25..0000000000
--- a/render-test/tests/gfx/pass/expected.png
+++ /dev/null
diff --git a/render-test/tests/gfx/pass/metrics.json b/render-test/tests/gfx/pass/metrics.json
deleted file mode 100644
index 67ecec5d78..0000000000
--- a/render-test/tests/gfx/pass/metrics.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "gfx":[
-        ["gfx 0", 36, 13, 63, 1, [240136, 240136], [68598, 68598], [74592, 74592]]
-    ]
-} 
diff --git a/render-test/tests/gfx/pass/style.json b/render-test/tests/gfx/pass/style.json
deleted file mode 100644
index 6ae3eecb8c..0000000000
--- a/render-test/tests/gfx/pass/style.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "version": 8,
-    "metadata": {
-      "test": {
-        "width": 512,
-        "height": 512,
-        "operations": [
-          ["setStyle", "local://styles/uruguay.json"],
-          ["setZoom", 9 ],
-          ["probeGFXStart"],
-          ["setCenter", [-56.509552, -32.865788] ],
-          ["probeGFX", "gfx 0"],
-          ["probeGFXEnd"]
-        ]
-      }
-    },
-    "sources": {},
-    "layers": []
-  }
-  
\ No newline at end of file
diff --git a/render-test/tests/memory/fail-memory-size-is-too-big/expected.png b/render-test/tests/memory/fail-memory-size-is-too-big/expected.png
deleted file mode 100644
index 0858c19f05..0000000000
--- a/render-test/tests/memory/fail-memory-size-is-too-big/expected.png
+++ /dev/null
diff --git a/render-test/tests/memory/fail-memory-size-is-too-big/metrics.json b/render-test/tests/memory/fail-memory-size-is-too-big/metrics.json
deleted file mode 100644
index f13f54410d..0000000000
--- a/render-test/tests/memory/fail-memory-size-is-too-big/metrics.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "memory": [
-        [
-            "after setZoom 0.9",
-            21439,
-            57
-        ],
-        [
-            "end",
-            20000,
-            108
-        ],
-        [
-            "start",
-            0,
-            0
-        ]
-    ]
-}
diff --git a/render-test/tests/memory/fail-memory-size-is-too-big/style.json b/render-test/tests/memory/fail-memory-size-is-too-big/style.json
deleted file mode 100644
index b2805ef34f..0000000000
--- a/render-test/tests/memory/fail-memory-size-is-too-big/style.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "width": 64,
-      "height": 64,
-      "operations": [
-        [ "wait" ],
-        [ "probeMemoryStart" ],
-        [ "probeMemory", "start" ],
-        [
-          "setZoom",
-          0.9
-        ],
-        [
-          "wait"
-        ],
-        [ "probeMemory", "after setZoom 0.9", 0.005 ],
-        [
-          "setLayerZoomRange",
-          "circle",
-          1,
-          2
-        ],
-        [
-          "wait"
-        ],
-        [ "probeMemory", "end", 0.005 ],
-        [ "probeMemoryEnd" ]
-      ]
-    }
-  },
-  "sources": {
-    "geojson": {
-      "type": "geojson",
-      "data": {
-        "type": "Point",
-        "coordinates": [
-          0,
-          0
-        ]
-      }
-    }
-  },
-  "layers": [
-    {
-      "id": "circle",
-      "type": "circle",
-      "source": "geojson"
-    }
-  ]
-}
diff --git a/render-test/tests/memory/fail-memory-size-is-too-small/expected.png b/render-test/tests/memory/fail-memory-size-is-too-small/expected.png
deleted file mode 100644
index 0858c19f05..0000000000
--- a/render-test/tests/memory/fail-memory-size-is-too-small/expected.png
+++ /dev/null
diff --git a/render-test/tests/memory/fail-memory-size-is-too-small/metrics.json b/render-test/tests/memory/fail-memory-size-is-too-small/metrics.json
deleted file mode 100644
index 9aba39584a..0000000000
--- a/render-test/tests/memory/fail-memory-size-is-too-small/metrics.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "memory": [
-        [
-            "after setZoom 0.9",
-            21439,
-            57
-        ],
-        [
-            "end",
-            60000,
-            108
-        ],
-        [
-            "start",
-            0,
-            0
-        ]
-    ]
-}
diff --git a/render-test/tests/memory/fail-memory-size-is-too-small/style.json b/render-test/tests/memory/fail-memory-size-is-too-small/style.json
deleted file mode 100644
index b2805ef34f..0000000000
--- a/render-test/tests/memory/fail-memory-size-is-too-small/style.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "width": 64,
-      "height": 64,
-      "operations": [
-        [ "wait" ],
-        [ "probeMemoryStart" ],
-        [ "probeMemory", "start" ],
-        [
-          "setZoom",
-          0.9
-        ],
-        [
-          "wait"
-        ],
-        [ "probeMemory", "after setZoom 0.9", 0.005 ],
-        [
-          "setLayerZoomRange",
-          "circle",
-          1,
-          2
-        ],
-        [
-          "wait"
-        ],
-        [ "probeMemory", "end", 0.005 ],
-        [ "probeMemoryEnd" ]
-      ]
-    }
-  },
-  "sources": {
-    "geojson": {
-      "type": "geojson",
-      "data": {
-        "type": "Point",
-        "coordinates": [
-          0,
-          0
-        ]
-      }
-    }
-  },
-  "layers": [
-    {
-      "id": "circle",
-      "type": "circle",
-      "source": "geojson"
-    }
-  ]
-}
diff --git a/render-test/tests/memory/pass-memory-size-is-same/expected.png b/render-test/tests/memory/pass-memory-size-is-same/expected.png
deleted file mode 100644
index 0858c19f05..0000000000
--- a/render-test/tests/memory/pass-memory-size-is-same/expected.png
+++ /dev/null
diff --git a/render-test/tests/memory/pass-memory-size-is-same/metrics.json b/render-test/tests/memory/pass-memory-size-is-same/metrics.json
deleted file mode 100644
index 3ffbe1b732..0000000000
--- a/render-test/tests/memory/pass-memory-size-is-same/metrics.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "memory": [
-        [
-            "after setZoom 0.9",
-            21439,
-            57
-        ],
-        [
-            "end",
-            23385,
-            108
-        ],
-        [
-            "start",
-            0,
-            0
-        ]
-    ]
-}
diff --git a/render-test/tests/memory/pass-memory-size-is-same/style.json b/render-test/tests/memory/pass-memory-size-is-same/style.json
deleted file mode 100644
index d1c09f69f9..0000000000
--- a/render-test/tests/memory/pass-memory-size-is-same/style.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "width": 64,
-      "height": 64,
-      "operations": [
-        [ "wait" ],
-        [ "probeMemoryStart" ],
-        [ "probeMemory", "start" ],
-        [
-          "setZoom",
-          0.9
-        ],
-        [
-          "wait"
-        ],
-        [ "probeMemory", "after setZoom 0.9", 0.01 ],
-        [
-          "setLayerZoomRange",
-          "circle",
-          1,
-          2
-        ],
-        [
-          "wait"
-        ],
-        [ "probeMemory", "end", 0.01 ],
-        [ "probeMemoryEnd" ]
-      ]
-    }
-  },
-  "sources": {
-    "geojson": {
-      "type": "geojson",
-      "data": {
-        "type": "Point",
-        "coordinates": [
-          0,
-          0
-        ]
-      }
-    }
-  },
-  "layers": [
-    {
-      "id": "circle",
-      "type": "circle",
-      "source": "geojson"
-    }
-  ]
-}
diff --git a/render-test/tests/network/fail-requests-transferred/expected.png b/render-test/tests/network/fail-requests-transferred/expected.png
deleted file mode 100644
index b63b151765..0000000000
--- a/render-test/tests/network/fail-requests-transferred/expected.png
+++ /dev/null
diff --git a/render-test/tests/network/fail-requests-transferred/metrics.json b/render-test/tests/network/fail-requests-transferred/metrics.json
deleted file mode 100644
index 1a200ca38f..0000000000
--- a/render-test/tests/network/fail-requests-transferred/metrics.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "network": [
-        [
-            "end",
-            2,
-            200000
-        ],
-        [
-            "start",
-            0,
-            0
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/render-test/tests/network/fail-requests-transferred/style.json b/render-test/tests/network/fail-requests-transferred/style.json
deleted file mode 100644
index ef94ddc748..0000000000
--- a/render-test/tests/network/fail-requests-transferred/style.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "operations": [
-        ["probeNetworkStart"],
-        ["probeNetwork", "start"],
-        ["wait"],
-        ["probeNetwork", "end"],
-        ["probeNetworkEnd"]
-      ],
-      "height": 256,
-      "width": 1024
-    }
-  },
-  "center": [
-    -73,
-    15
-  ],
-  "zoom": 4.5,
-  "sources": {
-    "mapbox": {
-      "type": "vector",
-      "maxzoom": 14,
-      "tiles": [
-        "local://tiles/mapbox.mapbox-streets-v7/{z}-{x}-{y}.mvt"
-      ]
-    }
-  },
-  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
-  "layers": [
-    {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "white"
-      }
-    },
-    {
-      "id": "line-center",
-      "type": "symbol",
-      "source": "mapbox",
-      "source-layer": "marine_label",
-      "layout": {
-        "text-field": "{name_en}",
-        "symbol-placement": "line-center",
-        "text-allow-overlap": true,
-        "text-size": 35,
-        "text-letter-spacing": 0.4,
-        "text-offset": [3, 0],
-        "text-font": [
-          "Open Sans Semibold",
-          "Arial Unicode MS Bold"
-        ]
-      }
-    },
-    {
-      "id": "line",
-      "type": "line",
-      "source": "mapbox",
-      "source-layer": "marine_label",
-      "paint": {
-        "line-width": 1
-      }
-    }
-  ]
-}
diff --git a/render-test/tests/network/fail-requests/expected.png b/render-test/tests/network/fail-requests/expected.png
deleted file mode 100644
index b63b151765..0000000000
--- a/render-test/tests/network/fail-requests/expected.png
+++ /dev/null
diff --git a/render-test/tests/network/fail-requests/metrics.json b/render-test/tests/network/fail-requests/metrics.json
deleted file mode 100644
index 81c9b8a5d4..0000000000
--- a/render-test/tests/network/fail-requests/metrics.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "network": [
-        [
-            "end",
-            2,
-            183111
-        ],
-        [
-            "start",
-            0,
-            0
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/render-test/tests/network/fail-requests/style.json b/render-test/tests/network/fail-requests/style.json
deleted file mode 100644
index ef94ddc748..0000000000
--- a/render-test/tests/network/fail-requests/style.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "operations": [
-        ["probeNetworkStart"],
-        ["probeNetwork", "start"],
-        ["wait"],
-        ["probeNetwork", "end"],
-        ["probeNetworkEnd"]
-      ],
-      "height": 256,
-      "width": 1024
-    }
-  },
-  "center": [
-    -73,
-    15
-  ],
-  "zoom": 4.5,
-  "sources": {
-    "mapbox": {
-      "type": "vector",
-      "maxzoom": 14,
-      "tiles": [
-        "local://tiles/mapbox.mapbox-streets-v7/{z}-{x}-{y}.mvt"
-      ]
-    }
-  },
-  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
-  "layers": [
-    {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "white"
-      }
-    },
-    {
-      "id": "line-center",
-      "type": "symbol",
-      "source": "mapbox",
-      "source-layer": "marine_label",
-      "layout": {
-        "text-field": "{name_en}",
-        "symbol-placement": "line-center",
-        "text-allow-overlap": true,
-        "text-size": 35,
-        "text-letter-spacing": 0.4,
-        "text-offset": [3, 0],
-        "text-font": [
-          "Open Sans Semibold",
-          "Arial Unicode MS Bold"
-        ]
-      }
-    },
-    {
-      "id": "line",
-      "type": "line",
-      "source": "mapbox",
-      "source-layer": "marine_label",
-      "paint": {
-        "line-width": 1
-      }
-    }
-  ]
-}
diff --git a/render-test/tests/network/fail-transferred/expected.png b/render-test/tests/network/fail-transferred/expected.png
deleted file mode 100644
index b63b151765..0000000000
--- a/render-test/tests/network/fail-transferred/expected.png
+++ /dev/null
diff --git a/render-test/tests/network/fail-transferred/metrics.json b/render-test/tests/network/fail-transferred/metrics.json
deleted file mode 100644
index 20b42d5b9b..0000000000
--- a/render-test/tests/network/fail-transferred/metrics.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "network": [
-        [
-            "end",
-            3,
-            100000
-        ],
-        [
-            "start",
-            0,
-            0
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/render-test/tests/network/fail-transferred/style.json b/render-test/tests/network/fail-transferred/style.json
deleted file mode 100644
index ef94ddc748..0000000000
--- a/render-test/tests/network/fail-transferred/style.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "operations": [
-        ["probeNetworkStart"],
-        ["probeNetwork", "start"],
-        ["wait"],
-        ["probeNetwork", "end"],
-        ["probeNetworkEnd"]
-      ],
-      "height": 256,
-      "width": 1024
-    }
-  },
-  "center": [
-    -73,
-    15
-  ],
-  "zoom": 4.5,
-  "sources": {
-    "mapbox": {
-      "type": "vector",
-      "maxzoom": 14,
-      "tiles": [
-        "local://tiles/mapbox.mapbox-streets-v7/{z}-{x}-{y}.mvt"
-      ]
-    }
-  },
-  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
-  "layers": [
-    {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "white"
-      }
-    },
-    {
-      "id": "line-center",
-      "type": "symbol",
-      "source": "mapbox",
-      "source-layer": "marine_label",
-      "layout": {
-        "text-field": "{name_en}",
-        "symbol-placement": "line-center",
-        "text-allow-overlap": true,
-        "text-size": 35,
-        "text-letter-spacing": 0.4,
-        "text-offset": [3, 0],
-        "text-font": [
-          "Open Sans Semibold",
-          "Arial Unicode MS Bold"
-        ]
-      }
-    },
-    {
-      "id": "line",
-      "type": "line",
-      "source": "mapbox",
-      "source-layer": "marine_label",
-      "paint": {
-        "line-width": 1
-      }
-    }
-  ]
-}
diff --git a/render-test/tests/network/pass/expected.png b/render-test/tests/network/pass/expected.png
deleted file mode 100644
index b63b151765..0000000000
--- a/render-test/tests/network/pass/expected.png
+++ /dev/null
diff --git a/render-test/tests/network/pass/metrics.json b/render-test/tests/network/pass/metrics.json
deleted file mode 100644
index 6afd106a45..0000000000
--- a/render-test/tests/network/pass/metrics.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "network": [
-        [
-            "end",
-            3,
-            183111
-        ],
-        [
-            "start",
-            0,
-            0
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/render-test/tests/network/pass/style.json b/render-test/tests/network/pass/style.json
deleted file mode 100644
index ef94ddc748..0000000000
--- a/render-test/tests/network/pass/style.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "operations": [
-        ["probeNetworkStart"],
-        ["probeNetwork", "start"],
-        ["wait"],
-        ["probeNetwork", "end"],
-        ["probeNetworkEnd"]
-      ],
-      "height": 256,
-      "width": 1024
-    }
-  },
-  "center": [
-    -73,
-    15
-  ],
-  "zoom": 4.5,
-  "sources": {
-    "mapbox": {
-      "type": "vector",
-      "maxzoom": 14,
-      "tiles": [
-        "local://tiles/mapbox.mapbox-streets-v7/{z}-{x}-{y}.mvt"
-      ]
-    }
-  },
-  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
-  "layers": [
-    {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "white"
-      }
-    },
-    {
-      "id": "line-center",
-      "type": "symbol",
-      "source": "mapbox",
-      "source-layer": "marine_label",
-      "layout": {
-        "text-field": "{name_en}",
-        "symbol-placement": "line-center",
-        "text-allow-overlap": true,
-        "text-size": 35,
-        "text-letter-spacing": 0.4,
-        "text-offset": [3, 0],
-        "text-font": [
-          "Open Sans Semibold",
-          "Arial Unicode MS Bold"
-        ]
-      }
-    },
-    {
-      "id": "line",
-      "type": "line",
-      "source": "mapbox",
-      "source-layer": "marine_label",
-      "paint": {
-        "line-width": 1
-      }
-    }
-  ]
-}
diff --git a/render-test/tests/should-fail.json b/render-test/tests/should-fail.json
deleted file mode 100644
index b539d66019..0000000000
--- a/render-test/tests/should-fail.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "tests/file-size/fail-size-is-over": "Should fail, size is bigger than expected.",
-  "tests/file-size/fail-size-is-under": "Should fail, size is smaller than expected.",
-  "tests/file-size/fail-file-doesnt-match": "Should fail, doesn't match the expectation.",
-  "tests/file-size/fail-file-not-found": "Should fail, file not found.",
-  "tests/network/fail-requests": "Should fail, number of requests higher than expected.",
-  "tests/network/fail-transferred": "Should fail, amount of transferred data higher than expected.",
-  "tests/network/fail-requests-transferred": "Should fail, number of requests higher than expected and amount of transferred data less than expected.",
-  "tests/memory/fail-memory-size-is-too-big": "Should fail, memory size is bigger than expected.",
-  "tests/memory/fail-memory-size-is-too-small": "Should fail, memory size is smaller than expected.",
-  "tests/gfx/fail-ib-mem-mismatch": "Should fail, combined byte size of index buffers doesn't match the expectation.",
-  "tests/gfx/fail-negative-framebuffer-count": "Should fail, number of frame buffers is higher than expected.",
-  "tests/gfx/fail-texture-mem-mismatch": "Should fail, combined byte size of textures doesn't match the expectation.",
-  "tests/gfx/fail-too-many-drawcalls": "Should fail, number of draw calls higher than expected.",
-  "tests/gfx/fail-too-few-buffers": "Should fail, number of vertex and index buffers is smaller than expected.",
-  "tests/gfx/fail-too-few-textures": "Should fail, number of textures is smaller than expected.",
-  "tests/gfx/fail-vb-mem-mismatch": "Should fail, combined byte size of index buffers doesn't match the expectation."
-}