Use new package templates

Change-Id: I802583894275db995e0527c839170bee2b1f15c4
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/vulkan-cts/+/515101
Reviewed-by: John Rosasco <rosasco@google.com>
diff --git a/fuchsia/BUILD.gn b/fuchsia/BUILD.gn
index a04dc68..4d823a4 100644
--- a/fuchsia/BUILD.gn
+++ b/fuchsia/BUILD.gn
@@ -5,6 +5,7 @@
 import("//build/build_id.gni")
 import("//build/package.gni")
 import("//src/graphics/lib/magma/gnbuild/magma.gni")
+import("//src/sys/build/fuchsia_test_package.gni")
 import("resources.gni")
 
 # Only have a copy of the action in one toolchain to ensure we don't do build multiple times for no reason.
@@ -17,6 +18,7 @@
       host_cpu,
       host_os,
     ]
+
     # This action writes to many files in the build-vulkancts directory. In addition, CMake reads
     # from a ton of files everywhere on the system.
     # TODO(fxbug.dev/71971): Fix.
@@ -100,61 +102,35 @@
   labeled_hardware_envs += [ labeled_env ]
 }
 
-# To run on device: run fuchsia-pkg://fuchsia.com/vulkan-cts#meta/vulkan-cts.cmx
-# The following command line args are provided by the cmx:
-# --deqp-caselist-file=/pkg/data/vk-default-1.1.3.txt --deqp-log-images=disable --deqp-log-shader-sources=disable --deqp-log-filename=/data/TestResults.qpa
-# To run the 1.0.2 CTS: "run fuchsia-pkg://fuchsia.com/vulkan-cts#meta/vulkan-cts-1.0.2.cmx"
-package("vulkan-cts-unified") {
-  testonly = true
-  package_name = "vulkan-cts"
-  deps = [
-    ":copy",
-    ":strip",
-    ":vulkan_cts_build_id",
-  ]
-  tests = [
-    {
-      name = "vulkan-cts"
-      environments = labeled_hardware_envs
-    },
-  ]
+# C++ binaries implicitly use a set of shared libraries like ld.so.1. Adding them as deps to the
+# resource allows the fuchsia_package to discover and package them. This list is mainly assembled
+# from the variant_target template in //build/config/BUILDCONFIG.gn.
+cpp_binary_deps = [
+  "//build/toolchain/runtime:shared-libc++-deps",
+  "//build/unification/lib/sysroot:sysroot",
+  "//sdk/lib/fdio",
+  "//src/zircon/lib/zircon",
+  "//zircon/public/sysroot:cpp_binary_deps",
+  "//zircon/public/sysroot:crt1_deps",
+]
 
-  meta = [
-    {
-      path = rebase_path("meta/vulkan-cts.cmx")
-      dest = "vulkan-cts.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-no-args.cmx")
-      dest = "vulkan-cts-no-args.cmx"
-    },
-  ]
-  resources = cts_resources
+resource("vulkan-cts-executable") {
+  deps = [ ":strip" ]
+  data_deps = [ "//src/lib/vulkan" ] + cpp_binary_deps
+
+  sources = [ "$root_build_dir/vulkan-cts" ]
+  outputs = [ "test/vulkan-cts" ]
 }
 
-# Run zircon-specific handle tests
-package("vulkan-cts-zircon") {
-  testonly = true
-  deps = [
-    ":copy",
-    ":strip",
-    ":vulkan_cts_build_id",
-  ]
-  tests = [
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-zircon"
-      environments = labeled_hardware_envs
-    },
-  ]
+resource_group("cts-resources") {
+  files = cts_resources
+}
 
-  meta = [
-    {
-      path = rebase_path("meta/vulkan-cts-zircon.cmx")
-      dest = "vulkan-cts-zircon.cmx"
-    },
+group("cts-deps") {
+  deps = [
+    ":cts-resources",
+    ":vulkan-cts-executable",
   ]
-  resources = cts_resources
 }
 
 group("vulkan-cts") {
@@ -173,78 +149,48 @@
   }
 }
 
-# To run on device:
-# run vulkan-cts-executor --start-server=/pkg/bin/execserver --testset=dEQP-VK.* --caselistdir=/pkg/data/cases --out=/data/TestLog.qpa --info=/data/infolog.txt --binaryname=/pkg/bin/deqp-vk --workdir=/data
-# Note: the list of cases may include tests that aren't in vk-default.txt "mustpass".
-package("vulkan-cts-executor") {
-  deps = [
-    ":build",
-    ":execserver_build_id",
-    ":executor_build_id",
-    ":vulkan_cts_build_id",
-  ]
-
-  binaries = [
-    {
-      name = "executor"
-      source = "$root_out_dir/build-vulkancts/executor/executor"
-    },
-    {
-      name = "deqp-vk"
-      source = "$root_out_dir/build-vulkancts/external/vulkancts/modules/vulkan/deqp-vk"
-    },
-    {
-      name = "execserver"
-      source = "$root_out_dir/build-vulkancts/execserver/execserver"
-    },
-  ]
-  meta = [
-    {
-      path = rebase_path("meta/vulkan-cts-executor.cmx")
-      dest = "vulkan-cts-executor.cmx"
-    },
-  ]
-  resources = cts_resources
+# To run on device: run fuchsia-pkg://fuchsia.com/vulkan-cts#meta/vulkan-cts.cmx
+# The following command line args are provided by the cmx:
+# --deqp-caselist-file=/pkg/data/vk-default-1.1.3.txt --deqp-log-images=disable --deqp-log-shader-sources=disable --deqp-log-filename=/data/TestResults.qpa
+fuchsia_component("vulkan-cts-component") {
+  component_name = "vulkan-cts"
+  testonly = true
+  manifest = "meta/vulkan-cts.cmx"
+  deps = [ ":cts-deps" ]
 }
 
-# On device:
-# run vulkan-cts-execserver
-# Run on host:
-# executor/executor --connect=192.168.42.80 --testset=dEQP-VK.* --caselistdir=cases/ --binaryname=/pkg/bin/deqp-vk --workdir=/data --cmdline="--deqp-log-images=disable --deqp-log-shader-sources=disable"
-# Note: the list of cases may include tests that aren't in vk-default.txt "mustpass".
-package("vulkan-cts-execserver") {
-  deps = [
-    ":build",
-    ":execserver_build_id",
-    ":executor_build_id",
-    ":vulkan_cts_build_id",
-  ]
+fuchsia_component("vulkan-cts-zircon-component") {
+  testonly = true
+  component_name = "vulkan-cts-zircon"
+  manifest = "meta/vulkan-cts-zircon.cmx"
+  deps = [ ":cts-deps" ]
+}
 
-  binaries = [
-    {
-      name = "execserver"
-      source = "$root_out_dir/build-vulkancts/execserver/execserver"
-    },
-    {
-      name = "deqp-vk"
-      source = "$root_out_dir/build-vulkancts/external/vulkancts/modules/vulkan/deqp-vk"
-    },
-  ]
-  meta = [
-    {
-      path = rebase_path("meta/vulkan-cts-execserver.cmx")
-      dest = "vulkan-cts-execserver.cmx"
-    },
-  ]
-  resources = cts_resources
+fuchsia_component("vulkan-cts-no-args") {
+  testonly = true
+  manifest = "meta/vulkan-cts-no-args.cmx"
+  deps = [ ":cts-deps" ]
+}
+
+fuchsia_test_package("vulkan-cts-unified") {
+  test_components = [ ":vulkan-cts-component" ]
+  deps = [ ":vulkan-cts-no-args" ]
+  test_specs = {
+    environments = labeled_hardware_envs
+  }
+}
+
+fuchsia_test_package("vulkan-cts-zircon") {
+  test_components = [ ":vulkan-cts-zircon-component" ]
+  test_specs = {
+    environments = labeled_hardware_envs
+  }
 }
 
 group("fuchsia") {
   testonly = true
   public_deps = [
     ":vulkan-cts",
-    ":vulkan-cts-execserver",
-    ":vulkan-cts-executor",
-    "//garnet/packages/prod:vulkan",
+    "//src/graphics/bundles:vulkan",
   ]
 }
diff --git a/fuchsia/gen.py b/fuchsia/gen.py
index 3680ae3..cd7faf1 100644
--- a/fuchsia/gen.py
+++ b/fuchsia/gen.py
@@ -12,10 +12,10 @@
     """\
 ### NOTE: This file auto-generated from gen.py
 
-  cts_resources = [
+cts_resources = [
   {
-    path=rebase_path("../external/vulkancts/mustpass/master/vk-default.txt")
-    dest="vk-default.txt"
+    source = rebase_path("../external/vulkancts/mustpass/master/vk-default.txt")
+    dest = "data/vk-default.txt"
   },
 """)
 
@@ -27,11 +27,11 @@
     file_split = file.split("/")
     file_split = file_split[4:]
     out_file.write("  {\n")
-    out_file.write('    path=rebase_path("%s")\n' % file)
-    out_file.write('    dest="%s"\n' % "/".join(file_split))
+    out_file.write('    source = rebase_path("%s")\n' % file)
+    out_file.write('    dest = "data/%s"\n' % "/".join(file_split))
     out_file.write("  },\n")
 
-out_file.write("  ]\n")
+out_file.write("]\n")
 out_file.close()
 
 cts_version = "master"
@@ -89,38 +89,35 @@
     cts_file_list = cts_file_list[chunk_size:]
     cts_chunks.append(first_section)
 
-test_list = []
-meta_list = []
-resources_list = []
+component_list = []
+component_name_list = []
 for chunk_num in range(len(cts_chunks)):
-    test_list.append(
+    component_name = "vulkan-cts-%03d" % chunk_num
+    out_file.write(
         """
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-%03d"
-      environments = labeled_magma_hardware_envs
-    },""" % chunk_num)
-
-    meta_list.append(
-        """
-    {
-      path = rebase_path("meta/vulkan-cts-%03d.cmx")
-      dest = "vulkan-cts-%03d.cmx"
-    },""" % (chunk_num, chunk_num))
-    resources_list.append(
-        """
-    {
-      path = rebase_path("data/vulkan-%03d.txt")
-      dest = "vk-list-%03d.txt"
-    },""" % (chunk_num, chunk_num))
+resource("%s-data") {
+  sources = [ "data/vulkan-%03d.txt" ]
+  outputs = [ "data/vk-list-%03d.txt" ]
+}
+fuchsia_component("%s") {
+  testonly = true
+  manifest = "meta/%s.cmx"
+  deps = [
+    ":%s-data",
+    "..:cts-deps",
+  ]
+}
+""" % (
+            component_name, chunk_num, chunk_num, component_name,
+            component_name, component_name))
+    component_name_list.append('":' + component_name + '"')
 
 for current_index in range(len(cts_chunks)):
     with open("split-cts/data/vulkan-%03d.txt" % current_index, "w") as f:
         f.write("\n".join(cts_chunks[current_index]))
     with open("split-cts/meta/vulkan-cts-%03d.cmx" % current_index, "w") as f:
         f.write(
-            """
-{
+            """{
     "facets": {
         "fuchsia.test": {
             "system-services": [
@@ -138,50 +135,42 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-%03d"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
 }
-""" % (current_index, current_index))
+""" % (current_index))
 
+combined_component_list = "".join(
+    "    " + x + ",\n" for x in component_name_list)
 out_file.write(
     """
-package("vulkan-cts-split") {
-  testonly = true
-  deps = [
-    "..:copy",
-    "..:strip",
-    "..:vulkan_cts_build_id",
-  ]
-  tests = [%s
-  ]
-  meta = [%s
-  ]
-  resources = [%s
-  ]
-  resources += cts_resources
+fuchsia_test_package("vulkan-cts-split") {
+  test_components = [
+%s  ]
+  test_specs = {
+    environments = labeled_magma_hardware_envs
+  }
 }
 
 group("split-cts") {
   testonly = true
-  deps = [
-    ":vulkan-cts-split",
-  ]
+  deps = [ ":vulkan-cts-split" ]
 }
-""" % ("".join(test_list), "".join(meta_list), "".join(resources_list)))
+""" % (combined_component_list))
 
 out_file.close()
diff --git a/fuchsia/meta/vulkan-cts-zircon.cmx b/fuchsia/meta/vulkan-cts-zircon.cmx
index 282ccbb..a41e481 100644
--- a/fuchsia/meta/vulkan-cts-zircon.cmx
+++ b/fuchsia/meta/vulkan-cts-zircon.cmx
@@ -13,24 +13,24 @@
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
             "--deqp-log-filename=/tmp/TestResults.qpa",
-	    "--deqp-archive-dir=/pkg/data",
+            "--deqp-archive-dir=/pkg/data",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-zircon"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
             "isolated-persistent-storage",
-            "isolated-temp"
+            "isolated-temp",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/resources.gni b/fuchsia/resources.gni
index e17ec40..26d5edc 100644
--- a/fuchsia/resources.gni
+++ b/fuchsia/resources.gni
@@ -1,1432 +1,1798 @@
 ### NOTE: This file auto-generated from gen.py
 
-  cts_resources = [
+cts_resources = [
   {
-    path=rebase_path("../external/vulkancts/mustpass/master/vk-default.txt")
-    dest="vk-default.txt"
+    source = rebase_path("../external/vulkancts/mustpass/master/vk-default.txt")
+    dest = "data/vk-default.txt"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/.gitignore")
-    dest="vulkan/.gitignore"
+    source = rebase_path("../external/vulkancts/data/vulkan/.gitignore")
+    dest = "data/vulkan/.gitignore"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/example/clear.amber")
-    dest="vulkan/amber/example/clear.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/example/clear.amber")
+    dest = "data/vulkan/amber/example/clear.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/access-new-vector-inside-if-condition.amber")
-    dest="vulkan/amber/graphicsfuzz/access-new-vector-inside-if-condition.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/access-new-vector-inside-if-condition.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/access-new-vector-inside-if-condition.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/always-false-if-in-do-while.amber")
-    dest="vulkan/amber/graphicsfuzz/always-false-if-in-do-while.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/always-false-if-in-do-while.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/always-false-if-in-do-while.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/always-false-if-with-discard-return.amber")
-    dest="vulkan/amber/graphicsfuzz/always-false-if-with-discard-return.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/always-false-if-with-discard-return.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/always-false-if-with-discard-return.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/barrier-in-loop-with-break.amber")
-    dest="vulkan/amber/graphicsfuzz/barrier-in-loop-with-break.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/barrier-in-loop-with-break.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/barrier-in-loop-with-break.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/break-in-do-while-with-nested-if.amber")
-    dest="vulkan/amber/graphicsfuzz/break-in-do-while-with-nested-if.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/break-in-do-while-with-nested-if.amber")
+    dest =
+        "data/vulkan/amber/graphicsfuzz/break-in-do-while-with-nested-if.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/call-if-while-switch.amber")
-    dest="vulkan/amber/graphicsfuzz/call-if-while-switch.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/call-if-while-switch.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/call-if-while-switch.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/color-write-in-loop.amber")
-    dest="vulkan/amber/graphicsfuzz/color-write-in-loop.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/color-write-in-loop.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/color-write-in-loop.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/complex-nested-loops-and-call.amber")
-    dest="vulkan/amber/graphicsfuzz/complex-nested-loops-and-call.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/complex-nested-loops-and-call.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/complex-nested-loops-and-call.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/conditional-return-in-infinite-while.amber")
-    dest="vulkan/amber/graphicsfuzz/conditional-return-in-infinite-while.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/conditional-return-in-infinite-while.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/conditional-return-in-infinite-while.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/continue-and-merge.amber")
-    dest="vulkan/amber/graphicsfuzz/continue-and-merge.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/continue-and-merge.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/continue-and-merge.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/control-flow-in-function.amber")
-    dest="vulkan/amber/graphicsfuzz/control-flow-in-function.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/control-flow-in-function.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/control-flow-in-function.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/control-flow-switch.amber")
-    dest="vulkan/amber/graphicsfuzz/control-flow-switch.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/control-flow-switch.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/control-flow-switch.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/dead-barriers-in-loops.amber")
-    dest="vulkan/amber/graphicsfuzz/dead-barriers-in-loops.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/dead-barriers-in-loops.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/dead-barriers-in-loops.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/dead-struct-init.amber")
-    dest="vulkan/amber/graphicsfuzz/dead-struct-init.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/dead-struct-init.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/dead-struct-init.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/disc-and-add-in-func-in-loop.amber")
-    dest="vulkan/amber/graphicsfuzz/disc-and-add-in-func-in-loop.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/disc-and-add-in-func-in-loop.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/disc-and-add-in-func-in-loop.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/discard-continue-return.amber")
-    dest="vulkan/amber/graphicsfuzz/discard-continue-return.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/discard-continue-return.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/discard-continue-return.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/discard-in-array-manipulating-loop.amber")
-    dest="vulkan/amber/graphicsfuzz/discard-in-array-manipulating-loop.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/discard-in-array-manipulating-loop.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/discard-in-array-manipulating-loop.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/discard-in-loop-in-function.amber")
-    dest="vulkan/amber/graphicsfuzz/discard-in-loop-in-function.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/discard-in-loop-in-function.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/discard-in-loop-in-function.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/discard-in-loop.amber")
-    dest="vulkan/amber/graphicsfuzz/discard-in-loop.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/discard-in-loop.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/discard-in-loop.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/discards-in-control-flow.amber")
-    dest="vulkan/amber/graphicsfuzz/discards-in-control-flow.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/discards-in-control-flow.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/discards-in-control-flow.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/do-while-loop-in-conditionals.amber")
-    dest="vulkan/amber/graphicsfuzz/do-while-loop-in-conditionals.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/do-while-loop-in-conditionals.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/do-while-loop-in-conditionals.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/do-while-with-always-true-if.amber")
-    dest="vulkan/amber/graphicsfuzz/do-while-with-always-true-if.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/do-while-with-always-true-if.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/do-while-with-always-true-if.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/early-return-and-barrier.amber")
-    dest="vulkan/amber/graphicsfuzz/early-return-and-barrier.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/early-return-and-barrier.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/early-return-and-barrier.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/for-condition-always-false.amber")
-    dest="vulkan/amber/graphicsfuzz/for-condition-always-false.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/for-condition-always-false.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/for-condition-always-false.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/for-loop-with-return.amber")
-    dest="vulkan/amber/graphicsfuzz/for-loop-with-return.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/for-loop-with-return.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/for-loop-with-return.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/for-with-ifs-and-return.amber")
-    dest="vulkan/amber/graphicsfuzz/for-with-ifs-and-return.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/for-with-ifs-and-return.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/for-with-ifs-and-return.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/fragcoord-control-flow-2.amber")
-    dest="vulkan/amber/graphicsfuzz/fragcoord-control-flow-2.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/fragcoord-control-flow-2.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/fragcoord-control-flow-2.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/fragcoord-control-flow.amber")
-    dest="vulkan/amber/graphicsfuzz/fragcoord-control-flow.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/fragcoord-control-flow.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/fragcoord-control-flow.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/if-and-switch.amber")
-    dest="vulkan/amber/graphicsfuzz/if-and-switch.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/if-and-switch.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/if-and-switch.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/index.txt")
-    dest="vulkan/amber/graphicsfuzz/index.txt"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/index.txt")
+    dest = "data/vulkan/amber/graphicsfuzz/index.txt"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/int-mat2-struct.amber")
-    dest="vulkan/amber/graphicsfuzz/int-mat2-struct.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/int-mat2-struct.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/int-mat2-struct.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/loop-call-discard.amber")
-    dest="vulkan/amber/graphicsfuzz/loop-call-discard.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/loop-call-discard.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/loop-call-discard.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/loop-dead-if-loop.amber")
-    dest="vulkan/amber/graphicsfuzz/loop-dead-if-loop.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/loop-dead-if-loop.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/loop-dead-if-loop.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/loop-nested-ifs.amber")
-    dest="vulkan/amber/graphicsfuzz/loop-nested-ifs.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/loop-nested-ifs.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/loop-nested-ifs.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/loops-breaks-returns.amber")
-    dest="vulkan/amber/graphicsfuzz/loops-breaks-returns.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/loops-breaks-returns.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/loops-breaks-returns.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/loops-ifs-continues-call.amber")
-    dest="vulkan/amber/graphicsfuzz/loops-ifs-continues-call.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/loops-ifs-continues-call.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/loops-ifs-continues-call.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/mat-array-deep-control-flow.amber")
-    dest="vulkan/amber/graphicsfuzz/mat-array-deep-control-flow.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/mat-array-deep-control-flow.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/mat-array-deep-control-flow.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/mat-array-distance.amber")
-    dest="vulkan/amber/graphicsfuzz/mat-array-distance.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/mat-array-distance.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/mat-array-distance.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/mat-mul-in-loop.amber")
-    dest="vulkan/amber/graphicsfuzz/mat-mul-in-loop.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/mat-mul-in-loop.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/mat-mul-in-loop.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/matrices-and-return-in-loop.amber")
-    dest="vulkan/amber/graphicsfuzz/matrices-and-return-in-loop.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/matrices-and-return-in-loop.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/matrices-and-return-in-loop.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/max-mix-conditional-discard.amber")
-    dest="vulkan/amber/graphicsfuzz/max-mix-conditional-discard.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/max-mix-conditional-discard.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/max-mix-conditional-discard.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/mix-floor-add.amber")
-    dest="vulkan/amber/graphicsfuzz/mix-floor-add.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/mix-floor-add.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/mix-floor-add.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/modf-gl-color.amber")
-    dest="vulkan/amber/graphicsfuzz/modf-gl-color.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/modf-gl-color.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/modf-gl-color.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/modf-temp-modf-color.amber")
-    dest="vulkan/amber/graphicsfuzz/modf-temp-modf-color.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/modf-temp-modf-color.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/modf-temp-modf-color.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/nested-for-loops-with-return.amber")
-    dest="vulkan/amber/graphicsfuzz/nested-for-loops-with-return.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/nested-for-loops-with-return.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/nested-for-loops-with-return.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/nested-ifs-and-return-in-for-loop.amber")
-    dest="vulkan/amber/graphicsfuzz/nested-ifs-and-return-in-for-loop.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/nested-ifs-and-return-in-for-loop.amber")
+    dest =
+        "data/vulkan/amber/graphicsfuzz/nested-ifs-and-return-in-for-loop.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/nested-loops-switch.amber")
-    dest="vulkan/amber/graphicsfuzz/nested-loops-switch.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/nested-loops-switch.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/nested-loops-switch.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/pow-vec4.amber")
-    dest="vulkan/amber/graphicsfuzz/pow-vec4.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/pow-vec4.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/pow-vec4.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/return-before-writing-wrong-color.amber")
-    dest="vulkan/amber/graphicsfuzz/return-before-writing-wrong-color.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/return-before-writing-wrong-color.amber")
+    dest =
+        "data/vulkan/amber/graphicsfuzz/return-before-writing-wrong-color.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/return-float-from-while-loop.amber")
-    dest="vulkan/amber/graphicsfuzz/return-float-from-while-loop.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/return-float-from-while-loop.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/return-float-from-while-loop.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/return-in-loop-in-function.amber")
-    dest="vulkan/amber/graphicsfuzz/return-in-loop-in-function.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/return-in-loop-in-function.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/return-in-loop-in-function.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/returned-boolean-in-vector.amber")
-    dest="vulkan/amber/graphicsfuzz/returned-boolean-in-vector.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/returned-boolean-in-vector.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/returned-boolean-in-vector.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/similar-nested-ifs.amber")
-    dest="vulkan/amber/graphicsfuzz/similar-nested-ifs.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/similar-nested-ifs.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/similar-nested-ifs.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/smoothstep-after-loop.amber")
-    dest="vulkan/amber/graphicsfuzz/smoothstep-after-loop.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/smoothstep-after-loop.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/smoothstep-after-loop.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/struct-and-unreachable-infinite-loop.amber")
-    dest="vulkan/amber/graphicsfuzz/struct-and-unreachable-infinite-loop.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/struct-and-unreachable-infinite-loop.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/struct-and-unreachable-infinite-loop.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/struct-controlled-loop.amber")
-    dest="vulkan/amber/graphicsfuzz/struct-controlled-loop.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/struct-controlled-loop.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/struct-controlled-loop.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/struct-used-as-temporary.amber")
-    dest="vulkan/amber/graphicsfuzz/struct-used-as-temporary.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/struct-used-as-temporary.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/struct-used-as-temporary.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/switch-if-discard.amber")
-    dest="vulkan/amber/graphicsfuzz/switch-if-discard.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/switch-if-discard.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/switch-if-discard.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/switch-with-empty-if-false.amber")
-    dest="vulkan/amber/graphicsfuzz/switch-with-empty-if-false.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/switch-with-empty-if-false.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/switch-with-empty-if-false.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/swizzle-struct-init-min.amber")
-    dest="vulkan/amber/graphicsfuzz/swizzle-struct-init-min.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/swizzle-struct-init-min.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/swizzle-struct-init-min.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/transpose-rectangular-matrix.amber")
-    dest="vulkan/amber/graphicsfuzz/transpose-rectangular-matrix.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/transpose-rectangular-matrix.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/transpose-rectangular-matrix.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/two-2-iteration-loops.amber")
-    dest="vulkan/amber/graphicsfuzz/two-2-iteration-loops.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/two-2-iteration-loops.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/two-2-iteration-loops.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/two-for-loops-with-barrier-function.amber")
-    dest="vulkan/amber/graphicsfuzz/two-for-loops-with-barrier-function.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/two-for-loops-with-barrier-function.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/two-for-loops-with-barrier-function.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/two-loops-matrix.amber")
-    dest="vulkan/amber/graphicsfuzz/two-loops-matrix.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/two-loops-matrix.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/two-loops-matrix.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/two-loops-set-struct.amber")
-    dest="vulkan/amber/graphicsfuzz/two-loops-set-struct.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/two-loops-set-struct.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/two-loops-set-struct.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/two-loops-with-break.amber")
-    dest="vulkan/amber/graphicsfuzz/two-loops-with-break.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/two-loops-with-break.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/two-loops-with-break.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/two-nested-do-whiles.amber")
-    dest="vulkan/amber/graphicsfuzz/two-nested-do-whiles.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/two-nested-do-whiles.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/two-nested-do-whiles.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/two-nested-for-loops-with-returns.amber")
-    dest="vulkan/amber/graphicsfuzz/two-nested-for-loops-with-returns.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/two-nested-for-loops-with-returns.amber")
+    dest =
+        "data/vulkan/amber/graphicsfuzz/two-nested-for-loops-with-returns.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/two-nested-infinite-loops-discard.amber")
-    dest="vulkan/amber/graphicsfuzz/two-nested-infinite-loops-discard.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/two-nested-infinite-loops-discard.amber")
+    dest =
+        "data/vulkan/amber/graphicsfuzz/two-nested-infinite-loops-discard.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/undefined-assign-in-infinite-loop.amber")
-    dest="vulkan/amber/graphicsfuzz/undefined-assign-in-infinite-loop.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/undefined-assign-in-infinite-loop.amber")
+    dest =
+        "data/vulkan/amber/graphicsfuzz/undefined-assign-in-infinite-loop.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/undefined-integer-in-function.amber")
-    dest="vulkan/amber/graphicsfuzz/undefined-integer-in-function.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/undefined-integer-in-function.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/undefined-integer-in-function.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/uninit-element-cast-in-loop.amber")
-    dest="vulkan/amber/graphicsfuzz/uninit-element-cast-in-loop.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/uninit-element-cast-in-loop.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/uninit-element-cast-in-loop.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/uninitialized-var-decrement-and-add.amber")
-    dest="vulkan/amber/graphicsfuzz/uninitialized-var-decrement-and-add.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/uninitialized-var-decrement-and-add.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/uninitialized-var-decrement-and-add.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/unreachable-barrier-in-loops.amber")
-    dest="vulkan/amber/graphicsfuzz/unreachable-barrier-in-loops.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/unreachable-barrier-in-loops.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/unreachable-barrier-in-loops.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/unreachable-continue-statement.amber")
-    dest="vulkan/amber/graphicsfuzz/unreachable-continue-statement.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/unreachable-continue-statement.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/unreachable-continue-statement.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/unreachable-discard-statement-in-if.amber")
-    dest="vulkan/amber/graphicsfuzz/unreachable-discard-statement-in-if.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/unreachable-discard-statement-in-if.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/unreachable-discard-statement-in-if.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/unreachable-discard-statement.amber")
-    dest="vulkan/amber/graphicsfuzz/unreachable-discard-statement.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/unreachable-discard-statement.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/unreachable-discard-statement.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/unreachable-loops-in-switch.amber")
-    dest="vulkan/amber/graphicsfuzz/unreachable-loops-in-switch.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/unreachable-loops-in-switch.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/unreachable-loops-in-switch.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/unreachable-loops.amber")
-    dest="vulkan/amber/graphicsfuzz/unreachable-loops.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/unreachable-loops.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/unreachable-loops.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/unreachable-return-in-loop.amber")
-    dest="vulkan/amber/graphicsfuzz/unreachable-return-in-loop.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/unreachable-return-in-loop.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/unreachable-return-in-loop.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/unreachable-switch-case-with-discards.amber")
-    dest="vulkan/amber/graphicsfuzz/unreachable-switch-case-with-discards.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/unreachable-switch-case-with-discards.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/unreachable-switch-case-with-discards.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/while-function-always-false.amber")
-    dest="vulkan/amber/graphicsfuzz/while-function-always-false.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/while-function-always-false.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/while-function-always-false.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/while-inside-switch.amber")
-    dest="vulkan/amber/graphicsfuzz/while-inside-switch.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/while-inside-switch.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/while-inside-switch.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/write-before-break.amber")
-    dest="vulkan/amber/graphicsfuzz/write-before-break.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/write-before-break.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/write-before-break.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/write-red-after-search.amber")
-    dest="vulkan/amber/graphicsfuzz/write-red-after-search.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/write-red-after-search.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/write-red-after-search.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/write-red-in-loop-nest.amber")
-    dest="vulkan/amber/graphicsfuzz/write-red-in-loop-nest.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/write-red-in-loop-nest.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/write-red-in-loop-nest.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/graphicsfuzz/wrong-color-in-always-false-if.amber")
-    dest="vulkan/amber/graphicsfuzz/wrong-color-in-always-false-if.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/graphicsfuzz/wrong-color-in-always-false-if.amber")
+    dest = "data/vulkan/amber/graphicsfuzz/wrong-color-in-always-false-if.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/pipeline/vertex_only/position_to_ssbo.amber")
-    dest="vulkan/amber/pipeline/vertex_only/position_to_ssbo.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/pipeline/vertex_only/position_to_ssbo.amber")
+    dest = "data/vulkan/amber/pipeline/vertex_only/position_to_ssbo.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/provoking_vertex/line_list.amber")
-    dest="vulkan/amber/provoking_vertex/line_list.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/provoking_vertex/line_list.amber")
+    dest = "data/vulkan/amber/provoking_vertex/line_list.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/provoking_vertex/line_list_with_adjacency.amber")
-    dest="vulkan/amber/provoking_vertex/line_list_with_adjacency.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/provoking_vertex/line_list_with_adjacency.amber")
+    dest = "data/vulkan/amber/provoking_vertex/line_list_with_adjacency.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/provoking_vertex/line_strip.amber")
-    dest="vulkan/amber/provoking_vertex/line_strip.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/provoking_vertex/line_strip.amber")
+    dest = "data/vulkan/amber/provoking_vertex/line_strip.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/provoking_vertex/line_strip_with_adjacency.amber")
-    dest="vulkan/amber/provoking_vertex/line_strip_with_adjacency.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/provoking_vertex/line_strip_with_adjacency.amber")
+    dest = "data/vulkan/amber/provoking_vertex/line_strip_with_adjacency.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_fan.amber")
-    dest="vulkan/amber/provoking_vertex/triangle_fan.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_fan.amber")
+    dest = "data/vulkan/amber/provoking_vertex/triangle_fan.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_list.amber")
-    dest="vulkan/amber/provoking_vertex/triangle_list.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_list.amber")
+    dest = "data/vulkan/amber/provoking_vertex/triangle_list.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_list_with_adjacency.amber")
-    dest="vulkan/amber/provoking_vertex/triangle_list_with_adjacency.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_list_with_adjacency.amber")
+    dest =
+        "data/vulkan/amber/provoking_vertex/triangle_list_with_adjacency.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_strip.amber")
-    dest="vulkan/amber/provoking_vertex/triangle_strip.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_strip.amber")
+    dest = "data/vulkan/amber/provoking_vertex/triangle_strip.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_strip_with_adjacency.amber")
-    dest="vulkan/amber/provoking_vertex/triangle_strip_with_adjacency.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_strip_with_adjacency.amber")
+    dest =
+        "data/vulkan/amber/provoking_vertex/triangle_strip_with_adjacency.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup_bad_stride.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup_bad_stride.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup_bad_stride.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup_bad_stride.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup_no_stride.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup_no_stride.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup_no_stride.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup_no_stride.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/comp_pc_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/comp_pc_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/comp_pc_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/comp_pc_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/comp_ssbo_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/comp_ssbo_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/comp_ssbo_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/comp_ssbo_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/comp_ubo_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/comp_ubo_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/comp_ubo_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/comp_ubo_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/comp_workgroup_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/comp_workgroup_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/comp_workgroup_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/comp_workgroup_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/frag_pc_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/frag_pc_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/frag_pc_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/frag_pc_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/frag_ssbo_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/frag_ssbo_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/frag_ssbo_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/frag_ssbo_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/frag_ubo_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/frag_ubo_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/frag_ubo_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/frag_ubo_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/geom_pc_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/geom_pc_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/geom_pc_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/geom_pc_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/geom_ssbo_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/geom_ssbo_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/geom_ssbo_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/geom_ssbo_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/geom_ubo_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/geom_ubo_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/geom_ubo_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/geom_ubo_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_pc_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_pc_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_pc_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_pc_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_ssbo_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_ssbo_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_ssbo_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_ssbo_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_ubo_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_ubo_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_ubo_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_ubo_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_pc_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_pc_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_pc_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_pc_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_ssbo_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_ssbo_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_ssbo_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_ssbo_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_ubo_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_ubo_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_ubo_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_ubo_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_pc_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_pc_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_pc_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_pc_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_ssbo_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_ssbo_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_ssbo_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_ssbo_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_ubo_entry_point.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_ubo_entry_point.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_ubo_entry_point.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_ubo_entry_point.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/hlsl_functionality1/counter_buffer.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/hlsl_functionality1/counter_buffer.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/hlsl_functionality1/counter_buffer.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/hlsl_functionality1/counter_buffer.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/hlsl_functionality1/decorate_string.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/hlsl_functionality1/decorate_string.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/hlsl_functionality1/decorate_string.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/hlsl_functionality1/decorate_string.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/iteration_multiple.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/iteration_multiple.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/iteration_multiple.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/iteration_multiple.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/max_iterations.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/max_iterations.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/max_iterations.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/max_iterations.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/min_iterations.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/min_iterations.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/min_iterations.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/min_iterations.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/partial_count.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/partial_count.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/partial_count.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/partial_count.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/peel_count.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/peel_count.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/peel_count.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/loop_control/peel_count.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/function_2_nonwritable.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/function_2_nonwritable.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/function_2_nonwritable.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/function_2_nonwritable.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/function_nonwritable.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/function_nonwritable.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/function_nonwritable.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/function_nonwritable.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/non_main_function_nonwritable.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/non_main_function_nonwritable.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/non_main_function_nonwritable.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/non_main_function_nonwritable.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/private_2_nonwritable.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/private_2_nonwritable.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/private_2_nonwritable.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/private_2_nonwritable.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/private_nonwritable.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/private_nonwritable.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/private_nonwritable.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/nonwritable/private_nonwritable.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/different_matrix_layout.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/different_matrix_layout.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/different_matrix_layout.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/different_matrix_layout.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/different_matrix_strides.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/different_matrix_strides.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/different_matrix_strides.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/different_matrix_strides.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/nested_arrays_different_inner_stride.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/nested_arrays_different_inner_stride.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/nested_arrays_different_inner_stride.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/nested_arrays_different_inner_stride.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/nested_arrays_different_outer_stride.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/nested_arrays_different_outer_stride.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/nested_arrays_different_outer_stride.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/nested_arrays_different_outer_stride.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/nested_arrays_different_strides.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/nested_arrays_different_strides.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/nested_arrays_different_strides.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/nested_arrays_different_strides.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/same_array_two_ids.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/same_array_two_ids.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/same_array_two_ids.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/same_array_two_ids.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/same_struct_two_ids.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/same_struct_two_ids.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/same_struct_two_ids.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/same_struct_two_ids.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/ssbo_to_ubo.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/ssbo_to_ubo.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/ssbo_to_ubo.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/ssbo_to_ubo.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/two_arrays_different_stride_1.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/two_arrays_different_stride_1.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/two_arrays_different_stride_1.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/two_arrays_different_stride_1.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/two_arrays_different_stride_2.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/two_arrays_different_stride_2.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/two_arrays_different_stride_2.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/two_arrays_different_stride_2.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/ubo_to_ssbo.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/ubo_to_ssbo.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/ubo_to_ssbo.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/ubo_to_ssbo.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopymemory/different_alignments.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopymemory/different_alignments.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopymemory/different_alignments.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopymemory/different_alignments.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopymemory/no_source_access_operands.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopymemory/no_source_access_operands.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopymemory/no_source_access_operands.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopymemory/no_source_access_operands.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopymemory/no_target_access_operands.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopymemory/no_target_access_operands.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopymemory/no_target_access_operands.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopymemory/no_target_access_operands.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/ssbo_comparisons_diff.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/ssbo_comparisons_diff.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/ssbo_comparisons_diff.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/ssbo_comparisons_diff.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/variable_pointers_vars_ssbo_2_diff.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/variable_pointers_vars_ssbo_2_diff.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/variable_pointers_vars_ssbo_2_diff.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/variable_pointers_vars_ssbo_2_diff.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/variable_pointers_vars_ssbo_diff.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/variable_pointers_vars_ssbo_diff.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/variable_pointers_vars_ssbo_diff.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/variable_pointers_vars_ssbo_diff.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/variable_pointers_vars_wg_diff.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/variable_pointers_vars_wg_diff.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/variable_pointers_vars_wg_diff.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/variable_pointers_vars_wg_diff.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/wg_comparisons_diff.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/wg_comparisons_diff.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/wg_comparisons_diff.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrdiff/wg_comparisons_diff.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/different_ssbos_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/different_ssbos_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/different_ssbos_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/different_ssbos_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/different_wgs_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/different_wgs_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/different_wgs_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/different_wgs_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/null_comparisons_ssbo_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/null_comparisons_ssbo_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/null_comparisons_ssbo_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/null_comparisons_ssbo_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/null_comparisons_wg_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/null_comparisons_wg_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/null_comparisons_wg_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/null_comparisons_wg_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/ssbo_comparisons_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/ssbo_comparisons_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/ssbo_comparisons_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/ssbo_comparisons_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_ssbo_2_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_ssbo_2_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_ssbo_2_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_ssbo_2_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_ssbo_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_ssbo_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_ssbo_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_ssbo_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_vars_ssbo_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_vars_ssbo_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_vars_ssbo_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_vars_ssbo_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_vars_wg_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_vars_wg_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_vars_wg_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_vars_wg_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_wg_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_wg_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_wg_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/variable_pointers_wg_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/wg_comparisons_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/wg_comparisons_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/wg_comparisons_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrequal/wg_comparisons_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/different_ssbos_not_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/different_ssbos_not_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/different_ssbos_not_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/different_ssbos_not_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/different_wgs_not_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/different_wgs_not_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/different_wgs_not_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/different_wgs_not_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/null_comparisons_ssbo_not_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/null_comparisons_ssbo_not_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/null_comparisons_ssbo_not_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/null_comparisons_ssbo_not_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/null_comparisons_wg_not_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/null_comparisons_wg_not_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/null_comparisons_wg_not_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/null_comparisons_wg_not_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/ssbo_comparisons_not_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/ssbo_comparisons_not_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/ssbo_comparisons_not_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/ssbo_comparisons_not_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_ssbo_2_not_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_ssbo_2_not_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_ssbo_2_not_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_ssbo_2_not_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_ssbo_not_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_ssbo_not_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_ssbo_not_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_ssbo_not_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_vars_ssbo_not_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_vars_ssbo_not_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_vars_ssbo_not_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_vars_ssbo_not_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_vars_wg_not_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_vars_wg_not_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_vars_wg_not_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_vars_wg_not_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_wg_not_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_wg_not_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_wg_not_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/variable_pointers_wg_not_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/wg_comparisons_not_equal.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/wg_comparisons_not_equal.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/wg_comparisons_not_equal.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opptrnotequal/wg_comparisons_not_equal.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/array_select.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/array_select.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/array_select.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/array_select.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/array_stride_select.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/array_stride_select.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/array_stride_select.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/array_stride_select.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/nested_array_select.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/nested_array_select.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/nested_array_select.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/nested_array_select.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/nested_struct_select.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/nested_struct_select.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/nested_struct_select.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/nested_struct_select.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/scalar_select.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/scalar_select.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/scalar_select.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/scalar_select.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/ssbo_pointers_2_select.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/ssbo_pointers_2_select.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/ssbo_pointers_2_select.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/ssbo_pointers_2_select.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/ssbo_pointers_select.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/ssbo_pointers_select.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/ssbo_pointers_select.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/ssbo_pointers_select.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/struct_select.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/struct_select.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/struct_select.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/struct_select.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/vector_element_select.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/vector_element_select.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/vector_element_select.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/vector_element_select.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/vector_select.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/vector_select.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/vector_select.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/vector_select.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/wg_pointers_2_select.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/wg_pointers_2_select.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/wg_pointers_2_select.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/wg_pointers_2_select.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/wg_pointers_select.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/wg_pointers_select.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/wg_pointers_select.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opselect/wg_pointers_select.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_extend_16.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_extend_16.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_extend_16.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_extend_16.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_extend_16_64_bit.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_extend_16_64_bit.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_extend_16_64_bit.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_extend_16_64_bit.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_extend_251658240_64_bits.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_extend_251658240_64_bits.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_extend_251658240_64_bits.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_extend_251658240_64_bits.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_extend_61440.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_extend_61440.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_extend_61440.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_extend_61440.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_truncate_16.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_truncate_16.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_truncate_16.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_truncate_16.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_truncate_16_64_bit.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_truncate_16_64_bit.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_truncate_16_64_bit.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_truncate_16_64_bit.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_truncate_983040.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_truncate_983040.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_truncate_983040.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_truncate_983040.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_zero_extend_n4096.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_zero_extend_n4096.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_zero_extend_n4096.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uconvert/spec_const_opt_zero_extend_n4096.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/partially_active_uniform_id.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/partially_active_uniform_id.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/partially_active_uniform_id.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/partially_active_uniform_id.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/subgroup_cfg_uniform_id.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/subgroup_cfg_uniform_id.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/subgroup_cfg_uniform_id.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/subgroup_cfg_uniform_id.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/subgroup_uniform.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/subgroup_uniform.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/subgroup_uniform.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/subgroup_uniform.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/workgroup_cfg_uniform_id.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/workgroup_cfg_uniform_id.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/workgroup_cfg_uniform_id.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/workgroup_cfg_uniform_id.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/workgroup_uniform.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/workgroup_uniform.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/workgroup_uniform.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/uniformid/workgroup_uniform.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/wrap/no_signed_wrap.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/wrap/no_signed_wrap.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/wrap/no_signed_wrap.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/wrap/no_signed_wrap.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/wrap/no_unsigned_wrap.amber")
-    dest="vulkan/amber/spirv_assembly/instruction/spirv1p4/wrap/no_unsigned_wrap.amber"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/wrap/no_unsigned_wrap.amber")
+    dest = "data/vulkan/amber/spirv_assembly/instruction/spirv1p4/wrap/no_unsigned_wrap.amber"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/brick.png")
-    dest="vulkan/data/brick.png"
+    source = rebase_path("../external/vulkancts/data/vulkan/data/brick.png")
+    dest = "data/vulkan/data/brick.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/device_group/sphere.png")
-    dest="vulkan/data/device_group/sphere.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/device_group/sphere.png")
+    dest = "data/vulkan/data/device_group/sphere.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/device_group/spherefilled.png")
-    dest="vulkan/data/device_group/spherefilled.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/device_group/spherefilled.png")
+    dest = "data/vulkan/data/device_group/spherefilled.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/line_strip.png")
-    dest="vulkan/data/geometry/line_strip.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/line_strip.png")
+    dest = "data/vulkan/data/geometry/line_strip.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/line_strip_adjacency.png")
-    dest="vulkan/data/geometry/line_strip_adjacency.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/line_strip_adjacency.png")
+    dest = "data/vulkan/data/geometry/line_strip_adjacency.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/line_strip_emit_0_end_0.png")
-    dest="vulkan/data/geometry/line_strip_emit_0_end_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/line_strip_emit_0_end_0.png")
+    dest = "data/vulkan/data/geometry/line_strip_emit_0_end_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/line_strip_emit_0_end_1.png")
-    dest="vulkan/data/geometry/line_strip_emit_0_end_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/line_strip_emit_0_end_1.png")
+    dest = "data/vulkan/data/geometry/line_strip_emit_0_end_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/line_strip_emit_0_end_2.png")
-    dest="vulkan/data/geometry/line_strip_emit_0_end_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/line_strip_emit_0_end_2.png")
+    dest = "data/vulkan/data/geometry/line_strip_emit_0_end_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/line_strip_emit_1_end_1.png")
-    dest="vulkan/data/geometry/line_strip_emit_1_end_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/line_strip_emit_1_end_1.png")
+    dest = "data/vulkan/data/geometry/line_strip_emit_1_end_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/line_strip_emit_1_end_2.png")
-    dest="vulkan/data/geometry/line_strip_emit_1_end_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/line_strip_emit_1_end_2.png")
+    dest = "data/vulkan/data/geometry/line_strip_emit_1_end_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/line_strip_emit_2_end_1.png")
-    dest="vulkan/data/geometry/line_strip_emit_2_end_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/line_strip_emit_2_end_1.png")
+    dest = "data/vulkan/data/geometry/line_strip_emit_2_end_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/line_strip_emit_2_end_2.png")
-    dest="vulkan/data/geometry/line_strip_emit_2_end_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/line_strip_emit_2_end_2.png")
+    dest = "data/vulkan/data/geometry/line_strip_emit_2_end_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/line_strip_emit_2_end_2_emit_2_end_0.png")
-    dest="vulkan/data/geometry/line_strip_emit_2_end_2_emit_2_end_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/line_strip_emit_2_end_2_emit_2_end_0.png")
+    dest = "data/vulkan/data/geometry/line_strip_emit_2_end_2_emit_2_end_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/lines.png")
-    dest="vulkan/data/geometry/lines.png"
+    source =
+        rebase_path("../external/vulkancts/data/vulkan/data/geometry/lines.png")
+    dest = "data/vulkan/data/geometry/lines.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/lines_adjacency.png")
-    dest="vulkan/data/geometry/lines_adjacency.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/lines_adjacency.png")
+    dest = "data/vulkan/data/geometry/lines_adjacency.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/lines_to_points.png")
-    dest="vulkan/data/geometry/lines_to_points.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/lines_to_points.png")
+    dest = "data/vulkan/data/geometry/lines_to_points.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/lines_to_triangles.png")
-    dest="vulkan/data/geometry/lines_to_triangles.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/lines_to_triangles.png")
+    dest = "data/vulkan/data/geometry/lines_to_triangles.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/output_0_and_128.png")
-    dest="vulkan/data/geometry/output_0_and_128.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/output_0_and_128.png")
+    dest = "data/vulkan/data/geometry/output_0_and_128.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/output_10.png")
-    dest="vulkan/data/geometry/output_10.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/output_10.png")
+    dest = "data/vulkan/data/geometry/output_10.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/output_100_and_10.png")
-    dest="vulkan/data/geometry/output_100_and_10.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/output_100_and_10.png")
+    dest = "data/vulkan/data/geometry/output_100_and_10.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/output_10_and_100.png")
-    dest="vulkan/data/geometry/output_10_and_100.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/output_10_and_100.png")
+    dest = "data/vulkan/data/geometry/output_10_and_100.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/output_128.png")
-    dest="vulkan/data/geometry/output_128.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/output_128.png")
+    dest = "data/vulkan/data/geometry/output_128.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/output_128_and_0.png")
-    dest="vulkan/data/geometry/output_128_and_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/output_128_and_0.png")
+    dest = "data/vulkan/data/geometry/output_128_and_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/output_max.png")
-    dest="vulkan/data/geometry/output_max.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/output_max.png")
+    dest = "data/vulkan/data/geometry/output_max.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/output_vary_by_attribute.png")
-    dest="vulkan/data/geometry/output_vary_by_attribute.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/output_vary_by_attribute.png")
+    dest = "data/vulkan/data/geometry/output_vary_by_attribute.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/output_vary_by_attribute_instancing.png")
-    dest="vulkan/data/geometry/output_vary_by_attribute_instancing.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/output_vary_by_attribute_instancing.png")
+    dest = "data/vulkan/data/geometry/output_vary_by_attribute_instancing.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/output_vary_by_texture.png")
-    dest="vulkan/data/geometry/output_vary_by_texture.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/output_vary_by_texture.png")
+    dest = "data/vulkan/data/geometry/output_vary_by_texture.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/output_vary_by_texture_instancing.png")
-    dest="vulkan/data/geometry/output_vary_by_texture_instancing.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/output_vary_by_texture_instancing.png")
+    dest = "data/vulkan/data/geometry/output_vary_by_texture_instancing.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/output_vary_by_uniform.png")
-    dest="vulkan/data/geometry/output_vary_by_uniform.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/output_vary_by_uniform.png")
+    dest = "data/vulkan/data/geometry/output_vary_by_uniform.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/output_vary_by_uniform_instancing.png")
-    dest="vulkan/data/geometry/output_vary_by_uniform_instancing.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/output_vary_by_uniform_instancing.png")
+    dest = "data/vulkan/data/geometry/output_vary_by_uniform_instancing.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/point_size.png")
-    dest="vulkan/data/geometry/point_size.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/point_size.png")
+    dest = "data/vulkan/data/geometry/point_size.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/points.png")
-    dest="vulkan/data/geometry/points.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/points.png")
+    dest = "data/vulkan/data/geometry/points.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/points_emit_0_end_0.png")
-    dest="vulkan/data/geometry/points_emit_0_end_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/points_emit_0_end_0.png")
+    dest = "data/vulkan/data/geometry/points_emit_0_end_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/points_emit_0_end_1.png")
-    dest="vulkan/data/geometry/points_emit_0_end_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/points_emit_0_end_1.png")
+    dest = "data/vulkan/data/geometry/points_emit_0_end_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/points_emit_0_end_2.png")
-    dest="vulkan/data/geometry/points_emit_0_end_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/points_emit_0_end_2.png")
+    dest = "data/vulkan/data/geometry/points_emit_0_end_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/points_emit_1_end_1.png")
-    dest="vulkan/data/geometry/points_emit_1_end_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/points_emit_1_end_1.png")
+    dest = "data/vulkan/data/geometry/points_emit_1_end_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/points_emit_1_end_2.png")
-    dest="vulkan/data/geometry/points_emit_1_end_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/points_emit_1_end_2.png")
+    dest = "data/vulkan/data/geometry/points_emit_1_end_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/points_to_lines.png")
-    dest="vulkan/data/geometry/points_to_lines.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/points_to_lines.png")
+    dest = "data/vulkan/data/geometry/points_to_lines.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/points_to_triangles.png")
-    dest="vulkan/data/geometry/points_to_triangles.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/points_to_triangles.png")
+    dest = "data/vulkan/data/geometry/points_to_triangles.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/primitive_id.png")
-    dest="vulkan/data/geometry/primitive_id.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/primitive_id.png")
+    dest = "data/vulkan/data/geometry/primitive_id.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/primitive_id_in.png")
-    dest="vulkan/data/geometry/primitive_id_in.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/primitive_id_in.png")
+    dest = "data/vulkan/data/geometry/primitive_id_in.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/primitive_id_in_restarted.png")
-    dest="vulkan/data/geometry/primitive_id_in_restarted.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/primitive_id_in_restarted.png")
+    dest = "data/vulkan/data/geometry/primitive_id_in_restarted.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/triangle_fan.png")
-    dest="vulkan/data/geometry/triangle_fan.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/triangle_fan.png")
+    dest = "data/vulkan/data/geometry/triangle_fan.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/triangle_strip.png")
-    dest="vulkan/data/geometry/triangle_strip.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/triangle_strip.png")
+    dest = "data/vulkan/data/geometry/triangle_strip.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_0_end_0.png")
-    dest="vulkan/data/geometry/triangle_strip_emit_0_end_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_0_end_0.png")
+    dest = "data/vulkan/data/geometry/triangle_strip_emit_0_end_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_0_end_1.png")
-    dest="vulkan/data/geometry/triangle_strip_emit_0_end_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_0_end_1.png")
+    dest = "data/vulkan/data/geometry/triangle_strip_emit_0_end_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_0_end_2.png")
-    dest="vulkan/data/geometry/triangle_strip_emit_0_end_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_0_end_2.png")
+    dest = "data/vulkan/data/geometry/triangle_strip_emit_0_end_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_1_end_1.png")
-    dest="vulkan/data/geometry/triangle_strip_emit_1_end_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_1_end_1.png")
+    dest = "data/vulkan/data/geometry/triangle_strip_emit_1_end_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_1_end_2.png")
-    dest="vulkan/data/geometry/triangle_strip_emit_1_end_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_1_end_2.png")
+    dest = "data/vulkan/data/geometry/triangle_strip_emit_1_end_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_2_end_1.png")
-    dest="vulkan/data/geometry/triangle_strip_emit_2_end_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_2_end_1.png")
+    dest = "data/vulkan/data/geometry/triangle_strip_emit_2_end_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_2_end_2.png")
-    dest="vulkan/data/geometry/triangle_strip_emit_2_end_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_2_end_2.png")
+    dest = "data/vulkan/data/geometry/triangle_strip_emit_2_end_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_3_end_1.png")
-    dest="vulkan/data/geometry/triangle_strip_emit_3_end_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_3_end_1.png")
+    dest = "data/vulkan/data/geometry/triangle_strip_emit_3_end_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_3_end_2.png")
-    dest="vulkan/data/geometry/triangle_strip_emit_3_end_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_3_end_2.png")
+    dest = "data/vulkan/data/geometry/triangle_strip_emit_3_end_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_3_end_2_emit_3_end_0.png")
-    dest="vulkan/data/geometry/triangle_strip_emit_3_end_2_emit_3_end_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/triangle_strip_emit_3_end_2_emit_3_end_0.png")
+    dest =
+        "data/vulkan/data/geometry/triangle_strip_emit_3_end_2_emit_3_end_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/triangles.png")
-    dest="vulkan/data/geometry/triangles.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/triangles.png")
+    dest = "data/vulkan/data/geometry/triangles.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/triangles_adjacency.png")
-    dest="vulkan/data/geometry/triangles_adjacency.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/triangles_adjacency.png")
+    dest = "data/vulkan/data/geometry/triangles_adjacency.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/triangles_to_lines.png")
-    dest="vulkan/data/geometry/triangles_to_lines.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/triangles_to_lines.png")
+    dest = "data/vulkan/data/geometry/triangles_to_lines.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/triangles_to_points.png")
-    dest="vulkan/data/geometry/triangles_to_points.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/triangles_to_points.png")
+    dest = "data/vulkan/data/geometry/triangles_to_points.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_count_0.png")
-    dest="vulkan/data/geometry/vertex_count_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_count_0.png")
+    dest = "data/vulkan/data/geometry/vertex_count_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_count_1.png")
-    dest="vulkan/data/geometry/vertex_count_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_count_1.png")
+    dest = "data/vulkan/data/geometry/vertex_count_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_count_10.png")
-    dest="vulkan/data/geometry/vertex_count_10.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_count_10.png")
+    dest = "data/vulkan/data/geometry/vertex_count_10.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_count_11.png")
-    dest="vulkan/data/geometry/vertex_count_11.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_count_11.png")
+    dest = "data/vulkan/data/geometry/vertex_count_11.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_count_12.png")
-    dest="vulkan/data/geometry/vertex_count_12.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_count_12.png")
+    dest = "data/vulkan/data/geometry/vertex_count_12.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_count_2.png")
-    dest="vulkan/data/geometry/vertex_count_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_count_2.png")
+    dest = "data/vulkan/data/geometry/vertex_count_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_count_3.png")
-    dest="vulkan/data/geometry/vertex_count_3.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_count_3.png")
+    dest = "data/vulkan/data/geometry/vertex_count_3.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_count_4.png")
-    dest="vulkan/data/geometry/vertex_count_4.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_count_4.png")
+    dest = "data/vulkan/data/geometry/vertex_count_4.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_count_5.png")
-    dest="vulkan/data/geometry/vertex_count_5.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_count_5.png")
+    dest = "data/vulkan/data/geometry/vertex_count_5.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_count_6.png")
-    dest="vulkan/data/geometry/vertex_count_6.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_count_6.png")
+    dest = "data/vulkan/data/geometry/vertex_count_6.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_count_7.png")
-    dest="vulkan/data/geometry/vertex_count_7.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_count_7.png")
+    dest = "data/vulkan/data/geometry/vertex_count_7.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_count_8.png")
-    dest="vulkan/data/geometry/vertex_count_8.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_count_8.png")
+    dest = "data/vulkan/data/geometry/vertex_count_8.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_count_9.png")
-    dest="vulkan/data/geometry/vertex_count_9.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_count_9.png")
+    dest = "data/vulkan/data/geometry/vertex_count_9.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_no_op_geometry_out_1.png")
-    dest="vulkan/data/geometry/vertex_no_op_geometry_out_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_no_op_geometry_out_1.png")
+    dest = "data/vulkan/data/geometry/vertex_no_op_geometry_out_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_out_0_geometry_out_1.png")
-    dest="vulkan/data/geometry/vertex_out_0_geometry_out_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_out_0_geometry_out_1.png")
+    dest = "data/vulkan/data/geometry/vertex_out_0_geometry_out_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_out_0_geometry_out_2.png")
-    dest="vulkan/data/geometry/vertex_out_0_geometry_out_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_out_0_geometry_out_2.png")
+    dest = "data/vulkan/data/geometry/vertex_out_0_geometry_out_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_out_1_geometry_out_0.png")
-    dest="vulkan/data/geometry/vertex_out_1_geometry_out_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_out_1_geometry_out_0.png")
+    dest = "data/vulkan/data/geometry/vertex_out_1_geometry_out_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/geometry/vertex_out_1_geometry_out_2.png")
-    dest="vulkan/data/geometry/vertex_out_1_geometry_out_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/geometry/vertex_out_1_geometry_out_2.png")
+    dest = "data/vulkan/data/geometry/vertex_out_1_geometry_out_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/barrier_ref.png")
-    dest="vulkan/data/tessellation/barrier_ref.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/barrier_ref.png")
+    dest = "data/vulkan/data/tessellation/barrier_ref.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_equal_spacing_ref_0.png")
-    dest="vulkan/data/tessellation/fill_cover_quads_equal_spacing_ref_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_equal_spacing_ref_0.png")
+    dest =
+        "data/vulkan/data/tessellation/fill_cover_quads_equal_spacing_ref_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_equal_spacing_ref_1.png")
-    dest="vulkan/data/tessellation/fill_cover_quads_equal_spacing_ref_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_equal_spacing_ref_1.png")
+    dest =
+        "data/vulkan/data/tessellation/fill_cover_quads_equal_spacing_ref_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_equal_spacing_ref_2.png")
-    dest="vulkan/data/tessellation/fill_cover_quads_equal_spacing_ref_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_equal_spacing_ref_2.png")
+    dest =
+        "data/vulkan/data/tessellation/fill_cover_quads_equal_spacing_ref_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_0.png")
-    dest="vulkan/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_0.png")
+    dest = "data/vulkan/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_1.png")
-    dest="vulkan/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_1.png")
+    dest = "data/vulkan/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_2.png")
-    dest="vulkan/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_2.png")
+    dest = "data/vulkan/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_0.png")
-    dest="vulkan/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_0.png")
+    dest = "data/vulkan/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_1.png")
-    dest="vulkan/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_1.png")
+    dest = "data/vulkan/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_2.png")
-    dest="vulkan/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_2.png")
+    dest = "data/vulkan/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_equal_spacing_ref_0.png")
-    dest="vulkan/data/tessellation/fill_cover_triangles_equal_spacing_ref_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_equal_spacing_ref_0.png")
+    dest = "data/vulkan/data/tessellation/fill_cover_triangles_equal_spacing_ref_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_equal_spacing_ref_1.png")
-    dest="vulkan/data/tessellation/fill_cover_triangles_equal_spacing_ref_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_equal_spacing_ref_1.png")
+    dest = "data/vulkan/data/tessellation/fill_cover_triangles_equal_spacing_ref_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_equal_spacing_ref_2.png")
-    dest="vulkan/data/tessellation/fill_cover_triangles_equal_spacing_ref_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_equal_spacing_ref_2.png")
+    dest = "data/vulkan/data/tessellation/fill_cover_triangles_equal_spacing_ref_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_0.png")
-    dest="vulkan/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_0.png")
+    dest = "data/vulkan/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_1.png")
-    dest="vulkan/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_1.png")
+    dest = "data/vulkan/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_2.png")
-    dest="vulkan/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_2.png")
+    dest = "data/vulkan/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_0.png")
-    dest="vulkan/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_0.png")
+    dest = "data/vulkan/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_1.png")
-    dest="vulkan/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_1.png")
+    dest = "data/vulkan/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_2.png")
-    dest="vulkan/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_2.png")
+    dest = "data/vulkan/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_equal_spacing_ref_0.png")
-    dest="vulkan/data/tessellation/fill_overlap_quads_equal_spacing_ref_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_equal_spacing_ref_0.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_quads_equal_spacing_ref_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_equal_spacing_ref_1.png")
-    dest="vulkan/data/tessellation/fill_overlap_quads_equal_spacing_ref_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_equal_spacing_ref_1.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_quads_equal_spacing_ref_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_equal_spacing_ref_2.png")
-    dest="vulkan/data/tessellation/fill_overlap_quads_equal_spacing_ref_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_equal_spacing_ref_2.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_quads_equal_spacing_ref_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_0.png")
-    dest="vulkan/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_0.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_1.png")
-    dest="vulkan/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_1.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_2.png")
-    dest="vulkan/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_2.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_0.png")
-    dest="vulkan/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_0.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_1.png")
-    dest="vulkan/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_1.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_2.png")
-    dest="vulkan/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_2.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_equal_spacing_ref_0.png")
-    dest="vulkan/data/tessellation/fill_overlap_triangles_equal_spacing_ref_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_equal_spacing_ref_0.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_triangles_equal_spacing_ref_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_equal_spacing_ref_1.png")
-    dest="vulkan/data/tessellation/fill_overlap_triangles_equal_spacing_ref_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_equal_spacing_ref_1.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_triangles_equal_spacing_ref_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_equal_spacing_ref_2.png")
-    dest="vulkan/data/tessellation/fill_overlap_triangles_equal_spacing_ref_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_equal_spacing_ref_2.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_triangles_equal_spacing_ref_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_0.png")
-    dest="vulkan/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_0.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_1.png")
-    dest="vulkan/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_1.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_2.png")
-    dest="vulkan/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_2.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_0.png")
-    dest="vulkan/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_0.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_1.png")
-    dest="vulkan/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_1.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_2.png")
-    dest="vulkan/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_2.png")
+    dest = "data/vulkan/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/gl_position_ref.png")
-    dest="vulkan/data/tessellation/gl_position_ref.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/gl_position_ref.png")
+    dest = "data/vulkan/data/tessellation/gl_position_ref.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/isolines_equal_spacing_ref_0.png")
-    dest="vulkan/data/tessellation/isolines_equal_spacing_ref_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/isolines_equal_spacing_ref_0.png")
+    dest = "data/vulkan/data/tessellation/isolines_equal_spacing_ref_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/isolines_equal_spacing_ref_1.png")
-    dest="vulkan/data/tessellation/isolines_equal_spacing_ref_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/isolines_equal_spacing_ref_1.png")
+    dest = "data/vulkan/data/tessellation/isolines_equal_spacing_ref_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/isolines_equal_spacing_ref_2.png")
-    dest="vulkan/data/tessellation/isolines_equal_spacing_ref_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/isolines_equal_spacing_ref_2.png")
+    dest = "data/vulkan/data/tessellation/isolines_equal_spacing_ref_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/isolines_fractional_even_spacing_ref_0.png")
-    dest="vulkan/data/tessellation/isolines_fractional_even_spacing_ref_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/isolines_fractional_even_spacing_ref_0.png")
+    dest = "data/vulkan/data/tessellation/isolines_fractional_even_spacing_ref_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/isolines_fractional_even_spacing_ref_1.png")
-    dest="vulkan/data/tessellation/isolines_fractional_even_spacing_ref_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/isolines_fractional_even_spacing_ref_1.png")
+    dest = "data/vulkan/data/tessellation/isolines_fractional_even_spacing_ref_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/isolines_fractional_even_spacing_ref_2.png")
-    dest="vulkan/data/tessellation/isolines_fractional_even_spacing_ref_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/isolines_fractional_even_spacing_ref_2.png")
+    dest = "data/vulkan/data/tessellation/isolines_fractional_even_spacing_ref_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/isolines_fractional_odd_spacing_ref_0.png")
-    dest="vulkan/data/tessellation/isolines_fractional_odd_spacing_ref_0.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/isolines_fractional_odd_spacing_ref_0.png")
+    dest = "data/vulkan/data/tessellation/isolines_fractional_odd_spacing_ref_0.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/isolines_fractional_odd_spacing_ref_1.png")
-    dest="vulkan/data/tessellation/isolines_fractional_odd_spacing_ref_1.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/isolines_fractional_odd_spacing_ref_1.png")
+    dest = "data/vulkan/data/tessellation/isolines_fractional_odd_spacing_ref_1.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/isolines_fractional_odd_spacing_ref_2.png")
-    dest="vulkan/data/tessellation/isolines_fractional_odd_spacing_ref_2.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/isolines_fractional_odd_spacing_ref_2.png")
+    dest = "data/vulkan/data/tessellation/isolines_fractional_odd_spacing_ref_2.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/patch_vertices_10_in_5_out_ref.png")
-    dest="vulkan/data/tessellation/patch_vertices_10_in_5_out_ref.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/patch_vertices_10_in_5_out_ref.png")
+    dest = "data/vulkan/data/tessellation/patch_vertices_10_in_5_out_ref.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/patch_vertices_5_in_10_out_ref.png")
-    dest="vulkan/data/tessellation/patch_vertices_5_in_10_out_ref.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/patch_vertices_5_in_10_out_ref.png")
+    dest = "data/vulkan/data/tessellation/patch_vertices_5_in_10_out_ref.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/primitive_id_tcs_ref.png")
-    dest="vulkan/data/tessellation/primitive_id_tcs_ref.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/primitive_id_tcs_ref.png")
+    dest = "data/vulkan/data/tessellation/primitive_id_tcs_ref.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/primitive_id_tes_ref.png")
-    dest="vulkan/data/tessellation/primitive_id_tes_ref.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/primitive_id_tes_ref.png")
+    dest = "data/vulkan/data/tessellation/primitive_id_tes_ref.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/user_defined_io_isolines_ref.png")
-    dest="vulkan/data/tessellation/user_defined_io_isolines_ref.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/user_defined_io_isolines_ref.png")
+    dest = "data/vulkan/data/tessellation/user_defined_io_isolines_ref.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/user_defined_io_quads_ref.png")
-    dest="vulkan/data/tessellation/user_defined_io_quads_ref.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/user_defined_io_quads_ref.png")
+    dest = "data/vulkan/data/tessellation/user_defined_io_quads_ref.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/data/tessellation/user_defined_io_triangles_ref.png")
-    dest="vulkan/data/tessellation/user_defined_io_triangles_ref.png"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/data/tessellation/user_defined_io_triangles_ref.png")
+    dest = "data/vulkan/data/tessellation/user_defined_io_triangles_ref.png"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/draw/ConcurrentPayload.comp")
-    dest="vulkan/draw/ConcurrentPayload.comp"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/draw/ConcurrentPayload.comp")
+    dest = "data/vulkan/draw/ConcurrentPayload.comp"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/draw/VertexFetch.frag")
-    dest="vulkan/draw/VertexFetch.frag"
+    source =
+        rebase_path("../external/vulkancts/data/vulkan/draw/VertexFetch.frag")
+    dest = "data/vulkan/draw/VertexFetch.frag"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/draw/VertexFetch.vert")
-    dest="vulkan/draw/VertexFetch.vert"
+    source =
+        rebase_path("../external/vulkancts/data/vulkan/draw/VertexFetch.vert")
+    dest = "data/vulkan/draw/VertexFetch.vert"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/draw/VertexFetchInstanceIndex.vert")
-    dest="vulkan/draw/VertexFetchInstanceIndex.vert"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/draw/VertexFetchInstanceIndex.vert")
+    dest = "data/vulkan/draw/VertexFetchInstanceIndex.vert"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/draw/VertexFetchInstanced.vert")
-    dest="vulkan/draw/VertexFetchInstanced.vert"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/draw/VertexFetchInstanced.vert")
+    dest = "data/vulkan/draw/VertexFetchInstanced.vert"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/draw/VertexFetchInstancedFirstInstance.vert")
-    dest="vulkan/draw/VertexFetchInstancedFirstInstance.vert"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/draw/VertexFetchInstancedFirstInstance.vert")
+    dest = "data/vulkan/draw/VertexFetchInstancedFirstInstance.vert"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/draw/VertexFetchShaderDrawParameters.vert")
-    dest="vulkan/draw/VertexFetchShaderDrawParameters.vert"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/draw/VertexFetchShaderDrawParameters.vert")
+    dest = "data/vulkan/draw/VertexFetchShaderDrawParameters.vert"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/draw/VertexFetchShaderDrawParametersDrawIndex.vert")
-    dest="vulkan/draw/VertexFetchShaderDrawParametersDrawIndex.vert"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/draw/VertexFetchShaderDrawParametersDrawIndex.vert")
+    dest = "data/vulkan/draw/VertexFetchShaderDrawParametersDrawIndex.vert"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/dynamic_state/VertexFetch.frag")
-    dest="vulkan/dynamic_state/VertexFetch.frag"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/dynamic_state/VertexFetch.frag")
+    dest = "data/vulkan/dynamic_state/VertexFetch.frag"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/dynamic_state/VertexFetch.vert")
-    dest="vulkan/dynamic_state/VertexFetch.vert"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/dynamic_state/VertexFetch.vert")
+    dest = "data/vulkan/dynamic_state/VertexFetch.vert"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/dynamic_state/ViewportArray.geom")
-    dest="vulkan/dynamic_state/ViewportArray.geom"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/dynamic_state/ViewportArray.geom")
+    dest = "data/vulkan/dynamic_state/ViewportArray.geom"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/glsl/440/linkage.test")
-    dest="vulkan/glsl/440/linkage.test"
+    source =
+        rebase_path("../external/vulkancts/data/vulkan/glsl/440/linkage.test")
+    dest = "data/vulkan/glsl/440/linkage.test"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/glsl/es310/arrays.test")
-    dest="vulkan/glsl/es310/arrays.test"
+    source =
+        rebase_path("../external/vulkancts/data/vulkan/glsl/es310/arrays.test")
+    dest = "data/vulkan/glsl/es310/arrays.test"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/glsl/es310/conditionals.test")
-    dest="vulkan/glsl/es310/conditionals.test"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/glsl/es310/conditionals.test")
+    dest = "data/vulkan/glsl/es310/conditionals.test"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/glsl/es310/constant_expressions.test")
-    dest="vulkan/glsl/es310/constant_expressions.test"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/glsl/es310/constant_expressions.test")
+    dest = "data/vulkan/glsl/es310/constant_expressions.test"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/glsl/es310/constants.test")
-    dest="vulkan/glsl/es310/constants.test"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/glsl/es310/constants.test")
+    dest = "data/vulkan/glsl/es310/constants.test"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/glsl/es310/conversions.test")
-    dest="vulkan/glsl/es310/conversions.test"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/glsl/es310/conversions.test")
+    dest = "data/vulkan/glsl/es310/conversions.test"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/glsl/es310/functions.test")
-    dest="vulkan/glsl/es310/functions.test"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/glsl/es310/functions.test")
+    dest = "data/vulkan/glsl/es310/functions.test"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/glsl/es310/linkage.test")
-    dest="vulkan/glsl/es310/linkage.test"
+    source =
+        rebase_path("../external/vulkancts/data/vulkan/glsl/es310/linkage.test")
+    dest = "data/vulkan/glsl/es310/linkage.test"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/glsl/es310/scoping.test")
-    dest="vulkan/glsl/es310/scoping.test"
+    source =
+        rebase_path("../external/vulkancts/data/vulkan/glsl/es310/scoping.test")
+    dest = "data/vulkan/glsl/es310/scoping.test"
   },
   {
-    path=rebase_path("../external/vulkancts/data/vulkan/glsl/es310/swizzles.test")
-    dest="vulkan/glsl/es310/swizzles.test"
+    source = rebase_path(
+            "../external/vulkancts/data/vulkan/glsl/es310/swizzles.test")
+    dest = "data/vulkan/glsl/es310/swizzles.test"
   },
-  ]
+]
diff --git a/fuchsia/split-cts/BUILD.gn b/fuchsia/split-cts/BUILD.gn
index b3f7abc..c3fb5c0 100644
--- a/fuchsia/split-cts/BUILD.gn
+++ b/fuchsia/split-cts/BUILD.gn
@@ -27,7417 +27,7978 @@
   labeled_magma_hardware_envs += [ labeled_env ]
 }
 
-package("vulkan-cts-split") {
+resource("vulkan-cts-000-data") {
+  sources = [ "data/vulkan-000.txt" ]
+  outputs = [ "data/vk-list-000.txt" ]
+}
+fuchsia_component("vulkan-cts-000") {
   testonly = true
+  manifest = "meta/vulkan-cts-000.cmx"
   deps = [
-    "..:copy",
-    "..:strip",
-    "..:vulkan_cts_build_id",
+    ":vulkan-cts-000-data",
+    "..:cts-deps",
   ]
-  tests = [
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-000"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-001"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-002"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-003"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-004"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-005"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-006"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-007"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-008"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-009"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-010"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-011"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-012"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-013"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-014"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-015"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-016"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-017"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-018"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-019"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-020"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-021"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-022"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-023"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-024"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-025"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-026"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-027"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-028"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-029"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-030"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-031"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-032"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-033"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-034"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-035"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-036"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-037"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-038"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-039"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-040"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-041"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-042"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-043"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-044"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-045"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-046"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-047"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-048"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-049"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-050"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-051"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-052"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-053"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-054"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-055"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-056"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-057"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-058"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-059"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-060"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-061"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-062"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-063"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-064"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-065"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-066"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-067"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-068"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-069"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-070"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-071"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-072"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-073"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-074"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-075"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-076"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-077"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-078"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-079"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-080"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-081"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-082"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-083"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-084"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-085"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-086"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-087"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-088"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-089"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-090"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-091"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-092"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-093"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-094"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-095"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-096"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-097"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-098"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-099"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-100"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-101"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-102"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-103"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-104"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-105"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-106"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-107"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-108"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-109"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-110"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-111"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-112"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-113"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-114"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-115"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-116"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-117"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-118"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-119"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-120"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-121"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-122"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-123"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-124"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-125"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-126"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-127"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-128"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-129"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-130"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-131"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-132"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-133"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-134"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-135"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-136"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-137"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-138"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-139"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-140"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-141"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-142"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-143"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-144"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-145"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-146"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-147"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-148"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-149"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-150"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-151"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-152"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-153"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-154"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-155"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-156"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-157"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-158"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-159"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-160"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-161"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-162"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-163"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-164"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-165"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-166"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-167"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-168"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-169"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-170"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-171"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-172"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-173"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-174"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-175"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-176"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-177"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-178"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-179"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-180"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-181"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-182"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-183"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-184"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-185"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-186"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-187"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-188"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-189"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-190"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-191"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-192"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-193"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-194"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-195"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-196"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-197"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-198"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-199"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-200"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-201"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-202"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-203"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-204"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-205"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-206"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-207"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-208"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-209"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-210"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-211"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-212"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-213"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-214"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-215"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-216"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-217"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-218"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-219"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-220"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-221"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-222"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-223"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-224"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-225"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-226"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-227"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-228"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-229"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-230"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-231"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-232"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-233"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-234"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-235"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-236"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-237"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-238"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-239"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-240"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-241"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-242"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-243"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-244"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-245"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-246"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-247"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-248"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-249"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-250"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-251"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-252"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-253"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-254"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-255"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-256"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-257"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-258"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-259"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-260"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-261"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-262"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-263"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-264"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-265"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-266"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-267"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-268"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-269"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-270"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-271"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-272"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-273"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-274"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-275"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-276"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-277"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-278"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-279"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-280"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-281"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-282"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-283"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-284"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-285"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-286"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-287"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-288"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-289"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-290"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-291"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-292"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-293"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-294"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-295"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-296"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-297"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-298"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-299"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-300"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-301"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-302"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-303"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-304"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-305"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-306"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-307"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-308"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-309"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-310"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-311"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-312"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-313"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-314"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-315"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-316"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-317"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-318"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-319"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-320"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-321"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-322"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-323"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-324"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-325"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-326"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-327"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-328"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-329"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-330"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-331"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-332"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-333"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-334"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-335"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-336"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-337"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-338"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-339"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-340"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-341"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-342"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-343"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-344"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-345"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-346"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-347"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-348"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-349"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-350"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-351"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-352"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-353"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-354"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-355"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-356"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-357"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-358"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-359"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-360"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-361"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-362"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-363"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-364"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-365"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-366"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-367"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-368"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-369"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-370"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-371"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-372"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-373"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-374"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-375"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-376"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-377"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-378"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-379"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-380"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-381"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-382"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-383"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-384"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-385"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-386"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-387"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-388"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-389"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-390"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-391"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-392"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-393"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-394"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-395"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-396"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-397"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-398"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-399"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-400"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-401"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-402"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-403"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-404"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-405"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-406"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-407"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-408"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-409"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-410"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-411"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-412"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-413"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-414"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-415"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-416"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-417"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-418"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-419"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-420"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-421"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-422"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-423"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-424"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-425"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-426"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-427"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-428"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-429"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-430"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-431"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-432"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-433"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-434"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-435"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-436"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-437"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-438"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-439"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-440"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-441"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-442"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-443"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-444"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-445"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-446"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-447"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-448"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-449"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-450"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-451"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-452"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-453"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-454"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-455"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-456"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-457"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-458"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-459"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-460"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-461"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-462"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-463"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-464"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-465"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-466"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-467"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-468"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-469"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-470"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-471"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-472"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-473"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-474"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-475"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-476"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-477"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-478"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-479"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-480"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-481"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-482"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-483"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-484"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-485"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-486"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-487"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-488"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-489"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-490"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-491"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-492"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-493"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-494"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-495"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-496"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-497"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-498"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-499"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-500"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-501"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-502"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-503"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-504"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-505"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-506"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-507"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-508"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-509"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-510"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-511"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-512"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-513"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-514"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-515"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-516"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-517"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-518"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-519"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-520"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-521"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-522"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-523"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-524"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-525"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-526"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-527"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-528"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-529"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-530"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-531"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-532"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-533"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-534"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-535"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-536"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-537"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-538"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-539"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-540"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-541"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-542"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-543"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-544"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-545"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-546"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-547"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-548"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-549"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-550"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-551"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-552"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-553"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-554"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-555"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-556"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-557"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-558"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-559"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-560"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-561"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-562"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-563"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-564"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-565"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-566"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-567"
-      environments = labeled_magma_hardware_envs
-    },
-    {
-      name = "vulkan-cts"
-      dest = "vulkan-cts-568"
-      environments = labeled_magma_hardware_envs
-    },
+}
+
+resource("vulkan-cts-001-data") {
+  sources = [ "data/vulkan-001.txt" ]
+  outputs = [ "data/vk-list-001.txt" ]
+}
+fuchsia_component("vulkan-cts-001") {
+  testonly = true
+  manifest = "meta/vulkan-cts-001.cmx"
+  deps = [
+    ":vulkan-cts-001-data",
+    "..:cts-deps",
   ]
-  meta = [
-    {
-      path = rebase_path("meta/vulkan-cts-000.cmx")
-      dest = "vulkan-cts-000.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-001.cmx")
-      dest = "vulkan-cts-001.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-002.cmx")
-      dest = "vulkan-cts-002.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-003.cmx")
-      dest = "vulkan-cts-003.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-004.cmx")
-      dest = "vulkan-cts-004.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-005.cmx")
-      dest = "vulkan-cts-005.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-006.cmx")
-      dest = "vulkan-cts-006.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-007.cmx")
-      dest = "vulkan-cts-007.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-008.cmx")
-      dest = "vulkan-cts-008.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-009.cmx")
-      dest = "vulkan-cts-009.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-010.cmx")
-      dest = "vulkan-cts-010.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-011.cmx")
-      dest = "vulkan-cts-011.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-012.cmx")
-      dest = "vulkan-cts-012.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-013.cmx")
-      dest = "vulkan-cts-013.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-014.cmx")
-      dest = "vulkan-cts-014.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-015.cmx")
-      dest = "vulkan-cts-015.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-016.cmx")
-      dest = "vulkan-cts-016.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-017.cmx")
-      dest = "vulkan-cts-017.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-018.cmx")
-      dest = "vulkan-cts-018.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-019.cmx")
-      dest = "vulkan-cts-019.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-020.cmx")
-      dest = "vulkan-cts-020.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-021.cmx")
-      dest = "vulkan-cts-021.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-022.cmx")
-      dest = "vulkan-cts-022.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-023.cmx")
-      dest = "vulkan-cts-023.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-024.cmx")
-      dest = "vulkan-cts-024.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-025.cmx")
-      dest = "vulkan-cts-025.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-026.cmx")
-      dest = "vulkan-cts-026.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-027.cmx")
-      dest = "vulkan-cts-027.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-028.cmx")
-      dest = "vulkan-cts-028.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-029.cmx")
-      dest = "vulkan-cts-029.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-030.cmx")
-      dest = "vulkan-cts-030.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-031.cmx")
-      dest = "vulkan-cts-031.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-032.cmx")
-      dest = "vulkan-cts-032.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-033.cmx")
-      dest = "vulkan-cts-033.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-034.cmx")
-      dest = "vulkan-cts-034.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-035.cmx")
-      dest = "vulkan-cts-035.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-036.cmx")
-      dest = "vulkan-cts-036.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-037.cmx")
-      dest = "vulkan-cts-037.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-038.cmx")
-      dest = "vulkan-cts-038.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-039.cmx")
-      dest = "vulkan-cts-039.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-040.cmx")
-      dest = "vulkan-cts-040.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-041.cmx")
-      dest = "vulkan-cts-041.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-042.cmx")
-      dest = "vulkan-cts-042.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-043.cmx")
-      dest = "vulkan-cts-043.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-044.cmx")
-      dest = "vulkan-cts-044.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-045.cmx")
-      dest = "vulkan-cts-045.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-046.cmx")
-      dest = "vulkan-cts-046.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-047.cmx")
-      dest = "vulkan-cts-047.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-048.cmx")
-      dest = "vulkan-cts-048.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-049.cmx")
-      dest = "vulkan-cts-049.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-050.cmx")
-      dest = "vulkan-cts-050.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-051.cmx")
-      dest = "vulkan-cts-051.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-052.cmx")
-      dest = "vulkan-cts-052.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-053.cmx")
-      dest = "vulkan-cts-053.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-054.cmx")
-      dest = "vulkan-cts-054.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-055.cmx")
-      dest = "vulkan-cts-055.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-056.cmx")
-      dest = "vulkan-cts-056.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-057.cmx")
-      dest = "vulkan-cts-057.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-058.cmx")
-      dest = "vulkan-cts-058.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-059.cmx")
-      dest = "vulkan-cts-059.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-060.cmx")
-      dest = "vulkan-cts-060.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-061.cmx")
-      dest = "vulkan-cts-061.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-062.cmx")
-      dest = "vulkan-cts-062.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-063.cmx")
-      dest = "vulkan-cts-063.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-064.cmx")
-      dest = "vulkan-cts-064.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-065.cmx")
-      dest = "vulkan-cts-065.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-066.cmx")
-      dest = "vulkan-cts-066.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-067.cmx")
-      dest = "vulkan-cts-067.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-068.cmx")
-      dest = "vulkan-cts-068.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-069.cmx")
-      dest = "vulkan-cts-069.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-070.cmx")
-      dest = "vulkan-cts-070.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-071.cmx")
-      dest = "vulkan-cts-071.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-072.cmx")
-      dest = "vulkan-cts-072.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-073.cmx")
-      dest = "vulkan-cts-073.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-074.cmx")
-      dest = "vulkan-cts-074.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-075.cmx")
-      dest = "vulkan-cts-075.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-076.cmx")
-      dest = "vulkan-cts-076.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-077.cmx")
-      dest = "vulkan-cts-077.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-078.cmx")
-      dest = "vulkan-cts-078.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-079.cmx")
-      dest = "vulkan-cts-079.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-080.cmx")
-      dest = "vulkan-cts-080.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-081.cmx")
-      dest = "vulkan-cts-081.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-082.cmx")
-      dest = "vulkan-cts-082.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-083.cmx")
-      dest = "vulkan-cts-083.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-084.cmx")
-      dest = "vulkan-cts-084.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-085.cmx")
-      dest = "vulkan-cts-085.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-086.cmx")
-      dest = "vulkan-cts-086.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-087.cmx")
-      dest = "vulkan-cts-087.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-088.cmx")
-      dest = "vulkan-cts-088.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-089.cmx")
-      dest = "vulkan-cts-089.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-090.cmx")
-      dest = "vulkan-cts-090.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-091.cmx")
-      dest = "vulkan-cts-091.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-092.cmx")
-      dest = "vulkan-cts-092.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-093.cmx")
-      dest = "vulkan-cts-093.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-094.cmx")
-      dest = "vulkan-cts-094.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-095.cmx")
-      dest = "vulkan-cts-095.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-096.cmx")
-      dest = "vulkan-cts-096.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-097.cmx")
-      dest = "vulkan-cts-097.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-098.cmx")
-      dest = "vulkan-cts-098.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-099.cmx")
-      dest = "vulkan-cts-099.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-100.cmx")
-      dest = "vulkan-cts-100.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-101.cmx")
-      dest = "vulkan-cts-101.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-102.cmx")
-      dest = "vulkan-cts-102.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-103.cmx")
-      dest = "vulkan-cts-103.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-104.cmx")
-      dest = "vulkan-cts-104.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-105.cmx")
-      dest = "vulkan-cts-105.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-106.cmx")
-      dest = "vulkan-cts-106.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-107.cmx")
-      dest = "vulkan-cts-107.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-108.cmx")
-      dest = "vulkan-cts-108.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-109.cmx")
-      dest = "vulkan-cts-109.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-110.cmx")
-      dest = "vulkan-cts-110.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-111.cmx")
-      dest = "vulkan-cts-111.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-112.cmx")
-      dest = "vulkan-cts-112.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-113.cmx")
-      dest = "vulkan-cts-113.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-114.cmx")
-      dest = "vulkan-cts-114.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-115.cmx")
-      dest = "vulkan-cts-115.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-116.cmx")
-      dest = "vulkan-cts-116.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-117.cmx")
-      dest = "vulkan-cts-117.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-118.cmx")
-      dest = "vulkan-cts-118.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-119.cmx")
-      dest = "vulkan-cts-119.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-120.cmx")
-      dest = "vulkan-cts-120.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-121.cmx")
-      dest = "vulkan-cts-121.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-122.cmx")
-      dest = "vulkan-cts-122.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-123.cmx")
-      dest = "vulkan-cts-123.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-124.cmx")
-      dest = "vulkan-cts-124.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-125.cmx")
-      dest = "vulkan-cts-125.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-126.cmx")
-      dest = "vulkan-cts-126.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-127.cmx")
-      dest = "vulkan-cts-127.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-128.cmx")
-      dest = "vulkan-cts-128.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-129.cmx")
-      dest = "vulkan-cts-129.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-130.cmx")
-      dest = "vulkan-cts-130.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-131.cmx")
-      dest = "vulkan-cts-131.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-132.cmx")
-      dest = "vulkan-cts-132.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-133.cmx")
-      dest = "vulkan-cts-133.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-134.cmx")
-      dest = "vulkan-cts-134.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-135.cmx")
-      dest = "vulkan-cts-135.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-136.cmx")
-      dest = "vulkan-cts-136.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-137.cmx")
-      dest = "vulkan-cts-137.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-138.cmx")
-      dest = "vulkan-cts-138.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-139.cmx")
-      dest = "vulkan-cts-139.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-140.cmx")
-      dest = "vulkan-cts-140.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-141.cmx")
-      dest = "vulkan-cts-141.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-142.cmx")
-      dest = "vulkan-cts-142.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-143.cmx")
-      dest = "vulkan-cts-143.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-144.cmx")
-      dest = "vulkan-cts-144.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-145.cmx")
-      dest = "vulkan-cts-145.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-146.cmx")
-      dest = "vulkan-cts-146.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-147.cmx")
-      dest = "vulkan-cts-147.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-148.cmx")
-      dest = "vulkan-cts-148.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-149.cmx")
-      dest = "vulkan-cts-149.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-150.cmx")
-      dest = "vulkan-cts-150.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-151.cmx")
-      dest = "vulkan-cts-151.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-152.cmx")
-      dest = "vulkan-cts-152.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-153.cmx")
-      dest = "vulkan-cts-153.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-154.cmx")
-      dest = "vulkan-cts-154.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-155.cmx")
-      dest = "vulkan-cts-155.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-156.cmx")
-      dest = "vulkan-cts-156.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-157.cmx")
-      dest = "vulkan-cts-157.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-158.cmx")
-      dest = "vulkan-cts-158.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-159.cmx")
-      dest = "vulkan-cts-159.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-160.cmx")
-      dest = "vulkan-cts-160.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-161.cmx")
-      dest = "vulkan-cts-161.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-162.cmx")
-      dest = "vulkan-cts-162.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-163.cmx")
-      dest = "vulkan-cts-163.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-164.cmx")
-      dest = "vulkan-cts-164.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-165.cmx")
-      dest = "vulkan-cts-165.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-166.cmx")
-      dest = "vulkan-cts-166.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-167.cmx")
-      dest = "vulkan-cts-167.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-168.cmx")
-      dest = "vulkan-cts-168.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-169.cmx")
-      dest = "vulkan-cts-169.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-170.cmx")
-      dest = "vulkan-cts-170.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-171.cmx")
-      dest = "vulkan-cts-171.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-172.cmx")
-      dest = "vulkan-cts-172.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-173.cmx")
-      dest = "vulkan-cts-173.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-174.cmx")
-      dest = "vulkan-cts-174.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-175.cmx")
-      dest = "vulkan-cts-175.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-176.cmx")
-      dest = "vulkan-cts-176.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-177.cmx")
-      dest = "vulkan-cts-177.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-178.cmx")
-      dest = "vulkan-cts-178.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-179.cmx")
-      dest = "vulkan-cts-179.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-180.cmx")
-      dest = "vulkan-cts-180.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-181.cmx")
-      dest = "vulkan-cts-181.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-182.cmx")
-      dest = "vulkan-cts-182.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-183.cmx")
-      dest = "vulkan-cts-183.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-184.cmx")
-      dest = "vulkan-cts-184.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-185.cmx")
-      dest = "vulkan-cts-185.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-186.cmx")
-      dest = "vulkan-cts-186.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-187.cmx")
-      dest = "vulkan-cts-187.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-188.cmx")
-      dest = "vulkan-cts-188.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-189.cmx")
-      dest = "vulkan-cts-189.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-190.cmx")
-      dest = "vulkan-cts-190.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-191.cmx")
-      dest = "vulkan-cts-191.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-192.cmx")
-      dest = "vulkan-cts-192.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-193.cmx")
-      dest = "vulkan-cts-193.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-194.cmx")
-      dest = "vulkan-cts-194.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-195.cmx")
-      dest = "vulkan-cts-195.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-196.cmx")
-      dest = "vulkan-cts-196.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-197.cmx")
-      dest = "vulkan-cts-197.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-198.cmx")
-      dest = "vulkan-cts-198.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-199.cmx")
-      dest = "vulkan-cts-199.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-200.cmx")
-      dest = "vulkan-cts-200.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-201.cmx")
-      dest = "vulkan-cts-201.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-202.cmx")
-      dest = "vulkan-cts-202.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-203.cmx")
-      dest = "vulkan-cts-203.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-204.cmx")
-      dest = "vulkan-cts-204.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-205.cmx")
-      dest = "vulkan-cts-205.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-206.cmx")
-      dest = "vulkan-cts-206.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-207.cmx")
-      dest = "vulkan-cts-207.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-208.cmx")
-      dest = "vulkan-cts-208.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-209.cmx")
-      dest = "vulkan-cts-209.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-210.cmx")
-      dest = "vulkan-cts-210.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-211.cmx")
-      dest = "vulkan-cts-211.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-212.cmx")
-      dest = "vulkan-cts-212.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-213.cmx")
-      dest = "vulkan-cts-213.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-214.cmx")
-      dest = "vulkan-cts-214.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-215.cmx")
-      dest = "vulkan-cts-215.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-216.cmx")
-      dest = "vulkan-cts-216.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-217.cmx")
-      dest = "vulkan-cts-217.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-218.cmx")
-      dest = "vulkan-cts-218.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-219.cmx")
-      dest = "vulkan-cts-219.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-220.cmx")
-      dest = "vulkan-cts-220.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-221.cmx")
-      dest = "vulkan-cts-221.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-222.cmx")
-      dest = "vulkan-cts-222.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-223.cmx")
-      dest = "vulkan-cts-223.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-224.cmx")
-      dest = "vulkan-cts-224.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-225.cmx")
-      dest = "vulkan-cts-225.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-226.cmx")
-      dest = "vulkan-cts-226.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-227.cmx")
-      dest = "vulkan-cts-227.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-228.cmx")
-      dest = "vulkan-cts-228.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-229.cmx")
-      dest = "vulkan-cts-229.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-230.cmx")
-      dest = "vulkan-cts-230.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-231.cmx")
-      dest = "vulkan-cts-231.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-232.cmx")
-      dest = "vulkan-cts-232.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-233.cmx")
-      dest = "vulkan-cts-233.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-234.cmx")
-      dest = "vulkan-cts-234.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-235.cmx")
-      dest = "vulkan-cts-235.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-236.cmx")
-      dest = "vulkan-cts-236.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-237.cmx")
-      dest = "vulkan-cts-237.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-238.cmx")
-      dest = "vulkan-cts-238.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-239.cmx")
-      dest = "vulkan-cts-239.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-240.cmx")
-      dest = "vulkan-cts-240.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-241.cmx")
-      dest = "vulkan-cts-241.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-242.cmx")
-      dest = "vulkan-cts-242.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-243.cmx")
-      dest = "vulkan-cts-243.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-244.cmx")
-      dest = "vulkan-cts-244.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-245.cmx")
-      dest = "vulkan-cts-245.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-246.cmx")
-      dest = "vulkan-cts-246.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-247.cmx")
-      dest = "vulkan-cts-247.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-248.cmx")
-      dest = "vulkan-cts-248.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-249.cmx")
-      dest = "vulkan-cts-249.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-250.cmx")
-      dest = "vulkan-cts-250.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-251.cmx")
-      dest = "vulkan-cts-251.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-252.cmx")
-      dest = "vulkan-cts-252.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-253.cmx")
-      dest = "vulkan-cts-253.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-254.cmx")
-      dest = "vulkan-cts-254.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-255.cmx")
-      dest = "vulkan-cts-255.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-256.cmx")
-      dest = "vulkan-cts-256.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-257.cmx")
-      dest = "vulkan-cts-257.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-258.cmx")
-      dest = "vulkan-cts-258.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-259.cmx")
-      dest = "vulkan-cts-259.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-260.cmx")
-      dest = "vulkan-cts-260.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-261.cmx")
-      dest = "vulkan-cts-261.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-262.cmx")
-      dest = "vulkan-cts-262.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-263.cmx")
-      dest = "vulkan-cts-263.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-264.cmx")
-      dest = "vulkan-cts-264.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-265.cmx")
-      dest = "vulkan-cts-265.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-266.cmx")
-      dest = "vulkan-cts-266.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-267.cmx")
-      dest = "vulkan-cts-267.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-268.cmx")
-      dest = "vulkan-cts-268.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-269.cmx")
-      dest = "vulkan-cts-269.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-270.cmx")
-      dest = "vulkan-cts-270.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-271.cmx")
-      dest = "vulkan-cts-271.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-272.cmx")
-      dest = "vulkan-cts-272.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-273.cmx")
-      dest = "vulkan-cts-273.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-274.cmx")
-      dest = "vulkan-cts-274.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-275.cmx")
-      dest = "vulkan-cts-275.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-276.cmx")
-      dest = "vulkan-cts-276.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-277.cmx")
-      dest = "vulkan-cts-277.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-278.cmx")
-      dest = "vulkan-cts-278.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-279.cmx")
-      dest = "vulkan-cts-279.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-280.cmx")
-      dest = "vulkan-cts-280.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-281.cmx")
-      dest = "vulkan-cts-281.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-282.cmx")
-      dest = "vulkan-cts-282.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-283.cmx")
-      dest = "vulkan-cts-283.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-284.cmx")
-      dest = "vulkan-cts-284.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-285.cmx")
-      dest = "vulkan-cts-285.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-286.cmx")
-      dest = "vulkan-cts-286.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-287.cmx")
-      dest = "vulkan-cts-287.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-288.cmx")
-      dest = "vulkan-cts-288.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-289.cmx")
-      dest = "vulkan-cts-289.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-290.cmx")
-      dest = "vulkan-cts-290.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-291.cmx")
-      dest = "vulkan-cts-291.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-292.cmx")
-      dest = "vulkan-cts-292.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-293.cmx")
-      dest = "vulkan-cts-293.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-294.cmx")
-      dest = "vulkan-cts-294.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-295.cmx")
-      dest = "vulkan-cts-295.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-296.cmx")
-      dest = "vulkan-cts-296.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-297.cmx")
-      dest = "vulkan-cts-297.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-298.cmx")
-      dest = "vulkan-cts-298.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-299.cmx")
-      dest = "vulkan-cts-299.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-300.cmx")
-      dest = "vulkan-cts-300.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-301.cmx")
-      dest = "vulkan-cts-301.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-302.cmx")
-      dest = "vulkan-cts-302.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-303.cmx")
-      dest = "vulkan-cts-303.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-304.cmx")
-      dest = "vulkan-cts-304.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-305.cmx")
-      dest = "vulkan-cts-305.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-306.cmx")
-      dest = "vulkan-cts-306.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-307.cmx")
-      dest = "vulkan-cts-307.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-308.cmx")
-      dest = "vulkan-cts-308.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-309.cmx")
-      dest = "vulkan-cts-309.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-310.cmx")
-      dest = "vulkan-cts-310.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-311.cmx")
-      dest = "vulkan-cts-311.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-312.cmx")
-      dest = "vulkan-cts-312.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-313.cmx")
-      dest = "vulkan-cts-313.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-314.cmx")
-      dest = "vulkan-cts-314.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-315.cmx")
-      dest = "vulkan-cts-315.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-316.cmx")
-      dest = "vulkan-cts-316.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-317.cmx")
-      dest = "vulkan-cts-317.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-318.cmx")
-      dest = "vulkan-cts-318.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-319.cmx")
-      dest = "vulkan-cts-319.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-320.cmx")
-      dest = "vulkan-cts-320.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-321.cmx")
-      dest = "vulkan-cts-321.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-322.cmx")
-      dest = "vulkan-cts-322.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-323.cmx")
-      dest = "vulkan-cts-323.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-324.cmx")
-      dest = "vulkan-cts-324.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-325.cmx")
-      dest = "vulkan-cts-325.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-326.cmx")
-      dest = "vulkan-cts-326.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-327.cmx")
-      dest = "vulkan-cts-327.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-328.cmx")
-      dest = "vulkan-cts-328.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-329.cmx")
-      dest = "vulkan-cts-329.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-330.cmx")
-      dest = "vulkan-cts-330.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-331.cmx")
-      dest = "vulkan-cts-331.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-332.cmx")
-      dest = "vulkan-cts-332.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-333.cmx")
-      dest = "vulkan-cts-333.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-334.cmx")
-      dest = "vulkan-cts-334.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-335.cmx")
-      dest = "vulkan-cts-335.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-336.cmx")
-      dest = "vulkan-cts-336.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-337.cmx")
-      dest = "vulkan-cts-337.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-338.cmx")
-      dest = "vulkan-cts-338.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-339.cmx")
-      dest = "vulkan-cts-339.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-340.cmx")
-      dest = "vulkan-cts-340.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-341.cmx")
-      dest = "vulkan-cts-341.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-342.cmx")
-      dest = "vulkan-cts-342.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-343.cmx")
-      dest = "vulkan-cts-343.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-344.cmx")
-      dest = "vulkan-cts-344.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-345.cmx")
-      dest = "vulkan-cts-345.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-346.cmx")
-      dest = "vulkan-cts-346.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-347.cmx")
-      dest = "vulkan-cts-347.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-348.cmx")
-      dest = "vulkan-cts-348.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-349.cmx")
-      dest = "vulkan-cts-349.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-350.cmx")
-      dest = "vulkan-cts-350.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-351.cmx")
-      dest = "vulkan-cts-351.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-352.cmx")
-      dest = "vulkan-cts-352.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-353.cmx")
-      dest = "vulkan-cts-353.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-354.cmx")
-      dest = "vulkan-cts-354.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-355.cmx")
-      dest = "vulkan-cts-355.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-356.cmx")
-      dest = "vulkan-cts-356.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-357.cmx")
-      dest = "vulkan-cts-357.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-358.cmx")
-      dest = "vulkan-cts-358.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-359.cmx")
-      dest = "vulkan-cts-359.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-360.cmx")
-      dest = "vulkan-cts-360.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-361.cmx")
-      dest = "vulkan-cts-361.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-362.cmx")
-      dest = "vulkan-cts-362.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-363.cmx")
-      dest = "vulkan-cts-363.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-364.cmx")
-      dest = "vulkan-cts-364.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-365.cmx")
-      dest = "vulkan-cts-365.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-366.cmx")
-      dest = "vulkan-cts-366.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-367.cmx")
-      dest = "vulkan-cts-367.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-368.cmx")
-      dest = "vulkan-cts-368.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-369.cmx")
-      dest = "vulkan-cts-369.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-370.cmx")
-      dest = "vulkan-cts-370.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-371.cmx")
-      dest = "vulkan-cts-371.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-372.cmx")
-      dest = "vulkan-cts-372.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-373.cmx")
-      dest = "vulkan-cts-373.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-374.cmx")
-      dest = "vulkan-cts-374.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-375.cmx")
-      dest = "vulkan-cts-375.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-376.cmx")
-      dest = "vulkan-cts-376.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-377.cmx")
-      dest = "vulkan-cts-377.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-378.cmx")
-      dest = "vulkan-cts-378.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-379.cmx")
-      dest = "vulkan-cts-379.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-380.cmx")
-      dest = "vulkan-cts-380.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-381.cmx")
-      dest = "vulkan-cts-381.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-382.cmx")
-      dest = "vulkan-cts-382.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-383.cmx")
-      dest = "vulkan-cts-383.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-384.cmx")
-      dest = "vulkan-cts-384.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-385.cmx")
-      dest = "vulkan-cts-385.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-386.cmx")
-      dest = "vulkan-cts-386.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-387.cmx")
-      dest = "vulkan-cts-387.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-388.cmx")
-      dest = "vulkan-cts-388.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-389.cmx")
-      dest = "vulkan-cts-389.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-390.cmx")
-      dest = "vulkan-cts-390.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-391.cmx")
-      dest = "vulkan-cts-391.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-392.cmx")
-      dest = "vulkan-cts-392.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-393.cmx")
-      dest = "vulkan-cts-393.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-394.cmx")
-      dest = "vulkan-cts-394.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-395.cmx")
-      dest = "vulkan-cts-395.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-396.cmx")
-      dest = "vulkan-cts-396.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-397.cmx")
-      dest = "vulkan-cts-397.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-398.cmx")
-      dest = "vulkan-cts-398.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-399.cmx")
-      dest = "vulkan-cts-399.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-400.cmx")
-      dest = "vulkan-cts-400.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-401.cmx")
-      dest = "vulkan-cts-401.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-402.cmx")
-      dest = "vulkan-cts-402.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-403.cmx")
-      dest = "vulkan-cts-403.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-404.cmx")
-      dest = "vulkan-cts-404.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-405.cmx")
-      dest = "vulkan-cts-405.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-406.cmx")
-      dest = "vulkan-cts-406.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-407.cmx")
-      dest = "vulkan-cts-407.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-408.cmx")
-      dest = "vulkan-cts-408.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-409.cmx")
-      dest = "vulkan-cts-409.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-410.cmx")
-      dest = "vulkan-cts-410.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-411.cmx")
-      dest = "vulkan-cts-411.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-412.cmx")
-      dest = "vulkan-cts-412.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-413.cmx")
-      dest = "vulkan-cts-413.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-414.cmx")
-      dest = "vulkan-cts-414.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-415.cmx")
-      dest = "vulkan-cts-415.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-416.cmx")
-      dest = "vulkan-cts-416.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-417.cmx")
-      dest = "vulkan-cts-417.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-418.cmx")
-      dest = "vulkan-cts-418.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-419.cmx")
-      dest = "vulkan-cts-419.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-420.cmx")
-      dest = "vulkan-cts-420.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-421.cmx")
-      dest = "vulkan-cts-421.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-422.cmx")
-      dest = "vulkan-cts-422.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-423.cmx")
-      dest = "vulkan-cts-423.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-424.cmx")
-      dest = "vulkan-cts-424.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-425.cmx")
-      dest = "vulkan-cts-425.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-426.cmx")
-      dest = "vulkan-cts-426.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-427.cmx")
-      dest = "vulkan-cts-427.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-428.cmx")
-      dest = "vulkan-cts-428.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-429.cmx")
-      dest = "vulkan-cts-429.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-430.cmx")
-      dest = "vulkan-cts-430.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-431.cmx")
-      dest = "vulkan-cts-431.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-432.cmx")
-      dest = "vulkan-cts-432.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-433.cmx")
-      dest = "vulkan-cts-433.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-434.cmx")
-      dest = "vulkan-cts-434.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-435.cmx")
-      dest = "vulkan-cts-435.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-436.cmx")
-      dest = "vulkan-cts-436.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-437.cmx")
-      dest = "vulkan-cts-437.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-438.cmx")
-      dest = "vulkan-cts-438.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-439.cmx")
-      dest = "vulkan-cts-439.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-440.cmx")
-      dest = "vulkan-cts-440.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-441.cmx")
-      dest = "vulkan-cts-441.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-442.cmx")
-      dest = "vulkan-cts-442.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-443.cmx")
-      dest = "vulkan-cts-443.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-444.cmx")
-      dest = "vulkan-cts-444.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-445.cmx")
-      dest = "vulkan-cts-445.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-446.cmx")
-      dest = "vulkan-cts-446.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-447.cmx")
-      dest = "vulkan-cts-447.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-448.cmx")
-      dest = "vulkan-cts-448.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-449.cmx")
-      dest = "vulkan-cts-449.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-450.cmx")
-      dest = "vulkan-cts-450.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-451.cmx")
-      dest = "vulkan-cts-451.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-452.cmx")
-      dest = "vulkan-cts-452.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-453.cmx")
-      dest = "vulkan-cts-453.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-454.cmx")
-      dest = "vulkan-cts-454.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-455.cmx")
-      dest = "vulkan-cts-455.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-456.cmx")
-      dest = "vulkan-cts-456.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-457.cmx")
-      dest = "vulkan-cts-457.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-458.cmx")
-      dest = "vulkan-cts-458.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-459.cmx")
-      dest = "vulkan-cts-459.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-460.cmx")
-      dest = "vulkan-cts-460.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-461.cmx")
-      dest = "vulkan-cts-461.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-462.cmx")
-      dest = "vulkan-cts-462.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-463.cmx")
-      dest = "vulkan-cts-463.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-464.cmx")
-      dest = "vulkan-cts-464.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-465.cmx")
-      dest = "vulkan-cts-465.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-466.cmx")
-      dest = "vulkan-cts-466.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-467.cmx")
-      dest = "vulkan-cts-467.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-468.cmx")
-      dest = "vulkan-cts-468.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-469.cmx")
-      dest = "vulkan-cts-469.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-470.cmx")
-      dest = "vulkan-cts-470.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-471.cmx")
-      dest = "vulkan-cts-471.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-472.cmx")
-      dest = "vulkan-cts-472.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-473.cmx")
-      dest = "vulkan-cts-473.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-474.cmx")
-      dest = "vulkan-cts-474.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-475.cmx")
-      dest = "vulkan-cts-475.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-476.cmx")
-      dest = "vulkan-cts-476.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-477.cmx")
-      dest = "vulkan-cts-477.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-478.cmx")
-      dest = "vulkan-cts-478.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-479.cmx")
-      dest = "vulkan-cts-479.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-480.cmx")
-      dest = "vulkan-cts-480.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-481.cmx")
-      dest = "vulkan-cts-481.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-482.cmx")
-      dest = "vulkan-cts-482.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-483.cmx")
-      dest = "vulkan-cts-483.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-484.cmx")
-      dest = "vulkan-cts-484.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-485.cmx")
-      dest = "vulkan-cts-485.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-486.cmx")
-      dest = "vulkan-cts-486.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-487.cmx")
-      dest = "vulkan-cts-487.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-488.cmx")
-      dest = "vulkan-cts-488.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-489.cmx")
-      dest = "vulkan-cts-489.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-490.cmx")
-      dest = "vulkan-cts-490.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-491.cmx")
-      dest = "vulkan-cts-491.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-492.cmx")
-      dest = "vulkan-cts-492.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-493.cmx")
-      dest = "vulkan-cts-493.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-494.cmx")
-      dest = "vulkan-cts-494.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-495.cmx")
-      dest = "vulkan-cts-495.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-496.cmx")
-      dest = "vulkan-cts-496.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-497.cmx")
-      dest = "vulkan-cts-497.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-498.cmx")
-      dest = "vulkan-cts-498.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-499.cmx")
-      dest = "vulkan-cts-499.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-500.cmx")
-      dest = "vulkan-cts-500.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-501.cmx")
-      dest = "vulkan-cts-501.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-502.cmx")
-      dest = "vulkan-cts-502.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-503.cmx")
-      dest = "vulkan-cts-503.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-504.cmx")
-      dest = "vulkan-cts-504.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-505.cmx")
-      dest = "vulkan-cts-505.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-506.cmx")
-      dest = "vulkan-cts-506.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-507.cmx")
-      dest = "vulkan-cts-507.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-508.cmx")
-      dest = "vulkan-cts-508.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-509.cmx")
-      dest = "vulkan-cts-509.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-510.cmx")
-      dest = "vulkan-cts-510.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-511.cmx")
-      dest = "vulkan-cts-511.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-512.cmx")
-      dest = "vulkan-cts-512.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-513.cmx")
-      dest = "vulkan-cts-513.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-514.cmx")
-      dest = "vulkan-cts-514.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-515.cmx")
-      dest = "vulkan-cts-515.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-516.cmx")
-      dest = "vulkan-cts-516.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-517.cmx")
-      dest = "vulkan-cts-517.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-518.cmx")
-      dest = "vulkan-cts-518.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-519.cmx")
-      dest = "vulkan-cts-519.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-520.cmx")
-      dest = "vulkan-cts-520.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-521.cmx")
-      dest = "vulkan-cts-521.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-522.cmx")
-      dest = "vulkan-cts-522.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-523.cmx")
-      dest = "vulkan-cts-523.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-524.cmx")
-      dest = "vulkan-cts-524.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-525.cmx")
-      dest = "vulkan-cts-525.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-526.cmx")
-      dest = "vulkan-cts-526.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-527.cmx")
-      dest = "vulkan-cts-527.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-528.cmx")
-      dest = "vulkan-cts-528.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-529.cmx")
-      dest = "vulkan-cts-529.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-530.cmx")
-      dest = "vulkan-cts-530.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-531.cmx")
-      dest = "vulkan-cts-531.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-532.cmx")
-      dest = "vulkan-cts-532.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-533.cmx")
-      dest = "vulkan-cts-533.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-534.cmx")
-      dest = "vulkan-cts-534.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-535.cmx")
-      dest = "vulkan-cts-535.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-536.cmx")
-      dest = "vulkan-cts-536.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-537.cmx")
-      dest = "vulkan-cts-537.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-538.cmx")
-      dest = "vulkan-cts-538.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-539.cmx")
-      dest = "vulkan-cts-539.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-540.cmx")
-      dest = "vulkan-cts-540.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-541.cmx")
-      dest = "vulkan-cts-541.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-542.cmx")
-      dest = "vulkan-cts-542.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-543.cmx")
-      dest = "vulkan-cts-543.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-544.cmx")
-      dest = "vulkan-cts-544.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-545.cmx")
-      dest = "vulkan-cts-545.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-546.cmx")
-      dest = "vulkan-cts-546.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-547.cmx")
-      dest = "vulkan-cts-547.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-548.cmx")
-      dest = "vulkan-cts-548.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-549.cmx")
-      dest = "vulkan-cts-549.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-550.cmx")
-      dest = "vulkan-cts-550.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-551.cmx")
-      dest = "vulkan-cts-551.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-552.cmx")
-      dest = "vulkan-cts-552.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-553.cmx")
-      dest = "vulkan-cts-553.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-554.cmx")
-      dest = "vulkan-cts-554.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-555.cmx")
-      dest = "vulkan-cts-555.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-556.cmx")
-      dest = "vulkan-cts-556.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-557.cmx")
-      dest = "vulkan-cts-557.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-558.cmx")
-      dest = "vulkan-cts-558.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-559.cmx")
-      dest = "vulkan-cts-559.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-560.cmx")
-      dest = "vulkan-cts-560.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-561.cmx")
-      dest = "vulkan-cts-561.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-562.cmx")
-      dest = "vulkan-cts-562.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-563.cmx")
-      dest = "vulkan-cts-563.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-564.cmx")
-      dest = "vulkan-cts-564.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-565.cmx")
-      dest = "vulkan-cts-565.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-566.cmx")
-      dest = "vulkan-cts-566.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-567.cmx")
-      dest = "vulkan-cts-567.cmx"
-    },
-    {
-      path = rebase_path("meta/vulkan-cts-568.cmx")
-      dest = "vulkan-cts-568.cmx"
-    },
+}
+
+resource("vulkan-cts-002-data") {
+  sources = [ "data/vulkan-002.txt" ]
+  outputs = [ "data/vk-list-002.txt" ]
+}
+fuchsia_component("vulkan-cts-002") {
+  testonly = true
+  manifest = "meta/vulkan-cts-002.cmx"
+  deps = [
+    ":vulkan-cts-002-data",
+    "..:cts-deps",
   ]
-  resources = [
-    {
-      path = rebase_path("data/vulkan-000.txt")
-      dest = "vk-list-000.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-001.txt")
-      dest = "vk-list-001.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-002.txt")
-      dest = "vk-list-002.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-003.txt")
-      dest = "vk-list-003.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-004.txt")
-      dest = "vk-list-004.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-005.txt")
-      dest = "vk-list-005.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-006.txt")
-      dest = "vk-list-006.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-007.txt")
-      dest = "vk-list-007.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-008.txt")
-      dest = "vk-list-008.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-009.txt")
-      dest = "vk-list-009.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-010.txt")
-      dest = "vk-list-010.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-011.txt")
-      dest = "vk-list-011.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-012.txt")
-      dest = "vk-list-012.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-013.txt")
-      dest = "vk-list-013.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-014.txt")
-      dest = "vk-list-014.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-015.txt")
-      dest = "vk-list-015.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-016.txt")
-      dest = "vk-list-016.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-017.txt")
-      dest = "vk-list-017.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-018.txt")
-      dest = "vk-list-018.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-019.txt")
-      dest = "vk-list-019.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-020.txt")
-      dest = "vk-list-020.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-021.txt")
-      dest = "vk-list-021.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-022.txt")
-      dest = "vk-list-022.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-023.txt")
-      dest = "vk-list-023.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-024.txt")
-      dest = "vk-list-024.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-025.txt")
-      dest = "vk-list-025.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-026.txt")
-      dest = "vk-list-026.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-027.txt")
-      dest = "vk-list-027.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-028.txt")
-      dest = "vk-list-028.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-029.txt")
-      dest = "vk-list-029.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-030.txt")
-      dest = "vk-list-030.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-031.txt")
-      dest = "vk-list-031.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-032.txt")
-      dest = "vk-list-032.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-033.txt")
-      dest = "vk-list-033.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-034.txt")
-      dest = "vk-list-034.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-035.txt")
-      dest = "vk-list-035.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-036.txt")
-      dest = "vk-list-036.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-037.txt")
-      dest = "vk-list-037.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-038.txt")
-      dest = "vk-list-038.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-039.txt")
-      dest = "vk-list-039.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-040.txt")
-      dest = "vk-list-040.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-041.txt")
-      dest = "vk-list-041.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-042.txt")
-      dest = "vk-list-042.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-043.txt")
-      dest = "vk-list-043.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-044.txt")
-      dest = "vk-list-044.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-045.txt")
-      dest = "vk-list-045.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-046.txt")
-      dest = "vk-list-046.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-047.txt")
-      dest = "vk-list-047.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-048.txt")
-      dest = "vk-list-048.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-049.txt")
-      dest = "vk-list-049.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-050.txt")
-      dest = "vk-list-050.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-051.txt")
-      dest = "vk-list-051.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-052.txt")
-      dest = "vk-list-052.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-053.txt")
-      dest = "vk-list-053.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-054.txt")
-      dest = "vk-list-054.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-055.txt")
-      dest = "vk-list-055.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-056.txt")
-      dest = "vk-list-056.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-057.txt")
-      dest = "vk-list-057.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-058.txt")
-      dest = "vk-list-058.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-059.txt")
-      dest = "vk-list-059.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-060.txt")
-      dest = "vk-list-060.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-061.txt")
-      dest = "vk-list-061.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-062.txt")
-      dest = "vk-list-062.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-063.txt")
-      dest = "vk-list-063.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-064.txt")
-      dest = "vk-list-064.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-065.txt")
-      dest = "vk-list-065.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-066.txt")
-      dest = "vk-list-066.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-067.txt")
-      dest = "vk-list-067.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-068.txt")
-      dest = "vk-list-068.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-069.txt")
-      dest = "vk-list-069.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-070.txt")
-      dest = "vk-list-070.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-071.txt")
-      dest = "vk-list-071.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-072.txt")
-      dest = "vk-list-072.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-073.txt")
-      dest = "vk-list-073.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-074.txt")
-      dest = "vk-list-074.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-075.txt")
-      dest = "vk-list-075.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-076.txt")
-      dest = "vk-list-076.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-077.txt")
-      dest = "vk-list-077.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-078.txt")
-      dest = "vk-list-078.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-079.txt")
-      dest = "vk-list-079.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-080.txt")
-      dest = "vk-list-080.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-081.txt")
-      dest = "vk-list-081.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-082.txt")
-      dest = "vk-list-082.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-083.txt")
-      dest = "vk-list-083.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-084.txt")
-      dest = "vk-list-084.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-085.txt")
-      dest = "vk-list-085.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-086.txt")
-      dest = "vk-list-086.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-087.txt")
-      dest = "vk-list-087.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-088.txt")
-      dest = "vk-list-088.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-089.txt")
-      dest = "vk-list-089.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-090.txt")
-      dest = "vk-list-090.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-091.txt")
-      dest = "vk-list-091.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-092.txt")
-      dest = "vk-list-092.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-093.txt")
-      dest = "vk-list-093.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-094.txt")
-      dest = "vk-list-094.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-095.txt")
-      dest = "vk-list-095.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-096.txt")
-      dest = "vk-list-096.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-097.txt")
-      dest = "vk-list-097.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-098.txt")
-      dest = "vk-list-098.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-099.txt")
-      dest = "vk-list-099.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-100.txt")
-      dest = "vk-list-100.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-101.txt")
-      dest = "vk-list-101.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-102.txt")
-      dest = "vk-list-102.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-103.txt")
-      dest = "vk-list-103.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-104.txt")
-      dest = "vk-list-104.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-105.txt")
-      dest = "vk-list-105.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-106.txt")
-      dest = "vk-list-106.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-107.txt")
-      dest = "vk-list-107.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-108.txt")
-      dest = "vk-list-108.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-109.txt")
-      dest = "vk-list-109.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-110.txt")
-      dest = "vk-list-110.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-111.txt")
-      dest = "vk-list-111.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-112.txt")
-      dest = "vk-list-112.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-113.txt")
-      dest = "vk-list-113.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-114.txt")
-      dest = "vk-list-114.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-115.txt")
-      dest = "vk-list-115.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-116.txt")
-      dest = "vk-list-116.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-117.txt")
-      dest = "vk-list-117.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-118.txt")
-      dest = "vk-list-118.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-119.txt")
-      dest = "vk-list-119.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-120.txt")
-      dest = "vk-list-120.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-121.txt")
-      dest = "vk-list-121.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-122.txt")
-      dest = "vk-list-122.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-123.txt")
-      dest = "vk-list-123.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-124.txt")
-      dest = "vk-list-124.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-125.txt")
-      dest = "vk-list-125.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-126.txt")
-      dest = "vk-list-126.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-127.txt")
-      dest = "vk-list-127.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-128.txt")
-      dest = "vk-list-128.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-129.txt")
-      dest = "vk-list-129.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-130.txt")
-      dest = "vk-list-130.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-131.txt")
-      dest = "vk-list-131.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-132.txt")
-      dest = "vk-list-132.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-133.txt")
-      dest = "vk-list-133.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-134.txt")
-      dest = "vk-list-134.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-135.txt")
-      dest = "vk-list-135.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-136.txt")
-      dest = "vk-list-136.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-137.txt")
-      dest = "vk-list-137.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-138.txt")
-      dest = "vk-list-138.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-139.txt")
-      dest = "vk-list-139.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-140.txt")
-      dest = "vk-list-140.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-141.txt")
-      dest = "vk-list-141.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-142.txt")
-      dest = "vk-list-142.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-143.txt")
-      dest = "vk-list-143.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-144.txt")
-      dest = "vk-list-144.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-145.txt")
-      dest = "vk-list-145.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-146.txt")
-      dest = "vk-list-146.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-147.txt")
-      dest = "vk-list-147.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-148.txt")
-      dest = "vk-list-148.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-149.txt")
-      dest = "vk-list-149.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-150.txt")
-      dest = "vk-list-150.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-151.txt")
-      dest = "vk-list-151.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-152.txt")
-      dest = "vk-list-152.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-153.txt")
-      dest = "vk-list-153.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-154.txt")
-      dest = "vk-list-154.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-155.txt")
-      dest = "vk-list-155.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-156.txt")
-      dest = "vk-list-156.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-157.txt")
-      dest = "vk-list-157.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-158.txt")
-      dest = "vk-list-158.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-159.txt")
-      dest = "vk-list-159.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-160.txt")
-      dest = "vk-list-160.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-161.txt")
-      dest = "vk-list-161.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-162.txt")
-      dest = "vk-list-162.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-163.txt")
-      dest = "vk-list-163.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-164.txt")
-      dest = "vk-list-164.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-165.txt")
-      dest = "vk-list-165.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-166.txt")
-      dest = "vk-list-166.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-167.txt")
-      dest = "vk-list-167.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-168.txt")
-      dest = "vk-list-168.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-169.txt")
-      dest = "vk-list-169.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-170.txt")
-      dest = "vk-list-170.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-171.txt")
-      dest = "vk-list-171.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-172.txt")
-      dest = "vk-list-172.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-173.txt")
-      dest = "vk-list-173.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-174.txt")
-      dest = "vk-list-174.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-175.txt")
-      dest = "vk-list-175.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-176.txt")
-      dest = "vk-list-176.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-177.txt")
-      dest = "vk-list-177.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-178.txt")
-      dest = "vk-list-178.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-179.txt")
-      dest = "vk-list-179.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-180.txt")
-      dest = "vk-list-180.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-181.txt")
-      dest = "vk-list-181.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-182.txt")
-      dest = "vk-list-182.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-183.txt")
-      dest = "vk-list-183.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-184.txt")
-      dest = "vk-list-184.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-185.txt")
-      dest = "vk-list-185.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-186.txt")
-      dest = "vk-list-186.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-187.txt")
-      dest = "vk-list-187.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-188.txt")
-      dest = "vk-list-188.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-189.txt")
-      dest = "vk-list-189.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-190.txt")
-      dest = "vk-list-190.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-191.txt")
-      dest = "vk-list-191.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-192.txt")
-      dest = "vk-list-192.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-193.txt")
-      dest = "vk-list-193.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-194.txt")
-      dest = "vk-list-194.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-195.txt")
-      dest = "vk-list-195.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-196.txt")
-      dest = "vk-list-196.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-197.txt")
-      dest = "vk-list-197.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-198.txt")
-      dest = "vk-list-198.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-199.txt")
-      dest = "vk-list-199.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-200.txt")
-      dest = "vk-list-200.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-201.txt")
-      dest = "vk-list-201.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-202.txt")
-      dest = "vk-list-202.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-203.txt")
-      dest = "vk-list-203.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-204.txt")
-      dest = "vk-list-204.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-205.txt")
-      dest = "vk-list-205.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-206.txt")
-      dest = "vk-list-206.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-207.txt")
-      dest = "vk-list-207.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-208.txt")
-      dest = "vk-list-208.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-209.txt")
-      dest = "vk-list-209.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-210.txt")
-      dest = "vk-list-210.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-211.txt")
-      dest = "vk-list-211.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-212.txt")
-      dest = "vk-list-212.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-213.txt")
-      dest = "vk-list-213.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-214.txt")
-      dest = "vk-list-214.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-215.txt")
-      dest = "vk-list-215.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-216.txt")
-      dest = "vk-list-216.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-217.txt")
-      dest = "vk-list-217.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-218.txt")
-      dest = "vk-list-218.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-219.txt")
-      dest = "vk-list-219.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-220.txt")
-      dest = "vk-list-220.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-221.txt")
-      dest = "vk-list-221.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-222.txt")
-      dest = "vk-list-222.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-223.txt")
-      dest = "vk-list-223.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-224.txt")
-      dest = "vk-list-224.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-225.txt")
-      dest = "vk-list-225.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-226.txt")
-      dest = "vk-list-226.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-227.txt")
-      dest = "vk-list-227.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-228.txt")
-      dest = "vk-list-228.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-229.txt")
-      dest = "vk-list-229.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-230.txt")
-      dest = "vk-list-230.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-231.txt")
-      dest = "vk-list-231.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-232.txt")
-      dest = "vk-list-232.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-233.txt")
-      dest = "vk-list-233.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-234.txt")
-      dest = "vk-list-234.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-235.txt")
-      dest = "vk-list-235.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-236.txt")
-      dest = "vk-list-236.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-237.txt")
-      dest = "vk-list-237.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-238.txt")
-      dest = "vk-list-238.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-239.txt")
-      dest = "vk-list-239.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-240.txt")
-      dest = "vk-list-240.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-241.txt")
-      dest = "vk-list-241.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-242.txt")
-      dest = "vk-list-242.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-243.txt")
-      dest = "vk-list-243.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-244.txt")
-      dest = "vk-list-244.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-245.txt")
-      dest = "vk-list-245.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-246.txt")
-      dest = "vk-list-246.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-247.txt")
-      dest = "vk-list-247.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-248.txt")
-      dest = "vk-list-248.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-249.txt")
-      dest = "vk-list-249.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-250.txt")
-      dest = "vk-list-250.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-251.txt")
-      dest = "vk-list-251.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-252.txt")
-      dest = "vk-list-252.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-253.txt")
-      dest = "vk-list-253.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-254.txt")
-      dest = "vk-list-254.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-255.txt")
-      dest = "vk-list-255.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-256.txt")
-      dest = "vk-list-256.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-257.txt")
-      dest = "vk-list-257.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-258.txt")
-      dest = "vk-list-258.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-259.txt")
-      dest = "vk-list-259.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-260.txt")
-      dest = "vk-list-260.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-261.txt")
-      dest = "vk-list-261.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-262.txt")
-      dest = "vk-list-262.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-263.txt")
-      dest = "vk-list-263.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-264.txt")
-      dest = "vk-list-264.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-265.txt")
-      dest = "vk-list-265.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-266.txt")
-      dest = "vk-list-266.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-267.txt")
-      dest = "vk-list-267.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-268.txt")
-      dest = "vk-list-268.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-269.txt")
-      dest = "vk-list-269.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-270.txt")
-      dest = "vk-list-270.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-271.txt")
-      dest = "vk-list-271.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-272.txt")
-      dest = "vk-list-272.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-273.txt")
-      dest = "vk-list-273.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-274.txt")
-      dest = "vk-list-274.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-275.txt")
-      dest = "vk-list-275.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-276.txt")
-      dest = "vk-list-276.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-277.txt")
-      dest = "vk-list-277.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-278.txt")
-      dest = "vk-list-278.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-279.txt")
-      dest = "vk-list-279.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-280.txt")
-      dest = "vk-list-280.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-281.txt")
-      dest = "vk-list-281.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-282.txt")
-      dest = "vk-list-282.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-283.txt")
-      dest = "vk-list-283.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-284.txt")
-      dest = "vk-list-284.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-285.txt")
-      dest = "vk-list-285.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-286.txt")
-      dest = "vk-list-286.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-287.txt")
-      dest = "vk-list-287.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-288.txt")
-      dest = "vk-list-288.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-289.txt")
-      dest = "vk-list-289.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-290.txt")
-      dest = "vk-list-290.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-291.txt")
-      dest = "vk-list-291.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-292.txt")
-      dest = "vk-list-292.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-293.txt")
-      dest = "vk-list-293.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-294.txt")
-      dest = "vk-list-294.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-295.txt")
-      dest = "vk-list-295.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-296.txt")
-      dest = "vk-list-296.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-297.txt")
-      dest = "vk-list-297.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-298.txt")
-      dest = "vk-list-298.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-299.txt")
-      dest = "vk-list-299.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-300.txt")
-      dest = "vk-list-300.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-301.txt")
-      dest = "vk-list-301.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-302.txt")
-      dest = "vk-list-302.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-303.txt")
-      dest = "vk-list-303.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-304.txt")
-      dest = "vk-list-304.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-305.txt")
-      dest = "vk-list-305.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-306.txt")
-      dest = "vk-list-306.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-307.txt")
-      dest = "vk-list-307.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-308.txt")
-      dest = "vk-list-308.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-309.txt")
-      dest = "vk-list-309.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-310.txt")
-      dest = "vk-list-310.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-311.txt")
-      dest = "vk-list-311.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-312.txt")
-      dest = "vk-list-312.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-313.txt")
-      dest = "vk-list-313.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-314.txt")
-      dest = "vk-list-314.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-315.txt")
-      dest = "vk-list-315.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-316.txt")
-      dest = "vk-list-316.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-317.txt")
-      dest = "vk-list-317.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-318.txt")
-      dest = "vk-list-318.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-319.txt")
-      dest = "vk-list-319.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-320.txt")
-      dest = "vk-list-320.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-321.txt")
-      dest = "vk-list-321.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-322.txt")
-      dest = "vk-list-322.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-323.txt")
-      dest = "vk-list-323.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-324.txt")
-      dest = "vk-list-324.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-325.txt")
-      dest = "vk-list-325.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-326.txt")
-      dest = "vk-list-326.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-327.txt")
-      dest = "vk-list-327.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-328.txt")
-      dest = "vk-list-328.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-329.txt")
-      dest = "vk-list-329.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-330.txt")
-      dest = "vk-list-330.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-331.txt")
-      dest = "vk-list-331.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-332.txt")
-      dest = "vk-list-332.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-333.txt")
-      dest = "vk-list-333.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-334.txt")
-      dest = "vk-list-334.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-335.txt")
-      dest = "vk-list-335.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-336.txt")
-      dest = "vk-list-336.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-337.txt")
-      dest = "vk-list-337.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-338.txt")
-      dest = "vk-list-338.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-339.txt")
-      dest = "vk-list-339.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-340.txt")
-      dest = "vk-list-340.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-341.txt")
-      dest = "vk-list-341.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-342.txt")
-      dest = "vk-list-342.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-343.txt")
-      dest = "vk-list-343.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-344.txt")
-      dest = "vk-list-344.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-345.txt")
-      dest = "vk-list-345.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-346.txt")
-      dest = "vk-list-346.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-347.txt")
-      dest = "vk-list-347.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-348.txt")
-      dest = "vk-list-348.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-349.txt")
-      dest = "vk-list-349.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-350.txt")
-      dest = "vk-list-350.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-351.txt")
-      dest = "vk-list-351.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-352.txt")
-      dest = "vk-list-352.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-353.txt")
-      dest = "vk-list-353.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-354.txt")
-      dest = "vk-list-354.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-355.txt")
-      dest = "vk-list-355.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-356.txt")
-      dest = "vk-list-356.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-357.txt")
-      dest = "vk-list-357.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-358.txt")
-      dest = "vk-list-358.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-359.txt")
-      dest = "vk-list-359.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-360.txt")
-      dest = "vk-list-360.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-361.txt")
-      dest = "vk-list-361.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-362.txt")
-      dest = "vk-list-362.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-363.txt")
-      dest = "vk-list-363.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-364.txt")
-      dest = "vk-list-364.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-365.txt")
-      dest = "vk-list-365.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-366.txt")
-      dest = "vk-list-366.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-367.txt")
-      dest = "vk-list-367.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-368.txt")
-      dest = "vk-list-368.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-369.txt")
-      dest = "vk-list-369.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-370.txt")
-      dest = "vk-list-370.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-371.txt")
-      dest = "vk-list-371.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-372.txt")
-      dest = "vk-list-372.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-373.txt")
-      dest = "vk-list-373.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-374.txt")
-      dest = "vk-list-374.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-375.txt")
-      dest = "vk-list-375.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-376.txt")
-      dest = "vk-list-376.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-377.txt")
-      dest = "vk-list-377.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-378.txt")
-      dest = "vk-list-378.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-379.txt")
-      dest = "vk-list-379.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-380.txt")
-      dest = "vk-list-380.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-381.txt")
-      dest = "vk-list-381.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-382.txt")
-      dest = "vk-list-382.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-383.txt")
-      dest = "vk-list-383.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-384.txt")
-      dest = "vk-list-384.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-385.txt")
-      dest = "vk-list-385.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-386.txt")
-      dest = "vk-list-386.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-387.txt")
-      dest = "vk-list-387.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-388.txt")
-      dest = "vk-list-388.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-389.txt")
-      dest = "vk-list-389.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-390.txt")
-      dest = "vk-list-390.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-391.txt")
-      dest = "vk-list-391.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-392.txt")
-      dest = "vk-list-392.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-393.txt")
-      dest = "vk-list-393.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-394.txt")
-      dest = "vk-list-394.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-395.txt")
-      dest = "vk-list-395.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-396.txt")
-      dest = "vk-list-396.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-397.txt")
-      dest = "vk-list-397.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-398.txt")
-      dest = "vk-list-398.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-399.txt")
-      dest = "vk-list-399.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-400.txt")
-      dest = "vk-list-400.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-401.txt")
-      dest = "vk-list-401.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-402.txt")
-      dest = "vk-list-402.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-403.txt")
-      dest = "vk-list-403.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-404.txt")
-      dest = "vk-list-404.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-405.txt")
-      dest = "vk-list-405.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-406.txt")
-      dest = "vk-list-406.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-407.txt")
-      dest = "vk-list-407.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-408.txt")
-      dest = "vk-list-408.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-409.txt")
-      dest = "vk-list-409.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-410.txt")
-      dest = "vk-list-410.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-411.txt")
-      dest = "vk-list-411.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-412.txt")
-      dest = "vk-list-412.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-413.txt")
-      dest = "vk-list-413.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-414.txt")
-      dest = "vk-list-414.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-415.txt")
-      dest = "vk-list-415.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-416.txt")
-      dest = "vk-list-416.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-417.txt")
-      dest = "vk-list-417.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-418.txt")
-      dest = "vk-list-418.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-419.txt")
-      dest = "vk-list-419.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-420.txt")
-      dest = "vk-list-420.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-421.txt")
-      dest = "vk-list-421.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-422.txt")
-      dest = "vk-list-422.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-423.txt")
-      dest = "vk-list-423.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-424.txt")
-      dest = "vk-list-424.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-425.txt")
-      dest = "vk-list-425.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-426.txt")
-      dest = "vk-list-426.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-427.txt")
-      dest = "vk-list-427.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-428.txt")
-      dest = "vk-list-428.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-429.txt")
-      dest = "vk-list-429.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-430.txt")
-      dest = "vk-list-430.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-431.txt")
-      dest = "vk-list-431.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-432.txt")
-      dest = "vk-list-432.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-433.txt")
-      dest = "vk-list-433.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-434.txt")
-      dest = "vk-list-434.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-435.txt")
-      dest = "vk-list-435.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-436.txt")
-      dest = "vk-list-436.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-437.txt")
-      dest = "vk-list-437.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-438.txt")
-      dest = "vk-list-438.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-439.txt")
-      dest = "vk-list-439.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-440.txt")
-      dest = "vk-list-440.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-441.txt")
-      dest = "vk-list-441.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-442.txt")
-      dest = "vk-list-442.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-443.txt")
-      dest = "vk-list-443.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-444.txt")
-      dest = "vk-list-444.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-445.txt")
-      dest = "vk-list-445.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-446.txt")
-      dest = "vk-list-446.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-447.txt")
-      dest = "vk-list-447.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-448.txt")
-      dest = "vk-list-448.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-449.txt")
-      dest = "vk-list-449.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-450.txt")
-      dest = "vk-list-450.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-451.txt")
-      dest = "vk-list-451.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-452.txt")
-      dest = "vk-list-452.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-453.txt")
-      dest = "vk-list-453.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-454.txt")
-      dest = "vk-list-454.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-455.txt")
-      dest = "vk-list-455.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-456.txt")
-      dest = "vk-list-456.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-457.txt")
-      dest = "vk-list-457.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-458.txt")
-      dest = "vk-list-458.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-459.txt")
-      dest = "vk-list-459.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-460.txt")
-      dest = "vk-list-460.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-461.txt")
-      dest = "vk-list-461.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-462.txt")
-      dest = "vk-list-462.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-463.txt")
-      dest = "vk-list-463.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-464.txt")
-      dest = "vk-list-464.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-465.txt")
-      dest = "vk-list-465.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-466.txt")
-      dest = "vk-list-466.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-467.txt")
-      dest = "vk-list-467.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-468.txt")
-      dest = "vk-list-468.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-469.txt")
-      dest = "vk-list-469.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-470.txt")
-      dest = "vk-list-470.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-471.txt")
-      dest = "vk-list-471.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-472.txt")
-      dest = "vk-list-472.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-473.txt")
-      dest = "vk-list-473.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-474.txt")
-      dest = "vk-list-474.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-475.txt")
-      dest = "vk-list-475.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-476.txt")
-      dest = "vk-list-476.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-477.txt")
-      dest = "vk-list-477.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-478.txt")
-      dest = "vk-list-478.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-479.txt")
-      dest = "vk-list-479.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-480.txt")
-      dest = "vk-list-480.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-481.txt")
-      dest = "vk-list-481.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-482.txt")
-      dest = "vk-list-482.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-483.txt")
-      dest = "vk-list-483.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-484.txt")
-      dest = "vk-list-484.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-485.txt")
-      dest = "vk-list-485.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-486.txt")
-      dest = "vk-list-486.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-487.txt")
-      dest = "vk-list-487.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-488.txt")
-      dest = "vk-list-488.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-489.txt")
-      dest = "vk-list-489.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-490.txt")
-      dest = "vk-list-490.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-491.txt")
-      dest = "vk-list-491.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-492.txt")
-      dest = "vk-list-492.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-493.txt")
-      dest = "vk-list-493.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-494.txt")
-      dest = "vk-list-494.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-495.txt")
-      dest = "vk-list-495.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-496.txt")
-      dest = "vk-list-496.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-497.txt")
-      dest = "vk-list-497.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-498.txt")
-      dest = "vk-list-498.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-499.txt")
-      dest = "vk-list-499.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-500.txt")
-      dest = "vk-list-500.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-501.txt")
-      dest = "vk-list-501.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-502.txt")
-      dest = "vk-list-502.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-503.txt")
-      dest = "vk-list-503.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-504.txt")
-      dest = "vk-list-504.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-505.txt")
-      dest = "vk-list-505.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-506.txt")
-      dest = "vk-list-506.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-507.txt")
-      dest = "vk-list-507.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-508.txt")
-      dest = "vk-list-508.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-509.txt")
-      dest = "vk-list-509.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-510.txt")
-      dest = "vk-list-510.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-511.txt")
-      dest = "vk-list-511.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-512.txt")
-      dest = "vk-list-512.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-513.txt")
-      dest = "vk-list-513.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-514.txt")
-      dest = "vk-list-514.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-515.txt")
-      dest = "vk-list-515.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-516.txt")
-      dest = "vk-list-516.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-517.txt")
-      dest = "vk-list-517.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-518.txt")
-      dest = "vk-list-518.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-519.txt")
-      dest = "vk-list-519.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-520.txt")
-      dest = "vk-list-520.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-521.txt")
-      dest = "vk-list-521.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-522.txt")
-      dest = "vk-list-522.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-523.txt")
-      dest = "vk-list-523.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-524.txt")
-      dest = "vk-list-524.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-525.txt")
-      dest = "vk-list-525.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-526.txt")
-      dest = "vk-list-526.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-527.txt")
-      dest = "vk-list-527.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-528.txt")
-      dest = "vk-list-528.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-529.txt")
-      dest = "vk-list-529.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-530.txt")
-      dest = "vk-list-530.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-531.txt")
-      dest = "vk-list-531.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-532.txt")
-      dest = "vk-list-532.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-533.txt")
-      dest = "vk-list-533.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-534.txt")
-      dest = "vk-list-534.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-535.txt")
-      dest = "vk-list-535.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-536.txt")
-      dest = "vk-list-536.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-537.txt")
-      dest = "vk-list-537.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-538.txt")
-      dest = "vk-list-538.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-539.txt")
-      dest = "vk-list-539.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-540.txt")
-      dest = "vk-list-540.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-541.txt")
-      dest = "vk-list-541.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-542.txt")
-      dest = "vk-list-542.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-543.txt")
-      dest = "vk-list-543.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-544.txt")
-      dest = "vk-list-544.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-545.txt")
-      dest = "vk-list-545.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-546.txt")
-      dest = "vk-list-546.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-547.txt")
-      dest = "vk-list-547.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-548.txt")
-      dest = "vk-list-548.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-549.txt")
-      dest = "vk-list-549.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-550.txt")
-      dest = "vk-list-550.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-551.txt")
-      dest = "vk-list-551.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-552.txt")
-      dest = "vk-list-552.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-553.txt")
-      dest = "vk-list-553.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-554.txt")
-      dest = "vk-list-554.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-555.txt")
-      dest = "vk-list-555.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-556.txt")
-      dest = "vk-list-556.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-557.txt")
-      dest = "vk-list-557.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-558.txt")
-      dest = "vk-list-558.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-559.txt")
-      dest = "vk-list-559.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-560.txt")
-      dest = "vk-list-560.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-561.txt")
-      dest = "vk-list-561.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-562.txt")
-      dest = "vk-list-562.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-563.txt")
-      dest = "vk-list-563.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-564.txt")
-      dest = "vk-list-564.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-565.txt")
-      dest = "vk-list-565.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-566.txt")
-      dest = "vk-list-566.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-567.txt")
-      dest = "vk-list-567.txt"
-    },
-    {
-      path = rebase_path("data/vulkan-568.txt")
-      dest = "vk-list-568.txt"
-    },
+}
+
+resource("vulkan-cts-003-data") {
+  sources = [ "data/vulkan-003.txt" ]
+  outputs = [ "data/vk-list-003.txt" ]
+}
+fuchsia_component("vulkan-cts-003") {
+  testonly = true
+  manifest = "meta/vulkan-cts-003.cmx"
+  deps = [
+    ":vulkan-cts-003-data",
+    "..:cts-deps",
   ]
-  resources += cts_resources
+}
+
+resource("vulkan-cts-004-data") {
+  sources = [ "data/vulkan-004.txt" ]
+  outputs = [ "data/vk-list-004.txt" ]
+}
+fuchsia_component("vulkan-cts-004") {
+  testonly = true
+  manifest = "meta/vulkan-cts-004.cmx"
+  deps = [
+    ":vulkan-cts-004-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-005-data") {
+  sources = [ "data/vulkan-005.txt" ]
+  outputs = [ "data/vk-list-005.txt" ]
+}
+fuchsia_component("vulkan-cts-005") {
+  testonly = true
+  manifest = "meta/vulkan-cts-005.cmx"
+  deps = [
+    ":vulkan-cts-005-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-006-data") {
+  sources = [ "data/vulkan-006.txt" ]
+  outputs = [ "data/vk-list-006.txt" ]
+}
+fuchsia_component("vulkan-cts-006") {
+  testonly = true
+  manifest = "meta/vulkan-cts-006.cmx"
+  deps = [
+    ":vulkan-cts-006-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-007-data") {
+  sources = [ "data/vulkan-007.txt" ]
+  outputs = [ "data/vk-list-007.txt" ]
+}
+fuchsia_component("vulkan-cts-007") {
+  testonly = true
+  manifest = "meta/vulkan-cts-007.cmx"
+  deps = [
+    ":vulkan-cts-007-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-008-data") {
+  sources = [ "data/vulkan-008.txt" ]
+  outputs = [ "data/vk-list-008.txt" ]
+}
+fuchsia_component("vulkan-cts-008") {
+  testonly = true
+  manifest = "meta/vulkan-cts-008.cmx"
+  deps = [
+    ":vulkan-cts-008-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-009-data") {
+  sources = [ "data/vulkan-009.txt" ]
+  outputs = [ "data/vk-list-009.txt" ]
+}
+fuchsia_component("vulkan-cts-009") {
+  testonly = true
+  manifest = "meta/vulkan-cts-009.cmx"
+  deps = [
+    ":vulkan-cts-009-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-010-data") {
+  sources = [ "data/vulkan-010.txt" ]
+  outputs = [ "data/vk-list-010.txt" ]
+}
+fuchsia_component("vulkan-cts-010") {
+  testonly = true
+  manifest = "meta/vulkan-cts-010.cmx"
+  deps = [
+    ":vulkan-cts-010-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-011-data") {
+  sources = [ "data/vulkan-011.txt" ]
+  outputs = [ "data/vk-list-011.txt" ]
+}
+fuchsia_component("vulkan-cts-011") {
+  testonly = true
+  manifest = "meta/vulkan-cts-011.cmx"
+  deps = [
+    ":vulkan-cts-011-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-012-data") {
+  sources = [ "data/vulkan-012.txt" ]
+  outputs = [ "data/vk-list-012.txt" ]
+}
+fuchsia_component("vulkan-cts-012") {
+  testonly = true
+  manifest = "meta/vulkan-cts-012.cmx"
+  deps = [
+    ":vulkan-cts-012-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-013-data") {
+  sources = [ "data/vulkan-013.txt" ]
+  outputs = [ "data/vk-list-013.txt" ]
+}
+fuchsia_component("vulkan-cts-013") {
+  testonly = true
+  manifest = "meta/vulkan-cts-013.cmx"
+  deps = [
+    ":vulkan-cts-013-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-014-data") {
+  sources = [ "data/vulkan-014.txt" ]
+  outputs = [ "data/vk-list-014.txt" ]
+}
+fuchsia_component("vulkan-cts-014") {
+  testonly = true
+  manifest = "meta/vulkan-cts-014.cmx"
+  deps = [
+    ":vulkan-cts-014-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-015-data") {
+  sources = [ "data/vulkan-015.txt" ]
+  outputs = [ "data/vk-list-015.txt" ]
+}
+fuchsia_component("vulkan-cts-015") {
+  testonly = true
+  manifest = "meta/vulkan-cts-015.cmx"
+  deps = [
+    ":vulkan-cts-015-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-016-data") {
+  sources = [ "data/vulkan-016.txt" ]
+  outputs = [ "data/vk-list-016.txt" ]
+}
+fuchsia_component("vulkan-cts-016") {
+  testonly = true
+  manifest = "meta/vulkan-cts-016.cmx"
+  deps = [
+    ":vulkan-cts-016-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-017-data") {
+  sources = [ "data/vulkan-017.txt" ]
+  outputs = [ "data/vk-list-017.txt" ]
+}
+fuchsia_component("vulkan-cts-017") {
+  testonly = true
+  manifest = "meta/vulkan-cts-017.cmx"
+  deps = [
+    ":vulkan-cts-017-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-018-data") {
+  sources = [ "data/vulkan-018.txt" ]
+  outputs = [ "data/vk-list-018.txt" ]
+}
+fuchsia_component("vulkan-cts-018") {
+  testonly = true
+  manifest = "meta/vulkan-cts-018.cmx"
+  deps = [
+    ":vulkan-cts-018-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-019-data") {
+  sources = [ "data/vulkan-019.txt" ]
+  outputs = [ "data/vk-list-019.txt" ]
+}
+fuchsia_component("vulkan-cts-019") {
+  testonly = true
+  manifest = "meta/vulkan-cts-019.cmx"
+  deps = [
+    ":vulkan-cts-019-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-020-data") {
+  sources = [ "data/vulkan-020.txt" ]
+  outputs = [ "data/vk-list-020.txt" ]
+}
+fuchsia_component("vulkan-cts-020") {
+  testonly = true
+  manifest = "meta/vulkan-cts-020.cmx"
+  deps = [
+    ":vulkan-cts-020-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-021-data") {
+  sources = [ "data/vulkan-021.txt" ]
+  outputs = [ "data/vk-list-021.txt" ]
+}
+fuchsia_component("vulkan-cts-021") {
+  testonly = true
+  manifest = "meta/vulkan-cts-021.cmx"
+  deps = [
+    ":vulkan-cts-021-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-022-data") {
+  sources = [ "data/vulkan-022.txt" ]
+  outputs = [ "data/vk-list-022.txt" ]
+}
+fuchsia_component("vulkan-cts-022") {
+  testonly = true
+  manifest = "meta/vulkan-cts-022.cmx"
+  deps = [
+    ":vulkan-cts-022-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-023-data") {
+  sources = [ "data/vulkan-023.txt" ]
+  outputs = [ "data/vk-list-023.txt" ]
+}
+fuchsia_component("vulkan-cts-023") {
+  testonly = true
+  manifest = "meta/vulkan-cts-023.cmx"
+  deps = [
+    ":vulkan-cts-023-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-024-data") {
+  sources = [ "data/vulkan-024.txt" ]
+  outputs = [ "data/vk-list-024.txt" ]
+}
+fuchsia_component("vulkan-cts-024") {
+  testonly = true
+  manifest = "meta/vulkan-cts-024.cmx"
+  deps = [
+    ":vulkan-cts-024-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-025-data") {
+  sources = [ "data/vulkan-025.txt" ]
+  outputs = [ "data/vk-list-025.txt" ]
+}
+fuchsia_component("vulkan-cts-025") {
+  testonly = true
+  manifest = "meta/vulkan-cts-025.cmx"
+  deps = [
+    ":vulkan-cts-025-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-026-data") {
+  sources = [ "data/vulkan-026.txt" ]
+  outputs = [ "data/vk-list-026.txt" ]
+}
+fuchsia_component("vulkan-cts-026") {
+  testonly = true
+  manifest = "meta/vulkan-cts-026.cmx"
+  deps = [
+    ":vulkan-cts-026-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-027-data") {
+  sources = [ "data/vulkan-027.txt" ]
+  outputs = [ "data/vk-list-027.txt" ]
+}
+fuchsia_component("vulkan-cts-027") {
+  testonly = true
+  manifest = "meta/vulkan-cts-027.cmx"
+  deps = [
+    ":vulkan-cts-027-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-028-data") {
+  sources = [ "data/vulkan-028.txt" ]
+  outputs = [ "data/vk-list-028.txt" ]
+}
+fuchsia_component("vulkan-cts-028") {
+  testonly = true
+  manifest = "meta/vulkan-cts-028.cmx"
+  deps = [
+    ":vulkan-cts-028-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-029-data") {
+  sources = [ "data/vulkan-029.txt" ]
+  outputs = [ "data/vk-list-029.txt" ]
+}
+fuchsia_component("vulkan-cts-029") {
+  testonly = true
+  manifest = "meta/vulkan-cts-029.cmx"
+  deps = [
+    ":vulkan-cts-029-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-030-data") {
+  sources = [ "data/vulkan-030.txt" ]
+  outputs = [ "data/vk-list-030.txt" ]
+}
+fuchsia_component("vulkan-cts-030") {
+  testonly = true
+  manifest = "meta/vulkan-cts-030.cmx"
+  deps = [
+    ":vulkan-cts-030-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-031-data") {
+  sources = [ "data/vulkan-031.txt" ]
+  outputs = [ "data/vk-list-031.txt" ]
+}
+fuchsia_component("vulkan-cts-031") {
+  testonly = true
+  manifest = "meta/vulkan-cts-031.cmx"
+  deps = [
+    ":vulkan-cts-031-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-032-data") {
+  sources = [ "data/vulkan-032.txt" ]
+  outputs = [ "data/vk-list-032.txt" ]
+}
+fuchsia_component("vulkan-cts-032") {
+  testonly = true
+  manifest = "meta/vulkan-cts-032.cmx"
+  deps = [
+    ":vulkan-cts-032-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-033-data") {
+  sources = [ "data/vulkan-033.txt" ]
+  outputs = [ "data/vk-list-033.txt" ]
+}
+fuchsia_component("vulkan-cts-033") {
+  testonly = true
+  manifest = "meta/vulkan-cts-033.cmx"
+  deps = [
+    ":vulkan-cts-033-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-034-data") {
+  sources = [ "data/vulkan-034.txt" ]
+  outputs = [ "data/vk-list-034.txt" ]
+}
+fuchsia_component("vulkan-cts-034") {
+  testonly = true
+  manifest = "meta/vulkan-cts-034.cmx"
+  deps = [
+    ":vulkan-cts-034-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-035-data") {
+  sources = [ "data/vulkan-035.txt" ]
+  outputs = [ "data/vk-list-035.txt" ]
+}
+fuchsia_component("vulkan-cts-035") {
+  testonly = true
+  manifest = "meta/vulkan-cts-035.cmx"
+  deps = [
+    ":vulkan-cts-035-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-036-data") {
+  sources = [ "data/vulkan-036.txt" ]
+  outputs = [ "data/vk-list-036.txt" ]
+}
+fuchsia_component("vulkan-cts-036") {
+  testonly = true
+  manifest = "meta/vulkan-cts-036.cmx"
+  deps = [
+    ":vulkan-cts-036-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-037-data") {
+  sources = [ "data/vulkan-037.txt" ]
+  outputs = [ "data/vk-list-037.txt" ]
+}
+fuchsia_component("vulkan-cts-037") {
+  testonly = true
+  manifest = "meta/vulkan-cts-037.cmx"
+  deps = [
+    ":vulkan-cts-037-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-038-data") {
+  sources = [ "data/vulkan-038.txt" ]
+  outputs = [ "data/vk-list-038.txt" ]
+}
+fuchsia_component("vulkan-cts-038") {
+  testonly = true
+  manifest = "meta/vulkan-cts-038.cmx"
+  deps = [
+    ":vulkan-cts-038-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-039-data") {
+  sources = [ "data/vulkan-039.txt" ]
+  outputs = [ "data/vk-list-039.txt" ]
+}
+fuchsia_component("vulkan-cts-039") {
+  testonly = true
+  manifest = "meta/vulkan-cts-039.cmx"
+  deps = [
+    ":vulkan-cts-039-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-040-data") {
+  sources = [ "data/vulkan-040.txt" ]
+  outputs = [ "data/vk-list-040.txt" ]
+}
+fuchsia_component("vulkan-cts-040") {
+  testonly = true
+  manifest = "meta/vulkan-cts-040.cmx"
+  deps = [
+    ":vulkan-cts-040-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-041-data") {
+  sources = [ "data/vulkan-041.txt" ]
+  outputs = [ "data/vk-list-041.txt" ]
+}
+fuchsia_component("vulkan-cts-041") {
+  testonly = true
+  manifest = "meta/vulkan-cts-041.cmx"
+  deps = [
+    ":vulkan-cts-041-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-042-data") {
+  sources = [ "data/vulkan-042.txt" ]
+  outputs = [ "data/vk-list-042.txt" ]
+}
+fuchsia_component("vulkan-cts-042") {
+  testonly = true
+  manifest = "meta/vulkan-cts-042.cmx"
+  deps = [
+    ":vulkan-cts-042-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-043-data") {
+  sources = [ "data/vulkan-043.txt" ]
+  outputs = [ "data/vk-list-043.txt" ]
+}
+fuchsia_component("vulkan-cts-043") {
+  testonly = true
+  manifest = "meta/vulkan-cts-043.cmx"
+  deps = [
+    ":vulkan-cts-043-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-044-data") {
+  sources = [ "data/vulkan-044.txt" ]
+  outputs = [ "data/vk-list-044.txt" ]
+}
+fuchsia_component("vulkan-cts-044") {
+  testonly = true
+  manifest = "meta/vulkan-cts-044.cmx"
+  deps = [
+    ":vulkan-cts-044-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-045-data") {
+  sources = [ "data/vulkan-045.txt" ]
+  outputs = [ "data/vk-list-045.txt" ]
+}
+fuchsia_component("vulkan-cts-045") {
+  testonly = true
+  manifest = "meta/vulkan-cts-045.cmx"
+  deps = [
+    ":vulkan-cts-045-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-046-data") {
+  sources = [ "data/vulkan-046.txt" ]
+  outputs = [ "data/vk-list-046.txt" ]
+}
+fuchsia_component("vulkan-cts-046") {
+  testonly = true
+  manifest = "meta/vulkan-cts-046.cmx"
+  deps = [
+    ":vulkan-cts-046-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-047-data") {
+  sources = [ "data/vulkan-047.txt" ]
+  outputs = [ "data/vk-list-047.txt" ]
+}
+fuchsia_component("vulkan-cts-047") {
+  testonly = true
+  manifest = "meta/vulkan-cts-047.cmx"
+  deps = [
+    ":vulkan-cts-047-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-048-data") {
+  sources = [ "data/vulkan-048.txt" ]
+  outputs = [ "data/vk-list-048.txt" ]
+}
+fuchsia_component("vulkan-cts-048") {
+  testonly = true
+  manifest = "meta/vulkan-cts-048.cmx"
+  deps = [
+    ":vulkan-cts-048-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-049-data") {
+  sources = [ "data/vulkan-049.txt" ]
+  outputs = [ "data/vk-list-049.txt" ]
+}
+fuchsia_component("vulkan-cts-049") {
+  testonly = true
+  manifest = "meta/vulkan-cts-049.cmx"
+  deps = [
+    ":vulkan-cts-049-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-050-data") {
+  sources = [ "data/vulkan-050.txt" ]
+  outputs = [ "data/vk-list-050.txt" ]
+}
+fuchsia_component("vulkan-cts-050") {
+  testonly = true
+  manifest = "meta/vulkan-cts-050.cmx"
+  deps = [
+    ":vulkan-cts-050-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-051-data") {
+  sources = [ "data/vulkan-051.txt" ]
+  outputs = [ "data/vk-list-051.txt" ]
+}
+fuchsia_component("vulkan-cts-051") {
+  testonly = true
+  manifest = "meta/vulkan-cts-051.cmx"
+  deps = [
+    ":vulkan-cts-051-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-052-data") {
+  sources = [ "data/vulkan-052.txt" ]
+  outputs = [ "data/vk-list-052.txt" ]
+}
+fuchsia_component("vulkan-cts-052") {
+  testonly = true
+  manifest = "meta/vulkan-cts-052.cmx"
+  deps = [
+    ":vulkan-cts-052-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-053-data") {
+  sources = [ "data/vulkan-053.txt" ]
+  outputs = [ "data/vk-list-053.txt" ]
+}
+fuchsia_component("vulkan-cts-053") {
+  testonly = true
+  manifest = "meta/vulkan-cts-053.cmx"
+  deps = [
+    ":vulkan-cts-053-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-054-data") {
+  sources = [ "data/vulkan-054.txt" ]
+  outputs = [ "data/vk-list-054.txt" ]
+}
+fuchsia_component("vulkan-cts-054") {
+  testonly = true
+  manifest = "meta/vulkan-cts-054.cmx"
+  deps = [
+    ":vulkan-cts-054-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-055-data") {
+  sources = [ "data/vulkan-055.txt" ]
+  outputs = [ "data/vk-list-055.txt" ]
+}
+fuchsia_component("vulkan-cts-055") {
+  testonly = true
+  manifest = "meta/vulkan-cts-055.cmx"
+  deps = [
+    ":vulkan-cts-055-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-056-data") {
+  sources = [ "data/vulkan-056.txt" ]
+  outputs = [ "data/vk-list-056.txt" ]
+}
+fuchsia_component("vulkan-cts-056") {
+  testonly = true
+  manifest = "meta/vulkan-cts-056.cmx"
+  deps = [
+    ":vulkan-cts-056-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-057-data") {
+  sources = [ "data/vulkan-057.txt" ]
+  outputs = [ "data/vk-list-057.txt" ]
+}
+fuchsia_component("vulkan-cts-057") {
+  testonly = true
+  manifest = "meta/vulkan-cts-057.cmx"
+  deps = [
+    ":vulkan-cts-057-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-058-data") {
+  sources = [ "data/vulkan-058.txt" ]
+  outputs = [ "data/vk-list-058.txt" ]
+}
+fuchsia_component("vulkan-cts-058") {
+  testonly = true
+  manifest = "meta/vulkan-cts-058.cmx"
+  deps = [
+    ":vulkan-cts-058-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-059-data") {
+  sources = [ "data/vulkan-059.txt" ]
+  outputs = [ "data/vk-list-059.txt" ]
+}
+fuchsia_component("vulkan-cts-059") {
+  testonly = true
+  manifest = "meta/vulkan-cts-059.cmx"
+  deps = [
+    ":vulkan-cts-059-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-060-data") {
+  sources = [ "data/vulkan-060.txt" ]
+  outputs = [ "data/vk-list-060.txt" ]
+}
+fuchsia_component("vulkan-cts-060") {
+  testonly = true
+  manifest = "meta/vulkan-cts-060.cmx"
+  deps = [
+    ":vulkan-cts-060-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-061-data") {
+  sources = [ "data/vulkan-061.txt" ]
+  outputs = [ "data/vk-list-061.txt" ]
+}
+fuchsia_component("vulkan-cts-061") {
+  testonly = true
+  manifest = "meta/vulkan-cts-061.cmx"
+  deps = [
+    ":vulkan-cts-061-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-062-data") {
+  sources = [ "data/vulkan-062.txt" ]
+  outputs = [ "data/vk-list-062.txt" ]
+}
+fuchsia_component("vulkan-cts-062") {
+  testonly = true
+  manifest = "meta/vulkan-cts-062.cmx"
+  deps = [
+    ":vulkan-cts-062-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-063-data") {
+  sources = [ "data/vulkan-063.txt" ]
+  outputs = [ "data/vk-list-063.txt" ]
+}
+fuchsia_component("vulkan-cts-063") {
+  testonly = true
+  manifest = "meta/vulkan-cts-063.cmx"
+  deps = [
+    ":vulkan-cts-063-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-064-data") {
+  sources = [ "data/vulkan-064.txt" ]
+  outputs = [ "data/vk-list-064.txt" ]
+}
+fuchsia_component("vulkan-cts-064") {
+  testonly = true
+  manifest = "meta/vulkan-cts-064.cmx"
+  deps = [
+    ":vulkan-cts-064-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-065-data") {
+  sources = [ "data/vulkan-065.txt" ]
+  outputs = [ "data/vk-list-065.txt" ]
+}
+fuchsia_component("vulkan-cts-065") {
+  testonly = true
+  manifest = "meta/vulkan-cts-065.cmx"
+  deps = [
+    ":vulkan-cts-065-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-066-data") {
+  sources = [ "data/vulkan-066.txt" ]
+  outputs = [ "data/vk-list-066.txt" ]
+}
+fuchsia_component("vulkan-cts-066") {
+  testonly = true
+  manifest = "meta/vulkan-cts-066.cmx"
+  deps = [
+    ":vulkan-cts-066-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-067-data") {
+  sources = [ "data/vulkan-067.txt" ]
+  outputs = [ "data/vk-list-067.txt" ]
+}
+fuchsia_component("vulkan-cts-067") {
+  testonly = true
+  manifest = "meta/vulkan-cts-067.cmx"
+  deps = [
+    ":vulkan-cts-067-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-068-data") {
+  sources = [ "data/vulkan-068.txt" ]
+  outputs = [ "data/vk-list-068.txt" ]
+}
+fuchsia_component("vulkan-cts-068") {
+  testonly = true
+  manifest = "meta/vulkan-cts-068.cmx"
+  deps = [
+    ":vulkan-cts-068-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-069-data") {
+  sources = [ "data/vulkan-069.txt" ]
+  outputs = [ "data/vk-list-069.txt" ]
+}
+fuchsia_component("vulkan-cts-069") {
+  testonly = true
+  manifest = "meta/vulkan-cts-069.cmx"
+  deps = [
+    ":vulkan-cts-069-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-070-data") {
+  sources = [ "data/vulkan-070.txt" ]
+  outputs = [ "data/vk-list-070.txt" ]
+}
+fuchsia_component("vulkan-cts-070") {
+  testonly = true
+  manifest = "meta/vulkan-cts-070.cmx"
+  deps = [
+    ":vulkan-cts-070-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-071-data") {
+  sources = [ "data/vulkan-071.txt" ]
+  outputs = [ "data/vk-list-071.txt" ]
+}
+fuchsia_component("vulkan-cts-071") {
+  testonly = true
+  manifest = "meta/vulkan-cts-071.cmx"
+  deps = [
+    ":vulkan-cts-071-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-072-data") {
+  sources = [ "data/vulkan-072.txt" ]
+  outputs = [ "data/vk-list-072.txt" ]
+}
+fuchsia_component("vulkan-cts-072") {
+  testonly = true
+  manifest = "meta/vulkan-cts-072.cmx"
+  deps = [
+    ":vulkan-cts-072-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-073-data") {
+  sources = [ "data/vulkan-073.txt" ]
+  outputs = [ "data/vk-list-073.txt" ]
+}
+fuchsia_component("vulkan-cts-073") {
+  testonly = true
+  manifest = "meta/vulkan-cts-073.cmx"
+  deps = [
+    ":vulkan-cts-073-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-074-data") {
+  sources = [ "data/vulkan-074.txt" ]
+  outputs = [ "data/vk-list-074.txt" ]
+}
+fuchsia_component("vulkan-cts-074") {
+  testonly = true
+  manifest = "meta/vulkan-cts-074.cmx"
+  deps = [
+    ":vulkan-cts-074-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-075-data") {
+  sources = [ "data/vulkan-075.txt" ]
+  outputs = [ "data/vk-list-075.txt" ]
+}
+fuchsia_component("vulkan-cts-075") {
+  testonly = true
+  manifest = "meta/vulkan-cts-075.cmx"
+  deps = [
+    ":vulkan-cts-075-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-076-data") {
+  sources = [ "data/vulkan-076.txt" ]
+  outputs = [ "data/vk-list-076.txt" ]
+}
+fuchsia_component("vulkan-cts-076") {
+  testonly = true
+  manifest = "meta/vulkan-cts-076.cmx"
+  deps = [
+    ":vulkan-cts-076-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-077-data") {
+  sources = [ "data/vulkan-077.txt" ]
+  outputs = [ "data/vk-list-077.txt" ]
+}
+fuchsia_component("vulkan-cts-077") {
+  testonly = true
+  manifest = "meta/vulkan-cts-077.cmx"
+  deps = [
+    ":vulkan-cts-077-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-078-data") {
+  sources = [ "data/vulkan-078.txt" ]
+  outputs = [ "data/vk-list-078.txt" ]
+}
+fuchsia_component("vulkan-cts-078") {
+  testonly = true
+  manifest = "meta/vulkan-cts-078.cmx"
+  deps = [
+    ":vulkan-cts-078-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-079-data") {
+  sources = [ "data/vulkan-079.txt" ]
+  outputs = [ "data/vk-list-079.txt" ]
+}
+fuchsia_component("vulkan-cts-079") {
+  testonly = true
+  manifest = "meta/vulkan-cts-079.cmx"
+  deps = [
+    ":vulkan-cts-079-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-080-data") {
+  sources = [ "data/vulkan-080.txt" ]
+  outputs = [ "data/vk-list-080.txt" ]
+}
+fuchsia_component("vulkan-cts-080") {
+  testonly = true
+  manifest = "meta/vulkan-cts-080.cmx"
+  deps = [
+    ":vulkan-cts-080-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-081-data") {
+  sources = [ "data/vulkan-081.txt" ]
+  outputs = [ "data/vk-list-081.txt" ]
+}
+fuchsia_component("vulkan-cts-081") {
+  testonly = true
+  manifest = "meta/vulkan-cts-081.cmx"
+  deps = [
+    ":vulkan-cts-081-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-082-data") {
+  sources = [ "data/vulkan-082.txt" ]
+  outputs = [ "data/vk-list-082.txt" ]
+}
+fuchsia_component("vulkan-cts-082") {
+  testonly = true
+  manifest = "meta/vulkan-cts-082.cmx"
+  deps = [
+    ":vulkan-cts-082-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-083-data") {
+  sources = [ "data/vulkan-083.txt" ]
+  outputs = [ "data/vk-list-083.txt" ]
+}
+fuchsia_component("vulkan-cts-083") {
+  testonly = true
+  manifest = "meta/vulkan-cts-083.cmx"
+  deps = [
+    ":vulkan-cts-083-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-084-data") {
+  sources = [ "data/vulkan-084.txt" ]
+  outputs = [ "data/vk-list-084.txt" ]
+}
+fuchsia_component("vulkan-cts-084") {
+  testonly = true
+  manifest = "meta/vulkan-cts-084.cmx"
+  deps = [
+    ":vulkan-cts-084-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-085-data") {
+  sources = [ "data/vulkan-085.txt" ]
+  outputs = [ "data/vk-list-085.txt" ]
+}
+fuchsia_component("vulkan-cts-085") {
+  testonly = true
+  manifest = "meta/vulkan-cts-085.cmx"
+  deps = [
+    ":vulkan-cts-085-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-086-data") {
+  sources = [ "data/vulkan-086.txt" ]
+  outputs = [ "data/vk-list-086.txt" ]
+}
+fuchsia_component("vulkan-cts-086") {
+  testonly = true
+  manifest = "meta/vulkan-cts-086.cmx"
+  deps = [
+    ":vulkan-cts-086-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-087-data") {
+  sources = [ "data/vulkan-087.txt" ]
+  outputs = [ "data/vk-list-087.txt" ]
+}
+fuchsia_component("vulkan-cts-087") {
+  testonly = true
+  manifest = "meta/vulkan-cts-087.cmx"
+  deps = [
+    ":vulkan-cts-087-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-088-data") {
+  sources = [ "data/vulkan-088.txt" ]
+  outputs = [ "data/vk-list-088.txt" ]
+}
+fuchsia_component("vulkan-cts-088") {
+  testonly = true
+  manifest = "meta/vulkan-cts-088.cmx"
+  deps = [
+    ":vulkan-cts-088-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-089-data") {
+  sources = [ "data/vulkan-089.txt" ]
+  outputs = [ "data/vk-list-089.txt" ]
+}
+fuchsia_component("vulkan-cts-089") {
+  testonly = true
+  manifest = "meta/vulkan-cts-089.cmx"
+  deps = [
+    ":vulkan-cts-089-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-090-data") {
+  sources = [ "data/vulkan-090.txt" ]
+  outputs = [ "data/vk-list-090.txt" ]
+}
+fuchsia_component("vulkan-cts-090") {
+  testonly = true
+  manifest = "meta/vulkan-cts-090.cmx"
+  deps = [
+    ":vulkan-cts-090-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-091-data") {
+  sources = [ "data/vulkan-091.txt" ]
+  outputs = [ "data/vk-list-091.txt" ]
+}
+fuchsia_component("vulkan-cts-091") {
+  testonly = true
+  manifest = "meta/vulkan-cts-091.cmx"
+  deps = [
+    ":vulkan-cts-091-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-092-data") {
+  sources = [ "data/vulkan-092.txt" ]
+  outputs = [ "data/vk-list-092.txt" ]
+}
+fuchsia_component("vulkan-cts-092") {
+  testonly = true
+  manifest = "meta/vulkan-cts-092.cmx"
+  deps = [
+    ":vulkan-cts-092-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-093-data") {
+  sources = [ "data/vulkan-093.txt" ]
+  outputs = [ "data/vk-list-093.txt" ]
+}
+fuchsia_component("vulkan-cts-093") {
+  testonly = true
+  manifest = "meta/vulkan-cts-093.cmx"
+  deps = [
+    ":vulkan-cts-093-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-094-data") {
+  sources = [ "data/vulkan-094.txt" ]
+  outputs = [ "data/vk-list-094.txt" ]
+}
+fuchsia_component("vulkan-cts-094") {
+  testonly = true
+  manifest = "meta/vulkan-cts-094.cmx"
+  deps = [
+    ":vulkan-cts-094-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-095-data") {
+  sources = [ "data/vulkan-095.txt" ]
+  outputs = [ "data/vk-list-095.txt" ]
+}
+fuchsia_component("vulkan-cts-095") {
+  testonly = true
+  manifest = "meta/vulkan-cts-095.cmx"
+  deps = [
+    ":vulkan-cts-095-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-096-data") {
+  sources = [ "data/vulkan-096.txt" ]
+  outputs = [ "data/vk-list-096.txt" ]
+}
+fuchsia_component("vulkan-cts-096") {
+  testonly = true
+  manifest = "meta/vulkan-cts-096.cmx"
+  deps = [
+    ":vulkan-cts-096-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-097-data") {
+  sources = [ "data/vulkan-097.txt" ]
+  outputs = [ "data/vk-list-097.txt" ]
+}
+fuchsia_component("vulkan-cts-097") {
+  testonly = true
+  manifest = "meta/vulkan-cts-097.cmx"
+  deps = [
+    ":vulkan-cts-097-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-098-data") {
+  sources = [ "data/vulkan-098.txt" ]
+  outputs = [ "data/vk-list-098.txt" ]
+}
+fuchsia_component("vulkan-cts-098") {
+  testonly = true
+  manifest = "meta/vulkan-cts-098.cmx"
+  deps = [
+    ":vulkan-cts-098-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-099-data") {
+  sources = [ "data/vulkan-099.txt" ]
+  outputs = [ "data/vk-list-099.txt" ]
+}
+fuchsia_component("vulkan-cts-099") {
+  testonly = true
+  manifest = "meta/vulkan-cts-099.cmx"
+  deps = [
+    ":vulkan-cts-099-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-100-data") {
+  sources = [ "data/vulkan-100.txt" ]
+  outputs = [ "data/vk-list-100.txt" ]
+}
+fuchsia_component("vulkan-cts-100") {
+  testonly = true
+  manifest = "meta/vulkan-cts-100.cmx"
+  deps = [
+    ":vulkan-cts-100-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-101-data") {
+  sources = [ "data/vulkan-101.txt" ]
+  outputs = [ "data/vk-list-101.txt" ]
+}
+fuchsia_component("vulkan-cts-101") {
+  testonly = true
+  manifest = "meta/vulkan-cts-101.cmx"
+  deps = [
+    ":vulkan-cts-101-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-102-data") {
+  sources = [ "data/vulkan-102.txt" ]
+  outputs = [ "data/vk-list-102.txt" ]
+}
+fuchsia_component("vulkan-cts-102") {
+  testonly = true
+  manifest = "meta/vulkan-cts-102.cmx"
+  deps = [
+    ":vulkan-cts-102-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-103-data") {
+  sources = [ "data/vulkan-103.txt" ]
+  outputs = [ "data/vk-list-103.txt" ]
+}
+fuchsia_component("vulkan-cts-103") {
+  testonly = true
+  manifest = "meta/vulkan-cts-103.cmx"
+  deps = [
+    ":vulkan-cts-103-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-104-data") {
+  sources = [ "data/vulkan-104.txt" ]
+  outputs = [ "data/vk-list-104.txt" ]
+}
+fuchsia_component("vulkan-cts-104") {
+  testonly = true
+  manifest = "meta/vulkan-cts-104.cmx"
+  deps = [
+    ":vulkan-cts-104-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-105-data") {
+  sources = [ "data/vulkan-105.txt" ]
+  outputs = [ "data/vk-list-105.txt" ]
+}
+fuchsia_component("vulkan-cts-105") {
+  testonly = true
+  manifest = "meta/vulkan-cts-105.cmx"
+  deps = [
+    ":vulkan-cts-105-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-106-data") {
+  sources = [ "data/vulkan-106.txt" ]
+  outputs = [ "data/vk-list-106.txt" ]
+}
+fuchsia_component("vulkan-cts-106") {
+  testonly = true
+  manifest = "meta/vulkan-cts-106.cmx"
+  deps = [
+    ":vulkan-cts-106-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-107-data") {
+  sources = [ "data/vulkan-107.txt" ]
+  outputs = [ "data/vk-list-107.txt" ]
+}
+fuchsia_component("vulkan-cts-107") {
+  testonly = true
+  manifest = "meta/vulkan-cts-107.cmx"
+  deps = [
+    ":vulkan-cts-107-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-108-data") {
+  sources = [ "data/vulkan-108.txt" ]
+  outputs = [ "data/vk-list-108.txt" ]
+}
+fuchsia_component("vulkan-cts-108") {
+  testonly = true
+  manifest = "meta/vulkan-cts-108.cmx"
+  deps = [
+    ":vulkan-cts-108-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-109-data") {
+  sources = [ "data/vulkan-109.txt" ]
+  outputs = [ "data/vk-list-109.txt" ]
+}
+fuchsia_component("vulkan-cts-109") {
+  testonly = true
+  manifest = "meta/vulkan-cts-109.cmx"
+  deps = [
+    ":vulkan-cts-109-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-110-data") {
+  sources = [ "data/vulkan-110.txt" ]
+  outputs = [ "data/vk-list-110.txt" ]
+}
+fuchsia_component("vulkan-cts-110") {
+  testonly = true
+  manifest = "meta/vulkan-cts-110.cmx"
+  deps = [
+    ":vulkan-cts-110-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-111-data") {
+  sources = [ "data/vulkan-111.txt" ]
+  outputs = [ "data/vk-list-111.txt" ]
+}
+fuchsia_component("vulkan-cts-111") {
+  testonly = true
+  manifest = "meta/vulkan-cts-111.cmx"
+  deps = [
+    ":vulkan-cts-111-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-112-data") {
+  sources = [ "data/vulkan-112.txt" ]
+  outputs = [ "data/vk-list-112.txt" ]
+}
+fuchsia_component("vulkan-cts-112") {
+  testonly = true
+  manifest = "meta/vulkan-cts-112.cmx"
+  deps = [
+    ":vulkan-cts-112-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-113-data") {
+  sources = [ "data/vulkan-113.txt" ]
+  outputs = [ "data/vk-list-113.txt" ]
+}
+fuchsia_component("vulkan-cts-113") {
+  testonly = true
+  manifest = "meta/vulkan-cts-113.cmx"
+  deps = [
+    ":vulkan-cts-113-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-114-data") {
+  sources = [ "data/vulkan-114.txt" ]
+  outputs = [ "data/vk-list-114.txt" ]
+}
+fuchsia_component("vulkan-cts-114") {
+  testonly = true
+  manifest = "meta/vulkan-cts-114.cmx"
+  deps = [
+    ":vulkan-cts-114-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-115-data") {
+  sources = [ "data/vulkan-115.txt" ]
+  outputs = [ "data/vk-list-115.txt" ]
+}
+fuchsia_component("vulkan-cts-115") {
+  testonly = true
+  manifest = "meta/vulkan-cts-115.cmx"
+  deps = [
+    ":vulkan-cts-115-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-116-data") {
+  sources = [ "data/vulkan-116.txt" ]
+  outputs = [ "data/vk-list-116.txt" ]
+}
+fuchsia_component("vulkan-cts-116") {
+  testonly = true
+  manifest = "meta/vulkan-cts-116.cmx"
+  deps = [
+    ":vulkan-cts-116-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-117-data") {
+  sources = [ "data/vulkan-117.txt" ]
+  outputs = [ "data/vk-list-117.txt" ]
+}
+fuchsia_component("vulkan-cts-117") {
+  testonly = true
+  manifest = "meta/vulkan-cts-117.cmx"
+  deps = [
+    ":vulkan-cts-117-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-118-data") {
+  sources = [ "data/vulkan-118.txt" ]
+  outputs = [ "data/vk-list-118.txt" ]
+}
+fuchsia_component("vulkan-cts-118") {
+  testonly = true
+  manifest = "meta/vulkan-cts-118.cmx"
+  deps = [
+    ":vulkan-cts-118-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-119-data") {
+  sources = [ "data/vulkan-119.txt" ]
+  outputs = [ "data/vk-list-119.txt" ]
+}
+fuchsia_component("vulkan-cts-119") {
+  testonly = true
+  manifest = "meta/vulkan-cts-119.cmx"
+  deps = [
+    ":vulkan-cts-119-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-120-data") {
+  sources = [ "data/vulkan-120.txt" ]
+  outputs = [ "data/vk-list-120.txt" ]
+}
+fuchsia_component("vulkan-cts-120") {
+  testonly = true
+  manifest = "meta/vulkan-cts-120.cmx"
+  deps = [
+    ":vulkan-cts-120-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-121-data") {
+  sources = [ "data/vulkan-121.txt" ]
+  outputs = [ "data/vk-list-121.txt" ]
+}
+fuchsia_component("vulkan-cts-121") {
+  testonly = true
+  manifest = "meta/vulkan-cts-121.cmx"
+  deps = [
+    ":vulkan-cts-121-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-122-data") {
+  sources = [ "data/vulkan-122.txt" ]
+  outputs = [ "data/vk-list-122.txt" ]
+}
+fuchsia_component("vulkan-cts-122") {
+  testonly = true
+  manifest = "meta/vulkan-cts-122.cmx"
+  deps = [
+    ":vulkan-cts-122-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-123-data") {
+  sources = [ "data/vulkan-123.txt" ]
+  outputs = [ "data/vk-list-123.txt" ]
+}
+fuchsia_component("vulkan-cts-123") {
+  testonly = true
+  manifest = "meta/vulkan-cts-123.cmx"
+  deps = [
+    ":vulkan-cts-123-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-124-data") {
+  sources = [ "data/vulkan-124.txt" ]
+  outputs = [ "data/vk-list-124.txt" ]
+}
+fuchsia_component("vulkan-cts-124") {
+  testonly = true
+  manifest = "meta/vulkan-cts-124.cmx"
+  deps = [
+    ":vulkan-cts-124-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-125-data") {
+  sources = [ "data/vulkan-125.txt" ]
+  outputs = [ "data/vk-list-125.txt" ]
+}
+fuchsia_component("vulkan-cts-125") {
+  testonly = true
+  manifest = "meta/vulkan-cts-125.cmx"
+  deps = [
+    ":vulkan-cts-125-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-126-data") {
+  sources = [ "data/vulkan-126.txt" ]
+  outputs = [ "data/vk-list-126.txt" ]
+}
+fuchsia_component("vulkan-cts-126") {
+  testonly = true
+  manifest = "meta/vulkan-cts-126.cmx"
+  deps = [
+    ":vulkan-cts-126-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-127-data") {
+  sources = [ "data/vulkan-127.txt" ]
+  outputs = [ "data/vk-list-127.txt" ]
+}
+fuchsia_component("vulkan-cts-127") {
+  testonly = true
+  manifest = "meta/vulkan-cts-127.cmx"
+  deps = [
+    ":vulkan-cts-127-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-128-data") {
+  sources = [ "data/vulkan-128.txt" ]
+  outputs = [ "data/vk-list-128.txt" ]
+}
+fuchsia_component("vulkan-cts-128") {
+  testonly = true
+  manifest = "meta/vulkan-cts-128.cmx"
+  deps = [
+    ":vulkan-cts-128-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-129-data") {
+  sources = [ "data/vulkan-129.txt" ]
+  outputs = [ "data/vk-list-129.txt" ]
+}
+fuchsia_component("vulkan-cts-129") {
+  testonly = true
+  manifest = "meta/vulkan-cts-129.cmx"
+  deps = [
+    ":vulkan-cts-129-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-130-data") {
+  sources = [ "data/vulkan-130.txt" ]
+  outputs = [ "data/vk-list-130.txt" ]
+}
+fuchsia_component("vulkan-cts-130") {
+  testonly = true
+  manifest = "meta/vulkan-cts-130.cmx"
+  deps = [
+    ":vulkan-cts-130-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-131-data") {
+  sources = [ "data/vulkan-131.txt" ]
+  outputs = [ "data/vk-list-131.txt" ]
+}
+fuchsia_component("vulkan-cts-131") {
+  testonly = true
+  manifest = "meta/vulkan-cts-131.cmx"
+  deps = [
+    ":vulkan-cts-131-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-132-data") {
+  sources = [ "data/vulkan-132.txt" ]
+  outputs = [ "data/vk-list-132.txt" ]
+}
+fuchsia_component("vulkan-cts-132") {
+  testonly = true
+  manifest = "meta/vulkan-cts-132.cmx"
+  deps = [
+    ":vulkan-cts-132-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-133-data") {
+  sources = [ "data/vulkan-133.txt" ]
+  outputs = [ "data/vk-list-133.txt" ]
+}
+fuchsia_component("vulkan-cts-133") {
+  testonly = true
+  manifest = "meta/vulkan-cts-133.cmx"
+  deps = [
+    ":vulkan-cts-133-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-134-data") {
+  sources = [ "data/vulkan-134.txt" ]
+  outputs = [ "data/vk-list-134.txt" ]
+}
+fuchsia_component("vulkan-cts-134") {
+  testonly = true
+  manifest = "meta/vulkan-cts-134.cmx"
+  deps = [
+    ":vulkan-cts-134-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-135-data") {
+  sources = [ "data/vulkan-135.txt" ]
+  outputs = [ "data/vk-list-135.txt" ]
+}
+fuchsia_component("vulkan-cts-135") {
+  testonly = true
+  manifest = "meta/vulkan-cts-135.cmx"
+  deps = [
+    ":vulkan-cts-135-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-136-data") {
+  sources = [ "data/vulkan-136.txt" ]
+  outputs = [ "data/vk-list-136.txt" ]
+}
+fuchsia_component("vulkan-cts-136") {
+  testonly = true
+  manifest = "meta/vulkan-cts-136.cmx"
+  deps = [
+    ":vulkan-cts-136-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-137-data") {
+  sources = [ "data/vulkan-137.txt" ]
+  outputs = [ "data/vk-list-137.txt" ]
+}
+fuchsia_component("vulkan-cts-137") {
+  testonly = true
+  manifest = "meta/vulkan-cts-137.cmx"
+  deps = [
+    ":vulkan-cts-137-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-138-data") {
+  sources = [ "data/vulkan-138.txt" ]
+  outputs = [ "data/vk-list-138.txt" ]
+}
+fuchsia_component("vulkan-cts-138") {
+  testonly = true
+  manifest = "meta/vulkan-cts-138.cmx"
+  deps = [
+    ":vulkan-cts-138-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-139-data") {
+  sources = [ "data/vulkan-139.txt" ]
+  outputs = [ "data/vk-list-139.txt" ]
+}
+fuchsia_component("vulkan-cts-139") {
+  testonly = true
+  manifest = "meta/vulkan-cts-139.cmx"
+  deps = [
+    ":vulkan-cts-139-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-140-data") {
+  sources = [ "data/vulkan-140.txt" ]
+  outputs = [ "data/vk-list-140.txt" ]
+}
+fuchsia_component("vulkan-cts-140") {
+  testonly = true
+  manifest = "meta/vulkan-cts-140.cmx"
+  deps = [
+    ":vulkan-cts-140-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-141-data") {
+  sources = [ "data/vulkan-141.txt" ]
+  outputs = [ "data/vk-list-141.txt" ]
+}
+fuchsia_component("vulkan-cts-141") {
+  testonly = true
+  manifest = "meta/vulkan-cts-141.cmx"
+  deps = [
+    ":vulkan-cts-141-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-142-data") {
+  sources = [ "data/vulkan-142.txt" ]
+  outputs = [ "data/vk-list-142.txt" ]
+}
+fuchsia_component("vulkan-cts-142") {
+  testonly = true
+  manifest = "meta/vulkan-cts-142.cmx"
+  deps = [
+    ":vulkan-cts-142-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-143-data") {
+  sources = [ "data/vulkan-143.txt" ]
+  outputs = [ "data/vk-list-143.txt" ]
+}
+fuchsia_component("vulkan-cts-143") {
+  testonly = true
+  manifest = "meta/vulkan-cts-143.cmx"
+  deps = [
+    ":vulkan-cts-143-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-144-data") {
+  sources = [ "data/vulkan-144.txt" ]
+  outputs = [ "data/vk-list-144.txt" ]
+}
+fuchsia_component("vulkan-cts-144") {
+  testonly = true
+  manifest = "meta/vulkan-cts-144.cmx"
+  deps = [
+    ":vulkan-cts-144-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-145-data") {
+  sources = [ "data/vulkan-145.txt" ]
+  outputs = [ "data/vk-list-145.txt" ]
+}
+fuchsia_component("vulkan-cts-145") {
+  testonly = true
+  manifest = "meta/vulkan-cts-145.cmx"
+  deps = [
+    ":vulkan-cts-145-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-146-data") {
+  sources = [ "data/vulkan-146.txt" ]
+  outputs = [ "data/vk-list-146.txt" ]
+}
+fuchsia_component("vulkan-cts-146") {
+  testonly = true
+  manifest = "meta/vulkan-cts-146.cmx"
+  deps = [
+    ":vulkan-cts-146-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-147-data") {
+  sources = [ "data/vulkan-147.txt" ]
+  outputs = [ "data/vk-list-147.txt" ]
+}
+fuchsia_component("vulkan-cts-147") {
+  testonly = true
+  manifest = "meta/vulkan-cts-147.cmx"
+  deps = [
+    ":vulkan-cts-147-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-148-data") {
+  sources = [ "data/vulkan-148.txt" ]
+  outputs = [ "data/vk-list-148.txt" ]
+}
+fuchsia_component("vulkan-cts-148") {
+  testonly = true
+  manifest = "meta/vulkan-cts-148.cmx"
+  deps = [
+    ":vulkan-cts-148-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-149-data") {
+  sources = [ "data/vulkan-149.txt" ]
+  outputs = [ "data/vk-list-149.txt" ]
+}
+fuchsia_component("vulkan-cts-149") {
+  testonly = true
+  manifest = "meta/vulkan-cts-149.cmx"
+  deps = [
+    ":vulkan-cts-149-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-150-data") {
+  sources = [ "data/vulkan-150.txt" ]
+  outputs = [ "data/vk-list-150.txt" ]
+}
+fuchsia_component("vulkan-cts-150") {
+  testonly = true
+  manifest = "meta/vulkan-cts-150.cmx"
+  deps = [
+    ":vulkan-cts-150-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-151-data") {
+  sources = [ "data/vulkan-151.txt" ]
+  outputs = [ "data/vk-list-151.txt" ]
+}
+fuchsia_component("vulkan-cts-151") {
+  testonly = true
+  manifest = "meta/vulkan-cts-151.cmx"
+  deps = [
+    ":vulkan-cts-151-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-152-data") {
+  sources = [ "data/vulkan-152.txt" ]
+  outputs = [ "data/vk-list-152.txt" ]
+}
+fuchsia_component("vulkan-cts-152") {
+  testonly = true
+  manifest = "meta/vulkan-cts-152.cmx"
+  deps = [
+    ":vulkan-cts-152-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-153-data") {
+  sources = [ "data/vulkan-153.txt" ]
+  outputs = [ "data/vk-list-153.txt" ]
+}
+fuchsia_component("vulkan-cts-153") {
+  testonly = true
+  manifest = "meta/vulkan-cts-153.cmx"
+  deps = [
+    ":vulkan-cts-153-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-154-data") {
+  sources = [ "data/vulkan-154.txt" ]
+  outputs = [ "data/vk-list-154.txt" ]
+}
+fuchsia_component("vulkan-cts-154") {
+  testonly = true
+  manifest = "meta/vulkan-cts-154.cmx"
+  deps = [
+    ":vulkan-cts-154-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-155-data") {
+  sources = [ "data/vulkan-155.txt" ]
+  outputs = [ "data/vk-list-155.txt" ]
+}
+fuchsia_component("vulkan-cts-155") {
+  testonly = true
+  manifest = "meta/vulkan-cts-155.cmx"
+  deps = [
+    ":vulkan-cts-155-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-156-data") {
+  sources = [ "data/vulkan-156.txt" ]
+  outputs = [ "data/vk-list-156.txt" ]
+}
+fuchsia_component("vulkan-cts-156") {
+  testonly = true
+  manifest = "meta/vulkan-cts-156.cmx"
+  deps = [
+    ":vulkan-cts-156-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-157-data") {
+  sources = [ "data/vulkan-157.txt" ]
+  outputs = [ "data/vk-list-157.txt" ]
+}
+fuchsia_component("vulkan-cts-157") {
+  testonly = true
+  manifest = "meta/vulkan-cts-157.cmx"
+  deps = [
+    ":vulkan-cts-157-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-158-data") {
+  sources = [ "data/vulkan-158.txt" ]
+  outputs = [ "data/vk-list-158.txt" ]
+}
+fuchsia_component("vulkan-cts-158") {
+  testonly = true
+  manifest = "meta/vulkan-cts-158.cmx"
+  deps = [
+    ":vulkan-cts-158-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-159-data") {
+  sources = [ "data/vulkan-159.txt" ]
+  outputs = [ "data/vk-list-159.txt" ]
+}
+fuchsia_component("vulkan-cts-159") {
+  testonly = true
+  manifest = "meta/vulkan-cts-159.cmx"
+  deps = [
+    ":vulkan-cts-159-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-160-data") {
+  sources = [ "data/vulkan-160.txt" ]
+  outputs = [ "data/vk-list-160.txt" ]
+}
+fuchsia_component("vulkan-cts-160") {
+  testonly = true
+  manifest = "meta/vulkan-cts-160.cmx"
+  deps = [
+    ":vulkan-cts-160-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-161-data") {
+  sources = [ "data/vulkan-161.txt" ]
+  outputs = [ "data/vk-list-161.txt" ]
+}
+fuchsia_component("vulkan-cts-161") {
+  testonly = true
+  manifest = "meta/vulkan-cts-161.cmx"
+  deps = [
+    ":vulkan-cts-161-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-162-data") {
+  sources = [ "data/vulkan-162.txt" ]
+  outputs = [ "data/vk-list-162.txt" ]
+}
+fuchsia_component("vulkan-cts-162") {
+  testonly = true
+  manifest = "meta/vulkan-cts-162.cmx"
+  deps = [
+    ":vulkan-cts-162-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-163-data") {
+  sources = [ "data/vulkan-163.txt" ]
+  outputs = [ "data/vk-list-163.txt" ]
+}
+fuchsia_component("vulkan-cts-163") {
+  testonly = true
+  manifest = "meta/vulkan-cts-163.cmx"
+  deps = [
+    ":vulkan-cts-163-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-164-data") {
+  sources = [ "data/vulkan-164.txt" ]
+  outputs = [ "data/vk-list-164.txt" ]
+}
+fuchsia_component("vulkan-cts-164") {
+  testonly = true
+  manifest = "meta/vulkan-cts-164.cmx"
+  deps = [
+    ":vulkan-cts-164-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-165-data") {
+  sources = [ "data/vulkan-165.txt" ]
+  outputs = [ "data/vk-list-165.txt" ]
+}
+fuchsia_component("vulkan-cts-165") {
+  testonly = true
+  manifest = "meta/vulkan-cts-165.cmx"
+  deps = [
+    ":vulkan-cts-165-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-166-data") {
+  sources = [ "data/vulkan-166.txt" ]
+  outputs = [ "data/vk-list-166.txt" ]
+}
+fuchsia_component("vulkan-cts-166") {
+  testonly = true
+  manifest = "meta/vulkan-cts-166.cmx"
+  deps = [
+    ":vulkan-cts-166-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-167-data") {
+  sources = [ "data/vulkan-167.txt" ]
+  outputs = [ "data/vk-list-167.txt" ]
+}
+fuchsia_component("vulkan-cts-167") {
+  testonly = true
+  manifest = "meta/vulkan-cts-167.cmx"
+  deps = [
+    ":vulkan-cts-167-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-168-data") {
+  sources = [ "data/vulkan-168.txt" ]
+  outputs = [ "data/vk-list-168.txt" ]
+}
+fuchsia_component("vulkan-cts-168") {
+  testonly = true
+  manifest = "meta/vulkan-cts-168.cmx"
+  deps = [
+    ":vulkan-cts-168-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-169-data") {
+  sources = [ "data/vulkan-169.txt" ]
+  outputs = [ "data/vk-list-169.txt" ]
+}
+fuchsia_component("vulkan-cts-169") {
+  testonly = true
+  manifest = "meta/vulkan-cts-169.cmx"
+  deps = [
+    ":vulkan-cts-169-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-170-data") {
+  sources = [ "data/vulkan-170.txt" ]
+  outputs = [ "data/vk-list-170.txt" ]
+}
+fuchsia_component("vulkan-cts-170") {
+  testonly = true
+  manifest = "meta/vulkan-cts-170.cmx"
+  deps = [
+    ":vulkan-cts-170-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-171-data") {
+  sources = [ "data/vulkan-171.txt" ]
+  outputs = [ "data/vk-list-171.txt" ]
+}
+fuchsia_component("vulkan-cts-171") {
+  testonly = true
+  manifest = "meta/vulkan-cts-171.cmx"
+  deps = [
+    ":vulkan-cts-171-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-172-data") {
+  sources = [ "data/vulkan-172.txt" ]
+  outputs = [ "data/vk-list-172.txt" ]
+}
+fuchsia_component("vulkan-cts-172") {
+  testonly = true
+  manifest = "meta/vulkan-cts-172.cmx"
+  deps = [
+    ":vulkan-cts-172-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-173-data") {
+  sources = [ "data/vulkan-173.txt" ]
+  outputs = [ "data/vk-list-173.txt" ]
+}
+fuchsia_component("vulkan-cts-173") {
+  testonly = true
+  manifest = "meta/vulkan-cts-173.cmx"
+  deps = [
+    ":vulkan-cts-173-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-174-data") {
+  sources = [ "data/vulkan-174.txt" ]
+  outputs = [ "data/vk-list-174.txt" ]
+}
+fuchsia_component("vulkan-cts-174") {
+  testonly = true
+  manifest = "meta/vulkan-cts-174.cmx"
+  deps = [
+    ":vulkan-cts-174-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-175-data") {
+  sources = [ "data/vulkan-175.txt" ]
+  outputs = [ "data/vk-list-175.txt" ]
+}
+fuchsia_component("vulkan-cts-175") {
+  testonly = true
+  manifest = "meta/vulkan-cts-175.cmx"
+  deps = [
+    ":vulkan-cts-175-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-176-data") {
+  sources = [ "data/vulkan-176.txt" ]
+  outputs = [ "data/vk-list-176.txt" ]
+}
+fuchsia_component("vulkan-cts-176") {
+  testonly = true
+  manifest = "meta/vulkan-cts-176.cmx"
+  deps = [
+    ":vulkan-cts-176-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-177-data") {
+  sources = [ "data/vulkan-177.txt" ]
+  outputs = [ "data/vk-list-177.txt" ]
+}
+fuchsia_component("vulkan-cts-177") {
+  testonly = true
+  manifest = "meta/vulkan-cts-177.cmx"
+  deps = [
+    ":vulkan-cts-177-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-178-data") {
+  sources = [ "data/vulkan-178.txt" ]
+  outputs = [ "data/vk-list-178.txt" ]
+}
+fuchsia_component("vulkan-cts-178") {
+  testonly = true
+  manifest = "meta/vulkan-cts-178.cmx"
+  deps = [
+    ":vulkan-cts-178-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-179-data") {
+  sources = [ "data/vulkan-179.txt" ]
+  outputs = [ "data/vk-list-179.txt" ]
+}
+fuchsia_component("vulkan-cts-179") {
+  testonly = true
+  manifest = "meta/vulkan-cts-179.cmx"
+  deps = [
+    ":vulkan-cts-179-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-180-data") {
+  sources = [ "data/vulkan-180.txt" ]
+  outputs = [ "data/vk-list-180.txt" ]
+}
+fuchsia_component("vulkan-cts-180") {
+  testonly = true
+  manifest = "meta/vulkan-cts-180.cmx"
+  deps = [
+    ":vulkan-cts-180-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-181-data") {
+  sources = [ "data/vulkan-181.txt" ]
+  outputs = [ "data/vk-list-181.txt" ]
+}
+fuchsia_component("vulkan-cts-181") {
+  testonly = true
+  manifest = "meta/vulkan-cts-181.cmx"
+  deps = [
+    ":vulkan-cts-181-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-182-data") {
+  sources = [ "data/vulkan-182.txt" ]
+  outputs = [ "data/vk-list-182.txt" ]
+}
+fuchsia_component("vulkan-cts-182") {
+  testonly = true
+  manifest = "meta/vulkan-cts-182.cmx"
+  deps = [
+    ":vulkan-cts-182-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-183-data") {
+  sources = [ "data/vulkan-183.txt" ]
+  outputs = [ "data/vk-list-183.txt" ]
+}
+fuchsia_component("vulkan-cts-183") {
+  testonly = true
+  manifest = "meta/vulkan-cts-183.cmx"
+  deps = [
+    ":vulkan-cts-183-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-184-data") {
+  sources = [ "data/vulkan-184.txt" ]
+  outputs = [ "data/vk-list-184.txt" ]
+}
+fuchsia_component("vulkan-cts-184") {
+  testonly = true
+  manifest = "meta/vulkan-cts-184.cmx"
+  deps = [
+    ":vulkan-cts-184-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-185-data") {
+  sources = [ "data/vulkan-185.txt" ]
+  outputs = [ "data/vk-list-185.txt" ]
+}
+fuchsia_component("vulkan-cts-185") {
+  testonly = true
+  manifest = "meta/vulkan-cts-185.cmx"
+  deps = [
+    ":vulkan-cts-185-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-186-data") {
+  sources = [ "data/vulkan-186.txt" ]
+  outputs = [ "data/vk-list-186.txt" ]
+}
+fuchsia_component("vulkan-cts-186") {
+  testonly = true
+  manifest = "meta/vulkan-cts-186.cmx"
+  deps = [
+    ":vulkan-cts-186-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-187-data") {
+  sources = [ "data/vulkan-187.txt" ]
+  outputs = [ "data/vk-list-187.txt" ]
+}
+fuchsia_component("vulkan-cts-187") {
+  testonly = true
+  manifest = "meta/vulkan-cts-187.cmx"
+  deps = [
+    ":vulkan-cts-187-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-188-data") {
+  sources = [ "data/vulkan-188.txt" ]
+  outputs = [ "data/vk-list-188.txt" ]
+}
+fuchsia_component("vulkan-cts-188") {
+  testonly = true
+  manifest = "meta/vulkan-cts-188.cmx"
+  deps = [
+    ":vulkan-cts-188-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-189-data") {
+  sources = [ "data/vulkan-189.txt" ]
+  outputs = [ "data/vk-list-189.txt" ]
+}
+fuchsia_component("vulkan-cts-189") {
+  testonly = true
+  manifest = "meta/vulkan-cts-189.cmx"
+  deps = [
+    ":vulkan-cts-189-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-190-data") {
+  sources = [ "data/vulkan-190.txt" ]
+  outputs = [ "data/vk-list-190.txt" ]
+}
+fuchsia_component("vulkan-cts-190") {
+  testonly = true
+  manifest = "meta/vulkan-cts-190.cmx"
+  deps = [
+    ":vulkan-cts-190-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-191-data") {
+  sources = [ "data/vulkan-191.txt" ]
+  outputs = [ "data/vk-list-191.txt" ]
+}
+fuchsia_component("vulkan-cts-191") {
+  testonly = true
+  manifest = "meta/vulkan-cts-191.cmx"
+  deps = [
+    ":vulkan-cts-191-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-192-data") {
+  sources = [ "data/vulkan-192.txt" ]
+  outputs = [ "data/vk-list-192.txt" ]
+}
+fuchsia_component("vulkan-cts-192") {
+  testonly = true
+  manifest = "meta/vulkan-cts-192.cmx"
+  deps = [
+    ":vulkan-cts-192-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-193-data") {
+  sources = [ "data/vulkan-193.txt" ]
+  outputs = [ "data/vk-list-193.txt" ]
+}
+fuchsia_component("vulkan-cts-193") {
+  testonly = true
+  manifest = "meta/vulkan-cts-193.cmx"
+  deps = [
+    ":vulkan-cts-193-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-194-data") {
+  sources = [ "data/vulkan-194.txt" ]
+  outputs = [ "data/vk-list-194.txt" ]
+}
+fuchsia_component("vulkan-cts-194") {
+  testonly = true
+  manifest = "meta/vulkan-cts-194.cmx"
+  deps = [
+    ":vulkan-cts-194-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-195-data") {
+  sources = [ "data/vulkan-195.txt" ]
+  outputs = [ "data/vk-list-195.txt" ]
+}
+fuchsia_component("vulkan-cts-195") {
+  testonly = true
+  manifest = "meta/vulkan-cts-195.cmx"
+  deps = [
+    ":vulkan-cts-195-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-196-data") {
+  sources = [ "data/vulkan-196.txt" ]
+  outputs = [ "data/vk-list-196.txt" ]
+}
+fuchsia_component("vulkan-cts-196") {
+  testonly = true
+  manifest = "meta/vulkan-cts-196.cmx"
+  deps = [
+    ":vulkan-cts-196-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-197-data") {
+  sources = [ "data/vulkan-197.txt" ]
+  outputs = [ "data/vk-list-197.txt" ]
+}
+fuchsia_component("vulkan-cts-197") {
+  testonly = true
+  manifest = "meta/vulkan-cts-197.cmx"
+  deps = [
+    ":vulkan-cts-197-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-198-data") {
+  sources = [ "data/vulkan-198.txt" ]
+  outputs = [ "data/vk-list-198.txt" ]
+}
+fuchsia_component("vulkan-cts-198") {
+  testonly = true
+  manifest = "meta/vulkan-cts-198.cmx"
+  deps = [
+    ":vulkan-cts-198-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-199-data") {
+  sources = [ "data/vulkan-199.txt" ]
+  outputs = [ "data/vk-list-199.txt" ]
+}
+fuchsia_component("vulkan-cts-199") {
+  testonly = true
+  manifest = "meta/vulkan-cts-199.cmx"
+  deps = [
+    ":vulkan-cts-199-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-200-data") {
+  sources = [ "data/vulkan-200.txt" ]
+  outputs = [ "data/vk-list-200.txt" ]
+}
+fuchsia_component("vulkan-cts-200") {
+  testonly = true
+  manifest = "meta/vulkan-cts-200.cmx"
+  deps = [
+    ":vulkan-cts-200-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-201-data") {
+  sources = [ "data/vulkan-201.txt" ]
+  outputs = [ "data/vk-list-201.txt" ]
+}
+fuchsia_component("vulkan-cts-201") {
+  testonly = true
+  manifest = "meta/vulkan-cts-201.cmx"
+  deps = [
+    ":vulkan-cts-201-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-202-data") {
+  sources = [ "data/vulkan-202.txt" ]
+  outputs = [ "data/vk-list-202.txt" ]
+}
+fuchsia_component("vulkan-cts-202") {
+  testonly = true
+  manifest = "meta/vulkan-cts-202.cmx"
+  deps = [
+    ":vulkan-cts-202-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-203-data") {
+  sources = [ "data/vulkan-203.txt" ]
+  outputs = [ "data/vk-list-203.txt" ]
+}
+fuchsia_component("vulkan-cts-203") {
+  testonly = true
+  manifest = "meta/vulkan-cts-203.cmx"
+  deps = [
+    ":vulkan-cts-203-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-204-data") {
+  sources = [ "data/vulkan-204.txt" ]
+  outputs = [ "data/vk-list-204.txt" ]
+}
+fuchsia_component("vulkan-cts-204") {
+  testonly = true
+  manifest = "meta/vulkan-cts-204.cmx"
+  deps = [
+    ":vulkan-cts-204-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-205-data") {
+  sources = [ "data/vulkan-205.txt" ]
+  outputs = [ "data/vk-list-205.txt" ]
+}
+fuchsia_component("vulkan-cts-205") {
+  testonly = true
+  manifest = "meta/vulkan-cts-205.cmx"
+  deps = [
+    ":vulkan-cts-205-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-206-data") {
+  sources = [ "data/vulkan-206.txt" ]
+  outputs = [ "data/vk-list-206.txt" ]
+}
+fuchsia_component("vulkan-cts-206") {
+  testonly = true
+  manifest = "meta/vulkan-cts-206.cmx"
+  deps = [
+    ":vulkan-cts-206-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-207-data") {
+  sources = [ "data/vulkan-207.txt" ]
+  outputs = [ "data/vk-list-207.txt" ]
+}
+fuchsia_component("vulkan-cts-207") {
+  testonly = true
+  manifest = "meta/vulkan-cts-207.cmx"
+  deps = [
+    ":vulkan-cts-207-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-208-data") {
+  sources = [ "data/vulkan-208.txt" ]
+  outputs = [ "data/vk-list-208.txt" ]
+}
+fuchsia_component("vulkan-cts-208") {
+  testonly = true
+  manifest = "meta/vulkan-cts-208.cmx"
+  deps = [
+    ":vulkan-cts-208-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-209-data") {
+  sources = [ "data/vulkan-209.txt" ]
+  outputs = [ "data/vk-list-209.txt" ]
+}
+fuchsia_component("vulkan-cts-209") {
+  testonly = true
+  manifest = "meta/vulkan-cts-209.cmx"
+  deps = [
+    ":vulkan-cts-209-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-210-data") {
+  sources = [ "data/vulkan-210.txt" ]
+  outputs = [ "data/vk-list-210.txt" ]
+}
+fuchsia_component("vulkan-cts-210") {
+  testonly = true
+  manifest = "meta/vulkan-cts-210.cmx"
+  deps = [
+    ":vulkan-cts-210-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-211-data") {
+  sources = [ "data/vulkan-211.txt" ]
+  outputs = [ "data/vk-list-211.txt" ]
+}
+fuchsia_component("vulkan-cts-211") {
+  testonly = true
+  manifest = "meta/vulkan-cts-211.cmx"
+  deps = [
+    ":vulkan-cts-211-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-212-data") {
+  sources = [ "data/vulkan-212.txt" ]
+  outputs = [ "data/vk-list-212.txt" ]
+}
+fuchsia_component("vulkan-cts-212") {
+  testonly = true
+  manifest = "meta/vulkan-cts-212.cmx"
+  deps = [
+    ":vulkan-cts-212-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-213-data") {
+  sources = [ "data/vulkan-213.txt" ]
+  outputs = [ "data/vk-list-213.txt" ]
+}
+fuchsia_component("vulkan-cts-213") {
+  testonly = true
+  manifest = "meta/vulkan-cts-213.cmx"
+  deps = [
+    ":vulkan-cts-213-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-214-data") {
+  sources = [ "data/vulkan-214.txt" ]
+  outputs = [ "data/vk-list-214.txt" ]
+}
+fuchsia_component("vulkan-cts-214") {
+  testonly = true
+  manifest = "meta/vulkan-cts-214.cmx"
+  deps = [
+    ":vulkan-cts-214-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-215-data") {
+  sources = [ "data/vulkan-215.txt" ]
+  outputs = [ "data/vk-list-215.txt" ]
+}
+fuchsia_component("vulkan-cts-215") {
+  testonly = true
+  manifest = "meta/vulkan-cts-215.cmx"
+  deps = [
+    ":vulkan-cts-215-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-216-data") {
+  sources = [ "data/vulkan-216.txt" ]
+  outputs = [ "data/vk-list-216.txt" ]
+}
+fuchsia_component("vulkan-cts-216") {
+  testonly = true
+  manifest = "meta/vulkan-cts-216.cmx"
+  deps = [
+    ":vulkan-cts-216-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-217-data") {
+  sources = [ "data/vulkan-217.txt" ]
+  outputs = [ "data/vk-list-217.txt" ]
+}
+fuchsia_component("vulkan-cts-217") {
+  testonly = true
+  manifest = "meta/vulkan-cts-217.cmx"
+  deps = [
+    ":vulkan-cts-217-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-218-data") {
+  sources = [ "data/vulkan-218.txt" ]
+  outputs = [ "data/vk-list-218.txt" ]
+}
+fuchsia_component("vulkan-cts-218") {
+  testonly = true
+  manifest = "meta/vulkan-cts-218.cmx"
+  deps = [
+    ":vulkan-cts-218-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-219-data") {
+  sources = [ "data/vulkan-219.txt" ]
+  outputs = [ "data/vk-list-219.txt" ]
+}
+fuchsia_component("vulkan-cts-219") {
+  testonly = true
+  manifest = "meta/vulkan-cts-219.cmx"
+  deps = [
+    ":vulkan-cts-219-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-220-data") {
+  sources = [ "data/vulkan-220.txt" ]
+  outputs = [ "data/vk-list-220.txt" ]
+}
+fuchsia_component("vulkan-cts-220") {
+  testonly = true
+  manifest = "meta/vulkan-cts-220.cmx"
+  deps = [
+    ":vulkan-cts-220-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-221-data") {
+  sources = [ "data/vulkan-221.txt" ]
+  outputs = [ "data/vk-list-221.txt" ]
+}
+fuchsia_component("vulkan-cts-221") {
+  testonly = true
+  manifest = "meta/vulkan-cts-221.cmx"
+  deps = [
+    ":vulkan-cts-221-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-222-data") {
+  sources = [ "data/vulkan-222.txt" ]
+  outputs = [ "data/vk-list-222.txt" ]
+}
+fuchsia_component("vulkan-cts-222") {
+  testonly = true
+  manifest = "meta/vulkan-cts-222.cmx"
+  deps = [
+    ":vulkan-cts-222-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-223-data") {
+  sources = [ "data/vulkan-223.txt" ]
+  outputs = [ "data/vk-list-223.txt" ]
+}
+fuchsia_component("vulkan-cts-223") {
+  testonly = true
+  manifest = "meta/vulkan-cts-223.cmx"
+  deps = [
+    ":vulkan-cts-223-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-224-data") {
+  sources = [ "data/vulkan-224.txt" ]
+  outputs = [ "data/vk-list-224.txt" ]
+}
+fuchsia_component("vulkan-cts-224") {
+  testonly = true
+  manifest = "meta/vulkan-cts-224.cmx"
+  deps = [
+    ":vulkan-cts-224-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-225-data") {
+  sources = [ "data/vulkan-225.txt" ]
+  outputs = [ "data/vk-list-225.txt" ]
+}
+fuchsia_component("vulkan-cts-225") {
+  testonly = true
+  manifest = "meta/vulkan-cts-225.cmx"
+  deps = [
+    ":vulkan-cts-225-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-226-data") {
+  sources = [ "data/vulkan-226.txt" ]
+  outputs = [ "data/vk-list-226.txt" ]
+}
+fuchsia_component("vulkan-cts-226") {
+  testonly = true
+  manifest = "meta/vulkan-cts-226.cmx"
+  deps = [
+    ":vulkan-cts-226-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-227-data") {
+  sources = [ "data/vulkan-227.txt" ]
+  outputs = [ "data/vk-list-227.txt" ]
+}
+fuchsia_component("vulkan-cts-227") {
+  testonly = true
+  manifest = "meta/vulkan-cts-227.cmx"
+  deps = [
+    ":vulkan-cts-227-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-228-data") {
+  sources = [ "data/vulkan-228.txt" ]
+  outputs = [ "data/vk-list-228.txt" ]
+}
+fuchsia_component("vulkan-cts-228") {
+  testonly = true
+  manifest = "meta/vulkan-cts-228.cmx"
+  deps = [
+    ":vulkan-cts-228-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-229-data") {
+  sources = [ "data/vulkan-229.txt" ]
+  outputs = [ "data/vk-list-229.txt" ]
+}
+fuchsia_component("vulkan-cts-229") {
+  testonly = true
+  manifest = "meta/vulkan-cts-229.cmx"
+  deps = [
+    ":vulkan-cts-229-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-230-data") {
+  sources = [ "data/vulkan-230.txt" ]
+  outputs = [ "data/vk-list-230.txt" ]
+}
+fuchsia_component("vulkan-cts-230") {
+  testonly = true
+  manifest = "meta/vulkan-cts-230.cmx"
+  deps = [
+    ":vulkan-cts-230-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-231-data") {
+  sources = [ "data/vulkan-231.txt" ]
+  outputs = [ "data/vk-list-231.txt" ]
+}
+fuchsia_component("vulkan-cts-231") {
+  testonly = true
+  manifest = "meta/vulkan-cts-231.cmx"
+  deps = [
+    ":vulkan-cts-231-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-232-data") {
+  sources = [ "data/vulkan-232.txt" ]
+  outputs = [ "data/vk-list-232.txt" ]
+}
+fuchsia_component("vulkan-cts-232") {
+  testonly = true
+  manifest = "meta/vulkan-cts-232.cmx"
+  deps = [
+    ":vulkan-cts-232-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-233-data") {
+  sources = [ "data/vulkan-233.txt" ]
+  outputs = [ "data/vk-list-233.txt" ]
+}
+fuchsia_component("vulkan-cts-233") {
+  testonly = true
+  manifest = "meta/vulkan-cts-233.cmx"
+  deps = [
+    ":vulkan-cts-233-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-234-data") {
+  sources = [ "data/vulkan-234.txt" ]
+  outputs = [ "data/vk-list-234.txt" ]
+}
+fuchsia_component("vulkan-cts-234") {
+  testonly = true
+  manifest = "meta/vulkan-cts-234.cmx"
+  deps = [
+    ":vulkan-cts-234-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-235-data") {
+  sources = [ "data/vulkan-235.txt" ]
+  outputs = [ "data/vk-list-235.txt" ]
+}
+fuchsia_component("vulkan-cts-235") {
+  testonly = true
+  manifest = "meta/vulkan-cts-235.cmx"
+  deps = [
+    ":vulkan-cts-235-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-236-data") {
+  sources = [ "data/vulkan-236.txt" ]
+  outputs = [ "data/vk-list-236.txt" ]
+}
+fuchsia_component("vulkan-cts-236") {
+  testonly = true
+  manifest = "meta/vulkan-cts-236.cmx"
+  deps = [
+    ":vulkan-cts-236-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-237-data") {
+  sources = [ "data/vulkan-237.txt" ]
+  outputs = [ "data/vk-list-237.txt" ]
+}
+fuchsia_component("vulkan-cts-237") {
+  testonly = true
+  manifest = "meta/vulkan-cts-237.cmx"
+  deps = [
+    ":vulkan-cts-237-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-238-data") {
+  sources = [ "data/vulkan-238.txt" ]
+  outputs = [ "data/vk-list-238.txt" ]
+}
+fuchsia_component("vulkan-cts-238") {
+  testonly = true
+  manifest = "meta/vulkan-cts-238.cmx"
+  deps = [
+    ":vulkan-cts-238-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-239-data") {
+  sources = [ "data/vulkan-239.txt" ]
+  outputs = [ "data/vk-list-239.txt" ]
+}
+fuchsia_component("vulkan-cts-239") {
+  testonly = true
+  manifest = "meta/vulkan-cts-239.cmx"
+  deps = [
+    ":vulkan-cts-239-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-240-data") {
+  sources = [ "data/vulkan-240.txt" ]
+  outputs = [ "data/vk-list-240.txt" ]
+}
+fuchsia_component("vulkan-cts-240") {
+  testonly = true
+  manifest = "meta/vulkan-cts-240.cmx"
+  deps = [
+    ":vulkan-cts-240-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-241-data") {
+  sources = [ "data/vulkan-241.txt" ]
+  outputs = [ "data/vk-list-241.txt" ]
+}
+fuchsia_component("vulkan-cts-241") {
+  testonly = true
+  manifest = "meta/vulkan-cts-241.cmx"
+  deps = [
+    ":vulkan-cts-241-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-242-data") {
+  sources = [ "data/vulkan-242.txt" ]
+  outputs = [ "data/vk-list-242.txt" ]
+}
+fuchsia_component("vulkan-cts-242") {
+  testonly = true
+  manifest = "meta/vulkan-cts-242.cmx"
+  deps = [
+    ":vulkan-cts-242-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-243-data") {
+  sources = [ "data/vulkan-243.txt" ]
+  outputs = [ "data/vk-list-243.txt" ]
+}
+fuchsia_component("vulkan-cts-243") {
+  testonly = true
+  manifest = "meta/vulkan-cts-243.cmx"
+  deps = [
+    ":vulkan-cts-243-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-244-data") {
+  sources = [ "data/vulkan-244.txt" ]
+  outputs = [ "data/vk-list-244.txt" ]
+}
+fuchsia_component("vulkan-cts-244") {
+  testonly = true
+  manifest = "meta/vulkan-cts-244.cmx"
+  deps = [
+    ":vulkan-cts-244-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-245-data") {
+  sources = [ "data/vulkan-245.txt" ]
+  outputs = [ "data/vk-list-245.txt" ]
+}
+fuchsia_component("vulkan-cts-245") {
+  testonly = true
+  manifest = "meta/vulkan-cts-245.cmx"
+  deps = [
+    ":vulkan-cts-245-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-246-data") {
+  sources = [ "data/vulkan-246.txt" ]
+  outputs = [ "data/vk-list-246.txt" ]
+}
+fuchsia_component("vulkan-cts-246") {
+  testonly = true
+  manifest = "meta/vulkan-cts-246.cmx"
+  deps = [
+    ":vulkan-cts-246-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-247-data") {
+  sources = [ "data/vulkan-247.txt" ]
+  outputs = [ "data/vk-list-247.txt" ]
+}
+fuchsia_component("vulkan-cts-247") {
+  testonly = true
+  manifest = "meta/vulkan-cts-247.cmx"
+  deps = [
+    ":vulkan-cts-247-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-248-data") {
+  sources = [ "data/vulkan-248.txt" ]
+  outputs = [ "data/vk-list-248.txt" ]
+}
+fuchsia_component("vulkan-cts-248") {
+  testonly = true
+  manifest = "meta/vulkan-cts-248.cmx"
+  deps = [
+    ":vulkan-cts-248-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-249-data") {
+  sources = [ "data/vulkan-249.txt" ]
+  outputs = [ "data/vk-list-249.txt" ]
+}
+fuchsia_component("vulkan-cts-249") {
+  testonly = true
+  manifest = "meta/vulkan-cts-249.cmx"
+  deps = [
+    ":vulkan-cts-249-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-250-data") {
+  sources = [ "data/vulkan-250.txt" ]
+  outputs = [ "data/vk-list-250.txt" ]
+}
+fuchsia_component("vulkan-cts-250") {
+  testonly = true
+  manifest = "meta/vulkan-cts-250.cmx"
+  deps = [
+    ":vulkan-cts-250-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-251-data") {
+  sources = [ "data/vulkan-251.txt" ]
+  outputs = [ "data/vk-list-251.txt" ]
+}
+fuchsia_component("vulkan-cts-251") {
+  testonly = true
+  manifest = "meta/vulkan-cts-251.cmx"
+  deps = [
+    ":vulkan-cts-251-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-252-data") {
+  sources = [ "data/vulkan-252.txt" ]
+  outputs = [ "data/vk-list-252.txt" ]
+}
+fuchsia_component("vulkan-cts-252") {
+  testonly = true
+  manifest = "meta/vulkan-cts-252.cmx"
+  deps = [
+    ":vulkan-cts-252-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-253-data") {
+  sources = [ "data/vulkan-253.txt" ]
+  outputs = [ "data/vk-list-253.txt" ]
+}
+fuchsia_component("vulkan-cts-253") {
+  testonly = true
+  manifest = "meta/vulkan-cts-253.cmx"
+  deps = [
+    ":vulkan-cts-253-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-254-data") {
+  sources = [ "data/vulkan-254.txt" ]
+  outputs = [ "data/vk-list-254.txt" ]
+}
+fuchsia_component("vulkan-cts-254") {
+  testonly = true
+  manifest = "meta/vulkan-cts-254.cmx"
+  deps = [
+    ":vulkan-cts-254-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-255-data") {
+  sources = [ "data/vulkan-255.txt" ]
+  outputs = [ "data/vk-list-255.txt" ]
+}
+fuchsia_component("vulkan-cts-255") {
+  testonly = true
+  manifest = "meta/vulkan-cts-255.cmx"
+  deps = [
+    ":vulkan-cts-255-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-256-data") {
+  sources = [ "data/vulkan-256.txt" ]
+  outputs = [ "data/vk-list-256.txt" ]
+}
+fuchsia_component("vulkan-cts-256") {
+  testonly = true
+  manifest = "meta/vulkan-cts-256.cmx"
+  deps = [
+    ":vulkan-cts-256-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-257-data") {
+  sources = [ "data/vulkan-257.txt" ]
+  outputs = [ "data/vk-list-257.txt" ]
+}
+fuchsia_component("vulkan-cts-257") {
+  testonly = true
+  manifest = "meta/vulkan-cts-257.cmx"
+  deps = [
+    ":vulkan-cts-257-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-258-data") {
+  sources = [ "data/vulkan-258.txt" ]
+  outputs = [ "data/vk-list-258.txt" ]
+}
+fuchsia_component("vulkan-cts-258") {
+  testonly = true
+  manifest = "meta/vulkan-cts-258.cmx"
+  deps = [
+    ":vulkan-cts-258-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-259-data") {
+  sources = [ "data/vulkan-259.txt" ]
+  outputs = [ "data/vk-list-259.txt" ]
+}
+fuchsia_component("vulkan-cts-259") {
+  testonly = true
+  manifest = "meta/vulkan-cts-259.cmx"
+  deps = [
+    ":vulkan-cts-259-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-260-data") {
+  sources = [ "data/vulkan-260.txt" ]
+  outputs = [ "data/vk-list-260.txt" ]
+}
+fuchsia_component("vulkan-cts-260") {
+  testonly = true
+  manifest = "meta/vulkan-cts-260.cmx"
+  deps = [
+    ":vulkan-cts-260-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-261-data") {
+  sources = [ "data/vulkan-261.txt" ]
+  outputs = [ "data/vk-list-261.txt" ]
+}
+fuchsia_component("vulkan-cts-261") {
+  testonly = true
+  manifest = "meta/vulkan-cts-261.cmx"
+  deps = [
+    ":vulkan-cts-261-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-262-data") {
+  sources = [ "data/vulkan-262.txt" ]
+  outputs = [ "data/vk-list-262.txt" ]
+}
+fuchsia_component("vulkan-cts-262") {
+  testonly = true
+  manifest = "meta/vulkan-cts-262.cmx"
+  deps = [
+    ":vulkan-cts-262-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-263-data") {
+  sources = [ "data/vulkan-263.txt" ]
+  outputs = [ "data/vk-list-263.txt" ]
+}
+fuchsia_component("vulkan-cts-263") {
+  testonly = true
+  manifest = "meta/vulkan-cts-263.cmx"
+  deps = [
+    ":vulkan-cts-263-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-264-data") {
+  sources = [ "data/vulkan-264.txt" ]
+  outputs = [ "data/vk-list-264.txt" ]
+}
+fuchsia_component("vulkan-cts-264") {
+  testonly = true
+  manifest = "meta/vulkan-cts-264.cmx"
+  deps = [
+    ":vulkan-cts-264-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-265-data") {
+  sources = [ "data/vulkan-265.txt" ]
+  outputs = [ "data/vk-list-265.txt" ]
+}
+fuchsia_component("vulkan-cts-265") {
+  testonly = true
+  manifest = "meta/vulkan-cts-265.cmx"
+  deps = [
+    ":vulkan-cts-265-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-266-data") {
+  sources = [ "data/vulkan-266.txt" ]
+  outputs = [ "data/vk-list-266.txt" ]
+}
+fuchsia_component("vulkan-cts-266") {
+  testonly = true
+  manifest = "meta/vulkan-cts-266.cmx"
+  deps = [
+    ":vulkan-cts-266-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-267-data") {
+  sources = [ "data/vulkan-267.txt" ]
+  outputs = [ "data/vk-list-267.txt" ]
+}
+fuchsia_component("vulkan-cts-267") {
+  testonly = true
+  manifest = "meta/vulkan-cts-267.cmx"
+  deps = [
+    ":vulkan-cts-267-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-268-data") {
+  sources = [ "data/vulkan-268.txt" ]
+  outputs = [ "data/vk-list-268.txt" ]
+}
+fuchsia_component("vulkan-cts-268") {
+  testonly = true
+  manifest = "meta/vulkan-cts-268.cmx"
+  deps = [
+    ":vulkan-cts-268-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-269-data") {
+  sources = [ "data/vulkan-269.txt" ]
+  outputs = [ "data/vk-list-269.txt" ]
+}
+fuchsia_component("vulkan-cts-269") {
+  testonly = true
+  manifest = "meta/vulkan-cts-269.cmx"
+  deps = [
+    ":vulkan-cts-269-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-270-data") {
+  sources = [ "data/vulkan-270.txt" ]
+  outputs = [ "data/vk-list-270.txt" ]
+}
+fuchsia_component("vulkan-cts-270") {
+  testonly = true
+  manifest = "meta/vulkan-cts-270.cmx"
+  deps = [
+    ":vulkan-cts-270-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-271-data") {
+  sources = [ "data/vulkan-271.txt" ]
+  outputs = [ "data/vk-list-271.txt" ]
+}
+fuchsia_component("vulkan-cts-271") {
+  testonly = true
+  manifest = "meta/vulkan-cts-271.cmx"
+  deps = [
+    ":vulkan-cts-271-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-272-data") {
+  sources = [ "data/vulkan-272.txt" ]
+  outputs = [ "data/vk-list-272.txt" ]
+}
+fuchsia_component("vulkan-cts-272") {
+  testonly = true
+  manifest = "meta/vulkan-cts-272.cmx"
+  deps = [
+    ":vulkan-cts-272-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-273-data") {
+  sources = [ "data/vulkan-273.txt" ]
+  outputs = [ "data/vk-list-273.txt" ]
+}
+fuchsia_component("vulkan-cts-273") {
+  testonly = true
+  manifest = "meta/vulkan-cts-273.cmx"
+  deps = [
+    ":vulkan-cts-273-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-274-data") {
+  sources = [ "data/vulkan-274.txt" ]
+  outputs = [ "data/vk-list-274.txt" ]
+}
+fuchsia_component("vulkan-cts-274") {
+  testonly = true
+  manifest = "meta/vulkan-cts-274.cmx"
+  deps = [
+    ":vulkan-cts-274-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-275-data") {
+  sources = [ "data/vulkan-275.txt" ]
+  outputs = [ "data/vk-list-275.txt" ]
+}
+fuchsia_component("vulkan-cts-275") {
+  testonly = true
+  manifest = "meta/vulkan-cts-275.cmx"
+  deps = [
+    ":vulkan-cts-275-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-276-data") {
+  sources = [ "data/vulkan-276.txt" ]
+  outputs = [ "data/vk-list-276.txt" ]
+}
+fuchsia_component("vulkan-cts-276") {
+  testonly = true
+  manifest = "meta/vulkan-cts-276.cmx"
+  deps = [
+    ":vulkan-cts-276-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-277-data") {
+  sources = [ "data/vulkan-277.txt" ]
+  outputs = [ "data/vk-list-277.txt" ]
+}
+fuchsia_component("vulkan-cts-277") {
+  testonly = true
+  manifest = "meta/vulkan-cts-277.cmx"
+  deps = [
+    ":vulkan-cts-277-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-278-data") {
+  sources = [ "data/vulkan-278.txt" ]
+  outputs = [ "data/vk-list-278.txt" ]
+}
+fuchsia_component("vulkan-cts-278") {
+  testonly = true
+  manifest = "meta/vulkan-cts-278.cmx"
+  deps = [
+    ":vulkan-cts-278-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-279-data") {
+  sources = [ "data/vulkan-279.txt" ]
+  outputs = [ "data/vk-list-279.txt" ]
+}
+fuchsia_component("vulkan-cts-279") {
+  testonly = true
+  manifest = "meta/vulkan-cts-279.cmx"
+  deps = [
+    ":vulkan-cts-279-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-280-data") {
+  sources = [ "data/vulkan-280.txt" ]
+  outputs = [ "data/vk-list-280.txt" ]
+}
+fuchsia_component("vulkan-cts-280") {
+  testonly = true
+  manifest = "meta/vulkan-cts-280.cmx"
+  deps = [
+    ":vulkan-cts-280-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-281-data") {
+  sources = [ "data/vulkan-281.txt" ]
+  outputs = [ "data/vk-list-281.txt" ]
+}
+fuchsia_component("vulkan-cts-281") {
+  testonly = true
+  manifest = "meta/vulkan-cts-281.cmx"
+  deps = [
+    ":vulkan-cts-281-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-282-data") {
+  sources = [ "data/vulkan-282.txt" ]
+  outputs = [ "data/vk-list-282.txt" ]
+}
+fuchsia_component("vulkan-cts-282") {
+  testonly = true
+  manifest = "meta/vulkan-cts-282.cmx"
+  deps = [
+    ":vulkan-cts-282-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-283-data") {
+  sources = [ "data/vulkan-283.txt" ]
+  outputs = [ "data/vk-list-283.txt" ]
+}
+fuchsia_component("vulkan-cts-283") {
+  testonly = true
+  manifest = "meta/vulkan-cts-283.cmx"
+  deps = [
+    ":vulkan-cts-283-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-284-data") {
+  sources = [ "data/vulkan-284.txt" ]
+  outputs = [ "data/vk-list-284.txt" ]
+}
+fuchsia_component("vulkan-cts-284") {
+  testonly = true
+  manifest = "meta/vulkan-cts-284.cmx"
+  deps = [
+    ":vulkan-cts-284-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-285-data") {
+  sources = [ "data/vulkan-285.txt" ]
+  outputs = [ "data/vk-list-285.txt" ]
+}
+fuchsia_component("vulkan-cts-285") {
+  testonly = true
+  manifest = "meta/vulkan-cts-285.cmx"
+  deps = [
+    ":vulkan-cts-285-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-286-data") {
+  sources = [ "data/vulkan-286.txt" ]
+  outputs = [ "data/vk-list-286.txt" ]
+}
+fuchsia_component("vulkan-cts-286") {
+  testonly = true
+  manifest = "meta/vulkan-cts-286.cmx"
+  deps = [
+    ":vulkan-cts-286-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-287-data") {
+  sources = [ "data/vulkan-287.txt" ]
+  outputs = [ "data/vk-list-287.txt" ]
+}
+fuchsia_component("vulkan-cts-287") {
+  testonly = true
+  manifest = "meta/vulkan-cts-287.cmx"
+  deps = [
+    ":vulkan-cts-287-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-288-data") {
+  sources = [ "data/vulkan-288.txt" ]
+  outputs = [ "data/vk-list-288.txt" ]
+}
+fuchsia_component("vulkan-cts-288") {
+  testonly = true
+  manifest = "meta/vulkan-cts-288.cmx"
+  deps = [
+    ":vulkan-cts-288-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-289-data") {
+  sources = [ "data/vulkan-289.txt" ]
+  outputs = [ "data/vk-list-289.txt" ]
+}
+fuchsia_component("vulkan-cts-289") {
+  testonly = true
+  manifest = "meta/vulkan-cts-289.cmx"
+  deps = [
+    ":vulkan-cts-289-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-290-data") {
+  sources = [ "data/vulkan-290.txt" ]
+  outputs = [ "data/vk-list-290.txt" ]
+}
+fuchsia_component("vulkan-cts-290") {
+  testonly = true
+  manifest = "meta/vulkan-cts-290.cmx"
+  deps = [
+    ":vulkan-cts-290-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-291-data") {
+  sources = [ "data/vulkan-291.txt" ]
+  outputs = [ "data/vk-list-291.txt" ]
+}
+fuchsia_component("vulkan-cts-291") {
+  testonly = true
+  manifest = "meta/vulkan-cts-291.cmx"
+  deps = [
+    ":vulkan-cts-291-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-292-data") {
+  sources = [ "data/vulkan-292.txt" ]
+  outputs = [ "data/vk-list-292.txt" ]
+}
+fuchsia_component("vulkan-cts-292") {
+  testonly = true
+  manifest = "meta/vulkan-cts-292.cmx"
+  deps = [
+    ":vulkan-cts-292-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-293-data") {
+  sources = [ "data/vulkan-293.txt" ]
+  outputs = [ "data/vk-list-293.txt" ]
+}
+fuchsia_component("vulkan-cts-293") {
+  testonly = true
+  manifest = "meta/vulkan-cts-293.cmx"
+  deps = [
+    ":vulkan-cts-293-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-294-data") {
+  sources = [ "data/vulkan-294.txt" ]
+  outputs = [ "data/vk-list-294.txt" ]
+}
+fuchsia_component("vulkan-cts-294") {
+  testonly = true
+  manifest = "meta/vulkan-cts-294.cmx"
+  deps = [
+    ":vulkan-cts-294-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-295-data") {
+  sources = [ "data/vulkan-295.txt" ]
+  outputs = [ "data/vk-list-295.txt" ]
+}
+fuchsia_component("vulkan-cts-295") {
+  testonly = true
+  manifest = "meta/vulkan-cts-295.cmx"
+  deps = [
+    ":vulkan-cts-295-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-296-data") {
+  sources = [ "data/vulkan-296.txt" ]
+  outputs = [ "data/vk-list-296.txt" ]
+}
+fuchsia_component("vulkan-cts-296") {
+  testonly = true
+  manifest = "meta/vulkan-cts-296.cmx"
+  deps = [
+    ":vulkan-cts-296-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-297-data") {
+  sources = [ "data/vulkan-297.txt" ]
+  outputs = [ "data/vk-list-297.txt" ]
+}
+fuchsia_component("vulkan-cts-297") {
+  testonly = true
+  manifest = "meta/vulkan-cts-297.cmx"
+  deps = [
+    ":vulkan-cts-297-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-298-data") {
+  sources = [ "data/vulkan-298.txt" ]
+  outputs = [ "data/vk-list-298.txt" ]
+}
+fuchsia_component("vulkan-cts-298") {
+  testonly = true
+  manifest = "meta/vulkan-cts-298.cmx"
+  deps = [
+    ":vulkan-cts-298-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-299-data") {
+  sources = [ "data/vulkan-299.txt" ]
+  outputs = [ "data/vk-list-299.txt" ]
+}
+fuchsia_component("vulkan-cts-299") {
+  testonly = true
+  manifest = "meta/vulkan-cts-299.cmx"
+  deps = [
+    ":vulkan-cts-299-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-300-data") {
+  sources = [ "data/vulkan-300.txt" ]
+  outputs = [ "data/vk-list-300.txt" ]
+}
+fuchsia_component("vulkan-cts-300") {
+  testonly = true
+  manifest = "meta/vulkan-cts-300.cmx"
+  deps = [
+    ":vulkan-cts-300-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-301-data") {
+  sources = [ "data/vulkan-301.txt" ]
+  outputs = [ "data/vk-list-301.txt" ]
+}
+fuchsia_component("vulkan-cts-301") {
+  testonly = true
+  manifest = "meta/vulkan-cts-301.cmx"
+  deps = [
+    ":vulkan-cts-301-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-302-data") {
+  sources = [ "data/vulkan-302.txt" ]
+  outputs = [ "data/vk-list-302.txt" ]
+}
+fuchsia_component("vulkan-cts-302") {
+  testonly = true
+  manifest = "meta/vulkan-cts-302.cmx"
+  deps = [
+    ":vulkan-cts-302-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-303-data") {
+  sources = [ "data/vulkan-303.txt" ]
+  outputs = [ "data/vk-list-303.txt" ]
+}
+fuchsia_component("vulkan-cts-303") {
+  testonly = true
+  manifest = "meta/vulkan-cts-303.cmx"
+  deps = [
+    ":vulkan-cts-303-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-304-data") {
+  sources = [ "data/vulkan-304.txt" ]
+  outputs = [ "data/vk-list-304.txt" ]
+}
+fuchsia_component("vulkan-cts-304") {
+  testonly = true
+  manifest = "meta/vulkan-cts-304.cmx"
+  deps = [
+    ":vulkan-cts-304-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-305-data") {
+  sources = [ "data/vulkan-305.txt" ]
+  outputs = [ "data/vk-list-305.txt" ]
+}
+fuchsia_component("vulkan-cts-305") {
+  testonly = true
+  manifest = "meta/vulkan-cts-305.cmx"
+  deps = [
+    ":vulkan-cts-305-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-306-data") {
+  sources = [ "data/vulkan-306.txt" ]
+  outputs = [ "data/vk-list-306.txt" ]
+}
+fuchsia_component("vulkan-cts-306") {
+  testonly = true
+  manifest = "meta/vulkan-cts-306.cmx"
+  deps = [
+    ":vulkan-cts-306-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-307-data") {
+  sources = [ "data/vulkan-307.txt" ]
+  outputs = [ "data/vk-list-307.txt" ]
+}
+fuchsia_component("vulkan-cts-307") {
+  testonly = true
+  manifest = "meta/vulkan-cts-307.cmx"
+  deps = [
+    ":vulkan-cts-307-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-308-data") {
+  sources = [ "data/vulkan-308.txt" ]
+  outputs = [ "data/vk-list-308.txt" ]
+}
+fuchsia_component("vulkan-cts-308") {
+  testonly = true
+  manifest = "meta/vulkan-cts-308.cmx"
+  deps = [
+    ":vulkan-cts-308-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-309-data") {
+  sources = [ "data/vulkan-309.txt" ]
+  outputs = [ "data/vk-list-309.txt" ]
+}
+fuchsia_component("vulkan-cts-309") {
+  testonly = true
+  manifest = "meta/vulkan-cts-309.cmx"
+  deps = [
+    ":vulkan-cts-309-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-310-data") {
+  sources = [ "data/vulkan-310.txt" ]
+  outputs = [ "data/vk-list-310.txt" ]
+}
+fuchsia_component("vulkan-cts-310") {
+  testonly = true
+  manifest = "meta/vulkan-cts-310.cmx"
+  deps = [
+    ":vulkan-cts-310-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-311-data") {
+  sources = [ "data/vulkan-311.txt" ]
+  outputs = [ "data/vk-list-311.txt" ]
+}
+fuchsia_component("vulkan-cts-311") {
+  testonly = true
+  manifest = "meta/vulkan-cts-311.cmx"
+  deps = [
+    ":vulkan-cts-311-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-312-data") {
+  sources = [ "data/vulkan-312.txt" ]
+  outputs = [ "data/vk-list-312.txt" ]
+}
+fuchsia_component("vulkan-cts-312") {
+  testonly = true
+  manifest = "meta/vulkan-cts-312.cmx"
+  deps = [
+    ":vulkan-cts-312-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-313-data") {
+  sources = [ "data/vulkan-313.txt" ]
+  outputs = [ "data/vk-list-313.txt" ]
+}
+fuchsia_component("vulkan-cts-313") {
+  testonly = true
+  manifest = "meta/vulkan-cts-313.cmx"
+  deps = [
+    ":vulkan-cts-313-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-314-data") {
+  sources = [ "data/vulkan-314.txt" ]
+  outputs = [ "data/vk-list-314.txt" ]
+}
+fuchsia_component("vulkan-cts-314") {
+  testonly = true
+  manifest = "meta/vulkan-cts-314.cmx"
+  deps = [
+    ":vulkan-cts-314-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-315-data") {
+  sources = [ "data/vulkan-315.txt" ]
+  outputs = [ "data/vk-list-315.txt" ]
+}
+fuchsia_component("vulkan-cts-315") {
+  testonly = true
+  manifest = "meta/vulkan-cts-315.cmx"
+  deps = [
+    ":vulkan-cts-315-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-316-data") {
+  sources = [ "data/vulkan-316.txt" ]
+  outputs = [ "data/vk-list-316.txt" ]
+}
+fuchsia_component("vulkan-cts-316") {
+  testonly = true
+  manifest = "meta/vulkan-cts-316.cmx"
+  deps = [
+    ":vulkan-cts-316-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-317-data") {
+  sources = [ "data/vulkan-317.txt" ]
+  outputs = [ "data/vk-list-317.txt" ]
+}
+fuchsia_component("vulkan-cts-317") {
+  testonly = true
+  manifest = "meta/vulkan-cts-317.cmx"
+  deps = [
+    ":vulkan-cts-317-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-318-data") {
+  sources = [ "data/vulkan-318.txt" ]
+  outputs = [ "data/vk-list-318.txt" ]
+}
+fuchsia_component("vulkan-cts-318") {
+  testonly = true
+  manifest = "meta/vulkan-cts-318.cmx"
+  deps = [
+    ":vulkan-cts-318-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-319-data") {
+  sources = [ "data/vulkan-319.txt" ]
+  outputs = [ "data/vk-list-319.txt" ]
+}
+fuchsia_component("vulkan-cts-319") {
+  testonly = true
+  manifest = "meta/vulkan-cts-319.cmx"
+  deps = [
+    ":vulkan-cts-319-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-320-data") {
+  sources = [ "data/vulkan-320.txt" ]
+  outputs = [ "data/vk-list-320.txt" ]
+}
+fuchsia_component("vulkan-cts-320") {
+  testonly = true
+  manifest = "meta/vulkan-cts-320.cmx"
+  deps = [
+    ":vulkan-cts-320-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-321-data") {
+  sources = [ "data/vulkan-321.txt" ]
+  outputs = [ "data/vk-list-321.txt" ]
+}
+fuchsia_component("vulkan-cts-321") {
+  testonly = true
+  manifest = "meta/vulkan-cts-321.cmx"
+  deps = [
+    ":vulkan-cts-321-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-322-data") {
+  sources = [ "data/vulkan-322.txt" ]
+  outputs = [ "data/vk-list-322.txt" ]
+}
+fuchsia_component("vulkan-cts-322") {
+  testonly = true
+  manifest = "meta/vulkan-cts-322.cmx"
+  deps = [
+    ":vulkan-cts-322-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-323-data") {
+  sources = [ "data/vulkan-323.txt" ]
+  outputs = [ "data/vk-list-323.txt" ]
+}
+fuchsia_component("vulkan-cts-323") {
+  testonly = true
+  manifest = "meta/vulkan-cts-323.cmx"
+  deps = [
+    ":vulkan-cts-323-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-324-data") {
+  sources = [ "data/vulkan-324.txt" ]
+  outputs = [ "data/vk-list-324.txt" ]
+}
+fuchsia_component("vulkan-cts-324") {
+  testonly = true
+  manifest = "meta/vulkan-cts-324.cmx"
+  deps = [
+    ":vulkan-cts-324-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-325-data") {
+  sources = [ "data/vulkan-325.txt" ]
+  outputs = [ "data/vk-list-325.txt" ]
+}
+fuchsia_component("vulkan-cts-325") {
+  testonly = true
+  manifest = "meta/vulkan-cts-325.cmx"
+  deps = [
+    ":vulkan-cts-325-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-326-data") {
+  sources = [ "data/vulkan-326.txt" ]
+  outputs = [ "data/vk-list-326.txt" ]
+}
+fuchsia_component("vulkan-cts-326") {
+  testonly = true
+  manifest = "meta/vulkan-cts-326.cmx"
+  deps = [
+    ":vulkan-cts-326-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-327-data") {
+  sources = [ "data/vulkan-327.txt" ]
+  outputs = [ "data/vk-list-327.txt" ]
+}
+fuchsia_component("vulkan-cts-327") {
+  testonly = true
+  manifest = "meta/vulkan-cts-327.cmx"
+  deps = [
+    ":vulkan-cts-327-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-328-data") {
+  sources = [ "data/vulkan-328.txt" ]
+  outputs = [ "data/vk-list-328.txt" ]
+}
+fuchsia_component("vulkan-cts-328") {
+  testonly = true
+  manifest = "meta/vulkan-cts-328.cmx"
+  deps = [
+    ":vulkan-cts-328-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-329-data") {
+  sources = [ "data/vulkan-329.txt" ]
+  outputs = [ "data/vk-list-329.txt" ]
+}
+fuchsia_component("vulkan-cts-329") {
+  testonly = true
+  manifest = "meta/vulkan-cts-329.cmx"
+  deps = [
+    ":vulkan-cts-329-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-330-data") {
+  sources = [ "data/vulkan-330.txt" ]
+  outputs = [ "data/vk-list-330.txt" ]
+}
+fuchsia_component("vulkan-cts-330") {
+  testonly = true
+  manifest = "meta/vulkan-cts-330.cmx"
+  deps = [
+    ":vulkan-cts-330-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-331-data") {
+  sources = [ "data/vulkan-331.txt" ]
+  outputs = [ "data/vk-list-331.txt" ]
+}
+fuchsia_component("vulkan-cts-331") {
+  testonly = true
+  manifest = "meta/vulkan-cts-331.cmx"
+  deps = [
+    ":vulkan-cts-331-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-332-data") {
+  sources = [ "data/vulkan-332.txt" ]
+  outputs = [ "data/vk-list-332.txt" ]
+}
+fuchsia_component("vulkan-cts-332") {
+  testonly = true
+  manifest = "meta/vulkan-cts-332.cmx"
+  deps = [
+    ":vulkan-cts-332-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-333-data") {
+  sources = [ "data/vulkan-333.txt" ]
+  outputs = [ "data/vk-list-333.txt" ]
+}
+fuchsia_component("vulkan-cts-333") {
+  testonly = true
+  manifest = "meta/vulkan-cts-333.cmx"
+  deps = [
+    ":vulkan-cts-333-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-334-data") {
+  sources = [ "data/vulkan-334.txt" ]
+  outputs = [ "data/vk-list-334.txt" ]
+}
+fuchsia_component("vulkan-cts-334") {
+  testonly = true
+  manifest = "meta/vulkan-cts-334.cmx"
+  deps = [
+    ":vulkan-cts-334-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-335-data") {
+  sources = [ "data/vulkan-335.txt" ]
+  outputs = [ "data/vk-list-335.txt" ]
+}
+fuchsia_component("vulkan-cts-335") {
+  testonly = true
+  manifest = "meta/vulkan-cts-335.cmx"
+  deps = [
+    ":vulkan-cts-335-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-336-data") {
+  sources = [ "data/vulkan-336.txt" ]
+  outputs = [ "data/vk-list-336.txt" ]
+}
+fuchsia_component("vulkan-cts-336") {
+  testonly = true
+  manifest = "meta/vulkan-cts-336.cmx"
+  deps = [
+    ":vulkan-cts-336-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-337-data") {
+  sources = [ "data/vulkan-337.txt" ]
+  outputs = [ "data/vk-list-337.txt" ]
+}
+fuchsia_component("vulkan-cts-337") {
+  testonly = true
+  manifest = "meta/vulkan-cts-337.cmx"
+  deps = [
+    ":vulkan-cts-337-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-338-data") {
+  sources = [ "data/vulkan-338.txt" ]
+  outputs = [ "data/vk-list-338.txt" ]
+}
+fuchsia_component("vulkan-cts-338") {
+  testonly = true
+  manifest = "meta/vulkan-cts-338.cmx"
+  deps = [
+    ":vulkan-cts-338-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-339-data") {
+  sources = [ "data/vulkan-339.txt" ]
+  outputs = [ "data/vk-list-339.txt" ]
+}
+fuchsia_component("vulkan-cts-339") {
+  testonly = true
+  manifest = "meta/vulkan-cts-339.cmx"
+  deps = [
+    ":vulkan-cts-339-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-340-data") {
+  sources = [ "data/vulkan-340.txt" ]
+  outputs = [ "data/vk-list-340.txt" ]
+}
+fuchsia_component("vulkan-cts-340") {
+  testonly = true
+  manifest = "meta/vulkan-cts-340.cmx"
+  deps = [
+    ":vulkan-cts-340-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-341-data") {
+  sources = [ "data/vulkan-341.txt" ]
+  outputs = [ "data/vk-list-341.txt" ]
+}
+fuchsia_component("vulkan-cts-341") {
+  testonly = true
+  manifest = "meta/vulkan-cts-341.cmx"
+  deps = [
+    ":vulkan-cts-341-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-342-data") {
+  sources = [ "data/vulkan-342.txt" ]
+  outputs = [ "data/vk-list-342.txt" ]
+}
+fuchsia_component("vulkan-cts-342") {
+  testonly = true
+  manifest = "meta/vulkan-cts-342.cmx"
+  deps = [
+    ":vulkan-cts-342-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-343-data") {
+  sources = [ "data/vulkan-343.txt" ]
+  outputs = [ "data/vk-list-343.txt" ]
+}
+fuchsia_component("vulkan-cts-343") {
+  testonly = true
+  manifest = "meta/vulkan-cts-343.cmx"
+  deps = [
+    ":vulkan-cts-343-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-344-data") {
+  sources = [ "data/vulkan-344.txt" ]
+  outputs = [ "data/vk-list-344.txt" ]
+}
+fuchsia_component("vulkan-cts-344") {
+  testonly = true
+  manifest = "meta/vulkan-cts-344.cmx"
+  deps = [
+    ":vulkan-cts-344-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-345-data") {
+  sources = [ "data/vulkan-345.txt" ]
+  outputs = [ "data/vk-list-345.txt" ]
+}
+fuchsia_component("vulkan-cts-345") {
+  testonly = true
+  manifest = "meta/vulkan-cts-345.cmx"
+  deps = [
+    ":vulkan-cts-345-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-346-data") {
+  sources = [ "data/vulkan-346.txt" ]
+  outputs = [ "data/vk-list-346.txt" ]
+}
+fuchsia_component("vulkan-cts-346") {
+  testonly = true
+  manifest = "meta/vulkan-cts-346.cmx"
+  deps = [
+    ":vulkan-cts-346-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-347-data") {
+  sources = [ "data/vulkan-347.txt" ]
+  outputs = [ "data/vk-list-347.txt" ]
+}
+fuchsia_component("vulkan-cts-347") {
+  testonly = true
+  manifest = "meta/vulkan-cts-347.cmx"
+  deps = [
+    ":vulkan-cts-347-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-348-data") {
+  sources = [ "data/vulkan-348.txt" ]
+  outputs = [ "data/vk-list-348.txt" ]
+}
+fuchsia_component("vulkan-cts-348") {
+  testonly = true
+  manifest = "meta/vulkan-cts-348.cmx"
+  deps = [
+    ":vulkan-cts-348-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-349-data") {
+  sources = [ "data/vulkan-349.txt" ]
+  outputs = [ "data/vk-list-349.txt" ]
+}
+fuchsia_component("vulkan-cts-349") {
+  testonly = true
+  manifest = "meta/vulkan-cts-349.cmx"
+  deps = [
+    ":vulkan-cts-349-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-350-data") {
+  sources = [ "data/vulkan-350.txt" ]
+  outputs = [ "data/vk-list-350.txt" ]
+}
+fuchsia_component("vulkan-cts-350") {
+  testonly = true
+  manifest = "meta/vulkan-cts-350.cmx"
+  deps = [
+    ":vulkan-cts-350-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-351-data") {
+  sources = [ "data/vulkan-351.txt" ]
+  outputs = [ "data/vk-list-351.txt" ]
+}
+fuchsia_component("vulkan-cts-351") {
+  testonly = true
+  manifest = "meta/vulkan-cts-351.cmx"
+  deps = [
+    ":vulkan-cts-351-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-352-data") {
+  sources = [ "data/vulkan-352.txt" ]
+  outputs = [ "data/vk-list-352.txt" ]
+}
+fuchsia_component("vulkan-cts-352") {
+  testonly = true
+  manifest = "meta/vulkan-cts-352.cmx"
+  deps = [
+    ":vulkan-cts-352-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-353-data") {
+  sources = [ "data/vulkan-353.txt" ]
+  outputs = [ "data/vk-list-353.txt" ]
+}
+fuchsia_component("vulkan-cts-353") {
+  testonly = true
+  manifest = "meta/vulkan-cts-353.cmx"
+  deps = [
+    ":vulkan-cts-353-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-354-data") {
+  sources = [ "data/vulkan-354.txt" ]
+  outputs = [ "data/vk-list-354.txt" ]
+}
+fuchsia_component("vulkan-cts-354") {
+  testonly = true
+  manifest = "meta/vulkan-cts-354.cmx"
+  deps = [
+    ":vulkan-cts-354-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-355-data") {
+  sources = [ "data/vulkan-355.txt" ]
+  outputs = [ "data/vk-list-355.txt" ]
+}
+fuchsia_component("vulkan-cts-355") {
+  testonly = true
+  manifest = "meta/vulkan-cts-355.cmx"
+  deps = [
+    ":vulkan-cts-355-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-356-data") {
+  sources = [ "data/vulkan-356.txt" ]
+  outputs = [ "data/vk-list-356.txt" ]
+}
+fuchsia_component("vulkan-cts-356") {
+  testonly = true
+  manifest = "meta/vulkan-cts-356.cmx"
+  deps = [
+    ":vulkan-cts-356-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-357-data") {
+  sources = [ "data/vulkan-357.txt" ]
+  outputs = [ "data/vk-list-357.txt" ]
+}
+fuchsia_component("vulkan-cts-357") {
+  testonly = true
+  manifest = "meta/vulkan-cts-357.cmx"
+  deps = [
+    ":vulkan-cts-357-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-358-data") {
+  sources = [ "data/vulkan-358.txt" ]
+  outputs = [ "data/vk-list-358.txt" ]
+}
+fuchsia_component("vulkan-cts-358") {
+  testonly = true
+  manifest = "meta/vulkan-cts-358.cmx"
+  deps = [
+    ":vulkan-cts-358-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-359-data") {
+  sources = [ "data/vulkan-359.txt" ]
+  outputs = [ "data/vk-list-359.txt" ]
+}
+fuchsia_component("vulkan-cts-359") {
+  testonly = true
+  manifest = "meta/vulkan-cts-359.cmx"
+  deps = [
+    ":vulkan-cts-359-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-360-data") {
+  sources = [ "data/vulkan-360.txt" ]
+  outputs = [ "data/vk-list-360.txt" ]
+}
+fuchsia_component("vulkan-cts-360") {
+  testonly = true
+  manifest = "meta/vulkan-cts-360.cmx"
+  deps = [
+    ":vulkan-cts-360-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-361-data") {
+  sources = [ "data/vulkan-361.txt" ]
+  outputs = [ "data/vk-list-361.txt" ]
+}
+fuchsia_component("vulkan-cts-361") {
+  testonly = true
+  manifest = "meta/vulkan-cts-361.cmx"
+  deps = [
+    ":vulkan-cts-361-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-362-data") {
+  sources = [ "data/vulkan-362.txt" ]
+  outputs = [ "data/vk-list-362.txt" ]
+}
+fuchsia_component("vulkan-cts-362") {
+  testonly = true
+  manifest = "meta/vulkan-cts-362.cmx"
+  deps = [
+    ":vulkan-cts-362-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-363-data") {
+  sources = [ "data/vulkan-363.txt" ]
+  outputs = [ "data/vk-list-363.txt" ]
+}
+fuchsia_component("vulkan-cts-363") {
+  testonly = true
+  manifest = "meta/vulkan-cts-363.cmx"
+  deps = [
+    ":vulkan-cts-363-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-364-data") {
+  sources = [ "data/vulkan-364.txt" ]
+  outputs = [ "data/vk-list-364.txt" ]
+}
+fuchsia_component("vulkan-cts-364") {
+  testonly = true
+  manifest = "meta/vulkan-cts-364.cmx"
+  deps = [
+    ":vulkan-cts-364-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-365-data") {
+  sources = [ "data/vulkan-365.txt" ]
+  outputs = [ "data/vk-list-365.txt" ]
+}
+fuchsia_component("vulkan-cts-365") {
+  testonly = true
+  manifest = "meta/vulkan-cts-365.cmx"
+  deps = [
+    ":vulkan-cts-365-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-366-data") {
+  sources = [ "data/vulkan-366.txt" ]
+  outputs = [ "data/vk-list-366.txt" ]
+}
+fuchsia_component("vulkan-cts-366") {
+  testonly = true
+  manifest = "meta/vulkan-cts-366.cmx"
+  deps = [
+    ":vulkan-cts-366-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-367-data") {
+  sources = [ "data/vulkan-367.txt" ]
+  outputs = [ "data/vk-list-367.txt" ]
+}
+fuchsia_component("vulkan-cts-367") {
+  testonly = true
+  manifest = "meta/vulkan-cts-367.cmx"
+  deps = [
+    ":vulkan-cts-367-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-368-data") {
+  sources = [ "data/vulkan-368.txt" ]
+  outputs = [ "data/vk-list-368.txt" ]
+}
+fuchsia_component("vulkan-cts-368") {
+  testonly = true
+  manifest = "meta/vulkan-cts-368.cmx"
+  deps = [
+    ":vulkan-cts-368-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-369-data") {
+  sources = [ "data/vulkan-369.txt" ]
+  outputs = [ "data/vk-list-369.txt" ]
+}
+fuchsia_component("vulkan-cts-369") {
+  testonly = true
+  manifest = "meta/vulkan-cts-369.cmx"
+  deps = [
+    ":vulkan-cts-369-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-370-data") {
+  sources = [ "data/vulkan-370.txt" ]
+  outputs = [ "data/vk-list-370.txt" ]
+}
+fuchsia_component("vulkan-cts-370") {
+  testonly = true
+  manifest = "meta/vulkan-cts-370.cmx"
+  deps = [
+    ":vulkan-cts-370-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-371-data") {
+  sources = [ "data/vulkan-371.txt" ]
+  outputs = [ "data/vk-list-371.txt" ]
+}
+fuchsia_component("vulkan-cts-371") {
+  testonly = true
+  manifest = "meta/vulkan-cts-371.cmx"
+  deps = [
+    ":vulkan-cts-371-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-372-data") {
+  sources = [ "data/vulkan-372.txt" ]
+  outputs = [ "data/vk-list-372.txt" ]
+}
+fuchsia_component("vulkan-cts-372") {
+  testonly = true
+  manifest = "meta/vulkan-cts-372.cmx"
+  deps = [
+    ":vulkan-cts-372-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-373-data") {
+  sources = [ "data/vulkan-373.txt" ]
+  outputs = [ "data/vk-list-373.txt" ]
+}
+fuchsia_component("vulkan-cts-373") {
+  testonly = true
+  manifest = "meta/vulkan-cts-373.cmx"
+  deps = [
+    ":vulkan-cts-373-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-374-data") {
+  sources = [ "data/vulkan-374.txt" ]
+  outputs = [ "data/vk-list-374.txt" ]
+}
+fuchsia_component("vulkan-cts-374") {
+  testonly = true
+  manifest = "meta/vulkan-cts-374.cmx"
+  deps = [
+    ":vulkan-cts-374-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-375-data") {
+  sources = [ "data/vulkan-375.txt" ]
+  outputs = [ "data/vk-list-375.txt" ]
+}
+fuchsia_component("vulkan-cts-375") {
+  testonly = true
+  manifest = "meta/vulkan-cts-375.cmx"
+  deps = [
+    ":vulkan-cts-375-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-376-data") {
+  sources = [ "data/vulkan-376.txt" ]
+  outputs = [ "data/vk-list-376.txt" ]
+}
+fuchsia_component("vulkan-cts-376") {
+  testonly = true
+  manifest = "meta/vulkan-cts-376.cmx"
+  deps = [
+    ":vulkan-cts-376-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-377-data") {
+  sources = [ "data/vulkan-377.txt" ]
+  outputs = [ "data/vk-list-377.txt" ]
+}
+fuchsia_component("vulkan-cts-377") {
+  testonly = true
+  manifest = "meta/vulkan-cts-377.cmx"
+  deps = [
+    ":vulkan-cts-377-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-378-data") {
+  sources = [ "data/vulkan-378.txt" ]
+  outputs = [ "data/vk-list-378.txt" ]
+}
+fuchsia_component("vulkan-cts-378") {
+  testonly = true
+  manifest = "meta/vulkan-cts-378.cmx"
+  deps = [
+    ":vulkan-cts-378-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-379-data") {
+  sources = [ "data/vulkan-379.txt" ]
+  outputs = [ "data/vk-list-379.txt" ]
+}
+fuchsia_component("vulkan-cts-379") {
+  testonly = true
+  manifest = "meta/vulkan-cts-379.cmx"
+  deps = [
+    ":vulkan-cts-379-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-380-data") {
+  sources = [ "data/vulkan-380.txt" ]
+  outputs = [ "data/vk-list-380.txt" ]
+}
+fuchsia_component("vulkan-cts-380") {
+  testonly = true
+  manifest = "meta/vulkan-cts-380.cmx"
+  deps = [
+    ":vulkan-cts-380-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-381-data") {
+  sources = [ "data/vulkan-381.txt" ]
+  outputs = [ "data/vk-list-381.txt" ]
+}
+fuchsia_component("vulkan-cts-381") {
+  testonly = true
+  manifest = "meta/vulkan-cts-381.cmx"
+  deps = [
+    ":vulkan-cts-381-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-382-data") {
+  sources = [ "data/vulkan-382.txt" ]
+  outputs = [ "data/vk-list-382.txt" ]
+}
+fuchsia_component("vulkan-cts-382") {
+  testonly = true
+  manifest = "meta/vulkan-cts-382.cmx"
+  deps = [
+    ":vulkan-cts-382-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-383-data") {
+  sources = [ "data/vulkan-383.txt" ]
+  outputs = [ "data/vk-list-383.txt" ]
+}
+fuchsia_component("vulkan-cts-383") {
+  testonly = true
+  manifest = "meta/vulkan-cts-383.cmx"
+  deps = [
+    ":vulkan-cts-383-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-384-data") {
+  sources = [ "data/vulkan-384.txt" ]
+  outputs = [ "data/vk-list-384.txt" ]
+}
+fuchsia_component("vulkan-cts-384") {
+  testonly = true
+  manifest = "meta/vulkan-cts-384.cmx"
+  deps = [
+    ":vulkan-cts-384-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-385-data") {
+  sources = [ "data/vulkan-385.txt" ]
+  outputs = [ "data/vk-list-385.txt" ]
+}
+fuchsia_component("vulkan-cts-385") {
+  testonly = true
+  manifest = "meta/vulkan-cts-385.cmx"
+  deps = [
+    ":vulkan-cts-385-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-386-data") {
+  sources = [ "data/vulkan-386.txt" ]
+  outputs = [ "data/vk-list-386.txt" ]
+}
+fuchsia_component("vulkan-cts-386") {
+  testonly = true
+  manifest = "meta/vulkan-cts-386.cmx"
+  deps = [
+    ":vulkan-cts-386-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-387-data") {
+  sources = [ "data/vulkan-387.txt" ]
+  outputs = [ "data/vk-list-387.txt" ]
+}
+fuchsia_component("vulkan-cts-387") {
+  testonly = true
+  manifest = "meta/vulkan-cts-387.cmx"
+  deps = [
+    ":vulkan-cts-387-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-388-data") {
+  sources = [ "data/vulkan-388.txt" ]
+  outputs = [ "data/vk-list-388.txt" ]
+}
+fuchsia_component("vulkan-cts-388") {
+  testonly = true
+  manifest = "meta/vulkan-cts-388.cmx"
+  deps = [
+    ":vulkan-cts-388-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-389-data") {
+  sources = [ "data/vulkan-389.txt" ]
+  outputs = [ "data/vk-list-389.txt" ]
+}
+fuchsia_component("vulkan-cts-389") {
+  testonly = true
+  manifest = "meta/vulkan-cts-389.cmx"
+  deps = [
+    ":vulkan-cts-389-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-390-data") {
+  sources = [ "data/vulkan-390.txt" ]
+  outputs = [ "data/vk-list-390.txt" ]
+}
+fuchsia_component("vulkan-cts-390") {
+  testonly = true
+  manifest = "meta/vulkan-cts-390.cmx"
+  deps = [
+    ":vulkan-cts-390-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-391-data") {
+  sources = [ "data/vulkan-391.txt" ]
+  outputs = [ "data/vk-list-391.txt" ]
+}
+fuchsia_component("vulkan-cts-391") {
+  testonly = true
+  manifest = "meta/vulkan-cts-391.cmx"
+  deps = [
+    ":vulkan-cts-391-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-392-data") {
+  sources = [ "data/vulkan-392.txt" ]
+  outputs = [ "data/vk-list-392.txt" ]
+}
+fuchsia_component("vulkan-cts-392") {
+  testonly = true
+  manifest = "meta/vulkan-cts-392.cmx"
+  deps = [
+    ":vulkan-cts-392-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-393-data") {
+  sources = [ "data/vulkan-393.txt" ]
+  outputs = [ "data/vk-list-393.txt" ]
+}
+fuchsia_component("vulkan-cts-393") {
+  testonly = true
+  manifest = "meta/vulkan-cts-393.cmx"
+  deps = [
+    ":vulkan-cts-393-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-394-data") {
+  sources = [ "data/vulkan-394.txt" ]
+  outputs = [ "data/vk-list-394.txt" ]
+}
+fuchsia_component("vulkan-cts-394") {
+  testonly = true
+  manifest = "meta/vulkan-cts-394.cmx"
+  deps = [
+    ":vulkan-cts-394-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-395-data") {
+  sources = [ "data/vulkan-395.txt" ]
+  outputs = [ "data/vk-list-395.txt" ]
+}
+fuchsia_component("vulkan-cts-395") {
+  testonly = true
+  manifest = "meta/vulkan-cts-395.cmx"
+  deps = [
+    ":vulkan-cts-395-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-396-data") {
+  sources = [ "data/vulkan-396.txt" ]
+  outputs = [ "data/vk-list-396.txt" ]
+}
+fuchsia_component("vulkan-cts-396") {
+  testonly = true
+  manifest = "meta/vulkan-cts-396.cmx"
+  deps = [
+    ":vulkan-cts-396-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-397-data") {
+  sources = [ "data/vulkan-397.txt" ]
+  outputs = [ "data/vk-list-397.txt" ]
+}
+fuchsia_component("vulkan-cts-397") {
+  testonly = true
+  manifest = "meta/vulkan-cts-397.cmx"
+  deps = [
+    ":vulkan-cts-397-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-398-data") {
+  sources = [ "data/vulkan-398.txt" ]
+  outputs = [ "data/vk-list-398.txt" ]
+}
+fuchsia_component("vulkan-cts-398") {
+  testonly = true
+  manifest = "meta/vulkan-cts-398.cmx"
+  deps = [
+    ":vulkan-cts-398-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-399-data") {
+  sources = [ "data/vulkan-399.txt" ]
+  outputs = [ "data/vk-list-399.txt" ]
+}
+fuchsia_component("vulkan-cts-399") {
+  testonly = true
+  manifest = "meta/vulkan-cts-399.cmx"
+  deps = [
+    ":vulkan-cts-399-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-400-data") {
+  sources = [ "data/vulkan-400.txt" ]
+  outputs = [ "data/vk-list-400.txt" ]
+}
+fuchsia_component("vulkan-cts-400") {
+  testonly = true
+  manifest = "meta/vulkan-cts-400.cmx"
+  deps = [
+    ":vulkan-cts-400-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-401-data") {
+  sources = [ "data/vulkan-401.txt" ]
+  outputs = [ "data/vk-list-401.txt" ]
+}
+fuchsia_component("vulkan-cts-401") {
+  testonly = true
+  manifest = "meta/vulkan-cts-401.cmx"
+  deps = [
+    ":vulkan-cts-401-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-402-data") {
+  sources = [ "data/vulkan-402.txt" ]
+  outputs = [ "data/vk-list-402.txt" ]
+}
+fuchsia_component("vulkan-cts-402") {
+  testonly = true
+  manifest = "meta/vulkan-cts-402.cmx"
+  deps = [
+    ":vulkan-cts-402-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-403-data") {
+  sources = [ "data/vulkan-403.txt" ]
+  outputs = [ "data/vk-list-403.txt" ]
+}
+fuchsia_component("vulkan-cts-403") {
+  testonly = true
+  manifest = "meta/vulkan-cts-403.cmx"
+  deps = [
+    ":vulkan-cts-403-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-404-data") {
+  sources = [ "data/vulkan-404.txt" ]
+  outputs = [ "data/vk-list-404.txt" ]
+}
+fuchsia_component("vulkan-cts-404") {
+  testonly = true
+  manifest = "meta/vulkan-cts-404.cmx"
+  deps = [
+    ":vulkan-cts-404-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-405-data") {
+  sources = [ "data/vulkan-405.txt" ]
+  outputs = [ "data/vk-list-405.txt" ]
+}
+fuchsia_component("vulkan-cts-405") {
+  testonly = true
+  manifest = "meta/vulkan-cts-405.cmx"
+  deps = [
+    ":vulkan-cts-405-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-406-data") {
+  sources = [ "data/vulkan-406.txt" ]
+  outputs = [ "data/vk-list-406.txt" ]
+}
+fuchsia_component("vulkan-cts-406") {
+  testonly = true
+  manifest = "meta/vulkan-cts-406.cmx"
+  deps = [
+    ":vulkan-cts-406-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-407-data") {
+  sources = [ "data/vulkan-407.txt" ]
+  outputs = [ "data/vk-list-407.txt" ]
+}
+fuchsia_component("vulkan-cts-407") {
+  testonly = true
+  manifest = "meta/vulkan-cts-407.cmx"
+  deps = [
+    ":vulkan-cts-407-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-408-data") {
+  sources = [ "data/vulkan-408.txt" ]
+  outputs = [ "data/vk-list-408.txt" ]
+}
+fuchsia_component("vulkan-cts-408") {
+  testonly = true
+  manifest = "meta/vulkan-cts-408.cmx"
+  deps = [
+    ":vulkan-cts-408-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-409-data") {
+  sources = [ "data/vulkan-409.txt" ]
+  outputs = [ "data/vk-list-409.txt" ]
+}
+fuchsia_component("vulkan-cts-409") {
+  testonly = true
+  manifest = "meta/vulkan-cts-409.cmx"
+  deps = [
+    ":vulkan-cts-409-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-410-data") {
+  sources = [ "data/vulkan-410.txt" ]
+  outputs = [ "data/vk-list-410.txt" ]
+}
+fuchsia_component("vulkan-cts-410") {
+  testonly = true
+  manifest = "meta/vulkan-cts-410.cmx"
+  deps = [
+    ":vulkan-cts-410-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-411-data") {
+  sources = [ "data/vulkan-411.txt" ]
+  outputs = [ "data/vk-list-411.txt" ]
+}
+fuchsia_component("vulkan-cts-411") {
+  testonly = true
+  manifest = "meta/vulkan-cts-411.cmx"
+  deps = [
+    ":vulkan-cts-411-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-412-data") {
+  sources = [ "data/vulkan-412.txt" ]
+  outputs = [ "data/vk-list-412.txt" ]
+}
+fuchsia_component("vulkan-cts-412") {
+  testonly = true
+  manifest = "meta/vulkan-cts-412.cmx"
+  deps = [
+    ":vulkan-cts-412-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-413-data") {
+  sources = [ "data/vulkan-413.txt" ]
+  outputs = [ "data/vk-list-413.txt" ]
+}
+fuchsia_component("vulkan-cts-413") {
+  testonly = true
+  manifest = "meta/vulkan-cts-413.cmx"
+  deps = [
+    ":vulkan-cts-413-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-414-data") {
+  sources = [ "data/vulkan-414.txt" ]
+  outputs = [ "data/vk-list-414.txt" ]
+}
+fuchsia_component("vulkan-cts-414") {
+  testonly = true
+  manifest = "meta/vulkan-cts-414.cmx"
+  deps = [
+    ":vulkan-cts-414-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-415-data") {
+  sources = [ "data/vulkan-415.txt" ]
+  outputs = [ "data/vk-list-415.txt" ]
+}
+fuchsia_component("vulkan-cts-415") {
+  testonly = true
+  manifest = "meta/vulkan-cts-415.cmx"
+  deps = [
+    ":vulkan-cts-415-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-416-data") {
+  sources = [ "data/vulkan-416.txt" ]
+  outputs = [ "data/vk-list-416.txt" ]
+}
+fuchsia_component("vulkan-cts-416") {
+  testonly = true
+  manifest = "meta/vulkan-cts-416.cmx"
+  deps = [
+    ":vulkan-cts-416-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-417-data") {
+  sources = [ "data/vulkan-417.txt" ]
+  outputs = [ "data/vk-list-417.txt" ]
+}
+fuchsia_component("vulkan-cts-417") {
+  testonly = true
+  manifest = "meta/vulkan-cts-417.cmx"
+  deps = [
+    ":vulkan-cts-417-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-418-data") {
+  sources = [ "data/vulkan-418.txt" ]
+  outputs = [ "data/vk-list-418.txt" ]
+}
+fuchsia_component("vulkan-cts-418") {
+  testonly = true
+  manifest = "meta/vulkan-cts-418.cmx"
+  deps = [
+    ":vulkan-cts-418-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-419-data") {
+  sources = [ "data/vulkan-419.txt" ]
+  outputs = [ "data/vk-list-419.txt" ]
+}
+fuchsia_component("vulkan-cts-419") {
+  testonly = true
+  manifest = "meta/vulkan-cts-419.cmx"
+  deps = [
+    ":vulkan-cts-419-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-420-data") {
+  sources = [ "data/vulkan-420.txt" ]
+  outputs = [ "data/vk-list-420.txt" ]
+}
+fuchsia_component("vulkan-cts-420") {
+  testonly = true
+  manifest = "meta/vulkan-cts-420.cmx"
+  deps = [
+    ":vulkan-cts-420-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-421-data") {
+  sources = [ "data/vulkan-421.txt" ]
+  outputs = [ "data/vk-list-421.txt" ]
+}
+fuchsia_component("vulkan-cts-421") {
+  testonly = true
+  manifest = "meta/vulkan-cts-421.cmx"
+  deps = [
+    ":vulkan-cts-421-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-422-data") {
+  sources = [ "data/vulkan-422.txt" ]
+  outputs = [ "data/vk-list-422.txt" ]
+}
+fuchsia_component("vulkan-cts-422") {
+  testonly = true
+  manifest = "meta/vulkan-cts-422.cmx"
+  deps = [
+    ":vulkan-cts-422-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-423-data") {
+  sources = [ "data/vulkan-423.txt" ]
+  outputs = [ "data/vk-list-423.txt" ]
+}
+fuchsia_component("vulkan-cts-423") {
+  testonly = true
+  manifest = "meta/vulkan-cts-423.cmx"
+  deps = [
+    ":vulkan-cts-423-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-424-data") {
+  sources = [ "data/vulkan-424.txt" ]
+  outputs = [ "data/vk-list-424.txt" ]
+}
+fuchsia_component("vulkan-cts-424") {
+  testonly = true
+  manifest = "meta/vulkan-cts-424.cmx"
+  deps = [
+    ":vulkan-cts-424-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-425-data") {
+  sources = [ "data/vulkan-425.txt" ]
+  outputs = [ "data/vk-list-425.txt" ]
+}
+fuchsia_component("vulkan-cts-425") {
+  testonly = true
+  manifest = "meta/vulkan-cts-425.cmx"
+  deps = [
+    ":vulkan-cts-425-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-426-data") {
+  sources = [ "data/vulkan-426.txt" ]
+  outputs = [ "data/vk-list-426.txt" ]
+}
+fuchsia_component("vulkan-cts-426") {
+  testonly = true
+  manifest = "meta/vulkan-cts-426.cmx"
+  deps = [
+    ":vulkan-cts-426-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-427-data") {
+  sources = [ "data/vulkan-427.txt" ]
+  outputs = [ "data/vk-list-427.txt" ]
+}
+fuchsia_component("vulkan-cts-427") {
+  testonly = true
+  manifest = "meta/vulkan-cts-427.cmx"
+  deps = [
+    ":vulkan-cts-427-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-428-data") {
+  sources = [ "data/vulkan-428.txt" ]
+  outputs = [ "data/vk-list-428.txt" ]
+}
+fuchsia_component("vulkan-cts-428") {
+  testonly = true
+  manifest = "meta/vulkan-cts-428.cmx"
+  deps = [
+    ":vulkan-cts-428-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-429-data") {
+  sources = [ "data/vulkan-429.txt" ]
+  outputs = [ "data/vk-list-429.txt" ]
+}
+fuchsia_component("vulkan-cts-429") {
+  testonly = true
+  manifest = "meta/vulkan-cts-429.cmx"
+  deps = [
+    ":vulkan-cts-429-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-430-data") {
+  sources = [ "data/vulkan-430.txt" ]
+  outputs = [ "data/vk-list-430.txt" ]
+}
+fuchsia_component("vulkan-cts-430") {
+  testonly = true
+  manifest = "meta/vulkan-cts-430.cmx"
+  deps = [
+    ":vulkan-cts-430-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-431-data") {
+  sources = [ "data/vulkan-431.txt" ]
+  outputs = [ "data/vk-list-431.txt" ]
+}
+fuchsia_component("vulkan-cts-431") {
+  testonly = true
+  manifest = "meta/vulkan-cts-431.cmx"
+  deps = [
+    ":vulkan-cts-431-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-432-data") {
+  sources = [ "data/vulkan-432.txt" ]
+  outputs = [ "data/vk-list-432.txt" ]
+}
+fuchsia_component("vulkan-cts-432") {
+  testonly = true
+  manifest = "meta/vulkan-cts-432.cmx"
+  deps = [
+    ":vulkan-cts-432-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-433-data") {
+  sources = [ "data/vulkan-433.txt" ]
+  outputs = [ "data/vk-list-433.txt" ]
+}
+fuchsia_component("vulkan-cts-433") {
+  testonly = true
+  manifest = "meta/vulkan-cts-433.cmx"
+  deps = [
+    ":vulkan-cts-433-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-434-data") {
+  sources = [ "data/vulkan-434.txt" ]
+  outputs = [ "data/vk-list-434.txt" ]
+}
+fuchsia_component("vulkan-cts-434") {
+  testonly = true
+  manifest = "meta/vulkan-cts-434.cmx"
+  deps = [
+    ":vulkan-cts-434-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-435-data") {
+  sources = [ "data/vulkan-435.txt" ]
+  outputs = [ "data/vk-list-435.txt" ]
+}
+fuchsia_component("vulkan-cts-435") {
+  testonly = true
+  manifest = "meta/vulkan-cts-435.cmx"
+  deps = [
+    ":vulkan-cts-435-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-436-data") {
+  sources = [ "data/vulkan-436.txt" ]
+  outputs = [ "data/vk-list-436.txt" ]
+}
+fuchsia_component("vulkan-cts-436") {
+  testonly = true
+  manifest = "meta/vulkan-cts-436.cmx"
+  deps = [
+    ":vulkan-cts-436-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-437-data") {
+  sources = [ "data/vulkan-437.txt" ]
+  outputs = [ "data/vk-list-437.txt" ]
+}
+fuchsia_component("vulkan-cts-437") {
+  testonly = true
+  manifest = "meta/vulkan-cts-437.cmx"
+  deps = [
+    ":vulkan-cts-437-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-438-data") {
+  sources = [ "data/vulkan-438.txt" ]
+  outputs = [ "data/vk-list-438.txt" ]
+}
+fuchsia_component("vulkan-cts-438") {
+  testonly = true
+  manifest = "meta/vulkan-cts-438.cmx"
+  deps = [
+    ":vulkan-cts-438-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-439-data") {
+  sources = [ "data/vulkan-439.txt" ]
+  outputs = [ "data/vk-list-439.txt" ]
+}
+fuchsia_component("vulkan-cts-439") {
+  testonly = true
+  manifest = "meta/vulkan-cts-439.cmx"
+  deps = [
+    ":vulkan-cts-439-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-440-data") {
+  sources = [ "data/vulkan-440.txt" ]
+  outputs = [ "data/vk-list-440.txt" ]
+}
+fuchsia_component("vulkan-cts-440") {
+  testonly = true
+  manifest = "meta/vulkan-cts-440.cmx"
+  deps = [
+    ":vulkan-cts-440-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-441-data") {
+  sources = [ "data/vulkan-441.txt" ]
+  outputs = [ "data/vk-list-441.txt" ]
+}
+fuchsia_component("vulkan-cts-441") {
+  testonly = true
+  manifest = "meta/vulkan-cts-441.cmx"
+  deps = [
+    ":vulkan-cts-441-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-442-data") {
+  sources = [ "data/vulkan-442.txt" ]
+  outputs = [ "data/vk-list-442.txt" ]
+}
+fuchsia_component("vulkan-cts-442") {
+  testonly = true
+  manifest = "meta/vulkan-cts-442.cmx"
+  deps = [
+    ":vulkan-cts-442-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-443-data") {
+  sources = [ "data/vulkan-443.txt" ]
+  outputs = [ "data/vk-list-443.txt" ]
+}
+fuchsia_component("vulkan-cts-443") {
+  testonly = true
+  manifest = "meta/vulkan-cts-443.cmx"
+  deps = [
+    ":vulkan-cts-443-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-444-data") {
+  sources = [ "data/vulkan-444.txt" ]
+  outputs = [ "data/vk-list-444.txt" ]
+}
+fuchsia_component("vulkan-cts-444") {
+  testonly = true
+  manifest = "meta/vulkan-cts-444.cmx"
+  deps = [
+    ":vulkan-cts-444-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-445-data") {
+  sources = [ "data/vulkan-445.txt" ]
+  outputs = [ "data/vk-list-445.txt" ]
+}
+fuchsia_component("vulkan-cts-445") {
+  testonly = true
+  manifest = "meta/vulkan-cts-445.cmx"
+  deps = [
+    ":vulkan-cts-445-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-446-data") {
+  sources = [ "data/vulkan-446.txt" ]
+  outputs = [ "data/vk-list-446.txt" ]
+}
+fuchsia_component("vulkan-cts-446") {
+  testonly = true
+  manifest = "meta/vulkan-cts-446.cmx"
+  deps = [
+    ":vulkan-cts-446-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-447-data") {
+  sources = [ "data/vulkan-447.txt" ]
+  outputs = [ "data/vk-list-447.txt" ]
+}
+fuchsia_component("vulkan-cts-447") {
+  testonly = true
+  manifest = "meta/vulkan-cts-447.cmx"
+  deps = [
+    ":vulkan-cts-447-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-448-data") {
+  sources = [ "data/vulkan-448.txt" ]
+  outputs = [ "data/vk-list-448.txt" ]
+}
+fuchsia_component("vulkan-cts-448") {
+  testonly = true
+  manifest = "meta/vulkan-cts-448.cmx"
+  deps = [
+    ":vulkan-cts-448-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-449-data") {
+  sources = [ "data/vulkan-449.txt" ]
+  outputs = [ "data/vk-list-449.txt" ]
+}
+fuchsia_component("vulkan-cts-449") {
+  testonly = true
+  manifest = "meta/vulkan-cts-449.cmx"
+  deps = [
+    ":vulkan-cts-449-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-450-data") {
+  sources = [ "data/vulkan-450.txt" ]
+  outputs = [ "data/vk-list-450.txt" ]
+}
+fuchsia_component("vulkan-cts-450") {
+  testonly = true
+  manifest = "meta/vulkan-cts-450.cmx"
+  deps = [
+    ":vulkan-cts-450-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-451-data") {
+  sources = [ "data/vulkan-451.txt" ]
+  outputs = [ "data/vk-list-451.txt" ]
+}
+fuchsia_component("vulkan-cts-451") {
+  testonly = true
+  manifest = "meta/vulkan-cts-451.cmx"
+  deps = [
+    ":vulkan-cts-451-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-452-data") {
+  sources = [ "data/vulkan-452.txt" ]
+  outputs = [ "data/vk-list-452.txt" ]
+}
+fuchsia_component("vulkan-cts-452") {
+  testonly = true
+  manifest = "meta/vulkan-cts-452.cmx"
+  deps = [
+    ":vulkan-cts-452-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-453-data") {
+  sources = [ "data/vulkan-453.txt" ]
+  outputs = [ "data/vk-list-453.txt" ]
+}
+fuchsia_component("vulkan-cts-453") {
+  testonly = true
+  manifest = "meta/vulkan-cts-453.cmx"
+  deps = [
+    ":vulkan-cts-453-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-454-data") {
+  sources = [ "data/vulkan-454.txt" ]
+  outputs = [ "data/vk-list-454.txt" ]
+}
+fuchsia_component("vulkan-cts-454") {
+  testonly = true
+  manifest = "meta/vulkan-cts-454.cmx"
+  deps = [
+    ":vulkan-cts-454-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-455-data") {
+  sources = [ "data/vulkan-455.txt" ]
+  outputs = [ "data/vk-list-455.txt" ]
+}
+fuchsia_component("vulkan-cts-455") {
+  testonly = true
+  manifest = "meta/vulkan-cts-455.cmx"
+  deps = [
+    ":vulkan-cts-455-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-456-data") {
+  sources = [ "data/vulkan-456.txt" ]
+  outputs = [ "data/vk-list-456.txt" ]
+}
+fuchsia_component("vulkan-cts-456") {
+  testonly = true
+  manifest = "meta/vulkan-cts-456.cmx"
+  deps = [
+    ":vulkan-cts-456-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-457-data") {
+  sources = [ "data/vulkan-457.txt" ]
+  outputs = [ "data/vk-list-457.txt" ]
+}
+fuchsia_component("vulkan-cts-457") {
+  testonly = true
+  manifest = "meta/vulkan-cts-457.cmx"
+  deps = [
+    ":vulkan-cts-457-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-458-data") {
+  sources = [ "data/vulkan-458.txt" ]
+  outputs = [ "data/vk-list-458.txt" ]
+}
+fuchsia_component("vulkan-cts-458") {
+  testonly = true
+  manifest = "meta/vulkan-cts-458.cmx"
+  deps = [
+    ":vulkan-cts-458-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-459-data") {
+  sources = [ "data/vulkan-459.txt" ]
+  outputs = [ "data/vk-list-459.txt" ]
+}
+fuchsia_component("vulkan-cts-459") {
+  testonly = true
+  manifest = "meta/vulkan-cts-459.cmx"
+  deps = [
+    ":vulkan-cts-459-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-460-data") {
+  sources = [ "data/vulkan-460.txt" ]
+  outputs = [ "data/vk-list-460.txt" ]
+}
+fuchsia_component("vulkan-cts-460") {
+  testonly = true
+  manifest = "meta/vulkan-cts-460.cmx"
+  deps = [
+    ":vulkan-cts-460-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-461-data") {
+  sources = [ "data/vulkan-461.txt" ]
+  outputs = [ "data/vk-list-461.txt" ]
+}
+fuchsia_component("vulkan-cts-461") {
+  testonly = true
+  manifest = "meta/vulkan-cts-461.cmx"
+  deps = [
+    ":vulkan-cts-461-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-462-data") {
+  sources = [ "data/vulkan-462.txt" ]
+  outputs = [ "data/vk-list-462.txt" ]
+}
+fuchsia_component("vulkan-cts-462") {
+  testonly = true
+  manifest = "meta/vulkan-cts-462.cmx"
+  deps = [
+    ":vulkan-cts-462-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-463-data") {
+  sources = [ "data/vulkan-463.txt" ]
+  outputs = [ "data/vk-list-463.txt" ]
+}
+fuchsia_component("vulkan-cts-463") {
+  testonly = true
+  manifest = "meta/vulkan-cts-463.cmx"
+  deps = [
+    ":vulkan-cts-463-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-464-data") {
+  sources = [ "data/vulkan-464.txt" ]
+  outputs = [ "data/vk-list-464.txt" ]
+}
+fuchsia_component("vulkan-cts-464") {
+  testonly = true
+  manifest = "meta/vulkan-cts-464.cmx"
+  deps = [
+    ":vulkan-cts-464-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-465-data") {
+  sources = [ "data/vulkan-465.txt" ]
+  outputs = [ "data/vk-list-465.txt" ]
+}
+fuchsia_component("vulkan-cts-465") {
+  testonly = true
+  manifest = "meta/vulkan-cts-465.cmx"
+  deps = [
+    ":vulkan-cts-465-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-466-data") {
+  sources = [ "data/vulkan-466.txt" ]
+  outputs = [ "data/vk-list-466.txt" ]
+}
+fuchsia_component("vulkan-cts-466") {
+  testonly = true
+  manifest = "meta/vulkan-cts-466.cmx"
+  deps = [
+    ":vulkan-cts-466-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-467-data") {
+  sources = [ "data/vulkan-467.txt" ]
+  outputs = [ "data/vk-list-467.txt" ]
+}
+fuchsia_component("vulkan-cts-467") {
+  testonly = true
+  manifest = "meta/vulkan-cts-467.cmx"
+  deps = [
+    ":vulkan-cts-467-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-468-data") {
+  sources = [ "data/vulkan-468.txt" ]
+  outputs = [ "data/vk-list-468.txt" ]
+}
+fuchsia_component("vulkan-cts-468") {
+  testonly = true
+  manifest = "meta/vulkan-cts-468.cmx"
+  deps = [
+    ":vulkan-cts-468-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-469-data") {
+  sources = [ "data/vulkan-469.txt" ]
+  outputs = [ "data/vk-list-469.txt" ]
+}
+fuchsia_component("vulkan-cts-469") {
+  testonly = true
+  manifest = "meta/vulkan-cts-469.cmx"
+  deps = [
+    ":vulkan-cts-469-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-470-data") {
+  sources = [ "data/vulkan-470.txt" ]
+  outputs = [ "data/vk-list-470.txt" ]
+}
+fuchsia_component("vulkan-cts-470") {
+  testonly = true
+  manifest = "meta/vulkan-cts-470.cmx"
+  deps = [
+    ":vulkan-cts-470-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-471-data") {
+  sources = [ "data/vulkan-471.txt" ]
+  outputs = [ "data/vk-list-471.txt" ]
+}
+fuchsia_component("vulkan-cts-471") {
+  testonly = true
+  manifest = "meta/vulkan-cts-471.cmx"
+  deps = [
+    ":vulkan-cts-471-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-472-data") {
+  sources = [ "data/vulkan-472.txt" ]
+  outputs = [ "data/vk-list-472.txt" ]
+}
+fuchsia_component("vulkan-cts-472") {
+  testonly = true
+  manifest = "meta/vulkan-cts-472.cmx"
+  deps = [
+    ":vulkan-cts-472-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-473-data") {
+  sources = [ "data/vulkan-473.txt" ]
+  outputs = [ "data/vk-list-473.txt" ]
+}
+fuchsia_component("vulkan-cts-473") {
+  testonly = true
+  manifest = "meta/vulkan-cts-473.cmx"
+  deps = [
+    ":vulkan-cts-473-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-474-data") {
+  sources = [ "data/vulkan-474.txt" ]
+  outputs = [ "data/vk-list-474.txt" ]
+}
+fuchsia_component("vulkan-cts-474") {
+  testonly = true
+  manifest = "meta/vulkan-cts-474.cmx"
+  deps = [
+    ":vulkan-cts-474-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-475-data") {
+  sources = [ "data/vulkan-475.txt" ]
+  outputs = [ "data/vk-list-475.txt" ]
+}
+fuchsia_component("vulkan-cts-475") {
+  testonly = true
+  manifest = "meta/vulkan-cts-475.cmx"
+  deps = [
+    ":vulkan-cts-475-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-476-data") {
+  sources = [ "data/vulkan-476.txt" ]
+  outputs = [ "data/vk-list-476.txt" ]
+}
+fuchsia_component("vulkan-cts-476") {
+  testonly = true
+  manifest = "meta/vulkan-cts-476.cmx"
+  deps = [
+    ":vulkan-cts-476-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-477-data") {
+  sources = [ "data/vulkan-477.txt" ]
+  outputs = [ "data/vk-list-477.txt" ]
+}
+fuchsia_component("vulkan-cts-477") {
+  testonly = true
+  manifest = "meta/vulkan-cts-477.cmx"
+  deps = [
+    ":vulkan-cts-477-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-478-data") {
+  sources = [ "data/vulkan-478.txt" ]
+  outputs = [ "data/vk-list-478.txt" ]
+}
+fuchsia_component("vulkan-cts-478") {
+  testonly = true
+  manifest = "meta/vulkan-cts-478.cmx"
+  deps = [
+    ":vulkan-cts-478-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-479-data") {
+  sources = [ "data/vulkan-479.txt" ]
+  outputs = [ "data/vk-list-479.txt" ]
+}
+fuchsia_component("vulkan-cts-479") {
+  testonly = true
+  manifest = "meta/vulkan-cts-479.cmx"
+  deps = [
+    ":vulkan-cts-479-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-480-data") {
+  sources = [ "data/vulkan-480.txt" ]
+  outputs = [ "data/vk-list-480.txt" ]
+}
+fuchsia_component("vulkan-cts-480") {
+  testonly = true
+  manifest = "meta/vulkan-cts-480.cmx"
+  deps = [
+    ":vulkan-cts-480-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-481-data") {
+  sources = [ "data/vulkan-481.txt" ]
+  outputs = [ "data/vk-list-481.txt" ]
+}
+fuchsia_component("vulkan-cts-481") {
+  testonly = true
+  manifest = "meta/vulkan-cts-481.cmx"
+  deps = [
+    ":vulkan-cts-481-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-482-data") {
+  sources = [ "data/vulkan-482.txt" ]
+  outputs = [ "data/vk-list-482.txt" ]
+}
+fuchsia_component("vulkan-cts-482") {
+  testonly = true
+  manifest = "meta/vulkan-cts-482.cmx"
+  deps = [
+    ":vulkan-cts-482-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-483-data") {
+  sources = [ "data/vulkan-483.txt" ]
+  outputs = [ "data/vk-list-483.txt" ]
+}
+fuchsia_component("vulkan-cts-483") {
+  testonly = true
+  manifest = "meta/vulkan-cts-483.cmx"
+  deps = [
+    ":vulkan-cts-483-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-484-data") {
+  sources = [ "data/vulkan-484.txt" ]
+  outputs = [ "data/vk-list-484.txt" ]
+}
+fuchsia_component("vulkan-cts-484") {
+  testonly = true
+  manifest = "meta/vulkan-cts-484.cmx"
+  deps = [
+    ":vulkan-cts-484-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-485-data") {
+  sources = [ "data/vulkan-485.txt" ]
+  outputs = [ "data/vk-list-485.txt" ]
+}
+fuchsia_component("vulkan-cts-485") {
+  testonly = true
+  manifest = "meta/vulkan-cts-485.cmx"
+  deps = [
+    ":vulkan-cts-485-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-486-data") {
+  sources = [ "data/vulkan-486.txt" ]
+  outputs = [ "data/vk-list-486.txt" ]
+}
+fuchsia_component("vulkan-cts-486") {
+  testonly = true
+  manifest = "meta/vulkan-cts-486.cmx"
+  deps = [
+    ":vulkan-cts-486-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-487-data") {
+  sources = [ "data/vulkan-487.txt" ]
+  outputs = [ "data/vk-list-487.txt" ]
+}
+fuchsia_component("vulkan-cts-487") {
+  testonly = true
+  manifest = "meta/vulkan-cts-487.cmx"
+  deps = [
+    ":vulkan-cts-487-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-488-data") {
+  sources = [ "data/vulkan-488.txt" ]
+  outputs = [ "data/vk-list-488.txt" ]
+}
+fuchsia_component("vulkan-cts-488") {
+  testonly = true
+  manifest = "meta/vulkan-cts-488.cmx"
+  deps = [
+    ":vulkan-cts-488-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-489-data") {
+  sources = [ "data/vulkan-489.txt" ]
+  outputs = [ "data/vk-list-489.txt" ]
+}
+fuchsia_component("vulkan-cts-489") {
+  testonly = true
+  manifest = "meta/vulkan-cts-489.cmx"
+  deps = [
+    ":vulkan-cts-489-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-490-data") {
+  sources = [ "data/vulkan-490.txt" ]
+  outputs = [ "data/vk-list-490.txt" ]
+}
+fuchsia_component("vulkan-cts-490") {
+  testonly = true
+  manifest = "meta/vulkan-cts-490.cmx"
+  deps = [
+    ":vulkan-cts-490-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-491-data") {
+  sources = [ "data/vulkan-491.txt" ]
+  outputs = [ "data/vk-list-491.txt" ]
+}
+fuchsia_component("vulkan-cts-491") {
+  testonly = true
+  manifest = "meta/vulkan-cts-491.cmx"
+  deps = [
+    ":vulkan-cts-491-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-492-data") {
+  sources = [ "data/vulkan-492.txt" ]
+  outputs = [ "data/vk-list-492.txt" ]
+}
+fuchsia_component("vulkan-cts-492") {
+  testonly = true
+  manifest = "meta/vulkan-cts-492.cmx"
+  deps = [
+    ":vulkan-cts-492-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-493-data") {
+  sources = [ "data/vulkan-493.txt" ]
+  outputs = [ "data/vk-list-493.txt" ]
+}
+fuchsia_component("vulkan-cts-493") {
+  testonly = true
+  manifest = "meta/vulkan-cts-493.cmx"
+  deps = [
+    ":vulkan-cts-493-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-494-data") {
+  sources = [ "data/vulkan-494.txt" ]
+  outputs = [ "data/vk-list-494.txt" ]
+}
+fuchsia_component("vulkan-cts-494") {
+  testonly = true
+  manifest = "meta/vulkan-cts-494.cmx"
+  deps = [
+    ":vulkan-cts-494-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-495-data") {
+  sources = [ "data/vulkan-495.txt" ]
+  outputs = [ "data/vk-list-495.txt" ]
+}
+fuchsia_component("vulkan-cts-495") {
+  testonly = true
+  manifest = "meta/vulkan-cts-495.cmx"
+  deps = [
+    ":vulkan-cts-495-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-496-data") {
+  sources = [ "data/vulkan-496.txt" ]
+  outputs = [ "data/vk-list-496.txt" ]
+}
+fuchsia_component("vulkan-cts-496") {
+  testonly = true
+  manifest = "meta/vulkan-cts-496.cmx"
+  deps = [
+    ":vulkan-cts-496-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-497-data") {
+  sources = [ "data/vulkan-497.txt" ]
+  outputs = [ "data/vk-list-497.txt" ]
+}
+fuchsia_component("vulkan-cts-497") {
+  testonly = true
+  manifest = "meta/vulkan-cts-497.cmx"
+  deps = [
+    ":vulkan-cts-497-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-498-data") {
+  sources = [ "data/vulkan-498.txt" ]
+  outputs = [ "data/vk-list-498.txt" ]
+}
+fuchsia_component("vulkan-cts-498") {
+  testonly = true
+  manifest = "meta/vulkan-cts-498.cmx"
+  deps = [
+    ":vulkan-cts-498-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-499-data") {
+  sources = [ "data/vulkan-499.txt" ]
+  outputs = [ "data/vk-list-499.txt" ]
+}
+fuchsia_component("vulkan-cts-499") {
+  testonly = true
+  manifest = "meta/vulkan-cts-499.cmx"
+  deps = [
+    ":vulkan-cts-499-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-500-data") {
+  sources = [ "data/vulkan-500.txt" ]
+  outputs = [ "data/vk-list-500.txt" ]
+}
+fuchsia_component("vulkan-cts-500") {
+  testonly = true
+  manifest = "meta/vulkan-cts-500.cmx"
+  deps = [
+    ":vulkan-cts-500-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-501-data") {
+  sources = [ "data/vulkan-501.txt" ]
+  outputs = [ "data/vk-list-501.txt" ]
+}
+fuchsia_component("vulkan-cts-501") {
+  testonly = true
+  manifest = "meta/vulkan-cts-501.cmx"
+  deps = [
+    ":vulkan-cts-501-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-502-data") {
+  sources = [ "data/vulkan-502.txt" ]
+  outputs = [ "data/vk-list-502.txt" ]
+}
+fuchsia_component("vulkan-cts-502") {
+  testonly = true
+  manifest = "meta/vulkan-cts-502.cmx"
+  deps = [
+    ":vulkan-cts-502-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-503-data") {
+  sources = [ "data/vulkan-503.txt" ]
+  outputs = [ "data/vk-list-503.txt" ]
+}
+fuchsia_component("vulkan-cts-503") {
+  testonly = true
+  manifest = "meta/vulkan-cts-503.cmx"
+  deps = [
+    ":vulkan-cts-503-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-504-data") {
+  sources = [ "data/vulkan-504.txt" ]
+  outputs = [ "data/vk-list-504.txt" ]
+}
+fuchsia_component("vulkan-cts-504") {
+  testonly = true
+  manifest = "meta/vulkan-cts-504.cmx"
+  deps = [
+    ":vulkan-cts-504-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-505-data") {
+  sources = [ "data/vulkan-505.txt" ]
+  outputs = [ "data/vk-list-505.txt" ]
+}
+fuchsia_component("vulkan-cts-505") {
+  testonly = true
+  manifest = "meta/vulkan-cts-505.cmx"
+  deps = [
+    ":vulkan-cts-505-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-506-data") {
+  sources = [ "data/vulkan-506.txt" ]
+  outputs = [ "data/vk-list-506.txt" ]
+}
+fuchsia_component("vulkan-cts-506") {
+  testonly = true
+  manifest = "meta/vulkan-cts-506.cmx"
+  deps = [
+    ":vulkan-cts-506-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-507-data") {
+  sources = [ "data/vulkan-507.txt" ]
+  outputs = [ "data/vk-list-507.txt" ]
+}
+fuchsia_component("vulkan-cts-507") {
+  testonly = true
+  manifest = "meta/vulkan-cts-507.cmx"
+  deps = [
+    ":vulkan-cts-507-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-508-data") {
+  sources = [ "data/vulkan-508.txt" ]
+  outputs = [ "data/vk-list-508.txt" ]
+}
+fuchsia_component("vulkan-cts-508") {
+  testonly = true
+  manifest = "meta/vulkan-cts-508.cmx"
+  deps = [
+    ":vulkan-cts-508-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-509-data") {
+  sources = [ "data/vulkan-509.txt" ]
+  outputs = [ "data/vk-list-509.txt" ]
+}
+fuchsia_component("vulkan-cts-509") {
+  testonly = true
+  manifest = "meta/vulkan-cts-509.cmx"
+  deps = [
+    ":vulkan-cts-509-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-510-data") {
+  sources = [ "data/vulkan-510.txt" ]
+  outputs = [ "data/vk-list-510.txt" ]
+}
+fuchsia_component("vulkan-cts-510") {
+  testonly = true
+  manifest = "meta/vulkan-cts-510.cmx"
+  deps = [
+    ":vulkan-cts-510-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-511-data") {
+  sources = [ "data/vulkan-511.txt" ]
+  outputs = [ "data/vk-list-511.txt" ]
+}
+fuchsia_component("vulkan-cts-511") {
+  testonly = true
+  manifest = "meta/vulkan-cts-511.cmx"
+  deps = [
+    ":vulkan-cts-511-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-512-data") {
+  sources = [ "data/vulkan-512.txt" ]
+  outputs = [ "data/vk-list-512.txt" ]
+}
+fuchsia_component("vulkan-cts-512") {
+  testonly = true
+  manifest = "meta/vulkan-cts-512.cmx"
+  deps = [
+    ":vulkan-cts-512-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-513-data") {
+  sources = [ "data/vulkan-513.txt" ]
+  outputs = [ "data/vk-list-513.txt" ]
+}
+fuchsia_component("vulkan-cts-513") {
+  testonly = true
+  manifest = "meta/vulkan-cts-513.cmx"
+  deps = [
+    ":vulkan-cts-513-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-514-data") {
+  sources = [ "data/vulkan-514.txt" ]
+  outputs = [ "data/vk-list-514.txt" ]
+}
+fuchsia_component("vulkan-cts-514") {
+  testonly = true
+  manifest = "meta/vulkan-cts-514.cmx"
+  deps = [
+    ":vulkan-cts-514-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-515-data") {
+  sources = [ "data/vulkan-515.txt" ]
+  outputs = [ "data/vk-list-515.txt" ]
+}
+fuchsia_component("vulkan-cts-515") {
+  testonly = true
+  manifest = "meta/vulkan-cts-515.cmx"
+  deps = [
+    ":vulkan-cts-515-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-516-data") {
+  sources = [ "data/vulkan-516.txt" ]
+  outputs = [ "data/vk-list-516.txt" ]
+}
+fuchsia_component("vulkan-cts-516") {
+  testonly = true
+  manifest = "meta/vulkan-cts-516.cmx"
+  deps = [
+    ":vulkan-cts-516-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-517-data") {
+  sources = [ "data/vulkan-517.txt" ]
+  outputs = [ "data/vk-list-517.txt" ]
+}
+fuchsia_component("vulkan-cts-517") {
+  testonly = true
+  manifest = "meta/vulkan-cts-517.cmx"
+  deps = [
+    ":vulkan-cts-517-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-518-data") {
+  sources = [ "data/vulkan-518.txt" ]
+  outputs = [ "data/vk-list-518.txt" ]
+}
+fuchsia_component("vulkan-cts-518") {
+  testonly = true
+  manifest = "meta/vulkan-cts-518.cmx"
+  deps = [
+    ":vulkan-cts-518-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-519-data") {
+  sources = [ "data/vulkan-519.txt" ]
+  outputs = [ "data/vk-list-519.txt" ]
+}
+fuchsia_component("vulkan-cts-519") {
+  testonly = true
+  manifest = "meta/vulkan-cts-519.cmx"
+  deps = [
+    ":vulkan-cts-519-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-520-data") {
+  sources = [ "data/vulkan-520.txt" ]
+  outputs = [ "data/vk-list-520.txt" ]
+}
+fuchsia_component("vulkan-cts-520") {
+  testonly = true
+  manifest = "meta/vulkan-cts-520.cmx"
+  deps = [
+    ":vulkan-cts-520-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-521-data") {
+  sources = [ "data/vulkan-521.txt" ]
+  outputs = [ "data/vk-list-521.txt" ]
+}
+fuchsia_component("vulkan-cts-521") {
+  testonly = true
+  manifest = "meta/vulkan-cts-521.cmx"
+  deps = [
+    ":vulkan-cts-521-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-522-data") {
+  sources = [ "data/vulkan-522.txt" ]
+  outputs = [ "data/vk-list-522.txt" ]
+}
+fuchsia_component("vulkan-cts-522") {
+  testonly = true
+  manifest = "meta/vulkan-cts-522.cmx"
+  deps = [
+    ":vulkan-cts-522-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-523-data") {
+  sources = [ "data/vulkan-523.txt" ]
+  outputs = [ "data/vk-list-523.txt" ]
+}
+fuchsia_component("vulkan-cts-523") {
+  testonly = true
+  manifest = "meta/vulkan-cts-523.cmx"
+  deps = [
+    ":vulkan-cts-523-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-524-data") {
+  sources = [ "data/vulkan-524.txt" ]
+  outputs = [ "data/vk-list-524.txt" ]
+}
+fuchsia_component("vulkan-cts-524") {
+  testonly = true
+  manifest = "meta/vulkan-cts-524.cmx"
+  deps = [
+    ":vulkan-cts-524-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-525-data") {
+  sources = [ "data/vulkan-525.txt" ]
+  outputs = [ "data/vk-list-525.txt" ]
+}
+fuchsia_component("vulkan-cts-525") {
+  testonly = true
+  manifest = "meta/vulkan-cts-525.cmx"
+  deps = [
+    ":vulkan-cts-525-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-526-data") {
+  sources = [ "data/vulkan-526.txt" ]
+  outputs = [ "data/vk-list-526.txt" ]
+}
+fuchsia_component("vulkan-cts-526") {
+  testonly = true
+  manifest = "meta/vulkan-cts-526.cmx"
+  deps = [
+    ":vulkan-cts-526-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-527-data") {
+  sources = [ "data/vulkan-527.txt" ]
+  outputs = [ "data/vk-list-527.txt" ]
+}
+fuchsia_component("vulkan-cts-527") {
+  testonly = true
+  manifest = "meta/vulkan-cts-527.cmx"
+  deps = [
+    ":vulkan-cts-527-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-528-data") {
+  sources = [ "data/vulkan-528.txt" ]
+  outputs = [ "data/vk-list-528.txt" ]
+}
+fuchsia_component("vulkan-cts-528") {
+  testonly = true
+  manifest = "meta/vulkan-cts-528.cmx"
+  deps = [
+    ":vulkan-cts-528-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-529-data") {
+  sources = [ "data/vulkan-529.txt" ]
+  outputs = [ "data/vk-list-529.txt" ]
+}
+fuchsia_component("vulkan-cts-529") {
+  testonly = true
+  manifest = "meta/vulkan-cts-529.cmx"
+  deps = [
+    ":vulkan-cts-529-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-530-data") {
+  sources = [ "data/vulkan-530.txt" ]
+  outputs = [ "data/vk-list-530.txt" ]
+}
+fuchsia_component("vulkan-cts-530") {
+  testonly = true
+  manifest = "meta/vulkan-cts-530.cmx"
+  deps = [
+    ":vulkan-cts-530-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-531-data") {
+  sources = [ "data/vulkan-531.txt" ]
+  outputs = [ "data/vk-list-531.txt" ]
+}
+fuchsia_component("vulkan-cts-531") {
+  testonly = true
+  manifest = "meta/vulkan-cts-531.cmx"
+  deps = [
+    ":vulkan-cts-531-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-532-data") {
+  sources = [ "data/vulkan-532.txt" ]
+  outputs = [ "data/vk-list-532.txt" ]
+}
+fuchsia_component("vulkan-cts-532") {
+  testonly = true
+  manifest = "meta/vulkan-cts-532.cmx"
+  deps = [
+    ":vulkan-cts-532-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-533-data") {
+  sources = [ "data/vulkan-533.txt" ]
+  outputs = [ "data/vk-list-533.txt" ]
+}
+fuchsia_component("vulkan-cts-533") {
+  testonly = true
+  manifest = "meta/vulkan-cts-533.cmx"
+  deps = [
+    ":vulkan-cts-533-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-534-data") {
+  sources = [ "data/vulkan-534.txt" ]
+  outputs = [ "data/vk-list-534.txt" ]
+}
+fuchsia_component("vulkan-cts-534") {
+  testonly = true
+  manifest = "meta/vulkan-cts-534.cmx"
+  deps = [
+    ":vulkan-cts-534-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-535-data") {
+  sources = [ "data/vulkan-535.txt" ]
+  outputs = [ "data/vk-list-535.txt" ]
+}
+fuchsia_component("vulkan-cts-535") {
+  testonly = true
+  manifest = "meta/vulkan-cts-535.cmx"
+  deps = [
+    ":vulkan-cts-535-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-536-data") {
+  sources = [ "data/vulkan-536.txt" ]
+  outputs = [ "data/vk-list-536.txt" ]
+}
+fuchsia_component("vulkan-cts-536") {
+  testonly = true
+  manifest = "meta/vulkan-cts-536.cmx"
+  deps = [
+    ":vulkan-cts-536-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-537-data") {
+  sources = [ "data/vulkan-537.txt" ]
+  outputs = [ "data/vk-list-537.txt" ]
+}
+fuchsia_component("vulkan-cts-537") {
+  testonly = true
+  manifest = "meta/vulkan-cts-537.cmx"
+  deps = [
+    ":vulkan-cts-537-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-538-data") {
+  sources = [ "data/vulkan-538.txt" ]
+  outputs = [ "data/vk-list-538.txt" ]
+}
+fuchsia_component("vulkan-cts-538") {
+  testonly = true
+  manifest = "meta/vulkan-cts-538.cmx"
+  deps = [
+    ":vulkan-cts-538-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-539-data") {
+  sources = [ "data/vulkan-539.txt" ]
+  outputs = [ "data/vk-list-539.txt" ]
+}
+fuchsia_component("vulkan-cts-539") {
+  testonly = true
+  manifest = "meta/vulkan-cts-539.cmx"
+  deps = [
+    ":vulkan-cts-539-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-540-data") {
+  sources = [ "data/vulkan-540.txt" ]
+  outputs = [ "data/vk-list-540.txt" ]
+}
+fuchsia_component("vulkan-cts-540") {
+  testonly = true
+  manifest = "meta/vulkan-cts-540.cmx"
+  deps = [
+    ":vulkan-cts-540-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-541-data") {
+  sources = [ "data/vulkan-541.txt" ]
+  outputs = [ "data/vk-list-541.txt" ]
+}
+fuchsia_component("vulkan-cts-541") {
+  testonly = true
+  manifest = "meta/vulkan-cts-541.cmx"
+  deps = [
+    ":vulkan-cts-541-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-542-data") {
+  sources = [ "data/vulkan-542.txt" ]
+  outputs = [ "data/vk-list-542.txt" ]
+}
+fuchsia_component("vulkan-cts-542") {
+  testonly = true
+  manifest = "meta/vulkan-cts-542.cmx"
+  deps = [
+    ":vulkan-cts-542-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-543-data") {
+  sources = [ "data/vulkan-543.txt" ]
+  outputs = [ "data/vk-list-543.txt" ]
+}
+fuchsia_component("vulkan-cts-543") {
+  testonly = true
+  manifest = "meta/vulkan-cts-543.cmx"
+  deps = [
+    ":vulkan-cts-543-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-544-data") {
+  sources = [ "data/vulkan-544.txt" ]
+  outputs = [ "data/vk-list-544.txt" ]
+}
+fuchsia_component("vulkan-cts-544") {
+  testonly = true
+  manifest = "meta/vulkan-cts-544.cmx"
+  deps = [
+    ":vulkan-cts-544-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-545-data") {
+  sources = [ "data/vulkan-545.txt" ]
+  outputs = [ "data/vk-list-545.txt" ]
+}
+fuchsia_component("vulkan-cts-545") {
+  testonly = true
+  manifest = "meta/vulkan-cts-545.cmx"
+  deps = [
+    ":vulkan-cts-545-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-546-data") {
+  sources = [ "data/vulkan-546.txt" ]
+  outputs = [ "data/vk-list-546.txt" ]
+}
+fuchsia_component("vulkan-cts-546") {
+  testonly = true
+  manifest = "meta/vulkan-cts-546.cmx"
+  deps = [
+    ":vulkan-cts-546-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-547-data") {
+  sources = [ "data/vulkan-547.txt" ]
+  outputs = [ "data/vk-list-547.txt" ]
+}
+fuchsia_component("vulkan-cts-547") {
+  testonly = true
+  manifest = "meta/vulkan-cts-547.cmx"
+  deps = [
+    ":vulkan-cts-547-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-548-data") {
+  sources = [ "data/vulkan-548.txt" ]
+  outputs = [ "data/vk-list-548.txt" ]
+}
+fuchsia_component("vulkan-cts-548") {
+  testonly = true
+  manifest = "meta/vulkan-cts-548.cmx"
+  deps = [
+    ":vulkan-cts-548-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-549-data") {
+  sources = [ "data/vulkan-549.txt" ]
+  outputs = [ "data/vk-list-549.txt" ]
+}
+fuchsia_component("vulkan-cts-549") {
+  testonly = true
+  manifest = "meta/vulkan-cts-549.cmx"
+  deps = [
+    ":vulkan-cts-549-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-550-data") {
+  sources = [ "data/vulkan-550.txt" ]
+  outputs = [ "data/vk-list-550.txt" ]
+}
+fuchsia_component("vulkan-cts-550") {
+  testonly = true
+  manifest = "meta/vulkan-cts-550.cmx"
+  deps = [
+    ":vulkan-cts-550-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-551-data") {
+  sources = [ "data/vulkan-551.txt" ]
+  outputs = [ "data/vk-list-551.txt" ]
+}
+fuchsia_component("vulkan-cts-551") {
+  testonly = true
+  manifest = "meta/vulkan-cts-551.cmx"
+  deps = [
+    ":vulkan-cts-551-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-552-data") {
+  sources = [ "data/vulkan-552.txt" ]
+  outputs = [ "data/vk-list-552.txt" ]
+}
+fuchsia_component("vulkan-cts-552") {
+  testonly = true
+  manifest = "meta/vulkan-cts-552.cmx"
+  deps = [
+    ":vulkan-cts-552-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-553-data") {
+  sources = [ "data/vulkan-553.txt" ]
+  outputs = [ "data/vk-list-553.txt" ]
+}
+fuchsia_component("vulkan-cts-553") {
+  testonly = true
+  manifest = "meta/vulkan-cts-553.cmx"
+  deps = [
+    ":vulkan-cts-553-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-554-data") {
+  sources = [ "data/vulkan-554.txt" ]
+  outputs = [ "data/vk-list-554.txt" ]
+}
+fuchsia_component("vulkan-cts-554") {
+  testonly = true
+  manifest = "meta/vulkan-cts-554.cmx"
+  deps = [
+    ":vulkan-cts-554-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-555-data") {
+  sources = [ "data/vulkan-555.txt" ]
+  outputs = [ "data/vk-list-555.txt" ]
+}
+fuchsia_component("vulkan-cts-555") {
+  testonly = true
+  manifest = "meta/vulkan-cts-555.cmx"
+  deps = [
+    ":vulkan-cts-555-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-556-data") {
+  sources = [ "data/vulkan-556.txt" ]
+  outputs = [ "data/vk-list-556.txt" ]
+}
+fuchsia_component("vulkan-cts-556") {
+  testonly = true
+  manifest = "meta/vulkan-cts-556.cmx"
+  deps = [
+    ":vulkan-cts-556-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-557-data") {
+  sources = [ "data/vulkan-557.txt" ]
+  outputs = [ "data/vk-list-557.txt" ]
+}
+fuchsia_component("vulkan-cts-557") {
+  testonly = true
+  manifest = "meta/vulkan-cts-557.cmx"
+  deps = [
+    ":vulkan-cts-557-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-558-data") {
+  sources = [ "data/vulkan-558.txt" ]
+  outputs = [ "data/vk-list-558.txt" ]
+}
+fuchsia_component("vulkan-cts-558") {
+  testonly = true
+  manifest = "meta/vulkan-cts-558.cmx"
+  deps = [
+    ":vulkan-cts-558-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-559-data") {
+  sources = [ "data/vulkan-559.txt" ]
+  outputs = [ "data/vk-list-559.txt" ]
+}
+fuchsia_component("vulkan-cts-559") {
+  testonly = true
+  manifest = "meta/vulkan-cts-559.cmx"
+  deps = [
+    ":vulkan-cts-559-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-560-data") {
+  sources = [ "data/vulkan-560.txt" ]
+  outputs = [ "data/vk-list-560.txt" ]
+}
+fuchsia_component("vulkan-cts-560") {
+  testonly = true
+  manifest = "meta/vulkan-cts-560.cmx"
+  deps = [
+    ":vulkan-cts-560-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-561-data") {
+  sources = [ "data/vulkan-561.txt" ]
+  outputs = [ "data/vk-list-561.txt" ]
+}
+fuchsia_component("vulkan-cts-561") {
+  testonly = true
+  manifest = "meta/vulkan-cts-561.cmx"
+  deps = [
+    ":vulkan-cts-561-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-562-data") {
+  sources = [ "data/vulkan-562.txt" ]
+  outputs = [ "data/vk-list-562.txt" ]
+}
+fuchsia_component("vulkan-cts-562") {
+  testonly = true
+  manifest = "meta/vulkan-cts-562.cmx"
+  deps = [
+    ":vulkan-cts-562-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-563-data") {
+  sources = [ "data/vulkan-563.txt" ]
+  outputs = [ "data/vk-list-563.txt" ]
+}
+fuchsia_component("vulkan-cts-563") {
+  testonly = true
+  manifest = "meta/vulkan-cts-563.cmx"
+  deps = [
+    ":vulkan-cts-563-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-564-data") {
+  sources = [ "data/vulkan-564.txt" ]
+  outputs = [ "data/vk-list-564.txt" ]
+}
+fuchsia_component("vulkan-cts-564") {
+  testonly = true
+  manifest = "meta/vulkan-cts-564.cmx"
+  deps = [
+    ":vulkan-cts-564-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-565-data") {
+  sources = [ "data/vulkan-565.txt" ]
+  outputs = [ "data/vk-list-565.txt" ]
+}
+fuchsia_component("vulkan-cts-565") {
+  testonly = true
+  manifest = "meta/vulkan-cts-565.cmx"
+  deps = [
+    ":vulkan-cts-565-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-566-data") {
+  sources = [ "data/vulkan-566.txt" ]
+  outputs = [ "data/vk-list-566.txt" ]
+}
+fuchsia_component("vulkan-cts-566") {
+  testonly = true
+  manifest = "meta/vulkan-cts-566.cmx"
+  deps = [
+    ":vulkan-cts-566-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-567-data") {
+  sources = [ "data/vulkan-567.txt" ]
+  outputs = [ "data/vk-list-567.txt" ]
+}
+fuchsia_component("vulkan-cts-567") {
+  testonly = true
+  manifest = "meta/vulkan-cts-567.cmx"
+  deps = [
+    ":vulkan-cts-567-data",
+    "..:cts-deps",
+  ]
+}
+
+resource("vulkan-cts-568-data") {
+  sources = [ "data/vulkan-568.txt" ]
+  outputs = [ "data/vk-list-568.txt" ]
+}
+fuchsia_component("vulkan-cts-568") {
+  testonly = true
+  manifest = "meta/vulkan-cts-568.cmx"
+  deps = [
+    ":vulkan-cts-568-data",
+    "..:cts-deps",
+  ]
+}
+
+fuchsia_test_package("vulkan-cts-split") {
+  test_components = [
+    ":vulkan-cts-000",
+    ":vulkan-cts-001",
+    ":vulkan-cts-002",
+    ":vulkan-cts-003",
+    ":vulkan-cts-004",
+    ":vulkan-cts-005",
+    ":vulkan-cts-006",
+    ":vulkan-cts-007",
+    ":vulkan-cts-008",
+    ":vulkan-cts-009",
+    ":vulkan-cts-010",
+    ":vulkan-cts-011",
+    ":vulkan-cts-012",
+    ":vulkan-cts-013",
+    ":vulkan-cts-014",
+    ":vulkan-cts-015",
+    ":vulkan-cts-016",
+    ":vulkan-cts-017",
+    ":vulkan-cts-018",
+    ":vulkan-cts-019",
+    ":vulkan-cts-020",
+    ":vulkan-cts-021",
+    ":vulkan-cts-022",
+    ":vulkan-cts-023",
+    ":vulkan-cts-024",
+    ":vulkan-cts-025",
+    ":vulkan-cts-026",
+    ":vulkan-cts-027",
+    ":vulkan-cts-028",
+    ":vulkan-cts-029",
+    ":vulkan-cts-030",
+    ":vulkan-cts-031",
+    ":vulkan-cts-032",
+    ":vulkan-cts-033",
+    ":vulkan-cts-034",
+    ":vulkan-cts-035",
+    ":vulkan-cts-036",
+    ":vulkan-cts-037",
+    ":vulkan-cts-038",
+    ":vulkan-cts-039",
+    ":vulkan-cts-040",
+    ":vulkan-cts-041",
+    ":vulkan-cts-042",
+    ":vulkan-cts-043",
+    ":vulkan-cts-044",
+    ":vulkan-cts-045",
+    ":vulkan-cts-046",
+    ":vulkan-cts-047",
+    ":vulkan-cts-048",
+    ":vulkan-cts-049",
+    ":vulkan-cts-050",
+    ":vulkan-cts-051",
+    ":vulkan-cts-052",
+    ":vulkan-cts-053",
+    ":vulkan-cts-054",
+    ":vulkan-cts-055",
+    ":vulkan-cts-056",
+    ":vulkan-cts-057",
+    ":vulkan-cts-058",
+    ":vulkan-cts-059",
+    ":vulkan-cts-060",
+    ":vulkan-cts-061",
+    ":vulkan-cts-062",
+    ":vulkan-cts-063",
+    ":vulkan-cts-064",
+    ":vulkan-cts-065",
+    ":vulkan-cts-066",
+    ":vulkan-cts-067",
+    ":vulkan-cts-068",
+    ":vulkan-cts-069",
+    ":vulkan-cts-070",
+    ":vulkan-cts-071",
+    ":vulkan-cts-072",
+    ":vulkan-cts-073",
+    ":vulkan-cts-074",
+    ":vulkan-cts-075",
+    ":vulkan-cts-076",
+    ":vulkan-cts-077",
+    ":vulkan-cts-078",
+    ":vulkan-cts-079",
+    ":vulkan-cts-080",
+    ":vulkan-cts-081",
+    ":vulkan-cts-082",
+    ":vulkan-cts-083",
+    ":vulkan-cts-084",
+    ":vulkan-cts-085",
+    ":vulkan-cts-086",
+    ":vulkan-cts-087",
+    ":vulkan-cts-088",
+    ":vulkan-cts-089",
+    ":vulkan-cts-090",
+    ":vulkan-cts-091",
+    ":vulkan-cts-092",
+    ":vulkan-cts-093",
+    ":vulkan-cts-094",
+    ":vulkan-cts-095",
+    ":vulkan-cts-096",
+    ":vulkan-cts-097",
+    ":vulkan-cts-098",
+    ":vulkan-cts-099",
+    ":vulkan-cts-100",
+    ":vulkan-cts-101",
+    ":vulkan-cts-102",
+    ":vulkan-cts-103",
+    ":vulkan-cts-104",
+    ":vulkan-cts-105",
+    ":vulkan-cts-106",
+    ":vulkan-cts-107",
+    ":vulkan-cts-108",
+    ":vulkan-cts-109",
+    ":vulkan-cts-110",
+    ":vulkan-cts-111",
+    ":vulkan-cts-112",
+    ":vulkan-cts-113",
+    ":vulkan-cts-114",
+    ":vulkan-cts-115",
+    ":vulkan-cts-116",
+    ":vulkan-cts-117",
+    ":vulkan-cts-118",
+    ":vulkan-cts-119",
+    ":vulkan-cts-120",
+    ":vulkan-cts-121",
+    ":vulkan-cts-122",
+    ":vulkan-cts-123",
+    ":vulkan-cts-124",
+    ":vulkan-cts-125",
+    ":vulkan-cts-126",
+    ":vulkan-cts-127",
+    ":vulkan-cts-128",
+    ":vulkan-cts-129",
+    ":vulkan-cts-130",
+    ":vulkan-cts-131",
+    ":vulkan-cts-132",
+    ":vulkan-cts-133",
+    ":vulkan-cts-134",
+    ":vulkan-cts-135",
+    ":vulkan-cts-136",
+    ":vulkan-cts-137",
+    ":vulkan-cts-138",
+    ":vulkan-cts-139",
+    ":vulkan-cts-140",
+    ":vulkan-cts-141",
+    ":vulkan-cts-142",
+    ":vulkan-cts-143",
+    ":vulkan-cts-144",
+    ":vulkan-cts-145",
+    ":vulkan-cts-146",
+    ":vulkan-cts-147",
+    ":vulkan-cts-148",
+    ":vulkan-cts-149",
+    ":vulkan-cts-150",
+    ":vulkan-cts-151",
+    ":vulkan-cts-152",
+    ":vulkan-cts-153",
+    ":vulkan-cts-154",
+    ":vulkan-cts-155",
+    ":vulkan-cts-156",
+    ":vulkan-cts-157",
+    ":vulkan-cts-158",
+    ":vulkan-cts-159",
+    ":vulkan-cts-160",
+    ":vulkan-cts-161",
+    ":vulkan-cts-162",
+    ":vulkan-cts-163",
+    ":vulkan-cts-164",
+    ":vulkan-cts-165",
+    ":vulkan-cts-166",
+    ":vulkan-cts-167",
+    ":vulkan-cts-168",
+    ":vulkan-cts-169",
+    ":vulkan-cts-170",
+    ":vulkan-cts-171",
+    ":vulkan-cts-172",
+    ":vulkan-cts-173",
+    ":vulkan-cts-174",
+    ":vulkan-cts-175",
+    ":vulkan-cts-176",
+    ":vulkan-cts-177",
+    ":vulkan-cts-178",
+    ":vulkan-cts-179",
+    ":vulkan-cts-180",
+    ":vulkan-cts-181",
+    ":vulkan-cts-182",
+    ":vulkan-cts-183",
+    ":vulkan-cts-184",
+    ":vulkan-cts-185",
+    ":vulkan-cts-186",
+    ":vulkan-cts-187",
+    ":vulkan-cts-188",
+    ":vulkan-cts-189",
+    ":vulkan-cts-190",
+    ":vulkan-cts-191",
+    ":vulkan-cts-192",
+    ":vulkan-cts-193",
+    ":vulkan-cts-194",
+    ":vulkan-cts-195",
+    ":vulkan-cts-196",
+    ":vulkan-cts-197",
+    ":vulkan-cts-198",
+    ":vulkan-cts-199",
+    ":vulkan-cts-200",
+    ":vulkan-cts-201",
+    ":vulkan-cts-202",
+    ":vulkan-cts-203",
+    ":vulkan-cts-204",
+    ":vulkan-cts-205",
+    ":vulkan-cts-206",
+    ":vulkan-cts-207",
+    ":vulkan-cts-208",
+    ":vulkan-cts-209",
+    ":vulkan-cts-210",
+    ":vulkan-cts-211",
+    ":vulkan-cts-212",
+    ":vulkan-cts-213",
+    ":vulkan-cts-214",
+    ":vulkan-cts-215",
+    ":vulkan-cts-216",
+    ":vulkan-cts-217",
+    ":vulkan-cts-218",
+    ":vulkan-cts-219",
+    ":vulkan-cts-220",
+    ":vulkan-cts-221",
+    ":vulkan-cts-222",
+    ":vulkan-cts-223",
+    ":vulkan-cts-224",
+    ":vulkan-cts-225",
+    ":vulkan-cts-226",
+    ":vulkan-cts-227",
+    ":vulkan-cts-228",
+    ":vulkan-cts-229",
+    ":vulkan-cts-230",
+    ":vulkan-cts-231",
+    ":vulkan-cts-232",
+    ":vulkan-cts-233",
+    ":vulkan-cts-234",
+    ":vulkan-cts-235",
+    ":vulkan-cts-236",
+    ":vulkan-cts-237",
+    ":vulkan-cts-238",
+    ":vulkan-cts-239",
+    ":vulkan-cts-240",
+    ":vulkan-cts-241",
+    ":vulkan-cts-242",
+    ":vulkan-cts-243",
+    ":vulkan-cts-244",
+    ":vulkan-cts-245",
+    ":vulkan-cts-246",
+    ":vulkan-cts-247",
+    ":vulkan-cts-248",
+    ":vulkan-cts-249",
+    ":vulkan-cts-250",
+    ":vulkan-cts-251",
+    ":vulkan-cts-252",
+    ":vulkan-cts-253",
+    ":vulkan-cts-254",
+    ":vulkan-cts-255",
+    ":vulkan-cts-256",
+    ":vulkan-cts-257",
+    ":vulkan-cts-258",
+    ":vulkan-cts-259",
+    ":vulkan-cts-260",
+    ":vulkan-cts-261",
+    ":vulkan-cts-262",
+    ":vulkan-cts-263",
+    ":vulkan-cts-264",
+    ":vulkan-cts-265",
+    ":vulkan-cts-266",
+    ":vulkan-cts-267",
+    ":vulkan-cts-268",
+    ":vulkan-cts-269",
+    ":vulkan-cts-270",
+    ":vulkan-cts-271",
+    ":vulkan-cts-272",
+    ":vulkan-cts-273",
+    ":vulkan-cts-274",
+    ":vulkan-cts-275",
+    ":vulkan-cts-276",
+    ":vulkan-cts-277",
+    ":vulkan-cts-278",
+    ":vulkan-cts-279",
+    ":vulkan-cts-280",
+    ":vulkan-cts-281",
+    ":vulkan-cts-282",
+    ":vulkan-cts-283",
+    ":vulkan-cts-284",
+    ":vulkan-cts-285",
+    ":vulkan-cts-286",
+    ":vulkan-cts-287",
+    ":vulkan-cts-288",
+    ":vulkan-cts-289",
+    ":vulkan-cts-290",
+    ":vulkan-cts-291",
+    ":vulkan-cts-292",
+    ":vulkan-cts-293",
+    ":vulkan-cts-294",
+    ":vulkan-cts-295",
+    ":vulkan-cts-296",
+    ":vulkan-cts-297",
+    ":vulkan-cts-298",
+    ":vulkan-cts-299",
+    ":vulkan-cts-300",
+    ":vulkan-cts-301",
+    ":vulkan-cts-302",
+    ":vulkan-cts-303",
+    ":vulkan-cts-304",
+    ":vulkan-cts-305",
+    ":vulkan-cts-306",
+    ":vulkan-cts-307",
+    ":vulkan-cts-308",
+    ":vulkan-cts-309",
+    ":vulkan-cts-310",
+    ":vulkan-cts-311",
+    ":vulkan-cts-312",
+    ":vulkan-cts-313",
+    ":vulkan-cts-314",
+    ":vulkan-cts-315",
+    ":vulkan-cts-316",
+    ":vulkan-cts-317",
+    ":vulkan-cts-318",
+    ":vulkan-cts-319",
+    ":vulkan-cts-320",
+    ":vulkan-cts-321",
+    ":vulkan-cts-322",
+    ":vulkan-cts-323",
+    ":vulkan-cts-324",
+    ":vulkan-cts-325",
+    ":vulkan-cts-326",
+    ":vulkan-cts-327",
+    ":vulkan-cts-328",
+    ":vulkan-cts-329",
+    ":vulkan-cts-330",
+    ":vulkan-cts-331",
+    ":vulkan-cts-332",
+    ":vulkan-cts-333",
+    ":vulkan-cts-334",
+    ":vulkan-cts-335",
+    ":vulkan-cts-336",
+    ":vulkan-cts-337",
+    ":vulkan-cts-338",
+    ":vulkan-cts-339",
+    ":vulkan-cts-340",
+    ":vulkan-cts-341",
+    ":vulkan-cts-342",
+    ":vulkan-cts-343",
+    ":vulkan-cts-344",
+    ":vulkan-cts-345",
+    ":vulkan-cts-346",
+    ":vulkan-cts-347",
+    ":vulkan-cts-348",
+    ":vulkan-cts-349",
+    ":vulkan-cts-350",
+    ":vulkan-cts-351",
+    ":vulkan-cts-352",
+    ":vulkan-cts-353",
+    ":vulkan-cts-354",
+    ":vulkan-cts-355",
+    ":vulkan-cts-356",
+    ":vulkan-cts-357",
+    ":vulkan-cts-358",
+    ":vulkan-cts-359",
+    ":vulkan-cts-360",
+    ":vulkan-cts-361",
+    ":vulkan-cts-362",
+    ":vulkan-cts-363",
+    ":vulkan-cts-364",
+    ":vulkan-cts-365",
+    ":vulkan-cts-366",
+    ":vulkan-cts-367",
+    ":vulkan-cts-368",
+    ":vulkan-cts-369",
+    ":vulkan-cts-370",
+    ":vulkan-cts-371",
+    ":vulkan-cts-372",
+    ":vulkan-cts-373",
+    ":vulkan-cts-374",
+    ":vulkan-cts-375",
+    ":vulkan-cts-376",
+    ":vulkan-cts-377",
+    ":vulkan-cts-378",
+    ":vulkan-cts-379",
+    ":vulkan-cts-380",
+    ":vulkan-cts-381",
+    ":vulkan-cts-382",
+    ":vulkan-cts-383",
+    ":vulkan-cts-384",
+    ":vulkan-cts-385",
+    ":vulkan-cts-386",
+    ":vulkan-cts-387",
+    ":vulkan-cts-388",
+    ":vulkan-cts-389",
+    ":vulkan-cts-390",
+    ":vulkan-cts-391",
+    ":vulkan-cts-392",
+    ":vulkan-cts-393",
+    ":vulkan-cts-394",
+    ":vulkan-cts-395",
+    ":vulkan-cts-396",
+    ":vulkan-cts-397",
+    ":vulkan-cts-398",
+    ":vulkan-cts-399",
+    ":vulkan-cts-400",
+    ":vulkan-cts-401",
+    ":vulkan-cts-402",
+    ":vulkan-cts-403",
+    ":vulkan-cts-404",
+    ":vulkan-cts-405",
+    ":vulkan-cts-406",
+    ":vulkan-cts-407",
+    ":vulkan-cts-408",
+    ":vulkan-cts-409",
+    ":vulkan-cts-410",
+    ":vulkan-cts-411",
+    ":vulkan-cts-412",
+    ":vulkan-cts-413",
+    ":vulkan-cts-414",
+    ":vulkan-cts-415",
+    ":vulkan-cts-416",
+    ":vulkan-cts-417",
+    ":vulkan-cts-418",
+    ":vulkan-cts-419",
+    ":vulkan-cts-420",
+    ":vulkan-cts-421",
+    ":vulkan-cts-422",
+    ":vulkan-cts-423",
+    ":vulkan-cts-424",
+    ":vulkan-cts-425",
+    ":vulkan-cts-426",
+    ":vulkan-cts-427",
+    ":vulkan-cts-428",
+    ":vulkan-cts-429",
+    ":vulkan-cts-430",
+    ":vulkan-cts-431",
+    ":vulkan-cts-432",
+    ":vulkan-cts-433",
+    ":vulkan-cts-434",
+    ":vulkan-cts-435",
+    ":vulkan-cts-436",
+    ":vulkan-cts-437",
+    ":vulkan-cts-438",
+    ":vulkan-cts-439",
+    ":vulkan-cts-440",
+    ":vulkan-cts-441",
+    ":vulkan-cts-442",
+    ":vulkan-cts-443",
+    ":vulkan-cts-444",
+    ":vulkan-cts-445",
+    ":vulkan-cts-446",
+    ":vulkan-cts-447",
+    ":vulkan-cts-448",
+    ":vulkan-cts-449",
+    ":vulkan-cts-450",
+    ":vulkan-cts-451",
+    ":vulkan-cts-452",
+    ":vulkan-cts-453",
+    ":vulkan-cts-454",
+    ":vulkan-cts-455",
+    ":vulkan-cts-456",
+    ":vulkan-cts-457",
+    ":vulkan-cts-458",
+    ":vulkan-cts-459",
+    ":vulkan-cts-460",
+    ":vulkan-cts-461",
+    ":vulkan-cts-462",
+    ":vulkan-cts-463",
+    ":vulkan-cts-464",
+    ":vulkan-cts-465",
+    ":vulkan-cts-466",
+    ":vulkan-cts-467",
+    ":vulkan-cts-468",
+    ":vulkan-cts-469",
+    ":vulkan-cts-470",
+    ":vulkan-cts-471",
+    ":vulkan-cts-472",
+    ":vulkan-cts-473",
+    ":vulkan-cts-474",
+    ":vulkan-cts-475",
+    ":vulkan-cts-476",
+    ":vulkan-cts-477",
+    ":vulkan-cts-478",
+    ":vulkan-cts-479",
+    ":vulkan-cts-480",
+    ":vulkan-cts-481",
+    ":vulkan-cts-482",
+    ":vulkan-cts-483",
+    ":vulkan-cts-484",
+    ":vulkan-cts-485",
+    ":vulkan-cts-486",
+    ":vulkan-cts-487",
+    ":vulkan-cts-488",
+    ":vulkan-cts-489",
+    ":vulkan-cts-490",
+    ":vulkan-cts-491",
+    ":vulkan-cts-492",
+    ":vulkan-cts-493",
+    ":vulkan-cts-494",
+    ":vulkan-cts-495",
+    ":vulkan-cts-496",
+    ":vulkan-cts-497",
+    ":vulkan-cts-498",
+    ":vulkan-cts-499",
+    ":vulkan-cts-500",
+    ":vulkan-cts-501",
+    ":vulkan-cts-502",
+    ":vulkan-cts-503",
+    ":vulkan-cts-504",
+    ":vulkan-cts-505",
+    ":vulkan-cts-506",
+    ":vulkan-cts-507",
+    ":vulkan-cts-508",
+    ":vulkan-cts-509",
+    ":vulkan-cts-510",
+    ":vulkan-cts-511",
+    ":vulkan-cts-512",
+    ":vulkan-cts-513",
+    ":vulkan-cts-514",
+    ":vulkan-cts-515",
+    ":vulkan-cts-516",
+    ":vulkan-cts-517",
+    ":vulkan-cts-518",
+    ":vulkan-cts-519",
+    ":vulkan-cts-520",
+    ":vulkan-cts-521",
+    ":vulkan-cts-522",
+    ":vulkan-cts-523",
+    ":vulkan-cts-524",
+    ":vulkan-cts-525",
+    ":vulkan-cts-526",
+    ":vulkan-cts-527",
+    ":vulkan-cts-528",
+    ":vulkan-cts-529",
+    ":vulkan-cts-530",
+    ":vulkan-cts-531",
+    ":vulkan-cts-532",
+    ":vulkan-cts-533",
+    ":vulkan-cts-534",
+    ":vulkan-cts-535",
+    ":vulkan-cts-536",
+    ":vulkan-cts-537",
+    ":vulkan-cts-538",
+    ":vulkan-cts-539",
+    ":vulkan-cts-540",
+    ":vulkan-cts-541",
+    ":vulkan-cts-542",
+    ":vulkan-cts-543",
+    ":vulkan-cts-544",
+    ":vulkan-cts-545",
+    ":vulkan-cts-546",
+    ":vulkan-cts-547",
+    ":vulkan-cts-548",
+    ":vulkan-cts-549",
+    ":vulkan-cts-550",
+    ":vulkan-cts-551",
+    ":vulkan-cts-552",
+    ":vulkan-cts-553",
+    ":vulkan-cts-554",
+    ":vulkan-cts-555",
+    ":vulkan-cts-556",
+    ":vulkan-cts-557",
+    ":vulkan-cts-558",
+    ":vulkan-cts-559",
+    ":vulkan-cts-560",
+    ":vulkan-cts-561",
+    ":vulkan-cts-562",
+    ":vulkan-cts-563",
+    ":vulkan-cts-564",
+    ":vulkan-cts-565",
+    ":vulkan-cts-566",
+    ":vulkan-cts-567",
+    ":vulkan-cts-568",
+  ]
+  test_specs = {
+    environments = labeled_magma_hardware_envs
+  }
 }
 
 group("split-cts") {
diff --git a/fuchsia/split-cts/meta/vulkan-cts-000.cmx b/fuchsia/split-cts/meta/vulkan-cts-000.cmx
index f6536b5..16d147f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-000.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-000.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-000"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-001.cmx b/fuchsia/split-cts/meta/vulkan-cts-001.cmx
index 0bb072a..17282bb 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-001.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-001.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-001"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-002.cmx b/fuchsia/split-cts/meta/vulkan-cts-002.cmx
index 1fb69a7..3e9d6d9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-002.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-002.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-002"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-003.cmx b/fuchsia/split-cts/meta/vulkan-cts-003.cmx
index 6f86c21..e3be228 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-003.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-003.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-003"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-004.cmx b/fuchsia/split-cts/meta/vulkan-cts-004.cmx
index 4c21a0d..1cc788a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-004.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-004.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-004"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-005.cmx b/fuchsia/split-cts/meta/vulkan-cts-005.cmx
index 9986300..0f55a5b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-005.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-005.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-005"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-006.cmx b/fuchsia/split-cts/meta/vulkan-cts-006.cmx
index 92269f6..f801d97 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-006.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-006.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-006"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-007.cmx b/fuchsia/split-cts/meta/vulkan-cts-007.cmx
index dfe0251..2bc8fc6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-007.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-007.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-007"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-008.cmx b/fuchsia/split-cts/meta/vulkan-cts-008.cmx
index a6a9123..7010b26 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-008.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-008.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-008"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-009.cmx b/fuchsia/split-cts/meta/vulkan-cts-009.cmx
index 0a84e8e..52dd28d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-009.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-009.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-009"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-010.cmx b/fuchsia/split-cts/meta/vulkan-cts-010.cmx
index 255d2e6..87cd182 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-010.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-010.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-010"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-011.cmx b/fuchsia/split-cts/meta/vulkan-cts-011.cmx
index 511be53..09ab616 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-011.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-011.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-011"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-012.cmx b/fuchsia/split-cts/meta/vulkan-cts-012.cmx
index 8c51cf0..96f6911 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-012.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-012.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-012"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-013.cmx b/fuchsia/split-cts/meta/vulkan-cts-013.cmx
index 5858a50..5e6d8ee 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-013.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-013.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-013"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-014.cmx b/fuchsia/split-cts/meta/vulkan-cts-014.cmx
index 164d8d5..dcd874b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-014.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-014.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-014"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-015.cmx b/fuchsia/split-cts/meta/vulkan-cts-015.cmx
index 2ad5d93..49e7687 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-015.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-015.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-015"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-016.cmx b/fuchsia/split-cts/meta/vulkan-cts-016.cmx
index 760d2d1..f94e12c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-016.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-016.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-016"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-017.cmx b/fuchsia/split-cts/meta/vulkan-cts-017.cmx
index 43f6150..f89ad19 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-017.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-017.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-017"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-018.cmx b/fuchsia/split-cts/meta/vulkan-cts-018.cmx
index 41c6b96..027b589 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-018.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-018.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-018"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-019.cmx b/fuchsia/split-cts/meta/vulkan-cts-019.cmx
index 3684c75..6d2ed3f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-019.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-019.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-019"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-020.cmx b/fuchsia/split-cts/meta/vulkan-cts-020.cmx
index 63b420e..40fcec6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-020.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-020.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-020"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-021.cmx b/fuchsia/split-cts/meta/vulkan-cts-021.cmx
index 5948303..eb5214b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-021.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-021.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-021"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-022.cmx b/fuchsia/split-cts/meta/vulkan-cts-022.cmx
index 9dee7b6..9c2c2de 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-022.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-022.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-022"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-023.cmx b/fuchsia/split-cts/meta/vulkan-cts-023.cmx
index a53f8a0..2455a7d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-023.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-023.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-023"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-024.cmx b/fuchsia/split-cts/meta/vulkan-cts-024.cmx
index 36b40eb..e0585e3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-024.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-024.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-024"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-025.cmx b/fuchsia/split-cts/meta/vulkan-cts-025.cmx
index 83d3439..b08f055 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-025.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-025.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-025"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-026.cmx b/fuchsia/split-cts/meta/vulkan-cts-026.cmx
index 7826c5b..fb7c9a2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-026.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-026.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-026"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-027.cmx b/fuchsia/split-cts/meta/vulkan-cts-027.cmx
index a73a993..ca36060 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-027.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-027.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-027"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-028.cmx b/fuchsia/split-cts/meta/vulkan-cts-028.cmx
index 3a9ccc4..a08cbc7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-028.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-028.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-028"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-029.cmx b/fuchsia/split-cts/meta/vulkan-cts-029.cmx
index 0e56ec1..d809bdd 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-029.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-029.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-029"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-030.cmx b/fuchsia/split-cts/meta/vulkan-cts-030.cmx
index 2d2c807..53561cd 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-030.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-030.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-030"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-031.cmx b/fuchsia/split-cts/meta/vulkan-cts-031.cmx
index e8bed24..b8bb1cf 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-031.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-031.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-031"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-032.cmx b/fuchsia/split-cts/meta/vulkan-cts-032.cmx
index df240f6..7155eb7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-032.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-032.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-032"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-033.cmx b/fuchsia/split-cts/meta/vulkan-cts-033.cmx
index 6344fca..af2d696 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-033.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-033.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-033"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-034.cmx b/fuchsia/split-cts/meta/vulkan-cts-034.cmx
index 9a4779e..4b3271d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-034.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-034.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-034"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-035.cmx b/fuchsia/split-cts/meta/vulkan-cts-035.cmx
index 6a1054e..d91d5fd 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-035.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-035.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-035"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-036.cmx b/fuchsia/split-cts/meta/vulkan-cts-036.cmx
index befc92f..94e87ab 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-036.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-036.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-036"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-037.cmx b/fuchsia/split-cts/meta/vulkan-cts-037.cmx
index 4f4cc5d..58ef264 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-037.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-037.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-037"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-038.cmx b/fuchsia/split-cts/meta/vulkan-cts-038.cmx
index d706984..4f0ac4e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-038.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-038.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-038"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-039.cmx b/fuchsia/split-cts/meta/vulkan-cts-039.cmx
index ee3f4c7..86ef393 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-039.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-039.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-039"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-040.cmx b/fuchsia/split-cts/meta/vulkan-cts-040.cmx
index 20104a4..f0145d5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-040.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-040.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-040"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-041.cmx b/fuchsia/split-cts/meta/vulkan-cts-041.cmx
index 7d9b582..7f511ea 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-041.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-041.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-041"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-042.cmx b/fuchsia/split-cts/meta/vulkan-cts-042.cmx
index c1bd3ef..de0a5aa 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-042.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-042.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-042"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-043.cmx b/fuchsia/split-cts/meta/vulkan-cts-043.cmx
index c3f8b6c..7ab8d90 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-043.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-043.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-043"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-044.cmx b/fuchsia/split-cts/meta/vulkan-cts-044.cmx
index 80c8e5a..b8cee92 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-044.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-044.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-044"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-045.cmx b/fuchsia/split-cts/meta/vulkan-cts-045.cmx
index 8092c91..305b3c3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-045.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-045.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-045"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-046.cmx b/fuchsia/split-cts/meta/vulkan-cts-046.cmx
index 09d7b9d..8373990 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-046.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-046.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-046"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-047.cmx b/fuchsia/split-cts/meta/vulkan-cts-047.cmx
index 75fd9c6..b30f4c2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-047.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-047.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-047"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-048.cmx b/fuchsia/split-cts/meta/vulkan-cts-048.cmx
index 5512815..637000e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-048.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-048.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-048"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-049.cmx b/fuchsia/split-cts/meta/vulkan-cts-049.cmx
index 9d18acf..9741b15 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-049.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-049.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-049"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-050.cmx b/fuchsia/split-cts/meta/vulkan-cts-050.cmx
index 4f80c3a..58a4021 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-050.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-050.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-050"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-051.cmx b/fuchsia/split-cts/meta/vulkan-cts-051.cmx
index 02985c8..0b1dab2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-051.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-051.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-051"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-052.cmx b/fuchsia/split-cts/meta/vulkan-cts-052.cmx
index d3470f3..9f7931e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-052.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-052.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-052"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-053.cmx b/fuchsia/split-cts/meta/vulkan-cts-053.cmx
index 041ae28..2860ee6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-053.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-053.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-053"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-054.cmx b/fuchsia/split-cts/meta/vulkan-cts-054.cmx
index b074bab..990a252 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-054.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-054.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-054"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-055.cmx b/fuchsia/split-cts/meta/vulkan-cts-055.cmx
index f18b2dd..6687bb1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-055.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-055.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-055"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-056.cmx b/fuchsia/split-cts/meta/vulkan-cts-056.cmx
index daf0219..c6c183c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-056.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-056.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-056"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-057.cmx b/fuchsia/split-cts/meta/vulkan-cts-057.cmx
index f02caee..7599d2a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-057.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-057.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-057"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-058.cmx b/fuchsia/split-cts/meta/vulkan-cts-058.cmx
index 0ef5425..56921d8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-058.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-058.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-058"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-059.cmx b/fuchsia/split-cts/meta/vulkan-cts-059.cmx
index 3c1a59f..48e11d1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-059.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-059.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-059"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-060.cmx b/fuchsia/split-cts/meta/vulkan-cts-060.cmx
index 01d8398..c1a1d81 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-060.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-060.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-060"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-061.cmx b/fuchsia/split-cts/meta/vulkan-cts-061.cmx
index 25db762..b6607eb 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-061.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-061.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-061"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-062.cmx b/fuchsia/split-cts/meta/vulkan-cts-062.cmx
index de39159..138ba66 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-062.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-062.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-062"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-063.cmx b/fuchsia/split-cts/meta/vulkan-cts-063.cmx
index 156fc12..dee8efa 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-063.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-063.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-063"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-064.cmx b/fuchsia/split-cts/meta/vulkan-cts-064.cmx
index 714580d..c19f90c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-064.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-064.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-064"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-065.cmx b/fuchsia/split-cts/meta/vulkan-cts-065.cmx
index 1469fe6..7f222f2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-065.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-065.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-065"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-066.cmx b/fuchsia/split-cts/meta/vulkan-cts-066.cmx
index 0e401f8..b0a7470 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-066.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-066.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-066"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-067.cmx b/fuchsia/split-cts/meta/vulkan-cts-067.cmx
index 01b275a..fd2c582 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-067.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-067.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-067"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-068.cmx b/fuchsia/split-cts/meta/vulkan-cts-068.cmx
index cdba086..ff5191c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-068.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-068.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-068"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-069.cmx b/fuchsia/split-cts/meta/vulkan-cts-069.cmx
index b5720d7..375b663 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-069.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-069.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-069"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-070.cmx b/fuchsia/split-cts/meta/vulkan-cts-070.cmx
index 95b29ff..00ee0b8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-070.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-070.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-070"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-071.cmx b/fuchsia/split-cts/meta/vulkan-cts-071.cmx
index a223e4f..6a209fc 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-071.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-071.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-071"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-072.cmx b/fuchsia/split-cts/meta/vulkan-cts-072.cmx
index d311ffe..cdbc942 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-072.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-072.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-072"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-073.cmx b/fuchsia/split-cts/meta/vulkan-cts-073.cmx
index 206cc94..88e0311 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-073.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-073.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-073"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-074.cmx b/fuchsia/split-cts/meta/vulkan-cts-074.cmx
index 208e933..5c2c290 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-074.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-074.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-074"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-075.cmx b/fuchsia/split-cts/meta/vulkan-cts-075.cmx
index d7621d0..c337eab 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-075.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-075.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-075"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-076.cmx b/fuchsia/split-cts/meta/vulkan-cts-076.cmx
index 6443a0d..0d03f1e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-076.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-076.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-076"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-077.cmx b/fuchsia/split-cts/meta/vulkan-cts-077.cmx
index 032da9b..5bfc5fe 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-077.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-077.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-077"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-078.cmx b/fuchsia/split-cts/meta/vulkan-cts-078.cmx
index 911e200..0263f99 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-078.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-078.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-078"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-079.cmx b/fuchsia/split-cts/meta/vulkan-cts-079.cmx
index bcd83b1..305760b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-079.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-079.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-079"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-080.cmx b/fuchsia/split-cts/meta/vulkan-cts-080.cmx
index 5b8f14e..81e8d57 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-080.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-080.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-080"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-081.cmx b/fuchsia/split-cts/meta/vulkan-cts-081.cmx
index 5a8a6bf..6348ca4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-081.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-081.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-081"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-082.cmx b/fuchsia/split-cts/meta/vulkan-cts-082.cmx
index e91a33c..5b31478 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-082.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-082.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-082"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-083.cmx b/fuchsia/split-cts/meta/vulkan-cts-083.cmx
index 4cea284..aabab31 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-083.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-083.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-083"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-084.cmx b/fuchsia/split-cts/meta/vulkan-cts-084.cmx
index e4e7292..c28ea86 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-084.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-084.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-084"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-085.cmx b/fuchsia/split-cts/meta/vulkan-cts-085.cmx
index 7bdda21..6f9d00c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-085.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-085.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-085"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-086.cmx b/fuchsia/split-cts/meta/vulkan-cts-086.cmx
index aa8f119..4818255 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-086.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-086.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-086"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-087.cmx b/fuchsia/split-cts/meta/vulkan-cts-087.cmx
index 11bc947..3e1f1fe 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-087.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-087.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-087"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-088.cmx b/fuchsia/split-cts/meta/vulkan-cts-088.cmx
index ce5d05f..bdaf967 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-088.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-088.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-088"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-089.cmx b/fuchsia/split-cts/meta/vulkan-cts-089.cmx
index 1cebb22..0f8ee49 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-089.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-089.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-089"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-090.cmx b/fuchsia/split-cts/meta/vulkan-cts-090.cmx
index 4cc6fad..0a3154c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-090.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-090.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-090"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-091.cmx b/fuchsia/split-cts/meta/vulkan-cts-091.cmx
index ab46bc0..7165826 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-091.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-091.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-091"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-092.cmx b/fuchsia/split-cts/meta/vulkan-cts-092.cmx
index f09b7ff..dd2bea6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-092.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-092.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-092"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-093.cmx b/fuchsia/split-cts/meta/vulkan-cts-093.cmx
index 7898f68..89af696 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-093.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-093.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-093"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-094.cmx b/fuchsia/split-cts/meta/vulkan-cts-094.cmx
index acff36c..df7c466 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-094.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-094.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-094"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-095.cmx b/fuchsia/split-cts/meta/vulkan-cts-095.cmx
index 6828950..f7b8b18 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-095.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-095.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-095"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-096.cmx b/fuchsia/split-cts/meta/vulkan-cts-096.cmx
index 6f09b28..8a1f31c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-096.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-096.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-096"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-097.cmx b/fuchsia/split-cts/meta/vulkan-cts-097.cmx
index ef31102..97d68a6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-097.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-097.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-097"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-098.cmx b/fuchsia/split-cts/meta/vulkan-cts-098.cmx
index 60e2443..b960929 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-098.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-098.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-098"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-099.cmx b/fuchsia/split-cts/meta/vulkan-cts-099.cmx
index 926a2a1..b6f195f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-099.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-099.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-099"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-100.cmx b/fuchsia/split-cts/meta/vulkan-cts-100.cmx
index 3fa224d..ebfd64d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-100.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-100.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-100"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-101.cmx b/fuchsia/split-cts/meta/vulkan-cts-101.cmx
index 4417005..f88e37e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-101.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-101.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-101"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-102.cmx b/fuchsia/split-cts/meta/vulkan-cts-102.cmx
index c97cec4..0e6d479 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-102.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-102.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-102"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-103.cmx b/fuchsia/split-cts/meta/vulkan-cts-103.cmx
index 7654b5a..616e663 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-103.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-103.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-103"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-104.cmx b/fuchsia/split-cts/meta/vulkan-cts-104.cmx
index b4969a6..fb3597d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-104.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-104.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-104"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-105.cmx b/fuchsia/split-cts/meta/vulkan-cts-105.cmx
index 782218e..44f18ae 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-105.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-105.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-105"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-106.cmx b/fuchsia/split-cts/meta/vulkan-cts-106.cmx
index af7d9ed..f18912d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-106.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-106.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-106"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-107.cmx b/fuchsia/split-cts/meta/vulkan-cts-107.cmx
index 0d58f13..c3df7c6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-107.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-107.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-107"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-108.cmx b/fuchsia/split-cts/meta/vulkan-cts-108.cmx
index ef076af..2858c65 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-108.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-108.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-108"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-109.cmx b/fuchsia/split-cts/meta/vulkan-cts-109.cmx
index 77f7b4c..12dea9a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-109.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-109.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-109"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-110.cmx b/fuchsia/split-cts/meta/vulkan-cts-110.cmx
index 5118da4..b302c04 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-110.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-110.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-110"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-111.cmx b/fuchsia/split-cts/meta/vulkan-cts-111.cmx
index 6e1b158..94900a1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-111.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-111.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-111"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-112.cmx b/fuchsia/split-cts/meta/vulkan-cts-112.cmx
index 4a90bd4..997a151 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-112.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-112.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-112"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-113.cmx b/fuchsia/split-cts/meta/vulkan-cts-113.cmx
index daace30..fb3255c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-113.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-113.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-113"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-114.cmx b/fuchsia/split-cts/meta/vulkan-cts-114.cmx
index 0fd20b4..9d82d31 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-114.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-114.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-114"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-115.cmx b/fuchsia/split-cts/meta/vulkan-cts-115.cmx
index 4a6be8d..4a51056 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-115.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-115.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-115"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-116.cmx b/fuchsia/split-cts/meta/vulkan-cts-116.cmx
index a058743..0027932 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-116.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-116.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-116"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-117.cmx b/fuchsia/split-cts/meta/vulkan-cts-117.cmx
index cdbdb87..dba554a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-117.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-117.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-117"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-118.cmx b/fuchsia/split-cts/meta/vulkan-cts-118.cmx
index 24d6f53..c8d3845 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-118.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-118.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-118"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-119.cmx b/fuchsia/split-cts/meta/vulkan-cts-119.cmx
index 533a165..1b2e829 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-119.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-119.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-119"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-120.cmx b/fuchsia/split-cts/meta/vulkan-cts-120.cmx
index 83aa5ff..e52c19e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-120.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-120.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-120"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-121.cmx b/fuchsia/split-cts/meta/vulkan-cts-121.cmx
index eb10b5c..4927804 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-121.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-121.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-121"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-122.cmx b/fuchsia/split-cts/meta/vulkan-cts-122.cmx
index 7df2f92..f40a65a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-122.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-122.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-122"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-123.cmx b/fuchsia/split-cts/meta/vulkan-cts-123.cmx
index 528c9ad..1834fea 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-123.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-123.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-123"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-124.cmx b/fuchsia/split-cts/meta/vulkan-cts-124.cmx
index 9093320..f6677a9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-124.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-124.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-124"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-125.cmx b/fuchsia/split-cts/meta/vulkan-cts-125.cmx
index a218119..3110d6d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-125.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-125.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-125"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-126.cmx b/fuchsia/split-cts/meta/vulkan-cts-126.cmx
index 4a4ac40..3c94eae 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-126.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-126.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-126"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-127.cmx b/fuchsia/split-cts/meta/vulkan-cts-127.cmx
index 336b851..1645e2e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-127.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-127.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-127"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-128.cmx b/fuchsia/split-cts/meta/vulkan-cts-128.cmx
index cad7b4a..a2cdd21 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-128.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-128.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-128"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-129.cmx b/fuchsia/split-cts/meta/vulkan-cts-129.cmx
index e00f428..c0aa5d8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-129.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-129.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-129"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-130.cmx b/fuchsia/split-cts/meta/vulkan-cts-130.cmx
index 5532861..6b69bb4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-130.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-130.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-130"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-131.cmx b/fuchsia/split-cts/meta/vulkan-cts-131.cmx
index c1262fc..bad247e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-131.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-131.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-131"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-132.cmx b/fuchsia/split-cts/meta/vulkan-cts-132.cmx
index 03a616f..1a69815 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-132.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-132.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-132"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-133.cmx b/fuchsia/split-cts/meta/vulkan-cts-133.cmx
index cdddaa2..ad1d787 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-133.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-133.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-133"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-134.cmx b/fuchsia/split-cts/meta/vulkan-cts-134.cmx
index d7b9e33..dc05a51 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-134.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-134.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-134"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-135.cmx b/fuchsia/split-cts/meta/vulkan-cts-135.cmx
index 2b0104c..2f5ea09 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-135.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-135.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-135"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-136.cmx b/fuchsia/split-cts/meta/vulkan-cts-136.cmx
index 4d8a1a6..031f6f8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-136.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-136.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-136"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-137.cmx b/fuchsia/split-cts/meta/vulkan-cts-137.cmx
index 7ffd1f7..f300a80 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-137.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-137.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-137"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-138.cmx b/fuchsia/split-cts/meta/vulkan-cts-138.cmx
index ab4969f..f1dea12 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-138.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-138.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-138"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-139.cmx b/fuchsia/split-cts/meta/vulkan-cts-139.cmx
index fbdb660..d4c5196 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-139.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-139.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-139"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-140.cmx b/fuchsia/split-cts/meta/vulkan-cts-140.cmx
index eb20cc0..0b0da35 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-140.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-140.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-140"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-141.cmx b/fuchsia/split-cts/meta/vulkan-cts-141.cmx
index b8aa05b..978940b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-141.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-141.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-141"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-142.cmx b/fuchsia/split-cts/meta/vulkan-cts-142.cmx
index 2ceb854..fbd8e72 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-142.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-142.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-142"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-143.cmx b/fuchsia/split-cts/meta/vulkan-cts-143.cmx
index 3dd0845..2c85727 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-143.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-143.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-143"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-144.cmx b/fuchsia/split-cts/meta/vulkan-cts-144.cmx
index 0553f4e..be3be73 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-144.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-144.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-144"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-145.cmx b/fuchsia/split-cts/meta/vulkan-cts-145.cmx
index f0267fe..b6598d2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-145.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-145.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-145"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-146.cmx b/fuchsia/split-cts/meta/vulkan-cts-146.cmx
index 8502a2f..86dc6d7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-146.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-146.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-146"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-147.cmx b/fuchsia/split-cts/meta/vulkan-cts-147.cmx
index 12c3ff4..350b274 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-147.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-147.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-147"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-148.cmx b/fuchsia/split-cts/meta/vulkan-cts-148.cmx
index 418dc4e..d1abb01 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-148.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-148.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-148"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-149.cmx b/fuchsia/split-cts/meta/vulkan-cts-149.cmx
index c094e89..a3f00ac 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-149.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-149.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-149"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-150.cmx b/fuchsia/split-cts/meta/vulkan-cts-150.cmx
index 89e282f..f003da6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-150.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-150.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-150"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-151.cmx b/fuchsia/split-cts/meta/vulkan-cts-151.cmx
index ae33636..f8e2755 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-151.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-151.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-151"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-152.cmx b/fuchsia/split-cts/meta/vulkan-cts-152.cmx
index 5fde4fd..03c4fd1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-152.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-152.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-152"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-153.cmx b/fuchsia/split-cts/meta/vulkan-cts-153.cmx
index becb630..24cceba 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-153.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-153.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-153"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-154.cmx b/fuchsia/split-cts/meta/vulkan-cts-154.cmx
index 7c1e8cb..7e6fae5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-154.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-154.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-154"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-155.cmx b/fuchsia/split-cts/meta/vulkan-cts-155.cmx
index e46f97f..06877ed 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-155.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-155.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-155"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-156.cmx b/fuchsia/split-cts/meta/vulkan-cts-156.cmx
index 9690f16..528599e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-156.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-156.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-156"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-157.cmx b/fuchsia/split-cts/meta/vulkan-cts-157.cmx
index 2a8ec2a..b353f60 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-157.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-157.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-157"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-158.cmx b/fuchsia/split-cts/meta/vulkan-cts-158.cmx
index ebe4db4..ecb2edb 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-158.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-158.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-158"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-159.cmx b/fuchsia/split-cts/meta/vulkan-cts-159.cmx
index ae35d7f..abc1aee 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-159.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-159.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-159"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-160.cmx b/fuchsia/split-cts/meta/vulkan-cts-160.cmx
index ca7b17d..aa75ece 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-160.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-160.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-160"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-161.cmx b/fuchsia/split-cts/meta/vulkan-cts-161.cmx
index 002a4ba..7a43664 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-161.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-161.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-161"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-162.cmx b/fuchsia/split-cts/meta/vulkan-cts-162.cmx
index b8459db..c2aeef6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-162.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-162.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-162"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-163.cmx b/fuchsia/split-cts/meta/vulkan-cts-163.cmx
index 24b7506..7646248 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-163.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-163.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-163"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-164.cmx b/fuchsia/split-cts/meta/vulkan-cts-164.cmx
index 591c2d4..765b312 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-164.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-164.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-164"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-165.cmx b/fuchsia/split-cts/meta/vulkan-cts-165.cmx
index e5287aa..b92c535 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-165.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-165.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-165"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-166.cmx b/fuchsia/split-cts/meta/vulkan-cts-166.cmx
index 3d252e1..6c0ff56 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-166.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-166.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-166"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-167.cmx b/fuchsia/split-cts/meta/vulkan-cts-167.cmx
index 269ecd8..1f1027a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-167.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-167.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-167"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-168.cmx b/fuchsia/split-cts/meta/vulkan-cts-168.cmx
index 3c78c57..7176449 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-168.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-168.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-168"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-169.cmx b/fuchsia/split-cts/meta/vulkan-cts-169.cmx
index fdd5f8f..d6e7cf1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-169.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-169.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-169"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-170.cmx b/fuchsia/split-cts/meta/vulkan-cts-170.cmx
index 07c4379..efd2983 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-170.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-170.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-170"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-171.cmx b/fuchsia/split-cts/meta/vulkan-cts-171.cmx
index f14dc65..3581069 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-171.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-171.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-171"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-172.cmx b/fuchsia/split-cts/meta/vulkan-cts-172.cmx
index 2b72e8c..6b3315d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-172.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-172.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-172"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-173.cmx b/fuchsia/split-cts/meta/vulkan-cts-173.cmx
index db83a40..58e75fd 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-173.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-173.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-173"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-174.cmx b/fuchsia/split-cts/meta/vulkan-cts-174.cmx
index b6cdab2..c008504 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-174.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-174.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-174"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-175.cmx b/fuchsia/split-cts/meta/vulkan-cts-175.cmx
index e4762d9..6c13c69 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-175.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-175.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-175"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-176.cmx b/fuchsia/split-cts/meta/vulkan-cts-176.cmx
index 4320878..b121d16 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-176.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-176.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-176"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-177.cmx b/fuchsia/split-cts/meta/vulkan-cts-177.cmx
index 288bcf4..154725b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-177.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-177.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-177"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-178.cmx b/fuchsia/split-cts/meta/vulkan-cts-178.cmx
index 25d238a..59bc5ee 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-178.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-178.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-178"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-179.cmx b/fuchsia/split-cts/meta/vulkan-cts-179.cmx
index a461177..1698aad 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-179.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-179.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-179"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-180.cmx b/fuchsia/split-cts/meta/vulkan-cts-180.cmx
index 75dd875..f5187c5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-180.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-180.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-180"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-181.cmx b/fuchsia/split-cts/meta/vulkan-cts-181.cmx
index d1e01ee..b117d3c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-181.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-181.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-181"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-182.cmx b/fuchsia/split-cts/meta/vulkan-cts-182.cmx
index e3acd73..5876aa4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-182.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-182.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-182"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-183.cmx b/fuchsia/split-cts/meta/vulkan-cts-183.cmx
index d61753a..2752723 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-183.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-183.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-183"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-184.cmx b/fuchsia/split-cts/meta/vulkan-cts-184.cmx
index 46a495d..36e233d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-184.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-184.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-184"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-185.cmx b/fuchsia/split-cts/meta/vulkan-cts-185.cmx
index 0e62439..96a1c49 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-185.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-185.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-185"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-186.cmx b/fuchsia/split-cts/meta/vulkan-cts-186.cmx
index 73b3565..05f70c3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-186.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-186.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-186"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-187.cmx b/fuchsia/split-cts/meta/vulkan-cts-187.cmx
index b1d7f9f..ea16f28 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-187.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-187.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-187"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-188.cmx b/fuchsia/split-cts/meta/vulkan-cts-188.cmx
index 7917580..d363e2a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-188.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-188.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-188"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-189.cmx b/fuchsia/split-cts/meta/vulkan-cts-189.cmx
index ce1b79f..7cf2368 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-189.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-189.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-189"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-190.cmx b/fuchsia/split-cts/meta/vulkan-cts-190.cmx
index 72ef2b9..ab35ab3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-190.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-190.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-190"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-191.cmx b/fuchsia/split-cts/meta/vulkan-cts-191.cmx
index 3269353..00e88af 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-191.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-191.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-191"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-192.cmx b/fuchsia/split-cts/meta/vulkan-cts-192.cmx
index 4e169c8..ea48fcd 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-192.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-192.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-192"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-193.cmx b/fuchsia/split-cts/meta/vulkan-cts-193.cmx
index 4c79bb3..4bd74a8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-193.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-193.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-193"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-194.cmx b/fuchsia/split-cts/meta/vulkan-cts-194.cmx
index 518af9b..6457bae 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-194.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-194.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-194"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-195.cmx b/fuchsia/split-cts/meta/vulkan-cts-195.cmx
index 0ca0716..20c091a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-195.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-195.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-195"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-196.cmx b/fuchsia/split-cts/meta/vulkan-cts-196.cmx
index 60350e9..0ddc47d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-196.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-196.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-196"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-197.cmx b/fuchsia/split-cts/meta/vulkan-cts-197.cmx
index b970fc2..60bd8a4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-197.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-197.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-197"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-198.cmx b/fuchsia/split-cts/meta/vulkan-cts-198.cmx
index fe7ba62..3f094e4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-198.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-198.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-198"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-199.cmx b/fuchsia/split-cts/meta/vulkan-cts-199.cmx
index 95076c7..b2ab878 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-199.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-199.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-199"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-200.cmx b/fuchsia/split-cts/meta/vulkan-cts-200.cmx
index 945c7c8..eaf635f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-200.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-200.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-200"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-201.cmx b/fuchsia/split-cts/meta/vulkan-cts-201.cmx
index 48c551b..18c4639 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-201.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-201.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-201"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-202.cmx b/fuchsia/split-cts/meta/vulkan-cts-202.cmx
index 17ac92f..c87008a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-202.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-202.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-202"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-203.cmx b/fuchsia/split-cts/meta/vulkan-cts-203.cmx
index 62e107e..eedd39e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-203.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-203.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-203"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-204.cmx b/fuchsia/split-cts/meta/vulkan-cts-204.cmx
index 1038f46..ba7d189 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-204.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-204.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-204"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-205.cmx b/fuchsia/split-cts/meta/vulkan-cts-205.cmx
index 62f377f..30ec0d8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-205.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-205.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-205"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-206.cmx b/fuchsia/split-cts/meta/vulkan-cts-206.cmx
index 3a3f27e..9240991 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-206.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-206.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-206"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-207.cmx b/fuchsia/split-cts/meta/vulkan-cts-207.cmx
index d5e9545..0ba3542 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-207.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-207.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-207"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-208.cmx b/fuchsia/split-cts/meta/vulkan-cts-208.cmx
index b148913..6821e94 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-208.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-208.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-208"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-209.cmx b/fuchsia/split-cts/meta/vulkan-cts-209.cmx
index 4bd4090..6882940 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-209.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-209.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-209"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-210.cmx b/fuchsia/split-cts/meta/vulkan-cts-210.cmx
index cb48833..bab3648 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-210.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-210.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-210"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-211.cmx b/fuchsia/split-cts/meta/vulkan-cts-211.cmx
index c1cd2f2..4a66661 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-211.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-211.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-211"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-212.cmx b/fuchsia/split-cts/meta/vulkan-cts-212.cmx
index 23bf9f2..cdb827d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-212.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-212.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-212"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-213.cmx b/fuchsia/split-cts/meta/vulkan-cts-213.cmx
index 9d31ff5..1c4cc57 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-213.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-213.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-213"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-214.cmx b/fuchsia/split-cts/meta/vulkan-cts-214.cmx
index a2ce37c..18f7258 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-214.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-214.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-214"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-215.cmx b/fuchsia/split-cts/meta/vulkan-cts-215.cmx
index 31b1009..235b22c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-215.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-215.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-215"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-216.cmx b/fuchsia/split-cts/meta/vulkan-cts-216.cmx
index bcfc659..0ac3410 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-216.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-216.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-216"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-217.cmx b/fuchsia/split-cts/meta/vulkan-cts-217.cmx
index f4c92dc..a255c5a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-217.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-217.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-217"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-218.cmx b/fuchsia/split-cts/meta/vulkan-cts-218.cmx
index f76edd1..d3c61c6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-218.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-218.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-218"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-219.cmx b/fuchsia/split-cts/meta/vulkan-cts-219.cmx
index 23d7139..1a4eea6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-219.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-219.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-219"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-220.cmx b/fuchsia/split-cts/meta/vulkan-cts-220.cmx
index 9072da1..d6ffa22 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-220.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-220.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-220"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-221.cmx b/fuchsia/split-cts/meta/vulkan-cts-221.cmx
index ba423f5..e778422 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-221.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-221.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-221"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-222.cmx b/fuchsia/split-cts/meta/vulkan-cts-222.cmx
index 804c7d3..3a13fc9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-222.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-222.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-222"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-223.cmx b/fuchsia/split-cts/meta/vulkan-cts-223.cmx
index b47c229..3678fa9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-223.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-223.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-223"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-224.cmx b/fuchsia/split-cts/meta/vulkan-cts-224.cmx
index 74b3369..29ed932 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-224.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-224.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-224"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-225.cmx b/fuchsia/split-cts/meta/vulkan-cts-225.cmx
index 705c82e..6d5538e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-225.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-225.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-225"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-226.cmx b/fuchsia/split-cts/meta/vulkan-cts-226.cmx
index 14dc483..9511608 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-226.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-226.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-226"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-227.cmx b/fuchsia/split-cts/meta/vulkan-cts-227.cmx
index c0e5611..0f2d1ea 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-227.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-227.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-227"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-228.cmx b/fuchsia/split-cts/meta/vulkan-cts-228.cmx
index debed85..d52005b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-228.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-228.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-228"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-229.cmx b/fuchsia/split-cts/meta/vulkan-cts-229.cmx
index 696c348..a4bb163 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-229.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-229.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-229"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-230.cmx b/fuchsia/split-cts/meta/vulkan-cts-230.cmx
index 5f9ce0a..a3e6809 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-230.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-230.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-230"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-231.cmx b/fuchsia/split-cts/meta/vulkan-cts-231.cmx
index c03c013..b249de6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-231.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-231.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-231"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-232.cmx b/fuchsia/split-cts/meta/vulkan-cts-232.cmx
index b4f80c7..fbbb2ac 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-232.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-232.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-232"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-233.cmx b/fuchsia/split-cts/meta/vulkan-cts-233.cmx
index f091db4..189a0e8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-233.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-233.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-233"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-234.cmx b/fuchsia/split-cts/meta/vulkan-cts-234.cmx
index 02ba9f9..437c486 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-234.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-234.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-234"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-235.cmx b/fuchsia/split-cts/meta/vulkan-cts-235.cmx
index 843eadc..ada1ee1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-235.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-235.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-235"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-236.cmx b/fuchsia/split-cts/meta/vulkan-cts-236.cmx
index 877e58d..fc6620a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-236.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-236.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-236"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-237.cmx b/fuchsia/split-cts/meta/vulkan-cts-237.cmx
index 2a259d8..67a3c16 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-237.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-237.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-237"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-238.cmx b/fuchsia/split-cts/meta/vulkan-cts-238.cmx
index 1334d34..ea15a8c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-238.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-238.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-238"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-239.cmx b/fuchsia/split-cts/meta/vulkan-cts-239.cmx
index 9afcd2d..6aa6f80 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-239.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-239.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-239"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-240.cmx b/fuchsia/split-cts/meta/vulkan-cts-240.cmx
index 72b2b3a..7669cb2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-240.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-240.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-240"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-241.cmx b/fuchsia/split-cts/meta/vulkan-cts-241.cmx
index b76b639..64c1d22 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-241.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-241.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-241"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-242.cmx b/fuchsia/split-cts/meta/vulkan-cts-242.cmx
index ce52b2b..3585632 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-242.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-242.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-242"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-243.cmx b/fuchsia/split-cts/meta/vulkan-cts-243.cmx
index 8854c29..457daf0 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-243.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-243.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-243"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-244.cmx b/fuchsia/split-cts/meta/vulkan-cts-244.cmx
index 73338b1..3dd714d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-244.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-244.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-244"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-245.cmx b/fuchsia/split-cts/meta/vulkan-cts-245.cmx
index ae791e5..967114f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-245.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-245.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-245"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-246.cmx b/fuchsia/split-cts/meta/vulkan-cts-246.cmx
index 8c45b6f..e326b2f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-246.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-246.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-246"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-247.cmx b/fuchsia/split-cts/meta/vulkan-cts-247.cmx
index f108a50..7b20a94 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-247.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-247.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-247"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-248.cmx b/fuchsia/split-cts/meta/vulkan-cts-248.cmx
index cd8088c..ef3013d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-248.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-248.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-248"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-249.cmx b/fuchsia/split-cts/meta/vulkan-cts-249.cmx
index 684c22a..a88247f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-249.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-249.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-249"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-250.cmx b/fuchsia/split-cts/meta/vulkan-cts-250.cmx
index f62af66..f037cb1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-250.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-250.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-250"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-251.cmx b/fuchsia/split-cts/meta/vulkan-cts-251.cmx
index 9fa298d..3bc7424 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-251.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-251.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-251"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-252.cmx b/fuchsia/split-cts/meta/vulkan-cts-252.cmx
index a81e932..20ef460 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-252.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-252.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-252"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-253.cmx b/fuchsia/split-cts/meta/vulkan-cts-253.cmx
index 405da98..7379f5a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-253.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-253.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-253"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-254.cmx b/fuchsia/split-cts/meta/vulkan-cts-254.cmx
index a5d2c1a..ac35429 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-254.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-254.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-254"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-255.cmx b/fuchsia/split-cts/meta/vulkan-cts-255.cmx
index b1ec48b..6191b62 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-255.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-255.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-255"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-256.cmx b/fuchsia/split-cts/meta/vulkan-cts-256.cmx
index fe5341c..e7f6f30 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-256.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-256.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-256"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-257.cmx b/fuchsia/split-cts/meta/vulkan-cts-257.cmx
index 438cda9..8895c83 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-257.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-257.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-257"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-258.cmx b/fuchsia/split-cts/meta/vulkan-cts-258.cmx
index 7116b28..644a2fe 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-258.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-258.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-258"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-259.cmx b/fuchsia/split-cts/meta/vulkan-cts-259.cmx
index 911c2e9..4a6f050 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-259.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-259.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-259"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-260.cmx b/fuchsia/split-cts/meta/vulkan-cts-260.cmx
index ec1dc2b..cae598b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-260.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-260.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-260"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-261.cmx b/fuchsia/split-cts/meta/vulkan-cts-261.cmx
index f09756f..47d6ccc 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-261.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-261.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-261"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-262.cmx b/fuchsia/split-cts/meta/vulkan-cts-262.cmx
index 68f2d18..337738b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-262.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-262.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-262"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-263.cmx b/fuchsia/split-cts/meta/vulkan-cts-263.cmx
index c87afc5..8a6e497 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-263.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-263.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-263"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-264.cmx b/fuchsia/split-cts/meta/vulkan-cts-264.cmx
index 3d09123..1214040 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-264.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-264.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-264"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-265.cmx b/fuchsia/split-cts/meta/vulkan-cts-265.cmx
index 9c7e900..9a3955f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-265.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-265.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-265"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-266.cmx b/fuchsia/split-cts/meta/vulkan-cts-266.cmx
index 15cbdcf..c549585 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-266.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-266.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-266"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-267.cmx b/fuchsia/split-cts/meta/vulkan-cts-267.cmx
index ea24e0f..aa5fc2b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-267.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-267.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-267"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-268.cmx b/fuchsia/split-cts/meta/vulkan-cts-268.cmx
index e787d10..4868079 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-268.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-268.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-268"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-269.cmx b/fuchsia/split-cts/meta/vulkan-cts-269.cmx
index 7b31256..70075cd 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-269.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-269.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-269"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-270.cmx b/fuchsia/split-cts/meta/vulkan-cts-270.cmx
index fa9c65d..2e3e4b7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-270.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-270.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-270"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-271.cmx b/fuchsia/split-cts/meta/vulkan-cts-271.cmx
index 29ea578..a8b61f0 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-271.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-271.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-271"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-272.cmx b/fuchsia/split-cts/meta/vulkan-cts-272.cmx
index 4ee7465..d64aae1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-272.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-272.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-272"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-273.cmx b/fuchsia/split-cts/meta/vulkan-cts-273.cmx
index fd7873b..848e4ef 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-273.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-273.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-273"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-274.cmx b/fuchsia/split-cts/meta/vulkan-cts-274.cmx
index edf4c36..7df1abe 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-274.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-274.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-274"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-275.cmx b/fuchsia/split-cts/meta/vulkan-cts-275.cmx
index 33abd80..56e8e40 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-275.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-275.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-275"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-276.cmx b/fuchsia/split-cts/meta/vulkan-cts-276.cmx
index f0fe83f..4b8dd3a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-276.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-276.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-276"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-277.cmx b/fuchsia/split-cts/meta/vulkan-cts-277.cmx
index f0162f2..d58dd65 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-277.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-277.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-277"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-278.cmx b/fuchsia/split-cts/meta/vulkan-cts-278.cmx
index a0fe97e..ef645b1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-278.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-278.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-278"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-279.cmx b/fuchsia/split-cts/meta/vulkan-cts-279.cmx
index babf1a7..bc1dc55 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-279.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-279.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-279"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-280.cmx b/fuchsia/split-cts/meta/vulkan-cts-280.cmx
index 46382d3..4f9cfc3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-280.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-280.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-280"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-281.cmx b/fuchsia/split-cts/meta/vulkan-cts-281.cmx
index e570960..d169880 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-281.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-281.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-281"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-282.cmx b/fuchsia/split-cts/meta/vulkan-cts-282.cmx
index 819ee27..20aa4d6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-282.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-282.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-282"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-283.cmx b/fuchsia/split-cts/meta/vulkan-cts-283.cmx
index dc1f2f3..17bd45e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-283.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-283.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-283"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-284.cmx b/fuchsia/split-cts/meta/vulkan-cts-284.cmx
index d5cbe97..f2beed2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-284.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-284.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-284"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-285.cmx b/fuchsia/split-cts/meta/vulkan-cts-285.cmx
index 30575da..8c17bf0 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-285.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-285.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-285"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-286.cmx b/fuchsia/split-cts/meta/vulkan-cts-286.cmx
index b5cfd95..81c6f72 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-286.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-286.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-286"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-287.cmx b/fuchsia/split-cts/meta/vulkan-cts-287.cmx
index 21f1de3..2c0eafe 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-287.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-287.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-287"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-288.cmx b/fuchsia/split-cts/meta/vulkan-cts-288.cmx
index 12dfc00..9aa8466 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-288.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-288.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-288"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-289.cmx b/fuchsia/split-cts/meta/vulkan-cts-289.cmx
index 3ee2827..17c83f2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-289.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-289.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-289"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-290.cmx b/fuchsia/split-cts/meta/vulkan-cts-290.cmx
index ff95bd1..3acf5d2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-290.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-290.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-290"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-291.cmx b/fuchsia/split-cts/meta/vulkan-cts-291.cmx
index 03c5ccf..6ad0b73 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-291.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-291.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-291"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-292.cmx b/fuchsia/split-cts/meta/vulkan-cts-292.cmx
index 9d7b73d..9708031 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-292.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-292.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-292"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-293.cmx b/fuchsia/split-cts/meta/vulkan-cts-293.cmx
index d550a1e..a8ac85f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-293.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-293.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-293"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-294.cmx b/fuchsia/split-cts/meta/vulkan-cts-294.cmx
index b64a34f..452ad12 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-294.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-294.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-294"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-295.cmx b/fuchsia/split-cts/meta/vulkan-cts-295.cmx
index f9d1e51..1601f5f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-295.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-295.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-295"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-296.cmx b/fuchsia/split-cts/meta/vulkan-cts-296.cmx
index 515ae8f..622dcfb 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-296.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-296.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-296"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-297.cmx b/fuchsia/split-cts/meta/vulkan-cts-297.cmx
index ac2a4a5..2526147 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-297.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-297.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-297"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-298.cmx b/fuchsia/split-cts/meta/vulkan-cts-298.cmx
index 19d8dbe..96d34eb 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-298.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-298.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-298"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-299.cmx b/fuchsia/split-cts/meta/vulkan-cts-299.cmx
index ec200c9..abf28c6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-299.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-299.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-299"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-300.cmx b/fuchsia/split-cts/meta/vulkan-cts-300.cmx
index 23744b5..18bc836 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-300.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-300.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-300"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-301.cmx b/fuchsia/split-cts/meta/vulkan-cts-301.cmx
index 1fcebc4..d570487 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-301.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-301.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-301"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-302.cmx b/fuchsia/split-cts/meta/vulkan-cts-302.cmx
index d381b85..0dbd504 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-302.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-302.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-302"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-303.cmx b/fuchsia/split-cts/meta/vulkan-cts-303.cmx
index b2f60ab..a5c0311 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-303.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-303.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-303"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-304.cmx b/fuchsia/split-cts/meta/vulkan-cts-304.cmx
index 5b7496d..e8236d9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-304.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-304.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-304"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-305.cmx b/fuchsia/split-cts/meta/vulkan-cts-305.cmx
index b8bd141..cfc75c9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-305.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-305.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-305"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-306.cmx b/fuchsia/split-cts/meta/vulkan-cts-306.cmx
index c8f0fd3..006e5e4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-306.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-306.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-306"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-307.cmx b/fuchsia/split-cts/meta/vulkan-cts-307.cmx
index aab2618..8608cb2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-307.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-307.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-307"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-308.cmx b/fuchsia/split-cts/meta/vulkan-cts-308.cmx
index 2196984..2c18301 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-308.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-308.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-308"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-309.cmx b/fuchsia/split-cts/meta/vulkan-cts-309.cmx
index 06ad61b..6406f4f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-309.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-309.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-309"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-310.cmx b/fuchsia/split-cts/meta/vulkan-cts-310.cmx
index 079bf15..208f3ed 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-310.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-310.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-310"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-311.cmx b/fuchsia/split-cts/meta/vulkan-cts-311.cmx
index 58d1cfb..3514c7c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-311.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-311.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-311"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-312.cmx b/fuchsia/split-cts/meta/vulkan-cts-312.cmx
index 73c4084..7e5cb21 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-312.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-312.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-312"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-313.cmx b/fuchsia/split-cts/meta/vulkan-cts-313.cmx
index 75f9f5c..1ef63a9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-313.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-313.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-313"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-314.cmx b/fuchsia/split-cts/meta/vulkan-cts-314.cmx
index fd025d5..b39afc9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-314.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-314.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-314"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-315.cmx b/fuchsia/split-cts/meta/vulkan-cts-315.cmx
index 6011073..6f9b9e8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-315.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-315.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-315"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-316.cmx b/fuchsia/split-cts/meta/vulkan-cts-316.cmx
index b4a8608..172cfa0 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-316.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-316.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-316"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-317.cmx b/fuchsia/split-cts/meta/vulkan-cts-317.cmx
index 3713d75..031d2c0 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-317.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-317.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-317"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-318.cmx b/fuchsia/split-cts/meta/vulkan-cts-318.cmx
index deb78f4..8be9e03 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-318.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-318.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-318"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-319.cmx b/fuchsia/split-cts/meta/vulkan-cts-319.cmx
index 5831b21..474e123 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-319.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-319.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-319"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-320.cmx b/fuchsia/split-cts/meta/vulkan-cts-320.cmx
index 20d9631..3dba617 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-320.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-320.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-320"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-321.cmx b/fuchsia/split-cts/meta/vulkan-cts-321.cmx
index 8d8b4f6..bd256bb 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-321.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-321.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-321"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-322.cmx b/fuchsia/split-cts/meta/vulkan-cts-322.cmx
index 80ff9e6..966e996 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-322.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-322.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-322"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-323.cmx b/fuchsia/split-cts/meta/vulkan-cts-323.cmx
index 0dcfaae..4f9095f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-323.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-323.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-323"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-324.cmx b/fuchsia/split-cts/meta/vulkan-cts-324.cmx
index dabe182..726b253 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-324.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-324.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-324"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-325.cmx b/fuchsia/split-cts/meta/vulkan-cts-325.cmx
index f67ef6a..7eb1192 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-325.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-325.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-325"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-326.cmx b/fuchsia/split-cts/meta/vulkan-cts-326.cmx
index b09e433..f83a024 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-326.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-326.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-326"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-327.cmx b/fuchsia/split-cts/meta/vulkan-cts-327.cmx
index 04ad267..fdbb461 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-327.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-327.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-327"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-328.cmx b/fuchsia/split-cts/meta/vulkan-cts-328.cmx
index 3a0f356..5fd508b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-328.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-328.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-328"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-329.cmx b/fuchsia/split-cts/meta/vulkan-cts-329.cmx
index ff09c37..dac38a5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-329.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-329.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-329"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-330.cmx b/fuchsia/split-cts/meta/vulkan-cts-330.cmx
index 217b327..f365692 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-330.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-330.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-330"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-331.cmx b/fuchsia/split-cts/meta/vulkan-cts-331.cmx
index 03c1535..9930dc5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-331.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-331.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-331"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-332.cmx b/fuchsia/split-cts/meta/vulkan-cts-332.cmx
index 6d5a976..e546774 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-332.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-332.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-332"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-333.cmx b/fuchsia/split-cts/meta/vulkan-cts-333.cmx
index a493099..dcd01ef 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-333.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-333.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-333"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-334.cmx b/fuchsia/split-cts/meta/vulkan-cts-334.cmx
index 5c21dec..0b00f79 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-334.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-334.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-334"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-335.cmx b/fuchsia/split-cts/meta/vulkan-cts-335.cmx
index 7d30cab..5c256ca 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-335.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-335.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-335"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-336.cmx b/fuchsia/split-cts/meta/vulkan-cts-336.cmx
index bf09239..191d97c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-336.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-336.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-336"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-337.cmx b/fuchsia/split-cts/meta/vulkan-cts-337.cmx
index 3a95378..741676c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-337.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-337.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-337"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-338.cmx b/fuchsia/split-cts/meta/vulkan-cts-338.cmx
index 2ebff3e..f1a3110 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-338.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-338.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-338"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-339.cmx b/fuchsia/split-cts/meta/vulkan-cts-339.cmx
index 77c88fc..c0e82ce 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-339.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-339.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-339"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-340.cmx b/fuchsia/split-cts/meta/vulkan-cts-340.cmx
index 9017b01..982d0d1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-340.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-340.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-340"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-341.cmx b/fuchsia/split-cts/meta/vulkan-cts-341.cmx
index 65cd29f..b3d5019 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-341.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-341.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-341"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-342.cmx b/fuchsia/split-cts/meta/vulkan-cts-342.cmx
index 98d241b..0e571bd 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-342.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-342.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-342"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-343.cmx b/fuchsia/split-cts/meta/vulkan-cts-343.cmx
index ace5754..493e9a5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-343.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-343.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-343"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-344.cmx b/fuchsia/split-cts/meta/vulkan-cts-344.cmx
index d059087..38d52d7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-344.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-344.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-344"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-345.cmx b/fuchsia/split-cts/meta/vulkan-cts-345.cmx
index ddded37..471cd5b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-345.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-345.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-345"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-346.cmx b/fuchsia/split-cts/meta/vulkan-cts-346.cmx
index 8bf1876..f5e4093 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-346.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-346.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-346"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-347.cmx b/fuchsia/split-cts/meta/vulkan-cts-347.cmx
index 85bdb2b..87ab61e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-347.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-347.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-347"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-348.cmx b/fuchsia/split-cts/meta/vulkan-cts-348.cmx
index 27ea254..7c1538c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-348.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-348.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-348"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-349.cmx b/fuchsia/split-cts/meta/vulkan-cts-349.cmx
index 2dd2afd..3c878be 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-349.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-349.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-349"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-350.cmx b/fuchsia/split-cts/meta/vulkan-cts-350.cmx
index bab5937..2bffaea 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-350.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-350.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-350"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-351.cmx b/fuchsia/split-cts/meta/vulkan-cts-351.cmx
index 36d1321..23dde8c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-351.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-351.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-351"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-352.cmx b/fuchsia/split-cts/meta/vulkan-cts-352.cmx
index ef3584c..7a70001 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-352.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-352.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-352"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-353.cmx b/fuchsia/split-cts/meta/vulkan-cts-353.cmx
index 607205b..43f0dff 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-353.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-353.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-353"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-354.cmx b/fuchsia/split-cts/meta/vulkan-cts-354.cmx
index 2f3c4dd..e00ea71 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-354.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-354.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-354"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-355.cmx b/fuchsia/split-cts/meta/vulkan-cts-355.cmx
index 4c2f927..88fe8ec 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-355.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-355.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-355"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-356.cmx b/fuchsia/split-cts/meta/vulkan-cts-356.cmx
index 96c19ac..d55fd5f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-356.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-356.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-356"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-357.cmx b/fuchsia/split-cts/meta/vulkan-cts-357.cmx
index 99d285a..be3bb05 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-357.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-357.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-357"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-358.cmx b/fuchsia/split-cts/meta/vulkan-cts-358.cmx
index ea6f86e..9e556d5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-358.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-358.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-358"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-359.cmx b/fuchsia/split-cts/meta/vulkan-cts-359.cmx
index a959770..9a1c591 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-359.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-359.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-359"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-360.cmx b/fuchsia/split-cts/meta/vulkan-cts-360.cmx
index 4b5eb8d..ac988af 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-360.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-360.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-360"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-361.cmx b/fuchsia/split-cts/meta/vulkan-cts-361.cmx
index e659281..9093fc3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-361.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-361.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-361"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-362.cmx b/fuchsia/split-cts/meta/vulkan-cts-362.cmx
index 2f36dfd..b157e56 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-362.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-362.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-362"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-363.cmx b/fuchsia/split-cts/meta/vulkan-cts-363.cmx
index f367b90..49fce73 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-363.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-363.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-363"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-364.cmx b/fuchsia/split-cts/meta/vulkan-cts-364.cmx
index f0d9d37..f831ac2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-364.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-364.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-364"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-365.cmx b/fuchsia/split-cts/meta/vulkan-cts-365.cmx
index 957e829..826d86b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-365.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-365.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-365"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-366.cmx b/fuchsia/split-cts/meta/vulkan-cts-366.cmx
index f0102b3..3c144cb 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-366.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-366.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-366"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-367.cmx b/fuchsia/split-cts/meta/vulkan-cts-367.cmx
index 8360074..35d7e26 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-367.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-367.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-367"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-368.cmx b/fuchsia/split-cts/meta/vulkan-cts-368.cmx
index 73da87f..d3aa7d4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-368.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-368.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-368"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-369.cmx b/fuchsia/split-cts/meta/vulkan-cts-369.cmx
index aa53037..be4d743 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-369.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-369.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-369"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-370.cmx b/fuchsia/split-cts/meta/vulkan-cts-370.cmx
index 078e601..fe1a2ea 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-370.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-370.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-370"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-371.cmx b/fuchsia/split-cts/meta/vulkan-cts-371.cmx
index 9b1cd9b..0726c13 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-371.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-371.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-371"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-372.cmx b/fuchsia/split-cts/meta/vulkan-cts-372.cmx
index bab9270..00a23c0 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-372.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-372.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-372"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-373.cmx b/fuchsia/split-cts/meta/vulkan-cts-373.cmx
index 68e3dc4..edf61ba 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-373.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-373.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-373"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-374.cmx b/fuchsia/split-cts/meta/vulkan-cts-374.cmx
index 9e00f5b..d3bfd7b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-374.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-374.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-374"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-375.cmx b/fuchsia/split-cts/meta/vulkan-cts-375.cmx
index ec90545..aeb733f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-375.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-375.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-375"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-376.cmx b/fuchsia/split-cts/meta/vulkan-cts-376.cmx
index 6048664..3ec3f4e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-376.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-376.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-376"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-377.cmx b/fuchsia/split-cts/meta/vulkan-cts-377.cmx
index d56acde..c4369b0 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-377.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-377.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-377"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-378.cmx b/fuchsia/split-cts/meta/vulkan-cts-378.cmx
index c4e28d4..175f243 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-378.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-378.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-378"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-379.cmx b/fuchsia/split-cts/meta/vulkan-cts-379.cmx
index a698958..0b7dd8d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-379.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-379.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-379"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-380.cmx b/fuchsia/split-cts/meta/vulkan-cts-380.cmx
index d6d4006..c861008 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-380.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-380.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-380"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-381.cmx b/fuchsia/split-cts/meta/vulkan-cts-381.cmx
index fe054d9..038f7c3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-381.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-381.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-381"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-382.cmx b/fuchsia/split-cts/meta/vulkan-cts-382.cmx
index 9826b20..55f38a7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-382.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-382.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-382"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-383.cmx b/fuchsia/split-cts/meta/vulkan-cts-383.cmx
index c021c3a..583c239 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-383.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-383.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-383"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-384.cmx b/fuchsia/split-cts/meta/vulkan-cts-384.cmx
index df056bd..74541a5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-384.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-384.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-384"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-385.cmx b/fuchsia/split-cts/meta/vulkan-cts-385.cmx
index 99e08e7..30dd221 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-385.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-385.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-385"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-386.cmx b/fuchsia/split-cts/meta/vulkan-cts-386.cmx
index bec2e7c..024c0ad 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-386.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-386.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-386"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-387.cmx b/fuchsia/split-cts/meta/vulkan-cts-387.cmx
index b5bf00b..0115d90 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-387.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-387.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-387"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-388.cmx b/fuchsia/split-cts/meta/vulkan-cts-388.cmx
index e203b8b..22ab08b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-388.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-388.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-388"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-389.cmx b/fuchsia/split-cts/meta/vulkan-cts-389.cmx
index 42a4589..6959bea 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-389.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-389.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-389"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-390.cmx b/fuchsia/split-cts/meta/vulkan-cts-390.cmx
index 729b821..04a98b1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-390.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-390.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-390"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-391.cmx b/fuchsia/split-cts/meta/vulkan-cts-391.cmx
index 3328afe..3c16218 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-391.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-391.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-391"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-392.cmx b/fuchsia/split-cts/meta/vulkan-cts-392.cmx
index 8965b75..e0833c7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-392.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-392.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-392"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-393.cmx b/fuchsia/split-cts/meta/vulkan-cts-393.cmx
index baa6e76..765613c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-393.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-393.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-393"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-394.cmx b/fuchsia/split-cts/meta/vulkan-cts-394.cmx
index 3428b48..a2c7f3d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-394.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-394.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-394"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-395.cmx b/fuchsia/split-cts/meta/vulkan-cts-395.cmx
index 6453b2c..806050d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-395.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-395.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-395"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-396.cmx b/fuchsia/split-cts/meta/vulkan-cts-396.cmx
index 1c0812c..c51656e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-396.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-396.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-396"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-397.cmx b/fuchsia/split-cts/meta/vulkan-cts-397.cmx
index 968522e..983ef50 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-397.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-397.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-397"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-398.cmx b/fuchsia/split-cts/meta/vulkan-cts-398.cmx
index 64a90d6..41ea508 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-398.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-398.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-398"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-399.cmx b/fuchsia/split-cts/meta/vulkan-cts-399.cmx
index 4fc3383..b7dc26c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-399.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-399.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-399"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-400.cmx b/fuchsia/split-cts/meta/vulkan-cts-400.cmx
index ed839f7..d63ef87 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-400.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-400.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-400"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-401.cmx b/fuchsia/split-cts/meta/vulkan-cts-401.cmx
index 33558c6..b85ef7f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-401.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-401.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-401"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-402.cmx b/fuchsia/split-cts/meta/vulkan-cts-402.cmx
index a37c733..0a17a1f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-402.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-402.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-402"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-403.cmx b/fuchsia/split-cts/meta/vulkan-cts-403.cmx
index 86edff6..7bf8017 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-403.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-403.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-403"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-404.cmx b/fuchsia/split-cts/meta/vulkan-cts-404.cmx
index 9c432ff..84c0d7f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-404.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-404.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-404"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-405.cmx b/fuchsia/split-cts/meta/vulkan-cts-405.cmx
index 22754f3..d726dad 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-405.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-405.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-405"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-406.cmx b/fuchsia/split-cts/meta/vulkan-cts-406.cmx
index 192ae80..f4135a0 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-406.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-406.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-406"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-407.cmx b/fuchsia/split-cts/meta/vulkan-cts-407.cmx
index 78cd831..469415d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-407.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-407.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-407"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-408.cmx b/fuchsia/split-cts/meta/vulkan-cts-408.cmx
index 46b47d1..61d1ee6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-408.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-408.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-408"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-409.cmx b/fuchsia/split-cts/meta/vulkan-cts-409.cmx
index 53a48d9..2c94ade 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-409.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-409.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-409"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-410.cmx b/fuchsia/split-cts/meta/vulkan-cts-410.cmx
index 93cc11c..482f855 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-410.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-410.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-410"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-411.cmx b/fuchsia/split-cts/meta/vulkan-cts-411.cmx
index ed37abd..58e3df5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-411.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-411.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-411"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-412.cmx b/fuchsia/split-cts/meta/vulkan-cts-412.cmx
index 8c5931a..815c7da 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-412.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-412.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-412"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-413.cmx b/fuchsia/split-cts/meta/vulkan-cts-413.cmx
index 4486c81..eb57b0a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-413.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-413.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-413"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-414.cmx b/fuchsia/split-cts/meta/vulkan-cts-414.cmx
index 0d168ac..ee69cb7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-414.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-414.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-414"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-415.cmx b/fuchsia/split-cts/meta/vulkan-cts-415.cmx
index 8e2cb85..7d925f8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-415.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-415.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-415"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-416.cmx b/fuchsia/split-cts/meta/vulkan-cts-416.cmx
index 9efb3ce..d1882a6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-416.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-416.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-416"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-417.cmx b/fuchsia/split-cts/meta/vulkan-cts-417.cmx
index 4c0c0cc..186a51f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-417.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-417.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-417"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-418.cmx b/fuchsia/split-cts/meta/vulkan-cts-418.cmx
index ea427a0..1b709af 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-418.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-418.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-418"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-419.cmx b/fuchsia/split-cts/meta/vulkan-cts-419.cmx
index baec516..7fbbf20 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-419.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-419.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-419"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-420.cmx b/fuchsia/split-cts/meta/vulkan-cts-420.cmx
index a8ea7b4..8c4b89f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-420.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-420.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-420"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-421.cmx b/fuchsia/split-cts/meta/vulkan-cts-421.cmx
index 37f697a..0eb6c0e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-421.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-421.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-421"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-422.cmx b/fuchsia/split-cts/meta/vulkan-cts-422.cmx
index 20a8904..ce4d404 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-422.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-422.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-422"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-423.cmx b/fuchsia/split-cts/meta/vulkan-cts-423.cmx
index cab84d0..2b6abef 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-423.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-423.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-423"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-424.cmx b/fuchsia/split-cts/meta/vulkan-cts-424.cmx
index c8b53c0..673f83e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-424.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-424.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-424"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-425.cmx b/fuchsia/split-cts/meta/vulkan-cts-425.cmx
index 99cb7b5..c8af80c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-425.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-425.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-425"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-426.cmx b/fuchsia/split-cts/meta/vulkan-cts-426.cmx
index 417ea9d..154972c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-426.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-426.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-426"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-427.cmx b/fuchsia/split-cts/meta/vulkan-cts-427.cmx
index 4393335..c211564 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-427.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-427.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-427"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-428.cmx b/fuchsia/split-cts/meta/vulkan-cts-428.cmx
index 0080f3b..7fb6f32 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-428.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-428.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-428"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-429.cmx b/fuchsia/split-cts/meta/vulkan-cts-429.cmx
index 047f25d..0bc8ed4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-429.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-429.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-429"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-430.cmx b/fuchsia/split-cts/meta/vulkan-cts-430.cmx
index fdc61b7..387e851 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-430.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-430.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-430"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-431.cmx b/fuchsia/split-cts/meta/vulkan-cts-431.cmx
index 087a22c..d018ddc 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-431.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-431.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-431"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-432.cmx b/fuchsia/split-cts/meta/vulkan-cts-432.cmx
index de1880c..d95af0a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-432.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-432.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-432"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-433.cmx b/fuchsia/split-cts/meta/vulkan-cts-433.cmx
index 0670890..5e69fc4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-433.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-433.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-433"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-434.cmx b/fuchsia/split-cts/meta/vulkan-cts-434.cmx
index 37649ba..3355bca 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-434.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-434.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-434"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-435.cmx b/fuchsia/split-cts/meta/vulkan-cts-435.cmx
index 14335e1..859215a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-435.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-435.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-435"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-436.cmx b/fuchsia/split-cts/meta/vulkan-cts-436.cmx
index 29d34a7..c846701 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-436.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-436.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-436"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-437.cmx b/fuchsia/split-cts/meta/vulkan-cts-437.cmx
index 69c90f7..43c5572 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-437.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-437.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-437"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-438.cmx b/fuchsia/split-cts/meta/vulkan-cts-438.cmx
index 3438a2d..deb8884 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-438.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-438.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-438"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-439.cmx b/fuchsia/split-cts/meta/vulkan-cts-439.cmx
index 7b52beb..b8a1a18 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-439.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-439.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-439"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-440.cmx b/fuchsia/split-cts/meta/vulkan-cts-440.cmx
index e927e6d..bd9113d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-440.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-440.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-440"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-441.cmx b/fuchsia/split-cts/meta/vulkan-cts-441.cmx
index 4f30433..81e88bb 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-441.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-441.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-441"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-442.cmx b/fuchsia/split-cts/meta/vulkan-cts-442.cmx
index 358d36e..17684e5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-442.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-442.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-442"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-443.cmx b/fuchsia/split-cts/meta/vulkan-cts-443.cmx
index 3ca0d73..1c58143 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-443.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-443.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-443"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-444.cmx b/fuchsia/split-cts/meta/vulkan-cts-444.cmx
index d4f8ac3..ca24d80 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-444.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-444.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-444"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-445.cmx b/fuchsia/split-cts/meta/vulkan-cts-445.cmx
index 654bab2..e3bedf2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-445.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-445.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-445"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-446.cmx b/fuchsia/split-cts/meta/vulkan-cts-446.cmx
index 23d1843..7d68428 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-446.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-446.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-446"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-447.cmx b/fuchsia/split-cts/meta/vulkan-cts-447.cmx
index 063d0d6..6c22b80 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-447.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-447.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-447"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-448.cmx b/fuchsia/split-cts/meta/vulkan-cts-448.cmx
index 1b08696..f8b9bb9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-448.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-448.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-448"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-449.cmx b/fuchsia/split-cts/meta/vulkan-cts-449.cmx
index 31cab64..b6ee117 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-449.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-449.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-449"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-450.cmx b/fuchsia/split-cts/meta/vulkan-cts-450.cmx
index 8db3eb4..b2ba546 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-450.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-450.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-450"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-451.cmx b/fuchsia/split-cts/meta/vulkan-cts-451.cmx
index 845a289..19cd7fa 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-451.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-451.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-451"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-452.cmx b/fuchsia/split-cts/meta/vulkan-cts-452.cmx
index fa6855a..fba9207 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-452.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-452.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-452"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-453.cmx b/fuchsia/split-cts/meta/vulkan-cts-453.cmx
index 673a498..4bbcbd8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-453.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-453.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-453"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-454.cmx b/fuchsia/split-cts/meta/vulkan-cts-454.cmx
index fad12ad..3eb700b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-454.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-454.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-454"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-455.cmx b/fuchsia/split-cts/meta/vulkan-cts-455.cmx
index a9385b7..c40fd4a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-455.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-455.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-455"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-456.cmx b/fuchsia/split-cts/meta/vulkan-cts-456.cmx
index 89b3b78..0de96ca 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-456.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-456.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-456"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-457.cmx b/fuchsia/split-cts/meta/vulkan-cts-457.cmx
index 126a83f..a105c99 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-457.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-457.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-457"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-458.cmx b/fuchsia/split-cts/meta/vulkan-cts-458.cmx
index 457032c..abb685a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-458.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-458.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-458"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-459.cmx b/fuchsia/split-cts/meta/vulkan-cts-459.cmx
index 0fce36a..fc7045d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-459.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-459.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-459"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-460.cmx b/fuchsia/split-cts/meta/vulkan-cts-460.cmx
index bf7ef97..c11f54c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-460.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-460.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-460"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-461.cmx b/fuchsia/split-cts/meta/vulkan-cts-461.cmx
index 6471ed2..842cdd3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-461.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-461.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-461"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-462.cmx b/fuchsia/split-cts/meta/vulkan-cts-462.cmx
index 5e769f4..a3f6a47 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-462.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-462.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-462"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-463.cmx b/fuchsia/split-cts/meta/vulkan-cts-463.cmx
index 2d53e8e..15638c4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-463.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-463.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-463"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-464.cmx b/fuchsia/split-cts/meta/vulkan-cts-464.cmx
index 2ec2391..cafee67 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-464.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-464.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-464"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-465.cmx b/fuchsia/split-cts/meta/vulkan-cts-465.cmx
index 20a1750..4e4380a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-465.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-465.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-465"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-466.cmx b/fuchsia/split-cts/meta/vulkan-cts-466.cmx
index edeef16..19df496 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-466.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-466.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-466"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-467.cmx b/fuchsia/split-cts/meta/vulkan-cts-467.cmx
index 1557eb6..3e90770 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-467.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-467.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-467"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-468.cmx b/fuchsia/split-cts/meta/vulkan-cts-468.cmx
index b50f459..09392a6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-468.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-468.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-468"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-469.cmx b/fuchsia/split-cts/meta/vulkan-cts-469.cmx
index faad6f3..4c324a9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-469.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-469.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-469"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-470.cmx b/fuchsia/split-cts/meta/vulkan-cts-470.cmx
index 6fa8e17..50c739f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-470.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-470.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-470"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-471.cmx b/fuchsia/split-cts/meta/vulkan-cts-471.cmx
index 6f10b87..988d6c2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-471.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-471.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-471"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-472.cmx b/fuchsia/split-cts/meta/vulkan-cts-472.cmx
index 325a42f..7771ac9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-472.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-472.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-472"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-473.cmx b/fuchsia/split-cts/meta/vulkan-cts-473.cmx
index a9a9816..67c763f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-473.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-473.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-473"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-474.cmx b/fuchsia/split-cts/meta/vulkan-cts-474.cmx
index 483c0b6..554f399 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-474.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-474.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-474"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-475.cmx b/fuchsia/split-cts/meta/vulkan-cts-475.cmx
index 317598f..30a388b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-475.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-475.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-475"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-476.cmx b/fuchsia/split-cts/meta/vulkan-cts-476.cmx
index 1dba9c5..46068a7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-476.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-476.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-476"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-477.cmx b/fuchsia/split-cts/meta/vulkan-cts-477.cmx
index 61f4528..6904eec 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-477.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-477.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-477"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-478.cmx b/fuchsia/split-cts/meta/vulkan-cts-478.cmx
index a17085c..3bb40c7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-478.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-478.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-478"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-479.cmx b/fuchsia/split-cts/meta/vulkan-cts-479.cmx
index 0f973cb..e6c98d4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-479.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-479.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-479"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-480.cmx b/fuchsia/split-cts/meta/vulkan-cts-480.cmx
index 559c0fc..3525fab 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-480.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-480.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-480"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-481.cmx b/fuchsia/split-cts/meta/vulkan-cts-481.cmx
index 12c678d..353736d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-481.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-481.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-481"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-482.cmx b/fuchsia/split-cts/meta/vulkan-cts-482.cmx
index ea5406d..e269c53 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-482.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-482.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-482"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-483.cmx b/fuchsia/split-cts/meta/vulkan-cts-483.cmx
index 65d5392..947220d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-483.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-483.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-483"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-484.cmx b/fuchsia/split-cts/meta/vulkan-cts-484.cmx
index 2c15103..687f32c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-484.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-484.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-484"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-485.cmx b/fuchsia/split-cts/meta/vulkan-cts-485.cmx
index a4422f7..1d15c9d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-485.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-485.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-485"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-486.cmx b/fuchsia/split-cts/meta/vulkan-cts-486.cmx
index 12840c6..050fa93 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-486.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-486.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-486"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-487.cmx b/fuchsia/split-cts/meta/vulkan-cts-487.cmx
index 611c169..257aeef 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-487.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-487.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-487"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-488.cmx b/fuchsia/split-cts/meta/vulkan-cts-488.cmx
index 6e3fbac..257521d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-488.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-488.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-488"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-489.cmx b/fuchsia/split-cts/meta/vulkan-cts-489.cmx
index aea5d55..c08d63c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-489.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-489.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-489"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-490.cmx b/fuchsia/split-cts/meta/vulkan-cts-490.cmx
index b9dff33..6eb2b68 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-490.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-490.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-490"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-491.cmx b/fuchsia/split-cts/meta/vulkan-cts-491.cmx
index d589e29..e1159fb 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-491.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-491.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-491"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-492.cmx b/fuchsia/split-cts/meta/vulkan-cts-492.cmx
index ef6e8c2..c26573d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-492.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-492.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-492"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-493.cmx b/fuchsia/split-cts/meta/vulkan-cts-493.cmx
index b557643..d373709 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-493.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-493.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-493"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-494.cmx b/fuchsia/split-cts/meta/vulkan-cts-494.cmx
index e40f143..b43990f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-494.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-494.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-494"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-495.cmx b/fuchsia/split-cts/meta/vulkan-cts-495.cmx
index bbf6af5..70b9364 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-495.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-495.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-495"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-496.cmx b/fuchsia/split-cts/meta/vulkan-cts-496.cmx
index b5a629a..428e0e3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-496.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-496.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-496"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-497.cmx b/fuchsia/split-cts/meta/vulkan-cts-497.cmx
index 29507e9..57643dd 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-497.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-497.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-497"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-498.cmx b/fuchsia/split-cts/meta/vulkan-cts-498.cmx
index 09a634f..06e65b3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-498.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-498.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-498"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-499.cmx b/fuchsia/split-cts/meta/vulkan-cts-499.cmx
index 03d6059..1b2de29 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-499.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-499.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-499"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-500.cmx b/fuchsia/split-cts/meta/vulkan-cts-500.cmx
index 9fab036..f2be4d5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-500.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-500.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-500"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-501.cmx b/fuchsia/split-cts/meta/vulkan-cts-501.cmx
index 8eaf99d..62baed4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-501.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-501.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-501"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-502.cmx b/fuchsia/split-cts/meta/vulkan-cts-502.cmx
index 6d9eac1..d645277 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-502.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-502.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-502"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-503.cmx b/fuchsia/split-cts/meta/vulkan-cts-503.cmx
index dfa1aa2..11891ca 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-503.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-503.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-503"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-504.cmx b/fuchsia/split-cts/meta/vulkan-cts-504.cmx
index b0b8921..d1a756d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-504.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-504.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-504"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-505.cmx b/fuchsia/split-cts/meta/vulkan-cts-505.cmx
index 1bf6b92..cc050b6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-505.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-505.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-505"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-506.cmx b/fuchsia/split-cts/meta/vulkan-cts-506.cmx
index ca93b1e..ebf9f11 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-506.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-506.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-506"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-507.cmx b/fuchsia/split-cts/meta/vulkan-cts-507.cmx
index 341f934..e7e1d2b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-507.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-507.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-507"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-508.cmx b/fuchsia/split-cts/meta/vulkan-cts-508.cmx
index 5173b8c..535fbec 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-508.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-508.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-508"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-509.cmx b/fuchsia/split-cts/meta/vulkan-cts-509.cmx
index 536ed59..1dbcbf7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-509.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-509.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-509"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-510.cmx b/fuchsia/split-cts/meta/vulkan-cts-510.cmx
index 500de38..ac35826 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-510.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-510.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-510"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-511.cmx b/fuchsia/split-cts/meta/vulkan-cts-511.cmx
index ab06711..76532a3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-511.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-511.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-511"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-512.cmx b/fuchsia/split-cts/meta/vulkan-cts-512.cmx
index 4f17911..ed16d09 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-512.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-512.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-512"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-513.cmx b/fuchsia/split-cts/meta/vulkan-cts-513.cmx
index 9ee9035..43a28ea 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-513.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-513.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-513"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-514.cmx b/fuchsia/split-cts/meta/vulkan-cts-514.cmx
index 6fd42f8..d3dfa27 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-514.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-514.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-514"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-515.cmx b/fuchsia/split-cts/meta/vulkan-cts-515.cmx
index fea1edd..0469202 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-515.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-515.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-515"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-516.cmx b/fuchsia/split-cts/meta/vulkan-cts-516.cmx
index ae70589..10aaf83 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-516.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-516.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-516"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-517.cmx b/fuchsia/split-cts/meta/vulkan-cts-517.cmx
index cf7c9e2..e9b9bdc 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-517.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-517.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-517"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-518.cmx b/fuchsia/split-cts/meta/vulkan-cts-518.cmx
index e080d32..6598bc6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-518.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-518.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-518"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-519.cmx b/fuchsia/split-cts/meta/vulkan-cts-519.cmx
index fe4ab2a..6d19879 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-519.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-519.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-519"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-520.cmx b/fuchsia/split-cts/meta/vulkan-cts-520.cmx
index 4b043a6..7a69fcb 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-520.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-520.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-520"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-521.cmx b/fuchsia/split-cts/meta/vulkan-cts-521.cmx
index bb76f7e..69fe15b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-521.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-521.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-521"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-522.cmx b/fuchsia/split-cts/meta/vulkan-cts-522.cmx
index 4042a15..176dba1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-522.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-522.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-522"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-523.cmx b/fuchsia/split-cts/meta/vulkan-cts-523.cmx
index 26d13ef..b18a15d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-523.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-523.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-523"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-524.cmx b/fuchsia/split-cts/meta/vulkan-cts-524.cmx
index 3ba4558..36211b3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-524.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-524.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-524"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-525.cmx b/fuchsia/split-cts/meta/vulkan-cts-525.cmx
index b127753..1827de9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-525.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-525.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-525"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-526.cmx b/fuchsia/split-cts/meta/vulkan-cts-526.cmx
index c9bb1e2..92f7cfa 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-526.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-526.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-526"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-527.cmx b/fuchsia/split-cts/meta/vulkan-cts-527.cmx
index 0681264..7bd5bc9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-527.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-527.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-527"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-528.cmx b/fuchsia/split-cts/meta/vulkan-cts-528.cmx
index ec429cb..da376fe 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-528.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-528.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-528"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-529.cmx b/fuchsia/split-cts/meta/vulkan-cts-529.cmx
index e27bebe..5663e2e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-529.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-529.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-529"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-530.cmx b/fuchsia/split-cts/meta/vulkan-cts-530.cmx
index 28c41ab..49b7e74 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-530.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-530.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-530"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-531.cmx b/fuchsia/split-cts/meta/vulkan-cts-531.cmx
index ef5775e..77f2a59 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-531.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-531.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-531"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-532.cmx b/fuchsia/split-cts/meta/vulkan-cts-532.cmx
index 980005a..67b21df 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-532.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-532.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-532"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-533.cmx b/fuchsia/split-cts/meta/vulkan-cts-533.cmx
index 045c798..393b999 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-533.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-533.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-533"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-534.cmx b/fuchsia/split-cts/meta/vulkan-cts-534.cmx
index 79de9eb..1d8c5b6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-534.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-534.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-534"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-535.cmx b/fuchsia/split-cts/meta/vulkan-cts-535.cmx
index ad11a69..992d49f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-535.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-535.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-535"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-536.cmx b/fuchsia/split-cts/meta/vulkan-cts-536.cmx
index 642abcc..408a737 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-536.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-536.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-536"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-537.cmx b/fuchsia/split-cts/meta/vulkan-cts-537.cmx
index d8d9902..9ed7193 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-537.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-537.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-537"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-538.cmx b/fuchsia/split-cts/meta/vulkan-cts-538.cmx
index f0d6c50..4801063 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-538.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-538.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-538"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-539.cmx b/fuchsia/split-cts/meta/vulkan-cts-539.cmx
index 67e9941..2301e33 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-539.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-539.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-539"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-540.cmx b/fuchsia/split-cts/meta/vulkan-cts-540.cmx
index c34f240..2b6c8d9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-540.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-540.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-540"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-541.cmx b/fuchsia/split-cts/meta/vulkan-cts-541.cmx
index b9ca471..5200a32 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-541.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-541.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-541"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-542.cmx b/fuchsia/split-cts/meta/vulkan-cts-542.cmx
index 262b119..92e1fac 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-542.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-542.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-542"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-543.cmx b/fuchsia/split-cts/meta/vulkan-cts-543.cmx
index 72445de..ba116c4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-543.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-543.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-543"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-544.cmx b/fuchsia/split-cts/meta/vulkan-cts-544.cmx
index 2b257fb..efebe37 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-544.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-544.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-544"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-545.cmx b/fuchsia/split-cts/meta/vulkan-cts-545.cmx
index a0e12b7..b4a38ad 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-545.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-545.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-545"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-546.cmx b/fuchsia/split-cts/meta/vulkan-cts-546.cmx
index 3e833c5..def743c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-546.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-546.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-546"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-547.cmx b/fuchsia/split-cts/meta/vulkan-cts-547.cmx
index 73a91ad..f69838f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-547.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-547.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-547"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-548.cmx b/fuchsia/split-cts/meta/vulkan-cts-548.cmx
index c985b59..4458587 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-548.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-548.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-548"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-549.cmx b/fuchsia/split-cts/meta/vulkan-cts-549.cmx
index 9c764ee..462bbf5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-549.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-549.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-549"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-550.cmx b/fuchsia/split-cts/meta/vulkan-cts-550.cmx
index b36facd..f1b4a95 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-550.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-550.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-550"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-551.cmx b/fuchsia/split-cts/meta/vulkan-cts-551.cmx
index ba69a8d..deeba48 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-551.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-551.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-551"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-552.cmx b/fuchsia/split-cts/meta/vulkan-cts-552.cmx
index 6558db6..5f2dedf 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-552.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-552.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-552"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-553.cmx b/fuchsia/split-cts/meta/vulkan-cts-553.cmx
index dc89cca..43ab6ee 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-553.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-553.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-553"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-554.cmx b/fuchsia/split-cts/meta/vulkan-cts-554.cmx
index 46a9fdc..22efac8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-554.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-554.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-554"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-555.cmx b/fuchsia/split-cts/meta/vulkan-cts-555.cmx
index 2437312..44c1fa2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-555.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-555.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-555"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-556.cmx b/fuchsia/split-cts/meta/vulkan-cts-556.cmx
index 96d255d..62e7753 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-556.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-556.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-556"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-557.cmx b/fuchsia/split-cts/meta/vulkan-cts-557.cmx
index 7091ae3..b6a814e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-557.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-557.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-557"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-558.cmx b/fuchsia/split-cts/meta/vulkan-cts-558.cmx
index 9886bf1..28243ab 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-558.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-558.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-558"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-559.cmx b/fuchsia/split-cts/meta/vulkan-cts-559.cmx
index 0bfc8bb..e0ea7d2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-559.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-559.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-559"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-560.cmx b/fuchsia/split-cts/meta/vulkan-cts-560.cmx
index 0bf2a1e..69c1a47 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-560.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-560.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-560"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-561.cmx b/fuchsia/split-cts/meta/vulkan-cts-561.cmx
index ed49e74..31431fe 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-561.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-561.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-561"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-562.cmx b/fuchsia/split-cts/meta/vulkan-cts-562.cmx
index 6a4368e..23981b0 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-562.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-562.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-562"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-563.cmx b/fuchsia/split-cts/meta/vulkan-cts-563.cmx
index 37de0c4..0aa0995 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-563.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-563.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-563"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-564.cmx b/fuchsia/split-cts/meta/vulkan-cts-564.cmx
index bca45c7..518eda9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-564.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-564.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-564"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-565.cmx b/fuchsia/split-cts/meta/vulkan-cts-565.cmx
index 9a6cfd9..479cfdc 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-565.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-565.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-565"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-566.cmx b/fuchsia/split-cts/meta/vulkan-cts-566.cmx
index 85e4618..40421bf 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-566.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-566.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-566"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-567.cmx b/fuchsia/split-cts/meta/vulkan-cts-567.cmx
index 63b1187..7ae52fb 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-567.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-567.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-567"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }
diff --git a/fuchsia/split-cts/meta/vulkan-cts-568.cmx b/fuchsia/split-cts/meta/vulkan-cts-568.cmx
index 1bb8a67..5874ade 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-568.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-568.cmx
@@ -1,4 +1,3 @@
-
 {
     "facets": {
         "fuchsia.test": {
@@ -17,20 +16,20 @@
             "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
-        "binary": "test/vulkan-cts-568"
+        "binary": "test/vulkan-cts"
     },
     "sandbox": {
         "dev": [
             "class/framebuffer"
         ],
         "features": [
-            "vulkan",
-            "isolated-persistent-storage"
+            "isolated-persistent-storage",
+            "vulkan"
         ],
         "services": [
+            "fuchsia.logger.LogSink",
             "fuchsia.sysmem.Allocator",
             "fuchsia.tracing.provider.Registry",
-            "fuchsia.logger.LogSink",
             "fuchsia.vulkan.loader.Loader"
         ]
     }